summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:08 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:08 +0200
commit258f905e8c6b1853884f730ab0e36a544bfd7b76 (patch)
tree812254806beb1a7af7271469e7148b667b2d96de
parentbc212c565cdc252d2a01e5221a75868b3f01d230 (diff)
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 <pmladek@walk.suse.cz> 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 <kendy@suse.cz> 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 <ihi@openoffice.org> Date: Thu Aug 26 13:52:56 2010 +0200 CWS-TOOLING: integrate CWS calc58 commit 51cfacc73ee6162c82dbb735448f5321a2a57269 Merge: 1f33e95 8676b47 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Aug 25 12:49:35 2010 +0200 CWS-TOOLING: integrate CWS mib18 commit 1d0dc690de7aa8ef1fd93d26578251248fd66d9a Author: Thomas Benisch <tbe@openoffice.org> 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 <tbe@openoffice.org> 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] <eike.rathke@oracle.com> 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] <eike.rathke@oracle.com> 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] <eike.rathke@oracle.com> 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 <dr@openoffice.org> Date: Fri Aug 13 11:29:46 2010 +0200 mib18: rebase to OOO330m4 commit 6423ab81e71f7090d61e81b8992878ce7de43f27 Merge: 6e0de89 772dd5e Author: Andreas Bregas <ab@openoffice.org> Date: Wed Aug 11 08:28:57 2010 +0200 mib18: Merge commit 772dd5e59b0b28c3e24cac6ae52ea0141b39c240 Author: Daniel Rentz <dr@openoffice.org> 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 <mbn@openoffice.org> 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 <mbn@openoffice.org> Date: Tue Aug 10 16:57:47 2010 +0200 heads merged commit 80722e0f75ad7d3204f39a580df2f48412e001c3 Author: Michael E. Bohn <mbn@openoffice.org> 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 <dr@openoffice.org> 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 <dr@openoffice.org> 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 <mbn@openoffice.org> 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 <ab@openoffice.org> Date: Fri Aug 6 09:39:35 2010 +0200 mib18: Merge commit 81cec496df67c85bb1b64ef7d15c9f73987882a0 Author: Daniel Rentz <dr@openoffice.org> 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 <dr@openoffice.org> 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 <dr@openoffice.org> 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 <dr@openoffice.org> 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 <dr@openoffice.org> 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 <dr@openoffice.org> 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 <dr@openoffice.org> 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(-)
Notes
split repo tag: calc_OOO_BUILD_3_2_98_1
-rw-r--r--chart2/inc/pch/precompiled_chart2.cxx2
-rw-r--r--chart2/inc/pch/precompiled_chart2.hxx2
-rw-r--r--chart2/source/controller/accessibility/AccStatisticsObject.cxx4
-rw-r--r--chart2/source/controller/accessibility/AccStatisticsObject.hxx2
-rw-r--r--chart2/source/controller/accessibility/AccessibleBase.cxx2
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartElement.cxx2
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartElement.hxx2
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartShape.cxx2
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartShape.hxx2
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartView.cxx2
-rw-r--r--chart2/source/controller/accessibility/AccessibleTextHelper.cxx2
-rw-r--r--chart2/source/controller/accessibility/AccessibleViewForwarder.cxx2
-rw-r--r--chart2/source/controller/accessibility/AccessibleViewForwarder.hxx4
-rw-r--r--chart2/source/controller/accessibility/ChartElementFactory.cxx2
-rw-r--r--chart2/source/controller/accessibility/ChartElementFactory.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/AreaWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/AreaWrapper.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/AxisWrapper.cxx14
-rw-r--r--chart2/source/controller/chartapiwrapper/AxisWrapper.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx8
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx22
-rw-r--r--chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx24
-rw-r--r--chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/GridWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/GridWrapper.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/LegendWrapper.cxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/LegendWrapper.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx10
-rw-r--r--chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/TitleWrapper.cxx12
-rw-r--r--chart2/source/controller/chartapiwrapper/TitleWrapper.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx12
-rw-r--r--chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx8
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx12
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx16
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx10
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx2
-rw-r--r--chart2/source/controller/dialogs/Bitmaps.hrc2
-rw-r--r--chart2/source/controller/dialogs/Bitmaps.src2
-rw-r--r--chart2/source/controller/dialogs/Bitmaps_HC.hrc2
-rw-r--r--chart2/source/controller/dialogs/Bitmaps_HC.src2
-rw-r--r--chart2/source/controller/dialogs/ChangingResource.cxx2
-rw-r--r--chart2/source/controller/dialogs/ChangingResource.hxx4
-rw-r--r--chart2/source/controller/dialogs/ChartTypeDialogController.cxx34
-rw-r--r--chart2/source/controller/dialogs/ChartTypeDialogController.hxx46
-rw-r--r--chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx2
-rw-r--r--chart2/source/controller/dialogs/CommonResources.hrc2
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.cxx4
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.hxx12
-rw-r--r--chart2/source/controller/dialogs/DataBrowserModel.cxx4
-rw-r--r--chart2/source/controller/dialogs/DataBrowserModel.hxx2
-rw-r--r--chart2/source/controller/dialogs/DialogModel.cxx2
-rw-r--r--chart2/source/controller/dialogs/DialogModel.hxx2
-rw-r--r--chart2/source/controller/dialogs/ObjectNameProvider.cxx16
-rw-r--r--chart2/source/controller/dialogs/RangeEdit.cxx2
-rw-r--r--chart2/source/controller/dialogs/RangeSelectionButton.cxx2
-rw-r--r--chart2/source/controller/dialogs/RangeSelectionHelper.cxx2
-rw-r--r--chart2/source/controller/dialogs/RangeSelectionListener.cxx2
-rw-r--r--chart2/source/controller/dialogs/ResourceIds.hrc6
-rw-r--r--chart2/source/controller/dialogs/Strings.src4
-rw-r--r--chart2/source/controller/dialogs/Strings_AdditionalControls.src2
-rw-r--r--chart2/source/controller/dialogs/Strings_ChartTypes.src2
-rw-r--r--chart2/source/controller/dialogs/Strings_Scale.src2
-rw-r--r--chart2/source/controller/dialogs/Strings_Statistic.src2
-rw-r--r--chart2/source/controller/dialogs/TabPages.hrc106
-rw-r--r--chart2/source/controller/dialogs/TextDirectionListBox.cxx2
-rw-r--r--chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx2
-rw-r--r--chart2/source/controller/dialogs/TitleDialogData.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_ChartType.cxx4
-rw-r--r--chart2/source/controller/dialogs/dlg_ChartType.hrc2
-rw-r--r--chart2/source/controller/dialogs/dlg_ChartType.src8
-rw-r--r--chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx4
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard.hrc2
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_DataEditor.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_DataEditor.hrc2
-rw-r--r--chart2/source/controller/dialogs/dlg_DataEditor.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_DataSource.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_DataSource.hrc2
-rw-r--r--chart2/source/controller/dialogs/dlg_DataSource.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx4
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertAxis_Grid.hrc2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src8
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertDataLabel.hrc2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertDataLabel.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertErrorBars.hrc2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertErrorBars.src4
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertLegend.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertLegend.hrc2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertLegend.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertTitle.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertTitle.hrc4
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertTitle.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertTrendline.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertTrendline.hrc2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertTrendline.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_NumberFormat.cxx4
-rw-r--r--chart2/source/controller/dialogs/dlg_NumberFormat.hxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_ObjectProperties.cxx4
-rw-r--r--chart2/source/controller/dialogs/dlg_ObjectProperties.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_ShapeFont.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_ShapeFont.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_ShapeParagraph.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_View3D.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_View3D.hrc2
-rw-r--r--chart2/source/controller/dialogs/dlg_View3D.src4
-rw-r--r--chart2/source/controller/dialogs/hidother.src2
-rw-r--r--chart2/source/controller/dialogs/res_BarGeometry.cxx6
-rw-r--r--chart2/source/controller/dialogs/res_BarGeometry.hxx2
-rw-r--r--chart2/source/controller/dialogs/res_BarGeometry.src2
-rw-r--r--chart2/source/controller/dialogs/res_DataLabel.cxx6
-rw-r--r--chart2/source/controller/dialogs/res_DataLabel.hxx2
-rw-r--r--chart2/source/controller/dialogs/res_DataLabel_IDs.hrc2
-rw-r--r--chart2/source/controller/dialogs/res_DataLabel_tmpl.hrc6
-rw-r--r--chart2/source/controller/dialogs/res_ErrorBar.cxx2
-rw-r--r--chart2/source/controller/dialogs/res_ErrorBar_IDs.hrc2
-rw-r--r--chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc4
-rw-r--r--chart2/source/controller/dialogs/res_LegendPosition.cxx6
-rw-r--r--chart2/source/controller/dialogs/res_LegendPosition.hxx10
-rw-r--r--chart2/source/controller/dialogs/res_LegendPosition_IDs.hrc2
-rw-r--r--chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc2
-rw-r--r--chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc2
-rw-r--r--chart2/source/controller/dialogs/res_TextSeparator.cxx2
-rw-r--r--chart2/source/controller/dialogs/res_TextSeparator.hxx2
-rw-r--r--chart2/source/controller/dialogs/res_TextSeparator.src4
-rw-r--r--chart2/source/controller/dialogs/res_Titles.cxx12
-rw-r--r--chart2/source/controller/dialogs/res_Titles.hrc2
-rw-r--r--chart2/source/controller/dialogs/res_Titles.hxx22
-rw-r--r--chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc2
-rw-r--r--chart2/source/controller/dialogs/res_Trendline.cxx2
-rw-r--r--chart2/source/controller/dialogs/res_Trendline.hxx2
-rw-r--r--chart2/source/controller/dialogs/res_Trendline_IDs.hrc2
-rw-r--r--chart2/source/controller/dialogs/res_Trendline_tmpl.hrc2
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx10
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc2
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx14
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneAppearance.src8
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx22
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneGeometry.hrc2
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx24
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneGeometry.src8
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx26
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc2
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneIllumination.src10
-rw-r--r--chart2/source/controller/dialogs/tp_AxisLabel.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_AxisLabel.hxx16
-rw-r--r--chart2/source/controller/dialogs/tp_AxisLabel.src28
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.cxx18
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.hxx8
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.src28
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.cxx10
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.hrc8
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.hxx8
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.src6
-rw-r--r--chart2/source/controller/dialogs/tp_DataLabel.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_DataLabel.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_DataLabel.src2
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.cxx6
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.hrc2
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.src2
-rw-r--r--chart2/source/controller/dialogs/tp_DataSourceControls.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_DataSourceControls.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_ErrorBars.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_ErrorBars.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_ErrorBars.src4
-rw-r--r--chart2/source/controller/dialogs/tp_LegendPosition.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_LegendPosition.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_LegendPosition.src2
-rw-r--r--chart2/source/controller/dialogs/tp_Location.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_Location.hrc2
-rw-r--r--chart2/source/controller/dialogs/tp_Location.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_Location.src2
-rw-r--r--chart2/source/controller/dialogs/tp_PointGeometry.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_PointGeometry.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_PointGeometry.src2
-rw-r--r--chart2/source/controller/dialogs/tp_PolarOptions.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_PolarOptions.hrc2
-rw-r--r--chart2/source/controller/dialogs/tp_PolarOptions.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_PolarOptions.src4
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.hrc2
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.src2
-rw-r--r--chart2/source/controller/dialogs/tp_Scale.cxx32
-rw-r--r--chart2/source/controller/dialogs/tp_Scale.hxx48
-rw-r--r--chart2/source/controller/dialogs/tp_Scale.src12
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.cxx18
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.hrc20
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.hxx8
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.src18
-rw-r--r--chart2/source/controller/dialogs/tp_TitleRotation.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_TitleRotation.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_TitleRotation.src2
-rw-r--r--chart2/source/controller/dialogs/tp_Trendline.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_Trendline.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_Trendline.src4
-rw-r--r--chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc2
-rw-r--r--chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx8
-rw-r--r--chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src2
-rw-r--r--chart2/source/controller/drawinglayer/DrawViewWrapper.cxx10
-rw-r--r--chart2/source/controller/drawinglayer/ViewElementListProvider.cxx6
-rw-r--r--chart2/source/controller/inc/AccessibleBase.hxx2
-rw-r--r--chart2/source/controller/inc/AccessibleChartView.hxx2
-rw-r--r--chart2/source/controller/inc/AccessibleTextHelper.hxx2
-rw-r--r--chart2/source/controller/inc/AxisItemConverter.hxx4
-rw-r--r--chart2/source/controller/inc/CharacterPropertyItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/ChartDocumentWrapper.hxx6
-rw-r--r--chart2/source/controller/inc/ChartRenderer.hxx4
-rw-r--r--chart2/source/controller/inc/ConfigurationAccess.hxx2
-rw-r--r--chart2/source/controller/inc/DataPointItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/DrawViewWrapper.hxx2
-rwxr-xr-xchart2/source/controller/inc/ErrorBarItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/GraphicPropertyItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/HelpIds.hrc12
-rw-r--r--chart2/source/controller/inc/ItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/ItemPropertyMap.hxx2
-rw-r--r--chart2/source/controller/inc/LegendItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/MenuResIds.hrc2
-rw-r--r--chart2/source/controller/inc/MultipleChartConverters.hxx2
-rw-r--r--chart2/source/controller/inc/MultipleItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/ObjectHierarchy.hxx4
-rw-r--r--chart2/source/controller/inc/ObjectNameProvider.hxx4
-rw-r--r--chart2/source/controller/inc/PositionAndSizeHelper.hxx2
-rwxr-xr-xchart2/source/controller/inc/RangeEdit.hxx2
-rw-r--r--chart2/source/controller/inc/RangeSelectionButton.hxx2
-rwxr-xr-xchart2/source/controller/inc/RangeSelectionHelper.hxx2
-rw-r--r--chart2/source/controller/inc/RangeSelectionListener.hxx2
-rw-r--r--chart2/source/controller/inc/RegressionCurveItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/RegressionEquationItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/SchSlotIds.hxx78
-rw-r--r--chart2/source/controller/inc/SeriesOptionsItemConverter.hxx4
-rw-r--r--chart2/source/controller/inc/ShapeController.hrc2
-rw-r--r--chart2/source/controller/inc/StatisticsItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/TabPageNotifiable.hxx2
-rw-r--r--chart2/source/controller/inc/TextDirectionListBox.hxx2
-rw-r--r--chart2/source/controller/inc/TimerTriggeredControllerLock.hxx2
-rw-r--r--chart2/source/controller/inc/TitleDialogData.hxx2
-rw-r--r--chart2/source/controller/inc/TitleItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/ViewElementListProvider.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_ChartType.hxx10
-rw-r--r--chart2/source/controller/inc/dlg_ChartType_UNO.hxx6
-rw-r--r--chart2/source/controller/inc/dlg_CreationWizard.hxx12
-rw-r--r--chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx8
-rw-r--r--chart2/source/controller/inc/dlg_DataEditor.hxx4
-rw-r--r--chart2/source/controller/inc/dlg_DataSource.hxx8
-rw-r--r--chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx28
-rw-r--r--chart2/source/controller/inc/dlg_InsertDataLabel.hxx10
-rw-r--r--chart2/source/controller/inc/dlg_InsertErrorBars.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_InsertLegend.hxx8
-rw-r--r--chart2/source/controller/inc/dlg_InsertTitle.hxx10
-rw-r--r--chart2/source/controller/inc/dlg_InsertTrendline.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_ObjectProperties.hxx22
-rw-r--r--chart2/source/controller/inc/dlg_ShapeFont.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_ShapeParagraph.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_View3D.hxx8
-rw-r--r--chart2/source/controller/inc/res_ErrorBar.hxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx22
-rw-r--r--chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx4
-rw-r--r--chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx16
-rwxr-xr-xchart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx4
-rw-r--r--chart2/source/controller/itemsetwrapper/ItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx4
-rw-r--r--chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx102
-rw-r--r--chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx6
-rw-r--r--chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx2
-rw-r--r--chart2/source/controller/main/ChartController.cxx54
-rw-r--r--chart2/source/controller/main/ChartController.hxx78
-rw-r--r--chart2/source/controller/main/ChartController_EditData.cxx2
-rw-r--r--chart2/source/controller/main/ChartController_Insert.cxx8
-rw-r--r--chart2/source/controller/main/ChartController_Position.cxx12
-rw-r--r--chart2/source/controller/main/ChartController_Properties.cxx16
-rw-r--r--chart2/source/controller/main/ChartController_TextEdit.cxx4
-rw-r--r--chart2/source/controller/main/ChartController_Tools.cxx20
-rw-r--r--chart2/source/controller/main/ChartController_Window.cxx46
-rw-r--r--chart2/source/controller/main/ChartDropTargetHelper.cxx2
-rw-r--r--chart2/source/controller/main/ChartDropTargetHelper.hxx4
-rw-r--r--chart2/source/controller/main/ChartFrameloader.cxx8
-rw-r--r--chart2/source/controller/main/ChartFrameloader.hxx16
-rw-r--r--chart2/source/controller/main/ChartRenderer.cxx8
-rw-r--r--chart2/source/controller/main/ChartTransferable.cxx2
-rw-r--r--chart2/source/controller/main/ChartTransferable.hxx2
-rw-r--r--chart2/source/controller/main/ChartWindow.cxx2
-rw-r--r--chart2/source/controller/main/ChartWindow.hxx2
-rw-r--r--chart2/source/controller/main/CommandDispatch.cxx2
-rw-r--r--chart2/source/controller/main/CommandDispatch.hxx2
-rw-r--r--chart2/source/controller/main/CommandDispatchContainer.cxx6
-rw-r--r--chart2/source/controller/main/CommandDispatchContainer.hxx2
-rw-r--r--chart2/source/controller/main/ConfigurationAccess.cxx2
-rw-r--r--chart2/source/controller/main/ControllerCommandDispatch.cxx2
-rw-r--r--chart2/source/controller/main/ControllerCommandDispatch.hxx2
-rw-r--r--chart2/source/controller/main/DragMethod_Base.cxx2
-rw-r--r--chart2/source/controller/main/DragMethod_Base.hxx2
-rw-r--r--chart2/source/controller/main/DragMethod_PieSegment.cxx4
-rw-r--r--chart2/source/controller/main/DragMethod_PieSegment.hxx2
-rw-r--r--chart2/source/controller/main/DragMethod_RotateDiagram.cxx12
-rw-r--r--chart2/source/controller/main/DragMethod_RotateDiagram.hxx8
-rw-r--r--chart2/source/controller/main/DrawCommandDispatch.cxx4
-rw-r--r--chart2/source/controller/main/DrawCommandDispatch.hrc2
-rw-r--r--chart2/source/controller/main/DrawCommandDispatch.hxx2
-rw-r--r--chart2/source/controller/main/ElementSelector.cxx6
-rw-r--r--chart2/source/controller/main/ElementSelector.hxx8
-rw-r--r--chart2/source/controller/main/FeatureCommandDispatchBase.cxx2
-rw-r--r--chart2/source/controller/main/FeatureCommandDispatchBase.hxx4
-rw-r--r--chart2/source/controller/main/ImplUndoManager.cxx2
-rw-r--r--chart2/source/controller/main/ImplUndoManager.hxx2
-rw-r--r--chart2/source/controller/main/ObjectHierarchy.cxx6
-rw-r--r--chart2/source/controller/main/PositionAndSizeHelper.cxx2
-rw-r--r--chart2/source/controller/main/SelectionHelper.cxx16
-rw-r--r--chart2/source/controller/main/SelectionHelper.hxx2
-rw-r--r--chart2/source/controller/main/ShapeController.cxx2
-rw-r--r--chart2/source/controller/main/ShapeController.hxx2
-rw-r--r--chart2/source/controller/main/ShapeToolbarController.cxx10
-rw-r--r--chart2/source/controller/main/ShapeToolbarController.hxx4
-rw-r--r--chart2/source/controller/main/StatusBarCommandDispatch.cxx2
-rw-r--r--chart2/source/controller/main/StatusBarCommandDispatch.hxx2
-rw-r--r--chart2/source/controller/main/UndoCommandDispatch.cxx2
-rw-r--r--chart2/source/controller/main/UndoCommandDispatch.hxx2
-rw-r--r--chart2/source/controller/main/UndoGuard.cxx2
-rw-r--r--chart2/source/controller/main/UndoManager.cxx2
-rw-r--r--chart2/source/controller/main/_serviceregistration_controller.cxx2
-rw-r--r--chart2/source/controller/menus/ShapeContextMenu.src6
-rw-r--r--chart2/source/controller/menus/ShapeEditContextMenu.src2
-rw-r--r--chart2/source/inc/AxisHelper.hxx8
-rw-r--r--chart2/source/inc/AxisIndexDefines.hxx2
-rw-r--r--chart2/source/inc/BaseGFXHelper.hxx2
-rw-r--r--chart2/source/inc/CachedDataSequence.hxx4
-rw-r--r--chart2/source/inc/CharacterProperties.hxx2
-rw-r--r--chart2/source/inc/ChartDebugTrace.hxx2
-rw-r--r--chart2/source/inc/ChartModelHelper.hxx2
-rw-r--r--chart2/source/inc/ChartTypeHelper.hxx2
-rw-r--r--chart2/source/inc/ChartViewHelper.hxx2
-rw-r--r--chart2/source/inc/CloneHelper.hxx2
-rw-r--r--chart2/source/inc/ColorPerPointHelper.hxx2
-rw-r--r--chart2/source/inc/CommonConverters.hxx4
-rw-r--r--chart2/source/inc/CommonFunctors.hxx2
-rw-r--r--chart2/source/inc/ConfigColorScheme.hxx2
-rw-r--r--chart2/source/inc/ConfigItemListener.hxx2
-rw-r--r--chart2/source/inc/ContainerHelper.hxx2
-rw-r--r--chart2/source/inc/ControllerLockGuard.hxx2
-rw-r--r--chart2/source/inc/DataSeriesHelper.hxx2
-rw-r--r--chart2/source/inc/DataSource.hxx2
-rw-r--r--chart2/source/inc/DataSourceHelper.hxx4
-rw-r--r--chart2/source/inc/DiagramHelper.hxx6
-rw-r--r--chart2/source/inc/DisposeHelper.hxx2
-rw-r--r--chart2/source/inc/ErrorBar.hxx2
-rw-r--r--chart2/source/inc/EventListenerHelper.hxx2
-rw-r--r--chart2/source/inc/ExplicitCategoriesProvider.hxx2
-rw-r--r--chart2/source/inc/ExponentialRegressionCurveCalculator.hxx2
-rw-r--r--chart2/source/inc/FastPropertyIdRanges.hxx2
-rw-r--r--chart2/source/inc/FillProperties.hxx2
-rw-r--r--chart2/source/inc/FormattedStringHelper.hxx2
-rwxr-xr-xchart2/source/inc/InternalData.hxx4
-rw-r--r--chart2/source/inc/InternalDataProvider.hxx8
-rw-r--r--chart2/source/inc/LabeledDataSequence.hxx2
-rw-r--r--chart2/source/inc/LegendHelper.hxx2
-rw-r--r--chart2/source/inc/LifeTime.hxx86
-rw-r--r--chart2/source/inc/LineProperties.hxx2
-rw-r--r--chart2/source/inc/LinearRegressionCurveCalculator.hxx2
-rw-r--r--chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx2
-rw-r--r--chart2/source/inc/MeanValueRegressionCurveCalculator.hxx2
-rw-r--r--chart2/source/inc/MediaDescriptorHelper.hxx134
-rw-r--r--chart2/source/inc/ModifyListenerCallBack.hxx4
-rw-r--r--chart2/source/inc/ModifyListenerHelper.hxx2
-rw-r--r--chart2/source/inc/MutexContainer.hxx2
-rw-r--r--chart2/source/inc/NameContainer.hxx2
-rw-r--r--chart2/source/inc/NamedFillProperties.hxx2
-rw-r--r--chart2/source/inc/NamedLineProperties.hxx2
-rw-r--r--chart2/source/inc/NamedProperties.hxx2
-rw-r--r--chart2/source/inc/NoWarningThisInCTOR.hxx2
-rw-r--r--chart2/source/inc/OPropertySet.hxx2
-rw-r--r--chart2/source/inc/ObjectIdentifier.hxx6
-rw-r--r--chart2/source/inc/PotentialRegressionCurveCalculator.hxx2
-rw-r--r--chart2/source/inc/PropertyHelper.hxx2
-rw-r--r--chart2/source/inc/RangeHighlighter.hxx2
-rw-r--r--chart2/source/inc/ReferenceSizeProvider.hxx2
-rw-r--r--chart2/source/inc/RegressionCurveCalculator.hxx2
-rw-r--r--chart2/source/inc/RegressionCurveHelper.hxx4
-rw-r--r--chart2/source/inc/RelativePositionHelper.hxx2
-rw-r--r--chart2/source/inc/RelativeSizeHelper.hxx2
-rw-r--r--chart2/source/inc/ResId.hxx2
-rw-r--r--chart2/source/inc/RessourceManager.hxx2
-rw-r--r--chart2/source/inc/Scaling.hxx2
-rw-r--r--chart2/source/inc/SceneProperties.hxx2
-rw-r--r--chart2/source/inc/ServiceMacros.hxx32
-rw-r--r--chart2/source/inc/StackMode.hxx2
-rw-r--r--chart2/source/inc/StatisticsHelper.hxx2
-rw-r--r--chart2/source/inc/Strings.hrc176
-rw-r--r--chart2/source/inc/ThreeDHelper.hxx8
-rw-r--r--chart2/source/inc/TitleHelper.hxx2
-rw-r--r--chart2/source/inc/TrueGuard.hxx4
-rw-r--r--chart2/source/inc/UncachedDataSequence.hxx2
-rw-r--r--chart2/source/inc/UndoGuard.hxx2
-rw-r--r--chart2/source/inc/UndoManager.hxx2
-rw-r--r--chart2/source/inc/UserDefinedProperties.hxx2
-rw-r--r--chart2/source/inc/WeakListenerAdapter.hxx2
-rw-r--r--chart2/source/inc/WrappedDefaultProperty.hxx2
-rw-r--r--chart2/source/inc/WrappedDirectStateProperty.hxx2
-rw-r--r--chart2/source/inc/WrappedIgnoreProperty.hxx2
-rw-r--r--chart2/source/inc/WrappedProperty.hxx2
-rw-r--r--chart2/source/inc/WrappedPropertySet.hxx10
-rw-r--r--chart2/source/inc/XMLRangeHelper.hxx2
-rw-r--r--chart2/source/inc/charttoolsdllapi.hxx2
-rw-r--r--chart2/source/inc/chartview/ChartSfxItemIds.hxx190
-rw-r--r--chart2/source/inc/chartview/DataPointSymbolSupplier.hxx2
-rw-r--r--chart2/source/inc/chartview/DrawModelWrapper.hxx4
-rw-r--r--chart2/source/inc/chartview/ExplicitValueProvider.hxx4
-rw-r--r--chart2/source/inc/chartview/NumberFormatterWrapper.hxx2
-rw-r--r--chart2/source/inc/chartview/chartviewdllapi.hxx2
-rw-r--r--chart2/source/inc/chartview/servicenames_charttypes.hxx2
-rw-r--r--chart2/source/inc/macros.hxx2
-rw-r--r--chart2/source/inc/servicenames.hxx2
-rw-r--r--chart2/source/inc/servicenames_charttypes.hxx2
-rw-r--r--chart2/source/inc/servicenames_coosystems.hxx2
-rw-r--r--chart2/source/inc/servicenames_dlwrapper.hxx2
-rw-r--r--chart2/source/model/filter/XMLFilter.cxx8
-rw-r--r--chart2/source/model/inc/BaseCoordinateSystem.hxx2
-rw-r--r--chart2/source/model/inc/CartesianCoordinateSystem.hxx2
-rw-r--r--chart2/source/model/inc/ChartTypeManager.hxx2
-rw-r--r--chart2/source/model/inc/DataSeries.hxx2
-rw-r--r--chart2/source/model/inc/DataSeriesTree.hxx2
-rw-r--r--chart2/source/model/inc/Diagram.hxx12
-rw-r--r--chart2/source/model/inc/PolarCoordinateSystem.hxx2
-rw-r--r--chart2/source/model/inc/StockBar.hxx2
-rw-r--r--chart2/source/model/inc/XMLFilter.hxx18
-rw-r--r--chart2/source/model/inc/_serviceregistration_charttypes.hxx2
-rw-r--r--chart2/source/model/main/Axis.cxx4
-rw-r--r--chart2/source/model/main/Axis.hxx6
-rw-r--r--chart2/source/model/main/BaseCoordinateSystem.cxx2
-rw-r--r--chart2/source/model/main/CartesianCoordinateSystem.cxx2
-rwxr-xr-xchart2/source/model/main/ChartModel.cxx19
-rw-r--r--chart2/source/model/main/ChartModel.hxx58
-rw-r--r--chart2/source/model/main/ChartModel_Persistence.cxx32
-rw-r--r--chart2/source/model/main/DataPoint.cxx2
-rw-r--r--chart2/source/model/main/DataPoint.hxx2
-rw-r--r--chart2/source/model/main/DataPointProperties.cxx2
-rw-r--r--chart2/source/model/main/DataPointProperties.hxx2
-rw-r--r--chart2/source/model/main/DataSeries.cxx4
-rw-r--r--chart2/source/model/main/DataSeriesProperties.cxx2
-rw-r--r--chart2/source/model/main/DataSeriesProperties.hxx2
-rw-r--r--chart2/source/model/main/Diagram.cxx2
-rw-r--r--chart2/source/model/main/FormattedString.cxx4
-rw-r--r--chart2/source/model/main/FormattedString.hxx6
-rw-r--r--chart2/source/model/main/GridProperties.cxx2
-rw-r--r--chart2/source/model/main/GridProperties.hxx2
-rw-r--r--chart2/source/model/main/LayoutContainer.cxx2
-rw-r--r--chart2/source/model/main/LayoutContainer.hxx2
-rw-r--r--chart2/source/model/main/Legend.cxx2
-rw-r--r--chart2/source/model/main/Legend.hxx6
-rw-r--r--chart2/source/model/main/PageBackground.cxx2
-rw-r--r--chart2/source/model/main/PageBackground.hxx6
-rw-r--r--chart2/source/model/main/PolarCoordinateSystem.cxx2
-rw-r--r--chart2/source/model/main/StockBar.cxx2
-rw-r--r--chart2/source/model/main/Title.cxx2
-rw-r--r--chart2/source/model/main/Title.hxx6
-rw-r--r--chart2/source/model/main/Wall.cxx2
-rw-r--r--chart2/source/model/main/Wall.hxx6
-rw-r--r--chart2/source/model/main/_serviceregistration_model.cxx2
-rw-r--r--chart2/source/model/template/AreaChartType.cxx2
-rw-r--r--chart2/source/model/template/AreaChartType.hxx2
-rw-r--r--chart2/source/model/template/AreaChartTypeTemplate.cxx4
-rw-r--r--chart2/source/model/template/AreaChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/BarChartType.cxx2
-rw-r--r--chart2/source/model/template/BarChartType.hxx2
-rw-r--r--chart2/source/model/template/BarChartTypeTemplate.cxx6
-rw-r--r--chart2/source/model/template/BarChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/BubbleChartType.cxx6
-rw-r--r--chart2/source/model/template/BubbleChartType.hxx2
-rw-r--r--chart2/source/model/template/BubbleChartTypeTemplate.cxx2
-rw-r--r--chart2/source/model/template/BubbleChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/BubbleDataInterpreter.cxx6
-rw-r--r--chart2/source/model/template/BubbleDataInterpreter.hxx2
-rw-r--r--chart2/source/model/template/CandleStickChartType.cxx2
-rw-r--r--chart2/source/model/template/CandleStickChartType.hxx2
-rw-r--r--chart2/source/model/template/ChartType.cxx4
-rw-r--r--chart2/source/model/template/ChartType.hxx8
-rw-r--r--chart2/source/model/template/ChartTypeManager.cxx2
-rw-r--r--chart2/source/model/template/ChartTypeTemplate.cxx4
-rw-r--r--chart2/source/model/template/ChartTypeTemplate.hxx4
-rw-r--r--chart2/source/model/template/ColumnChartType.cxx2
-rw-r--r--chart2/source/model/template/ColumnChartType.hxx2
-rw-r--r--chart2/source/model/template/ColumnLineChartTypeTemplate.cxx4
-rw-r--r--chart2/source/model/template/ColumnLineChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/ColumnLineDataInterpreter.cxx2
-rw-r--r--chart2/source/model/template/ColumnLineDataInterpreter.hxx2
-rw-r--r--chart2/source/model/template/DataInterpreter.cxx2
-rw-r--r--chart2/source/model/template/DataInterpreter.hxx2
-rw-r--r--chart2/source/model/template/FilledNetChartType.cxx2
-rw-r--r--chart2/source/model/template/FilledNetChartType.hxx2
-rw-r--r--chart2/source/model/template/LineChartType.cxx2
-rw-r--r--chart2/source/model/template/LineChartType.hxx2
-rw-r--r--chart2/source/model/template/LineChartTypeTemplate.cxx2
-rw-r--r--chart2/source/model/template/LineChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/NetChartType.cxx4
-rw-r--r--chart2/source/model/template/NetChartType.hxx2
-rw-r--r--chart2/source/model/template/NetChartTypeTemplate.cxx6
-rw-r--r--chart2/source/model/template/NetChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/PieChartType.cxx2
-rw-r--r--chart2/source/model/template/PieChartType.hxx2
-rw-r--r--chart2/source/model/template/PieChartTypeTemplate.cxx4
-rw-r--r--chart2/source/model/template/PieChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/ScatterChartType.cxx4
-rw-r--r--chart2/source/model/template/ScatterChartType.hxx2
-rw-r--r--chart2/source/model/template/ScatterChartTypeTemplate.cxx2
-rw-r--r--chart2/source/model/template/ScatterChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/StockChartTypeTemplate.cxx8
-rw-r--r--chart2/source/model/template/StockChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/StockDataInterpreter.cxx2
-rw-r--r--chart2/source/model/template/StockDataInterpreter.hxx2
-rw-r--r--chart2/source/model/template/XYDataInterpreter.cxx6
-rw-r--r--chart2/source/model/template/XYDataInterpreter.hxx2
-rw-r--r--chart2/source/model/template/_serviceregistration_charttypes.cxx2
-rw-r--r--chart2/source/tools/AxisHelper.cxx2
-rw-r--r--chart2/source/tools/BaseGFXHelper.cxx4
-rw-r--r--chart2/source/tools/CachedDataSequence.cxx2
-rw-r--r--chart2/source/tools/CharacterProperties.cxx2
-rw-r--r--chart2/source/tools/ChartDebugTrace.cxx4
-rw-r--r--chart2/source/tools/ChartModelHelper.cxx4
-rw-r--r--chart2/source/tools/ChartTypeHelper.cxx6
-rw-r--r--chart2/source/tools/ChartViewHelper.cxx2
-rw-r--r--chart2/source/tools/ColorPerPointHelper.cxx2
-rw-r--r--chart2/source/tools/CommonConverters.cxx10
-rw-r--r--chart2/source/tools/ConfigColorScheme.cxx2
-rw-r--r--chart2/source/tools/ControllerLockGuard.cxx2
-rw-r--r--chart2/source/tools/DataSeriesHelper.cxx2
-rw-r--r--chart2/source/tools/DataSource.cxx2
-rw-r--r--chart2/source/tools/DataSourceHelper.cxx4
-rw-r--r--chart2/source/tools/DiagramHelper.cxx22
-rw-r--r--chart2/source/tools/ErrorBar.cxx2
-rw-r--r--chart2/source/tools/ExplicitCategoriesProvider.cxx14
-rw-r--r--chart2/source/tools/ExponentialRegressionCurveCalculator.cxx2
-rw-r--r--chart2/source/tools/FillProperties.cxx2
-rw-r--r--chart2/source/tools/FormattedStringHelper.cxx4
-rw-r--r--chart2/source/tools/ImplOPropertySet.cxx2
-rw-r--r--chart2/source/tools/ImplOPropertySet.hxx2
-rwxr-xr-xchart2/source/tools/InternalData.cxx12
-rw-r--r--chart2/source/tools/InternalDataProvider.cxx6
-rw-r--r--chart2/source/tools/LabeledDataSequence.cxx2
-rw-r--r--chart2/source/tools/LegendHelper.cxx4
-rw-r--r--chart2/source/tools/LifeTime.cxx10
-rw-r--r--chart2/source/tools/LineProperties.cxx4
-rw-r--r--chart2/source/tools/LinearRegressionCurveCalculator.cxx2
-rw-r--r--chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx2
-rw-r--r--chart2/source/tools/MeanValueRegressionCurveCalculator.cxx2
-rw-r--r--chart2/source/tools/MediaDescriptorHelper.cxx54
-rw-r--r--chart2/source/tools/ModifyListenerCallBack.cxx2
-rw-r--r--chart2/source/tools/ModifyListenerHelper.cxx2
-rw-r--r--chart2/source/tools/MutexContainer.cxx2
-rw-r--r--chart2/source/tools/NameContainer.cxx6
-rw-r--r--chart2/source/tools/NamedFillProperties.cxx2
-rw-r--r--chart2/source/tools/NamedLineProperties.cxx2
-rw-r--r--chart2/source/tools/NamedProperties.cxx2
-rw-r--r--chart2/source/tools/OPropertySet.cxx2
-rw-r--r--chart2/source/tools/ObjectIdentifier.cxx28
-rw-r--r--chart2/source/tools/PotentialRegressionCurveCalculator.cxx2
-rw-r--r--chart2/source/tools/PropertyHelper.cxx2
-rw-r--r--chart2/source/tools/RangeHighlighter.cxx2
-rw-r--r--chart2/source/tools/ReferenceSizeProvider.cxx4
-rw-r--r--chart2/source/tools/RegressionCalculationHelper.hxx2
-rw-r--r--chart2/source/tools/RegressionCurveCalculator.cxx2
-rw-r--r--chart2/source/tools/RegressionCurveHelper.cxx6
-rw-r--r--chart2/source/tools/RegressionCurveModel.cxx2
-rw-r--r--chart2/source/tools/RegressionCurveModel.hxx2
-rw-r--r--chart2/source/tools/RegressionEquation.cxx2
-rw-r--r--chart2/source/tools/RegressionEquation.hxx2
-rw-r--r--chart2/source/tools/RelativePositionHelper.cxx2
-rw-r--r--chart2/source/tools/RelativeSizeHelper.cxx2
-rw-r--r--chart2/source/tools/ResId.cxx2
-rw-r--r--chart2/source/tools/RessourceManager.cxx2
-rw-r--r--chart2/source/tools/Scaling.cxx2
-rw-r--r--chart2/source/tools/SceneProperties.cxx2
-rw-r--r--chart2/source/tools/StatisticsHelper.cxx4
-rw-r--r--chart2/source/tools/ThreeDHelper.cxx32
-rw-r--r--chart2/source/tools/TitleHelper.cxx10
-rw-r--r--chart2/source/tools/TrueGuard.cxx2
-rw-r--r--chart2/source/tools/UncachedDataSequence.cxx2
-rw-r--r--chart2/source/tools/UserDefinedProperties.cxx2
-rw-r--r--chart2/source/tools/WeakListenerAdapter.cxx2
-rw-r--r--chart2/source/tools/WrappedDefaultProperty.cxx2
-rw-r--r--chart2/source/tools/WrappedDirectStateProperty.cxx2
-rw-r--r--chart2/source/tools/WrappedIgnoreProperty.cxx2
-rw-r--r--chart2/source/tools/WrappedProperty.cxx4
-rw-r--r--chart2/source/tools/WrappedPropertySet.cxx4
-rw-r--r--chart2/source/tools/XMLRangeHelper.cxx2
-rw-r--r--chart2/source/tools/_serviceregistration_tools.cxx2
-rw-r--r--chart2/source/view/axes/MinimumAndMaximumSupplier.cxx2
-rw-r--r--chart2/source/view/axes/ScaleAutomatism.cxx4
-rw-r--r--chart2/source/view/axes/TickmarkHelper.cxx6
-rw-r--r--chart2/source/view/axes/TickmarkHelper.hxx4
-rw-r--r--chart2/source/view/axes/TickmarkProperties.hxx2
-rw-r--r--chart2/source/view/axes/VAxisBase.cxx4
-rw-r--r--chart2/source/view/axes/VAxisBase.hxx4
-rw-r--r--chart2/source/view/axes/VAxisOrGridBase.cxx2
-rw-r--r--chart2/source/view/axes/VAxisOrGridBase.hxx2
-rw-r--r--chart2/source/view/axes/VAxisProperties.cxx12
-rw-r--r--chart2/source/view/axes/VAxisProperties.hxx2
-rw-r--r--chart2/source/view/axes/VCartesianAxis.cxx46
-rw-r--r--chart2/source/view/axes/VCartesianAxis.hxx4
-rw-r--r--chart2/source/view/axes/VCartesianCoordinateSystem.cxx6
-rw-r--r--chart2/source/view/axes/VCartesianCoordinateSystem.hxx4
-rw-r--r--chart2/source/view/axes/VCartesianGrid.cxx8
-rw-r--r--chart2/source/view/axes/VCartesianGrid.hxx2
-rw-r--r--chart2/source/view/axes/VCoordinateSystem.cxx18
-rw-r--r--chart2/source/view/axes/VPolarAngleAxis.cxx12
-rw-r--r--chart2/source/view/axes/VPolarAngleAxis.hxx2
-rw-r--r--chart2/source/view/axes/VPolarAxis.cxx2
-rw-r--r--chart2/source/view/axes/VPolarAxis.hxx2
-rw-r--r--chart2/source/view/axes/VPolarCoordinateSystem.cxx10
-rw-r--r--chart2/source/view/axes/VPolarCoordinateSystem.hxx2
-rw-r--r--chart2/source/view/axes/VPolarGrid.cxx10
-rw-r--r--chart2/source/view/axes/VPolarGrid.hxx2
-rw-r--r--chart2/source/view/axes/VPolarRadiusAxis.cxx6
-rw-r--r--chart2/source/view/axes/VPolarRadiusAxis.hxx4
-rw-r--r--chart2/source/view/charttypes/AreaChart.cxx14
-rw-r--r--chart2/source/view/charttypes/AreaChart.hxx12
-rwxr-xr-xchart2/source/view/charttypes/BarChart.cxx24
-rw-r--r--chart2/source/view/charttypes/BarChart.hxx2
-rw-r--r--chart2/source/view/charttypes/BarPositionHelper.cxx2
-rw-r--r--chart2/source/view/charttypes/BarPositionHelper.hxx2
-rw-r--r--chart2/source/view/charttypes/BubbleChart.cxx12
-rw-r--r--chart2/source/view/charttypes/BubbleChart.hxx4
-rw-r--r--chart2/source/view/charttypes/CandleStickChart.cxx10
-rw-r--r--chart2/source/view/charttypes/CandleStickChart.hxx2
-rw-r--r--chart2/source/view/charttypes/CategoryPositionHelper.cxx2
-rw-r--r--chart2/source/view/charttypes/CategoryPositionHelper.hxx2
-rw-r--r--chart2/source/view/charttypes/PieChart.cxx18
-rw-r--r--chart2/source/view/charttypes/PieChart.hxx4
-rw-r--r--chart2/source/view/charttypes/Splines.cxx20
-rw-r--r--chart2/source/view/charttypes/Splines.hxx2
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx38
-rw-r--r--chart2/source/view/diagram/VDiagram.cxx20
-rw-r--r--chart2/source/view/inc/Clipping.hxx10
-rw-r--r--chart2/source/view/inc/LabelAlignment.hxx2
-rw-r--r--chart2/source/view/inc/LabelPositionHelper.hxx2
-rw-r--r--chart2/source/view/inc/LegendEntryProvider.hxx2
-rw-r--r--chart2/source/view/inc/Linear3DTransformation.hxx2
-rw-r--r--chart2/source/view/inc/MinimumAndMaximumSupplier.hxx2
-rw-r--r--chart2/source/view/inc/PlotterBase.hxx8
-rw-r--r--chart2/source/view/inc/PlottingPositionHelper.hxx10
-rw-r--r--chart2/source/view/inc/PolarLabelPositionHelper.hxx2
-rw-r--r--chart2/source/view/inc/PropertyMapper.hxx2
-rw-r--r--chart2/source/view/inc/ScaleAutomatism.hxx6
-rw-r--r--chart2/source/view/inc/ShapeFactory.hxx2
-rw-r--r--chart2/source/view/inc/Stripe.hxx2
-rw-r--r--chart2/source/view/inc/VCoordinateSystem.hxx18
-rw-r--r--chart2/source/view/inc/VDataSeries.hxx4
-rw-r--r--chart2/source/view/inc/VDiagram.hxx4
-rw-r--r--chart2/source/view/inc/VLegendSymbolFactory.hxx2
-rw-r--r--chart2/source/view/inc/VLineProperties.hxx2
-rw-r--r--chart2/source/view/inc/VPolarTransformation.hxx2
-rw-r--r--chart2/source/view/inc/VSeriesPlotter.hxx20
-rw-r--r--chart2/source/view/inc/ViewDefines.hxx2
-rw-r--r--chart2/source/view/main/ChartItemPool.cxx144
-rw-r--r--chart2/source/view/main/ChartItemPool.hxx4
-rw-r--r--chart2/source/view/main/ChartView.cxx104
-rw-r--r--chart2/source/view/main/ChartView.hxx12
-rw-r--r--chart2/source/view/main/Clipping.cxx66
-rw-r--r--chart2/source/view/main/DataPointSymbolSupplier.cxx4
-rw-r--r--chart2/source/view/main/DrawModelWrapper.cxx2
-rw-r--r--chart2/source/view/main/LabelPositionHelper.cxx4
-rw-r--r--chart2/source/view/main/Linear3DTransformation.cxx2
-rw-r--r--chart2/source/view/main/NumberFormatterWrapper.cxx2
-rw-r--r--chart2/source/view/main/PlotterBase.cxx4
-rw-r--r--chart2/source/view/main/PlottingPositionHelper.cxx18
-rw-r--r--chart2/source/view/main/PolarLabelPositionHelper.cxx8
-rw-r--r--chart2/source/view/main/PropertyMapper.cxx10
-rw-r--r--chart2/source/view/main/ShapeFactory.cxx14
-rw-r--r--chart2/source/view/main/Stripe.cxx14
-rw-r--r--chart2/source/view/main/VDataSeries.cxx10
-rw-r--r--chart2/source/view/main/VLegend.cxx6
-rw-r--r--chart2/source/view/main/VLegend.hxx4
-rw-r--r--chart2/source/view/main/VLegendSymbolFactory.cxx4
-rw-r--r--chart2/source/view/main/VLineProperties.cxx4
-rw-r--r--chart2/source/view/main/VPolarTransformation.cxx8
-rw-r--r--chart2/source/view/main/VTitle.cxx4
-rw-r--r--chart2/source/view/main/VTitle.hxx4
-rw-r--r--chart2/source/view/main/_serviceregistration_view.cxx2
-rw-r--r--chart2/uiconfig/menubar/menubar.xml2
-rw-r--r--chart2/uiconfig/toolbar/arrowshapes.xml22
-rw-r--r--chart2/uiconfig/toolbar/basicshapes.xml14
-rw-r--r--chart2/uiconfig/toolbar/flowchartshapes.xml26
-rw-r--r--chart2/uiconfig/toolbar/symbolshapes.xml6
-rw-r--r--chart2/workbench/addin/sampleaddin.cxx62
-rw-r--r--chart2/workbench/addin/sampleaddin.hxx6
-rw-r--r--sc/addin/datefunc/dfa.src2
-rw-r--r--sc/addin/inc/addin.h20
-rw-r--r--sc/addin/inc/dfa.hrc2
-rw-r--r--sc/addin/inc/rot13.hrc2
-rw-r--r--sc/addin/rot13/rot13.src2
-rw-r--r--sc/addin/util/cl2c.pl4
-rw-r--r--sc/inc/AccessibleFilterMenu.hxx4
-rw-r--r--sc/inc/AccessibleFilterMenuItem.hxx24
-rw-r--r--sc/inc/AccessibleFilterTopWindow.hxx4
-rw-r--r--sc/inc/AccessibleGlobal.hxx12
-rw-r--r--sc/inc/ViewSettingsSequenceDefines.hxx110
-rw-r--r--sc/inc/addincfg.hxx10
-rw-r--r--sc/inc/addincol.hxx102
-rw-r--r--sc/inc/address.hxx34
-rw-r--r--sc/inc/addruno.hxx2
-rw-r--r--sc/inc/afmtuno.hxx64
-rw-r--r--sc/inc/appluno.hxx26
-rw-r--r--sc/inc/appoptio.hxx118
-rw-r--r--sc/inc/arealink.hxx26
-rw-r--r--sc/inc/attarray.hxx150
-rw-r--r--sc/inc/attrib.hxx90
-rw-r--r--sc/inc/autoform.hxx2
-rw-r--r--sc/inc/autonamecache.hxx4
-rw-r--r--sc/inc/bigrange.hxx72
-rw-r--r--sc/inc/brdcst.hxx18
-rw-r--r--sc/inc/callform.hxx52
-rw-r--r--sc/inc/cell.hxx208
-rw-r--r--sc/inc/cellform.hxx12
-rw-r--r--sc/inc/cellsuno.hxx414
-rw-r--r--sc/inc/cfgids.hxx8
-rw-r--r--sc/inc/chart2uno.hxx46
-rw-r--r--sc/inc/chartarr.hxx44
-rw-r--r--sc/inc/charthelper.hxx2
-rw-r--r--sc/inc/chartlis.hxx110
-rw-r--r--sc/inc/chartlock.hxx18
-rw-r--r--sc/inc/chartpos.hxx92
-rw-r--r--sc/inc/chartuno.hxx40
-rw-r--r--sc/inc/chgtrack.hxx720
-rw-r--r--sc/inc/chgviset.hxx94
-rw-r--r--sc/inc/clipparam.hxx18
-rw-r--r--sc/inc/collect.hxx66
-rw-r--r--sc/inc/column.hxx388
-rw-r--r--sc/inc/compiler.hxx20
-rw-r--r--sc/inc/compressedarray.hxx4
-rw-r--r--sc/inc/conditio.hxx174
-rw-r--r--sc/inc/confuno.hxx20
-rw-r--r--sc/inc/consoli.hxx112
-rw-r--r--sc/inc/convuno.hxx30
-rw-r--r--sc/inc/cursuno.hxx34
-rw-r--r--sc/inc/dapiuno.hxx94
-rw-r--r--sc/inc/datauno.hxx220
-rw-r--r--sc/inc/dbcolect.hxx266
-rw-r--r--sc/inc/dbdocutl.hxx2
-rw-r--r--sc/inc/dbtoken.hxx2
-rw-r--r--sc/inc/defltuno.hxx22
-rw-r--r--sc/inc/detdata.hxx28
-rw-r--r--sc/inc/detfunc.hxx68
-rw-r--r--sc/inc/dispuno.hxx34
-rw-r--r--sc/inc/dociter.hxx318
-rw-r--r--sc/inc/docoptio.hxx156
-rw-r--r--sc/inc/docpool.hxx48
-rw-r--r--sc/inc/document.hxx1322
-rw-r--r--sc/inc/docuno.hxx208
-rw-r--r--sc/inc/dpcachetable.hxx8
-rw-r--r--sc/inc/dpdimsave.hxx2
-rwxr-xr-xsc/inc/dpglobal.hxx114
-rw-r--r--sc/inc/dpgroup.hxx16
-rw-r--r--sc/inc/dpobject.hxx164
-rw-r--r--sc/inc/dpoutput.hxx88
-rw-r--r--sc/inc/dpoutputgeometry.hxx6
-rw-r--r--sc/inc/dpsave.hxx148
-rw-r--r--sc/inc/dpsdbtab.hxx32
-rw-r--r--sc/inc/dpshttab.hxx40
-rw-r--r--sc/inc/dptabdat.hxx88
-rw-r--r--sc/inc/dptablecache.hxx56
-rw-r--r--sc/inc/dptabres.hxx294
-rw-r--r--sc/inc/dptabsrc.hxx376
-rw-r--r--sc/inc/drawattr.hxx12
-rw-r--r--sc/inc/drawpage.hxx2
-rw-r--r--sc/inc/drdefuno.hxx10
-rw-r--r--sc/inc/drwlayer.hxx112
-rw-r--r--sc/inc/editsrc.hxx102
-rw-r--r--sc/inc/editutil.hxx124
-rwxr-xr-xsc/inc/eventuno.hxx2
-rw-r--r--sc/inc/externalrefmgr.hxx52
-rw-r--r--sc/inc/fielduno.hxx146
-rw-r--r--sc/inc/fillinfo.hxx2
-rw-r--r--sc/inc/filter.hxx54
-rw-r--r--sc/inc/filtopt.hxx20
-rw-r--r--sc/inc/filtuno.hxx22
-rw-r--r--sc/inc/fmtuno.hxx82
-rw-r--r--sc/inc/forbiuno.hxx12
-rw-r--r--sc/inc/formulaparserpool.hxx2
-rw-r--r--sc/inc/formularesult.hxx6
-rw-r--r--sc/inc/funcdesc.hxx10
-rw-r--r--sc/inc/funcuno.hxx36
-rw-r--r--sc/inc/global.hxx560
-rw-r--r--sc/inc/globstr.hrc646
-rw-r--r--sc/inc/hints.hxx108
-rw-r--r--sc/inc/inputopt.hxx32
-rw-r--r--sc/inc/linkuno.hxx158
-rw-r--r--sc/inc/listenercalls.hxx2
-rw-r--r--sc/inc/lookupcache.hxx2
-rw-r--r--sc/inc/markarr.hxx42
-rw-r--r--sc/inc/markdata.hxx98
-rw-r--r--sc/inc/miscuno.hxx126
-rw-r--r--sc/inc/mutexhlp.hxx6
-rw-r--r--sc/inc/nameuno.hxx84
-rw-r--r--sc/inc/navicfg.hxx20
-rw-r--r--sc/inc/notesuno.hxx146
-rw-r--r--sc/inc/olinetab.hxx2
-rw-r--r--sc/inc/optuno.hxx14
-rw-r--r--sc/inc/optutil.hxx24
-rw-r--r--sc/inc/pagepar.hxx58
-rw-r--r--sc/inc/pageuno.hxx4
-rw-r--r--sc/inc/paramisc.hxx32
-rw-r--r--sc/inc/patattr.hxx60
-rwxr-xr-xsc/inc/pch/precompiled_sc.cxx2
-rw-r--r--sc/inc/pch/precompiled_sc.hxx2
-rw-r--r--sc/inc/pivot.hxx24
-rw-r--r--sc/inc/postit.hxx2
-rw-r--r--sc/inc/printopt.hxx28
-rw-r--r--sc/inc/prnsave.hxx16
-rw-r--r--sc/inc/progress.hxx64
-rw-r--r--sc/inc/queryparam.hxx2
-rw-r--r--sc/inc/rangelst.hxx46
-rw-r--r--sc/inc/rangenam.hxx152
-rw-r--r--sc/inc/rangeseq.hxx22
-rw-r--r--sc/inc/rangeutl.hxx118
-rw-r--r--sc/inc/rechead.hxx194
-rw-r--r--sc/inc/recursionhelper.hxx4
-rw-r--r--sc/inc/refdata.hxx4
-rw-r--r--sc/inc/reffind.hxx22
-rw-r--r--sc/inc/refreshtimer.hxx48
-rw-r--r--sc/inc/reftokenhelper.hxx10
-rw-r--r--sc/inc/sc.hrc2108
-rw-r--r--sc/inc/scabstdlg.hxx212
-rw-r--r--sc/inc/scdll.hxx18
-rw-r--r--sc/inc/scerrors.hxx2
-rw-r--r--sc/inc/scextopt.hxx2
-rw-r--r--sc/inc/scfuncs.hrc562
-rw-r--r--sc/inc/scitems.hxx142
-rw-r--r--sc/inc/scmatrix.hxx19
-rw-r--r--sc/inc/scmod.hxx214
-rw-r--r--sc/inc/scresid.hxx4
-rw-r--r--sc/inc/scwarngs.hxx4
-rw-r--r--sc/inc/segmenttree.hxx2
-rw-r--r--sc/inc/servuno.hxx90
-rw-r--r--sc/inc/shapeuno.hxx44
-rw-r--r--sc/inc/sheetdata.hxx2
-rw-r--r--sc/inc/sheetevents.hxx4
-rw-r--r--sc/inc/shellids.hxx32
-rw-r--r--sc/inc/sortparam.hxx52
-rw-r--r--sc/inc/srchuno.hxx24
-rw-r--r--sc/inc/stlpool.hxx46
-rw-r--r--sc/inc/stlsheet.hxx26
-rw-r--r--sc/inc/stringutil.hxx12
-rw-r--r--sc/inc/strload.hxx2
-rw-r--r--sc/inc/styleuno.hxx78
-rw-r--r--sc/inc/subtotal.hxx12
-rw-r--r--sc/inc/table.hxx718
-rw-r--r--sc/inc/tablink.hxx46
-rw-r--r--sc/inc/tabopparams.hxx2
-rw-r--r--sc/inc/tabprotection.hxx18
-rw-r--r--sc/inc/targuno.hxx102
-rw-r--r--sc/inc/textuno.hxx154
-rw-r--r--sc/inc/token.hxx18
-rw-r--r--sc/inc/tokenarray.hxx4
-rw-r--r--sc/inc/tokenuno.hxx2
-rw-r--r--sc/inc/unitconv.hxx20
-rw-r--r--sc/inc/unoguard.hxx2
-rw-r--r--sc/inc/unonames.hxx862
-rw-r--r--sc/inc/unoreflist.hxx2
-rw-r--r--sc/inc/unowids.hxx68
-rw-r--r--sc/inc/userdat.hxx20
-rw-r--r--sc/inc/userlist.hxx36
-rw-r--r--sc/inc/validat.hxx90
-rw-r--r--sc/inc/viewopti.hxx64
-rw-r--r--sc/inc/viewuno.hxx94
-rw-r--r--sc/inc/waitoff.hxx6
-rw-r--r--sc/inc/warnpassword.hxx10
-rw-r--r--sc/inc/xmlwrap.hxx8
-rw-r--r--sc/inc/zforauto.hxx2
-rwxr-xr-xsc/qa/complex/calcPreview/ViewForwarder.java2
-rwxr-xr-xsc/qa/complex/cellRanges/CheckXCellRangesQuery.java6
-rw-r--r--sc/qa/complex/dataPilot/CheckDataPilot.java2
-rw-r--r--sc/qa/complex/dataPilot/interfaceTests/beans/_XPropertySet.java14
-rw-r--r--sc/qa/complex/dataPilot/interfaceTests/container/_XNamed.java6
-rw-r--r--sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotDescriptor.java2
-rw-r--r--sc/qa/complex/dataPilot/interfaceTests/sheet/_XDataPilotTable.java8
-rw-r--r--sc/qa/complex/sc/CalcRTL.java98
-rw-r--r--sc/sdi/app.sdi16
-rw-r--r--sc/sdi/auditsh.sdi16
-rw-r--r--sc/sdi/cellsh.sdi364
-rw-r--r--sc/sdi/chartsh.sdi2
-rw-r--r--sc/sdi/docsh.sdi96
-rw-r--r--sc/sdi/drawsh.sdi250
-rw-r--r--sc/sdi/drformsh.sdi2
-rw-r--r--sc/sdi/drtxtob.sdi168
-rw-r--r--sc/sdi/editsh.sdi76
-rw-r--r--sc/sdi/formatsh.sdi100
-rw-r--r--sc/sdi/graphsh.sdi4
-rw-r--r--sc/sdi/mediash.sdi2
-rw-r--r--sc/sdi/oleobjsh.sdi2
-rw-r--r--sc/sdi/pgbrksh.sdi2
-rw-r--r--sc/sdi/pivotsh.sdi8
-rw-r--r--sc/sdi/prevwsh.sdi44
-rw-r--r--sc/sdi/scalc.sdi8
-rw-r--r--sc/sdi/scslots.hrc2
-rw-r--r--sc/sdi/scslots.sdi2
-rw-r--r--sc/sdi/tabpopsh.sdi4
-rw-r--r--sc/sdi/tabvwsh.sdi230
-rw-r--r--sc/source/core/data/attarray.cxx312
-rw-r--r--sc/source/core/data/attrib.cxx156
-rw-r--r--sc/source/core/data/autonamecache.cxx2
-rw-r--r--sc/source/core/data/bcaslot.cxx38
-rw-r--r--sc/source/core/data/cell.cxx72
-rw-r--r--sc/source/core/data/cell2.cxx8
-rw-r--r--sc/source/core/data/clipparam.cxx2
-rw-r--r--sc/source/core/data/column.cxx158
-rw-r--r--sc/source/core/data/column2.cxx244
-rw-r--r--sc/source/core/data/column3.cxx252
-rw-r--r--sc/source/core/data/compressedarray.cxx4
-rw-r--r--sc/source/core/data/conditio.cxx168
-rw-r--r--sc/source/core/data/dbdocutl.cxx10
-rw-r--r--sc/source/core/data/dociter.cxx150
-rw-r--r--sc/source/core/data/docpool.cxx488
-rw-r--r--sc/source/core/data/documen2.cxx112
-rw-r--r--sc/source/core/data/documen3.cxx184
-rw-r--r--sc/source/core/data/documen4.cxx176
-rw-r--r--sc/source/core/data/documen5.cxx36
-rw-r--r--sc/source/core/data/documen6.cxx26
-rw-r--r--sc/source/core/data/documen7.cxx46
-rw-r--r--sc/source/core/data/documen8.cxx230
-rw-r--r--sc/source/core/data/documen9.cxx84
-rw-r--r--sc/source/core/data/document.cxx282
-rw-r--r--sc/source/core/data/dpcachetable.cxx30
-rw-r--r--sc/source/core/data/dpdimsave.cxx2
-rwxr-xr-xsc/source/core/data/dpglobal.cxx12
-rw-r--r--sc/source/core/data/dpgroup.cxx76
-rw-r--r--sc/source/core/data/dpobject.cxx244
-rwxr-xr-xsc/source/core/data/dpoutput.cxx252
-rw-r--r--sc/source/core/data/dpoutputgeometry.cxx2
-rw-r--r--sc/source/core/data/dpsave.cxx94
-rw-r--r--sc/source/core/data/dpsdbtab.cxx34
-rwxr-xr-xsc/source/core/data/dpshttab.cxx20
-rwxr-xr-xsc/source/core/data/dptabdat.cxx64
-rwxr-xr-xsc/source/core/data/dptablecache.cxx180
-rwxr-xr-xsc/source/core/data/dptabres.cxx330
-rwxr-xr-xsc/source/core/data/dptabsrc.cxx396
-rw-r--r--sc/source/core/data/drawpage.cxx2
-rw-r--r--sc/source/core/data/drwlayer.cxx274
-rw-r--r--sc/source/core/data/fillinfo.cxx178
-rw-r--r--sc/source/core/data/global.cxx250
-rw-r--r--sc/source/core/data/global2.cxx348
-rw-r--r--sc/source/core/data/globalx.cxx6
-rw-r--r--sc/source/core/data/markarr.cxx18
-rw-r--r--sc/source/core/data/markdata.cxx52
-rw-r--r--sc/source/core/data/olinetab.cxx2
-rw-r--r--sc/source/core/data/pagepar.cxx18
-rw-r--r--sc/source/core/data/patattr.cxx168
-rw-r--r--sc/source/core/data/pivot2.cxx4
-rw-r--r--sc/source/core/data/poolhelp.cxx14
-rw-r--r--sc/source/core/data/postit.cxx2
-rw-r--r--sc/source/core/data/scdpoutputimpl.cxx50
-rwxr-xr-xsc/source/core/data/scdpoutputimpl.hxx54
-rw-r--r--sc/source/core/data/segmenttree.cxx10
-rw-r--r--sc/source/core/data/sheetevents.cxx2
-rw-r--r--sc/source/core/data/sortparam.cxx112
-rw-r--r--sc/source/core/data/stlpool.cxx114
-rw-r--r--sc/source/core/data/stlsheet.cxx78
-rw-r--r--sc/source/core/data/tabbgcolor.cxx18
-rw-r--r--sc/source/core/data/table1.cxx166
-rw-r--r--sc/source/core/data/table2.cxx234
-rw-r--r--sc/source/core/data/table3.cxx250
-rw-r--r--sc/source/core/data/table4.cxx160
-rw-r--r--sc/source/core/data/table5.cxx62
-rw-r--r--sc/source/core/data/table6.cxx68
-rw-r--r--sc/source/core/data/tabprotection.cxx10
-rw-r--r--sc/source/core/data/userdat.cxx2
-rw-r--r--sc/source/core/data/validat.cxx132
-rw-r--r--sc/source/core/inc/addinhelpid.hxx2
-rw-r--r--sc/source/core/inc/addinlis.hxx28
-rw-r--r--sc/source/core/inc/adiasync.hxx38
-rw-r--r--sc/source/core/inc/bcaslot.hxx84
-rw-r--r--sc/source/core/inc/cellkeytranslator.hxx16
-rw-r--r--sc/source/core/inc/core_pch.hxx10
-rw-r--r--sc/source/core/inc/ddelink.hxx40
-rw-r--r--sc/source/core/inc/doubleref.hxx52
-rw-r--r--sc/source/core/inc/interpre.hxx12
-rw-r--r--sc/source/core/inc/jumpmatrix.hxx2
-rw-r--r--sc/source/core/inc/parclass.hxx10
-rw-r--r--sc/source/core/inc/poolhelp.hxx24
-rw-r--r--sc/source/core/inc/refupdat.hxx10
-rw-r--r--sc/source/core/inc/scrdata.hxx2
-rw-r--r--sc/source/core/src/compiler.src2
-rw-r--r--sc/source/core/tool/addincfg.cxx2
-rw-r--r--sc/source/core/tool/addincol.cxx4
-rw-r--r--sc/source/core/tool/addinhelpid.cxx2
-rw-r--r--sc/source/core/tool/addinlis.cxx38
-rw-r--r--sc/source/core/tool/address.cxx94
-rw-r--r--sc/source/core/tool/adiasync.cxx12
-rw-r--r--sc/source/core/tool/appoptio.cxx126
-rw-r--r--sc/source/core/tool/autoform.cxx60
-rw-r--r--sc/source/core/tool/callform.cxx96
-rw-r--r--sc/source/core/tool/cellform.cxx4
-rw-r--r--sc/source/core/tool/cellkeytranslator.cxx14
-rw-r--r--sc/source/core/tool/chartarr.cxx126
-rw-r--r--sc/source/core/tool/charthelper.cxx8
-rw-r--r--sc/source/core/tool/chartlis.cxx54
-rw-r--r--sc/source/core/tool/chartlock.cxx2
-rw-r--r--sc/source/core/tool/chartpos.cxx62
-rw-r--r--sc/source/core/tool/chgtrack.cxx220
-rw-r--r--sc/source/core/tool/chgviset.cxx56
-rw-r--r--sc/source/core/tool/collect.cxx58
-rw-r--r--sc/source/core/tool/compiler.cxx32
-rw-r--r--sc/source/core/tool/consoli.cxx120
-rw-r--r--sc/source/core/tool/dbcolect.cxx418
-rw-r--r--sc/source/core/tool/ddelink.cxx84
-rw-r--r--sc/source/core/tool/detdata.cxx6
-rw-r--r--sc/source/core/tool/detfunc.cxx208
-rw-r--r--sc/source/core/tool/docoptio.cxx110
-rw-r--r--sc/source/core/tool/doubleref.cxx8
-rw-r--r--sc/source/core/tool/editutil.cxx82
-rw-r--r--sc/source/core/tool/filtopt.cxx20
-rw-r--r--sc/source/core/tool/formulaparserpool.cxx2
-rw-r--r--sc/source/core/tool/hints.cxx2
-rw-r--r--sc/source/core/tool/inputopt.cxx80
-rw-r--r--sc/source/core/tool/interpr1.cxx123
-rw-r--r--sc/source/core/tool/interpr2.cxx14
-rw-r--r--sc/source/core/tool/interpr3.cxx34
-rw-r--r--sc/source/core/tool/interpr4.cxx71
-rw-r--r--sc/source/core/tool/interpr5.cxx43
-rw-r--r--sc/source/core/tool/interpr6.cxx8
-rw-r--r--sc/source/core/tool/lookupcache.cxx2
-rw-r--r--sc/source/core/tool/navicfg.cxx12
-rw-r--r--sc/source/core/tool/odffmap.cxx2
-rw-r--r--sc/source/core/tool/optutil.cxx8
-rw-r--r--sc/source/core/tool/parclass.cxx2
-rw-r--r--sc/source/core/tool/printopt.cxx22
-rw-r--r--sc/source/core/tool/prnsave.cxx6
-rw-r--r--sc/source/core/tool/progress.cxx32
-rw-r--r--sc/source/core/tool/queryparam.cxx6
-rw-r--r--sc/source/core/tool/rangelst.cxx106
-rw-r--r--sc/source/core/tool/rangenam.cxx138
-rw-r--r--sc/source/core/tool/rangeseq.cxx16
-rw-r--r--sc/source/core/tool/rangeutl.cxx218
-rw-r--r--sc/source/core/tool/rechead.cxx12
-rw-r--r--sc/source/core/tool/refdata.cxx22
-rw-r--r--sc/source/core/tool/reffind.cxx24
-rw-r--r--sc/source/core/tool/refreshtimer.cxx2
-rw-r--r--sc/source/core/tool/reftokenhelper.cxx2
-rw-r--r--sc/source/core/tool/refupdat.cxx78
-rw-r--r--sc/source/core/tool/scmatrix.cxx33
-rw-r--r--sc/source/core/tool/stringutil.cxx2
-rw-r--r--sc/source/core/tool/subtotal.cxx2
-rw-r--r--sc/source/core/tool/token.cxx28
-rw-r--r--sc/source/core/tool/unitconv.cxx18
-rw-r--r--sc/source/core/tool/userlist.cxx10
-rw-r--r--sc/source/core/tool/viewopti.cxx266
-rw-r--r--sc/source/core/tool/zforauto.cxx16
-rw-r--r--sc/source/filter/dif/difexp.cxx48
-rw-r--r--sc/source/filter/dif/difimp.cxx144
-rw-r--r--sc/source/filter/excel/colrowst.cxx2
-rw-r--r--sc/source/filter/excel/excdoc.cxx10
-rw-r--r--sc/source/filter/excel/excel.cxx2
-rw-r--r--sc/source/filter/excel/excform.cxx476
-rw-r--r--sc/source/filter/excel/excform8.cxx438
-rw-r--r--sc/source/filter/excel/excimp8.cxx34
-rw-r--r--sc/source/filter/excel/excrecds.cxx84
-rw-r--r--sc/source/filter/excel/exctools.cxx82
-rw-r--r--sc/source/filter/excel/expop2.cxx6
-rw-r--r--sc/source/filter/excel/fontbuff.cxx40
-rw-r--r--sc/source/filter/excel/frmbase.cxx16
-rw-r--r--sc/source/filter/excel/impop.cxx102
-rw-r--r--sc/source/filter/excel/namebuff.cxx38
-rw-r--r--sc/source/filter/excel/read.cxx222
-rw-r--r--sc/source/filter/excel/tokstack.cxx122
-rw-r--r--sc/source/filter/excel/xechart.cxx2
-rw-r--r--sc/source/filter/excel/xecontent.cxx18
-rw-r--r--sc/source/filter/excel/xeescher.cxx2
-rw-r--r--sc/source/filter/excel/xeformula.cxx2
-rw-r--r--sc/source/filter/excel/xehelper.cxx2
-rw-r--r--sc/source/filter/excel/xelink.cxx2
-rw-r--r--sc/source/filter/excel/xename.cxx2
-rw-r--r--sc/source/filter/excel/xepage.cxx12
-rw-r--r--sc/source/filter/excel/xepivot.cxx12
-rw-r--r--sc/source/filter/excel/xerecord.cxx2
-rw-r--r--sc/source/filter/excel/xestream.cxx2
-rw-r--r--sc/source/filter/excel/xestring.cxx12
-rw-r--r--sc/source/filter/excel/xestyle.cxx2
-rw-r--r--sc/source/filter/excel/xetable.cxx22
-rw-r--r--sc/source/filter/excel/xeview.cxx4
-rwxr-xr-xsc/source/filter/excel/xichart.cxx4
-rw-r--r--sc/source/filter/excel/xicontent.cxx8
-rw-r--r--sc/source/filter/excel/xiescher.cxx28
-rw-r--r--sc/source/filter/excel/xiformula.cxx2
-rw-r--r--sc/source/filter/excel/xilink.cxx2
-rw-r--r--sc/source/filter/excel/xiname.cxx2
-rw-r--r--sc/source/filter/excel/xipage.cxx2
-rw-r--r--sc/source/filter/excel/xipivot.cxx8
-rw-r--r--sc/source/filter/excel/xiroot.cxx2
-rw-r--r--sc/source/filter/excel/xistream.cxx2
-rw-r--r--sc/source/filter/excel/xistring.cxx2
-rw-r--r--sc/source/filter/excel/xistyle.cxx2
-rw-r--r--sc/source/filter/excel/xiview.cxx2
-rw-r--r--sc/source/filter/excel/xladdress.cxx2
-rwxr-xr-xsc/source/filter/excel/xlchart.cxx4
-rw-r--r--sc/source/filter/excel/xlescher.cxx2
-rw-r--r--sc/source/filter/excel/xlformula.cxx2
-rw-r--r--sc/source/filter/excel/xlpage.cxx12
-rw-r--r--sc/source/filter/excel/xlpivot.cxx4
-rw-r--r--sc/source/filter/excel/xlroot.cxx2
-rw-r--r--sc/source/filter/excel/xlstyle.cxx2
-rw-r--r--sc/source/filter/excel/xltools.cxx2
-rw-r--r--sc/source/filter/excel/xltracer.cxx4
-rw-r--r--sc/source/filter/excel/xlview.cxx2
-rw-r--r--sc/source/filter/ftools/fapihelper.cxx2
-rw-r--r--sc/source/filter/ftools/fprogressbar.cxx2
-rw-r--r--sc/source/filter/ftools/ftools.cxx2
-rw-r--r--sc/source/filter/html/htmlexp.cxx172
-rw-r--r--sc/source/filter/html/htmlexp2.cxx14
-rw-r--r--sc/source/filter/html/htmlimp.cxx6
-rw-r--r--sc/source/filter/html/htmlpars.cxx2
-rw-r--r--sc/source/filter/inc/XclExpChangeTrack.hxx320
-rw-r--r--sc/source/filter/inc/XclImpChangeTrack.hxx86
-rw-r--r--sc/source/filter/inc/biff.hxx12
-rw-r--r--sc/source/filter/inc/colrowst.hxx2
-rw-r--r--sc/source/filter/inc/decl.h2
-rw-r--r--sc/source/filter/inc/dif.hxx96
-rw-r--r--sc/source/filter/inc/eeimport.hxx2
-rw-r--r--sc/source/filter/inc/eeparser.hxx84
-rw-r--r--sc/source/filter/inc/excdefs.hxx52
-rw-r--r--sc/source/filter/inc/excdoc.hxx22
-rw-r--r--sc/source/filter/inc/excform.hxx32
-rw-r--r--sc/source/filter/inc/excimp8.hxx90
-rw-r--r--sc/source/filter/inc/excrecds.hxx120
-rw-r--r--sc/source/filter/inc/excscen.hxx44
-rw-r--r--sc/source/filter/inc/exp_op.hxx76
-rw-r--r--sc/source/filter/inc/expbase.hxx24
-rw-r--r--sc/source/filter/inc/fapihelper.hxx2
-rw-r--r--sc/source/filter/inc/filt_pch.hxx10
-rw-r--r--sc/source/filter/inc/fkttab.h2
-rw-r--r--sc/source/filter/inc/flttypes.hxx2
-rw-r--r--sc/source/filter/inc/formel.hxx96
-rw-r--r--sc/source/filter/inc/fprogressbar.hxx2
-rw-r--r--sc/source/filter/inc/ftools.hxx12
-rw-r--r--sc/source/filter/inc/funktion.h32
-rw-r--r--sc/source/filter/inc/htmlexp.hxx110
-rw-r--r--sc/source/filter/inc/htmlimp.hxx8
-rw-r--r--sc/source/filter/inc/htmlpars.hxx120
-rw-r--r--sc/source/filter/inc/imp_op.hxx114
-rw-r--r--sc/source/filter/inc/lotattr.hxx68
-rw-r--r--sc/source/filter/inc/lotfntbf.hxx40
-rw-r--r--sc/source/filter/inc/lotform.hxx90
-rw-r--r--sc/source/filter/inc/lotimpop.hxx76
-rw-r--r--sc/source/filter/inc/lotrange.hxx54
-rw-r--r--sc/source/filter/inc/namebuff.hxx116
-rw-r--r--sc/source/filter/inc/op.h10
-rw-r--r--sc/source/filter/inc/optab.h10
-rw-r--r--sc/source/filter/inc/otlnbuff.hxx32
-rw-r--r--sc/source/filter/inc/qpro.hxx2
-rw-r--r--sc/source/filter/inc/qproform.hxx44
-rw-r--r--sc/source/filter/inc/qprostyle.hxx2
-rw-r--r--sc/source/filter/inc/root.hxx40
-rw-r--r--sc/source/filter/inc/rtfexp.hxx16
-rw-r--r--sc/source/filter/inc/rtfimp.hxx2
-rw-r--r--sc/source/filter/inc/rtfparse.hxx44
-rw-r--r--sc/source/filter/inc/scflt.hxx842
-rw-r--r--sc/source/filter/inc/scfobj.hxx2
-rw-r--r--sc/source/filter/inc/scmem.h2
-rw-r--r--sc/source/filter/inc/tokstack.hxx198
-rw-r--r--sc/source/filter/inc/tool.h62
-rw-r--r--sc/source/filter/inc/xcl97dum.hxx2
-rw-r--r--sc/source/filter/inc/xcl97esc.hxx14
-rw-r--r--sc/source/filter/inc/xcl97rec.hxx126
-rw-r--r--sc/source/filter/inc/xechart.hxx2
-rw-r--r--sc/source/filter/inc/xecontent.hxx2
-rw-r--r--sc/source/filter/inc/xeescher.hxx2
-rw-r--r--sc/source/filter/inc/xeformula.hxx2
-rw-r--r--sc/source/filter/inc/xehelper.hxx2
-rw-r--r--sc/source/filter/inc/xename.hxx2
-rw-r--r--sc/source/filter/inc/xepage.hxx2
-rw-r--r--sc/source/filter/inc/xepivot.hxx2
-rw-r--r--sc/source/filter/inc/xerecord.hxx2
-rw-r--r--sc/source/filter/inc/xestream.hxx2
-rw-r--r--sc/source/filter/inc/xestring.hxx4
-rw-r--r--sc/source/filter/inc/xestyle.hxx2
-rw-r--r--sc/source/filter/inc/xetable.hxx8
-rw-r--r--sc/source/filter/inc/xeview.hxx2
-rw-r--r--sc/source/filter/inc/xichart.hxx2
-rw-r--r--sc/source/filter/inc/xicontent.hxx2
-rw-r--r--sc/source/filter/inc/xiescher.hxx2
-rw-r--r--sc/source/filter/inc/xiformula.hxx12
-rw-r--r--sc/source/filter/inc/xilink.hxx2
-rw-r--r--sc/source/filter/inc/xiname.hxx2
-rw-r--r--sc/source/filter/inc/xipage.hxx2
-rw-r--r--sc/source/filter/inc/xipivot.hxx2
-rw-r--r--sc/source/filter/inc/xiroot.hxx2
-rw-r--r--sc/source/filter/inc/xistream.hxx2
-rw-r--r--sc/source/filter/inc/xistring.hxx2
-rw-r--r--sc/source/filter/inc/xistyle.hxx2
-rw-r--r--sc/source/filter/inc/xiview.hxx2
-rw-r--r--sc/source/filter/inc/xladdress.hxx2
-rwxr-xr-xsc/source/filter/inc/xlchart.hxx4
-rw-r--r--sc/source/filter/inc/xlconst.hxx2
-rw-r--r--sc/source/filter/inc/xlcontent.hxx2
-rw-r--r--sc/source/filter/inc/xlescher.hxx2
-rw-r--r--sc/source/filter/inc/xlformula.hxx2
-rw-r--r--sc/source/filter/inc/xllink.hxx2
-rw-r--r--sc/source/filter/inc/xlname.hxx2
-rw-r--r--sc/source/filter/inc/xlpage.hxx2
-rw-r--r--sc/source/filter/inc/xlpivot.hxx4
-rw-r--r--sc/source/filter/inc/xlroot.hxx2
-rw-r--r--sc/source/filter/inc/xlstream.hxx2
-rw-r--r--sc/source/filter/inc/xlstring.hxx2
-rw-r--r--sc/source/filter/inc/xlstyle.hxx2
-rw-r--r--sc/source/filter/inc/xltable.hxx2
-rw-r--r--sc/source/filter/inc/xltools.hxx4
-rw-r--r--sc/source/filter/inc/xltracer.hxx2
-rw-r--r--sc/source/filter/inc/xlview.hxx6
-rw-r--r--sc/source/filter/lotus/expop.cxx80
-rw-r--r--sc/source/filter/lotus/export.cxx2
-rw-r--r--sc/source/filter/lotus/filter.cxx46
-rw-r--r--sc/source/filter/lotus/lotattr.cxx36
-rw-r--r--sc/source/filter/lotus/lotform.cxx2680
-rw-r--r--sc/source/filter/lotus/lotimpop.cxx98
-rw-r--r--sc/source/filter/lotus/lotread.cxx108
-rw-r--r--sc/source/filter/lotus/lotus.cxx10
-rw-r--r--sc/source/filter/lotus/memory.cxx52
-rw-r--r--sc/source/filter/lotus/op.cxx122
-rw-r--r--sc/source/filter/lotus/optab.cxx410
-rw-r--r--sc/source/filter/lotus/tool.cxx94
-rw-r--r--sc/source/filter/qpro/biff.cxx2
-rw-r--r--sc/source/filter/qpro/qpro.cxx2
-rw-r--r--sc/source/filter/qpro/qproform.cxx6
-rw-r--r--sc/source/filter/qpro/qprostyle.cxx2
-rw-r--r--sc/source/filter/rtf/eeimpars.cxx36
-rw-r--r--sc/source/filter/rtf/expbase.cxx2
-rw-r--r--sc/source/filter/rtf/rtfexp.cxx48
-rw-r--r--sc/source/filter/rtf/rtfimp.cxx2
-rw-r--r--sc/source/filter/rtf/rtfparse.cxx52
-rw-r--r--sc/source/filter/starcalc/scflt.cxx300
-rw-r--r--sc/source/filter/starcalc/scfobj.cxx6
-rw-r--r--sc/source/filter/xcl97/XclExpChangeTrack.cxx98
-rw-r--r--sc/source/filter/xcl97/XclImpChangeTrack.cxx28
-rw-r--r--sc/source/filter/xcl97/xcl97dum.cxx34
-rw-r--r--sc/source/filter/xcl97/xcl97esc.cxx8
-rw-r--r--sc/source/filter/xcl97/xcl97rec.cxx96
-rw-r--r--sc/source/filter/xml/XMLCalculationSettingsContext.cxx2
-rw-r--r--sc/source/filter/xml/XMLCalculationSettingsContext.hxx2
-rw-r--r--sc/source/filter/xml/XMLCellRangeSourceContext.cxx8
-rw-r--r--sc/source/filter/xml/XMLCellRangeSourceContext.hxx26
-rw-r--r--sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx16
-rw-r--r--sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx10
-rw-r--r--sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx12
-rw-r--r--sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx42
-rwxr-xr-xsc/source/filter/xml/XMLCodeNameProvider.cxx16
-rwxr-xr-xsc/source/filter/xml/XMLCodeNameProvider.hxx10
-rw-r--r--sc/source/filter/xml/XMLColumnRowGroupExport.cxx8
-rw-r--r--sc/source/filter/xml/XMLColumnRowGroupExport.hxx16
-rw-r--r--sc/source/filter/xml/XMLConsolidationContext.cxx14
-rw-r--r--sc/source/filter/xml/XMLConsolidationContext.hxx24
-rw-r--r--sc/source/filter/xml/XMLConverter.cxx56
-rw-r--r--sc/source/filter/xml/XMLConverter.hxx26
-rw-r--r--sc/source/filter/xml/XMLDDELinksContext.cxx40
-rw-r--r--sc/source/filter/xml/XMLDDELinksContext.hxx36
-rw-r--r--sc/source/filter/xml/XMLDetectiveContext.cxx26
-rw-r--r--sc/source/filter/xml/XMLDetectiveContext.hxx72
-rw-r--r--sc/source/filter/xml/XMLEmptyContext.cxx2
-rw-r--r--sc/source/filter/xml/XMLEmptyContext.hxx6
-rw-r--r--sc/source/filter/xml/XMLExportDDELinks.cxx2
-rw-r--r--sc/source/filter/xml/XMLExportDDELinks.hxx10
-rw-r--r--sc/source/filter/xml/XMLExportDataPilot.cxx4
-rw-r--r--sc/source/filter/xml/XMLExportDataPilot.hxx6
-rw-r--r--sc/source/filter/xml/XMLExportDatabaseRanges.cxx28
-rw-r--r--sc/source/filter/xml/XMLExportDatabaseRanges.hxx6
-rw-r--r--sc/source/filter/xml/XMLExportIterator.cxx12
-rw-r--r--sc/source/filter/xml/XMLExportIterator.hxx286
-rw-r--r--sc/source/filter/xml/XMLExportSharedData.cxx2
-rw-r--r--sc/source/filter/xml/XMLExportSharedData.hxx16
-rw-r--r--sc/source/filter/xml/XMLStylesExportHelper.cxx8
-rw-r--r--sc/source/filter/xml/XMLStylesExportHelper.hxx148
-rw-r--r--sc/source/filter/xml/XMLStylesImportHelper.cxx2
-rw-r--r--sc/source/filter/xml/XMLStylesImportHelper.hxx64
-rw-r--r--sc/source/filter/xml/XMLTableHeaderFooterContext.cxx2
-rw-r--r--sc/source/filter/xml/XMLTableHeaderFooterContext.hxx28
-rw-r--r--sc/source/filter/xml/XMLTableMasterPageExport.cxx2
-rw-r--r--sc/source/filter/xml/XMLTableMasterPageExport.hxx4
-rw-r--r--sc/source/filter/xml/XMLTableShapeImportHelper.cxx2
-rw-r--r--sc/source/filter/xml/XMLTableShapeImportHelper.hxx2
-rw-r--r--sc/source/filter/xml/XMLTableShapeResizer.cxx8
-rw-r--r--sc/source/filter/xml/XMLTableShapeResizer.hxx16
-rw-r--r--sc/source/filter/xml/XMLTableShapesContext.cxx2
-rw-r--r--sc/source/filter/xml/XMLTableShapesContext.hxx2
-rw-r--r--sc/source/filter/xml/XMLTableSourceContext.cxx2
-rw-r--r--sc/source/filter/xml/XMLTableSourceContext.hxx14
-rw-r--r--sc/source/filter/xml/XMLTextPContext.cxx4
-rw-r--r--sc/source/filter/xml/XMLTextPContext.hxx12
-rw-r--r--sc/source/filter/xml/XMLTrackedChangesContext.cxx116
-rw-r--r--sc/source/filter/xml/XMLTrackedChangesContext.hxx4
-rw-r--r--sc/source/filter/xml/sheetdata.cxx2
-rw-r--r--sc/source/filter/xml/xmlannoi.cxx4
-rw-r--r--sc/source/filter/xml/xmlannoi.hxx2
-rw-r--r--sc/source/filter/xml/xmlbodyi.cxx32
-rw-r--r--sc/source/filter/xml/xmlbodyi.hxx8
-rw-r--r--sc/source/filter/xml/xmlcelli.cxx10
-rw-r--r--sc/source/filter/xml/xmlcelli.hxx36
-rw-r--r--sc/source/filter/xml/xmlcoli.cxx6
-rw-r--r--sc/source/filter/xml/xmlcoli.hxx24
-rw-r--r--sc/source/filter/xml/xmlconti.cxx2
-rw-r--r--sc/source/filter/xml/xmlconti.hxx2
-rw-r--r--sc/source/filter/xml/xmlcvali.cxx28
-rw-r--r--sc/source/filter/xml/xmlcvali.hxx2
-rw-r--r--sc/source/filter/xml/xmldpimp.cxx28
-rw-r--r--sc/source/filter/xml/xmldpimp.hxx116
-rw-r--r--sc/source/filter/xml/xmldrani.cxx8
-rw-r--r--sc/source/filter/xml/xmldrani.hxx56
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx142
-rw-r--r--sc/source/filter/xml/xmlexprt.hxx86
-rw-r--r--sc/source/filter/xml/xmlexternaltabi.cxx16
-rw-r--r--sc/source/filter/xml/xmlexternaltabi.hxx2
-rw-r--r--sc/source/filter/xml/xmlfilti.cxx8
-rw-r--r--sc/source/filter/xml/xmlfilti.hxx62
-rw-r--r--sc/source/filter/xml/xmlfonte.cxx2
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx436
-rw-r--r--sc/source/filter/xml/xmlimprt.hxx288
-rw-r--r--sc/source/filter/xml/xmllabri.cxx18
-rw-r--r--sc/source/filter/xml/xmllabri.hxx28
-rw-r--r--sc/source/filter/xml/xmlnexpi.cxx8
-rw-r--r--sc/source/filter/xml/xmlnexpi.hxx2
-rw-r--r--sc/source/filter/xml/xmlrowi.cxx6
-rw-r--r--sc/source/filter/xml/xmlrowi.hxx2
-rw-r--r--sc/source/filter/xml/xmlsceni.cxx4
-rw-r--r--sc/source/filter/xml/xmlsceni.hxx18
-rw-r--r--sc/source/filter/xml/xmlsorti.cxx2
-rw-r--r--sc/source/filter/xml/xmlsorti.hxx24
-rw-r--r--sc/source/filter/xml/xmlstyle.cxx64
-rw-r--r--sc/source/filter/xml/xmlstyle.hxx102
-rw-r--r--sc/source/filter/xml/xmlstyli.cxx10
-rw-r--r--sc/source/filter/xml/xmlstyli.hxx34
-rw-r--r--sc/source/filter/xml/xmlsubti.cxx12
-rw-r--r--sc/source/filter/xml/xmlsubti.hxx140
-rw-r--r--sc/source/filter/xml/xmltabi.cxx22
-rw-r--r--sc/source/filter/xml/xmltabi.hxx6
-rw-r--r--sc/source/filter/xml/xmlwrap.cxx18
-rw-r--r--sc/source/ui/Accessibility/AccessibilityHints.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessibleCell.cxx6
-rw-r--r--sc/source/ui/Accessibility/AccessibleCellBase.cxx6
-rw-r--r--sc/source/ui/Accessibility/AccessibleContextBase.cxx24
-rw-r--r--sc/source/ui/Accessibility/AccessibleCsvControl.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx30
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocument.cxx22
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocumentBase.cxx6
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx28
-rw-r--r--sc/source/ui/Accessibility/AccessibleEditObject.cxx8
-rw-r--r--sc/source/ui/Accessibility/AccessibleFilterMenu.cxx34
-rw-r--r--sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx12
-rw-r--r--sc/source/ui/Accessibility/AccessibleGlobal.cxx6
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeader.cxx12
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx12
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewCell.cxx8
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx16
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewTable.cxx38
-rw-r--r--sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx10
-rw-r--r--sc/source/ui/Accessibility/AccessibleTableBase.cxx10
-rw-r--r--sc/source/ui/Accessibility/AccessibleText.cxx130
-rw-r--r--sc/source/ui/Accessibility/DrawModelBroadcaster.cxx4
-rw-r--r--sc/source/ui/app/client.cxx12
-rw-r--r--sc/source/ui/app/drwtrans.cxx2
-rw-r--r--sc/source/ui/app/inputhdl.cxx708
-rw-r--r--sc/source/ui/app/inputwin.cxx316
-rw-r--r--sc/source/ui/app/lnktrans.cxx4
-rw-r--r--sc/source/ui/app/msgpool.cxx68
-rw-r--r--sc/source/ui/app/rfindlst.cxx6
-rw-r--r--sc/source/ui/app/scdll.cxx242
-rw-r--r--sc/source/ui/app/scmod.cxx350
-rw-r--r--sc/source/ui/app/scmod2.cxx12
-rw-r--r--sc/source/ui/app/seltrans.cxx58
-rw-r--r--sc/source/ui/app/template.cxx2
-rw-r--r--sc/source/ui/app/transobj.cxx124
-rw-r--r--sc/source/ui/app/typemap.cxx6
-rw-r--r--sc/source/ui/app/uiitems.cxx116
-rw-r--r--sc/source/ui/app/wtcdummy.cxx2
-rw-r--r--sc/source/ui/attrdlg/attrdlg.cxx22
-rw-r--r--sc/source/ui/attrdlg/condfrmt.cxx128
-rw-r--r--sc/source/ui/attrdlg/scabstdlg.cxx4
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.cxx180
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.hxx262
-rw-r--r--sc/source/ui/attrdlg/scuiexp.cxx4
-rw-r--r--sc/source/ui/attrdlg/tabpages.cxx70
-rw-r--r--sc/source/ui/cctrl/cbuttonw.cxx36
-rw-r--r--sc/source/ui/cctrl/dpcontrol.cxx62
-rw-r--r--sc/source/ui/cctrl/dpcontrol.src2
-rw-r--r--sc/source/ui/cctrl/editfield.cxx2
-rw-r--r--sc/source/ui/cctrl/popmenu.cxx2
-rw-r--r--sc/source/ui/cctrl/tbinsert.cxx28
-rw-r--r--sc/source/ui/cctrl/tbzoomsliderctrl.cxx32
-rw-r--r--sc/source/ui/dbgui/asciiopt.cxx118
-rw-r--r--sc/source/ui/dbgui/asciiopt.hrc38
-rw-r--r--sc/source/ui/dbgui/asciiopt.src2
-rw-r--r--sc/source/ui/dbgui/consdlg.cxx186
-rw-r--r--sc/source/ui/dbgui/consdlg.hrc4
-rw-r--r--sc/source/ui/dbgui/consdlg.src2
-rw-r--r--sc/source/ui/dbgui/csvcontrol.cxx2
-rw-r--r--sc/source/ui/dbgui/csvgrid.cxx2
-rw-r--r--sc/source/ui/dbgui/csvruler.cxx2
-rw-r--r--sc/source/ui/dbgui/csvsplits.cxx2
-rw-r--r--sc/source/ui/dbgui/csvtablebox.cxx2
-rw-r--r--sc/source/ui/dbgui/dapidata.cxx40
-rw-r--r--sc/source/ui/dbgui/dapitype.cxx18
-rw-r--r--sc/source/ui/dbgui/dapitype.hrc46
-rw-r--r--sc/source/ui/dbgui/dapitype.src2
-rw-r--r--sc/source/ui/dbgui/dbnamdlg.cxx216
-rw-r--r--sc/source/ui/dbgui/dpgroupdlg.cxx2
-rw-r--r--sc/source/ui/dbgui/dpgroupdlg.hrc2
-rw-r--r--sc/source/ui/dbgui/dpgroupdlg.src2
-rw-r--r--sc/source/ui/dbgui/expftext.cxx30
-rw-r--r--sc/source/ui/dbgui/fieldwnd.cxx10
-rw-r--r--sc/source/ui/dbgui/filtdlg.cxx330
-rw-r--r--sc/source/ui/dbgui/foptmgr.cxx116
-rw-r--r--sc/source/ui/dbgui/imoptdlg.cxx12
-rw-r--r--sc/source/ui/dbgui/imoptdlg.hrc22
-rw-r--r--sc/source/ui/dbgui/imoptdlg.src4
-rw-r--r--sc/source/ui/dbgui/outline.src2
-rw-r--r--sc/source/ui/dbgui/pfiltdlg.cxx220
-rw-r--r--sc/source/ui/dbgui/pivot.hrc26
-rw-r--r--sc/source/ui/dbgui/pivot.src2
-rw-r--r--sc/source/ui/dbgui/pvfundlg.cxx4
-rw-r--r--sc/source/ui/dbgui/pvfundlg.hrc4
-rw-r--r--sc/source/ui/dbgui/pvfundlg.src2
-rw-r--r--sc/source/ui/dbgui/pvglob.hxx2
-rw-r--r--sc/source/ui/dbgui/pvlaydlg.cxx142
-rw-r--r--sc/source/ui/dbgui/scendlg.cxx50
-rw-r--r--sc/source/ui/dbgui/scendlg.hrc2
-rw-r--r--sc/source/ui/dbgui/scendlg.src2
-rw-r--r--sc/source/ui/dbgui/scuiasciiopt.cxx80
-rw-r--r--sc/source/ui/dbgui/scuiimoptdlg.cxx46
-rw-r--r--sc/source/ui/dbgui/sfiltdlg.cxx128
-rw-r--r--sc/source/ui/dbgui/sortdlg.cxx20
-rw-r--r--sc/source/ui/dbgui/subtdlg.cxx8
-rw-r--r--sc/source/ui/dbgui/textimportoptions.cxx4
-rw-r--r--sc/source/ui/dbgui/textimportoptions.src8
-rw-r--r--sc/source/ui/dbgui/tpsort.cxx272
-rw-r--r--sc/source/ui/dbgui/tpsubt.cxx254
-rw-r--r--sc/source/ui/dbgui/validate.cxx96
-rw-r--r--sc/source/ui/dbgui/validate.src8
-rw-r--r--sc/source/ui/docshell/arealink.cxx124
-rw-r--r--sc/source/ui/docshell/autostyl.cxx48
-rw-r--r--sc/source/ui/docshell/dbdocfun.cxx302
-rw-r--r--sc/source/ui/docshell/dbdocimp.cxx132
-rw-r--r--sc/source/ui/docshell/docfunc.cxx396
-rw-r--r--sc/source/ui/docshell/docsh.cxx370
-rw-r--r--sc/source/ui/docshell/docsh2.cxx32
-rw-r--r--sc/source/ui/docshell/docsh3.cxx170
-rw-r--r--sc/source/ui/docshell/docsh4.cxx300
-rw-r--r--sc/source/ui/docshell/docsh5.cxx142
-rw-r--r--sc/source/ui/docshell/docsh6.cxx80
-rw-r--r--sc/source/ui/docshell/docsh7.cxx4
-rw-r--r--sc/source/ui/docshell/docsh8.cxx104
-rw-r--r--sc/source/ui/docshell/docshimp.hxx2
-rw-r--r--sc/source/ui/docshell/editable.cxx6
-rw-r--r--sc/source/ui/docshell/externalrefmgr.cxx18
-rw-r--r--sc/source/ui/docshell/hiranges.cxx2
-rw-r--r--sc/source/ui/docshell/impex.cxx154
-rw-r--r--sc/source/ui/docshell/olinefun.cxx64
-rw-r--r--sc/source/ui/docshell/pagedata.cxx4
-rw-r--r--sc/source/ui/docshell/pntlock.cxx2
-rw-r--r--sc/source/ui/docshell/servobj.cxx32
-rw-r--r--sc/source/ui/docshell/sizedev.cxx4
-rw-r--r--sc/source/ui/docshell/tablink.cxx84
-rw-r--r--sc/source/ui/docshell/tpstat.cxx24
-rw-r--r--sc/source/ui/docshell/tpstat.hrc14
-rw-r--r--sc/source/ui/docshell/tpstat.src4
-rw-r--r--sc/source/ui/drawfunc/chartsh.cxx2
-rw-r--r--sc/source/ui/drawfunc/drawsh.cxx58
-rw-r--r--sc/source/ui/drawfunc/drawsh2.cxx48
-rw-r--r--sc/source/ui/drawfunc/drawsh4.cxx14
-rw-r--r--sc/source/ui/drawfunc/drawsh5.cxx14
-rw-r--r--sc/source/ui/drawfunc/drformsh.cxx2
-rw-r--r--sc/source/ui/drawfunc/drformsh.src10
-rw-r--r--sc/source/ui/drawfunc/drtxtob.cxx118
-rw-r--r--sc/source/ui/drawfunc/drtxtob1.cxx16
-rw-r--r--sc/source/ui/drawfunc/drtxtob2.cxx54
-rw-r--r--sc/source/ui/drawfunc/fuconarc.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuconcustomshape.cxx4
-rw-r--r--sc/source/ui/drawfunc/fuconpol.cxx18
-rw-r--r--sc/source/ui/drawfunc/fuconrec.cxx8
-rw-r--r--sc/source/ui/drawfunc/fuconstr.cxx24
-rw-r--r--sc/source/ui/drawfunc/fuconuno.cxx4
-rw-r--r--sc/source/ui/drawfunc/fudraw.cxx86
-rw-r--r--sc/source/ui/drawfunc/fuins1.cxx116
-rw-r--r--sc/source/ui/drawfunc/fuins2.cxx40
-rw-r--r--sc/source/ui/drawfunc/fumark.cxx28
-rw-r--r--sc/source/ui/drawfunc/fupoor.cxx46
-rw-r--r--sc/source/ui/drawfunc/fusel.cxx64
-rw-r--r--sc/source/ui/drawfunc/fusel2.cxx2
-rw-r--r--sc/source/ui/drawfunc/futext.cxx106
-rw-r--r--sc/source/ui/drawfunc/futext2.cxx10
-rw-r--r--sc/source/ui/drawfunc/futext3.cxx12
-rw-r--r--sc/source/ui/drawfunc/graphsh.cxx6
-rw-r--r--sc/source/ui/drawfunc/mediash.cxx14
-rw-r--r--sc/source/ui/drawfunc/objdraw.src38
-rw-r--r--sc/source/ui/drawfunc/oleobjsh.cxx2
-rw-r--r--sc/source/ui/formdlg/dwfunctr.cxx324
-rw-r--r--sc/source/ui/formdlg/dwfunctr.hrc12
-rw-r--r--sc/source/ui/formdlg/dwfunctr.src2
-rw-r--r--sc/source/ui/formdlg/formdata.cxx2
-rw-r--r--sc/source/ui/formdlg/formdlgs.src2
-rw-r--r--sc/source/ui/formdlg/formula.cxx74
-rw-r--r--sc/source/ui/formdlg/privsplt.cxx94
-rw-r--r--sc/source/ui/inc/AccessibilityHints.hxx24
-rw-r--r--sc/source/ui/inc/AccessibleCell.hxx18
-rw-r--r--sc/source/ui/inc/AccessibleCellBase.hxx32
-rw-r--r--sc/source/ui/inc/AccessibleContextBase.hxx58
-rw-r--r--sc/source/ui/inc/AccessibleCsvControl.hxx2
-rw-r--r--sc/source/ui/inc/AccessibleDataPilotControl.hxx26
-rw-r--r--sc/source/ui/inc/AccessibleDocument.hxx82
-rw-r--r--sc/source/ui/inc/AccessibleDocumentBase.hxx6
-rw-r--r--sc/source/ui/inc/AccessibleDocumentPagePreview.hxx24
-rw-r--r--sc/source/ui/inc/AccessibleEditObject.hxx30
-rw-r--r--sc/source/ui/inc/AccessiblePageHeader.hxx10
-rw-r--r--sc/source/ui/inc/AccessiblePageHeaderArea.hxx16
-rw-r--r--sc/source/ui/inc/AccessiblePreviewCell.hxx6
-rw-r--r--sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx30
-rw-r--r--sc/source/ui/inc/AccessiblePreviewTable.hxx22
-rw-r--r--sc/source/ui/inc/AccessibleSpreadsheet.hxx38
-rw-r--r--sc/source/ui/inc/AccessibleTableBase.hxx22
-rw-r--r--sc/source/ui/inc/AccessibleText.hxx98
-rw-r--r--sc/source/ui/inc/ChartRangeSelectionListener.hxx2
-rw-r--r--sc/source/ui/inc/DrawModelBroadcaster.hxx10
-rw-r--r--sc/source/ui/inc/IAnyRefDialog.hxx6
-rw-r--r--sc/source/ui/inc/ScDevChart.hxx2
-rw-r--r--sc/source/ui/inc/acredlin.hrc70
-rw-r--r--sc/source/ui/inc/acredlin.hxx206
-rw-r--r--sc/source/ui/inc/anyrefdg.hxx38
-rw-r--r--sc/source/ui/inc/areasave.hxx32
-rw-r--r--sc/source/ui/inc/areasdlg.hxx56
-rw-r--r--sc/source/ui/inc/asciiopt.hxx102
-rw-r--r--sc/source/ui/inc/attrdlg.hrc26
-rw-r--r--sc/source/ui/inc/attrdlg.hxx8
-rw-r--r--sc/source/ui/inc/auditsh.hxx10
-rw-r--r--sc/source/ui/inc/autofmt.hxx116
-rw-r--r--sc/source/ui/inc/autostyl.hxx26
-rw-r--r--sc/source/ui/inc/cbutton.hxx28
-rw-r--r--sc/source/ui/inc/cellsh.hxx42
-rw-r--r--sc/source/ui/inc/chartsh.hxx4
-rw-r--r--sc/source/ui/inc/client.hxx16
-rw-r--r--sc/source/ui/inc/colrowba.hxx66
-rw-r--r--sc/source/ui/inc/condfrmt.hrc66
-rw-r--r--sc/source/ui/inc/condfrmt.hxx134
-rw-r--r--sc/source/ui/inc/conflictsdlg.hrc2
-rw-r--r--sc/source/ui/inc/conflictsdlg.hxx2
-rw-r--r--sc/source/ui/inc/consdlg.hxx94
-rw-r--r--sc/source/ui/inc/content.hxx116
-rw-r--r--sc/source/ui/inc/corodlg.hxx18
-rw-r--r--sc/source/ui/inc/crdlg.hxx22
-rw-r--r--sc/source/ui/inc/crnrdlg.hrc26
-rw-r--r--sc/source/ui/inc/crnrdlg.hxx60
-rw-r--r--sc/source/ui/inc/csvcontrol.hxx2
-rw-r--r--sc/source/ui/inc/csvgrid.hxx2
-rw-r--r--sc/source/ui/inc/csvruler.hxx2
-rw-r--r--sc/source/ui/inc/csvsplits.hxx2
-rw-r--r--sc/source/ui/inc/csvtablebox.hxx2
-rw-r--r--sc/source/ui/inc/dapidata.hxx24
-rw-r--r--sc/source/ui/inc/dapitype.hxx54
-rw-r--r--sc/source/ui/inc/dbdocfun.hxx30
-rw-r--r--sc/source/ui/inc/dbfunc.hxx56
-rw-r--r--sc/source/ui/inc/dbnamdlg.hrc16
-rw-r--r--sc/source/ui/inc/dbnamdlg.hxx88
-rw-r--r--sc/source/ui/inc/delcldlg.hxx16
-rw-r--r--sc/source/ui/inc/delcodlg.hxx34
-rw-r--r--sc/source/ui/inc/docfunc.hxx108
-rw-r--r--sc/source/ui/inc/docsh.hxx256
-rw-r--r--sc/source/ui/inc/dpcontrol.hrc2
-rw-r--r--sc/source/ui/inc/dpcontrol.hxx66
-rw-r--r--sc/source/ui/inc/dpgroupdlg.hxx2
-rw-r--r--sc/source/ui/inc/drawsh.hxx36
-rw-r--r--sc/source/ui/inc/drawutil.hxx4
-rw-r--r--sc/source/ui/inc/drawview.hxx90
-rw-r--r--sc/source/ui/inc/drformsh.hxx8
-rw-r--r--sc/source/ui/inc/drtxtob.hxx12
-rw-r--r--sc/source/ui/inc/drwtrans.hxx62
-rw-r--r--sc/source/ui/inc/dwfunctr.hxx98
-rw-r--r--sc/source/ui/inc/editable.hxx24
-rw-r--r--sc/source/ui/inc/editfield.hxx2
-rw-r--r--sc/source/ui/inc/editsh.hxx28
-rw-r--r--sc/source/ui/inc/expftext.hxx4
-rwxr-xr-xsc/source/ui/inc/fieldwnd.hxx2
-rw-r--r--sc/source/ui/inc/filldlg.hxx108
-rw-r--r--sc/source/ui/inc/filtdlg.hxx220
-rw-r--r--sc/source/ui/inc/filter.hrc80
-rw-r--r--sc/source/ui/inc/foptmgr.hxx82
-rw-r--r--sc/source/ui/inc/formatsh.hxx28
-rw-r--r--sc/source/ui/inc/formdata.hxx18
-rw-r--r--sc/source/ui/inc/formula.hxx20
-rw-r--r--sc/source/ui/inc/fuconarc.hxx8
-rw-r--r--sc/source/ui/inc/fuconcustomshape.hxx6
-rw-r--r--sc/source/ui/inc/fuconpol.hxx8
-rw-r--r--sc/source/ui/inc/fuconrec.hxx8
-rw-r--r--sc/source/ui/inc/fuconstr.hxx10
-rw-r--r--sc/source/ui/inc/fuconuno.hxx8
-rw-r--r--sc/source/ui/inc/fudraw.hxx8
-rw-r--r--sc/source/ui/inc/fuedipo.hxx8
-rw-r--r--sc/source/ui/inc/fuinsert.hxx20
-rw-r--r--sc/source/ui/inc/fumark.hxx14
-rw-r--r--sc/source/ui/inc/funcpage.hxx46
-rw-r--r--sc/source/ui/inc/funcutl.hxx114
-rw-r--r--sc/source/ui/inc/fupoor.hxx46
-rw-r--r--sc/source/ui/inc/fusel.hxx16
-rw-r--r--sc/source/ui/inc/futext.hxx16
-rw-r--r--sc/source/ui/inc/graphsh.hxx12
-rw-r--r--sc/source/ui/inc/gridmerg.hxx30
-rw-r--r--sc/source/ui/inc/gridwin.hxx352
-rw-r--r--sc/source/ui/inc/groupdlg.hxx18
-rw-r--r--sc/source/ui/inc/hdrcont.hxx114
-rw-r--r--sc/source/ui/inc/hfedtdlg.hxx12
-rw-r--r--sc/source/ui/inc/highred.hrc48
-rw-r--r--sc/source/ui/inc/highred.hxx62
-rw-r--r--sc/source/ui/inc/hintwin.hxx16
-rw-r--r--sc/source/ui/inc/hiranges.hxx12
-rw-r--r--sc/source/ui/inc/imoptdlg.hxx40
-rw-r--r--sc/source/ui/inc/impex.hxx58
-rw-r--r--sc/source/ui/inc/inputhdl.hxx302
-rw-r--r--sc/source/ui/inc/inputwin.hxx168
-rw-r--r--sc/source/ui/inc/inscldlg.hxx16
-rw-r--r--sc/source/ui/inc/inscodlg.hxx110
-rw-r--r--sc/source/ui/inc/instbdlg.hrc36
-rw-r--r--sc/source/ui/inc/instbdlg.hxx66
-rw-r--r--sc/source/ui/inc/invmerge.hxx16
-rw-r--r--sc/source/ui/inc/lbseldlg.hxx16
-rw-r--r--sc/source/ui/inc/linkarea.hrc26
-rw-r--r--sc/source/ui/inc/linkarea.hxx54
-rw-r--r--sc/source/ui/inc/lnktrans.hxx16
-rw-r--r--sc/source/ui/inc/mediash.hxx8
-rw-r--r--sc/source/ui/inc/miscdlgs.hrc132
-rw-r--r--sc/source/ui/inc/msgpool.hxx28
-rw-r--r--sc/source/ui/inc/mtrindlg.hxx36
-rw-r--r--sc/source/ui/inc/mvtabdlg.hxx38
-rw-r--r--sc/source/ui/inc/namecrea.hxx28
-rw-r--r--sc/source/ui/inc/namedlg.hrc32
-rw-r--r--sc/source/ui/inc/namedlg.hxx70
-rw-r--r--sc/source/ui/inc/namepast.hxx24
-rw-r--r--sc/source/ui/inc/navcitem.hxx4
-rw-r--r--sc/source/ui/inc/navipi.hxx210
-rw-r--r--sc/source/ui/inc/navsett.hxx2
-rw-r--r--sc/source/ui/inc/notemark.hxx40
-rw-r--r--sc/source/ui/inc/oleobjsh.hxx4
-rw-r--r--sc/source/ui/inc/olinefun.hxx22
-rw-r--r--sc/source/ui/inc/olinewin.hxx2
-rw-r--r--sc/source/ui/inc/opredlin.hrc24
-rw-r--r--sc/source/ui/inc/opredlin.hxx26
-rw-r--r--sc/source/ui/inc/optdlg.hrc198
-rw-r--r--sc/source/ui/inc/optload.hrc24
-rw-r--r--sc/source/ui/inc/optload.hxx24
-rw-r--r--sc/source/ui/inc/optsolver.hrc38
-rw-r--r--sc/source/ui/inc/optsolver.hxx2
-rw-r--r--sc/source/ui/inc/output.hxx200
-rw-r--r--sc/source/ui/inc/pagedata.hxx60
-rw-r--r--sc/source/ui/inc/parawin.hxx144
-rw-r--r--sc/source/ui/inc/pfiltdlg.hxx108
-rw-r--r--sc/source/ui/inc/pfuncache.hxx34
-rw-r--r--sc/source/ui/inc/pgbrksh.hxx2
-rw-r--r--sc/source/ui/inc/pivotsh.hxx8
-rw-r--r--sc/source/ui/inc/pntlock.hxx32
-rw-r--r--sc/source/ui/inc/popmenu.hxx10
-rw-r--r--sc/source/ui/inc/preview.hxx102
-rw-r--r--sc/source/ui/inc/prevloc.hxx108
-rw-r--r--sc/source/ui/inc/prevwsh.hxx76
-rw-r--r--sc/source/ui/inc/printfun.hxx356
-rw-r--r--sc/source/ui/inc/privsplt.hxx52
-rw-r--r--sc/source/ui/inc/protectiondlg.hrc2
-rw-r--r--sc/source/ui/inc/protectiondlg.hxx2
-rw-r--r--sc/source/ui/inc/pvfundlg.hxx6
-rw-r--r--sc/source/ui/inc/pvlaydlg.hxx2
-rw-r--r--sc/source/ui/inc/redcom.hxx14
-rw-r--r--sc/source/ui/inc/reffact.hxx44
-rw-r--r--sc/source/ui/inc/refundo.hxx22
-rw-r--r--sc/source/ui/inc/retypepassdlg.hrc2
-rw-r--r--sc/source/ui/inc/retypepassdlg.hxx2
-rw-r--r--sc/source/ui/inc/rfindlst.hxx26
-rw-r--r--sc/source/ui/inc/scendlg.hxx30
-rw-r--r--sc/source/ui/inc/scui_def.hxx32
-rw-r--r--sc/source/ui/inc/scuiasciiopt.hxx2
-rw-r--r--sc/source/ui/inc/scuiautofmt.hxx62
-rw-r--r--sc/source/ui/inc/scuiimoptdlg.hxx32
-rw-r--r--sc/source/ui/inc/scuitphfedit.hxx94
-rw-r--r--sc/source/ui/inc/select.hxx78
-rw-r--r--sc/source/ui/inc/selectionstate.hxx2
-rw-r--r--sc/source/ui/inc/seltrans.hxx34
-rw-r--r--sc/source/ui/inc/servobj.hxx12
-rw-r--r--sc/source/ui/inc/sharedocdlg.hrc2
-rw-r--r--sc/source/ui/inc/sharedocdlg.hxx2
-rw-r--r--sc/source/ui/inc/shtabdlg.hxx6
-rw-r--r--sc/source/ui/inc/simpref.hrc14
-rw-r--r--sc/source/ui/inc/simpref.hxx72
-rw-r--r--sc/source/ui/inc/sizedev.hxx20
-rw-r--r--sc/source/ui/inc/solveroptions.hrc2
-rw-r--r--sc/source/ui/inc/solveroptions.hxx2
-rw-r--r--sc/source/ui/inc/solverutil.hxx2
-rw-r--r--sc/source/ui/inc/solvrdlg.hrc32
-rw-r--r--sc/source/ui/inc/solvrdlg.hxx60
-rw-r--r--sc/source/ui/inc/sortdlg.hrc36
-rw-r--r--sc/source/ui/inc/sortdlg.hxx24
-rw-r--r--sc/source/ui/inc/spelldialog.hxx2
-rw-r--r--sc/source/ui/inc/spelleng.hxx2
-rw-r--r--sc/source/ui/inc/spellparam.hxx2
-rw-r--r--sc/source/ui/inc/strindlg.hxx10
-rw-r--r--sc/source/ui/inc/styledlg.hrc6
-rw-r--r--sc/source/ui/inc/styledlg.hxx12
-rw-r--r--sc/source/ui/inc/submenu.hrc78
-rw-r--r--sc/source/ui/inc/subtdlg.hrc4
-rw-r--r--sc/source/ui/inc/subtdlg.hxx12
-rw-r--r--sc/source/ui/inc/tabbgcolordlg.hxx2
-rw-r--r--sc/source/ui/inc/tabcont.hxx34
-rw-r--r--sc/source/ui/inc/tabopdlg.hrc38
-rw-r--r--sc/source/ui/inc/tabopdlg.hxx82
-rw-r--r--sc/source/ui/inc/tabpages.hxx44
-rw-r--r--sc/source/ui/inc/tabpopsh.hxx6
-rw-r--r--sc/source/ui/inc/tabsplit.hxx16
-rw-r--r--sc/source/ui/inc/tabview.hxx490
-rw-r--r--sc/source/ui/inc/tabvwsh.hxx350
-rw-r--r--sc/source/ui/inc/target.hxx8
-rw-r--r--sc/source/ui/inc/tbinsert.hrc8
-rw-r--r--sc/source/ui/inc/tbinsert.hxx22
-rw-r--r--sc/source/ui/inc/tbzoomsliderctrl.hxx4
-rw-r--r--sc/source/ui/inc/textdlgs.hxx16
-rw-r--r--sc/source/ui/inc/textimportoptions.hrc2
-rw-r--r--sc/source/ui/inc/textimportoptions.hxx2
-rw-r--r--sc/source/ui/inc/tpcalc.hxx48
-rw-r--r--sc/source/ui/inc/tphf.hxx34
-rw-r--r--sc/source/ui/inc/tphfedit.hxx162
-rw-r--r--sc/source/ui/inc/tpprint.hxx20
-rw-r--r--sc/source/ui/inc/tpsort.hxx132
-rw-r--r--sc/source/ui/inc/tpstat.hxx2
-rw-r--r--sc/source/ui/inc/tpsubt.hxx132
-rw-r--r--sc/source/ui/inc/tptable.hxx38
-rw-r--r--sc/source/ui/inc/tpusrlst.hxx104
-rw-r--r--sc/source/ui/inc/tpview.hxx74
-rw-r--r--sc/source/ui/inc/transobj.hxx80
-rw-r--r--sc/source/ui/inc/ui_pch.hxx12
-rw-r--r--sc/source/ui/inc/uiitems.hxx162
-rw-r--r--sc/source/ui/inc/undobase.hxx64
-rw-r--r--sc/source/ui/inc/undoblk.hxx732
-rw-r--r--sc/source/ui/inc/undocell.hxx254
-rw-r--r--sc/source/ui/inc/undodat.hxx396
-rw-r--r--sc/source/ui/inc/undodraw.hxx34
-rw-r--r--sc/source/ui/inc/undoolk.hxx12
-rw-r--r--sc/source/ui/inc/undostyl.hxx50
-rw-r--r--sc/source/ui/inc/undotab.hxx346
-rw-r--r--sc/source/ui/inc/undoutil.hxx10
-rw-r--r--sc/source/ui/inc/validate.hrc4
-rw-r--r--sc/source/ui/inc/validate.hxx120
-rw-r--r--sc/source/ui/inc/viewdata.hxx506
-rw-r--r--sc/source/ui/inc/viewfunc.hxx260
-rw-r--r--sc/source/ui/inc/viewutil.hxx46
-rw-r--r--sc/source/ui/inc/warnbox.hxx2
-rw-r--r--sc/source/ui/miscdlgs/acredlin.cxx128
-rw-r--r--sc/source/ui/miscdlgs/acredlin.src2
-rw-r--r--sc/source/ui/miscdlgs/anyrefdg.cxx136
-rw-r--r--sc/source/ui/miscdlgs/autofmt.cxx48
-rw-r--r--sc/source/ui/miscdlgs/conflictsdlg.cxx6
-rw-r--r--sc/source/ui/miscdlgs/conflictsdlg.src6
-rw-r--r--sc/source/ui/miscdlgs/crdlg.cxx12
-rw-r--r--sc/source/ui/miscdlgs/crnrdlg.cxx378
-rw-r--r--sc/source/ui/miscdlgs/delcldlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/delcodlg.cxx4
-rw-r--r--sc/source/ui/miscdlgs/filldlg.cxx22
-rw-r--r--sc/source/ui/miscdlgs/groupdlg.cxx4
-rw-r--r--sc/source/ui/miscdlgs/highred.cxx40
-rw-r--r--sc/source/ui/miscdlgs/highred.src2
-rw-r--r--sc/source/ui/miscdlgs/inscldlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/inscodlg.cxx34
-rw-r--r--sc/source/ui/miscdlgs/instbdlg.cxx88
-rw-r--r--sc/source/ui/miscdlgs/instbdlg.src2
-rw-r--r--sc/source/ui/miscdlgs/lbseldlg.cxx4
-rw-r--r--sc/source/ui/miscdlgs/linkarea.cxx44
-rw-r--r--sc/source/ui/miscdlgs/linkarea.src2
-rw-r--r--sc/source/ui/miscdlgs/mtrindlg.cxx22
-rw-r--r--sc/source/ui/miscdlgs/mvtabdlg.cxx12
-rw-r--r--sc/source/ui/miscdlgs/namecrea.cxx32
-rw-r--r--sc/source/ui/miscdlgs/namepast.cxx18
-rw-r--r--sc/source/ui/miscdlgs/optsolver.cxx4
-rw-r--r--sc/source/ui/miscdlgs/protectiondlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/protectiondlg.src2
-rw-r--r--sc/source/ui/miscdlgs/redcom.cxx6
-rw-r--r--sc/source/ui/miscdlgs/retypepassdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/retypepassdlg.src2
-rw-r--r--sc/source/ui/miscdlgs/scuiautofmt.cxx80
-rw-r--r--sc/source/ui/miscdlgs/sharedocdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/sharedocdlg.src4
-rw-r--r--sc/source/ui/miscdlgs/shtabdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/simpref.cxx58
-rw-r--r--sc/source/ui/miscdlgs/solveroptions.cxx10
-rw-r--r--sc/source/ui/miscdlgs/solverutil.cxx2
-rw-r--r--sc/source/ui/miscdlgs/solvrdlg.cxx66
-rw-r--r--sc/source/ui/miscdlgs/strindlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/tabbgcolordlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/tabopdlg.cxx46
-rw-r--r--sc/source/ui/miscdlgs/textdlgs.cxx18
-rw-r--r--sc/source/ui/miscdlgs/warnbox.cxx2
-rw-r--r--sc/source/ui/namedlg/namedlg.cxx166
-rw-r--r--sc/source/ui/navipi/content.cxx170
-rw-r--r--sc/source/ui/navipi/navcitem.cxx20
-rw-r--r--sc/source/ui/navipi/navipi.cxx280
-rw-r--r--sc/source/ui/navipi/navipi.hrc56
-rw-r--r--sc/source/ui/navipi/navipi.src56
-rw-r--r--sc/source/ui/navipi/scenwnd.cxx4
-rw-r--r--sc/source/ui/optdlg/opredlin.cxx28
-rw-r--r--sc/source/ui/optdlg/tpcalc.cxx54
-rw-r--r--sc/source/ui/optdlg/tpprint.cxx10
-rw-r--r--sc/source/ui/optdlg/tpusrlst.cxx210
-rw-r--r--sc/source/ui/optdlg/tpview.cxx226
-rw-r--r--sc/source/ui/pagedlg/areasdlg.cxx128
-rw-r--r--sc/source/ui/pagedlg/hfedtdlg.cxx16
-rw-r--r--sc/source/ui/pagedlg/hfedtdlg.hrc10
-rw-r--r--sc/source/ui/pagedlg/hfedtdlg.src36
-rw-r--r--sc/source/ui/pagedlg/pagedlg.hrc72
-rw-r--r--sc/source/ui/pagedlg/pagedlg.src4
-rw-r--r--sc/source/ui/pagedlg/scuitphfedit.cxx88
-rw-r--r--sc/source/ui/pagedlg/tphf.cxx40
-rw-r--r--sc/source/ui/pagedlg/tphf.src2
-rw-r--r--sc/source/ui/pagedlg/tphfedit.cxx212
-rw-r--r--sc/source/ui/pagedlg/tptable.cxx154
-rw-r--r--sc/source/ui/src/attrdlg.src2
-rw-r--r--sc/source/ui/src/autofmt.src2
-rw-r--r--sc/source/ui/src/condfrmt.src2
-rw-r--r--sc/source/ui/src/crnrdlg.src4
-rw-r--r--sc/source/ui/src/dbnamdlg.src4
-rw-r--r--sc/source/ui/src/filter.src2
-rw-r--r--sc/source/ui/src/globstr.src2
-rw-r--r--sc/source/ui/src/hdrcont.src2
-rw-r--r--sc/source/ui/src/miscdlgs.src32
-rw-r--r--sc/source/ui/src/namedlg.src4
-rw-r--r--sc/source/ui/src/opredlin.src2
-rw-r--r--sc/source/ui/src/optdlg.src4
-rw-r--r--sc/source/ui/src/optsolver.src2
-rw-r--r--sc/source/ui/src/popup.src2
-rw-r--r--sc/source/ui/src/pseudo.src2
-rw-r--r--sc/source/ui/src/sc.src2
-rw-r--r--sc/source/ui/src/scerrors.src2
-rw-r--r--sc/source/ui/src/scfuncs.src534
-rw-r--r--sc/source/ui/src/scstring.src6
-rw-r--r--sc/source/ui/src/scwarngs.src2
-rw-r--r--sc/source/ui/src/simpref.src6
-rw-r--r--sc/source/ui/src/solveroptions.src2
-rw-r--r--sc/source/ui/src/solvrdlg.src2
-rw-r--r--sc/source/ui/src/sortdlg.src6
-rw-r--r--sc/source/ui/src/subtdlg.src6
-rw-r--r--sc/source/ui/src/tabopdlg.src2
-rw-r--r--sc/source/ui/src/textdlgs.src2
-rw-r--r--sc/source/ui/src/toolbox.src12
-rw-r--r--sc/source/ui/styleui/scstyles.src12
-rw-r--r--sc/source/ui/styleui/styledlg.cxx58
-rw-r--r--sc/source/ui/styleui/styledlg.src2
-rw-r--r--sc/source/ui/undo/areasave.cxx30
-rw-r--r--sc/source/ui/undo/refundo.cxx18
-rw-r--r--sc/source/ui/undo/target.cxx2
-rw-r--r--sc/source/ui/undo/undobase.cxx44
-rw-r--r--sc/source/ui/undo/undoblk.cxx260
-rw-r--r--sc/source/ui/undo/undoblk2.cxx18
-rw-r--r--sc/source/ui/undo/undoblk3.cxx366
-rw-r--r--sc/source/ui/undo/undocell.cxx94
-rw-r--r--sc/source/ui/undo/undodat.cxx292
-rw-r--r--sc/source/ui/undo/undodraw.cxx4
-rw-r--r--sc/source/ui/undo/undoolk.cxx4
-rw-r--r--sc/source/ui/undo/undostyl.cxx26
-rw-r--r--sc/source/ui/undo/undotab.cxx212
-rw-r--r--sc/source/ui/undo/undoutil.cxx2
-rw-r--r--sc/source/ui/unoobj/ChartRangeSelectionListener.cxx4
-rw-r--r--sc/source/ui/unoobj/addruno.cxx2
-rw-r--r--sc/source/ui/unoobj/afmtuno.cxx86
-rw-r--r--sc/source/ui/unoobj/appluno.cxx108
-rw-r--r--sc/source/ui/unoobj/celllistsource.cxx14
-rw-r--r--sc/source/ui/unoobj/celllistsource.hxx2
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx1990
-rw-r--r--sc/source/ui/unoobj/cellvaluebinding.cxx14
-rw-r--r--sc/source/ui/unoobj/cellvaluebinding.hxx2
-rw-r--r--sc/source/ui/unoobj/chart2uno.cxx230
-rw-r--r--sc/source/ui/unoobj/chartuno.cxx42
-rw-r--r--sc/source/ui/unoobj/confuno.cxx18
-rw-r--r--sc/source/ui/unoobj/convuno.cxx8
-rw-r--r--sc/source/ui/unoobj/cursuno.cxx56
-rwxr-xr-xsc/source/ui/unoobj/dapiuno.cxx78
-rw-r--r--sc/source/ui/unoobj/datauno.cxx338
-rw-r--r--sc/source/ui/unoobj/defltuno.cxx70
-rw-r--r--sc/source/ui/unoobj/detreg.cxx12
-rw-r--r--sc/source/ui/unoobj/dispuno.cxx2
-rw-r--r--sc/source/ui/unoobj/docuno.cxx312
-rw-r--r--sc/source/ui/unoobj/drdefuno.cxx10
-rw-r--r--sc/source/ui/unoobj/editsrc.cxx44
-rw-r--r--sc/source/ui/unoobj/fielduno.cxx194
-rw-r--r--sc/source/ui/unoobj/filtuno.cxx42
-rw-r--r--sc/source/ui/unoobj/fmtuno.cxx116
-rw-r--r--sc/source/ui/unoobj/forbiuno.cxx8
-rw-r--r--sc/source/ui/unoobj/funcuno.cxx100
-rw-r--r--sc/source/ui/unoobj/linkuno.cxx148
-rw-r--r--sc/source/ui/unoobj/listenercalls.cxx2
-rw-r--r--sc/source/ui/unoobj/miscuno.cxx68
-rw-r--r--sc/source/ui/unoobj/nameuno.cxx112
-rw-r--r--sc/source/ui/unoobj/notesuno.cxx56
-rw-r--r--sc/source/ui/unoobj/optuno.cxx32
-rw-r--r--sc/source/ui/unoobj/pageuno.cxx4
-rwxr-xr-xsc/source/ui/unoobj/scdetect.cxx56
-rw-r--r--sc/source/ui/unoobj/scdetect.hxx2
-rw-r--r--sc/source/ui/unoobj/servuno.cxx102
-rw-r--r--sc/source/ui/unoobj/shapeuno.cxx42
-rw-r--r--sc/source/ui/unoobj/srchuno.cxx48
-rw-r--r--sc/source/ui/unoobj/styleuno.cxx688
-rw-r--r--sc/source/ui/unoobj/targuno.cxx32
-rw-r--r--sc/source/ui/unoobj/textuno.cxx122
-rw-r--r--sc/source/ui/unoobj/tokenuno.cxx2
-rw-r--r--sc/source/ui/unoobj/unodoc.cxx2
-rw-r--r--sc/source/ui/unoobj/unoguard.cxx2
-rw-r--r--sc/source/ui/unoobj/unoreflist.cxx2
-rw-r--r--sc/source/ui/unoobj/viewuno.cxx168
-rw-r--r--sc/source/ui/unoobj/warnpassword.cxx12
-rw-r--r--sc/source/ui/vba/excelvbahelper.cxx38
-rw-r--r--sc/source/ui/vba/excelvbahelper.hxx8
-rw-r--r--sc/source/ui/vba/helperdecl.hxx4
-rw-r--r--sc/source/ui/vba/makefile.mk92
-rw-r--r--sc/source/ui/vba/service.cxx24
-rw-r--r--sc/source/ui/vba/testvba/launchTest.pl14
-rwxr-xr-xsc/source/ui/vba/testvba/runTests.pl4
-rw-r--r--sc/source/ui/vba/testvba/testResult.pl26
-rwxr-xr-xsc/source/ui/vba/testvba/testResults.pl24
-rw-r--r--sc/source/ui/vba/testvba/testvba.cxx76
-rwxr-xr-xsc/source/ui/vba/testvba/timestampsClean.pl2
-rw-r--r--sc/source/ui/vba/vbaapplication.cxx742
-rw-r--r--sc/source/ui/vba/vbaapplication.hxx10
-rw-r--r--sc/source/ui/vba/vbaassistant.cxx20
-rw-r--r--sc/source/ui/vba/vbaassistant.hxx4
-rw-r--r--sc/source/ui/vba/vbaaxes.cxx30
-rw-r--r--sc/source/ui/vba/vbaaxes.hxx4
-rw-r--r--sc/source/ui/vba/vbaaxis.cxx120
-rw-r--r--sc/source/ui/vba/vbaaxis.hxx6
-rw-r--r--sc/source/ui/vba/vbaaxistitle.cxx4
-rw-r--r--sc/source/ui/vba/vbaaxistitle.hxx2
-rw-r--r--sc/source/ui/vba/vbaborders.cxx90
-rw-r--r--sc/source/ui/vba/vbaborders.hxx12
-rw-r--r--sc/source/ui/vba/vbacharacters.cxx34
-rw-r--r--sc/source/ui/vba/vbacharacters.hxx2
-rw-r--r--sc/source/ui/vba/vbachart.cxx110
-rw-r--r--sc/source/ui/vba/vbachart.hxx8
-rw-r--r--sc/source/ui/vba/vbachartobject.cxx54
-rw-r--r--sc/source/ui/vba/vbachartobject.hxx8
-rw-r--r--sc/source/ui/vba/vbachartobjects.cxx36
-rw-r--r--sc/source/ui/vba/vbachartobjects.hxx10
-rw-r--r--sc/source/ui/vba/vbacharts.cxx20
-rw-r--r--sc/source/ui/vba/vbacharts.hxx10
-rw-r--r--sc/source/ui/vba/vbacharttitle.cxx4
-rw-r--r--sc/source/ui/vba/vbacharttitle.hxx2
-rw-r--r--sc/source/ui/vba/vbacomment.cxx8
-rw-r--r--sc/source/ui/vba/vbacomment.hxx2
-rw-r--r--sc/source/ui/vba/vbacomments.cxx10
-rw-r--r--sc/source/ui/vba/vbacomments.hxx4
-rw-r--r--sc/source/ui/vba/vbacondition.cxx24
-rw-r--r--sc/source/ui/vba/vbacondition.hxx10
-rw-r--r--sc/source/ui/vba/vbadialog.cxx10
-rw-r--r--sc/source/ui/vba/vbadialog.hxx2
-rw-r--r--sc/source/ui/vba/vbadialogs.cxx6
-rw-r--r--sc/source/ui/vba/vbadialogs.hxx4
-rwxr-xr-xsc/source/ui/vba/vbaeventshelper.cxx4
-rwxr-xr-xsc/source/ui/vba/vbaeventshelper.hxx4
-rw-r--r--sc/source/ui/vba/vbafont.cxx10
-rw-r--r--sc/source/ui/vba/vbafont.hxx2
-rw-r--r--sc/source/ui/vba/vbaformat.cxx168
-rw-r--r--sc/source/ui/vba/vbaformat.hxx14
-rw-r--r--sc/source/ui/vba/vbaformatcondition.cxx30
-rw-r--r--sc/source/ui/vba/vbaformatcondition.hxx12
-rw-r--r--sc/source/ui/vba/vbaformatconditions.cxx44
-rw-r--r--sc/source/ui/vba/vbaformatconditions.hxx6
-rw-r--r--sc/source/ui/vba/vbaglobals.cxx82
-rw-r--r--sc/source/ui/vba/vbaglobals.hxx9
-rw-r--r--sc/source/ui/vba/vbahelper.cxx100
-rw-r--r--sc/source/ui/vba/vbahyperlink.cxx4
-rw-r--r--sc/source/ui/vba/vbahyperlink.hxx6
-rwxr-xr-xsc/source/ui/vba/vbahyperlinks.cxx12
-rwxr-xr-xsc/source/ui/vba/vbahyperlinks.hxx12
-rw-r--r--sc/source/ui/vba/vbainterior.cxx58
-rw-r--r--sc/source/ui/vba/vbainterior.hxx8
-rw-r--r--sc/source/ui/vba/vbaname.cxx22
-rw-r--r--sc/source/ui/vba/vbaname.hxx6
-rw-r--r--sc/source/ui/vba/vbanames.cxx23
-rw-r--r--sc/source/ui/vba/vbanames.hxx10
-rw-r--r--sc/source/ui/vba/vbaoleobject.cxx32
-rw-r--r--sc/source/ui/vba/vbaoleobject.hxx4
-rw-r--r--sc/source/ui/vba/vbaoleobjects.cxx10
-rw-r--r--sc/source/ui/vba/vbaoleobjects.hxx6
-rw-r--r--sc/source/ui/vba/vbaoutline.cxx12
-rw-r--r--sc/source/ui/vba/vbaoutline.hxx6
-rw-r--r--sc/source/ui/vba/vbapagebreak.cxx30
-rw-r--r--sc/source/ui/vba/vbapagebreak.hxx18
-rw-r--r--sc/source/ui/vba/vbapagebreaks.cxx26
-rw-r--r--sc/source/ui/vba/vbapagebreaks.hxx14
-rw-r--r--sc/source/ui/vba/vbapagesetup.cxx26
-rw-r--r--sc/source/ui/vba/vbapagesetup.hxx10
-rw-r--r--sc/source/ui/vba/vbapalette.cxx8
-rw-r--r--sc/source/ui/vba/vbapalette.hxx4
-rw-r--r--sc/source/ui/vba/vbapane.cxx20
-rw-r--r--sc/source/ui/vba/vbapane.hxx2
-rw-r--r--sc/source/ui/vba/vbapivotcache.cxx8
-rw-r--r--sc/source/ui/vba/vbapivotcache.hxx4
-rw-r--r--sc/source/ui/vba/vbapivottable.cxx8
-rw-r--r--sc/source/ui/vba/vbapivottable.hxx4
-rw-r--r--sc/source/ui/vba/vbapivottables.cxx14
-rw-r--r--sc/source/ui/vba/vbapivottables.hxx8
-rw-r--r--sc/source/ui/vba/vbapropvalue.cxx8
-rw-r--r--sc/source/ui/vba/vbapropvalue.hxx8
-rwxr-xr-xsc/source/ui/vba/vbarange.cxx1024
-rw-r--r--sc/source/ui/vba/vbarange.hxx32
-rw-r--r--sc/source/ui/vba/vbaseriescollection.cxx12
-rw-r--r--sc/source/ui/vba/vbaseriescollection.hxx6
-rwxr-xr-xsc/source/ui/vba/vbasheetobject.cxx4
-rwxr-xr-xsc/source/ui/vba/vbasheetobject.hxx6
-rwxr-xr-xsc/source/ui/vba/vbasheetobjects.cxx4
-rwxr-xr-xsc/source/ui/vba/vbasheetobjects.hxx4
-rw-r--r--sc/source/ui/vba/vbastyle.cxx32
-rw-r--r--sc/source/ui/vba/vbastyle.hxx8
-rw-r--r--sc/source/ui/vba/vbastyles.cxx20
-rw-r--r--sc/source/ui/vba/vbastyles.hxx8
-rw-r--r--sc/source/ui/vba/vbatextboxshape.cxx8
-rw-r--r--sc/source/ui/vba/vbatextboxshape.hxx4
-rw-r--r--sc/source/ui/vba/vbatextframe.cxx6
-rw-r--r--sc/source/ui/vba/vbatextframe.hxx2
-rw-r--r--sc/source/ui/vba/vbatitle.hxx10
-rw-r--r--sc/source/ui/vba/vbavalidation.cxx110
-rw-r--r--sc/source/ui/vba/vbavalidation.hxx8
-rw-r--r--sc/source/ui/vba/vbawindow.cxx242
-rw-r--r--sc/source/ui/vba/vbawindow.hxx16
-rw-r--r--sc/source/ui/vba/vbawindows.cxx18
-rw-r--r--sc/source/ui/vba/vbawindows.hxx8
-rw-r--r--sc/source/ui/vba/vbaworkbook.cxx63
-rw-r--r--sc/source/ui/vba/vbaworkbook.hxx8
-rw-r--r--sc/source/ui/vba/vbaworkbooks.cxx56
-rw-r--r--sc/source/ui/vba/vbaworkbooks.hxx10
-rw-r--r--sc/source/ui/vba/vbaworksheet.cxx163
-rw-r--r--sc/source/ui/vba/vbaworksheet.hxx16
-rw-r--r--sc/source/ui/vba/vbaworksheets.cxx78
-rw-r--r--sc/source/ui/vba/vbaworksheets.hxx6
-rw-r--r--sc/source/ui/vba/vbawsfunction.cxx16
-rw-r--r--sc/source/ui/vba/vbawsfunction.hxx4
-rw-r--r--sc/source/ui/view/auditsh.cxx6
-rw-r--r--sc/source/ui/view/cellsh.cxx136
-rw-r--r--sc/source/ui/view/cellsh1.cxx252
-rw-r--r--sc/source/ui/view/cellsh2.cxx208
-rw-r--r--sc/source/ui/view/cellsh3.cxx186
-rw-r--r--sc/source/ui/view/cellsh4.cxx96
-rw-r--r--sc/source/ui/view/colrowba.cxx36
-rw-r--r--sc/source/ui/view/dbfunc.cxx74
-rw-r--r--sc/source/ui/view/dbfunc2.cxx2
-rwxr-xr-xsc/source/ui/view/dbfunc3.cxx150
-rw-r--r--sc/source/ui/view/dbfunc4.cxx2
-rw-r--r--sc/source/ui/view/drawattr.cxx2
-rw-r--r--sc/source/ui/view/drawutil.cxx12
-rw-r--r--sc/source/ui/view/drawvie2.cxx8
-rw-r--r--sc/source/ui/view/drawvie3.cxx14
-rw-r--r--sc/source/ui/view/drawvie4.cxx46
-rw-r--r--sc/source/ui/view/drawview.cxx116
-rw-r--r--sc/source/ui/view/editsh.cxx106
-rw-r--r--sc/source/ui/view/formatsh.cxx290
-rw-r--r--sc/source/ui/view/galwrap.cxx4
-rw-r--r--sc/source/ui/view/gridmerg.cxx24
-rw-r--r--sc/source/ui/view/gridwin.cxx974
-rw-r--r--sc/source/ui/view/gridwin2.cxx134
-rw-r--r--sc/source/ui/view/gridwin3.cxx66
-rw-r--r--sc/source/ui/view/gridwin4.cxx528
-rw-r--r--sc/source/ui/view/gridwin5.cxx60
-rw-r--r--sc/source/ui/view/hdrcont.cxx244
-rw-r--r--sc/source/ui/view/hintwin.cxx12
-rw-r--r--sc/source/ui/view/imapwrap.cxx6
-rw-r--r--sc/source/ui/view/invmerge.cxx20
-rw-r--r--sc/source/ui/view/notemark.cxx10
-rw-r--r--sc/source/ui/view/olinewin.cxx6
-rw-r--r--sc/source/ui/view/olkact.cxx12
-rw-r--r--sc/source/ui/view/output.cxx342
-rw-r--r--sc/source/ui/view/output2.cxx602
-rw-r--r--sc/source/ui/view/output3.cxx18
-rw-r--r--sc/source/ui/view/pfuncache.cxx12
-rw-r--r--sc/source/ui/view/pgbrksh.cxx2
-rw-r--r--sc/source/ui/view/pivotsh.cxx2
-rw-r--r--sc/source/ui/view/preview.cxx80
-rw-r--r--sc/source/ui/view/prevloc.cxx46
-rw-r--r--sc/source/ui/view/prevwsh.cxx176
-rw-r--r--sc/source/ui/view/prevwsh2.cxx2
-rw-r--r--sc/source/ui/view/printfun.cxx680
-rw-r--r--sc/source/ui/view/reffact.cxx84
-rw-r--r--sc/source/ui/view/scextopt.cxx2
-rw-r--r--sc/source/ui/view/select.cxx124
-rw-r--r--sc/source/ui/view/selectionstate.cxx2
-rw-r--r--sc/source/ui/view/spelldialog.cxx2
-rw-r--r--sc/source/ui/view/spelleng.cxx2
-rw-r--r--sc/source/ui/view/tabcont.cxx68
-rw-r--r--sc/source/ui/view/tabpopsh.cxx2
-rw-r--r--sc/source/ui/view/tabsplit.cxx2
-rw-r--r--sc/source/ui/view/tabview.cxx394
-rw-r--r--sc/source/ui/view/tabview2.cxx144
-rw-r--r--sc/source/ui/view/tabview3.cxx390
-rw-r--r--sc/source/ui/view/tabview4.cxx102
-rw-r--r--sc/source/ui/view/tabview5.cxx114
-rw-r--r--sc/source/ui/view/tabvwsh.cxx4
-rw-r--r--sc/source/ui/view/tabvwsh2.cxx94
-rw-r--r--sc/source/ui/view/tabvwsh3.cxx168
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx422
-rw-r--r--sc/source/ui/view/tabvwsh5.cxx92
-rw-r--r--sc/source/ui/view/tabvwsh8.cxx6
-rw-r--r--sc/source/ui/view/tabvwsh9.cxx42
-rw-r--r--sc/source/ui/view/tabvwsha.cxx146
-rw-r--r--sc/source/ui/view/tabvwshb.cxx48
-rw-r--r--sc/source/ui/view/tabvwshc.cxx50
-rw-r--r--sc/source/ui/view/tabvwshd.cxx12
-rw-r--r--sc/source/ui/view/tabvwshe.cxx54
-rw-r--r--sc/source/ui/view/tabvwshf.cxx140
-rw-r--r--sc/source/ui/view/tabvwshg.cxx18
-rw-r--r--sc/source/ui/view/tabvwshh.cxx24
-rw-r--r--sc/source/ui/view/viewdata.cxx410
-rw-r--r--sc/source/ui/view/viewfun2.cxx378
-rw-r--r--sc/source/ui/view/viewfun3.cxx278
-rw-r--r--sc/source/ui/view/viewfun4.cxx60
-rw-r--r--sc/source/ui/view/viewfun5.cxx60
-rw-r--r--sc/source/ui/view/viewfun6.cxx8
-rw-r--r--sc/source/ui/view/viewfun7.cxx40
-rw-r--r--sc/source/ui/view/viewfunc.cxx460
-rw-r--r--sc/source/ui/view/viewutil.cxx30
-rw-r--r--sc/source/ui/view/waitoff.cxx2
-rw-r--r--sc/uiconfig/scalc/toolbar/arrowshapes.xml22
-rw-r--r--sc/uiconfig/scalc/toolbar/basicshapes.xml14
-rw-r--r--sc/uiconfig/scalc/toolbar/flowchartshapes.xml26
-rw-r--r--sc/uiconfig/scalc/toolbar/previewbar.xml2
-rw-r--r--sc/uiconfig/scalc/toolbar/symbolshapes.xml6
-rw-r--r--sc/util/createExtPackage.pl10
-rw-r--r--sc/util/hidother.src810
-rw-r--r--sc/workben/addin.cxx132
-rw-r--r--sc/workben/addin.hxx22
-rw-r--r--sc/workben/map.idl2
-rw-r--r--sc/workben/result.cxx12
-rw-r--r--sc/workben/result.hxx22
-rw-r--r--sc/workben/test.cxx432
-rw-r--r--sc/workben/testadd.idl2
-rw-r--r--sc/xml/ScSpreadsheetSettingsObj.xml2
-rw-r--r--scaddins/source/analysis/analysis.cxx248
-rw-r--r--scaddins/source/analysis/analysis.hrc540
-rw-r--r--scaddins/source/analysis/analysis.hxx220
-rw-r--r--scaddins/source/analysis/analysis.src1294
-rw-r--r--scaddins/source/analysis/analysis_deffuncnames.src2
-rw-r--r--scaddins/source/analysis/analysis_funcnames.src2
-rw-r--r--scaddins/source/analysis/analysisadd.idl2
-rw-r--r--scaddins/source/analysis/analysisdefs.hxx34
-rw-r--r--scaddins/source/analysis/analysishelper.cxx504
-rw-r--r--scaddins/source/analysis/analysishelper.hxx322
-rw-r--r--scaddins/source/analysis/bessel.cxx32
-rw-r--r--scaddins/source/analysis/bessel.hxx2
-rw-r--r--scaddins/source/analysis/financial.cxx48
-rw-r--r--scaddins/source/datefunc/dateadd.idl2
-rw-r--r--scaddins/source/datefunc/datefunc.cxx2
-rw-r--r--scaddins/source/datefunc/datefunc.hrc2
-rw-r--r--scaddins/source/datefunc/datefunc.hxx4
-rw-r--r--scaddins/source/datefunc/datefunc.src2
-rw-r--r--sccomp/source/solver/solver.cxx6
-rw-r--r--sccomp/source/solver/solver.hrc2
-rw-r--r--sccomp/source/solver/solver.hxx2
-rw-r--r--sccomp/source/solver/solver.src2
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<ExplicitValueProvider*>(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<sal_Int64>(ThreeDHelper::getValueClippedToRange(static_cast<double>(m_nXRotation), ThreeDHelper::getXDegreeAngleLimitForRightAngledAxes())));
m_aMFYRotation.SetValue(static_cast<sal_Int64>(ThreeDHelper::getValueClippedToRange(static_cast<double>(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<aMissingValueTreatments.getLength(); nN++ )
{
sal_Int32 nVal = aMissingValueTreatments[nN];
@@ -267,12 +267,12 @@ void SchOptionTabPage::AdaptControlPositionsAndVisibility()
aMTGap.Show(m_bProvidesOverlapAndGapWidth);
aFTGap.Show(m_bProvidesOverlapAndGapWidth);
-
+
aMTOverlap.Show(m_bProvidesOverlapAndGapWidth);
aFTOverlap.Show(m_bProvidesOverlapAndGapWidth);
aCBConnect.Show(m_bProvidesBarConnectors);
-
+
if( !aMTGap.IsVisible() && !aMTOverlap.IsVisible() )
{
aGrpBar.Show(FALSE);
@@ -301,7 +301,7 @@ void SchOptionTabPage::AdaptControlPositionsAndVisibility()
lcl_offsetControl(m_aRB_DontPaint, nXOffset, 0);
lcl_offsetControl(m_aRB_AssumeZero, nXOffset, 0);
lcl_offsetControl(m_aRB_ContinueLine, nXOffset, 0);
-
+
if( !m_aFT_MissingValues.IsVisible() )
{
//for example for stock charts
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hrc b/chart2/source/controller/dialogs/tp_SeriesToAxis.hrc
index 814a148a2ef5..52746c452fd3 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hrc
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,15 +27,15 @@
#include "ResourceIds.hrc"
-#define GRP_OPT_AXIS 1
-#define RBT_OPT_AXIS_1 2
-#define RBT_OPT_AXIS_2 3
-#define MT_GAP 4
-#define MT_OVERLAP 5
-#define FT_GAP 6
-#define FT_OVERLAP 7
-#define GB_BAR 8
-#define CB_CONNECTOR 9
+#define GRP_OPT_AXIS 1
+#define RBT_OPT_AXIS_1 2
+#define RBT_OPT_AXIS_2 3
+#define MT_GAP 4
+#define MT_OVERLAP 5
+#define FT_GAP 6
+#define FT_OVERLAP 7
+#define GB_BAR 8
+#define CB_CONNECTOR 9
#define CB_BARS_SIDE_BY_SIDE 10
#define FL_PLOT_OPTIONS 11
#define FT_MISSING_VALUES 12
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index 63caf2885910..afd644d56857 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +59,16 @@ private: //methods
void AdaptControlPositionsAndVisibility();
private: //member
- FixedLine aGrpAxis;
+ FixedLine aGrpAxis;
RadioButton aRbtAxis1;
RadioButton aRbtAxis2;
- FixedLine aGrpBar;
+ FixedLine aGrpBar;
FixedText aFTGap;
MetricField aMTGap;
FixedText aFTOverlap;
MetricField aMTOverlap;
- CheckBox aCBConnect;
+ CheckBox aCBConnect;
CheckBox aCBAxisSideBySide;
FixedLine m_aFL_PlotOptions;
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.src b/chart2/source/controller/dialogs/tp_SeriesToAxis.src
index bc434be7ef07..134df3e9c827 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.src
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.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
@@ -127,7 +127,7 @@ TabPage TP_OPTIONS
TabStop = TRUE ;
Text [ en-US ] = "Show ~bars side by side";
};
-
+
FixedLine FL_PLOT_OPTIONS
{
Pos = MAP_APPFONT ( 6 , 113 ) ;
@@ -141,31 +141,31 @@ TabPage TP_OPTIONS
Size = MAP_APPFONT ( 80 , 8 ) ;
Text [ en-US ] = "Plot missing values";
};
-
+
RadioButton RB_DONT_PAINT
{
Pos = MAP_APPFONT ( 82 , 127 ) ;
Size = MAP_APPFONT ( 80 , 10 ) ;
TabStop = TRUE ;
- Text [ en-US ] = "~Leave gap";
+ Text [ en-US ] = "~Leave gap";
};
-
+
RadioButton RB_ASSUME_ZERO
{
Pos = MAP_APPFONT ( 82 , 141 ) ;
Size = MAP_APPFONT ( 80 , 10 ) ;
TabStop = TRUE ;
- Text [ en-US ] = "~Assume zero";
+ Text [ en-US ] = "~Assume zero";
};
-
+
RadioButton RB_CONTINUE_LINE
{
Pos = MAP_APPFONT ( 82 , 155 ) ;
Size = MAP_APPFONT ( 80 , 10 ) ;
TabStop = TRUE ;
- Text [ en-US ] = "~Continue line";
+ Text [ en-US ] = "~Continue line";
};
-
+
CheckBox CB_INCLUDE_HIDDEN_CELLS
{
Pos = MAP_APPFONT ( 12 , 172 ) ;
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 5b1d5647dc6c..9adbb66b298c 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR 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_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index e02b0f29078d..1624e70396c4 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR 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_TitleRotation.src b/chart2/source/controller/dialogs/tp_TitleRotation.src
index 2ac0355d39af..ec17cfdae2ac 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.src
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.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_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx
index 31b35b24a5b4..4466c81f206b 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.cxx
+++ b/chart2/source/controller/dialogs/tp_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/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx
index f1c6eb5609fd..936e4722ea10 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.hxx
+++ b/chart2/source/controller/dialogs/tp_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/tp_Trendline.src b/chart2/source/controller/dialogs/tp_Trendline.src
index efa11d3e2d67..16c7eff17f89 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.src
+++ b/chart2/source/controller/dialogs/tp_Trendline.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_TRENDLINE
{
Hide = TRUE ;
-// HelpID = HID_SCH_STAT ;
+// HelpID = HID_SCH_STAT ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 260 , 185 ) ;
RESOURCE_TRENDLINE( 260 - 12, 0 )
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index 03988116854e..8e5c9ed08cde 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR 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_Wizard_TitlesAndObjects.hrc b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc
index 44c340139782..da7edf4aea6c 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.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_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
index 1cd9c6162a46..0591ae7e6fe6 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +58,8 @@ public:
::com::sun::star::uno::XComponentContext >& 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<sal_Int32>(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_Int8> 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<uno::Reference<frame::XDispatch > > ChartController
+ uno::Sequence<uno::Reference<frame::XDispatch > > 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 <rtl/math.hxx>
#include <svtools/acceleratorexecute.hxx>
-#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<awt::XWindow> 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 <type scope="com::sun::star::frame">CommandGroup</type>.
*/
- 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; i<aAxes.getLength(); ++i )
lcl_addAxisTitle( aAxes[i], aTopLevelContainer, xModel );
-
+
// Diagram
aTopLevelContainer.push_back( aDiaOID );
}
@@ -339,7 +339,7 @@ void ImplObjectHierarchy::createAxesTree(
AxisHelper::getIndicesForAxis( xAxis, xDiagram, nCooSysIndex, nDimensionIndex, nAxisIndex );
if( nAxisIndex>0 && !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);
// <properties>
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<XInterface> *)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<aOldSeries.getLength(); ++nN )
ModifyListenerHelper::removeListener( aOldSeries[nN], m_xModifyEventForwarder );
m_aDataSeries.clear();
-
+
for( sal_Int32 i=0; i<aDataSeries.getLength(); ++i )
impl_addDataSeriesWithoutNotification( aDataSeries[i] );
}
diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx
index 07e72ea2890b..3ca1aee3e89c 100644
--- a/chart2/source/model/template/ChartType.hxx
+++ b/chart2/source/model/template/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
@@ -104,7 +104,7 @@ protected:
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& 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<rPolygon.SequenceX.getLength())
{
if(nPointIndex<rPolygon.SequenceX[nPolyIndex].getLength())
@@ -352,7 +352,7 @@ void appendPointSequence( drawing::PointSequenceSequence& rTarget
if(!nAddCount)
return;
sal_Int32 nOldCount = rTarget.getLength();
-
+
rTarget.realloc(nOldCount+nAddCount);
for(sal_Int32 nS=0; nS<nAddCount; nS++ )
rTarget[nOldCount+nS]=rAdd[nS];
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index fb7106d87096..fb48543ec0fe 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR 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/ControllerLockGuard.cxx b/chart2/source/tools/ControllerLockGuard.cxx
index 4ef430c5e483..ce40b0c01027 100644
--- a/chart2/source/tools/ControllerLockGuard.cxx
+++ b/chart2/source/tools/ControllerLockGuard.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR 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/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index acff332d4229..cfbff66ac1ca 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR 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/DataSource.cxx b/chart2/source/tools/DataSource.cxx
index edbf4dfacfeb..e08d78b4e9bb 100644
--- a/chart2/source/tools/DataSource.cxx
+++ b/chart2/source/tools/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/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index 0cc6ef4a4315..0f7aed78ac0d 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ uno::Reference< chart2::data::XDataSource > 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<aDataSeqences.getLength(); nN++ )
{
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 36afef60a6d4..56cc2154104a 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -379,7 +379,7 @@ StackMode DiagramHelper::getStackMode( const Reference< XDiagram > & 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<sal_Int32>& 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<nSize; ++i )
m_aData[i] = fDefaultData[i];
-
+
m_aRowLabels.clear();
m_aRowLabels.reserve( m_nRowCount );
generate_n( back_inserter( m_aRowLabels ), m_nRowCount,
@@ -156,7 +156,7 @@ Sequence< Sequence< double > > InternalData::getData() const
for( sal_Int32 i=0; i<m_nRowCount; ++i )
aResult[i] = lcl_ValarrayToSequence< tDataType::value_type >(
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<sal_Int32>(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<aResolution.getLength(); nN++ )
aResolution[nN]=1000;
- ::basegfx::B3DTuple aScale( BaseGFXHelper::GetScaleFromMatrix(
+ ::basegfx::B3DTuple aScale( BaseGFXHelper::GetScaleFromMatrix(
BaseGFXHelper::HomogenMatrixToB3DHomMatrix(
m_aMatrixSceneToScreen ) ) );
@@ -197,10 +197,10 @@ uno::Sequence< sal_Int32 > 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<aResolution.getLength(); nN++ )
aResolution[nN]=nMaxResolution;
}
-
+
return aResolution;
}
@@ -277,7 +277,7 @@ Sequence< ExplicitScaleData > 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<sal_Int32>(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<nPointCount )
{
@@ -800,7 +800,7 @@ void AreaChart::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)
@@ -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<drawing::XShape> xPointGroupShape_Shape =
- // uno::Reference<drawing::XShape>( xPointGroupShape_Shapes, uno::UNO_QUERY );
+ // uno::Reference< drawing::XShapes > xPointGroupShape_Shapes( createGroupShape(xSeriesGroupShape_Shapes) );
+ // uno::Reference<drawing::XShape> xPointGroupShape_Shape =
+ // uno::Reference<drawing::XShape>( 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<sal_Int32>(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<nNewSectorCount; nNewSector++)
{ // in first looping fCurveparam has value 0.0
-
+
// Calculate the values of the blending functions for actual curve parameter
BVector(fCurveparam, n, k, b, t);
-
+
// output point(fCurveparam) = sum over {input point * value of blending function}
fX = 0.0;
fY = 0.0;
@@ -526,7 +526,7 @@ void SplineCalculater::CalculateBSplines(
pNewX[nNewSector] = fX;
pNewY[nNewSector] = fY;
pNewZ[nNewSector] = fZ;
-
+
fCurveparam += fCurveStep; //for next looping
}
// add last control point to BSpline curve
diff --git a/chart2/source/view/charttypes/Splines.hxx b/chart2/source/view/charttypes/Splines.hxx
index 642522f53ebe..e9a8969d63b5 100644
--- a/chart2/source/view/charttypes/Splines.hxx
+++ b/chart2/source/view/charttypes/Splines.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR 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/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 840cbbe3e1e1..541255c5ade7 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -282,7 +282,7 @@ void VSeriesPlotter::releaseShapes()
::std::vector< VDataSeries* >::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<drawing::XShapes>( 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<sal_Int32>(rAvailableOuterRect.getWidth() - rConsumedOuterRect.getWidth());
sal_Int32 nDeltaHeight = static_cast<sal_Int32>(rAvailableOuterRect.getHeight() - rConsumedOuterRect.getHeight());
if( (aNewSize.Width + nDeltaWidth) < rAvailableOuterRect.getWidth()/3 )
nDeltaWidth = static_cast<sal_Int32>(rAvailableOuterRect.getWidth()/3 - aNewSize.Width);
aNewSize.Width += nDeltaWidth;
-
+
if( (aNewSize.Height + nDeltaHeight) < rAvailableOuterRect.getHeight()/3 )
nDeltaHeight = static_cast<sal_Int32>(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<sal_Int32> aKeySeq = xNumberFormats->queryKeys( util::NumberFormat::PERCENT,
+ Sequence<sal_Int32> 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<VTitle> 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<drawing::XShapes>( xGroup, uno::UNO_QUERY );
-
+
ShapeFactory aShapeFactory(xShapeFactory);
drawing::Position3D aPos(0,0,0);
for(sal_Int32 nS=0;nS<ShapeFactory::getSymbolCount();nS++)
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index 577f450172b5..8cf9da5ccd47 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR 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/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx
index 24ec5a285468..d03442b4ca77 100644
--- a/chart2/source/view/main/LabelPositionHelper.cxx
+++ b/chart2/source/view/main/LabelPositionHelper.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -454,7 +454,7 @@ void LabelPositionHelper::correctPositionForRotation( const uno::Reference< draw
lcl_correctRotation_Left( fXCorrection, fYCorrection, fAnglePositiveDegree, aSize, bRotateAroundCenter );
break;
case LABEL_ALIGN_RIGHT:
- lcl_correctRotation_Right( fXCorrection, fYCorrection, fAnglePositiveDegree, aSize, bRotateAroundCenter );
+ lcl_correctRotation_Right( fXCorrection, fYCorrection, fAnglePositiveDegree, aSize, bRotateAroundCenter );
break;
case LABEL_ALIGN_TOP:
lcl_correctRotation_Top( fXCorrection, fYCorrection, fAnglePositiveDegree, aSize, bRotateAroundCenter );
diff --git a/chart2/source/view/main/Linear3DTransformation.cxx b/chart2/source/view/main/Linear3DTransformation.cxx
index 9292ee6eb757..785236873dbf 100644
--- a/chart2/source/view/main/Linear3DTransformation.cxx
+++ b/chart2/source/view/main/Linear3DTransformation.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR 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/NumberFormatterWrapper.cxx b/chart2/source/view/main/NumberFormatterWrapper.cxx
index 4e4cd342506c..6b409290785a 100644
--- a/chart2/source/view/main/NumberFormatterWrapper.cxx
+++ b/chart2/source/view/main/NumberFormatterWrapper.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR 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/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx
index 08f43dc7064d..7a715010c28f 100644
--- a/chart2/source/view/main/PlotterBase.cxx
+++ b/chart2/source/view/main/PlotterBase.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -127,7 +127,7 @@ bool PlotterBase::isValidPosition( const drawing::Position3D& rPos )
return false;
if( ::rtl::math::isInf(rPos.PositionZ) )
return false;
- return true;
+ return true;
}
//.............................................................................
diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx
index deb390b70a79..c1f7ad4af7bb 100644
--- a/chart2/source/view/main/PlottingPositionHelper.cxx
+++ b/chart2/source/view/main/PlottingPositionHelper.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +393,7 @@ void PolarPlottingPositionHelper::setScales( const uno::Sequence< ExplicitScaleD
double fTranslateY = fTranslate;
double fTranslateZ = fTranslate;
- double fScaleX = fScale;
+ double fScaleX = fScale;
double fScaleY = fScale;
double fScaleZ = fScale;
@@ -421,7 +421,7 @@ void PolarPlottingPositionHelper::setScales( const uno::Sequence< ExplicitScaleD
aRet.translate(fTranslateX, fTranslateY, fTranslateZ);//x first
aRet.scale(fScaleX, fScaleY, fScaleZ);//x first
-
+
aRet = rMatrixScreenToScene * aRet;
return aRet;
}
@@ -451,11 +451,11 @@ double PolarPlottingPositionHelper::getWidthAngleDegree( double& fStartLogicValu
double fStartAngleDegree = this->transformToAngleDegree( 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<drawing::XShape>
bool bInvertPolygon = false;
bool bInvertNormals = false;
-
+
if(bRotateZ)
{
//bars
@@ -678,7 +678,7 @@ uno::Reference<drawing::XShape>
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<drawing::XShape>
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<drawing::XShape>
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<fY_First)
fMax=fY_First;
if(fMax<fY_Last)
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 7101a984ee24..528263450e11 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ void lcl_placeLegendEntries(
sal_Int32 nLegendWidth = -(nCurrentXPos-nXPadding);
rOutLegendSize.Width = nLegendWidth;
- awt::Point aPos(0,0);
+ awt::Point aPos(0,0);
for( sal_Int32 nEntry=0; nEntry<nNumberOfEntries; nEntry++ )
{
Reference< drawing::XShape > 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 @@
<menu:menuitem menu:id=".uno:DiagramType" menu:helpid="30528" menu:label="" />
<menu:menuitem menu:id=".uno:DataRanges" menu:helpid="30514" menu:label="" />
<menu:menuitem menu:id=".uno:View3D" menu:helpid="30527" menu:label="" />
-
+
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ToolsMenu" menu:label="" >
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 @@
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
</toolbar:toolbar> \ 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 @@
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
</toolbar:toolbar> \ 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 @@
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" />
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" />
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
</toolbar:toolbar> \ 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 @@
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" />
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" />
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
</toolbar:toolbar> \ 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<sal_Int32>(aPos.Y + nLength * (1.0 - fPercentage)); // y scale goes from top to bottom
+ aOutPosition.Y = static_cast<sal_Int32>(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 <set>
-/**
+/**
* 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<sal_Int16>& aStateSet)
+ const ::com::sun::star::uno::Sequence<sal_Int16>& aStateSet)
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence<sal_Int16> SAL_CALL getStates()
+ virtual ::com::sun::star::uno::Sequence<sal_Int16> 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<rtl::OUString>& aPropertyNames );
- virtual void Commit();
+ virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& 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<sequence<long>>
- SC_ADDINARG_DOUBLE_ARRAY, // sequence<sequence<double>>
- SC_ADDINARG_STRING_ARRAY, // sequence<sequence<string>>
- SC_ADDINARG_MIXED_ARRAY, // sequence<sequence<any>>
- SC_ADDINARG_VALUE_OR_ARRAY, // any
- SC_ADDINARG_CELLRANGE, // XCellRange
- SC_ADDINARG_CALLER, // XPropertySet
- SC_ADDINARG_VARARGS // sequence<any>
+ SC_ADDINARG_NONE, // -
+ SC_ADDINARG_INTEGER, // long
+ SC_ADDINARG_DOUBLE, // double
+ SC_ADDINARG_STRING, // string
+ SC_ADDINARG_INTEGER_ARRAY, // sequence<sequence<long>>
+ SC_ADDINARG_DOUBLE_ARRAY, // sequence<sequence<double>>
+ SC_ADDINARG_STRING_ARRAY, // sequence<sequence<string>>
+ SC_ADDINARG_MIXED_ARRAY, // sequence<sequence<any>>
+ SC_ADDINARG_VALUE_OR_ARRAY, // any
+ SC_ADDINARG_CELLRANGE, // XCellRange
+ SC_ADDINARG_CALLER, // XPropertySet
+ SC_ADDINARG_VARARGS // sequence<any>
};
//------------------------------------------------------------------------
@@ -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<com::sun::star::uno::Any> aArgs;
- com::sun::star::uno::Sequence<com::sun::star::uno::Any> aVarArg;
- com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xCaller;
- BOOL bValidCount;
+ const ScUnoAddInFuncData* pFuncData;
+ com::sun::star::uno::Sequence<com::sun::star::uno::Any> aArgs;
+ com::sun::star::uno::Sequence<com::sun::star::uno::Any> aVarArg;
+ com::sun::star::uno::Reference<com::sun::star::uno::XInterface> 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<com::sun::star::sheet::XVolatileResult> xVarRes;
- void ExecuteCallWithArgs(
+ void ExecuteCallWithArgs(
com::sun::star::uno::Sequence<com::sun::star::uno::Any>& 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<com::sun::star::sheet::XVolatileResult>
- 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 <tools/stream.hxx>
@@ -82,7 +82,7 @@ const SCSIZE SCSIZE_MAX = ::std::numeric_limits<SCSIZE>::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 <TRUE/>, a 3D reference (Sheet1:Sheet2)
+ @param bOnlyAcceptSingle If <TRUE/>, 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 <svl/smplhint.hxx>
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<USHORT>& 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 <svl/lstner.hxx>
@@ -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<com::sun::star::sheet::XSheetCellRanges>
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<com::sun::star::table::XCellRange>
@@ -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<sal_Int8>& getUnoTunnelId();
-// static ScChart2DataSequence* getImplementation( const com::sun::star::uno::Reference<
-// com::sun::star::uno::XInterface> xObj );
+// static const com::sun::star::uno::Sequence<sal_Int8>& 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<Item> 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<sal_Int32> 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<HiddenRangeListener> 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<sal_Int8>& getUnoTunnelId();
-// static ScChart2DataSequence* getImplementation( const com::sun::star::uno::Reference<
-// com::sun::star::uno::XInterface> xObj );
+// static const com::sun::star::uno::Sequence<sal_Int8>& 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<ExternalRefListener> mpExtRefListener;
::std::auto_ptr< ::std::vector<ScSharedTokenRef> > 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<ScSharedTokenRef>* 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<RangeListenerItem> 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 <vector>
-/**
- * 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<USHORT>& 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<A,D>::GetIterEnd() const
return nIterEnd;
}
-
+
template< typename A, typename D >
bool ScCompressedArrayIterator<A,D>::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 <svl/lstner.hxx>
@@ -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<com::sun::star::beans::PropertyValue>& rSeq );
- static void FillProperties(
+ static void FillProperties(
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& 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<com::sun::star::beans::PropertyValue>& rSeq );
- static void FillProperties(
+ static void FillProperties(
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& 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<com::sun::star::sheet::XSubTotalDescriptor> 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 <cppuhelper/implbase2.hxx>
#include <svl/lstner.hxx>
#include <svl/svarray.hxx>
-#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<SCROW>& rBreaks);
SCROW first();
SCROW next();
-
+
private:
::std::set<SCROW>& mrBreaks;
::std::set<SCROW>::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 <com/sun/star/uno/Reference.hxx>
#include <vos/ref.hxx>
#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<ScPoolHelper> 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<ScDPObject> m_listDPObjectsInClip;
+ std::list<ScDPObject> m_listDPObjectsInClip;
std::list<ScDPTableDataCache*> 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<SvxForbiddenCharactersTable> xForbiddenCharacters;
- ScFieldEditEngine* pCacheFieldEditEngine;
+ ScFieldEditEngine* pCacheFieldEditEngine;
::std::auto_ptr<ScDocProtection> pDocProtection;
::std::auto_ptr<ScClipParam> 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<SvxForbiddenCharactersTable> GetForbiddenCharacters();
- void SetForbiddenCharacters( const vos::ORef<SvxForbiddenCharactersTable> xNew );
+ void SetForbiddenCharacters( const vos::ORef<SvxForbiddenCharactersTable> 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<com::sun::star::uno::XAggregation> xNumberAgg;
com::sun::star::uno::Reference<com::sun::star::uno::XInterface> 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<com::sun::star::uno::XAggregation> 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<ScDPItemData*>(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<com::sun::star::container::XNameAccess> 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<double,double> & rRight );
-// used for DataPilot Panel
+// used for DataPilot Panel
ScDPInfoWnd* GetDPInfoWnd( ScTabViewShell *pViewShell );
bool ChkDPTableOverlap( ScDocument *pDestDoc, std::list<ScDPObject> & 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<ScDPTableData> mpTableData;
// cached data
com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> 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<com::sun::star::sheet::XDimensionsSupplier> 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<ScDPLabelData::Member>& 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<rtl::OUString> GetRegisteredSources();
static com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier>
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, <b>excluding the data layout
+ /**
+ * @param nCount number of row fields, <b>excluding the data layout
* field if exists</b>.
*/
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<rtl::OUString> 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<rtl::OUString> mpLayoutName;
::std::auto_ptr<rtl::OUString> 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 <String, ScDPSaveMember*, rtl::OUStringHash> MemberHash;
- typedef std::list <ScDPSaveMember*> MemberList;
+ typedef std::hash_map <String, ScDPSaveMember*, rtl::OUStringHash> MemberHash;
+ typedef std::list <ScDPSaveMember*> 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<String> & deletedDims);
+ const std::list<String> & 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<rtl::OUString> 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<ScDPCacheTable::Criterion>& rCriteria, const ::std::hash_set<sal_Int32>& 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<ScDPValueData> 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<long>& 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<ScDPItemData*>* mpTableDataValues; //Data Pilot Table's index - value map
- std::vector<SCROW>* mpSourceData; //Data Pilot Table's Source data
- std::vector<SCROW>* mpGlobalOrder; //Sorted members index
- std::vector<SCROW>* mpIndexOrder; //Index the sorted number
- std::vector<ScDPItemData*> mrLabelNames; //Source Label data
- std::vector<BOOL> mbEmptyRow; //If empty row?
- mutable ScDPItemDataPool maAdditionalDatas;
+ std::vector<ScDPItemData*>* mpTableDataValues; //Data Pilot Table's index - value map
+ std::vector<SCROW>* mpSourceData; //Data Pilot Table's Source data
+ std::vector<SCROW>* mpGlobalOrder; //Sorted members index
+ std::vector<SCROW>* mpIndexOrder; //Index the sorted number
+ std::vector<ScDPItemData*> mrLabelNames; //Source Label data
+ std::vector<BOOL> 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<ScDPItemData*>& 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 <com/sun/star/sheet/MemberResult.hpp>
#include <com/sun/star/sheet/DataResult.hpp>
#include <com/sun/star/uno/Sequence.hxx>
-#include "global.hxx" // enum ScSubTotalFunc
+#include "global.hxx" // enum ScSubTotalFunc
#include "dpcachetable.hxx"
#include <hash_map>
#include <hash_set>
@@ -94,7 +94,7 @@ public:
typedef ::std::vector<sal_Int32> 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<ScDPDimension*>& ppDim, const ::std::vector<ScDPLevel*>& ppLev,
+ LateInitParams( const ::std::vector<ScDPDimension*>& ppDim, const ::std::vector<ScDPLevel*>& 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<ScDPDimension*>& ppDim,
+ void InitFrom( const ::std::vector<ScDPDimension*>& ppDim,
const ::std::vector<ScDPLevel*>& 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<SCROW>& aDataMembers,
const ::std::vector<ScDPValueData>& 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<ScDPValueData>& 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<ScDPValueData>& 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<com::sun::star::sheet::DataResult>& 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<ScDPDimension*>& ppDim,
+ void InitFrom( const ::std::vector<ScDPDimension*>& ppDim,
const ::std::vector<ScDPLevel*>& 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<SCROW>& aMembers ) const;
-
- // modifies existing members, allocates data dimensions
- void ProcessData( const ::std::vector<SCROW>& aMembers,
+
+ // modifies existing members, allocates data dimensions
+ void ProcessData( const ::std::vector<SCROW>& aMembers,
const ScDPResultDimension* pDataDim,
const ::std::vector<SCROW>& aDataMembers,
- const ::std::vector<ScDPValueData>& aValues ) const; //! Test
+ const ::std::vector<ScDPValueData>& 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<ScDPValueData>& aValues,
const ScDPSubTotalState& rSubState );
// End Comments
- void FillDataRow( const ScDPResultDimension* pRefDim,
+ void FillDataRow( const ScDPResultDimension* pRefDim,
com::sun::star::uno::Sequence<com::sun::star::sheet::DataResult>& 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 <memory>
#include <tools/string.hxx>
#include <tools/list.hxx>
-#include "global.hxx" // enum ScSubTotalFunc
+#include "global.hxx" // enum ScSubTotalFunc
#include <com/sun/star/sheet/XDimensionsSupplier.hpp>
#include <com/sun/star/sheet/XHierarchiesSupplier.hpp>
#include <com/sun/star/sheet/XLevelsSupplier.hpp>
@@ -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<com::sun::star::sheet::MemberResult>* pColResults;
com::sun::star::uno::Sequence<com::sun::star::sheet::MemberResult>* pRowResults;
- List aColLevelList;
- List aRowLevelList;
- BOOL bResultOverflow;
+ List aColLevelList;
+ List aRowLevelList;
+ BOOL bResultOverflow;
::std::auto_ptr<rtl::OUString> 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<sal_Int32>& 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<com::sun::star::sheet::MemberResult>*
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<rtl::OUString> mpLayoutName;
::std::auto_ptr<rtl::OUString> 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<com::sun::star::sheet::GeneralFunction> 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<com::sun::star::sheet::GeneralFunction> 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<rtl::OUString> 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 <svl/lstner.hxx>
#include <svl/itemprop.hxx>
#include <editeng/editdata.hxx>
@@ -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<rtl::OUString> GetPropertyNames();
public:
ScFilterOptions();
- virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames );
- virtual void Commit();
+ virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& 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<const ScMatrixCellResultToken*>(p) : NULL);
if (pMatResult)
{
- const ScMatrixFormulaCellToken* pNewMatFormula =
+ const ScMatrixFormulaCellToken* pNewMatFormula =
dynamic_cast<const ScMatrixFormulaCellToken*>(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<rtl::OUString>& aPropertyNames );
- virtual void Commit();
+ virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& 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 <cppuhelper/implbase2.hxx>
#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<beans::XPropertyChangeListener>&) \
- throw(beans::UnknownPropertyException, \
- lang::WrappedTargetException, uno::RuntimeException) \
- { DBG_ERROR("not implemented"); } \
- void SAL_CALL ClassName::removePropertyChangeListener( const rtl::OUString&, \
- const uno::Reference<beans::XPropertyChangeListener>&) \
- throw(beans::UnknownPropertyException, \
- lang::WrappedTargetException, uno::RuntimeException) \
- { DBG_ERROR("not implemented"); } \
- void SAL_CALL ClassName::addVetoableChangeListener( const rtl::OUString&, \
- const uno::Reference<beans::XVetoableChangeListener>&) \
- throw(beans::UnknownPropertyException, \
- lang::WrappedTargetException, uno::RuntimeException) \
- { DBG_ERROR("not implemented"); } \
- void SAL_CALL ClassName::removeVetoableChangeListener( const rtl::OUString&, \
- const uno::Reference<beans::XVetoableChangeListener>&) \
- 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<beans::XPropertyChangeListener>&) \
+ throw(beans::UnknownPropertyException, \
+ lang::WrappedTargetException, uno::RuntimeException) \
+ { DBG_ERROR("not implemented"); } \
+ void SAL_CALL ClassName::removePropertyChangeListener( const rtl::OUString&, \
+ const uno::Reference<beans::XPropertyChangeListener>&) \
+ throw(beans::UnknownPropertyException, \
+ lang::WrappedTargetException, uno::RuntimeException) \
+ { DBG_ERROR("not implemented"); } \
+ void SAL_CALL ClassName::addVetoableChangeListener( const rtl::OUString&, \
+ const uno::Reference<beans::XVetoableChangeListener>&) \
+ throw(beans::UnknownPropertyException, \
+ lang::WrappedTargetException, uno::RuntimeException) \
+ { DBG_ERROR("not implemented"); } \
+ void SAL_CALL ClassName::removeVetoableChangeListener( const rtl::OUString&, \
+ const uno::Reference<beans::XVetoableChangeListener>&) \
+ throw(beans::UnknownPropertyException, \
+ lang::WrappedTargetException, uno::RuntimeException) \
{ DBG_ERROR("not implemented"); }
-#define SC_QUERYINTERFACE(x) \
- if (rType == getCppuType((const uno::Reference<x>*)0)) \
+#define SC_QUERYINTERFACE(x) \
+ if (rType == getCppuType((const uno::Reference<x>*)0)) \
{ return uno::makeAny(uno::Reference<x>(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<x>*)0)) \
+#define SC_QUERY_MULTIPLE(x,y) \
+ if (rType == getCppuType((const uno::Reference<x>*)0)) \
{ uno::Any aR; aR <<= uno::Reference<x>(static_cast<y*>(this)); return aR; }
@@ -100,12 +100,12 @@ class ScIndexEnumeration : public cppu::WeakImplHelper2<
private:
com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> 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<com::sun::star::uno::XInterface>
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<com::sun::star::beans::XPropertySet>& 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 <osl/mutex.hxx>
-// 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<rtl::OUString>& aPropertyNames );
- virtual void Commit();
+ virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& 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 <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/sheet/DataPilotFieldReference.hpp>
#include <com/sun/star/sheet/DataPilotFieldSortInfo.hpp>
@@ -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<Member> 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<sal_uInt16, sal_uInt16> 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 <FALSE/>, 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<sal_Int8>,
- // may or may not contain 0-bytes at the end
+ // rAny must contain Sequence<sal_Int8>,
+ // 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 <tools/stream.hxx>
-// 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<ScSharedTokenRef>& rRefTokens, const ::rtl::OUString& rRangeStr, ScDocument* pDoc,
@@ -60,7 +60,7 @@ public:
static void getRangeListFromTokens(ScRangeList& rRangeList, const ::std::vector<ScSharedTokenRef>& 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/dialogs.hrc> // ->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 SID_VALIDITY_REFERENCE (SC_MESSAGE_START + 61)
+#define SID_VALIDITY_REFERENCE (SC_MESSAGE_START + 61)
//-->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 * CreateScValidationDlg( Window* pParent, //add for ScValidationDlg
- // const SfxItemSet* pArgSet,int nId ) = 0;
+ // const SfxItemSet* pArgSet,int nId ) = 0;
virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, //add for ScValidationDlg
const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh ) = 0;
//-->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 <svx/svxids.hrc>
#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 <TRUE/> 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 <vcl/timer.hxx>
#include <svl/lstner.hxx>
-#include "global.hxx" // ScInputMode
-#include "markdata.hxx" //ScMarkData
+#include "global.hxx" // ScInputMode
+#include "markdata.hxx" //ScMarkData
#include "shellids.hxx"
#include <unotools/options.hxx>
#include <tools/shl.hxx>
@@ -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
- //void SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm = NULL );
- SC_DLLPUBLIC void SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm = NULL );
+ //void SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm = NULL );
+ SC_DLLPUBLIC void SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm = NULL );
//-->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<rtl::OUString> 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 <com/sun/star/lang/Locale.hpp>
#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<ScTableProtection> pTabProtection;
- USHORT* pColWidth;
+ USHORT* pColWidth;
::boost::shared_ptr<ScFlatUInt16RowSegments> mpRowHeights;
- BYTE* pColFlags;
+ BYTE* pColFlags;
ScBitMaskCompressedArray< SCROW, BYTE>* pRowFlags;
::boost::shared_ptr<ScFlatBoolColSegments> mpHiddenCols;
::boost::shared_ptr<ScFlatBoolRowSegments> mpHiddenRows;
@@ -137,52 +137,52 @@ private:
::std::set<SCCOL> maColPageBreaks;
::std::set<SCCOL> 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<USHORT>& 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<SCROW>& rBreaks );
void SetColManualBreaks( const ::std::set<SCCOL>& 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 <sfx2/lnkbase.hxx>
#include <sfx2/objsh.hxx>
-//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<sal_Int8> getPasswordHash(ScPasswordHash eHash) const = 0;
- virtual void setPasswordHash(const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword,
+ virtual void setPasswordHash(const ::com::sun::star::uno::Sequence<sal_Int8>& 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<sal_Int8> getPasswordHash(ScPasswordHash eHash) const;
- virtual void setPasswordHash(const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword,
+ virtual void setPasswordHash(const ::com::sun::star::uno::Sequence<sal_Int8>& 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<sal_Int8> getPasswordHash(ScPasswordHash eHash) const;
- virtual void setPasswordHash(const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword,
+ virtual void setPasswordHash(const ::com::sun::star::uno::Sequence<sal_Int8>& 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 <editeng/unotext.hxx>
#include <svl/brdcst.hxx>
@@ -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. <b>Be extra careful
- * not to mix use of this smart pointer type with ScTokenRef</b>, 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. <b>Be extra careful
+ * not to mix use of this smart pointer type with ScTokenRef</b>, 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<com::sun::star::frame::XModel>& xModel,
com::sun::star::uno::Reference<com::sun::star::uno::XInterface>& xWriter,
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& 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<com::sun::star::uno::Any>& 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 <code>getPropertySetInfo</code>. 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; i++)
{
@@ -184,7 +184,7 @@ void ScAttrArray::Reset( const ScPatternAttr* pPattern, BOOL bAlloc )
else
{
nCount = nLimit = 0;
- pData = NULL; // muss sofort wieder belegt werden !
+ pData = NULL; // muss sofort wieder belegt werden !
}
}
}
@@ -230,12 +230,12 @@ BOOL ScAttrArray::Concat(SCSIZE nPos)
BOOL ScAttrArray::Search( SCROW nRow, SCSIZE& nIndex ) const
{
- long nLo = 0;
- long nHi = static_cast<long>(nCount) - 1;
- long nStartRow = 0;
- long nEndRow = 0;
- long i = 0;
- BOOL bFound = (nCount == 1);
+ long nLo = 0;
+ long nHi = static_cast<long>(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<SCROW>(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; nAdd<nSize; nAdd++)
pDocument->ApplyAttr( 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<SCCOL>(nCol),static_cast<SCROW>(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<nCount; i++ )
//UNUSED2009-05 aList.Insert( new SCTAB( pTabArr[i] ) );
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 return ( nCount > 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; i<nCount; i++ )
//UNUSED2009-05 pTabArr[i] = *( (SCTAB*)rList.GetObject( i ) );
//UNUSED2009-05 }
@@ -667,19 +667,19 @@ SfxItemPresentation ScTableListItem::GetPresentation
ScPageHFItem::ScPageHFItem( USHORT nWhichP )
: SfxPoolItem ( nWhichP ),
- pLeftArea ( NULL ),
+ pLeftArea ( NULL ),
pCenterArea ( NULL ),
- pRightArea ( NULL )
+ pRightArea ( NULL )
{
}
//------------------------------------------------------------------------
ScPageHFItem::ScPageHFItem( const ScPageHFItem& rItem )
- : SfxPoolItem ( rItem ),
- pLeftArea ( NULL ),
+ : SfxPoolItem ( rItem ),
+ pLeftArea ( NULL ),
pCenterArea ( NULL ),
- pRightArea ( NULL )
+ pRightArea ( NULL )
{
if ( rItem.pLeftArea )
pLeftArea = rItem.pLeftArea->Clone();
@@ -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<long>(nCount)-1, static_cast<long>(nRow) );
- long i = 0;
- BOOL bFound = FALSE;
+ long nLo = nOldLo = 0;
+ long nHi = nOldHi = Min(static_cast<long>(nCount)-1, static_cast<long>(nRow) );
+ long i = 0;
+ BOOL bFound = FALSE;
// quite continuous distribution? => interpolating search
- BOOL bInterpol = (static_cast<SCSIZE>(nMaxRow - nMinRow) < nCount * 2);
- SCROW nR;
+ BOOL bInterpol = (static_cast<SCSIZE>(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<SCSIZE>(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<SCSIZE>(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; i<nCount; i++)
{
ScFormulaCell* p = (ScFormulaCell*) pItems[i].pCell;
@@ -1903,11 +1903,11 @@ void ScColumn::SetDirty()
void ScColumn::SetDirty( const ScRange& rRange )
-{ // broadcastet alles innerhalb eines Range, mit FormulaTrack
+{ // broadcastet alles innerhalb eines Range, mit FormulaTrack
if ( !pItems || !nCount )
return ;
BOOL bOldAutoCalc = pDocument->GetAutoCalc();
- 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; i<nCount; i++)
{
ScFormulaCell* p = (ScFormulaCell*) pItems[i].pCell;
@@ -1996,7 +1996,7 @@ void ScColumn::SetDirtyAfterLoad()
void ScColumn::SetRelNameDirty()
{
BOOL bOldAutoCalc = pDocument->GetAutoCalc();
- pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
+ pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
for (SCSIZE i=0; i<nCount; i++)
{
ScFormulaCell* p = (ScFormulaCell*) pItems[i].pCell;
@@ -2026,7 +2026,7 @@ void ScColumn::CalcAll()
if ( pFCell->GetCode()->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; i<nCount; i++)
{
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 65e896c7f2c4..e93fd9f3718c 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +46,10 @@
#include "formula/errorcodes.hxx"
#include "formula/token.hxx"
#include "brdcst.hxx"
-#include "docoptio.hxx" // GetStdPrecision fuer GetMaxNumberStringLen
+#include "docoptio.hxx" // GetStdPrecision fuer GetMaxNumberStringLen
#include "subtotal.hxx"
#include "markdata.hxx"
-#include "detfunc.hxx" // fuer Notizen bei DeleteRange
+#include "detfunc.hxx" // fuer Notizen bei DeleteRange
#include "postit.hxx"
#include "stringutil.hxx"
@@ -60,11 +60,11 @@ using ::rtl::OUString;
using ::rtl::OUStringBuffer;
// Err527 Workaround
-extern const ScFormulaCell* pLastFormulaTreeTop; // in cellform.cxx
+extern const ScFormulaCell* pLastFormulaTreeTop; // in cellform.cxx
using namespace formula;
// STATIC DATA -----------------------------------------------------------
-BOOL ScColumn::bDoubleAlloc = FALSE; // fuer Import: Groesse beim Allozieren verdoppeln
+BOOL ScColumn::bDoubleAlloc = FALSE; // fuer Import: Groesse beim Allozieren verdoppeln
void ScColumn::Insert( SCROW nRow, ScBaseCell* pNewCell )
@@ -80,7 +80,7 @@ void ScColumn::Insert( SCROW nRow, ScBaseCell* pNewCell )
}
if ( !bIsAppended )
{
- SCSIZE nIndex;
+ SCSIZE nIndex;
if (Search(nRow, nIndex))
{
ScBaseCell* pOldCell = pItems[nIndex].pCell;
@@ -203,13 +203,13 @@ void ScColumn::Append( SCROW nRow, ScBaseCell* pCell )
void ScColumn::Delete( SCROW nRow )
{
- SCSIZE nIndex;
+ SCSIZE nIndex;
if (Search(nRow, 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, 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<SCSIZE>(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<A,D>::GetLastUnequalAccess( A nStart, const D& rCompare )
}
-// === ScSummableCompressedArray =============================================
+// === ScSummableCompressedArray =============================================
template< typename A, typename D >
unsigned long ScSummableCompressedArray<A,D>::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<nEntryCount; i++)
if ( ! (*ppEntries[i] == *r.ppEntries[i]) )
@@ -1308,8 +1308,8 @@ void lcl_Extend( ScRange& rRange, ScDocument* pDoc, BOOL bLines )
if (bLines)
{
- if (nStartCol > 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; i<nEntryCount; i++)
ppEntries[i]->UpdateReference(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; i<nEntryCount; i++)
ppEntries[i]->UpdateMoveTab( 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; i<nCount; i++)
InsertNew( rList[i]->Clone() );
- //! 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; i<nCount; i++)
InsertNew( rList[i]->Clone(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; i<nCount && bEqual; i++) // Eintraege sind sortiert
- if ( !(*this)[i]->EqualEntries(*r[i]) ) // Eintraege unterschiedlich ?
+ for (USHORT i=0; i<nCount && bEqual; i++) // Eintraege sind sortiert
+ if ( !(*this)[i]->EqualEntries(*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; i<nCount; i++)
diff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxx
index 39675704fb70..233bc4e73d70 100644
--- a/sc/source/core/data/dbdocutl.cxx
+++ b/sc/source/core/data/dbdocutl.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB
BOOL bError = FALSE;
ULONG nFormatIndex = 0;
- //! wasNull calls only if null value was found?
+ //! wasNull calls only if null value was found?
try
{
@@ -68,7 +68,7 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB
{
case sdbc::DataType::BIT:
case sdbc::DataType::BOOLEAN:
- //! use language from doc (here, date/time and currency)?
+ //! use language from doc (here, date/time and currency)?
nFormatIndex = pDoc->GetFormatTable()->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; (i<nCount) && (mpParam->GetEntry(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<bool> 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<MAXQUERY) && (aParam.GetEntry(i).bDoQuery); i++)
{
@@ -1131,7 +1131,7 @@ ScQueryCellIterator::ScQueryCellIterator(ScDocument* pDocument, SCTAB nTable,
nIndex, rEntry.nVal));
}
}
- nNumFormat = 0; // werden bei GetNumberFormat initialisiert
+ nNumFormat = 0; // werden bei GetNumberFormat initialisiert
pAttrArray = 0;
nAttrEndRow = 0;
}
@@ -1157,7 +1157,7 @@ ScBaseCell* ScQueryCellIterator::GetThis()
do
{
if ( ++nCol > 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<nCount; i++)
if ( pNextEnd[i] < nSkipTo )
nSkipTo = pNextEnd[i];
- nRow = nSkipTo; // leere Zeilen ueberspringen
+ nRow = nSkipTo; // leere Zeilen ueberspringen
}
bRowEmpty = bEmpty;
- nCol = nStartCol; // wieder links anfangen
+ nCol = nStartCol; // wieder links anfangen
}
// return NULL;
@@ -1948,7 +1948,7 @@ ScUsedAreaIterator::~ScUsedAreaIterator()
BOOL ScUsedAreaIterator::GetNext()
{
- // Iteratoren weiterzaehlen
+ // Iteratoren weiterzaehlen
if ( pCell && IsGreater( nNextCol, nNextRow, nCellCol, nCellRow ) )
pCell = aCellIter.GetNext( nCellCol, nCellRow );
@@ -1962,39 +1962,39 @@ BOOL ScUsedAreaIterator::GetNext()
if ( pPattern && nAttrRow == nNextRow && nAttrCol1 < nNextCol )
nAttrCol1 = nNextCol;
- // naechsten Abschnitt heraussuchen
+ // naechsten Abschnitt heraussuchen
BOOL bFound = TRUE;
BOOL bUseCell = FALSE;
if ( pCell && pPattern )
{
- if ( IsGreater( nCellCol, nCellRow, nAttrCol1, nAttrRow ) ) // vorne nur Attribute ?
+ if ( IsGreater( nCellCol, nCellRow, nAttrCol1, nAttrRow ) ) // vorne nur Attribute ?
{
pFoundCell = NULL;
pFoundPattern = pPattern;
nFoundRow = nAttrRow;
nFoundStartCol = nAttrCol1;
- if ( nCellRow == nAttrRow && nCellCol <= nAttrCol2 ) // auch Zelle im Bereich ?
- nFoundEndCol = nCellCol - 1; // nur bis vor der Zelle
+ if ( nCellRow == nAttrRow && nCellCol <= nAttrCol2 ) // auch Zelle im Bereich ?
+ nFoundEndCol = nCellCol - 1; // nur bis vor der Zelle
else
- nFoundEndCol = nAttrCol2; // alles
+ nFoundEndCol = nAttrCol2; // alles
}
else
{
bUseCell = TRUE;
- if ( nAttrRow == nCellRow && nAttrCol1 == nCellCol ) // Attribute auf der Zelle ?
+ if ( nAttrRow == nCellRow && nAttrCol1 == nCellCol ) // Attribute auf der Zelle ?
pFoundPattern = pPattern;
else
pFoundPattern = NULL;
}
}
- else if ( pCell ) // nur Zelle -> 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<SCROW>& rBreaks) :
+ScRowBreakIterator::ScRowBreakIterator(set<SCROW>& 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<USHORT> 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; nR<nRangeCount && !bTouched; nR++)
@@ -684,11 +684,11 @@ void ScDocument::CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, BOOL bNewScenario
}
}
- pTab[nSrcTab]->SetActiveScenario(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<ScDPTableDataCache*>::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<ScDPTableDataCache*>::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<ScDPTableDataCache*>::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<ScDPTableDataCache*>& usedlist )
{
for ( std::list<ScDPTableDataCache*>::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; i<nCount; i++)
if ( nID == (*pDPCollection)[i]->GetCacheId() )
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<short>( 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<USHORT>((nDif*64)/nUsed); // max.256 (SC_DOCCOMP_MAXDIFF)
+ return static_cast<USHORT>((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<USHORT>((nDif*64)/nUsed); // max.256
+ return static_cast<USHORT>((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<SCCOLROW>(( 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<SCCOL>(nThisRow), nThisTab, rOtherDoc, static_cast<SCCOL>(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<ULONG>(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; nThisTab<nThisCount; nThisTab++)
{
SCTAB nOtherTab = SCTAB_MAX;
- if (!IsScenario(nThisTab)) // Szenarien weglassen
+ if (!IsScenario(nThisTab)) // Szenarien weglassen
{
GetName( nThisTab, aThisName );
for (SCTAB nTemp=0; nTemp<nOtherCount && nOtherTab>MAXTAB; 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<nThisCount; nThisTab++)
@@ -1003,9 +1003,9 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc )
SCROW nEndRow = Max(nThisEndRow, nOtherEndRow);
SCCOL nThisCol;
SCROW nThisRow;
- ULONG n1,n2; // fuer AppendDeleteRange
+ ULONG n1,n2; // fuer AppendDeleteRange
- //! ein Progress ueber alle Tabellen ???
+ //! ein Progress ueber alle Tabellen ???
String aTabName;
GetName( nThisTab, aTabName );
String aTemplate = ScGlobal::GetRscString(STR_PROGRESS_COMPARING);
@@ -1013,20 +1013,20 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc )
aProText += aTabName;
aProText += aTemplate.GetToken( 1, '#' );
ScProgress aProgress( GetDocumentShell(),
- aProText, 3*nThisEndRow ); // 2x FindOrder, 1x hier
- long nProgressStart = 2*nThisEndRow; // start fuer hier
+ aProText, 3*nThisEndRow ); // 2x FindOrder, 1x hier
+ long nProgressStart = 2*nThisEndRow; // start fuer hier
SCCOLROW* pTempRows = new SCCOLROW[nThisEndRow+1];
SCCOLROW* pOtherRows = new SCCOLROW[nThisEndRow+1];
SCCOLROW* pOtherCols = new SCCOLROW[nThisEndCol+1];
- // eingefuegte/geloeschte Spalten/Zeilen finden:
- // Zwei Versuche:
- // 1) Original Zeilen vergleichen (pTempRows)
- // 2) Original Spalten vergleichen (pOtherCols)
- // mit dieser Spaltenreihenfolge Zeilen vergleichen (pOtherRows)
+ // eingefuegte/geloeschte Spalten/Zeilen finden:
+ // Zwei Versuche:
+ // 1) Original Zeilen vergleichen (pTempRows)
+ // 2) Original Spalten vergleichen (pOtherCols)
+ // mit dieser Spaltenreihenfolge Zeilen vergleichen (pOtherRows)
- //! Spalten vergleichen zweimal mit unterschiedlichem nMinGood ???
+ //! Spalten vergleichen zweimal mit unterschiedlichem nMinGood ???
// 1
FindOrder( pTempRows, nThisEndRow, nOtherEndRow, FALSE,
@@ -1038,46 +1038,46 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc )
rOtherDoc, nThisTab, nOtherTab, nThisEndCol,
pOtherCols, &aProgress, nThisEndRow );
- ULONG nMatch1 = 0; // pTempRows, keine Spalten
+ ULONG nMatch1 = 0; // pTempRows, keine Spalten
for (nThisRow = 0; nThisRow<=nThisEndRow; nThisRow++)
if (ValidRow(pTempRows[nThisRow]))
nMatch1 += SC_DOCCOMP_MAXDIFF -
RowDifferences( nThisRow, nThisTab, rOtherDoc, pTempRows[nThisRow],
nOtherTab, nEndCol, NULL );
- ULONG nMatch2 = 0; // pOtherRows, pOtherCols
+ ULONG nMatch2 = 0; // pOtherRows, pOtherCols
for (nThisRow = 0; nThisRow<=nThisEndRow; nThisRow++)
if (ValidRow(pOtherRows[nThisRow]))
nMatch2 += SC_DOCCOMP_MAXDIFF -
RowDifferences( nThisRow, nThisTab, rOtherDoc, pOtherRows[nThisRow],
nOtherTab, nThisEndCol, pOtherCols );
- if ( nMatch1 >= 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<SCCOL>(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<SCCOL>(pOtherCols[nThisCol+1])) )
{
SCCOL nFirstNew = static_cast<SCCOL>(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 <svx/svdoole2.hxx>
#include <svx/svdpage.hxx>
-//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; nTab<nCount; nTab++)
@@ -763,10 +763,10 @@ void ScDocument::UpdateChartListenerCollection()
if (!bIsChart)
{
- // put into list of other ole objects, so the object doesn't have to
- // be swapped in the next time UpdateChartListenerCollection is called
- //! remove names when objects are no longer there?
- // (object names aren't used again before reloading the document)
+ // put into list of other ole objects, so the object doesn't have to
+ // be swapped in the next time UpdateChartListenerCollection is called
+ //! remove names when objects are no longer there?
+ // (object names aren't used again before reloading the document)
if (!pOtherObjects)
pOtherObjects = new ScStrCollection;
diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx
index 8706c49320d1..a64201857b63 100644
--- a/sc/source/core/data/documen6.cxx
+++ b/sc/source/core/data/documen6.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +46,11 @@
using namespace com::sun::star;
-#define SC_BREAKITER_SERVICE "com.sun.star.i18n.BreakIterator"
+#define SC_BREAKITER_SERVICE "com.sun.star.i18n.BreakIterator"
//
-// this file is compiled with exceptions enabled
-// put functions here that need exceptions!
+// this file is compiled with exceptions enabled
+// put functions here that need exceptions!
//
// -----------------------------------------------------------------------
@@ -84,7 +84,7 @@ BOOL ScDocument::HasStringWeakCharacters( const String& rString )
{
sal_Int16 nType = xBreakIter->getScriptType( 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 <tools/shl.hxx>
@@ -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; i<nCount; i++)
{
@@ -987,7 +987,7 @@ void ScDocument::LoadDdeLinks(SvStream& rStream)
BOOL ScDocument::HasDdeLinks() 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();
@@ -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; nTab<nDrawPages; nTab++)
{
- pDrawLayer->ScAddPage( 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<ScDefaultAttr, ScLessDefaultAttr> ScDefaultAttrSet;
+typedef std::set<ScDefaultAttr, ScLessDefaultAttr> 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<SCsROW>(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; i<nCount; i++)
@@ -2566,7 +2566,7 @@ void ScDocument::FillTabMarked( SCTAB nSrcTab, 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!
if (ValidTab(nSrcTab) && pTab[nSrcTab])
{
@@ -2574,7 +2574,7 @@ void ScDocument::FillTabMarked( SCTAB nSrcTab, const ScMarkData& rMark,
BOOL bDoMix = ( bSkipEmpty || nFunction ) && ( nFlags & IDF_CONTENTS );
BOOL bOldAutoCalc = GetAutoCalc();
- SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
+ SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
ScRange aArea;
rMark.GetMultiMarkArea( aArea );
@@ -2625,7 +2625,7 @@ void ScDocument::PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell,
{
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")),
@@ -2644,7 +2644,7 @@ void ScDocument::PutCell( const ScAddress& rPos, ScBaseCell* pCell, BOOL bForceT
SCTAB nTab = rPos.Tab();
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")),
@@ -2657,7 +2657,7 @@ void ScDocument::PutCell( const ScAddress& rPos, ScBaseCell* pCell, BOOL bForceT
}
-BOOL ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString,
+BOOL ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString,
SvNumberFormatter* pFormatter, bool bDetectNumberFormat )
{
if ( ValidTab(nTab) && pTab[nTab] )
@@ -2827,7 +2827,7 @@ BOOL ScDocument::HasValueData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
BOOL ScDocument::HasStringCells( const ScRange& rRange ) const
{
- // TRUE, wenn String- oder Editzellen im Bereich
+ // TRUE, wenn String- oder Editzellen im Bereich
SCCOL nStartCol = rRange.aStart.Col();
SCROW nStartRow = rRange.aStart.Row();
@@ -2914,16 +2914,16 @@ void ScDocument::InitializeAllNoteCaptions( bool bForced )
void ScDocument::SetDirty()
{
BOOL bOldAutoCalc = GetAutoCalc();
- bAutoCalc = FALSE; // keine Mehrfachberechnung
+ bAutoCalc = FALSE; // keine Mehrfachberechnung
{ // scope for bulk broadcast
ScBulkBroadcast aBulkBroadcast( GetBASM());
for (SCTAB i=0; i<=MAXTAB; i++)
if (pTab[i]) pTab[i]->SetDirty();
}
- // 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; i<nCount; i++)
{
@@ -4929,7 +4929,7 @@ void ScDocument::GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX,
}
//
-// Datei-Operationen
+// Datei-Operationen
//
@@ -5088,8 +5088,8 @@ BOOL ScDocument::HasManualBreaks( SCTAB nTab ) const
void ScDocument::GetDocStat( ScDocStat& rDocStat )
{
rDocStat.nTableCount = GetTableCount();
- rDocStat.aDocName = aDocName;
- rDocStat.nCellCount = GetCellCount();
+ rDocStat.aDocName = aDocName;
+ rDocStat.nCellCount = GetCellCount();
}
@@ -5212,8 +5212,8 @@ void ScDocument::RestorePrintRanges( const ScPrintRangeSaver& rSaver )
BOOL ScDocument::NeedPageResetAfterTab( SCTAB nTab ) const
{
// Die Seitennummern-Zaehlung faengt bei einer Tabelle neu an, wenn eine
- // andere Vorlage als bei der vorherigen gesetzt ist (nur Namen vergleichen)
- // und eine Seitennummer angegeben ist (nicht 0)
+ // andere Vorlage als bei der vorherigen gesetzt ist (nur Namen vergleichen)
+ // und eine Seitennummer angegeben ist (nicht 0)
if ( nTab < MAXTAB && pTab[nTab] && pTab[nTab+1] )
{
@@ -5226,12 +5226,12 @@ BOOL ScDocument::NeedPageResetAfterTab( SCTAB nTab ) const
const SfxItemSet& rSet = pStyle->GetItemSet();
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<Criterion>& 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<SCROW>& ScDPCacheTable::getFieldEntries( sal_Int32 nColumn
return maFieldEntries[nColumn];
}
-void ScDPCacheTable::filterTable(const vector<Criterion>& rCriteria, Sequence< Sequence<Any> >& rTabData,
+void ScDPCacheTable::filterTable(const vector<Criterion>& rCriteria, Sequence< Sequence<Any> >& rTabData,
const hash_set<sal_Int32>& 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<bool bUpdateData>
@@ -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<sal_Int32>(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<false>( 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<true>( nSourceDim, pCache, rEntries, aFirstName, SC_DP_DATE_FIRST, nDatePart );
- String aLastName = lcl_GetSpecialDateName( aNumInfo.End, false, pFormatter );
- lcl_InsertValue<true>( nSourceDim, pCache, rEntries, aLastName, SC_DP_DATE_LAST, nDatePart );
+ String aLastName = lcl_GetSpecialDateName( aNumInfo.End, false, pFormatter );
+ lcl_InsertValue<true>( 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; nOriginalPos<nOriginalCount; nOriginalPos++)
{
const ScDPItemData* pItemData = pCache->GetItemDataById( 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<true>( 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<true>( nSourceDim, pCache, maMemberEntries, aFirstName, aGroupInfo.Start - aGroupInfo.Step );
String aLastName = lcl_GetSpecialNumGroupName( aGroupInfo.End, false, cDecSeparator, aGroupInfo.DateValues, pFormatter );
- lcl_InsertValue<true>( nSourceDim, pCache, maMemberEntries, aLastName, aGroupInfo.End + aGroupInfo.Step );
+ lcl_InsertValue<true>( 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>&
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>&
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<ScDPCacheTable::Criterion>&
// 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<ScDPCacheTable::GroupFilter*>(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 <comphelper/processfactory.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
-#include <svl/zforlist.hxx> // IsNumberFormat
+#include <svl/zforlist.hxx> // IsNumberFormat
#include <vector>
#include <stdio.h>
@@ -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<sheet::XDimensionsSupplie
{
bFound = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
- //! error checking -- is "IsDataLayoutDimension" property required??
+ //! error checking -- is "IsDataLayoutDimension" property required??
if (bFound)
nRet = ScUnoHelpFunctions::GetEnumProperty(
xDimProp, rtl::OUString::createFromAscii(DP_PROP_ORIENTATION),
@@ -189,7 +189,7 @@ ScDPObject::ScDPObject(const ScDPObject& r) :
pSheetDesc( NULL ),
pImpDesc( NULL ),
pServDesc( NULL ),
- mpTableData(static_cast<ScDPTableData*>(NULL)),
+ mpTableData(static_cast<ScDPTableData*>(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<util::XRefreshable> 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; nPos<nInitial; nPos++)
@@ -632,7 +632,7 @@ void ScDPObject::RefreshAfterLoad()
nHeaderRows = nInitial;
}
else
- nHeaderRows = 0; // nothing found, no drop-down lists
+ nHeaderRows = 0; // nothing found, no drop-down lists
}
void ScDPObject::BuildAllDimensionMembers()
@@ -743,14 +743,14 @@ void ScDPObject::UpdateReference( UpdateRefMode eUpdateRefMode,
aNewDesc.aQueryParam = pSheetDesc->aQueryParam;
aNewDesc.aQueryParam.nCol1 = sal::static_int_cast<SCCOL>( aNewDesc.aQueryParam.nCol1 + nDiffX );
aNewDesc.aQueryParam.nCol2 = sal::static_int_cast<SCCOL>( 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; i<nEC; i++)
if (aNewDesc.aQueryParam.GetEntry(i).bDoQuery)
aNewDesc.aQueryParam.GetEntry(i).nField += nDiffX;
- SetSheetDesc( aNewDesc ); // allocates new pSheetDesc
+ SetSheetDesc( aNewDesc ); // allocates new pSheetDesc
}
}
}
@@ -865,7 +865,7 @@ String ScDPObject::GetDimName( long nDim, BOOL& rIsDataLayout )
{
BOOL bData = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
- //! error checking -- is "IsDataLayoutDimension" property required??
+ //! error checking -- is "IsDataLayoutDimension" property required??
rtl::OUString aName;
try
@@ -938,9 +938,9 @@ long ScDPObject::GetDimCount()
void ScDPObject::FillPageList( TypedScStrCollection& rStrings, long nField )
{
- //! merge members access with ToggleDetails?
+ //! merge members access with ToggleDetails?
- //! convert field index to dimension index?
+ //! convert field index to dimension index?
DBG_ASSERT( xSource.is(), "no source" );
if ( !xSource.is() ) return;
@@ -1023,8 +1023,8 @@ void ScDPObject::FillPageList( TypedScStrCollection& rStrings, long nField )
}
}
- // add "-all-" entry to the top (unsorted)
- TypedStrData* pAllData = new TypedStrData( String( ScResId( SCSTR_ALL ) ) ); //! separate string? (also output)
+ // add "-all-" entry to the top (unsorted)
+ TypedStrData* pAllData = new TypedStrData( String( ScResId( SCSTR_ALL ) ) ); //! separate string? (also output)
if ( !rStrings.AtInsert( 0, pAllData ) )
delete pAllData;
}
@@ -1033,7 +1033,7 @@ void ScDPObject::GetHeaderPositionData(const ScAddress& rPos, DataPilotTableHead
{
using namespace ::com::sun::star::sheet::DataPilotTablePositionType;
- CreateOutput(); // create xSource and pOutput if not already done
+ CreateOutput(); // create xSource and pOutput if not already done
// Reset member values to invalid state.
rData.Dimension = rData.Hierarchy = rData.Level = -1;
@@ -1057,14 +1057,14 @@ BOOL ScDPObject::GetPivotData( ScDPGetPivotDataField& rTarget,
BOOL ScDPObject::IsFilterButton( const ScAddress& rPos )
{
- CreateOutput(); // create xSource and pOutput if not already done
+ CreateOutput(); // create xSource and pOutput if not already done
return pOutput->IsFilterButton( 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<container::XNamed> xDim;
uno::Reference<container::XNameAccess> 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<container::XIndexAccess> 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<container:
if ( pArr[nPos] == rString )
return nPos;
}
- return -1; // not found
+ return -1; // not found
}
-USHORT lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>& xDimProp ) // PIVOT_FUNC mask
+USHORT lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>& xDimProp ) // PIVOT_FUNC mask
{
uno::Reference<sheet::XHierarchiesSupplier> 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<SCsCOL>(nDupSource)+nColAdd; //! seek source column from name
+ nCompCol = static_cast<SCsCOL>(nDupSource)+nColAdd; //! seek source column from name
for (SCSIZE nOld=0; nOld<nOutCount && !bDupUsed; nOld++)
if ( pFields[nOld].nCol == nCompCol )
{
- // add to previous column only if new bits aren't already set there
+ // add to previous column only if new bits aren't already set there
if ( ( pFields[nOld].nFuncMask & nMask ) == 0 )
{
pFields[nOld].nFuncMask |= nMask;
@@ -1794,17 +1794,17 @@ SCSIZE lcl_FillOldFields( PivotField* pFields,
}
}
- if ( !bDupUsed ) // also for duplicated dim if original has different orientation
+ if ( !bDupUsed ) // also for duplicated dim if original has different orientation
{
if ( bDataLayout )
{
pFields[nOutCount].nCol = PIVOT_DATA_FIELD;
bDataFound = TRUE;
}
- else if ( nDupSource >= 0 ) // if source was not found (different orientation)
- pFields[nOutCount].nCol = static_cast<SCsCOL>(nDupSource)+nColAdd; //! seek from name
+ else if ( nDupSource >= 0 ) // if source was not found (different orientation)
+ pFields[nOutCount].nCol = static_cast<SCsCOL>(nDupSource)+nColAdd; //! seek from name
else
- pFields[nOutCount].nCol = static_cast<SCsCOL>(nDim)+nColAdd; //! seek source column from name
+ pFields[nOutCount].nCol = static_cast<SCsCOL>(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<nOutCount; i++)
{
@@ -1841,7 +1841,7 @@ SCSIZE lcl_FillOldFields( PivotField* pFields,
if ( bAddData && !bDataFound )
{
if ( nOutCount >= 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<sheet::XDimensionsSupplier>& 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<nRefColCount; nRefCol++)
if (pRefColFields[nRefCol].nCol == nCol)
@@ -2181,8 +2181,8 @@ void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData,
if (pRefPageFields[nRefPage].nCol == nCol)
bFirst = FALSE;
- // 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
+ // 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; nPrevData<i; nPrevData++)
if (pFields[nPrevData].nCol == nCol)
bFirst = FALSE;
@@ -2207,7 +2207,7 @@ void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData,
nMask *= 2;
}
}
- else // set SubTotals
+ else // set SubTotals
{
pDim->SetOrientation( 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<rtl::OUString> ScDPObject::GetRegisteredSources()
{
long nCount = 0;
uno::Sequence<rtl::OUString> aSeq(0);
- // use implementation names...
+ // use implementation names...
uno::Reference<lang::XMultiServiceFactory> xManager = comphelper::getProcessServiceFactory();
uno::Reference<container::XContentEnumerationAccess> xEnAc( xManager, uno::UNO_QUERY );
@@ -2270,7 +2270,7 @@ uno::Sequence<rtl::OUString> ScDPObject::GetRegisteredSources()
while ( xEnum->hasMoreElements() )
{
uno::Any aAddInAny = xEnum->nextElement();
-// if ( aAddInAny.getReflection()->getTypeClass() == TypeClass_INTERFACE )
+// if ( aAddInAny.getReflection()->getTypeClass() == TypeClass_INTERFACE )
{
uno::Reference<uno::XInterface> xIntFac;
aAddInAny >>= xIntFac;
@@ -2297,7 +2297,7 @@ uno::Sequence<rtl::OUString> ScDPObject::GetRegisteredSources()
// use getContext from addincol.cxx
uno::Reference<uno::XComponentContext> getContext(uno::Reference<lang::XMultiServiceFactory> xMSF);
-// static
+// static
uno::Reference<sheet::XDimensionsSupplier> ScDPObject::CreateSource( const ScDPServiceDesc& rDesc )
{
rtl::OUString aImplName = rDesc.aServiceName;
@@ -2314,7 +2314,7 @@ uno::Reference<sheet::XDimensionsSupplier> 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<uno::XInterface> xIntFac;
aAddInAny >>= xIntFac;
@@ -2344,7 +2344,7 @@ uno::Reference<sheet::XDimensionsSupplier> ScDPObject::CreateSource( const ScDPS
uno::Reference<lang::XInitialization> xInit( xInterface, uno::UNO_QUERY );
if (xInit.is())
{
- // initialize
+ // initialize
uno::Sequence<uno::Any> 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; i<nCount; i++)
((const ScDPObject*)At(i))->WriteRefsTo( *((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<sheet::MemberResult> aResult;
+ long nDim;
+ long nHier;
+ long nLevel;
+ long nDimPos;
+ uno::Sequence<sheet::MemberResult> 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 && nLevel<r.nLevel ); }
void Swap(ScDPOutLevelData& r)
-//! { ScDPOutLevelData aTemp = r; r = *this; *this = aTemp; }
+//! { ScDPOutLevelData aTemp = r; r = *this; *this = aTemp; }
{ ScDPOutLevelData aTemp; aTemp = r; r = *this; *this = aTemp; }
- //! bug (73840) in uno::Sequence - copy and then assign doesn't work!
+ //! bug (73840) in uno::Sequence - copy and then assign doesn't work!
};
// -----------------------------------------------------------------------
@@ -143,7 +143,7 @@ void lcl_SetStyleById( ScDocument* pDoc, SCTAB nTab,
ScStyleSheet* pStyle = (ScStyleSheet*) pStlPool->Find( 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<container::XIndexAccess>& 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<sheet::MemberResult> 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<nSize; nPos++)
pNumFmt[nPos] = nFormat;
@@ -246,14 +246,14 @@ void lcl_FillNumberFormats( UINT32*& rFormats, long& rCount,
{
for (long nPos=0; nPos<nSize; nPos++)
{
- // if CONTINUE bit is set, keep previous name
- //! keep number format instead!
+ // if CONTINUE bit is set, keep previous name
+ //! keep number format instead!
if ( !(pArray[nPos].Flags & sheet::MemberResultFlags::CONTINUE) )
aName = String( pArray[nPos].Name );
UINT32 nFormat = 0;
for (long i=0; i<nDataCount; i++)
- if (aName == aDataNames[i]) //! search more efficiently?
+ if (aName == aDataNames[i]) //! search more efficiently?
{
nFormat = nDataFormats[i];
break;
@@ -308,7 +308,7 @@ void lcl_SortFields( ScDPOutLevelData* pFields, long nFieldCount )
BOOL lcl_MemberEmpty( const uno::Sequence<sheet::MemberResult>& 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<sheet::MemberResult>& rSeq )
if (pArray[i].Flags & sheet::MemberResultFlags::HASMEMBER)
return FALSE;
- return TRUE; // no member data -> empty
+ return TRUE; // no member data -> empty
}
uno::Sequence<sheet::MemberResult> lcl_GetSelectedPageAsResult( const uno::Reference<beans::XPropertySet>& xDimProp )
@@ -339,7 +339,7 @@ uno::Sequence<sheet::MemberResult> 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<sheet::MemberResult>( &aResult, 1 );
}
@@ -375,9 +375,9 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
nTabStartCol = nMemberStartCol = nDataStartCol = nTabEndCol = 0;
nTabStartRow = nMemberStartRow = nDataStartRow = nTabEndRow = 0;
- pColFields = new ScDPOutLevelData[SC_DPOUT_MAXLEVELS];
- pRowFields = new ScDPOutLevelData[SC_DPOUT_MAXLEVELS];
- pPageFields = new ScDPOutLevelData[SC_DPOUT_MAXLEVELS];
+ pColFields = new ScDPOutLevelData[SC_DPOUT_MAXLEVELS];
+ pRowFields = new ScDPOutLevelData[SC_DPOUT_MAXLEVELS];
+ pPageFields = new ScDPOutLevelData[SC_DPOUT_MAXLEVELS];
nColFieldCount = 0;
nRowFieldCount = 0;
nPageFieldCount = 0;
@@ -385,7 +385,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
uno::Reference<sheet::XDataPilotResults> xResult( xSource, uno::UNO_QUERY );
if ( xSource.is() && xResult.is() )
{
- // get dimension results:
+ // get dimension results:
uno::Reference<container::XIndexAccess> xDims =
new ScNameToIndexAccess( xSource->getDimensions() );
@@ -472,7 +472,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
pRowFields[nRowFieldCount].aCaption= aCaption;
pRowFields[nRowFieldCount].mbHasHiddenMember = bHasHiddenMember;
if (!lcl_MemberEmpty(pRowFields[nRowFieldCount].aResult))
- {
+ {
++nRowFieldCount;
bRowFieldHasMember = true;
}
@@ -524,7 +524,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
lcl_SortFields( pRowFields, nRowFieldCount );
lcl_SortFields( pPageFields, nPageFieldCount );
- // get data results:
+ // get data results:
try
{
@@ -582,7 +582,7 @@ void ScDPOutput::DataCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const sheet::Data
{
pDoc->SetValue( 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<sheet::DataResult>* 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<sheet::DataResult>* 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; nRow<nRowCount; nRow++)
{
- SCROW nRowPos = nDataStartRow + (SCROW)nRow; //! check for overflow
+ SCROW nRowPos = nDataStartRow + (SCROW)nRow; //! check for overflow
const sheet::DataResult* pColAry = pRowAry[nRow].getConstArray();
long nThisColCount = pRowAry[nRow].getLength();
- DBG_ASSERT( nThisColCount == nColCount, "count mismatch" ); //! ???
+ DBG_ASSERT( nThisColCount == nColCount, "count mismatch" ); //! ???
for (long nCol=0; nCol<nThisColCount; nCol++)
{
- SCCOL nColPos = nDataStartCol + (SCCOL)nCol; //! check for overflow
+ SCCOL nColPos = nDataStartCol + (SCCOL)nCol; //! check for overflow
DataCell( nColPos, nRowPos, nTab, pColAry[nCol] );
}
}
- // output page fields:
+ // output page fields:
for (nField=0; nField<nPageFieldCount; nField++)
{
@@ -843,26 +843,26 @@ void ScDPOutput::Output()
if ( pPageFields[nField].aResult.getLength() == 1 )
aPageValue = pPageFields[nField].aResult[0].Caption;
else
- aPageValue = String( ScResId( SCSTR_ALL ) ); //! separate string?
+ aPageValue = String( ScResId( SCSTR_ALL ) ); //! separate string?
pDoc->SetString( 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<nColFieldCount; nField++)
{
- SCCOL nHdrCol = nDataStartCol + (SCCOL)nField; //! check for overflow
+ SCCOL nHdrCol = nDataStartCol + (SCCOL)nField; //! check for overflow
FieldCell( nHdrCol, nTabStartRow, nTab, pColFields[nField].aCaption, true, true, pColFields[nField].mbHasHiddenMember );
- SCROW nRowPos = nMemberStartRow + (SCROW)nField; //! check for overflow
+ SCROW nRowPos = nMemberStartRow + (SCROW)nField; //! check for overflow
const uno::Sequence<sheet::MemberResult> 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<nThisColCount; nCol++)
{
- SCCOL nColPos = nDataStartCol + (SCCOL)nCol; //! check for overflow
+ SCCOL nColPos = nDataStartCol + (SCCOL)nCol; //! check for overflow
HeaderCell( nColPos, nRowPos, nTab, pArray[nCol], TRUE, nField );
// Wang Xu Ming -- 2009-8-17
// DataPilot Migration - Cache&&Performance
@@ -906,7 +906,7 @@ void ScDPOutput::Output()
// lcl_SetFrame( pDoc,nTab, nColPos,nRowPos, nEndColPos,nTabEndRow, SC_DP_FRAME_INNER_BOLD );
if ( nField == nColFieldCount - 2 )
{
- outputimp.AddCol( nColPos );
+ outputimp.AddCol( nColPos );
if ( nColPos + 1 == nEndColPos )
outputimp.OutputBlockFrame( nColPos,nRowPos, nEndColPos,nRowPos+1, TRUE );
}
@@ -922,30 +922,30 @@ void ScDPOutput::Output()
outputimp.AddCol( nColPos );
}
if ( nField== 0 && nColFieldCount == 1 )
- outputimp.OutputBlockFrame( nDataStartCol,nTabStartRow, nTabEndCol,nRowPos-1 );
+ outputimp.OutputBlockFrame( nDataStartCol,nTabStartRow, nTabEndCol,nRowPos-1 );
// End Comments
}
- // output row headers:
+ // output row headers:
std::vector<BOOL> vbSetBorder;
vbSetBorder.resize( nTabEndRow - nDataStartRow + 1, FALSE );
for (nField=0; nField<nRowFieldCount; nField++)
{
bool bDataLayout = mbHasDataLayout && (nField == nRowFieldCount-1);
- SCCOL nHdrCol = nTabStartCol + (SCCOL)nField; //! check for overflow
+ SCCOL nHdrCol = nTabStartCol + (SCCOL)nField; //! check for overflow
SCROW nHdrRow = nDataStartRow - 1;
- FieldCell( nHdrCol, nHdrRow, nTab, pRowFields[nField].aCaption, true, !bDataLayout,
+ FieldCell( nHdrCol, nHdrRow, nTab, pRowFields[nField].aCaption, true, !bDataLayout,
pRowFields[nField].mbHasHiddenMember );
- SCCOL nColPos = nMemberStartCol + (SCCOL)nField; //! check for overflow
+ SCCOL nColPos = nMemberStartCol + (SCCOL)nField; //! check for overflow
const uno::Sequence<sheet::MemberResult> 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<nThisRowCount; nRow++)
{
- SCROW nRowPos = nDataStartRow + (SCROW)nRow; //! check for overflow
+ SCROW nRowPos = nDataStartRow + (SCROW)nRow; //! check for overflow
HeaderCell( nColPos, nRowPos, nTab, pArray[nRow], FALSE, nField );
if ( ( pArray[nRow].Flags & sheet::MemberResultFlags::HASMEMBER ) &&
!( pArray[nRow].Flags & sheet::MemberResultFlags::SUBTOTAL ) )
@@ -955,7 +955,7 @@ void ScDPOutput::Output()
long nEnd = nRow;
while ( nEnd+1 < nThisRowCount && ( pArray[nEnd+1].Flags & sheet::MemberResultFlags::CONTINUE ) )
++nEnd;
- SCROW nEndRowPos = nDataStartRow + (SCROW)nEnd; //! check for overflow
+ SCROW nEndRowPos = nDataStartRow + (SCROW)nEnd; //! check for overflow
// Wang Xu Ming -- 2009-8-17
// DataPilot Migration - Cache&&Performance
// lcl_SetFrame( pDoc,nTab, nColPos,nRowPos, nColPos,nEndRowPos, SC_DP_FRAME_INNER_BOLD );
@@ -1161,9 +1161,9 @@ void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionDa
SCROW nRow = rPos.Row();
SCTAB nTab = rPos.Tab();
if ( nTab != aStartPos.Tab() )
- return; // wrong sheet
+ return; // wrong sheet
- // calculate output positions and sizes
+ // calculate output positions and sizes
CalcSizes();
@@ -1175,12 +1175,12 @@ void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionDa
vector<DataPilotFieldFilter> 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<beans::XPropertySet> 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<sheet::DataPilotFieldFilter>&
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<sheet::DataPilotFieldFilter>&
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<nColFieldCount && !bFound; nPos++)
@@ -1939,13 +1939,13 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo
}
rOrient = sheet::DataPilotFieldOrientation_COLUMN;
- rDimPos = nField; //!...
+ rDimPos = nField; //!...
return TRUE;
}
- // test for row header
+ // test for row header
- // special case if no row fields
+ // special case if no row fields
BOOL bSpecial = ( nRow+1 >= 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<nRowFieldCount && !bFound; nPos++)
@@ -1993,11 +1993,11 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo
}
rOrient = sheet::DataPilotFieldOrientation_ROW;
- rDimPos = nField; //!...
+ rDimPos = nField; //!...
return TRUE;
}
- // test for page fields
+ // test for page fields
SCROW nPageStartRow = aStartPos.Row() + ( bDoFilter ? 1 : 0 );
if ( nCol >= 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<nPageFieldCount && !bFound; nPos++)
@@ -2049,7 +2049,7 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo
}
rOrient = sheet::DataPilotFieldOrientation_PAGE;
- rDimPos = nField; //!...
+ rDimPos = nField; //!...
return TRUE;
}
diff --git a/sc/source/core/data/dpoutputgeometry.cxx b/sc/source/core/data/dpoutputgeometry.cxx
index fd9bee0ed572..7a6e46a9532d 100644
--- a/sc/source/core/data/dpoutputgeometry.cxx
+++ b/sc/source/core/data/dpoutputgeometry.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index dd493bb0df6c..84b5bdb9a542 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +80,16 @@ using ::std::auto_ptr;
// -----------------------------------------------------------------------
-#define SC_DPSAVEMODE_NO 0
-#define SC_DPSAVEMODE_YES 1
-#define SC_DPSAVEMODE_DONTKNOW 2
+#define SC_DPSAVEMODE_NO 0
+#define SC_DPSAVEMODE_YES 1
+#define SC_DPSAVEMODE_DONTKNOW 2
// -----------------------------------------------------------------------
void lcl_SetBoolProperty( const uno::Reference<beans::XPropertySet>& 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<uno::XInterface>& 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<sheet::XDimensionsSupplie
if (!xSource.is())
return;
- // source options must be first!
+ // source options must be first!
uno::Reference<beans::XPropertySet> 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::Reference<sheet::XDimensionsSupplie
// exceptions in the other calls are errors
try
{
- // reset all orientations
- //! "forgetSettings" or similar at source ?????
- //! reset all duplicated dimensions, or reuse them below !!!
+ // reset all orientations
+ //! "forgetSettings" or similar at source ?????
+ //! reset all duplicated dimensions, or reuse them below !!!
DBG_TRACE( "ScDPSaveData::WriteToSource" );
lcl_ResetOrient( xSource );
@@ -1119,10 +1119,10 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
rtl::OUString aName = pDim->GetName();
DBG_TRACESTR(pDim->GetName());
-
+
BOOL bData = pDim->IsDataLayout();
- //! getByName for ScDPSource, including DataLayoutDimension !!!!!!!!
+ //! getByName for ScDPSource, including DataLayoutDimension !!!!!!!!
uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions();
uno::Reference<container::XIndexAccess> xIntDims = new ScNameToIndexAccess( xDimsName );
@@ -1138,7 +1138,7 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
{
bFound = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) );
- //! error checking -- is "IsDataLayoutDimension" property required??
+ //! error checking -- is "IsDataLayoutDimension" property required??
}
}
else
@@ -1155,8 +1155,8 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
String aNewName = pDim->GetName();
// 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<util::XCloneable> 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<String>::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<String>::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<sdbc::XRowSet> 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<long>& 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<SCROW>& 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<sdbc::XRow>& 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<ScDPItemData*>[ mnColumnCount ];
- mpSourceData = new std::vector<SCROW>[ mnColumnCount ];
- mpGlobalOrder = new std::vector<SCROW>[ mnColumnCount ];
- mpIndexOrder = new std::vector<SCROW>[ mnColumnCount ];
+ mpSourceData = new std::vector<SCROW>[ mnColumnCount ];
+ mpGlobalOrder = new std::vector<SCROW>[ mnColumnCount ];
+ mpIndexOrder = new std::vector<SCROW>[ 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<ScDPItemData*>[ mnColumnCount ];
- mpSourceData = new std::vector<SCROW>[ mnColumnCount ];
- mpGlobalOrder = new std::vector<SCROW>[ mnColumnCount ];
- mpIndexOrder = new std::vector<SCROW>[ mnColumnCount ];
+ mpSourceData = new std::vector<SCROW>[ mnColumnCount ];
+ mpGlobalOrder = new std::vector<SCROW>[ mnColumnCount ];
+ mpIndexOrder = new std::vector<SCROW>[ mnColumnCount ];
//check valid
for ( SCROW nRow = nStartRow; nRow <= nEndRow; nRow ++ )
{
@@ -598,9 +598,9 @@ bool ScDPTableDataCache::InitFromDataBase (const Reference<sdbc::XRowSet>& xRowS
// Get column titles and types.
mrLabelNames.reserve(mnColumnCount);
mpTableDataValues = new std::vector<ScDPItemData*>[ mnColumnCount ];
- mpSourceData = new std::vector<SCROW>[ mnColumnCount ];
- mpGlobalOrder = new std::vector<SCROW>[ mnColumnCount ];
- mpIndexOrder = new std::vector<SCROW>[ mnColumnCount ];
+ mpSourceData = new std::vector<SCROW>[ mnColumnCount ];
+ mpGlobalOrder = new std::vector<SCROW>[ mnColumnCount ];
+ mpIndexOrder = new std::vector<SCROW>[ mnColumnCount ];
std::vector<sal_Int32> aColTypes(mnColumnCount);
@@ -615,7 +615,7 @@ bool ScDPTableDataCache::InitFromDataBase (const Reference<sdbc::XRowSet>& xRowS
Reference<sdbc::XRow> 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 <USHORT> (mnColumnCount+1), "ScDPTableDataCache::GetDimensionName");
if ( static_cast<size_t>(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 <math.h>
-#include <float.h> //! Test !!!
+#include <float.h> //! Test !!!
#include <algorithm>
#include <hash_map>
@@ -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<sheet::GeneralFunction> 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; i<nMembCount; i++ )
@@ -1017,7 +1017,7 @@ ScDPResultMember::ScDPResultMember( const ScDPResultData* pData, const ScDPPare
// pParentLevel/pMemberDesc is 0 for root members
}
-ScDPResultMember::ScDPResultMember( const ScDPResultData* pData,
+ScDPResultMember::ScDPResultMember( const ScDPResultData* pData,
BOOL bForceSub ) :
pResultData( pData ),
pChildDimension( NULL ),
@@ -1042,7 +1042,7 @@ String ScDPResultMember::GetName() const
if (pMemberDesc)
return pMemberDesc->GetNameStr();
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<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev,
+void ScDPResultMember::InitFrom( const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& 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<ScDPDimension*>& 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<ScDPDimension*>& 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<ScDPDimension*>& ppDim, const vect
}
}
-void ScDPResultMember::LateInitFrom( LateInitParams& rParams/*const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev*/,
+void ScDPResultMember::LateInitFrom( LateInitParams& rParams/*const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& 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 vector<ScDPD
// No next dimension. Bail out.
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
@@ -1164,7 +1164,7 @@ void ScDPResultMember::LateInitFrom( LateInitParams& rParams/*const vector<ScDPD
rParams.SetInitChild( bWasInitChild );
return;
}
- else
+ else
{ //find next dim
nPos ++;
nMemberStep ++;
@@ -1175,7 +1175,7 @@ void ScDPResultMember::LateInitFrom( LateInitParams& rParams/*const vector<ScDPD
return;
}
- // LateInitFrom is called several times...
+ // LateInitFrom is called several times...
if ( rParams.GetInitChild() )
{
if ( !pChildDimension )
@@ -1210,7 +1210,7 @@ long ScDPResultMember::GetSize(long nMeasure) const
{
if ( !IsVisible() )
return 0;
- const ScDPLevel* pParentLevel = GetParentLevel();
+ const ScDPLevel* pParentLevel = GetParentLevel();
long nExtraSpace = 0;
if ( pParentLevel && pParentLevel->IsAddEmpty() )
++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<sheet::GeneralFunction> 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<nUserSubCount; nUserPos++) // including hidden "automatic"
{
@@ -1343,10 +1343,10 @@ void ScDPResultMember::ProcessData( const vector< SCROW >& aChildMembers, const
}
}
-/**
+/**
* Parse subtotal string and replace all occurrences of '?' with the caption
* string. Do ensure that escaped characters are not translated.
- */
+ */
static String lcl_parseSubtotalName(const String& rSubStr, const String& rCaption)
{
String aNewStr;
@@ -1375,8 +1375,8 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS
const String* pMemberName,
const String* pMemberCaption )
{
- // IsVisible() test is in ScDPResultDimension::FillMemberResults
- // (not on data layout dimension)
+ // IsVisible() test is in ScDPResultDimension::FillMemberResults
+ // (not on data layout dimension)
long nSize = GetSize(nMeasure);
sheet::MemberResult* pArray = pSequences->getArray();
@@ -1384,7 +1384,7 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS
BOOL bIsNumeric = FALSE;
String aName;
- if ( pMemberName ) // if pMemberName != NULL, use instead of real member name
+ if ( pMemberName ) // if pMemberName != NULL, use instead of real member name
aName = *pMemberName;
else
{
@@ -1393,7 +1393,7 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS
aName = aItemData.GetString();
bIsNumeric = aItemData.IsValue();
}
- const ScDPDimension* pParentDim = GetParentDim();
+ const ScDPDimension* pParentDim = GetParentDim();
if ( bIsNumeric && pParentDim && pResultData->IsNumOrDateGroup( pParentDim->GetDimension() ) )
{
// Numeric group dimensions use numeric entries for proper sorting,
@@ -1413,7 +1413,7 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS
}
}
- if ( pMemberCaption ) // use pMemberCaption if != NULL
+ if ( pMemberCaption ) // use pMemberCaption if != NULL
aCaption = *pMemberCaption;
if (!aCaption.Len())
aCaption = ScGlobal::GetRscString(STR_EMPTYDATA);
@@ -1423,18 +1423,18 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS
else
pArray[rPos].Flags &= ~sheet::MemberResultFlags::NUMERIC;
- if ( nSize && !bRoot ) // root is overwritten by first dimension
+ if ( nSize && !bRoot ) // root is overwritten by first dimension
{
pArray[rPos].Name = rtl::OUString(aName);
pArray[rPos].Caption = rtl::OUString(aCaption);
- pArray[rPos].Flags |= sheet::MemberResultFlags::HASMEMBER;
+ pArray[rPos].Flags |= sheet::MemberResultFlags::HASMEMBER;
- // set "continue" flag (removed for subtotals later)
+ // set "continue" flag (removed for subtotals later)
for (long i=1; i<nSize; i++)
pArray[rPos+i].Flags |= sheet::MemberResultFlags::CONTINUE;
}
-
- const ScDPLevel* pParentLevel = GetParentLevel();
+
+ const ScDPLevel* pParentLevel = GetParentLevel();
long nExtraSpace = 0;
if ( pParentLevel && pParentLevel->IsAddEmpty() )
++nExtraSpace;
@@ -1453,11 +1453,11 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS
if ( bTitleLine ) // in tabular layout the title is on a separate row
++rPos; // -> fill child dimension one row below
- if (bRoot) // same sequence for root member
+ if (bRoot) // same sequence for root member
pChildDimension->FillMemberResults( pSequences, rPos, nMeasure );
else
//pChildDimension->FillMemberResults( pSequences + 1, rPos, nMeasure );
- pChildDimension->FillMemberResults( pSequences + nMemberStep/*1*/, rPos, nMeasure );
+ pChildDimension->FillMemberResults( pSequences + nMemberStep/*1*/, rPos, nMeasure );
if ( bTitleLine ) // title row is included in GetSize, so the following
--rPos; // positions are calculated with the normal values
@@ -1519,8 +1519,8 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS
if ( nMeasure == SC_DPMEASURE_ALL )
{
- // data layout dimension is (direct/indirect) child of this.
- // data layout dimension must have name for all entries.
+ // data layout dimension is (direct/indirect) child of this.
+ // data layout dimension must have name for all entries.
uno::Sequence<sheet::MemberResult>* pLayoutSeq = pSequences;
if (!bRoot)
@@ -1551,9 +1551,9 @@ void ScDPResultMember::FillDataResults( const ScDPResultMember* pRefMember,
uno::Sequence< uno::Sequence<sheet::DataResult> >& rSequence,
long& rRow, long nMeasure ) const
{
- // IsVisible() test is in ScDPResultDimension::FillDataResults
- // (not on data layout dimension)
- const ScDPLevel* pParentLevel = GetParentLevel();
+ // IsVisible() test is in ScDPResultDimension::FillDataResults
+ // (not on data layout dimension)
+ const ScDPLevel* pParentLevel = GetParentLevel();
long nStartRow = rRow;
long nExtraSpace = 0;
@@ -1608,7 +1608,7 @@ void ScDPResultMember::FillDataResults( const ScDPResultMember* pRefMember,
if ( pDataRoot )
{
- ScDPSubTotalState aSubState; // initial state
+ ScDPSubTotalState aSubState; // initial state
for (long nUserPos=nUserSubStart; nUserPos<nUserSubCount; nUserPos++)
{
@@ -1891,7 +1891,7 @@ long lcl_GetSubTotalPos( const ScDPSubTotalState& rSubState )
void ScDPDataMember::UpdateValues( const vector<ScDPValueData>& aValues, const ScDPSubTotalState& rSubState )
{
- //! find out how many and which subtotals are used
+ //! find out how many and which subtotals are used
ScDPAggData* pAgg = &aAggregate;
@@ -1918,13 +1918,13 @@ void ScDPDataMember::ProcessData( const vector< SCROW >& aChildMembers, const ve
{
if ( pResultData->IsLateInit() && !pChildDimension && pResultMember && pResultMember->GetChildDimension() )
{
- // if this DataMember doesn't have a child dimension because the ResultMember's
- // child dimension wasn't there yet during this DataMembers's creation,
- // create the child dimension now
+ // if this DataMember doesn't have a child dimension because the ResultMember's
+ // child dimension wasn't there yet during this DataMembers's creation,
+ // create the child dimension now
InitFrom( pResultMember->GetChildDimension() );
}
- ScDPSubTotalState aLocalSubState(rSubState); // keep row state, modify column
+ ScDPSubTotalState aLocalSubState(rSubState); // keep row state, modify column
long nUserSubCount = pResultMember ? pResultMember->GetSubTotalCount() : 0;
@@ -1946,7 +1946,7 @@ void ScDPDataMember::ProcessData( const vector< SCROW >& aChildMembers, const ve
}
if (pChildDimension)
- pChildDimension->ProcessData( aChildMembers, aValues, rSubState ); // with unmodified subtotal state
+ pChildDimension->ProcessData( aChildMembers, aValues, rSubState ); // with unmodified subtotal state
}
BOOL ScDPDataMember::HasData( long nMeasure, const ScDPSubTotalState& rSubState ) const
@@ -1955,11 +1955,11 @@ BOOL ScDPDataMember::HasData( long nMeasure, const ScDPSubTotalState& rSubState
rSubState.eColForce != rSubState.eRowForce )
return FALSE;
- // #74542# HasData can be different between measures!
+ // #74542# HasData can be different between measures!
const ScDPAggData* pAgg = GetConstAggData( nMeasure, rSubState );
if (!pAgg)
- return FALSE; //! error?
+ return FALSE; //! error?
return pAgg->HasData();
}
@@ -1977,7 +1977,7 @@ double ScDPDataMember::GetAggregate( long nMeasure, const ScDPSubTotalState& rSu
{
const ScDPAggData* pAgg = GetConstAggData( nMeasure, rSubState );
if (!pAgg)
- return DBL_MAX; //! error?
+ return DBL_MAX; //! error?
return pAgg->GetResult();
}
@@ -2029,7 +2029,7 @@ void ScDPDataMember::FillDataRow( const ScDPResultMember* pRefMember,
{
DBG_ASSERT( pRefMember == pResultMember || !pResultMember, "bla" );
- if ( pRefMember->IsVisible() ) //! here or in ScDPDataDimension::FillDataRow ???
+ if ( pRefMember->IsVisible() ) //! here or in ScDPDataDimension::FillDataRow ???
{
long nStartCol = rCol;
@@ -2048,8 +2048,8 @@ void ScDPDataMember::FillDataRow( const ScDPResultMember* pRefMember,
BOOL bSubTotalInTitle = pRefMember->IsSubTotalInTitle( nMeasure );
- // leave space for children even if the DataMember hasn't been initialized
- // (pDataChild is null then, this happens when no values for it are in this row)
+ // leave space for children even if the DataMember hasn't been initialized
+ // (pDataChild is null then, this happens when no values for it are in this row)
BOOL bHasChild = ( pRefChild != NULL );
if ( bHasChild )
@@ -2077,7 +2077,7 @@ void ScDPDataMember::FillDataRow( const ScDPResultMember* pRefMember,
nUserSubStart = 0;
}
- ScDPSubTotalState aLocalSubState(rSubState); // keep row state, modify column
+ ScDPSubTotalState aLocalSubState(rSubState); // keep row state, modify column
long nMemberMeasure = nMeasure;
long nSubSize = pResultData->GetCountForMeasure(nMeasure);
@@ -2480,7 +2480,7 @@ void ScDPDataMember::UpdateRunningTotals( const ScDPResultMember* pRefMember,
if ( bRefDimInCol )
{
aRefItemPos.nBasePos = pColVisible[nColPos]; // without sort order applied
- pSelectMember = ScDPResultDimension::GetColReferenceMember( pRefPos, pRefName,
+ pSelectMember = ScDPResultDimension::GetColReferenceMember( pRefPos, pRefName,
nColPos, rRunning );
}
else
@@ -2609,7 +2609,7 @@ void ScDPDataMember::UpdateRunningTotals( const ScDPResultMember* pRefMember,
if ( nRowTotal == 0.0 || nColTotal == 0.0 )
pAggData->SetError();
else
- pAggData->SetResult(
+ pAggData->SetResult(
( pAggData->GetResult() * nGrandTotal ) /
( nRowTotal * nColTotal ) );
}
@@ -2780,7 +2780,7 @@ ScDPResultMember *ScDPResultDimension::FindMember( SCROW iData ) const
return NULL;
}
-void ScDPResultDimension::InitFrom( const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev,
+void ScDPResultDimension::InitFrom( const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev,
size_t nPos, ScDPInitState& rInitState, BOOL bInitChild /*= TRUE */ )
{
if (nPos >= ppDim.size() || nPos >= ppLev.size())
@@ -2799,7 +2799,7 @@ void ScDPResultDimension::InitFrom( const vector<ScDPDimension*>& ppDim, const v
}
bIsDataLayout = pThisDim->getIsDataLayoutDimension(); // member
- aDimensionName = pThisDim->getName(); // member
+ aDimensionName = pThisDim->getName(); // member
// Check the autoshow setting. If it's enabled, store the settings.
const sheet::DataPilotFieldAutoShowInfo& rAutoInfo = pThisLevel->GetAutoShow();
@@ -2856,7 +2856,7 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S
return;
#ifdef DBG_UTIL
DBG_ASSERT( nPos <= pItemData.size(), ByteString::CreateFromInt32( pItemData.size()).GetBuffer() );
-#endif
+#endif
ScDPDimension* pThisDim = rParams.GetDim( nPos );
ScDPLevel* pThisLevel = rParams.GetLevel( nPos );
SCROW rThisData = pItemData[nPos];
@@ -2870,7 +2870,7 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S
if ( !bInitialized )
{ // init some values
- // create all members at the first call (preserve order)
+ // create all members at the first call (preserve order)
bIsDataLayout = pThisDim->getIsDataLayoutDimension();
aDimensionName = pThisDim->getName();
@@ -2905,14 +2905,14 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S
#endif
pMembers->SetHasHideDetailsMembers( FALSE );
}
-
+
bool bNewAllMembers =(!rParams.IsRow()) || nPos == 0 || bLateInitAllMembers ;
-
+
if (bNewAllMembers )
- {
+ {
// global order is used to initialize aMembers, so it doesn't have to be looked at later
if ( !bInitialized )
- { //init all members
+ { //init all members
const ScMemberSortOrder& rGlobalOrder = pThisLevel->GetGlobalOrder();
ScDPGroupCompare aCompare( pResultData, rInitState, nDimSource );
@@ -2931,21 +2931,21 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S
}
bInitialized = TRUE; // don't call again, even if no members were included
}
- // initialize only specific member (or all if "show empty" flag is set)
+ // initialize only specific member (or all if "show empty" flag is set)
if ( bLateInitAllMembers )
{
long nCount = maMemberArray.size();
for (long i=0; i<nCount; i++)
{
ScDPResultMember* pResultMember = maMemberArray[i];
-
- // check show empty
+
+ // check show empty
BOOL bAllChildren = FALSE;
if( bShowEmpty )
{
if ( pResultMember->IsNamedItem( rThisData ) )
bAllChildren = FALSE;
- else
+ else
bAllChildren = TRUE;
}
rParams.SetInitAllChildren( bAllChildren );
@@ -2961,14 +2961,14 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S
{
//DBG_TRACE( "ScDPResultDimension::LateInitFrom");
// DBG_TRACESTR( pResultMember->GetDPMember()->GetNameStr());
-
+
rInitState.AddMember( nDimSource, pResultMember->GetDataId() );
pResultMember->LateInitFrom( rParams, pItemData, nPos+1, rInitState );
rInitState.RemoveMember();
}
}
}
- else
+ else
InitWithMembers( rParams, pItemData, nPos, rInitState );
}
@@ -2980,12 +2980,12 @@ long ScDPResultDimension::GetSize(long nMeasure) const
{
DBG_ASSERT(nMeasure == SC_DPMEASURE_ALL || pResultData->GetMeasureCount() == 1,
"DataLayout dimension twice?");
- // repeat first member...
- nTotal = nMemberCount * maMemberArray[0]->GetSize(0); // all measures have equal size
+ // repeat first member...
+ nTotal = nMemberCount * maMemberArray[0]->GetSize(0); // all measures have equal size
}
else
{
- // add all members
+ // add all members
for (long nMem=0; nMem<nMemberCount; nMem++)
nTotal += maMemberArray[nMem]->GetSize(nMeasure);
}
@@ -3010,7 +3010,7 @@ bool ScDPResultDimension::IsValidEntry( const vector< SCROW >& aMembers ) const
}
void ScDPResultDimension::ProcessData( const vector< SCROW >& aMembers,
- const ScDPResultDimension* pDataDim,
+ const ScDPResultDimension* pDataDim,
const vector< SCROW >& aDataMembers,
const vector<ScDPValueData>& aValues ) const
{
@@ -3044,7 +3044,7 @@ void ScDPResultDimension::FillMemberResults( uno::Sequence<sheet::MemberResult>*
long nSorted = aMemberOrder.empty() ? i : aMemberOrder[i];
ScDPResultMember* pMember = maMemberArray[nSorted];
- // in data layout dimension, use first member with different measures/names
+ // in data layout dimension, use first member with different measures/names
if ( bIsDataLayout )
{
bool bTotalResult = false;
@@ -3547,8 +3547,8 @@ void ScDPDataDimension::InitFrom( const ScDPResultDimension* pDim )
if ( !pResultData->IsLateInit() )
{
- // with LateInit, pResMem hasn't necessarily been initialized yet,
- // so InitFrom for the new result member is called from its ProcessData method
+ // with LateInit, pResMem hasn't necessarily been initialized yet,
+ // so InitFrom for the new result member is called from its ProcessData method
const ScDPResultDimension* pChildDim = pResMem->GetChildDimension();
if ( pChildDim )
@@ -3611,7 +3611,7 @@ void ScDPDataDimension::FillDataRow( const ScDPResultDimension* pRefDim,
}
const ScDPResultMember* pRefMember = pRefDim->GetMember(nMemberPos);
- if ( pRefMember->IsVisible() ) //! here or in ScDPDataMember::FillDataRow ???
+ if ( pRefMember->IsVisible() ) //! here or in ScDPDataMember::FillDataRow ???
{
const ScDPDataMember* pDataMember = aMembers[(USHORT)nMemberPos];
pDataMember->FillDataRow( pRefMember, rSequence, nMemberCol, nMemberMeasure, bIsSubTotalRow, rSubState );
@@ -3898,10 +3898,10 @@ void ScDPResultVisibilityData::fillFieldFilters(vector<ScDPCacheTable::Criterion
continue;
long nDimIndex = itrField->second;
- aCri.mnFieldIndex = static_cast<sal_Int32>(nDimIndex);
+ aCri.mnFieldIndex = static_cast<sal_Int32>(nDimIndex);
aCri.mpFilter.reset(new ScDPCacheTable::GroupFilter(/*mrSharedString*/));
-
- ScDPCacheTable::GroupFilter* pGrpFilter =
+
+ ScDPCacheTable::GroupFilter* pGrpFilter =
static_cast<ScDPCacheTable::GroupFilter*>(aCri.mpFilter.get());
const VisibleMemberType& rMem = itr->second;
@@ -3929,7 +3929,7 @@ size_t ScDPResultVisibilityData::MemberHash::operator() (const ScDPItemData& r)
}
// Wang Xu Ming -- 2009-6-10
// DataPilot Migration
-SCROW ScDPResultMember::GetDataId( ) const
+SCROW ScDPResultMember::GetDataId( ) const
{
const ScDPMember* pMemberDesc = GetDPMember();
if (pMemberDesc)
@@ -3940,9 +3940,9 @@ SCROW ScDPResultMember::GetDataId( ) const
ScDPResultMember* ScDPResultDimension::AddMember(const ScDPParentDimData &aData )
{
ScDPResultMember* pMember = new ScDPResultMember( pResultData, aData, FALSE );
- SCROW nDataIndex = pMember->GetDataId();
+ SCROW nDataIndex = pMember->GetDataId();
maMemberArray.push_back( pMember );
-
+
if ( maMemberHash.end() == maMemberHash.find( nDataIndex ) )
maMemberHash.insert( std::pair< SCROW, ScDPResultMember *>( nDataIndex, pMember ) );
return pMember;
@@ -3953,7 +3953,7 @@ ResultMembers* ScDPResultDimension::GetResultMember( ScDPDimension* pThisDim, Sc
ResultMembers* pResultMembers = new ResultMembers();
// global order is used to initialize aMembers, so it doesn't have to be looked at later
const ScMemberSortOrder& rGlobalOrder = pThisLevel->GetGlobalOrder();
-
+
ScDPMembers* pMembers = pThisLevel->GetMembersObject();
long nMembCount = pMembers->getCount();
for ( long i=0; i<nMembCount; i++ )
@@ -3977,7 +3977,7 @@ ScDPResultMember* ScDPResultDimension::InsertMember(ScDPParentDimData *pMemberDa
ScDPResultMember* pNew = new ScDPResultMember( pResultData, *pMemberData, FALSE );
maMemberArray.insert( maMemberArray.begin()+nInsert, pNew );
- SCROW nDataIndex = pMemberData->mpMemberDesc->GetItemDataId();
+ SCROW nDataIndex = pMemberData->mpMemberDesc->GetItemDataId();
if ( maMemberHash.end() == maMemberHash.find( nDataIndex ) )
maMemberHash.insert( std::pair< SCROW, ScDPResultMember *>( nDataIndex, pNew ) );
return pNew;
@@ -3985,8 +3985,8 @@ ScDPResultMember* ScDPResultDimension::InsertMember(ScDPParentDimData *pMemberDa
return maMemberArray[ nInsert ];
}
-void ScDPResultDimension:: InitWithMembers( LateInitParams& rParams,
- const ::std::vector< SCROW >& pItemData,
+void ScDPResultDimension:: InitWithMembers( LateInitParams& rParams,
+ const ::std::vector< SCROW >& pItemData,
size_t nPos,
ScDPInitState& rInitState )
{
@@ -4000,14 +4000,14 @@ void ScDPResultDimension:: InitWithMembers( LateInitParams& rParams,
{
long nDimSource = pThisDim->GetDimension(); //! check GetSourceDim?
- // create all members at the first call (preserve order)
+ // create all members at the first call (preserve order)
ResultMembers* pMembers = pResultData->GetDimResultMembers(nDimSource, pThisDim, pThisLevel);
ScDPGroupCompare aCompare( pResultData, rInitState, nDimSource );
- // initialize only specific member (or all if "show empty" flag is set)
+ // initialize only specific member (or all if "show empty" flag is set)
ScDPResultMember* pResultMember = NULL;
- if ( bInitialized )
+ if ( bInitialized )
pResultMember = FindMember( nDataID );
- else
+ else
bInitialized = TRUE;
if ( pResultMember == NULL )
@@ -4082,7 +4082,7 @@ void ScDPResultDimension::CheckShowEmpty( BOOL bShow )
for (long i=0; i<nCount; i++)
{
pMember = maMemberArray.at(i);
- pMember->CheckShowEmpty( bShow );
+ pMember->CheckShowEmpty( bShow );
}
}
@@ -4104,6 +4104,6 @@ void ScDPResultMember::CheckShowEmpty( BOOL bShow )
ScDPResultDimension* pChildDim = GetChildDimension();
if (pChildDim )
pChildDim->CheckShowEmpty( TRUE );
- }
+ }
}
}// End Comments
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index da40e6e230c4..ed334e5a1b3f 100755
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "dptabdat.hxx"
#include "global.hxx"
#include "collect.hxx"
-#include "datauno.hxx" // ScDataUnoConversion
+#include "datauno.hxx" // ScDataUnoConversion
#include "unoguard.hxx"
#include "miscuno.hxx"
#include "unonames.hxx"
@@ -86,7 +86,7 @@ using ::rtl::OUString;
// -----------------------------------------------------------------------
-#define SC_MINCOUNT_LIMIT 1000000
+#define SC_MINCOUNT_LIMIT 1000000
// -----------------------------------------------------------------------
@@ -103,11 +103,11 @@ SC_SIMPLE_SERVICE_INFO( ScDPMember, "ScDPMember", "com.sun.star.sheet.
// -----------------------------------------------------------------------
// property maps for PropertySetInfo
-// DataDescription / NumberFormat are internal
+// DataDescription / NumberFormat are internal
// -----------------------------------------------------------------------
-//! move to a header?
+//! move to a header?
BOOL lcl_GetBoolFromAny( const uno::Any& aAny )
{
if ( aAny.getValueTypeClass() == uno::TypeClass_BOOLEAN )
@@ -129,7 +129,7 @@ ScDPSource::ScDPSource( ScDPTableData* pD ) :
nRowDimCount( 0 ),
nDataDimCount( 0 ),
nPageDimCount( 0 ),
- bColumnGrand( TRUE ), // default is true
+ bColumnGrand( TRUE ), // default is true
bRowGrand( TRUE ),
bIgnoreEmptyRows( FALSE ),
bRepeatIfEmpty( FALSE ),
@@ -148,9 +148,9 @@ ScDPSource::ScDPSource( ScDPTableData* pD ) :
ScDPSource::~ScDPSource()
{
if (pDimensions)
- pDimensions->release(); // ref-counted
+ pDimensions->release(); // ref-counted
- //! free lists
+ //! free lists
delete[] pColResults;
delete[] pRowResults;
@@ -234,12 +234,12 @@ BOOL lcl_TestSubTotal( BOOL& rAllowed, long nColumn, long* pArray, long nCount,
for (long i=0; i<nCount; i++)
if (pArray[i] == nColumn)
{
- // no subtotals for data layout dim, no matter where
+ // no subtotals for data layout dim, no matter where
if ( pSource->IsDataLayoutDimension(nColumn) )
rAllowed = FALSE;
else
{
- // no subtotals if no other dim but data layout follows
+ // no subtotals if no other dim but data layout follows
long nNextIndex = i+1;
if ( nNextIndex < nCount && pSource->IsDataLayoutDimension(pArray[nNextIndex]) )
++nNextIndex;
@@ -247,14 +247,14 @@ BOOL lcl_TestSubTotal( BOOL& rAllowed, long nColumn, long* pArray, long nCount,
rAllowed = FALSE;
}
- return TRUE; // found
+ return TRUE; // found
}
return FALSE;
}
BOOL ScDPSource::SubTotalAllowed(long nColumn)
{
- //! cache this at ScDPResultData
+ //! cache this at ScDPResultData
BOOL bAllowed = TRUE;
if ( lcl_TestSubTotal( bAllowed, nColumn, nColDims, nColDimCount, this ) )
return bAllowed;
@@ -277,7 +277,7 @@ void lcl_RemoveDim( long nRemove, long* pDims, long& rCount )
void ScDPSource::SetOrientation(long nColumn, USHORT nNew)
{
- //! change to no-op if new orientation is equal to old?
+ //! change to no-op if new orientation is equal to old?
// remove from old list
lcl_RemoveDim( nColumn, nColDims, nColDimCount );
@@ -305,7 +305,7 @@ void ScDPSource::SetOrientation(long nColumn, USHORT nNew)
case sheet::DataPilotFieldOrientation_HIDDEN:
break;
// End Comments
- default:
+ default:
DBG_ERROR( "ScDPSource::SetOrientation: unexpected orientation" );
break;
}
@@ -326,7 +326,7 @@ BOOL ScDPSource::IsDateDimension(long nDim)
return pData->IsDateDimension(nDim);
}
-UINT32 ScDPSource::GetNumberFormat(long nDim)
+UINT32 ScDPSource::GetNumberFormat(long nDim)
{
return pData->GetNumberFormat( nDim );
}
@@ -336,7 +336,7 @@ ScDPDimensions* ScDPSource::GetDimensionsObject()
if (!pDimensions)
{
pDimensions = new ScDPDimensions(this);
- pDimensions->acquire(); // ref-counted
+ pDimensions->acquire(); // ref-counted
}
return pDimensions;
}
@@ -355,7 +355,7 @@ ScDPDimension* ScDPSource::AddDuplicated(long /* nSource */, const String& rNewN
{
DBG_ASSERT( pDimensions, "AddDuplicated without dimensions?" );
- // re-use
+ // re-use
long nOldDimCount = pDimensions->getCount();
for (long i=0; i<nOldDimCount; i++)
@@ -363,20 +363,20 @@ ScDPDimension* ScDPSource::AddDuplicated(long /* nSource */, const String& rNewN
ScDPDimension* pDim = pDimensions->getByIndex(i);
if (pDim && String(pDim->getName()) == rNewName)
{
- //! test if pDim is a duplicate of source
+ //! test if pDim is a duplicate of source
return pDim;
}
}
SetDupCount( nDupCount + 1 );
- pDimensions->CountChanged(); // uses nDupCount
+ pDimensions->CountChanged(); // uses nDupCount
return pDimensions->getByIndex( pDimensions->getCount() - 1 );
}
long ScDPSource::GetSourceDim(long nDim)
{
- // original source dimension or data layout dimension?
+ // original source dimension or data layout dimension?
if ( nDim <= pData->GetColumnCount() )
return nDim;
@@ -398,26 +398,26 @@ long ScDPSource::GetSourceDim(long nDim)
uno::Sequence< uno::Sequence<sheet::DataResult> > SAL_CALL ScDPSource::getResults()
throw(uno::RuntimeException)
{
- CreateRes_Impl(); // create pColResRoot and pRowResRoot
+ CreateRes_Impl(); // create pColResRoot and pRowResRoot
- if ( bResultOverflow ) // set in CreateRes_Impl
+ if ( bResultOverflow ) // set in CreateRes_Impl
{
- // no results available
+ // no results available
throw uno::RuntimeException();
}
long nColCount = pColResRoot->GetSize(pResData->GetColStartMeasure());
long nRowCount = pRowResRoot->GetSize(pResData->GetRowStartMeasure());
- // allocate full sequence
- //! leave out empty rows???
+ // allocate full sequence
+ //! leave out empty rows???
uno::Sequence< uno::Sequence<sheet::DataResult> > aSeq( nRowCount );
uno::Sequence<sheet::DataResult>* pRowAry = aSeq.getArray();
for (long nRow = 0; nRow < nRowCount; nRow++)
{
uno::Sequence<sheet::DataResult> aColSeq( nColCount );
- // use default values of DataResult
+ // use default values of DataResult
pRowAry[nRow] = aColSeq;
}
@@ -435,13 +435,13 @@ void SAL_CALL ScDPSource::refresh() throw(uno::RuntimeException)
void SAL_CALL ScDPSource::addRefreshListener( const uno::Reference<util::XRefreshListener >& )
throw(uno::RuntimeException)
{
- DBG_ERROR("not implemented"); //! exception?
+ DBG_ERROR("not implemented"); //! exception?
}
void SAL_CALL ScDPSource::removeRefreshListener( const uno::Reference<util::XRefreshListener >& )
throw(uno::RuntimeException)
{
- DBG_ERROR("not implemented"); //! exception?
+ DBG_ERROR("not implemented"); //! exception?
}
Sequence< Sequence<Any> > SAL_CALL ScDPSource::getDrillDownData(const Sequence<sheet::DataPilotFieldFilter>& aFilters)
@@ -500,7 +500,7 @@ Sequence< Sequence<Any> > SAL_CALL ScDPSource::getDrillDownData(const Sequence<s
String ScDPSource::getDataDescription()
{
- CreateRes_Impl(); // create pResData
+ CreateRes_Impl(); // create pResData
String aRet;
if ( pResData->GetMeasureCount() == 1 )
@@ -509,7 +509,7 @@ String ScDPSource::getDataDescription()
aRet = pResData->GetMeasureString( 0, TRUE, SUBTOTAL_FUNC_NONE, bTotalResult );
}
- // empty for more than one measure
+ // empty for more than one measure
return aRet;
}
@@ -556,7 +556,7 @@ void ScDPSource::setRepeatIfEmpty(BOOL bSet)
pData->SetEmptyFlags( bIgnoreEmptyRows, bRepeatIfEmpty );
}
-void ScDPSource::validate() //! ???
+void ScDPSource::validate() //! ???
{
CreateRes_Impl();
}
@@ -565,7 +565,7 @@ void ScDPSource::disposeData()
{
if ( pResData )
{
- // reset all data...
+ // reset all data...
DELETEZ(pColResRoot);
DELETEZ(pRowResRoot);
@@ -580,22 +580,22 @@ void ScDPSource::disposeData()
if ( pDimensions )
{
- pDimensions->release(); // ref-counted
- pDimensions = NULL; // settings have to be applied (from SaveData) again!
+ pDimensions->release(); // ref-counted
+ pDimensions = NULL; // settings have to be applied (from SaveData) again!
}
SetDupCount( 0 );
- //! Test ????
+ //! Test ????
nColDimCount = nRowDimCount = nDataDimCount = nPageDimCount = 0;
- pData->DisposeData(); // cached entries etc.
+ pData->DisposeData(); // cached entries etc.
bResultOverflow = FALSE;
}
long lcl_CountMinMembers(const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLevel, long nLevels )
{
- // Calculate the product of the member count for those consecutive levels that
- // have the "show all" flag, one following level, and the data layout dimension.
+ // Calculate the product of the member count for those consecutive levels that
+ // have the "show all" flag, one following level, and the data layout dimension.
long nTotal = 1;
long nDataCount = 1;
@@ -614,7 +614,7 @@ long lcl_CountMinMembers(const vector<ScDPDimension*>& ppDim, const vector<ScDPL
BOOL bDo = FALSE;
if ( ppDim[nPos]->getIsDataLayoutDimension() )
{
- // data layout dim doesn't interfere with "show all" flags
+ // data layout dim doesn't interfere with "show all" flags
nDataCount = ppLevel[nPos]->GetMembersObject()->getCount();
if ( nDataCount == 0 )
nDataCount = 1;
@@ -624,7 +624,7 @@ long lcl_CountMinMembers(const vector<ScDPDimension*>& ppDim, const vector<ScDPL
bDo = TRUE;
if ( !ppLevel[nPos]->getShowEmpty() )
{
- // this level is counted, following ones are not
+ // this level is counted, following ones are not
bWasShowAll = FALSE;
}
}
@@ -633,21 +633,21 @@ long lcl_CountMinMembers(const vector<ScDPDimension*>& ppDim, const vector<ScDPL
long nThisCount = ppLevel[nPos]->GetMembersObject()->getMinMembers();
if ( nThisCount == 0 )
{
- nTotal = 1; // empty level -> start counting from here
- //! start with visible elements in this level?
+ nTotal = 1; // empty level -> start counting from here
+ //! start with visible elements in this level?
}
else
{
if ( nTotal >= LONG_MAX / nThisCount )
- return LONG_MAX; // overflow
+ return LONG_MAX; // overflow
nTotal *= nThisCount;
}
}
}
- // always include data layout dim, even after restarting
+ // always include data layout dim, even after restarting
if ( nTotal >= LONG_MAX / nDataCount )
- return LONG_MAX; // overflow
+ return LONG_MAX; // overflow
nTotal *= nDataCount;
return nTotal;
@@ -678,10 +678,10 @@ void ScDPSource::FillCalcInfo(bool bIsRow, ScDPTableData::CalcInfo& rInfo, bool
ScDPLevels* pLevels = pDim->GetHierarchiesObject()->getByIndex(nHierarchy)->GetLevelsObject();
long nCount = pLevels->getCount();
- //! Test
+ //! Test
if ( pDim->getIsDataLayoutDimension() && nDataDimCount < 2 )
nCount = 0;
- //! Test
+ //! Test
for (long j = 0; j < nCount; ++j)
{
@@ -689,7 +689,7 @@ void ScDPSource::FillCalcInfo(bool bIsRow, ScDPTableData::CalcInfo& rInfo, bool
pLevel->EvaluateSortOrder();
// no layout flags for column fields, only for row fields
- pLevel->SetEnableLayout( bIsRow );
+ pLevel->SetEnableLayout( bIsRow );
if ( pLevel->GetAutoShow().IsEnabled )
rHasAutoShow = TRUE;
@@ -756,7 +756,7 @@ void ScDPSource::FilterCacheTableByPageDimensions()
ScDPCacheTable::Criterion aFilter;
aFilter.mnFieldIndex = static_cast<sal_Int32>(nField);
aFilter.mpFilter.reset(new ScDPCacheTable::GroupFilter(/*rSharedString*/));
- ScDPCacheTable::GroupFilter* pGrpFilter =
+ ScDPCacheTable::GroupFilter* pGrpFilter =
static_cast<ScDPCacheTable::GroupFilter*>(aFilter.mpFilter.get());
for (long j = 0; j < nMemCount; ++j)
{
@@ -798,7 +798,7 @@ void ScDPSource::CreateRes_Impl()
if ( nDataDimCount > 1 && ( nDataOrient != sheet::DataPilotFieldOrientation_COLUMN &&
nDataOrient != sheet::DataPilotFieldOrientation_ROW ) )
{
- // if more than one data dimension, data layout orientation must be set
+ // if more than one data dimension, data layout orientation must be set
SetOrientation( pData->GetColumnCount(), sheet::DataPilotFieldOrientation_ROW );
nDataOrient = sheet::DataPilotFieldOrientation_ROW;
}
@@ -819,8 +819,8 @@ void ScDPSource::CreateRes_Impl()
ScDPTableData::CalcInfo aInfo;
- // LateInit (initialize only those rows/children that are used) can be used unless
- // any data dimension needs reference values from column/row dimensions
+ // LateInit (initialize only those rows/children that are used) can be used unless
+ // any data dimension needs reference values from column/row dimensions
BOOL bLateInit = TRUE;
// Go through all data dimensions (i.e. fields) and build their meta data
@@ -835,7 +835,7 @@ void ScDPSource::CreateRes_Impl()
sheet::GeneralFunction eUser = (sheet::GeneralFunction)pDim->getFunction();
if (eUser == sheet::GeneralFunction_AUTO)
{
- //! test for numeric data
+ //! test for numeric data
eUser = sheet::GeneralFunction_SUM;
}
@@ -844,7 +844,7 @@ void ScDPSource::CreateRes_Impl()
// Get reference field/item information.
pDataRefValues[i] = pDim->GetReferenceValue();
- nDataRefOrient[i] = sheet::DataPilotFieldOrientation_HIDDEN; // default if not used
+ nDataRefOrient[i] = sheet::DataPilotFieldOrientation_HIDDEN; // default if not used
sal_Int32 eRefType = pDataRefValues[i].ReferenceType;
if ( eRefType == sheet::DataPilotFieldReferenceType::ITEM_DIFFERENCE ||
eRefType == sheet::DataPilotFieldReferenceType::ITEM_PERCENTAGE ||
@@ -856,24 +856,24 @@ void ScDPSource::CreateRes_Impl()
if ( nColumn >= 0 )
{
nDataRefOrient[i] = GetOrientation( nColumn );
- // need fully initialized results to find reference values
- // (both in column or row dimensions), so updated values or
- // differences to 0 can be displayed even for empty results.
+ // need fully initialized results to find reference values
+ // (both in column or row dimensions), so updated values or
+ // differences to 0 can be displayed even for empty results.
bLateInit = FALSE;
}
}
- pDataNames[i] = String( pDim->getName() ); //! label?
+ pDataNames[i] = String( pDim->getName() ); //! label?
- // asterisk is added to duplicated dimension names by ScDPSaveData::WriteToSource
- //! modify user visible strings as in ScDPResultData::GetMeasureString instead!
+ // asterisk is added to duplicated dimension names by ScDPSaveData::WriteToSource
+ //! modify user visible strings as in ScDPResultData::GetMeasureString instead!
pDataNames[i].EraseTrailingChars('*');
- //! if the name is overridden by user, a flag must be set
- //! so the user defined name replaces the function string and field name.
+ //! if the name is overridden by user, a flag must be set
+ //! so the user defined name replaces the function string and field name.
- //! the complete name (function and field) must be stored at the dimension
+ //! the complete name (function and field) must be stored at the dimension
long nSource = ((ScDPDimension*)pDim)->GetSourceDim();
if (nSource >= 0)
@@ -940,16 +940,16 @@ void ScDPSource::CreateRes_Impl()
pLevels->getByIndex(j)->GetMembersObject(); // initialize for groups
}
- // pre-check: calculate minimum number of result columns / rows from
- // levels that have the "show all" flag set
+ // pre-check: calculate minimum number of result columns / rows from
+ // levels that have the "show all" flag set
long nMinColMembers = lcl_CountMinMembers( aInfo.aColDims, aInfo.aColLevels, nColLevelCount );
long nMinRowMembers = lcl_CountMinMembers( aInfo.aRowDims, aInfo.aRowLevels, nRowLevelCount );
if ( nMinColMembers > MAXCOLCOUNT/*SC_MINCOUNT_LIMIT*/ || nMinRowMembers > SC_MINCOUNT_LIMIT )
{
- // resulting table is too big -> abort before calculating
- // (this relies on late init, so no members are allocated in InitFrom above)
+ // resulting table is too big -> abort before calculating
+ // (this relies on late init, so no members are allocated in InitFrom above)
bResultOverflow = TRUE;
}
@@ -1013,9 +1013,9 @@ void ScDPSource::CreateRes_Impl()
//UNUSED2009-05 void ScDPSource::DumpState( ScDocument* pDoc, const ScAddress& rPos )
//UNUSED2009-05 {
//UNUSED2009-05 CreateRes_Impl();
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 ScAddress aDocPos( rPos );
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 if (pColResRoot->GetChildDimension())
//UNUSED2009-05 pColResRoot->GetChildDimension()->DumpState( NULL, pDoc, aDocPos );
//UNUSED2009-05 pRowResRoot->DumpState( pColResRoot, pDoc, aDocPos );
@@ -1082,10 +1082,10 @@ void ScDPSource::FillMemberResults()
{
CreateRes_Impl();
- if ( bResultOverflow ) // set in CreateRes_Impl
+ if ( bResultOverflow ) // set in CreateRes_Impl
{
- // no results available -> abort (leave empty)
- // exception is thrown in ScDPSource::getResults
+ // no results available -> abort (leave empty)
+ // exception is thrown in ScDPSource::getResults
return;
}
@@ -1155,11 +1155,11 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo(
static SfxItemPropertyMapEntry aDPSourceMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNO_COLGRAND), 0, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_DATADESC), 0, &getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNO_IGNOREEM), 0, &getBooleanCppuType(), 0, 0 }, // for sheet data only
- {MAP_CHAR_LEN(SC_UNO_REPEATIF), 0, &getBooleanCppuType(), 0, 0 }, // for sheet data only
- {MAP_CHAR_LEN(SC_UNO_ROWGRAND), 0, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_COLGRAND), 0, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_DATADESC), 0, &getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNO_IGNOREEM), 0, &getBooleanCppuType(), 0, 0 }, // for sheet data only
+ {MAP_CHAR_LEN(SC_UNO_REPEATIF), 0, &getBooleanCppuType(), 0, 0 }, // for sheet data only
+ {MAP_CHAR_LEN(SC_UNO_ROWGRAND), 0, &getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNO_ROWFIELDCOUNT), 0, &getCppuType(static_cast<sal_Int32*>(0)), READONLY, 0 },
{MAP_CHAR_LEN(SC_UNO_COLUMNFIELDCOUNT), 0, &getCppuType(static_cast<sal_Int32*>(0)), READONLY, 0 },
{MAP_CHAR_LEN(SC_UNO_DATAFIELDCOUNT), 0, &getCppuType(static_cast<sal_Int32*>(0)), READONLY, 0 },
@@ -1194,7 +1194,7 @@ void SAL_CALL ScDPSource::setPropertyValue( const rtl::OUString& aPropertyName,
else
{
DBG_ERROR("unknown property");
- //! THROW( UnknownPropertyException() );
+ //! THROW( UnknownPropertyException() );
}
}
@@ -1212,7 +1212,7 @@ uno::Any SAL_CALL ScDPSource::getPropertyValue( const rtl::OUString& aPropertyNa
lcl_SetBoolInAny( aRet, getIgnoreEmptyRows() );
else if ( aNameStr.EqualsAscii( SC_UNO_REPEATIF ) )
lcl_SetBoolInAny( aRet, getRepeatIfEmpty() );
- else if ( aNameStr.EqualsAscii( SC_UNO_DATADESC ) ) // read-only
+ else if ( aNameStr.EqualsAscii( SC_UNO_DATADESC ) ) // read-only
aRet <<= rtl::OUString( getDataDescription() );
else if ( aNameStr.EqualsAscii( SC_UNO_ROWFIELDCOUNT ) ) // read-only
aRet <<= static_cast<sal_Int32>(nRowDimCount);
@@ -1228,7 +1228,7 @@ uno::Any SAL_CALL ScDPSource::getPropertyValue( const rtl::OUString& aPropertyNa
else
{
DBG_ERROR("unknown property");
- //! THROW( UnknownPropertyException() );
+ //! THROW( UnknownPropertyException() );
}
return aRet;
}
@@ -1241,7 +1241,7 @@ ScDPDimensions::ScDPDimensions( ScDPSource* pSrc ) :
pSource( pSrc ),
ppDims( NULL )
{
- //! hold pSource
+ //! hold pSource
// include data layout dimension and duplicated dimensions
nDimCount = pSource->GetData()->GetColumnCount() + 1 + pSource->GetDupCount();
@@ -1249,13 +1249,13 @@ ScDPDimensions::ScDPDimensions( ScDPSource* pSrc ) :
ScDPDimensions::~ScDPDimensions()
{
- //! release pSource
+ //! release pSource
if (ppDims)
{
for (long i=0; i<nDimCount; i++)
if ( ppDims[i] )
- ppDims[i]->release(); // ref-counted
+ ppDims[i]->release(); // ref-counted
delete[] ppDims;
}
}
@@ -1270,13 +1270,13 @@ void ScDPDimensions::CountChanged()
long nCopy = Min( nNewCount, nDimCount );
ScDPDimension** ppNew = new ScDPDimension*[nNewCount];
- for (i=0; i<nCopy; i++) // copy existing dims
+ for (i=0; i<nCopy; i++) // copy existing dims
ppNew[i] = ppDims[i];
- for (i=nCopy; i<nNewCount; i++) // clear additional pointers
+ for (i=nCopy; i<nNewCount; i++) // clear additional pointers
ppNew[i] = NULL;
- for (i=nCopy; i<nDimCount; i++) // delete old dims if count is decreased
+ for (i=nCopy; i<nDimCount; i++) // delete old dims if count is decreased
if ( ppDims[i] )
- ppDims[i]->release(); // ref-counted
+ ppDims[i]->release(); // ref-counted
delete[] ppDims;
ppDims = ppNew;
@@ -1337,7 +1337,7 @@ sal_Bool SAL_CALL ScDPDimensions::hasElements() throw(uno::RuntimeException)
long ScDPDimensions::getCount() const
{
- // in tabular data, every column of source data is a dimension
+ // in tabular data, every column of source data is a dimension
return nDimCount;
}
@@ -1355,13 +1355,13 @@ ScDPDimension* ScDPDimensions::getByIndex(long nIndex) const
if ( !ppDims[nIndex] )
{
ppDims[nIndex] = new ScDPDimension( pSource, nIndex );
- ppDims[nIndex]->acquire(); // ref-counted
+ ppDims[nIndex]->acquire(); // ref-counted
}
return ppDims[nIndex];
}
- return NULL; //! exception?
+ return NULL; //! exception?
}
// -----------------------------------------------------------------------
@@ -1371,7 +1371,7 @@ ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) :
nDim( nD ),
pHierarchies( NULL ),
nUsedHier( 0 ),
- nFunction( SUBTOTAL_FUNC_SUM ), // sum is default
+ nFunction( SUBTOTAL_FUNC_SUM ), // sum is default
mpLayoutName(NULL),
mpSubtotalName(NULL),
nSourceDim( -1 ),
@@ -1379,15 +1379,15 @@ ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) :
pSelectedData( NULL ),
mbHasHiddenMember(false)
{
- //! hold pSource
+ //! hold pSource
}
ScDPDimension::~ScDPDimension()
{
- //! release pSource
+ //! release pSource
if ( pHierarchies )
- pHierarchies->release(); // ref-counted
+ pHierarchies->release(); // ref-counted
delete pSelectedData;
}
@@ -1397,7 +1397,7 @@ ScDPHierarchies* ScDPDimension::GetHierarchiesObject()
if (!pHierarchies)
{
pHierarchies = new ScDPHierarchies( pSource, nDim );
- pHierarchies->acquire(); // ref-counted
+ pHierarchies->acquire(); // ref-counted
}
return pHierarchies;
}
@@ -1428,7 +1428,7 @@ uno::Reference<container::XNameAccess> SAL_CALL ScDPDimension::getHierarchies()
void SAL_CALL ScDPDimension::setName( const ::rtl::OUString& rNewName ) throw(uno::RuntimeException)
{
- // used after cloning
+ // used after cloning
aName = String( rNewName );
}
@@ -1449,7 +1449,7 @@ long ScDPDimension::getPosition() const
void ScDPDimension::setPosition(long /* nNew */)
{
- //! ...
+ //! ...
}
BOOL ScDPDimension::getIsDataLayoutDimension() const
@@ -1482,13 +1482,13 @@ ScDPDimension* ScDPDimension::CreateCloneObject()
{
DBG_ASSERT( nSourceDim < 0, "recursive duplicate - not implemented" );
- //! set new name here, or temporary name ???
+ //! set new name here, or temporary name ???
String aNewName = aName;
ScDPDimension* pNew = pSource->AddDuplicated( nDim, aNewName );
- pNew->aName = aNewName; //! here or in source?
- pNew->nSourceDim = nDim; //! recursive?
+ pNew->aName = aNewName; //! here or in source?
+ pNew->nSourceDim = nDim; //! recursive?
return pNew;
}
@@ -1514,7 +1514,7 @@ const ScDPItemData& ScDPDimension::GetSelectedData()
{
// find the named member to initialize pSelectedData from it, with name and value
- long nLevel = 0; // same as in ScDPObject::FillPageList
+ long nLevel = 0; // same as in ScDPObject::FillPageList
long nHierarchy = getUsedHierarchy();
if ( nHierarchy >= GetHierarchiesObject()->getCount() )
@@ -1539,7 +1539,7 @@ const ScDPItemData& ScDPDimension::GetSelectedData()
}
if ( !pSelectedData )
- pSelectedData = new ScDPItemData( aSelectedPage, 0.0, FALSE ); // default - name only
+ pSelectedData = new ScDPItemData( aSelectedPage, 0.0, FALSE ); // default - name only
}
return *pSelectedData;
@@ -1549,7 +1549,7 @@ const ScDPItemData& ScDPDimension::GetSelectedData()
//UNUSED2009-05 {
//UNUSED2009-05 if ( bHasSelectedPage )
//UNUSED2009-05 return rData.IsCaseInsEqual( GetSelectedData() );
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 return TRUE; // no selection -> all data
//UNUSED2009-05 }
@@ -1575,15 +1575,15 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetIn
static SfxItemPropertyMapEntry aDPDimensionMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNO_FILTER), 0, &getCppuType((uno::Sequence<sheet::TableFilterField>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_FUNCTION), 0, &getCppuType((sheet::GeneralFunction*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_ISDATALA), 0, &getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNO_NUMBERFO), 0, &getCppuType((sal_Int32*)0), beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNO_ORIENTAT), 0, &getCppuType((sheet::DataPilotFieldOrientation*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_ORIGINAL), 0, &getCppuType((uno::Reference<container::XNamed>*)0), beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNO_POSITION), 0, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_REFVALUE), 0, &getCppuType((sheet::DataPilotFieldReference*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_USEDHIER), 0, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_FILTER), 0, &getCppuType((uno::Sequence<sheet::TableFilterField>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_FUNCTION), 0, &getCppuType((sheet::GeneralFunction*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_ISDATALA), 0, &getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNO_NUMBERFO), 0, &getCppuType((sal_Int32*)0), beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNO_ORIENTAT), 0, &getCppuType((sheet::DataPilotFieldOrientation*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_ORIGINAL), 0, &getCppuType((uno::Reference<container::XNamed>*)0), beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNO_POSITION), 0, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_REFVALUE), 0, &getCppuType((sheet::DataPilotFieldReference*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_USEDHIER), 0, &getCppuType((sal_Int32*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNO_LAYOUTNAME), 0, &getCppuType(static_cast<rtl::OUString*>(0)), 0, 0 },
{MAP_CHAR_LEN(SC_UNO_FIELD_SUBTOTALNAME), 0, &getCppuType(static_cast<rtl::OUString*>(0)), 0, 0 },
{MAP_CHAR_LEN(SC_UNO_HAS_HIDDEN_MEMBER), 0, &getBooleanCppuType(), 0, 0 },
@@ -1655,7 +1655,7 @@ void SAL_CALL ScDPDimension::setPropertyValue( const rtl::OUString& aPropertyNam
DBG_ERROR("Filter property is not a single string");
throw lang::IllegalArgumentException();
}
- DELETEZ( pSelectedData ); // invalid after changing aSelectedPage
+ DELETEZ( pSelectedData ); // invalid after changing aSelectedPage
}
else if (aNameStr.EqualsAscii(SC_UNO_LAYOUTNAME))
{
@@ -1674,7 +1674,7 @@ void SAL_CALL ScDPDimension::setPropertyValue( const rtl::OUString& aPropertyNam
else
{
DBG_ERROR("unknown property");
- //! THROW( UnknownPropertyException() );
+ //! THROW( UnknownPropertyException() );
}
}
@@ -1700,7 +1700,7 @@ uno::Any SAL_CALL ScDPDimension::getPropertyValue( const rtl::OUString& aPropert
}
else if ( aNameStr.EqualsAscii( SC_UNO_REFVALUE ) )
aRet <<= aReferenceValue;
- else if ( aNameStr.EqualsAscii( SC_UNO_ISDATALA ) ) // read-only properties
+ else if ( aNameStr.EqualsAscii( SC_UNO_ISDATALA ) ) // read-only properties
lcl_SetBoolInAny( aRet, getIsDataLayoutDimension() );
else if ( aNameStr.EqualsAscii( SC_UNO_NUMBERFO ) )
{
@@ -1756,7 +1756,7 @@ uno::Any SAL_CALL ScDPDimension::getPropertyValue( const rtl::OUString& aPropert
else
{
DBG_ERROR("unknown property");
- //! THROW( UnknownPropertyException() );
+ //! THROW( UnknownPropertyException() );
}
return aRet;
}
@@ -1770,10 +1770,10 @@ ScDPHierarchies::ScDPHierarchies( ScDPSource* pSrc, long nD ) :
nDim( nD ),
ppHiers( NULL )
{
- //! hold pSource
+ //! hold pSource
#if 0
- // date columns have 3 hierarchies (flat/quarter/week), other columns only one
+ // date columns have 3 hierarchies (flat/quarter/week), other columns only one
long nSrcDim = pSource->GetSourceDim( nDim );
if ( pSource->IsDateDimension( nSrcDim ) )
nHierCount = SC_DAPI_DATE_HIERARCHIES;
@@ -1787,13 +1787,13 @@ ScDPHierarchies::ScDPHierarchies( ScDPSource* pSrc, long nD ) :
ScDPHierarchies::~ScDPHierarchies()
{
- //! release pSource
+ //! release pSource
if (ppHiers)
{
for (long i=0; i<nHierCount; i++)
if ( ppHiers[i] )
- ppHiers[i]->release(); // ref-counted
+ ppHiers[i]->release(); // ref-counted
delete[] ppHiers;
}
}
@@ -1856,8 +1856,8 @@ long ScDPHierarchies::getCount() const
ScDPHierarchy* ScDPHierarchies::getByIndex(long nIndex) const
{
- // pass hierarchy index to new object in case the implementation
- // will be extended to more than one hierarchy
+ // pass hierarchy index to new object in case the implementation
+ // will be extended to more than one hierarchy
if ( nIndex >= 0 && nIndex < nHierCount )
{
@@ -1870,13 +1870,13 @@ ScDPHierarchy* ScDPHierarchies::getByIndex(long nIndex) const
if ( !ppHiers[nIndex] )
{
ppHiers[nIndex] = new ScDPHierarchy( pSource, nDim, nIndex );
- ppHiers[nIndex]->acquire(); // ref-counted
+ ppHiers[nIndex]->acquire(); // ref-counted
}
return ppHiers[nIndex];
}
- return NULL; //! exception?
+ return NULL; //! exception?
}
// -----------------------------------------------------------------------
@@ -1887,15 +1887,15 @@ ScDPHierarchy::ScDPHierarchy( ScDPSource* pSrc, long nD, long nH ) :
nHier( nH ),
pLevels( NULL )
{
- //! hold pSource
+ //! hold pSource
}
ScDPHierarchy::~ScDPHierarchy()
{
- //! release pSource
+ //! release pSource
if (pLevels)
- pLevels->release(); // ref-counted
+ pLevels->release(); // ref-counted
}
ScDPLevels* ScDPHierarchy::GetLevelsObject()
@@ -1903,7 +1903,7 @@ ScDPLevels* ScDPHierarchy::GetLevelsObject()
if (!pLevels)
{
pLevels = new ScDPLevels( pSource, nDim, nHier );
- pLevels->acquire(); // ref-counted
+ pLevels->acquire(); // ref-counted
}
return pLevels;
}
@@ -1916,18 +1916,18 @@ uno::Reference<container::XNameAccess> SAL_CALL ScDPHierarchy::getLevels()
::rtl::OUString SAL_CALL ScDPHierarchy::getName() throw(uno::RuntimeException)
{
- String aRet; //! globstr-ID !!!!
+ String aRet; //! globstr-ID !!!!
switch (nHier)
{
case SC_DAPI_HIERARCHY_FLAT:
aRet = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("flat"));
- break; //! name ???????
+ break; //! name ???????
case SC_DAPI_HIERARCHY_QUARTER:
aRet = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Quarter"));
- break; //! name ???????
+ break; //! name ???????
case SC_DAPI_HIERARCHY_WEEK:
aRet = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Week"));
- break; //! name ???????
+ break; //! name ???????
default:
DBG_ERROR( "ScDPHierarchy::getName: unexpected hierarchy" );
break;
@@ -1937,7 +1937,7 @@ uno::Reference<container::XNameAccess> SAL_CALL ScDPHierarchy::getLevels()
void SAL_CALL ScDPHierarchy::setName( const ::rtl::OUString& /* rNewName */ ) throw(uno::RuntimeException)
{
- DBG_ERROR("not implemented"); //! exception?
+ DBG_ERROR("not implemented"); //! exception?
}
// -----------------------------------------------------------------------
@@ -1948,18 +1948,18 @@ ScDPLevels::ScDPLevels( ScDPSource* pSrc, long nD, long nH ) :
nHier( nH ),
ppLevs( NULL )
{
- //! hold pSource
+ //! hold pSource
- // text columns have only one level
+ // text columns have only one level
long nSrcDim = pSource->GetSourceDim( nDim );
if ( pSource->IsDateDimension( nSrcDim ) )
{
switch ( nHier )
{
- case SC_DAPI_HIERARCHY_FLAT: nLevCount = SC_DAPI_FLAT_LEVELS; break;
- case SC_DAPI_HIERARCHY_QUARTER: nLevCount = SC_DAPI_QUARTER_LEVELS; break;
- case SC_DAPI_HIERARCHY_WEEK: nLevCount = SC_DAPI_WEEK_LEVELS; break;
+ case SC_DAPI_HIERARCHY_FLAT: nLevCount = SC_DAPI_FLAT_LEVELS; break;
+ case SC_DAPI_HIERARCHY_QUARTER: nLevCount = SC_DAPI_QUARTER_LEVELS; break;
+ case SC_DAPI_HIERARCHY_WEEK: nLevCount = SC_DAPI_WEEK_LEVELS; break;
default:
DBG_ERROR("wrong hierarchy");
nLevCount = 0;
@@ -1971,13 +1971,13 @@ ScDPLevels::ScDPLevels( ScDPSource* pSrc, long nD, long nH ) :
ScDPLevels::~ScDPLevels()
{
- //! release pSource
+ //! release pSource
if (ppLevs)
{
for (long i=0; i<nLevCount; i++)
if ( ppLevs[i] )
- ppLevs[i]->release(); // ref-counted
+ ppLevs[i]->release(); // ref-counted
delete[] ppLevs;
}
}
@@ -2051,13 +2051,13 @@ ScDPLevel* ScDPLevels::getByIndex(long nIndex) const
if ( !ppLevs[nIndex] )
{
ppLevs[nIndex] = new ScDPLevel( pSource, nDim, nHier, nIndex );
- ppLevs[nIndex]->acquire(); // ref-counted
+ ppLevs[nIndex]->acquire(); // ref-counted
}
return ppLevs[nIndex];
}
- return NULL; //! exception?
+ return NULL; //! exception?
}
// -----------------------------------------------------------------------
@@ -2105,16 +2105,16 @@ ScDPLevel::ScDPLevel( ScDPSource* pSrc, long nD, long nH, long nL ) :
nAutoMeasure( 0 ),
bEnableLayout( FALSE )
{
- //! hold pSource
- // aSubTotals is empty
+ //! hold pSource
+ // aSubTotals is empty
}
ScDPLevel::~ScDPLevel()
{
- //! release pSource
+ //! release pSource
if ( pMembers )
- pMembers->release(); // ref-counted
+ pMembers->release(); // ref-counted
}
void ScDPLevel::EvaluateSortOrder()
@@ -2187,7 +2187,7 @@ ScDPMembers* ScDPLevel::GetMembersObject()
if (!pMembers)
{
pMembers = new ScDPMembers( pSource, nDim, nHier, nLev );
- pMembers->acquire(); // ref-counted
+ pMembers->acquire(); // ref-counted
}
return pMembers;
}
@@ -2203,7 +2203,7 @@ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::R
if (pRes)
return *pRes;
- return uno::Sequence<sheet::MemberResult>(0); //! Error?
+ return uno::Sequence<sheet::MemberResult>(0); //! Error?
}
::rtl::OUString SAL_CALL ScDPLevel::getName() throw(uno::RuntimeException)
@@ -2211,7 +2211,7 @@ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::R
long nSrcDim = pSource->GetSourceDim( nDim );
if ( pSource->IsDateDimension( nSrcDim ) )
{
- String aRet; //! globstr-ID !!!!
+ String aRet; //! globstr-ID !!!!
if ( nHier == SC_DAPI_HIERARCHY_QUARTER )
{
@@ -2265,12 +2265,12 @@ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::R
void SAL_CALL ScDPLevel::setName( const ::rtl::OUString& /* rNewName */ ) throw(uno::RuntimeException)
{
- DBG_ERROR("not implemented"); //! exception?
+ DBG_ERROR("not implemented"); //! exception?
}
uno::Sequence<sheet::GeneralFunction> ScDPLevel::getSubTotals() const
{
- //! separate functions for settings and evaluation?
+ //! separate functions for settings and evaluation?
long nSrcDim = pSource->GetSourceDim( nDim );
if ( !pSource->SubTotalAllowed( nSrcDim ) )
@@ -2282,7 +2282,7 @@ uno::Sequence<sheet::GeneralFunction> ScDPLevel::getSubTotals() const
void ScDPLevel::setSubTotals(const uno::Sequence<sheet::GeneralFunction>& rNew)
{
aSubTotals = rNew;
- //! set "manual change" flag?
+ //! set "manual change" flag?
}
BOOL ScDPLevel::getShowEmpty() const
@@ -2305,11 +2305,11 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPLevel::getPropertySetInfo()
static SfxItemPropertyMapEntry aDPLevelMap_Impl[] =
{
//! change type of AutoShow/Layout/Sorting to API struct when available
- {MAP_CHAR_LEN(SC_UNO_AUTOSHOW), 0, &getCppuType((sheet::DataPilotFieldAutoShowInfo*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_LAYOUT), 0, &getCppuType((sheet::DataPilotFieldLayoutInfo*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_SHOWEMPT), 0, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_SORTING), 0, &getCppuType((sheet::DataPilotFieldSortInfo*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_SUBTOTAL), 0, &getCppuType((uno::Sequence<sheet::GeneralFunction>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_AUTOSHOW), 0, &getCppuType((sheet::DataPilotFieldAutoShowInfo*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_LAYOUT), 0, &getCppuType((sheet::DataPilotFieldLayoutInfo*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_SHOWEMPT), 0, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_SORTING), 0, &getCppuType((sheet::DataPilotFieldSortInfo*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_SUBTOTAL), 0, &getCppuType((uno::Sequence<sheet::GeneralFunction>*)0), 0, 0 },
{0,0,0,0,0,0}
};
static uno::Reference<beans::XPropertySetInfo> aRef =
@@ -2340,7 +2340,7 @@ void SAL_CALL ScDPLevel::setPropertyValue( const rtl::OUString& aPropertyName, c
else
{
DBG_ERROR("unknown property");
- //! THROW( UnknownPropertyException() );
+ //! THROW( UnknownPropertyException() );
}
}
@@ -2354,7 +2354,7 @@ uno::Any SAL_CALL ScDPLevel::getPropertyValue( const rtl::OUString& aPropertyNam
lcl_SetBoolInAny( aRet, getShowEmpty() );
else if ( aNameStr.EqualsAscii( SC_UNO_SUBTOTAL ) )
{
- uno::Sequence<sheet::GeneralFunction> aSeq = getSubTotals(); //! avoid extra copy?
+ uno::Sequence<sheet::GeneralFunction> aSeq = getSubTotals(); //! avoid extra copy?
aRet <<= aSeq;
}
else if ( aNameStr.EqualsAscii( SC_UNO_SORTING ) )
@@ -2380,7 +2380,7 @@ uno::Any SAL_CALL ScDPLevel::getPropertyValue( const rtl::OUString& aPropertyNam
else
{
DBG_ERROR("unknown property");
- //! THROW( UnknownPropertyException() );
+ //! THROW( UnknownPropertyException() );
}
return aRet;
}
@@ -2396,7 +2396,7 @@ ScDPMembers::ScDPMembers( ScDPSource* pSrc, long nD, long nH, long nL ) :
nLev( nL ),
ppMbrs( NULL )
{
- //! hold pSource
+ //! hold pSource
long nSrcDim = pSource->GetSourceDim( nDim );
if ( pSource->IsDataLayoutDimension(nSrcDim) )
@@ -2438,12 +2438,12 @@ ScDPMembers::ScDPMembers( ScDPSource* pSrc, long nD, long nH, long nL ) :
nMbrCount = nLastYear + 1 - nFirstYear;
}
else
- nMbrCount = 0; // no values
+ nMbrCount = 0; // no values
}
break;
- case SC_DAPI_LEVEL_QUARTER: nMbrCount = 4; break;
- case SC_DAPI_LEVEL_MONTH: nMbrCount = 12; break;
- case SC_DAPI_LEVEL_DAY: nMbrCount = 31; break;
+ case SC_DAPI_LEVEL_QUARTER: nMbrCount = 4; break;
+ case SC_DAPI_LEVEL_MONTH: nMbrCount = 12; break;
+ case SC_DAPI_LEVEL_DAY: nMbrCount = 31; break;
default:
DBG_ERROR( "ScDPMembers::ScDPMembers: unexpected level" );
break;
@@ -2453,9 +2453,9 @@ ScDPMembers::ScDPMembers( ScDPSource* pSrc, long nD, long nH, long nL ) :
{
switch (nLev)
{
- case SC_DAPI_LEVEL_YEAR: nMbrCount = 1; break; //! get years from source
- case SC_DAPI_LEVEL_WEEK: nMbrCount = 53; break;
- case SC_DAPI_LEVEL_WEEKDAY: nMbrCount = 7; break;
+ case SC_DAPI_LEVEL_YEAR: nMbrCount = 1; break; //! get years from source
+ case SC_DAPI_LEVEL_WEEK: nMbrCount = 53; break;
+ case SC_DAPI_LEVEL_WEEKDAY: nMbrCount = 7; break;
default:
DBG_ERROR( "ScDPMembers::ScDPMembers: unexpected level" );
break;
@@ -2468,13 +2468,13 @@ ScDPMembers::ScDPMembers( ScDPSource* pSrc, long nD, long nH, long nL ) :
ScDPMembers::~ScDPMembers()
{
- //! release pSource
+ //! release pSource
if (ppMbrs)
{
for (long i=0; i<nMbrCount; i++)
if ( ppMbrs[i] )
- ppMbrs[i]->release(); // ref-counted
+ ppMbrs[i]->release(); // ref-counted
delete[] ppMbrs;
}
}
@@ -2567,22 +2567,22 @@ long ScDPMembers::getMinMembers() const
{
for (long i=0; i<nMbrCount; i++)
{
- // count only visible with details (default is true for both)
+ // count only visible with details (default is true for both)
const ScDPMember* pMbr = ppMbrs[i];
if ( !pMbr || ( pMbr->getIsVisible() && pMbr->getShowDetails() ) )
++nVisCount;
}
}
else
- nVisCount = nMbrCount; // default for all
+ nVisCount = nMbrCount; // default for all
return nVisCount;
}
ScDPMember* ScDPMembers::getByIndex(long nIndex) const
{
- // result of GetColumnEntries must not change between ScDPMembers ctor
- // and all calls to getByIndex
+ // result of GetColumnEntries must not change between ScDPMembers ctor
+ // and all calls to getByIndex
if ( nIndex >= 0 && nIndex < nMbrCount )
{
@@ -2606,10 +2606,10 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const
long nVal = 0;
String aName;
- if ( nLev == SC_DAPI_LEVEL_YEAR ) // YEAR is in both hierarchies
+ if ( nLev == SC_DAPI_LEVEL_YEAR ) // YEAR is in both hierarchies
{
- //! cache year range here!
-
+ //! cache year range here!
+
// Wang Xu Ming - DataPilot migration
double fFirstVal = pSource->GetData()->GetMemberByIndex( nSrcDim, 0 )->GetValue();
long nFirstYear = pSource->GetData()->GetDatePart(
@@ -2621,24 +2621,24 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const
}
else if ( nHier == SC_DAPI_HIERARCHY_WEEK && nLev == SC_DAPI_LEVEL_WEEKDAY )
{
- nVal = nIndex; // DayOfWeek is 0-based
+ nVal = nIndex; // DayOfWeek is 0-based
aName = ScGlobal::GetCalendar()->getDisplayName(
::com::sun::star::i18n::CalendarDisplayIndex::DAY,
sal::static_int_cast<sal_Int16>(nVal), 0 );
}
else if ( nHier == SC_DAPI_HIERARCHY_QUARTER && nLev == SC_DAPI_LEVEL_MONTH )
{
- nVal = nIndex; // Month is 0-based
+ nVal = nIndex; // Month is 0-based
aName = ScGlobal::GetCalendar()->getDisplayName(
::com::sun::star::i18n::CalendarDisplayIndex::MONTH,
sal::static_int_cast<sal_Int16>(nVal), 0 );
}
else
- nVal = nIndex + 1; // Quarter, Day, Week are 1-based
+ nVal = nIndex + 1; // Quarter, Day, Week are 1-based
if ( !aName.Len() )
aName = String::CreateFromInt32(nVal);
-
+
ScDPItemData rData( aName, nVal, TRUE, 0 ) ;
pNew = new ScDPMember( pSource, nDim, nHier, nLev, pSource->GetCache()->GetAdditionalItemID(rData));
}
@@ -2647,7 +2647,7 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const
const std::vector< SCROW >& memberIndexs = pSource->GetData()->GetColumnEntries( nSrcDim );
pNew = new ScDPMember( pSource, nDim, nHier, nLev, memberIndexs[nIndex] );
}
- pNew->acquire(); // ref-counted
+ pNew->acquire(); // ref-counted
ppMbrs[nIndex] = pNew;
}
@@ -2656,7 +2656,7 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const
return ppMbrs[nIndex];
}
- return NULL; //! exception?
+ return NULL; //! exception?
}
// -----------------------------------------------------------------------
@@ -2673,12 +2673,12 @@ ScDPMember::ScDPMember( ScDPSource* pSrc, long nD, long nH, long nL,
bVisible( TRUE ),
bShowDet( TRUE )
{
- //! hold pSource
+ //! hold pSource
}
ScDPMember::~ScDPMember()
{
- //! release pSource
+ //! release pSource
}
BOOL ScDPMember::IsNamedItem( const ScDPItemData& r ) const
@@ -2690,7 +2690,7 @@ BOOL ScDPMember::IsNamedItem( const ScDPItemData& r ) const
(long)::rtl::math::approxFloor( r.GetValue() ),
nHier, nLev );
- // fValue is converted from integer, so simple comparison works
+ // fValue is converted from integer, so simple comparison works
return nComp == GetItemData().GetValue();
}
@@ -2701,7 +2701,7 @@ BOOL ScDPMember::IsNamedItem( SCROW nIndex ) const
{
long nSrcDim = pSource->GetSourceDim( nDim );
if ( nHier != SC_DAPI_HIERARCHY_FLAT && pSource->IsDateDimension( nSrcDim ) )
- {
+ {
const ScDPItemData* pData = pSource->GetCache()->GetItemDataById( (SCCOL) nSrcDim, nIndex );
if ( pData->IsValue() )
{
@@ -2743,7 +2743,7 @@ sal_Int32 ScDPMember::Compare( const ScDPMember& rOther ) const
void ScDPMember::FillItemData( ScDPItemData& rData ) const
{
- //! handle date hierarchy...
+ //! handle date hierarchy...
rData = GetItemData() ;
}
@@ -2765,7 +2765,7 @@ String ScDPMember::GetNameStr() const
void SAL_CALL ScDPMember::setName( const ::rtl::OUString& /* rNewName */ ) throw(uno::RuntimeException)
{
- DBG_ERROR("not implemented"); //! exception?
+ DBG_ERROR("not implemented"); //! exception?
}
BOOL ScDPMember::getIsVisible() const
@@ -2776,7 +2776,7 @@ BOOL ScDPMember::getIsVisible() const
void ScDPMember::setIsVisible(BOOL bSet)
{
bVisible = bSet;
- //! set "manual change" flag
+ //! set "manual change" flag
}
BOOL ScDPMember::getShowDetails() const
@@ -2787,7 +2787,7 @@ BOOL ScDPMember::getShowDetails() const
void ScDPMember::setShowDetails(BOOL bSet)
{
bShowDet = bSet;
- //! set "manual change" flag
+ //! set "manual change" flag
}
sal_Int32 ScDPMember::getPosition() const
@@ -2809,9 +2809,9 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo(
static SfxItemPropertyMapEntry aDPMemberMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNO_ISVISIBL), 0, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_ISVISIBL), 0, &getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNO_POSITION), 0, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_SHOWDETA), 0, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_SHOWDETA), 0, &getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNO_LAYOUTNAME), 0, &getCppuType(static_cast<rtl::OUString*>(0)), 0, 0 },
{0,0,0,0,0,0}
};
@@ -2845,7 +2845,7 @@ void SAL_CALL ScDPMember::setPropertyValue( const rtl::OUString& aPropertyName,
else
{
DBG_ERROR("unknown property");
- //! THROW( UnknownPropertyException() );
+ //! THROW( UnknownPropertyException() );
}
}
@@ -2866,7 +2866,7 @@ uno::Any SAL_CALL ScDPMember::getPropertyValue( const rtl::OUString& aPropertyNa
else
{
DBG_ERROR("unknown property");
- //! THROW( UnknownPropertyException() );
+ //! THROW( UnknownPropertyException() );
}
return aRet;
}
@@ -2887,7 +2887,7 @@ const ScDPItemData& ScDPMember::GetItemData() const
const ScDPItemData* ScDPSource::GetItemDataById(long nDim, long nId)
{
- long nSrcDim = GetSourceDim( nDim );
+ long nSrcDim = GetSourceDim( nDim );
const ScDPItemData* pItemData = GetData()->GetMemberById( nSrcDim, nId );
if ( !pItemData )
{ //todo:
@@ -2901,7 +2901,7 @@ const ScDPItemData* ScDPSource::GetItemDataById(long nDim, long nId)
SCROW ScDPSource::GetMemberId( long nDim, const ScDPItemData& rData )
{
long nSrcDim = GetSourceDim( nDim );
- return GetCache()->GetIdByItemData( nSrcDim, rData );
+ return GetCache()->GetIdByItemData( nSrcDim, rData );
}
const ScDPItemData* ScDPMembers::GetSrcItemDataByIndex( SCROW nIndex)
@@ -2909,7 +2909,7 @@ const ScDPItemData* ScDPMembers::GetSrcItemDataByIndex( SCROW nIndex)
const std::vector< SCROW >& memberIds = pSource->GetData()->GetColumnEntries( nDim );
if ( nIndex >= (long )(memberIds.size()) || nIndex < 0 )
return NULL;
- SCROW nId = memberIds[ nIndex ];
+ SCROW nId = memberIds[ nIndex ];
return pSource->GetItemDataById( nDim, nId );
}
diff --git a/sc/source/core/data/drawpage.cxx b/sc/source/core/data/drawpage.cxx
index 715b99f362a1..1b635098b12b 100644
--- a/sc/source/core/data/drawpage.cxx
+++ b/sc/source/core/data/drawpage.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 4df709768279..271882427539 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +82,15 @@
#include "attrib.hxx"
#include "charthelper.hxx"
-#define DET_ARROW_OFFSET 1000
+#define DET_ARROW_OFFSET 1000
-// Abstand zur naechsten Zelle beim Loeschen (bShrink), damit der Anker
-// immer an der richtigen Zelle angezeigt wird
-//#define SHRINK_DIST 3
-// und noch etwas mehr, damit das Objekt auch sichtbar in der Zelle liegt
-#define SHRINK_DIST 25
+// Abstand zur naechsten Zelle beim Loeschen (bShrink), damit der Anker
+// immer an der richtigen Zelle angezeigt wird
+//#define SHRINK_DIST 3
+// und noch etwas mehr, damit das Objekt auch sichtbar in der Zelle liegt
+#define SHRINK_DIST 25
-#define SHRINK_DIST_TWIPS 15
+#define SHRINK_DIST_TWIPS 15
using namespace ::com::sun::star;
@@ -104,9 +104,9 @@ static E3dObjFactory* pF3d = NULL;
static USHORT nInst = 0;
SfxObjectShell* ScDrawLayer::pGlobalDrawPersist = NULL;
-//REMOVE SvPersist* ScDrawLayer::pGlobalDrawPersist = NULL;
+//REMOVE SvPersist* ScDrawLayer::pGlobalDrawPersist = NULL;
-BOOL bDrawIsInUndo = FALSE; //! Member
+BOOL bDrawIsInUndo = FALSE; //! Member
// -----------------------------------------------------------------------
@@ -168,7 +168,7 @@ __EXPORT ScTabSizeChangedHint::~ScTabSizeChangedHint()
// -----------------------------------------------------------------------
-#define MAXMM 10000000
+#define MAXMM 10000000
inline void TwipsToMM( long& nVal )
{
@@ -177,7 +177,7 @@ inline void TwipsToMM( long& nVal )
inline void ReverseTwipsToMM( long& nVal )
{
- // reverse the effect of TwipsToMM - round up here (add 1)
+ // reverse the effect of TwipsToMM - round up here (add 1)
nVal = ((long) ( nVal / HMM_PER_TWIPS )) + 1;
}
@@ -207,11 +207,11 @@ void lcl_ReverseTwipsToMM( Rectangle& rRect )
ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) :
FmFormModel( SvtPathOptions().GetPalettePath(),
- NULL, // SfxItemPool* Pool
+ NULL, // SfxItemPool* Pool
pGlobalDrawPersist ?
pGlobalDrawPersist :
( pDocument ? pDocument->GetDocumentShell() : NULL ),
- TRUE ), // bUseExtColorTable (is set below)
+ TRUE ), // bUseExtColorTable (is set below)
aName( rName ),
pDoc( pDocument ),
pUndoGroup( NULL ),
@@ -219,7 +219,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) :
bAdjustEnabled( TRUE ),
bHyphenatorSet( FALSE )
{
- pGlobalDrawPersist = NULL; // nur einmal benutzen
+ pGlobalDrawPersist = NULL; // nur einmal benutzen
SfxObjectShell* pObjSh = pDocument ? pDocument->GetDocumentShell() : NULL;
if ( pObjSh )
@@ -235,7 +235,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) :
SetColorTable( XColorTable::GetStdColorTable() );
SetSwapGraphics(TRUE);
-// SetSwapAsynchron(TRUE); // an der View
+// SetSwapAsynchron(TRUE); // an der View
SetScaleUnit(MAP_100TH_MM);
SfxItemPool& rPool = GetItemPool();
@@ -257,7 +257,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) :
rPool.GetSecondaryPool()->SetPoolDefaultItem( SvxScriptSpaceItem( FALSE, EE_PARA_ASIANCJKSPACING ) );
}
- rPool.FreezeIdRanges(); // the pool is also used directly
+ rPool.FreezeIdRanges(); // the pool is also used directly
SdrLayerAdmin& rAdmin = GetLayerAdmin();
rAdmin.NewLayer(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("vorne")), SC_LAYER_FRONT);
@@ -267,7 +267,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) :
rAdmin.NewLayer(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("hidden")), SC_LAYER_HIDDEN);
// "Controls" is new - must also be created when loading
- // Link fuer URL-Fields setzen
+ // Link fuer URL-Fields setzen
ScModule* pScMod = SC_MOD();
Outliner& rOutliner = GetDrawOutliner();
rOutliner.SetCalcFieldValueHdl( LINK( pScMod, ScModule, CalcFieldValueHdl ) );
@@ -283,7 +283,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) :
if ( pHitOutlinerPool )
pHitOutlinerPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT )); // 12Pt
- // URL-Buttons haben keinen Handler mehr, machen alles selber
+ // URL-Buttons haben keinen Handler mehr, machen alles selber
if( !nInst++ )
{
@@ -324,7 +324,7 @@ void ScDrawLayer::UseHyphenator()
SdrPage* __EXPORT ScDrawLayer::AllocPage(FASTBOOL bMasterPage)
{
- // don't create basic until it is needed
+ // don't create basic until it is needed
StarBASIC* pBasic = NULL;
ScDrawPage* pPage = new ScDrawPage( *this, pBasic, sal::static_int_cast<BOOL>(bMasterPage) );
return pPage;
@@ -344,14 +344,14 @@ BOOL ScDrawLayer::HasObjects() const
void ScDrawLayer::UpdateBasic()
{
- // don't create basic until it is needed
- //! remove this method?
+ // don't create basic until it is needed
+ //! remove this method?
}
SdrModel* __EXPORT ScDrawLayer::AllocModel() const
{
- // #103849# Allocated model (for clipboard etc) must not have a pointer
- // to the original model's document, pass NULL as document:
+ // #103849# Allocated model (for clipboard etc) must not have a pointer
+ // to the original model's document, pass NULL as document:
return new ScDrawLayer( NULL, aName );
}
@@ -393,11 +393,11 @@ void ScDrawLayer::ScRemovePage( SCTAB nTab )
if (bRecording)
{
SdrPage* pPage = GetPage(static_cast<sal_uInt16>(nTab));
- AddCalcUndo(new SdrUndoDelPage(*pPage)); // Undo-Action wird Owner der Page
- RemovePage( static_cast<sal_uInt16>(nTab) ); // nur austragen, nicht loeschen
+ AddCalcUndo(new SdrUndoDelPage(*pPage)); // Undo-Action wird Owner der Page
+ RemovePage( static_cast<sal_uInt16>(nTab) ); // nur austragen, nicht loeschen
}
else
- DeletePage( static_cast<sal_uInt16>(nTab) ); // einfach weg damit
+ DeletePage( static_cast<sal_uInt16>(nTab) ); // einfach weg damit
}
void ScDrawLayer::ScRenamePage( SCTAB nTab, const String& rNewName )
@@ -414,7 +414,7 @@ void ScDrawLayer::ScMovePage( USHORT nOldPos, USHORT nNewPos )
void ScDrawLayer::ScCopyPage( USHORT nOldPos, USHORT nNewPos, BOOL bAlloc )
{
- //! remove argument bAlloc (always FALSE)
+ //! remove argument bAlloc (always FALSE)
if (bDrawIsInUndo)
return;
@@ -506,12 +506,12 @@ void ScDrawLayer::SetPageSize( USHORT nPageNo, const Size& rSize, bool bUpdateNo
if ( rSize != pPage->GetSize() )
{
pPage->SetSize( rSize );
- Broadcast( ScTabSizeChangedHint( static_cast<SCTAB>(nPageNo) ) ); // SetWorkArea() an den Views
+ Broadcast( ScTabSizeChangedHint( static_cast<SCTAB>(nPageNo) ) ); // SetWorkArea() an den Views
}
// Detektivlinien umsetzen (an neue Hoehen/Breiten anpassen)
- // auch wenn Groesse gleich geblieben ist
- // (einzelne Zeilen/Spalten koennen geaendert sein)
+ // auch wenn Groesse gleich geblieben ist
+ // (einzelne Zeilen/Spalten koennen geaendert sein)
BOOL bNegativePage = pDoc && pDoc->IsNegativePage( static_cast<SCTAB>(nPageNo) );
@@ -569,15 +569,15 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool b
TwipsToMM( aPos.X() );
TwipsToMM( aPos.Y() );
- // Berechnung und Werte wie in detfunc.cxx
+ // Berechnung und Werte wie in detfunc.cxx
Size aSize( (long)(pDoc->GetColWidth( nCol1, nTab1 ) * HMM_PER_TWIPS),
(long)(pDoc->GetRowHeight( nRow1, nTab1 ) * HMM_PER_TWIPS) );
Rectangle aRect( aPos, aSize );
- aRect.Left() -= 250;
- aRect.Right() += 250;
- aRect.Top() -= 70;
- aRect.Bottom() += 70;
+ aRect.Left() -= 250;
+ aRect.Right() += 250;
+ aRect.Top() -= 70;
+ aRect.Bottom() += 70;
if ( bNegativePage )
MirrorRectRTL( aRect );
@@ -590,7 +590,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool b
}
else if( bArrow )
{
- //! nicht mehrere Undos fuer ein Objekt erzeugen (hinteres kann dann weggelassen werden)
+ //! nicht mehrere Undos fuer ein Objekt erzeugen (hinteres kann dann weggelassen werden)
SCCOL nLastCol;
SCROW nLastRow;
@@ -605,7 +605,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool b
TwipsToMM( aPos.Y() );
Point aStartPos = aPos;
if ( bNegativePage )
- aStartPos.X() = -aStartPos.X(); // don't modify aPos - used below
+ aStartPos.X() = -aStartPos.X(); // don't modify aPos - used below
if ( pObj->GetPoint( 0 ) != aStartPos )
{
if (bRecording)
@@ -639,7 +639,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool b
TwipsToMM( aPos.Y() );
Point aEndPos = aPos;
if ( bNegativePage )
- aEndPos.X() = -aEndPos.X(); // don't modify aPos - used below
+ aEndPos.X() = -aEndPos.X(); // don't modify aPos - used below
if ( pObj->GetPoint( 1 ) != aEndPos )
{
if (bRecording)
@@ -665,7 +665,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool b
}
}
}
- else // Referenz-Rahmen
+ else // Referenz-Rahmen
{
DBG_ASSERT( bValid1, "ScDrawLayer::RecalcPos - invalid start position" );
Point aPos( pDoc->GetColOffset( nCol1, nTab1 ), pDoc->GetRowOffset( nRow1, nTab1 ) );
@@ -746,7 +746,7 @@ BOOL ScDrawLayer::GetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) co
if ( bNegativePage )
{
- nStartX = -nStartX; // positions are negative, swap start/end so the same comparisons work
+ nStartX = -nStartX; // positions are negative, swap start/end so the same comparisons work
nEndX = -nEndX;
::std::swap( nStartX, nEndX );
}
@@ -788,7 +788,7 @@ BOOL ScDrawLayer::GetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) co
if ( bNegativePage )
{
- nStartX = -nStartX; // reverse transformation, so the same cell address calculation works
+ nStartX = -nStartX; // reverse transformation, so the same cell address calculation works
nEndX = -nEndX;
::std::swap( nStartX, nEndX );
}
@@ -810,7 +810,7 @@ BOOL ScDrawLayer::GetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) co
rRange.aStart.SetCol( i>0 ? (i-1) : 0 );
nWidth = 0;
- for (i=0; i<=MAXCOL && nWidth<=nEndX; i++) //! bei Start anfangen
+ for (i=0; i<=MAXCOL && nWidth<=nEndX; i++) //! bei Start anfangen
nWidth += pDoc->GetColWidth(i,nTab);
rRange.aEnd.SetCol( i>0 ? (i-1) : 0 );
}
@@ -873,12 +873,12 @@ SdrUndoGroup* ScDrawLayer::GetCalcUndo()
return pRet;
}
-// MoveAreaTwips: all measures are kept in twips
+// MoveAreaTwips: all measures are kept in twips
void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea,
const Point& rMove, const Point& rTopLeft )
{
if (!rMove.X() && !rMove.Y())
- return; // nix
+ return; // nix
SdrPage* pPage = GetPage(static_cast<sal_uInt16>(nTab));
DBG_ASSERT(pPage,"Page nicht gefunden");
@@ -890,9 +890,9 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea,
// fuer Shrinking!
Rectangle aNew( rArea );
BOOL bShrink = FALSE;
- if ( rMove.X() < 0 || rMove.Y() < 0 ) // verkleinern
+ if ( rMove.X() < 0 || rMove.Y() < 0 ) // verkleinern
{
- if ( rTopLeft != rArea.TopLeft() ) // sind gleich beim Verschieben von Zellen
+ if ( rTopLeft != rArea.TopLeft() ) // sind gleich beim Verschieben von Zellen
{
bShrink = TRUE;
aNew.Left() = rTopLeft.X();
@@ -905,14 +905,14 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea,
{
if( GetAnchor( pObject ) == SCA_CELL )
{
- if ( GetObjData( pObject ) ) // Detektiv-Pfeil ?
+ if ( GetObjData( pObject ) ) // Detektiv-Pfeil ?
{
// hier nichts
}
- else if ( pObject->ISA( SdrEdgeObj ) ) // Verbinder?
+ else if ( pObject->ISA( SdrEdgeObj ) ) // Verbinder?
{
- // hier auch nichts
- //! nicht verbundene Enden wie bei Linien (s.u.) behandeln?
+ // hier auch nichts
+ //! nicht verbundene Enden wie bei Linien (s.u.) behandeln?
}
else if ( pObject->IsPolyObj() && pObject->GetPointCount()==2 )
{
@@ -927,7 +927,7 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea,
}
else if (bShrink && aNew.IsInside(aPoint))
{
- // Punkt ist in betroffener Zelle - Test auf geloeschten Bereich
+ // Punkt ist in betroffener Zelle - Test auf geloeschten Bereich
if ( rMove.X() && aPoint.X() >= rArea.Left() + rMove.X() )
{
aPoint.X() = rArea.Left() + rMove.X() - SHRINK_DIST_TWIPS;
@@ -955,7 +955,7 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea,
// aOldMMPos: not converted, millimeters
Point aOldMMPos = bNegativePage ? aObjRect.TopRight() : aObjRect.TopLeft();
lcl_ReverseTwipsToMM( aObjRect );
- Point aTopLeft = bNegativePage ? aObjRect.TopRight() : aObjRect.TopLeft(); // logical left
+ Point aTopLeft = bNegativePage ? aObjRect.TopRight() : aObjRect.TopLeft(); // logical left
Size aMoveSize;
BOOL bDoMove = FALSE;
if (rArea.IsInside(aTopLeft))
@@ -965,7 +965,7 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea,
}
else if (bShrink && aNew.IsInside(aTopLeft))
{
- // Position ist in betroffener Zelle - Test auf geloeschten Bereich
+ // Position ist in betroffener Zelle - Test auf geloeschten Bereich
if ( rMove.X() && aTopLeft.X() >= rArea.Left() + rMove.X() )
{
aMoveSize.Width() = rArea.Left() + rMove.X() - SHRINK_DIST - aTopLeft.X();
@@ -992,10 +992,10 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea,
if ( aTopLeft.Y() + aMoveSize.Height() < 0 )
aMoveSize.Height() = -aTopLeft.Y();
- // get corresponding move size in millimeters:
+ // get corresponding move size in millimeters:
Point aNewPos( aTopLeft.X() + aMoveSize.Width(), aTopLeft.Y() + aMoveSize.Height() );
lcl_TwipsToMM( aNewPos );
- aMoveSize = Size( aNewPos.X() - aOldMMPos.X(), aNewPos.Y() - aOldMMPos.Y() ); // millimeters
+ aMoveSize = Size( aNewPos.X() - aOldMMPos.X(), aNewPos.Y() - aOldMMPos.Y() ); // millimeters
AddCalcUndo( new SdrUndoMoveObj( *pObject, aMoveSize ) );
pObject->Move( aMoveSize );
@@ -1003,12 +1003,12 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea,
else if ( rArea.IsInside( bNegativePage ? aObjRect.BottomLeft() : aObjRect.BottomRight() ) &&
!pObject->IsResizeProtect() )
{
- // geschuetzte Groessen werden nicht veraendert
- // (Positionen schon, weil sie ja an der Zelle "verankert" sind)
+ // geschuetzte Groessen werden nicht veraendert
+ // (Positionen schon, weil sie ja an der Zelle "verankert" sind)
AddCalcUndo( new SdrUndoGeoObj( *pObject ) );
long nOldSizeX = aObjRect.Right() - aObjRect.Left() + 1;
long nOldSizeY = aObjRect.Bottom() - aObjRect.Top() + 1;
- long nLogMoveX = rMove.X() * ( bNegativePage ? -1 : 1 ); // logical direction
+ long nLogMoveX = rMove.X() * ( bNegativePage ? -1 : 1 ); // logical direction
pObject->Resize( aOldMMPos, Fraction( nOldSizeX+nLogMoveX, nOldSizeX ),
Fraction( nOldSizeY+rMove.Y(), nOldSizeY ) );
}
@@ -1032,7 +1032,7 @@ void ScDrawLayer::MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCR
Rectangle aRect = pDoc->GetMMRect( nCol1, nRow1, nCol2, nRow2, nTab );
lcl_ReverseTwipsToMM( aRect );
- //! use twips directly?
+ //! use twips directly?
Point aMove;
@@ -1050,22 +1050,22 @@ void ScDrawLayer::MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCR
if ( bNegativePage )
aMove.X() = -aMove.X();
- Point aTopLeft = aRect.TopLeft(); // Anfang beim Verkleinern
+ Point aTopLeft = aRect.TopLeft(); // Anfang beim Verkleinern
if (bInsDel)
{
- if ( aMove.X() != 0 && nDx < 0 ) // nDx counts cells, sign is independent of RTL
+ if ( aMove.X() != 0 && nDx < 0 ) // nDx counts cells, sign is independent of RTL
aTopLeft.X() += aMove.X();
if ( aMove.Y() < 0 )
aTopLeft.Y() += aMove.Y();
}
- // drawing objects are now directly included in cut&paste
- // -> only update references when inserting/deleting (or changing widths or heights)
+ // drawing objects are now directly included in cut&paste
+ // -> only update references when inserting/deleting (or changing widths or heights)
if ( bInsDel )
MoveAreaTwips( nTab, aRect, aMove, aTopLeft );
//
- // Detektiv-Pfeile: Zellpositionen anpassen
+ // Detektiv-Pfeile: Zellpositionen anpassen
//
MoveCells( nTab, nCol1,nRow1, nCol2,nRow2, nDx,nDy, bUpdateNoteCaptionPos );
@@ -1092,7 +1092,7 @@ void ScDrawLayer::WidthChanged( SCTAB nTab, SCCOL nCol, long nDifTwips )
aRect.Top() = 0;
aRect.Bottom() = MAXMM;
- //! aTopLeft ist falsch, wenn mehrere Spalten auf einmal ausgeblendet werden
+ //! aTopLeft ist falsch, wenn mehrere Spalten auf einmal ausgeblendet werden
BOOL bNegativePage = pDoc->IsNegativePage( nTab );
if ( bNegativePage )
@@ -1125,7 +1125,7 @@ void ScDrawLayer::HeightChanged( SCTAB nTab, SCROW nRow, long nDifTwips )
aRect.Left() = 0;
aRect.Right() = MAXMM;
- //! aTopLeft ist falsch, wenn mehrere Zeilen auf einmal ausgeblendet werden
+ //! aTopLeft ist falsch, wenn mehrere Zeilen auf einmal ausgeblendet werden
BOOL bNegativePage = pDoc->IsNegativePage( nTab );
if ( bNegativePage )
@@ -1177,7 +1177,7 @@ BOOL ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow )
SdrObject* pObject = aIter.Next();
while ( pObject && !bFound )
{
- aObjRect = pObject->GetSnapRect(); //! GetLogicRect ?
+ aObjRect = pObject->GetSnapRect(); //! GetLogicRect ?
if (aTestRect.IsInside(aObjRect.TopLeft()) || aTestRect.IsInside(aObjRect.BottomLeft()))
bFound = TRUE;
@@ -1197,8 +1197,8 @@ void ScDrawLayer::DeleteObjects( SCTAB nTab )
pPage->RecalcObjOrdNums();
- long nDelCount = 0;
- ULONG nObjCount = pPage->GetObjCount();
+ long nDelCount = 0;
+ ULONG nObjCount = pPage->GetObjCount();
if (nObjCount)
{
SdrObject** ppObj = new SdrObject*[nObjCount];
@@ -1207,7 +1207,7 @@ void ScDrawLayer::DeleteObjects( SCTAB nTab )
SdrObject* pObject = aIter.Next();
while (pObject)
{
- // alle loeschen
+ // alle loeschen
ppObj[nDelCount++] = pObject;
pObject = aIter.Next();
}
@@ -1239,8 +1239,8 @@ void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1,
pPage->RecalcObjOrdNums();
- long nDelCount = 0;
- ULONG nObjCount = pPage->GetObjCount();
+ long nDelCount = 0;
+ ULONG nObjCount = pPage->GetObjCount();
if (nObjCount)
{
Rectangle aDelRect = pDoc->GetMMRect( nCol1, nRow1, nCol2, nRow2, nTab );
@@ -1295,11 +1295,11 @@ void ScDrawLayer::DeleteObjectsInSelection( const ScMarkData& rMark )
if (pPage)
{
pPage->RecalcObjOrdNums();
- long nDelCount = 0;
- ULONG nObjCount = pPage->GetObjCount();
+ long nDelCount = 0;
+ ULONG nObjCount = pPage->GetObjCount();
if (nObjCount)
{
- // Rechteck um die ganze Selektion
+ // Rechteck um die ganze Selektion
Rectangle aMarkBound = pDoc->GetMMRect(
aMarkRange.aStart.Col(), aMarkRange.aStart.Row(),
aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(), nTab );
@@ -1326,7 +1326,7 @@ void ScDrawLayer::DeleteObjectsInSelection( const ScMarkData& rMark )
pObject = aIter.Next();
}
- // Objekte loeschen (rueckwaerts)
+ // Objekte loeschen (rueckwaerts)
long i;
if (bRecording)
@@ -1348,7 +1348,7 @@ void ScDrawLayer::DeleteObjectsInSelection( const ScMarkData& rMark )
void ScDrawLayer::CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const Rectangle& rRange )
{
- // copy everything in the specified range into the same page (sheet) in the clipboard doc
+ // copy everything in the specified range into the same page (sheet) in the clipboard doc
SdrPage* pSrcPage = GetPage(static_cast<sal_uInt16>(nTab));
if (pSrcPage)
@@ -1366,12 +1366,12 @@ void ScDrawLayer::CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const Rectangle&
{
if ( !pDestModel )
{
- pDestModel = pClipDoc->GetDrawLayer(); // does the document already have a drawing layer?
+ pDestModel = pClipDoc->GetDrawLayer(); // does the document already have a drawing layer?
if ( !pDestModel )
{
- // allocate drawing layer in clipboard document only if there are objects to copy
+ // allocate drawing layer in clipboard document only if there are objects to copy
- pClipDoc->InitDrawLayer(); //! create contiguous pages
+ pClipDoc->InitDrawLayer(); //! create contiguous pages
pDestModel = pClipDoc->GetDrawLayer();
}
if (pDestModel)
@@ -1392,8 +1392,8 @@ void ScDrawLayer::CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const Rectangle&
pNewObject->NbcMove(Size(0,0));
pDestPage->InsertObject( pNewObject );
- // no undo needed in clipboard document
- // charts are not updated
+ // no undo needed in clipboard document
+ // charts are not updated
}
}
@@ -1404,7 +1404,7 @@ void ScDrawLayer::CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const Rectangle&
BOOL lcl_IsAllInRange( const ::std::vector< ScRangeList >& rRangesVector, const ScRange& rClipRange )
{
- // check if every range of rRangesVector is completely in rClipRange
+ // check if every range of rRangesVector is completely in rClipRange
::std::vector< ScRangeList >::const_iterator aIt = rRangesVector.begin();
for( ;aIt!=rRangesVector.end(); ++aIt )
@@ -1416,12 +1416,12 @@ BOOL lcl_IsAllInRange( const ::std::vector< ScRangeList >& rRangesVector, const
ScRange aRange = *rRanges.GetObject(i);
if ( !rClipRange.In( aRange ) )
{
- return FALSE; // at least one range is not valid
+ return FALSE; // at least one range is not valid
}
}
}
- return TRUE; // everything is fine
+ return TRUE; // everything is fine
}
BOOL lcl_MoveRanges( ::std::vector< ScRangeList >& rRangesVector, const ScRange& rSourceRange, const ScAddress& rDestPos )
@@ -1460,7 +1460,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const
if (!pClipModel)
return;
- if (bDrawIsInUndo) //! can this happen?
+ if (bDrawIsInUndo) //! can this happen?
{
DBG_ERROR("CopyFromClip, bDrawIsInUndo");
return;
@@ -1539,7 +1539,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const
aVerFract = Fraction( nDestHeight, nSourceHeight );
bResize = TRUE;
}
- Point aRefPos = rDestRange.TopLeft(); // for resizing (after moving)
+ Point aRefPos = rDestRange.TopLeft(); // for resizing (after moving)
while (pOldObject)
{
@@ -1554,7 +1554,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const
pNewObject->SetPage(pDestPage);
if ( bMirrorObj )
- MirrorRTL( pNewObject ); // first mirror, then move
+ MirrorRTL( pNewObject ); // first mirror, then move
pNewObject->NbcMove( aMove );
if ( bResize )
@@ -1564,7 +1564,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const
if (bRecording)
AddCalcUndo( new SdrUndoInsertObj( *pNewObject ) );
- //#i110034# handle chart data references (after InsertObject)
+ //#i110034# handle chart data references (after InsertObject)
if ( pNewObject->GetObjIdentifier() == OBJ_OLE2 )
{
@@ -1637,7 +1637,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const
uno::Reference< chart::XChartDocument > xNewChartDoc( xNewChart, uno::UNO_QUERY );
if( xOldChartDoc.is() && xNewChartDoc.is() )
xNewChartDoc->attachData( xOldChartDoc->getData() );
-
+
// (see ScDocument::UpdateChartListenerCollection, PastingDrawFromOtherDoc)
}
}
@@ -1657,8 +1657,8 @@ void ScDrawLayer::MirrorRTL( SdrObject* pObj )
{
UINT16 nIdent = pObj->GetObjIdentifier();
- // don't mirror OLE or graphics, otherwise ask the object
- // if it can be mirrored
+ // don't mirror OLE or graphics, otherwise ask the object
+ // if it can be mirrored
BOOL bCanMirror = ( nIdent != OBJ_GRAF && nIdent != OBJ_OLE2 );
if (bCanMirror)
{
@@ -1677,9 +1677,9 @@ void ScDrawLayer::MirrorRTL( SdrObject* pObj )
}
else
{
- // Move instead of mirroring:
- // New start position is negative of old end position
- // -> move by sum of start and end position
+ // Move instead of mirroring:
+ // New start position is negative of old end position
+ // -> move by sum of start and end position
Rectangle aObjRect = pObj->GetLogicRect();
Size aMoveSize( -(aObjRect.Left() + aObjRect.Right()), 0 );
if (bRecording)
@@ -1691,7 +1691,7 @@ void ScDrawLayer::MirrorRTL( SdrObject* pObj )
// static
void ScDrawLayer::MirrorRectRTL( Rectangle& rRect )
{
- // mirror and swap left/right
+ // mirror and swap left/right
long nTemp = rRect.Left();
rRect.Left() = -rRect.Right();
rRect.Right() = -nTemp;
@@ -1744,10 +1744,10 @@ String ScDrawLayer::GetVisibleName( SdrObject* pObj )
String aName = pObj->GetName();
if ( pObj->GetObjIdentifier() == OBJ_OLE2 )
{
- // #95575# For OLE, the user defined name (GetName) is used
- // if it's not empty (accepting possibly duplicate names),
- // otherwise the persist name is used so every object appears
- // in the Navigator at all.
+ // #95575# For OLE, the user defined name (GetName) is used
+ // if it's not empty (accepting possibly duplicate names),
+ // otherwise the persist name is used so every object appears
+ // in the Navigator at all.
if ( !aName.Len() )
aName = static_cast<SdrOle2Obj*>(pObj)->GetPersistName();
@@ -1757,8 +1757,8 @@ String ScDrawLayer::GetVisibleName( SdrObject* pObj )
inline sal_Bool IsNamedObject( SdrObject* pObj, const String& rName )
{
- // TRUE if rName is the object's Name or PersistName
- // (used to find a named object)
+ // TRUE if rName is the object's Name or PersistName
+ // (used to find a named object)
return ( pObj->GetName() == rName ||
( pObj->GetObjIdentifier() == OBJ_OLE2 &&
@@ -1818,7 +1818,7 @@ String ScDrawLayer::GetNewGraphicName( long* pnCounter ) const
void ScDrawLayer::EnsureGraphicNames()
{
- // make sure all graphic objects have names (after Excel import etc.)
+ // make sure all graphic objects have names (after Excel import etc.)
sal_uInt16 nTabCount = GetPageCount();
for (sal_uInt16 nTab=0; nTab<nTabCount; nTab++)
@@ -1865,7 +1865,7 @@ ScAnchorType ScDrawLayer::GetAnchor( const SdrObject* pObj )
return ( aAnchor.Y() != 0 ) ? SCA_PAGE : SCA_CELL;
}
-ScDrawObjData* ScDrawLayer::GetObjData( SdrObject* pObj, BOOL bCreate ) // static
+ScDrawObjData* ScDrawLayer::GetObjData( SdrObject* pObj, BOOL bCreate ) // static
{
USHORT nCount = pObj ? pObj->GetUserDataCount() : 0;
for( USHORT i = 0; i < nCount; i++ )
@@ -1909,7 +1909,7 @@ ScDrawObjData* ScDrawLayer::GetNoteCaptionData( SdrObject* pObj, SCTAB nTab )
return (pData && pData->mbNote) ? pData : 0;
}
-ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj ) // static
+ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj ) // static
{
USHORT nCount = pObj->GetUserDataCount();
for( USHORT i = 0; i < nCount; i++ )
@@ -1923,28 +1923,28 @@ ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj ) // static
}
// static:
-IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj,
+IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj,
const Point& rWinPoint, const Window& rCmpWnd )
{
- const MapMode aMap100( MAP_100TH_MM );
- MapMode aWndMode = rCmpWnd.GetMapMode();
- Point aRelPoint( rCmpWnd.LogicToLogic( rWinPoint, &aWndMode, &aMap100 ) );
- Rectangle aLogRect = rCmpWnd.LogicToLogic( pObj->GetLogicRect(), &aWndMode, &aMap100 );
- ScIMapInfo* pIMapInfo = GetIMapInfo( pObj );
- IMapObject* pIMapObj = NULL;
+ const MapMode aMap100( MAP_100TH_MM );
+ MapMode aWndMode = rCmpWnd.GetMapMode();
+ Point aRelPoint( rCmpWnd.LogicToLogic( rWinPoint, &aWndMode, &aMap100 ) );
+ Rectangle aLogRect = rCmpWnd.LogicToLogic( pObj->GetLogicRect(), &aWndMode, &aMap100 );
+ ScIMapInfo* pIMapInfo = GetIMapInfo( pObj );
+ IMapObject* pIMapObj = NULL;
if ( pIMapInfo )
{
- Size aGraphSize;
- ImageMap& rImageMap = (ImageMap&) pIMapInfo->GetImageMap();
- Graphic aGraphic;
- BOOL bObjSupported = FALSE;
+ Size aGraphSize;
+ ImageMap& rImageMap = (ImageMap&) pIMapInfo->GetImageMap();
+ Graphic aGraphic;
+ BOOL bObjSupported = FALSE;
if ( pObj->ISA( SdrGrafObj ) ) // einfaches Grafik-Objekt
{
- const SdrGrafObj* pGrafObj = (const SdrGrafObj*) pObj;
- const GeoStat& rGeo = pGrafObj->GetGeoStat();
- const Graphic& rGraphic = pGrafObj->GetGraphic();
+ const SdrGrafObj* pGrafObj = (const SdrGrafObj*) pObj;
+ const GeoStat& rGeo = pGrafObj->GetGeoStat();
+ const Graphic& rGraphic = pGrafObj->GetGraphic();
// Drehung rueckgaengig
if ( rGeo.nDrehWink )
@@ -2007,7 +2007,7 @@ ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, BOOL bCreate )
return 0;
}
-void ScDrawLayer::SetGlobalDrawPersist(SfxObjectShell* pPersist) // static
+void ScDrawLayer::SetGlobalDrawPersist(SfxObjectShell* pPersist) // static
{
DBG_ASSERT(!pGlobalDrawPersist,"SetGlobalDrawPersist mehrfach");
pGlobalDrawPersist = pPersist;
@@ -2029,7 +2029,7 @@ SvStream* __EXPORT ScDrawLayer::GetDocumentStream(SdrDocumentStreamInfo& rStream
uno::Reference< embed::XStorage > xStorage = pDoc->GetDocumentShell() ?
pDoc->GetDocumentShell()->GetStorage() :
NULL;
- SvStream* pRet = NULL;
+ SvStream* pRet = NULL;
if( xStorage.is() )
{
@@ -2068,17 +2068,17 @@ SvStream* __EXPORT ScDrawLayer::GetDocumentStream(SdrDocumentStreamInfo& rStream
}
}
// the following code seems to be related to binary format
-//REMOVE else
-//REMOVE {
-//REMOVE pRet = pStor->OpenStream( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(STRING_SCSTREAM)),
-//REMOVE STREAM_READ | STREAM_WRITE | STREAM_TRUNC );
+//REMOVE else
+//REMOVE {
+//REMOVE pRet = pStor->OpenStream( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(STRING_SCSTREAM)),
+//REMOVE STREAM_READ | STREAM_WRITE | STREAM_TRUNC );
//REMOVE
-//REMOVE if( pRet )
-//REMOVE {
-//REMOVE pRet->SetVersion( pStor->GetVersion() );
-//REMOVE pRet->SetKey( pStor->GetKey() );
-//REMOVE }
-//REMOVE }
+//REMOVE if( pRet )
+//REMOVE {
+//REMOVE pRet->SetVersion( pStor->GetVersion() );
+//REMOVE pRet->SetKey( pStor->GetKey() );
+//REMOVE }
+//REMOVE }
rStreamInfo.mbDeleteAfterUse = ( pRet != NULL );
}
@@ -2086,14 +2086,14 @@ SvStream* __EXPORT ScDrawLayer::GetDocumentStream(SdrDocumentStreamInfo& rStream
return pRet;
}
-//REMOVE void ScDrawLayer::ReleasePictureStorage()
-//REMOVE {
-//REMOVE xPictureStorage.Clear();
-//REMOVE }
+//REMOVE void ScDrawLayer::ReleasePictureStorage()
+//REMOVE {
+//REMOVE xPictureStorage.Clear();
+//REMOVE }
SdrLayerID __EXPORT ScDrawLayer::GetControlExportLayerId( const SdrObject & ) const
{
- // Layer fuer Export von Form-Controls in Versionen vor 5.0 - immer SC_LAYER_FRONT
+ // Layer fuer Export von Form-Controls in Versionen vor 5.0 - immer SC_LAYER_FRONT
return SC_LAYER_FRONT;
}
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 99da4979a1b6..280b777738d8 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
#include "scitems.hxx"
#include <editeng/boxitem.hxx>
#include <editeng/bolnitem.hxx>
-#include <editeng/editdata.hxx> // can be removed if table has a bLayoutRTL flag
+#include <editeng/editdata.hxx> // can be removed if table has a bLayoutRTL flag
#include <editeng/shaditem.hxx>
#include "fillinfo.hxx"
@@ -83,7 +83,7 @@ inline const SvxBorderLine* GetNullOrLine( const SvxBoxItem* pBox, FillInfoLineP
return NULL;
}
-// aehnlich wie in output.cxx
+// aehnlich wie in output.cxx
void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
ScDocument* pDoc, RowInfo* pRowInfo,
@@ -99,7 +99,7 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
SCCOL nLastCol;
SCROW nLastRow;
- while (bHOver) // nY konstant
+ while (bHOver) // nY konstant
{
--rStartX;
if (rStartX >= (SCsCOL) nX1 && !pDoc->ColHidden(rStartX, nTab, nLastCol))
@@ -121,7 +121,7 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
--rStartY;
if (nArrY>0)
- --nArrY; // lokale Kopie !
+ --nArrY; // lokale Kopie !
if (rStartX >= (SCsCOL) nX1 && rStartY >= (SCsROW) nY1 &&
!pDoc->ColHidden(rStartX, nTab, nLastCol) &&
@@ -207,7 +207,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
nBlockStartY = aTmpRange.aStart.Row();
nBlockEndX = aTmpRange.aEnd.Col();
nBlockEndY = aTmpRange.aEnd.Row();
- ExtendHidden( nBlockStartX, nBlockStartY, nBlockEndX, nBlockEndY, nTab ); //? noetig ?
+ ExtendHidden( nBlockStartX, nBlockStartY, nBlockEndX, nBlockEndY, nTab ); //? noetig ?
if (pMarkData->IsMarkNegative())
bSkipMarks = TRUE;
else
@@ -215,7 +215,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
}
}
- // zuerst nur die Eintraege fuer die ganze Spalte
+ // zuerst nur die Eintraege fuer die ganze Spalte
nArrY=0;
SCROW nYExtra = nY2+1;
@@ -226,7 +226,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
if (nSignedY >= 0)
nY = (SCROW) nSignedY;
else
- nY = MAXROW+1; // ungueltig
+ nY = MAXROW+1; // ungueltig
if (nY > nDocHeightEndRow)
{
@@ -239,38 +239,38 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
if ( nArrY==0 || nDocHeight || nY > MAXROW )
{
RowInfo* pThisRowInfo = &pRowInfo[nArrY];
- pThisRowInfo->pCellInfo = NULL; // wird unten belegt
+ pThisRowInfo->pCellInfo = NULL; // wird unten belegt
USHORT nHeight = (USHORT) ( nDocHeight * nScaleY );
if (!nHeight)
nHeight = 1;
- pThisRowInfo->nRowNo = nY; //! Fall < 0 ?
- pThisRowInfo->nHeight = nHeight;
- pThisRowInfo->bEmptyBack = TRUE;
- pThisRowInfo->bEmptyText = TRUE;
- pThisRowInfo->bChanged = TRUE;
- pThisRowInfo->bAutoFilter = FALSE;
- pThisRowInfo->bPushButton = FALSE;
- pThisRowInfo->nRotMaxCol = SC_ROTMAX_NONE;
+ pThisRowInfo->nRowNo = nY; //! Fall < 0 ?
+ pThisRowInfo->nHeight = nHeight;
+ pThisRowInfo->bEmptyBack = TRUE;
+ pThisRowInfo->bEmptyText = TRUE;
+ pThisRowInfo->bChanged = TRUE;
+ pThisRowInfo->bAutoFilter = FALSE;
+ pThisRowInfo->bPushButton = FALSE;
+ pThisRowInfo->nRotMaxCol = SC_ROTMAX_NONE;
++nArrY;
if (nArrY >= ROWINFO_MAX)
{
DBG_ERROR("Zu grosser Bereich bei FillInfo" );
- nYExtra = nSignedY; // Ende
- nY2 = nYExtra - 1; // Bereich anpassen
+ nYExtra = nSignedY; // Ende
+ nY2 = nYExtra - 1; // Bereich anpassen
}
}
else
- if (nSignedY==(SCsROW) nYExtra) // zusaetzliche Zeile verdeckt ?
+ if (nSignedY==(SCsROW) nYExtra) // zusaetzliche Zeile verdeckt ?
++nYExtra;
}
- nArrCount = nArrY; // incl. Dummys
+ nArrCount = nArrY; // incl. Dummys
- // rotierter Text...
+ // rotierter Text...
- // Attribut im Dokument ueberhaupt verwendet?
+ // Attribut im Dokument ueberhaupt verwendet?
BOOL bAnyItem = FALSE;
USHORT nRotCount = pPool->GetItemCount( ATTR_ROTATE_VALUE );
for (USHORT nItem=0; nItem<nRotCount; nItem++)
@@ -284,33 +284,33 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
if ( bAnyItem && HasAttrib( 0,nY1,nTab, MAXCOL,nY2+1,nTab,
HASATTR_ROTATE | HASATTR_CONDITIONAL ) )
{
- //! Conditionals auch bei HASATTR_ROTATE abfragen ????
+ //! Conditionals auch bei HASATTR_ROTATE abfragen ????
DBG_ASSERT( nArrCount>2, "nArrCount zu klein" );
-// FindMaxRotCol( nTab, &pRowInfo[1], nArrCount-2, nX1, nX2 );
+// FindMaxRotCol( nTab, &pRowInfo[1], nArrCount-2, nX1, nX2 );
FindMaxRotCol( nTab, &pRowInfo[1], nArrCount-1, nX1, nX2 );
- // FindMaxRotCol setzt nRotMaxCol
+ // FindMaxRotCol setzt nRotMaxCol
for (nArrY=0; nArrY<nArrCount; nArrY++)
if (pRowInfo[nArrY].nRotMaxCol != SC_ROTMAX_NONE && pRowInfo[nArrY].nRotMaxCol > nRotMax)
nRotMax = pRowInfo[nArrY].nRotMaxCol;
}
- // Zell-Infos erst nach dem Test auf gedrehte allozieren
- // bis nRotMax wegen nRotateDir Flag
+ // Zell-Infos erst nach dem Test auf gedrehte allozieren
+ // bis nRotMax wegen nRotateDir Flag
for (nArrY=0; nArrY<nArrCount; nArrY++)
{
RowInfo* pThisRowInfo = &pRowInfo[nArrY];
nY = pThisRowInfo->nRowNo;
- pThisRowInfo->pCellInfo = new CellInfo[ nRotMax+1+2 ]; // vom Aufrufer zu loeschen !
+ pThisRowInfo->pCellInfo = new CellInfo[ nRotMax+1+2 ]; // vom Aufrufer zu loeschen !
- for (nArrX=0; nArrX<=nRotMax+2; nArrX++) // Zell-Infos vorbelegen
+ for (nArrX=0; nArrX<=nRotMax+2; nArrX++) // Zell-Infos vorbelegen
{
if (nArrX>0)
nX = nArrX-1;
else
- nX = MAXCOL+1; // ungueltig
+ nX = MAXCOL+1; // ungueltig
CellInfo* pInfo = &pThisRowInfo->pCellInfo[nArrX];
pInfo->bEmptyCellText = TRUE;
@@ -322,21 +322,21 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
pInfo->bMarked = FALSE;
pInfo->nWidth = 0;
- pInfo->nClipMark = SC_CLIPMARK_NONE;
- pInfo->bMerged = FALSE;
+ pInfo->nClipMark = SC_CLIPMARK_NONE;
+ pInfo->bMerged = FALSE;
pInfo->bHOverlapped = FALSE;
pInfo->bVOverlapped = FALSE;
- pInfo->bAutoFilter = FALSE;
- pInfo->bPushButton = FALSE;
+ pInfo->bAutoFilter = FALSE;
+ pInfo->bPushButton = FALSE;
pInfo->bPopupButton = false;
pInfo->bFilterActive = false;
- pInfo->nRotateDir = SC_ROTDIR_NONE;
+ pInfo->nRotateDir = SC_ROTDIR_NONE;
- pInfo->bPrinted = FALSE; // view-intern
- pInfo->bHideGrid = FALSE; // view-intern
- pInfo->bEditEngine = FALSE; // view-intern
+ pInfo->bPrinted = FALSE; // view-intern
+ pInfo->bHideGrid = FALSE; // view-intern
+ pInfo->bEditEngine = FALSE; // view-intern
- pInfo->pBackground = NULL; //! weglassen?
+ pInfo->pBackground = NULL; //! weglassen?
pInfo->pPatternAttr = NULL;
pInfo->pConditionSet= NULL;
@@ -344,13 +344,13 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
pInfo->mpTLBRLine = NULL;
pInfo->mpBLTRLine = NULL;
- pInfo->pShadowAttr = pDefShadow;
+ pInfo->pShadowAttr = pDefShadow;
pInfo->pHShadowOrigin = NULL;
pInfo->pVShadowOrigin = NULL;
}
}
- for (nArrX=nX2+3; nArrX<=nRotMax+2; nArrX++) // restliche Breiten eintragen
+ for (nArrX=nX2+3; nArrX<=nRotMax+2; nArrX++) // restliche Breiten eintragen
{
nX = nArrX-1;
if ( ValidCol(nX) )
@@ -366,9 +366,9 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
}
}
- for (nArrX=0; nArrX<=nX2+2; nArrX++) // links & rechts + 1
+ for (nArrX=0; nArrX<=nX2+2; nArrX++) // links & rechts + 1
{
- nX = (nArrX>0) ? nArrX-1 : MAXCOL+1; // negativ -> ungueltig
+ nX = (nArrX>0) ? nArrX-1 : MAXCOL+1; // negativ -> ungueltig
if ( ValidCol(nX) )
{
@@ -382,9 +382,9 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
if (!nThisWidth)
nThisWidth = 1;
- pRowInfo[0].pCellInfo[nArrX].nWidth = nThisWidth; //! dies sollte reichen
+ pRowInfo[0].pCellInfo[nArrX].nWidth = nThisWidth; //! dies sollte reichen
- ScColumn* pThisCol = &pTab[nTab]->aCol[nX]; // Spalten-Daten
+ ScColumn* pThisCol = &pTab[nTab]->aCol[nX]; // Spalten-Daten
nArrY = 1;
SCSIZE nUIndex;
@@ -415,25 +415,25 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
++nUIndex;
}
- if (nX+1 >= nX1) // Attribute/Blockmarken ab nX1-1
+ if (nX+1 >= nX1) // Attribute/Blockmarken ab nX1-1
{
- ScAttrArray* pThisAttrArr = pThisCol->pAttrArray; // Attribute
+ ScAttrArray* pThisAttrArr = pThisCol->pAttrArray; // Attribute
nArrY = 0;
const ScPatternAttr* pPattern;
- SCROW nCurRow=nY1; // einzelne Zeile
+ SCROW nCurRow=nY1; // einzelne Zeile
if (nCurRow>0)
- --nCurRow; // oben 1 mehr
+ --nCurRow; // oben 1 mehr
else
nArrY = 1;
- nThisRow=nCurRow; // Ende des Bereichs
+ nThisRow=nCurRow; // Ende des Bereichs
SCSIZE nIndex;
(void) pThisAttrArr->Search( nCurRow, nIndex );
do
{
- nThisRow=pThisAttrArr->pData[nIndex].nRow; // Ende des Bereichs
+ nThisRow=pThisAttrArr->pData[nIndex].nRow; // Ende des Bereichs
pPattern=pThisAttrArr->pData[nIndex].pPattern;
const SvxBrushItem* pBackground = (const SvxBrushItem*)
@@ -460,11 +460,11 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
BOOL bVOverlapped = ((nOverlap & SC_MF_VER) != 0);
BOOL bAutoFilter = ((nOverlap & SC_MF_AUTO) != 0);
BOOL bPushButton = ((nOverlap & SC_MF_BUTTON) != 0);
- BOOL bScenario = ((nOverlap & SC_MF_SCENARIO) != 0);
+ BOOL bScenario = ((nOverlap & SC_MF_SCENARIO) != 0);
bool bPopupButton = ((nOverlap & SC_MF_BUTTON_POPUP) != 0);
bool bFilterActive = ((nOverlap & SC_MF_HIDDEN_MEMBER) != 0);
if (bMerged||bHOverlapped||bVOverlapped)
- bAnyMerged = TRUE; // intern
+ bAnyMerged = TRUE; // intern
BOOL bHidden, bHideFormula;
if (bTabProtect)
@@ -490,7 +490,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
if ( nArrY==0 || !bRowHidden )
{
RowInfo* pThisRowInfo = &pRowInfo[nArrY];
- if (pBackground != pDefBackground) // Spalten-HG == Standard ?
+ if (pBackground != pDefBackground) // Spalten-HG == Standard ?
pThisRowInfo->bEmptyBack = FALSE;
if (bAutoFilter)
pThisRowInfo->bAutoFilter = TRUE;
@@ -498,26 +498,26 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
pThisRowInfo->bPushButton = TRUE;
CellInfo* pInfo = &pThisRowInfo->pCellInfo[nArrX];
- pInfo->pBackground = pBackground;
- pInfo->pPatternAttr = pPattern;
- pInfo->bMerged = bMerged;
- pInfo->bHOverlapped = bHOverlapped;
- pInfo->bVOverlapped = bVOverlapped;
- pInfo->bAutoFilter = bAutoFilter;
- pInfo->bPushButton = bPushButton;
+ pInfo->pBackground = pBackground;
+ pInfo->pPatternAttr = pPattern;
+ pInfo->bMerged = bMerged;
+ pInfo->bHOverlapped = bHOverlapped;
+ pInfo->bVOverlapped = bVOverlapped;
+ pInfo->bAutoFilter = bAutoFilter;
+ pInfo->bPushButton = bPushButton;
pInfo->bPopupButton = bPopupButton;
pInfo->bFilterActive = bFilterActive;
- pInfo->pLinesAttr = pLinesAttr;
+ pInfo->pLinesAttr = pLinesAttr;
pInfo->mpTLBRLine = pTLBRLine;
pInfo->mpBLTRLine = pBLTRLine;
- pInfo->pShadowAttr = pShadowAttr;
- // nWidth wird nicht mehr einzeln gesetzt
+ pInfo->pShadowAttr = pShadowAttr;
+ // nWidth wird nicht mehr einzeln gesetzt
BOOL bEmbed = FALSE; //bIsEmbedded &&
- nTab >= aEmbedRange.aStart.Tab() &&
+ nTab >= aEmbedRange.aStart.Tab() &&
nTab <= aEmbedRange.aEnd.Tab() &&
- nX >= aEmbedRange.aStart.Col() &&
- nX <= aEmbedRange.aEnd.Col() &&
+ nX >= aEmbedRange.aStart.Col() &&
+ nX <= aEmbedRange.aEnd.Col() &&
nCurRow >= aEmbedRange.aStart.Row() &&
nCurRow <= aEmbedRange.aEnd.Row();
@@ -547,7 +547,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
pStlPool->Find( aStyle, SFX_STYLE_FAMILY_PARA );
if ( pStyleSheet )
{
- //! Style-Sets cachen !!!
+ //! Style-Sets cachen !!!
pInfo->pConditionSet = &pStyleSheet->GetItemSet();
bAnyCondition = TRUE;
}
@@ -573,12 +573,12 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
if (pMarkData && pMarkData->IsMultiMarked())
{
- // Blockmarken
+ // Blockmarken
const ScMarkArray* pThisMarkArr = pMarkData->GetArray()+nX;
BOOL bThisMarked;
nArrY = 1;
- nCurRow = nY1; // einzelne Zeile
- nThisRow = nY1; // Ende des Bereichs
+ nCurRow = nY1; // einzelne Zeile
+ nThisRow = nY1; // Ende des Bereichs
if ( pThisMarkArr->Search( nY1, nIndex ) )
{
@@ -616,14 +616,14 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
}
}
}
- else // vordere Spalten
+ else // vordere Spalten
{
for (nArrY=1; nArrY+1<nArrCount; nArrY++)
{
RowInfo* pThisRowInfo = &pRowInfo[nArrY];
CellInfo* pInfo = &pThisRowInfo->pCellInfo[nArrX];
- pInfo->nWidth = nThisWidth; //! oder nur 0 abfragen ??
+ pInfo->nWidth = nThisWidth; //! oder nur 0 abfragen ??
}
}
}
@@ -634,13 +634,13 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
}
//-------------------------------------------------------------------------
- // bedingte Formatierung auswerten
+ // bedingte Formatierung auswerten
if (bAnyCondition)
{
for (nArrY=0; nArrY<nArrCount; nArrY++)
{
- for (nArrX=nX1; nArrX<=nX2+2; nArrX++) // links und rechts einer mehr
+ for (nArrX=nX1; nArrX<=nX2+2; nArrX++) // links und rechts einer mehr
{
CellInfo* pInfo = &pRowInfo[nArrY].pCellInfo[nArrX];
const SfxItemSet* pCondSet = pInfo->pConditionSet;
@@ -648,14 +648,14 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
{
const SfxPoolItem* pItem;
- // Hintergrund
+ // Hintergrund
if ( pCondSet->GetItemState( ATTR_BACKGROUND, TRUE, &pItem ) == SFX_ITEM_SET )
{
pInfo->pBackground = (const SvxBrushItem*) pItem;
pRowInfo[nArrY].bEmptyBack = FALSE;
}
- // Umrandung
+ // Umrandung
if ( pCondSet->GetItemState( ATTR_BORDER, TRUE, &pItem ) == SFX_ITEM_SET )
pInfo->pLinesAttr = (const SvxBoxItem*) pItem;
@@ -664,7 +664,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
if ( pCondSet->GetItemState( ATTR_BORDER_BLTR, TRUE, &pItem ) == SFX_ITEM_SET )
pInfo->mpBLTRLine = static_cast< const SvxLineItem* >( pItem );
- // Schatten
+ // Schatten
if ( pCondSet->GetItemState( ATTR_SHADOW, TRUE, &pItem ) == SFX_ITEM_SET )
{
pInfo->pShadowAttr = (const SvxShadowItem*) pItem;
@@ -675,11 +675,11 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
}
}
- // bedingte Formatierung Ende
+ // bedingte Formatierung Ende
//-------------------------------------------------------------------------
//
- // Daten von zusammengefassten Zellen anpassen
+ // Daten von zusammengefassten Zellen anpassen
//
if (bAnyMerged)
@@ -689,7 +689,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
RowInfo* pThisRowInfo = &pRowInfo[nArrY];
nSignedY = nArrY ? pThisRowInfo->nRowNo : ((SCsROW)nY1)-1;
- for (nArrX=nX1; nArrX<=nX2+2; nArrX++) // links und rechts einer mehr
+ for (nArrX=nX1; nArrX<=nX2+2; nArrX++) // links und rechts einer mehr
{
SCsCOL nSignedX = ((SCsCOL) nArrX) - 1;
CellInfo* pInfo = &pThisRowInfo->pCellInfo[nArrX];
@@ -745,14 +745,14 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
}
}
- if (bAnyShadow) // Schatten verteilen
+ if (bAnyShadow) // Schatten verteilen
{
for (nArrY=0; nArrY<nArrCount; nArrY++)
{
BOOL bTop = ( nArrY == 0 );
BOOL bBottom = ( nArrY+1 == nArrCount );
- for (nArrX=nX1; nArrX<=nX2+2; nArrX++) // links und rechts einer mehr
+ for (nArrX=nX1; nArrX<=nX2+2; nArrX++) // links und rechts einer mehr
{
BOOL bLeft = ( nArrX == nX1 );
BOOL bRight = ( nArrX == nX2+2 );
@@ -762,7 +762,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
SvxShadowLocation eLoc = pThisAttr ? pThisAttr->GetLocation() : SVX_SHADOW_NONE;
if (eLoc != SVX_SHADOW_NONE)
{
- // oder Test auf != eLoc
+ // oder Test auf != eLoc
SCsCOL nDxPos = 1;
SCsCOL nDxNeg = -1;
@@ -785,10 +785,10 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX
{
switch (eLoc)
{
- case SVX_SHADOW_BOTTOMRIGHT: eLoc = SVX_SHADOW_BOTTOMLEFT; break;
- case SVX_SHADOW_BOTTOMLEFT: eLoc = SVX_SHADOW_BOTTOMRIGHT; break;
- case SVX_SHADOW_TOPRIGHT: eLoc = SVX_SHADOW_TOPLEFT; break;
- case SVX_SHADOW_TOPLEFT: eLoc = SVX_SHADOW_TOPRIGHT; break;
+ case SVX_SHADOW_BOTTOMRIGHT: eLoc = SVX_SHADOW_BOTTOMLEFT; break;
+ case SVX_SHADOW_BOTTOMLEFT: eLoc = SVX_SHADOW_BOTTOMRIGHT; break;
+ case SVX_SHADOW_TOPRIGHT: eLoc = SVX_SHADOW_TOPLEFT; break;
+ case SVX_SHADOW_TOPLEFT: eLoc = SVX_SHADOW_TOPRIGHT; break;
default:
{
// added to avoid warnings
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 48879bcdec93..e1e1bbb22a94 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,20 +90,20 @@
// -----------------------------------------------------------------------
-#define CLIPST_AVAILABLE 0
-#define CLIPST_CAPTURED 1
-#define CLIPST_DELETE 2
-#define CLIPST_DRAW 3
+#define CLIPST_AVAILABLE 0
+#define CLIPST_CAPTURED 1
+#define CLIPST_DELETE 2
+#define CLIPST_DRAW 3
-ScDocShellRef* ScGlobal::pDrawClipDocShellRef = NULL;
-SvxSearchItem* ScGlobal::pSearchItem = NULL;
-ScAutoFormat* ScGlobal::pAutoFormat = NULL;
+ScDocShellRef* ScGlobal::pDrawClipDocShellRef = NULL;
+SvxSearchItem* ScGlobal::pSearchItem = NULL;
+ScAutoFormat* ScGlobal::pAutoFormat = NULL;
FuncCollection* ScGlobal::pFuncCollection = NULL;
ScUnoAddInCollection* ScGlobal::pAddInCollection = NULL;
-ScUserList* ScGlobal::pUserList = NULL;
-String** ScGlobal::ppRscString = NULL;
+ScUserList* ScGlobal::pUserList = NULL;
+String** ScGlobal::ppRscString = NULL;
LanguageType ScGlobal::eLnge = LANGUAGE_SYSTEM;
-::com::sun::star::lang::Locale* ScGlobal::pLocale = NULL;
+::com::sun::star::lang::Locale* ScGlobal::pLocale = NULL;
SvtSysLocale* ScGlobal::pSysLocale = NULL;
const CharClass* ScGlobal::pCharClass = NULL;
const LocaleDataWrapper* ScGlobal::pLocaleData = NULL;
@@ -114,59 +114,59 @@ CollatorWrapper* ScGlobal::pCaseCollator = NULL;
::utl::TransliterationWrapper* ScGlobal::pCaseTransliteration = NULL;
::com::sun::star::uno::Reference< ::com::sun::star::i18n::XOrdinalSuffix> ScGlobal::xOrdinalSuffix = NULL;
IntlWrapper* ScGlobal::pScIntlWrapper = NULL;
-sal_Unicode ScGlobal::cListDelimiter = ',';
-String* ScGlobal::pEmptyString = NULL;
-String* ScGlobal::pStrClipDocName = NULL;
+sal_Unicode ScGlobal::cListDelimiter = ',';
+String* ScGlobal::pEmptyString = NULL;
+String* ScGlobal::pStrClipDocName = NULL;
-SvxBrushItem* ScGlobal::pEmptyBrushItem = NULL;
-SvxBrushItem* ScGlobal::pButtonBrushItem = NULL;
-SvxBrushItem* ScGlobal::pEmbeddedBrushItem = NULL;
-SvxBrushItem* ScGlobal::pProtectedBrushItem = NULL;
+SvxBrushItem* ScGlobal::pEmptyBrushItem = NULL;
+SvxBrushItem* ScGlobal::pButtonBrushItem = NULL;
+SvxBrushItem* ScGlobal::pEmbeddedBrushItem = NULL;
+SvxBrushItem* ScGlobal::pProtectedBrushItem = NULL;
ImageList* ScGlobal::pOutlineBitmaps = NULL;
ImageList* ScGlobal::pOutlineBitmapsHC = NULL;
ScFunctionList* ScGlobal::pStarCalcFunctionList = NULL;
-ScFunctionMgr* ScGlobal::pStarCalcFunctionMgr = NULL;
+ScFunctionMgr* ScGlobal::pStarCalcFunctionMgr = NULL;
ScUnitConverter* ScGlobal::pUnitConverter = NULL;
SvNumberFormatter* ScGlobal::pEnglishFormatter = NULL;
-double ScGlobal::nScreenPPTX = 96.0;
-double ScGlobal::nScreenPPTY = 96.0;
+double ScGlobal::nScreenPPTX = 96.0;
+double ScGlobal::nScreenPPTY = 96.0;
-USHORT ScGlobal::nDefFontHeight = 240;
-USHORT ScGlobal::nStdRowHeight = 257;
+USHORT ScGlobal::nDefFontHeight = 240;
+USHORT ScGlobal::nStdRowHeight = 257;
-long ScGlobal::nLastRowHeightExtra = 0;
-long ScGlobal::nLastColWidthExtra = STD_EXTRA_WIDTH;
+long ScGlobal::nLastRowHeightExtra = 0;
+long ScGlobal::nLastColWidthExtra = STD_EXTRA_WIDTH;
-static USHORT nPPTZoom = 0; // ScreenZoom used to determine nScreenPPTX/Y
+static USHORT nPPTZoom = 0; // ScreenZoom used to determine nScreenPPTX/Y
class SfxViewShell;
-SfxViewShell* pScActiveViewShell = NULL; //! als Member !!!!!
-USHORT nScClickMouseModifier = 0; //! dito
-USHORT nScFillModeMouseModifier = 0; //! dito
+SfxViewShell* pScActiveViewShell = NULL; //! als Member !!!!!
+USHORT nScClickMouseModifier = 0; //! dito
+USHORT nScFillModeMouseModifier = 0; //! dito
// Hack: ScGlobal::GetUserList() muss InitAppOptions in der UI aufrufen,
-// damit UserList aus Cfg geladen wird
+// damit UserList aus Cfg geladen wird
void global_InitAppOptions();
//========================================================================
//
-// statische Funktionen
+// statische Funktionen
//
//========================================================================
BOOL ScGlobal::HasAttrChanged( const SfxItemSet& rNewAttrs,
const SfxItemSet& rOldAttrs,
- const USHORT nWhich )
+ const USHORT nWhich )
{
- BOOL bInvalidate = FALSE;
- const SfxItemState eNewState = rNewAttrs.GetItemState( nWhich );
- const SfxItemState eOldState = rOldAttrs.GetItemState( nWhich );
+ BOOL bInvalidate = FALSE;
+ const SfxItemState eNewState = rNewAttrs.GetItemState( nWhich );
+ const SfxItemState eOldState = rOldAttrs.GetItemState( nWhich );
//----------------------------------------------------------
@@ -281,7 +281,7 @@ void ScGlobal::SetSearchItem( const SvxSearchItem& rNew )
{
// Hier waere ein Zuweisungsoperator ganz nett:
delete pSearchItem;
- pSearchItem = (SvxSearchItem*)rNew.Clone();
+ pSearchItem = (SvxSearchItem*)rNew.Clone();
pSearchItem->SetWhich( SID_SEARCH_ITEM );
}
@@ -406,7 +406,7 @@ String ScGlobal::GetErrorString(USHORT nErrNumber)
case errDivisionByZero : nErrNumber = STR_DIV_ZERO; break;
case errIllegalFPOperation : nErrNumber = STR_NUM_ERROR; break;
- default : sResStr = GetRscString(STR_ERROR_STR);
+ default : sResStr = GetRscString(STR_ERROR_STR);
sResStr += String::CreateFromInt32( nErrNumber );
nErrNumber = 0;
break;
@@ -534,17 +534,17 @@ void ScGlobal::Init()
{
pEmptyString = new String;
- // Die Default-Sprache fuer Zahlenformate (ScGlobal::eLnge)
- // muss immer LANGUAGE_SYSTEM sein
- //! Dann kann auch die Variable raus
+ // Die Default-Sprache fuer Zahlenformate (ScGlobal::eLnge)
+ // muss immer LANGUAGE_SYSTEM sein
+ //! Dann kann auch die Variable raus
eLnge = LANGUAGE_SYSTEM;
- //! Wenn Sortierung etc. von der Sprache der installierten Offfice-Version
+ //! Wenn Sortierung etc. von der Sprache der installierten Offfice-Version
//! abhaengen sollen, hier "Application::GetSettings().GetUILanguage()"
pSysLocale = new SvtSysLocale;
pCharClass = pSysLocale->GetCharClassPtr();
pLocaleData = pSysLocale->GetLocaleDataPtr();
-
+
ppRscString = new String *[ STR_COUNT ];
for( USHORT nC = 0 ; nC < STR_COUNT ; nC++ ) ppRscString[ nC ] = NULL;
@@ -559,14 +559,14 @@ void ScGlobal::Init()
// arguments are to be merged in, which in turn need strings of function
// names from the compiler.
ScParameterClassification::Init();
- srand( (unsigned) time( NULL ) ); // Random Seed Init fuer Interpreter
+ srand( (unsigned) time( NULL ) ); // Random Seed Init fuer Interpreter
InitAddIns();
pStrClipDocName = new String( ScResId( SCSTR_NONAME ) );
*pStrClipDocName += '1';
- // ScDocumentPool::InitVersionMaps() ist schon vorher gerufen worden
+ // ScDocumentPool::InitVersionMaps() ist schon vorher gerufen worden
}
void ScGlobal::UpdatePPT( OutputDevice* pDev )
@@ -574,10 +574,10 @@ void ScGlobal::UpdatePPT( OutputDevice* pDev )
USHORT nCurrentZoom = Application::GetSettings().GetStyleSettings().GetScreenZoom();
if ( nCurrentZoom != nPPTZoom )
{
- // Screen PPT values must be updated when ScreenZoom has changed.
- // If called from Window::DataChanged, the window is passed as pDev,
- // to make sure LogicToPixel uses a device which already uses the new zoom.
- // For the initial settings, NULL is passed and GetDefaultDevice used.
+ // Screen PPT values must be updated when ScreenZoom has changed.
+ // If called from Window::DataChanged, the window is passed as pDev,
+ // to make sure LogicToPixel uses a device which already uses the new zoom.
+ // For the initial settings, NULL is passed and GetDefaultDevice used.
if ( !pDev )
pDev = Application::GetDefaultDevice();
@@ -614,12 +614,12 @@ void ScGlobal::InitTextHeight(SfxItemPool* pPool)
return;
}
-// String aTestString('X');
+// String aTestString('X');
OutputDevice* pDefaultDev = Application::GetDefaultDevice();
VirtualDevice aVirtWindow( *pDefaultDev );
aVirtWindow.SetMapMode(MAP_PIXEL);
Font aDefFont;
- pPattern->GetFont(aDefFont, SC_AUTOCOL_BLACK, &aVirtWindow); // font color doesn't matter here
+ pPattern->GetFont(aDefFont, SC_AUTOCOL_BLACK, &aVirtWindow); // font color doesn't matter here
aVirtWindow.SetFont(aDefFont);
nDefFontHeight = (USHORT) aVirtWindow.PixelToLogic(Size(0, aVirtWindow.GetTextHeight()),
MAP_TWIP).Height();
@@ -647,11 +647,11 @@ void ScGlobal::Clear()
delete[] ppRscString;
ppRscString = NULL;
- DELETEZ(pStarCalcFunctionList); // vor ResMgr zerstoeren!
+ DELETEZ(pStarCalcFunctionList); // vor ResMgr zerstoeren!
DELETEZ(pStarCalcFunctionMgr);
ScParameterClassification::Exit();
ScCompiler::DeInit();
- ScInterpreter::GlobalExit(); // statischen Stack loeschen
+ ScInterpreter::GlobalExit(); // statischen Stack loeschen
DELETEZ(pEmptyBrushItem);
DELETEZ(pButtonBrushItem);
@@ -659,8 +659,8 @@ void ScGlobal::Clear()
DELETEZ(pProtectedBrushItem);
DELETEZ(pOutlineBitmaps);
DELETEZ(pOutlineBitmapsHC);
-// DELETEZ(pAnchorBitmap);
-// DELETEZ(pGrayAnchorBitmap);
+// DELETEZ(pAnchorBitmap);
+// DELETEZ(pGrayAnchorBitmap);
DELETEZ(pEnglishFormatter);
DELETEZ(pCaseTransliteration);
DELETEZ(pTransliteration);
@@ -697,16 +697,16 @@ CharSet ScGlobal::GetCharsetValue( const String& rCharSet )
return (CharSet) nVal;
}
// old CharSet values for compatibility
- else if (rCharSet.EqualsIgnoreCaseAscii("ANSI") ) return RTL_TEXTENCODING_MS_1252;
- else if (rCharSet.EqualsIgnoreCaseAscii("MAC") ) return RTL_TEXTENCODING_APPLE_ROMAN;
- else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC") ) return RTL_TEXTENCODING_IBM_850;
+ else if (rCharSet.EqualsIgnoreCaseAscii("ANSI") ) return RTL_TEXTENCODING_MS_1252;
+ else if (rCharSet.EqualsIgnoreCaseAscii("MAC") ) return RTL_TEXTENCODING_APPLE_ROMAN;
+ else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC") ) return RTL_TEXTENCODING_IBM_850;
else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_437")) return RTL_TEXTENCODING_IBM_437;
else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_850")) return RTL_TEXTENCODING_IBM_850;
else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_860")) return RTL_TEXTENCODING_IBM_860;
else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_861")) return RTL_TEXTENCODING_IBM_861;
else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_863")) return RTL_TEXTENCODING_IBM_863;
else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_865")) return RTL_TEXTENCODING_IBM_865;
-// else if (rCharSet.EqualsIgnoreCaseAscii("SYSTEM") ) return gsl_getSystemTextEncoding();
+// else if (rCharSet.EqualsIgnoreCaseAscii("SYSTEM") ) return gsl_getSystemTextEncoding();
else return gsl_getSystemTextEncoding();
}
@@ -719,16 +719,16 @@ String ScGlobal::GetCharsetString( CharSet eVal )
switch ( eVal )
{
// old CharSet strings for compatibility
- case RTL_TEXTENCODING_MS_1252: pChar = "ANSI"; break;
- case RTL_TEXTENCODING_APPLE_ROMAN: pChar = "MAC"; break;
+ case RTL_TEXTENCODING_MS_1252: pChar = "ANSI"; break;
+ case RTL_TEXTENCODING_APPLE_ROMAN: pChar = "MAC"; break;
// IBMPC == IBMPC_850
- case RTL_TEXTENCODING_IBM_437: pChar = "IBMPC_437"; break;
- case RTL_TEXTENCODING_IBM_850: pChar = "IBMPC_850"; break;
- case RTL_TEXTENCODING_IBM_860: pChar = "IBMPC_860"; break;
- case RTL_TEXTENCODING_IBM_861: pChar = "IBMPC_861"; break;
- case RTL_TEXTENCODING_IBM_863: pChar = "IBMPC_863"; break;
- case RTL_TEXTENCODING_IBM_865: pChar = "IBMPC_865"; break;
- case RTL_TEXTENCODING_DONTKNOW: pChar = "SYSTEM"; break;
+ case RTL_TEXTENCODING_IBM_437: pChar = "IBMPC_437"; break;
+ case RTL_TEXTENCODING_IBM_850: pChar = "IBMPC_850"; break;
+ case RTL_TEXTENCODING_IBM_860: pChar = "IBMPC_860"; break;
+ case RTL_TEXTENCODING_IBM_861: pChar = "IBMPC_861"; break;
+ case RTL_TEXTENCODING_IBM_863: pChar = "IBMPC_863"; break;
+ case RTL_TEXTENCODING_IBM_865: pChar = "IBMPC_865"; break;
+ case RTL_TEXTENCODING_DONTKNOW: pChar = "SYSTEM"; break;
// new string of TextEncoding value
default:
return String::CreateFromInt32( eVal );
@@ -746,7 +746,7 @@ bool ScGlobal::HasStarCalcFunctionList()
ScFunctionList* ScGlobal::GetStarCalcFunctionList()
{
if ( !pStarCalcFunctionList )
- pStarCalcFunctionList = new ScFunctionList;
+ pStarCalcFunctionList = new ScFunctionList;
return pStarCalcFunctionList;
}
@@ -892,12 +892,12 @@ const sal_Unicode* ScGlobal::FindUnquoted( const sal_Unicode* pString, sal_Unico
BOOL ScGlobal::EETextObjEqual( const EditTextObject* pObj1,
const EditTextObject* pObj2 )
{
- if ( pObj1 == pObj2 ) // both empty or the same object
+ if ( pObj1 == pObj2 ) // both empty or the same object
return TRUE;
if ( pObj1 && pObj2 )
{
- // first test for equal text content
+ // first test for equal text content
USHORT nParCount = pObj1->GetParagraphCount();
if ( nParCount != pObj2->GetParagraphCount() )
return FALSE;
@@ -905,8 +905,8 @@ BOOL ScGlobal::EETextObjEqual( const EditTextObject* pObj1,
if ( pObj1->GetText(nPar) != pObj2->GetText(nPar) )
return FALSE;
- SvMemoryStream aStream1;
- SvMemoryStream aStream2;
+ SvMemoryStream aStream1;
+ SvMemoryStream aStream2;
pObj1->Store( aStream1 );
pObj2->Store( aStream2 );
ULONG nSize = aStream1.Tell();
@@ -920,13 +920,13 @@ BOOL ScGlobal::EETextObjEqual( const EditTextObject* pObj1,
void ScGlobal::OpenURL( const String& rURL, const String& rTarget )
{
- // OpenURL wird immer ueber irgendwelche Umwege durch Mausklicks im GridWindow
- // aufgerufen, darum stimmen pScActiveViewShell und nScClickMouseModifier.
+ // OpenURL wird immer ueber irgendwelche Umwege durch Mausklicks im GridWindow
+ // aufgerufen, darum stimmen pScActiveViewShell und nScClickMouseModifier.
SfxStringItem aUrl( SID_FILE_NAME, rURL );
SfxStringItem aTarget( SID_TARGETNAME, rTarget );
- if ( nScClickMouseModifier & KEY_MOD1 ) // control-click -> into new window
+ if ( nScClickMouseModifier & KEY_MOD1 ) // control-click -> into new window
aTarget.SetValue(
String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("_blank")) );
@@ -946,7 +946,7 @@ void ScGlobal::OpenURL( const String& rURL, const String& rTarget )
SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, FALSE );
SfxBoolItem aBrowsing( SID_BROWSE, TRUE );
- // kein SID_SILENT mehr wegen Bug #42525# (war angeblich sowieso falsch)
+ // kein SID_SILENT mehr wegen Bug #42525# (war angeblich sowieso falsch)
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
if (pViewFrm)
@@ -967,17 +967,17 @@ BOOL ScGlobal::IsSystemRTL()
BYTE ScGlobal::GetDefaultScriptType()
{
- // Used when text contains only WEAK characters.
- // Script type of office language is used then (same as GetEditDefaultLanguage,
- // to get consistent behavior of text in simple cells and EditEngine,
- // also same as GetAppLanguage() in Writer)
+ // Used when text contains only WEAK characters.
+ // Script type of office language is used then (same as GetEditDefaultLanguage,
+ // to get consistent behavior of text in simple cells and EditEngine,
+ // also same as GetAppLanguage() in Writer)
return (BYTE) SvtLanguageOptions::GetScriptTypeOfLanguage( Application::GetSettings().GetLanguage() );
}
LanguageType ScGlobal::GetEditDefaultLanguage()
{
- // used for EditEngine::SetDefaultLanguage
+ // used for EditEngine::SetDefaultLanguage
return Application::GetSettings().GetLanguage();
}
@@ -1104,7 +1104,7 @@ void ScGlobal::AddLanguage( SfxItemSet& rSet, SvNumberFormatter& rFormatter )
//===================================================================
//===================================================================
-// class ScFuncRes
+// class ScFuncRes
// fuer temporaere Objekte zum Holen der Resourcen
class ScFuncRes : public Resource
@@ -1123,7 +1123,7 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed )
{
rbSuppressed = (bool)GetNum();
pDesc->nCategory = GetNum();
- pDesc->nHelpId = GetNum() + 32768; //! Hack, see scfuncs.src
+ pDesc->nHelpId = GetNum() + 32768; //! Hack, see scfuncs.src
pDesc->nArgCount = GetNum();
USHORT nArgs = pDesc->nArgCount;
if (nArgs >= VAR_ARGS)
@@ -1201,22 +1201,22 @@ USHORT ScFuncRes::GetNum()
class ScResourcePublisher : public Resource
{
private:
- void FreeResource() { Resource::FreeResource(); }
+ void FreeResource() { Resource::FreeResource(); }
public:
ScResourcePublisher( const ScResId& rId ) : Resource( rId ) {}
~ScResourcePublisher() { FreeResource(); }
- BOOL IsAvailableRes( const ResId& rId ) const
+ BOOL IsAvailableRes( const ResId& rId ) const
{ return Resource::IsAvailableRes( rId ); }
-
+
};
ScFunctionList::ScFunctionList() :
- nMaxFuncNameLen ( 0 )
+ nMaxFuncNameLen ( 0 )
{
- ScFuncDesc* pDesc = NULL;
- xub_StrLen nStrLen = 0;
- FuncCollection* pFuncColl;
+ ScFuncDesc* pDesc = NULL;
+ xub_StrLen nStrLen = 0;
+ FuncCollection* pFuncColl;
USHORT i,j;
USHORT nDescBlock[] =
{
@@ -1262,7 +1262,7 @@ ScFunctionList::ScFunctionList() :
}
}
- USHORT nNextId = SC_OPCODE_LAST_OPCODE_ID + 1; // FuncID for AddIn functions
+ USHORT nNextId = SC_OPCODE_LAST_OPCODE_ID + 1; // FuncID for AddIn functions
// Auswertung AddIn-Liste
String aDefArgNameValue(RTL_CONSTASCII_STRINGPARAM("value"));
@@ -1285,7 +1285,7 @@ ScFunctionList::ScFunctionList() :
FuncData *pAddInFuncData = (FuncData*)pFuncColl->At(i);
USHORT nArgs = pAddInFuncData->GetParamCount() - 1;
pAddInFuncData->GetParamDesc( aArgName, aArgDesc, 0 );
- pDesc->nFIndex = nNextId++; // ??? OpCode vergeben
+ pDesc->nFIndex = nNextId++; // ??? OpCode vergeben
pDesc->nCategory = ID_FUNCTION_GRP_ADDINS;
pDesc->pFuncName = new String(pAddInFuncData->GetInternalName());
pDesc->pFuncName->ToUpperAscii();
@@ -1359,7 +1359,7 @@ ScFunctionList::ScFunctionList() :
}
}
}
-// pDesc->nHelpId = 0;
+// pDesc->nHelpId = 0;
aFunctionList.Insert(pDesc, LIST_APPEND);
nStrLen = (*(pDesc->pFuncName)).Len();
@@ -1367,7 +1367,7 @@ ScFunctionList::ScFunctionList() :
nMaxFuncNameLen = nStrLen;
}
- // StarOne AddIns
+ // StarOne AddIns
ScUnoAddInCollection* pUnoAddIns = ScGlobal::GetAddInCollection();
long nUnoCount = pUnoAddIns->GetFuncCount();
@@ -1564,7 +1564,7 @@ String ScFuncDesc::GetSignature() const
aFormula.appendAscii( "(" );
::std::vector< ::rtl::OUString >::const_iterator aIter = _aArguments.begin();
::std::vector< ::rtl::OUString >::const_iterator aEnd = _aArguments.end();
-
+
if ( nArgCount > 0 && aIter != aEnd )
{
BOOL bLastArg = ( aIter->getLength() == 0 );
@@ -1619,12 +1619,12 @@ USHORT ScFuncDesc::GetSuppressedArgCount() const
return sRet;
}
// -----------------------------------------------------------------------------
-const formula::IFunctionCategory* ScFuncDesc::getCategory() const
+const formula::IFunctionCategory* ScFuncDesc::getCategory() const
{
return ScGlobal::GetStarCalcFunctionMgr()->getCategory(nCategory);
}
// -----------------------------------------------------------------------------
-::rtl::OUString ScFuncDesc::getDescription() const
+::rtl::OUString ScFuncDesc::getDescription() const
{
::rtl::OUString sRet;
if ( pFuncDesc )
@@ -1633,13 +1633,13 @@ const formula::IFunctionCategory* ScFuncDesc::getCategory() const
}
// -----------------------------------------------------------------------------
// GetSuppressedArgCount
-xub_StrLen ScFuncDesc::getSuppressedArgumentCount() const
+xub_StrLen ScFuncDesc::getSuppressedArgumentCount() const
{
return GetSuppressedArgCount();
}
// -----------------------------------------------------------------------------
-//
-void ScFuncDesc::fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments) const
+//
+void ScFuncDesc::fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments) const
{
if (!bHasSuppressedArgs || !pDefArgFlags)
{
@@ -1684,34 +1684,34 @@ void ScFuncDesc::initArgumentInfo() const
}
}
// -----------------------------------------------------------------------------
-::rtl::OUString ScFuncDesc::getSignature() const
+::rtl::OUString ScFuncDesc::getSignature() const
{
return GetSignature();
}
// -----------------------------------------------------------------------------
-long ScFuncDesc::getHelpId() const
+long ScFuncDesc::getHelpId() const
{
return nHelpId;
}
// -----------------------------------------------------------------------------
// parameter
-sal_uInt32 ScFuncDesc::getParameterCount() const
+sal_uInt32 ScFuncDesc::getParameterCount() const
{
return nArgCount;
}
// -----------------------------------------------------------------------------
-::rtl::OUString ScFuncDesc::getParameterName(sal_uInt32 _nPos) const
+::rtl::OUString ScFuncDesc::getParameterName(sal_uInt32 _nPos) const
{
return *(ppDefArgNames[_nPos]);
}
// -----------------------------------------------------------------------------
-::rtl::OUString ScFuncDesc::getParameterDescription(sal_uInt32 _nPos) const
+::rtl::OUString ScFuncDesc::getParameterDescription(sal_uInt32 _nPos) const
{
return *(ppDefArgDescs[_nPos]);
}
// -----------------------------------------------------------------------------
-bool ScFuncDesc::isParameterOptional(sal_uInt32 _nPos) const
+bool ScFuncDesc::isParameterOptional(sal_uInt32 _nPos) const
{
return pDefArgFlags[_nPos].bOptional;
}
@@ -1720,19 +1720,19 @@ bool ScFuncDesc::isParameterOptional(sal_uInt32 _nPos) const
// class ScFunctionMgr:
ScFunctionMgr::ScFunctionMgr()
- : pFuncList ( ScGlobal::GetStarCalcFunctionList() ),
- pCurCatList ( NULL )
+ : pFuncList ( ScGlobal::GetStarCalcFunctionList() ),
+ pCurCatList ( NULL )
{
DBG_ASSERT( pFuncList, "Funktionsliste nicht gefunden." );
- ULONG nCount = pFuncList->GetCount();
- const ScFuncDesc* pDesc;
- List* pRootList;
- ULONG n;
+ ULONG nCount = pFuncList->GetCount();
+ const ScFuncDesc* pDesc;
+ List* pRootList;
+ ULONG n;
- for ( USHORT i=0; i<MAX_FUNCCAT; i++ ) // Kategorie-Listen erstellen
+ for ( USHORT i=0; i<MAX_FUNCCAT; i++ ) // Kategorie-Listen erstellen
aCatLists[i] = new List;
- pRootList = aCatLists[0]; // Gesamtliste ("Alle") erstellen
+ pRootList = aCatLists[0]; // Gesamtliste ("Alle") erstellen
CollatorWrapper* pCaseCollator = ScGlobal::GetCaseCollator();
for ( n=0; n<nCount; n++ )
{
@@ -1742,14 +1742,14 @@ ScFunctionMgr::ScFunctionMgr()
{
// ist zwar case-sensitiv, aber Umlaute muessen richtig einsortiert werden
- const ScFuncDesc* pTmpDesc = (const ScFuncDesc*)pRootList->GetObject(nTmpCnt);
+ const ScFuncDesc* pTmpDesc = (const ScFuncDesc*)pRootList->GetObject(nTmpCnt);
if ( pCaseCollator->compareString(*pDesc->pFuncName, *pTmpDesc->pFuncName ) == COMPARE_LESS )
break;
}
- pRootList->Insert((void*)pDesc, nTmpCnt); // Einsortieren
+ pRootList->Insert((void*)pDesc, nTmpCnt); // Einsortieren
}
- for ( n=0; n<nCount; n++ ) // in Gruppenlisten kopieren
+ for ( n=0; n<nCount; n++ ) // in Gruppenlisten kopieren
{
pDesc = (const ScFuncDesc*)pRootList->GetObject(n);
DBG_ASSERT((pDesc->nCategory) < MAX_FUNCCAT, "Unbekannte Kategorie");
@@ -1771,7 +1771,7 @@ ScFunctionMgr::~ScFunctionMgr()
const ScFuncDesc* ScFunctionMgr::Get( const String& rFName ) const
{
- const ScFuncDesc* pDesc = NULL;
+ const ScFuncDesc* pDesc = NULL;
if (rFName.Len() <= pFuncList->GetMaxFuncNameLen())
for (pDesc = First(0); pDesc; pDesc = Next())
if (rFName.EqualsIgnoreCaseAscii(*(pDesc->pFuncName)))
@@ -1783,7 +1783,7 @@ const ScFuncDesc* ScFunctionMgr::Get( const String& rFName ) const
const ScFuncDesc* ScFunctionMgr::Get( USHORT nFIndex ) const
{
- const ScFuncDesc* pDesc;
+ const ScFuncDesc* pDesc;
for (pDesc = First(0); pDesc; pDesc = Next())
if (pDesc->nFIndex == nFIndex)
break;
@@ -1792,7 +1792,7 @@ const ScFuncDesc* ScFunctionMgr::Get( USHORT nFIndex ) const
//------------------------------------------------------------------------
-const ScFuncDesc* ScFunctionMgr::First( USHORT nCategory ) const
+const ScFuncDesc* ScFunctionMgr::First( USHORT nCategory ) const
{
DBG_ASSERT( nCategory < MAX_FUNCCAT, "Unbekannte Kategorie" );
@@ -1842,7 +1842,7 @@ void ScFunctionMgr::fillLastRecentlyUsedFunctions(::std::vector< const formula::
const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions();
USHORT nLRUFuncCount = Min( rAppOpt.GetLRUFuncListCount(), (USHORT)LRU_MAX );
- USHORT* pLRUListIds = rAppOpt.GetLRUFuncList();
+ USHORT* pLRUListIds = rAppOpt.GetLRUFuncList();
if ( pLRUListIds )
{
@@ -1899,7 +1899,7 @@ const formula::IFunctionManager* ScFunctionCategory::getFunctionManager() const
// -----------------------------------------------------------------------------
const formula::IFunctionDescription* ScFunctionCategory::getFunction(sal_uInt32 _nPos) const
{
- const ScFuncDesc* pDesc = NULL;
+ const ScFuncDesc* pDesc = NULL;
sal_uInt32 i = 0;
for (pDesc = (const ScFuncDesc*)m_pCategory->First(); i < _nPos && pDesc; pDesc = (const ScFuncDesc*)m_pCategory->Next(),++i)
;
@@ -1945,7 +1945,7 @@ CalendarWrapper* ScGlobal::GetCalendar()
}
return pCalendar;
}
-CollatorWrapper* ScGlobal::GetCollator()
+CollatorWrapper* ScGlobal::GetCollator()
{
if ( !pCollator )
{
@@ -1954,7 +1954,7 @@ CollatorWrapper* ScGlobal::GetCollator()
} // if ( !pCollator )
return pCollator;
}
-CollatorWrapper* ScGlobal::GetCaseCollator()
+CollatorWrapper* ScGlobal::GetCaseCollator()
{
if ( !pCaseCollator )
{
@@ -1981,7 +1981,7 @@ IntlWrapper* ScGlobal::GetScIntlWrapper()
}
return pScIntlWrapper;
}
-::com::sun::star::lang::Locale* ScGlobal::GetLocale()
+::com::sun::star::lang::Locale* ScGlobal::GetLocale()
{
if ( !pLocale )
{
diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx
index 3234340ae9dd..55fa221afb0b 100644
--- a/sc/source/core/data/global2.cxx
+++ b/sc/source/core/data/global2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +80,16 @@ ScImportParam::ScImportParam() :
}
ScImportParam::ScImportParam( const ScImportParam& r ) :
- nCol1 (r.nCol1),
- nRow1 (r.nRow1),
- nCol2 (r.nCol2),
- nRow2 (r.nRow2),
- bImport (r.bImport),
- aDBName (r.aDBName),
- aStatement (r.aStatement),
- bNative (r.bNative),
- bSql (r.bSql),
- nType (r.nType)
+ nCol1 (r.nCol1),
+ nRow1 (r.nRow1),
+ nCol2 (r.nCol2),
+ nRow2 (r.nRow2),
+ bImport (r.bImport),
+ aDBName (r.aDBName),
+ aStatement (r.aStatement),
+ bNative (r.bNative),
+ bSql (r.bSql),
+ nType (r.nType)
{
}
@@ -111,34 +111,34 @@ ScImportParam::~ScImportParam()
ScImportParam& ScImportParam::operator=( const ScImportParam& r )
{
- nCol1 = r.nCol1;
- nRow1 = r.nRow1;
- nCol2 = r.nCol2;
- nRow2 = r.nRow2;
- bImport = r.bImport;
- aDBName = r.aDBName;
- aStatement = r.aStatement;
- bNative = r.bNative;
- bSql = r.bSql;
- nType = r.nType;
+ nCol1 = r.nCol1;
+ nRow1 = r.nRow1;
+ nCol2 = r.nCol2;
+ nRow2 = r.nRow2;
+ bImport = r.bImport;
+ aDBName = r.aDBName;
+ aStatement = r.aStatement;
+ bNative = r.bNative;
+ bSql = r.bSql;
+ nType = r.nType;
return *this;
}
BOOL ScImportParam::operator==( const ScImportParam& rOther ) const
{
- return( nCol1 == rOther.nCol1 &&
- nRow1 == rOther.nRow1 &&
- nCol2 == rOther.nCol2 &&
- nRow2 == rOther.nRow2 &&
- bImport == rOther.bImport &&
- aDBName == rOther.aDBName &&
- aStatement == rOther.aStatement &&
- bNative == rOther.bNative &&
- bSql == rOther.bSql &&
- nType == rOther.nType );
+ return( nCol1 == rOther.nCol1 &&
+ nRow1 == rOther.nRow1 &&
+ nCol2 == rOther.nCol2 &&
+ nRow2 == rOther.nRow2 &&
+ bImport == rOther.bImport &&
+ aDBName == rOther.aDBName &&
+ aStatement == rOther.aStatement &&
+ bNative == rOther.bNative &&
+ bSql == rOther.bSql &&
+ nType == rOther.nType );
- //! nQuerySh und pConnection sind gleich ?
+ //! nQuerySh und pConnection sind gleich ?
}
@@ -185,54 +185,54 @@ ScQueryEntry::~ScQueryEntry()
ScQueryEntry& ScQueryEntry::operator=( const ScQueryEntry& r )
{
- bDoQuery = r.bDoQuery;
- bQueryByString = r.bQueryByString;
+ bDoQuery = r.bDoQuery;
+ bQueryByString = r.bQueryByString;
bQueryByDate = r.bQueryByDate;
- eOp = r.eOp;
- eConnect = r.eConnect;
- nField = r.nField;
- nVal = r.nVal;
- *pStr = *r.pStr;
+ eOp = r.eOp;
+ eConnect = r.eConnect;
+ nField = r.nField;
+ nVal = r.nVal;
+ *pStr = *r.pStr;
if ( pSearchParam )
{
delete pSearchParam;
delete pSearchText;
}
- pSearchParam = NULL;
- pSearchText = NULL;
+ pSearchParam = NULL;
+ pSearchText = NULL;
return *this;
}
void ScQueryEntry::Clear()
{
- bDoQuery = FALSE;
- bQueryByString = FALSE;
+ bDoQuery = FALSE;
+ bQueryByString = FALSE;
bQueryByDate = false;
- eOp = SC_EQUAL;
- eConnect = SC_AND;
- nField = 0;
- nVal = 0.0;
+ eOp = SC_EQUAL;
+ eConnect = SC_AND;
+ nField = 0;
+ nVal = 0.0;
pStr->Erase();
if ( pSearchParam )
{
delete pSearchParam;
delete pSearchText;
}
- pSearchParam = NULL;
- pSearchText = NULL;
+ pSearchParam = NULL;
+ pSearchText = NULL;
}
BOOL ScQueryEntry::operator==( const ScQueryEntry& r ) const
{
- return bDoQuery == r.bDoQuery
- && bQueryByString == r.bQueryByString
+ return bDoQuery == r.bDoQuery
+ && bQueryByString == r.bQueryByString
&& bQueryByDate == r.bQueryByDate
- && eOp == r.eOp
- && eConnect == r.eConnect
- && nField == r.nField
- && nVal == r.nVal
- && *pStr == *r.pStr;
+ && eOp == r.eOp
+ && eConnect == r.eConnect
+ && nField == r.nField
+ && nVal == r.nVal
+ && *pStr == *r.pStr;
//! pSearchParam und pSearchText nicht vergleichen
}
@@ -272,14 +272,14 @@ ScSubTotalParam::ScSubTotalParam( const ScSubTotalParam& r ) :
{
for (USHORT i=0; i<MAXSUBTOTAL; i++)
{
- bGroupActive[i] = r.bGroupActive[i];
- nField[i] = r.nField[i];
+ bGroupActive[i] = r.bGroupActive[i];
+ nField[i] = r.nField[i];
if ( (r.nSubTotals[i] > 0) && r.pSubTotals[i] && r.pFunctions[i] )
{
nSubTotals[i] = r.nSubTotals[i];
- pSubTotals[i] = new SCCOL [r.nSubTotals[i]];
- pFunctions[i] = new ScSubTotalFunc [r.nSubTotals[i]];
+ pSubTotals[i] = new SCCOL [r.nSubTotals[i]];
+ pFunctions[i] = new ScSubTotalFunc [r.nSubTotals[i]];
for (SCCOL j=0; j<r.nSubTotals[i]; j++)
{
@@ -308,8 +308,8 @@ void ScSubTotalParam::Clear()
for (USHORT i=0; i<MAXSUBTOTAL; i++)
{
- bGroupActive[i] = FALSE;
- nField[i] = 0;
+ bGroupActive[i] = FALSE;
+ nField[i] = 0;
if ( (nSubTotals[i] > 0) && pSubTotals[i] && pFunctions[i] )
{
@@ -325,33 +325,33 @@ void ScSubTotalParam::Clear()
ScSubTotalParam& ScSubTotalParam::operator=( const ScSubTotalParam& r )
{
- nCol1 = r.nCol1;
- nRow1 = r.nRow1;
- nCol2 = r.nCol2;
- nRow2 = r.nRow2;
- bRemoveOnly = r.bRemoveOnly;
- bReplace = r.bReplace;
- bPagebreak = r.bPagebreak;
- bCaseSens = r.bCaseSens;
- bDoSort = r.bDoSort;
- bAscending = r.bAscending;
- bUserDef = r.bUserDef;
- nUserIndex = r.nUserIndex;
- bIncludePattern = r.bIncludePattern;
+ nCol1 = r.nCol1;
+ nRow1 = r.nRow1;
+ nCol2 = r.nCol2;
+ nRow2 = r.nRow2;
+ bRemoveOnly = r.bRemoveOnly;
+ bReplace = r.bReplace;
+ bPagebreak = r.bPagebreak;
+ bCaseSens = r.bCaseSens;
+ bDoSort = r.bDoSort;
+ bAscending = r.bAscending;
+ bUserDef = r.bUserDef;
+ nUserIndex = r.nUserIndex;
+ bIncludePattern = r.bIncludePattern;
for (USHORT i=0; i<MAXSUBTOTAL; i++)
{
- bGroupActive[i] = r.bGroupActive[i];
- nField[i] = r.nField[i];
- nSubTotals[i] = r.nSubTotals[i];
+ bGroupActive[i] = r.bGroupActive[i];
+ nField[i] = r.nField[i];
+ nSubTotals[i] = r.nSubTotals[i];
if ( pSubTotals[i] ) delete [] pSubTotals[i];
if ( pFunctions[i] ) delete [] pFunctions[i];
if ( r.nSubTotals[i] > 0 )
{
- pSubTotals[i] = new SCCOL [r.nSubTotals[i]];
- pFunctions[i] = new ScSubTotalFunc [r.nSubTotals[i]];
+ pSubTotals[i] = new SCCOL [r.nSubTotals[i]];
+ pFunctions[i] = new ScSubTotalFunc [r.nSubTotals[i]];
for (SCCOL j=0; j<r.nSubTotals[i]; j++)
{
@@ -374,18 +374,18 @@ ScSubTotalParam& ScSubTotalParam::operator=( const ScSubTotalParam& r )
BOOL ScSubTotalParam::operator==( const ScSubTotalParam& rOther ) const
{
- BOOL bEqual = (nCol1 == rOther.nCol1)
- && (nRow1 == rOther.nRow1)
- && (nCol2 == rOther.nCol2)
- && (nRow2 == rOther.nRow2)
- && (bRemoveOnly == rOther.bRemoveOnly)
- && (bReplace == rOther.bReplace)
- && (bPagebreak == rOther.bPagebreak)
- && (bDoSort == rOther.bDoSort)
- && (bCaseSens == rOther.bCaseSens)
- && (bAscending == rOther.bAscending)
- && (bUserDef == rOther.bUserDef)
- && (nUserIndex == rOther.nUserIndex)
+ BOOL bEqual = (nCol1 == rOther.nCol1)
+ && (nRow1 == rOther.nRow1)
+ && (nCol2 == rOther.nCol2)
+ && (nRow2 == rOther.nRow2)
+ && (bRemoveOnly == rOther.bRemoveOnly)
+ && (bReplace == rOther.bReplace)
+ && (bPagebreak == rOther.bPagebreak)
+ && (bDoSort == rOther.bDoSort)
+ && (bCaseSens == rOther.bCaseSens)
+ && (bAscending == rOther.bAscending)
+ && (bUserDef == rOther.bUserDef)
+ && (nUserIndex == rOther.nUserIndex)
&& (bIncludePattern== rOther.bIncludePattern);
if ( bEqual )
@@ -393,9 +393,9 @@ BOOL ScSubTotalParam::operator==( const ScSubTotalParam& rOther ) const
bEqual = TRUE;
for ( USHORT i=0; i<MAXSUBTOTAL && bEqual; i++ )
{
- bEqual = (bGroupActive[i] == rOther.bGroupActive[i])
- && (nField[i] == rOther.nField[i])
- && (nSubTotals[i] == rOther.nSubTotals[i]);
+ bEqual = (bGroupActive[i] == rOther.bGroupActive[i])
+ && (nField[i] == rOther.nField[i])
+ && (nSubTotals[i] == rOther.nSubTotals[i]);
if ( bEqual && (nSubTotals[i] > 0) )
{
@@ -416,10 +416,10 @@ BOOL ScSubTotalParam::operator==( const ScSubTotalParam& rOther ) const
//------------------------------------------------------------------------
-void ScSubTotalParam::SetSubTotals( USHORT nGroup,
- const SCCOL* ptrSubTotals,
- const ScSubTotalFunc* ptrFunctions,
- USHORT nCount )
+void ScSubTotalParam::SetSubTotals( USHORT nGroup,
+ const SCCOL* ptrSubTotals,
+ const ScSubTotalFunc* ptrFunctions,
+ USHORT nCount )
{
DBG_ASSERT( (nGroup <= MAXSUBTOTAL),
"ScSubTotalParam::SetSubTotals(): nGroup > MAXSUBTOTAL!" );
@@ -439,8 +439,8 @@ void ScSubTotalParam::SetSubTotals( USHORT nGroup,
delete [] pSubTotals[nGroup];
delete [] pFunctions[nGroup];
- pSubTotals[nGroup] = new SCCOL [nCount];
- pFunctions[nGroup] = new ScSubTotalFunc [nCount];
+ pSubTotals[nGroup] = new SCCOL [nCount];
+ pFunctions[nGroup] = new ScSubTotalFunc [nCount];
nSubTotals[nGroup] = static_cast<SCCOL>(nCount);
for ( USHORT i=0; i<nCount; i++ )
@@ -507,21 +507,21 @@ void __EXPORT ScConsolidateParam::Clear()
nCol = 0;
nRow = 0;
nTab = 0;
- bByCol = bByRow = bReferenceData = FALSE;
- eFunction = SUBTOTAL_FUNC_SUM;
+ bByCol = bByRow = bReferenceData = FALSE;
+ eFunction = SUBTOTAL_FUNC_SUM;
}
//------------------------------------------------------------------------
ScConsolidateParam& __EXPORT ScConsolidateParam::operator=( const ScConsolidateParam& r )
{
- nCol = r.nCol;
- nRow = r.nRow;
- nTab = r.nTab;
- bByCol = r.bByCol;
- bByRow = r.bByRow;
- bReferenceData = r.bReferenceData;
- eFunction = r.eFunction;
+ nCol = r.nCol;
+ nRow = r.nRow;
+ nTab = r.nTab;
+ bByCol = r.bByCol;
+ bByRow = r.bByRow;
+ bReferenceData = r.bReferenceData;
+ eFunction = r.eFunction;
SetAreas( r.ppDataAreas, r.nDataAreaCount );
return *this;
@@ -531,14 +531,14 @@ ScConsolidateParam& __EXPORT ScConsolidateParam::operator=( const ScConsolidateP
BOOL __EXPORT ScConsolidateParam::operator==( const ScConsolidateParam& r ) const
{
- BOOL bEqual = (nCol == r.nCol)
- && (nRow == r.nRow)
- && (nTab == r.nTab)
- && (bByCol == r.bByCol)
- && (bByRow == r.bByRow)
- && (bReferenceData == r.bReferenceData)
- && (nDataAreaCount == r.nDataAreaCount)
- && (eFunction == r.eFunction);
+ BOOL bEqual = (nCol == r.nCol)
+ && (nRow == r.nRow)
+ && (nTab == r.nTab)
+ && (bByCol == r.bByCol)
+ && (bByRow == r.bByRow)
+ && (bReferenceData == r.bReferenceData)
+ && (nDataAreaCount == r.nDataAreaCount)
+ && (eFunction == r.eFunction);
if ( nDataAreaCount == 0 )
bEqual = bEqual && (ppDataAreas == NULL) && (r.ppDataAreas == NULL);
@@ -590,7 +590,7 @@ bool PivotField::operator==( const PivotField& r ) const
// struct ScPivotParam:
ScPivotParam::ScPivotParam()
- : nCol(0), nRow(0), nTab(0),
+ : nCol(0), nRow(0), nTab(0),
nPageCount(0), nColCount(0), nRowCount(0), nDataCount(0),
bIgnoreEmptyRows(FALSE), bDetectCategories(FALSE),
bMakeTotalCol(TRUE), bMakeTotalRow(TRUE)
@@ -600,7 +600,7 @@ ScPivotParam::ScPivotParam()
//------------------------------------------------------------------------
ScPivotParam::ScPivotParam( const ScPivotParam& r )
- : nCol( r.nCol ), nRow( r.nRow ), nTab( r.nTab ),
+ : nCol( r.nCol ), nRow( r.nRow ), nTab( r.nTab ),
nPageCount(0), nColCount(0), nRowCount(0), nDataCount(0),
bIgnoreEmptyRows(r.bIgnoreEmptyRows),
bDetectCategories(r.bDetectCategories),
@@ -661,25 +661,25 @@ void ScPivotParam::SetLabelData(const vector<ScDPLabelDataRef>& r)
void __EXPORT ScPivotParam::SetPivotArrays ( const PivotField* pPageArr,
const PivotField* pColArr,
- const PivotField* pRowArr,
- const PivotField* pDataArr,
+ const PivotField* pRowArr,
+ const PivotField* pDataArr,
SCSIZE nPageCnt,
- SCSIZE nColCnt,
- SCSIZE nRowCnt,
- SCSIZE nDataCnt )
+ SCSIZE nColCnt,
+ SCSIZE nRowCnt,
+ SCSIZE nDataCnt )
{
ClearPivotArrays();
if ( pPageArr && pColArr && pRowArr && pDataArr )
{
nPageCount = (nPageCnt>PIVOT_MAXPAGEFIELD) ? PIVOT_MAXPAGEFIELD : nPageCnt;
- nColCount = (nColCnt>PIVOT_MAXFIELD) ? PIVOT_MAXFIELD : nColCnt;
- nRowCount = (nRowCnt>PIVOT_MAXFIELD) ? PIVOT_MAXFIELD : nRowCnt;
- nDataCount = (nDataCnt>PIVOT_MAXFIELD) ? PIVOT_MAXFIELD : nDataCnt;
+ nColCount = (nColCnt>PIVOT_MAXFIELD) ? PIVOT_MAXFIELD : nColCnt;
+ nRowCount = (nRowCnt>PIVOT_MAXFIELD) ? PIVOT_MAXFIELD : nRowCnt;
+ nDataCount = (nDataCnt>PIVOT_MAXFIELD) ? PIVOT_MAXFIELD : nDataCnt;
memcpy( aPageArr, pPageArr, nPageCount * sizeof(PivotField) );
- memcpy( aColArr, pColArr, nColCount * sizeof(PivotField) );
- memcpy( aRowArr, pRowArr, nRowCount * sizeof(PivotField) );
+ memcpy( aColArr, pColArr, nColCount * sizeof(PivotField) );
+ memcpy( aRowArr, pRowArr, nRowCount * sizeof(PivotField) );
memcpy( aDataArr, pDataArr, nDataCount * sizeof(PivotField) );
}
}
@@ -688,13 +688,13 @@ void __EXPORT ScPivotParam::SetPivotArrays ( const PivotField* pPageArr,
ScPivotParam& __EXPORT ScPivotParam::operator=( const ScPivotParam& r )
{
- nCol = r.nCol;
- nRow = r.nRow;
- nTab = r.nTab;
+ nCol = r.nCol;
+ nRow = r.nRow;
+ nTab = r.nTab;
bIgnoreEmptyRows = r.bIgnoreEmptyRows;
bDetectCategories = r.bDetectCategories;
- bMakeTotalCol = r.bMakeTotalCol;
- bMakeTotalRow = r.bMakeTotalRow;
+ bMakeTotalCol = r.bMakeTotalCol;
+ bMakeTotalRow = r.bMakeTotalRow;
SetPivotArrays ( r.aPageArr, r.aColArr, r.aRowArr, r.aDataArr,
r.nPageCount, r.nColCount, r.nRowCount, r.nDataCount );
@@ -706,18 +706,18 @@ ScPivotParam& __EXPORT ScPivotParam::operator=( const ScPivotParam& r )
BOOL __EXPORT ScPivotParam::operator==( const ScPivotParam& r ) const
{
- BOOL bEqual = (nCol == r.nCol)
- && (nRow == r.nRow)
- && (nTab == r.nTab)
+ BOOL bEqual = (nCol == r.nCol)
+ && (nRow == r.nRow)
+ && (nTab == r.nTab)
&& (bIgnoreEmptyRows == r.bIgnoreEmptyRows)
&& (bDetectCategories == r.bDetectCategories)
&& (bMakeTotalCol == r.bMakeTotalCol)
&& (bMakeTotalRow == r.bMakeTotalRow)
&& (maLabelArray.size() == r.maLabelArray.size())
&& (nPageCount == r.nPageCount)
- && (nColCount == r.nColCount)
- && (nRowCount == r.nRowCount)
- && (nDataCount == r.nDataCount);
+ && (nColCount == r.nColCount)
+ && (nRowCount == r.nRowCount)
+ && (nDataCount == r.nDataCount);
if ( bEqual )
{
@@ -743,16 +743,16 @@ BOOL __EXPORT ScPivotParam::operator==( const ScPivotParam& r ) const
// struct ScSolveParam
ScSolveParam::ScSolveParam()
- : pStrTargetVal( NULL )
+ : pStrTargetVal( NULL )
{
}
//------------------------------------------------------------------------
ScSolveParam::ScSolveParam( const ScSolveParam& r )
- : aRefFormulaCell ( r.aRefFormulaCell ),
+ : aRefFormulaCell ( r.aRefFormulaCell ),
aRefVariableCell( r.aRefVariableCell ),
- pStrTargetVal ( r.pStrTargetVal
+ pStrTargetVal ( r.pStrTargetVal
? new String(*r.pStrTargetVal)
: NULL )
{
@@ -762,10 +762,10 @@ ScSolveParam::ScSolveParam( const ScSolveParam& r )
ScSolveParam::ScSolveParam( const ScAddress& rFormulaCell,
const ScAddress& rVariableCell,
- const String& rTargetValStr )
- : aRefFormulaCell ( rFormulaCell ),
+ const String& rTargetValStr )
+ : aRefFormulaCell ( rFormulaCell ),
aRefVariableCell( rVariableCell ),
- pStrTargetVal ( new String(rTargetValStr) )
+ pStrTargetVal ( new String(rTargetValStr) )
{
}
@@ -794,8 +794,8 @@ ScSolveParam& __EXPORT ScSolveParam::operator=( const ScSolveParam& r )
BOOL ScSolveParam::operator==( const ScSolveParam& r ) const
{
- BOOL bEqual = (aRefFormulaCell == r.aRefFormulaCell)
- && (aRefVariableCell == r.aRefVariableCell);
+ BOOL bEqual = (aRefFormulaCell == r.aRefFormulaCell)
+ && (aRefVariableCell == r.aRefVariableCell);
if ( bEqual )
{
@@ -815,11 +815,11 @@ BOOL ScSolveParam::operator==( const ScSolveParam& r ) const
// struct ScTabOpParam
ScTabOpParam::ScTabOpParam( const ScTabOpParam& r )
- : aRefFormulaCell ( r.aRefFormulaCell ),
- aRefFormulaEnd ( r.aRefFormulaEnd ),
- aRefRowCell ( r.aRefRowCell ),
- aRefColCell ( r.aRefColCell ),
- nMode ( r.nMode )
+ : aRefFormulaCell ( r.aRefFormulaCell ),
+ aRefFormulaEnd ( r.aRefFormulaEnd ),
+ aRefRowCell ( r.aRefRowCell ),
+ aRefColCell ( r.aRefColCell ),
+ nMode ( r.nMode )
{
}
@@ -829,12 +829,12 @@ ScTabOpParam::ScTabOpParam( const ScRefAddress& rFormulaCell,
const ScRefAddress& rFormulaEnd,
const ScRefAddress& rRowCell,
const ScRefAddress& rColCell,
- BYTE nMd)
- : aRefFormulaCell ( rFormulaCell ),
- aRefFormulaEnd ( rFormulaEnd ),
- aRefRowCell ( rRowCell ),
- aRefColCell ( rColCell ),
- nMode ( nMd )
+ BYTE nMd)
+ : aRefFormulaCell ( rFormulaCell ),
+ aRefFormulaEnd ( rFormulaEnd ),
+ aRefRowCell ( rRowCell ),
+ aRefColCell ( rColCell ),
+ nMode ( nMd )
{
}
@@ -844,9 +844,9 @@ ScTabOpParam& ScTabOpParam::operator=( const ScTabOpParam& r )
{
aRefFormulaCell = r.aRefFormulaCell;
aRefFormulaEnd = r.aRefFormulaEnd;
- aRefRowCell = r.aRefRowCell;
- aRefColCell = r.aRefColCell;
- nMode = r.nMode;
+ aRefRowCell = r.aRefRowCell;
+ aRefColCell = r.aRefColCell;
+ nMode = r.nMode;
return *this;
}
@@ -854,11 +854,11 @@ ScTabOpParam& ScTabOpParam::operator=( const ScTabOpParam& r )
BOOL __EXPORT ScTabOpParam::operator==( const ScTabOpParam& r ) const
{
- return ( (aRefFormulaCell == r.aRefFormulaCell)
- && (aRefFormulaEnd == r.aRefFormulaEnd)
- && (aRefRowCell == r.aRefRowCell)
- && (aRefColCell == r.aRefColCell)
- && (nMode == r.nMode) );
+ return ( (aRefFormulaCell == r.aRefFormulaCell)
+ && (aRefFormulaEnd == r.aRefFormulaEnd)
+ && (aRefRowCell == r.aRefRowCell)
+ && (aRefColCell == r.aRefColCell)
+ && (nMode == r.nMode) );
}
String ScGlobal::GetAbsDocName( const String& rFileName,
@@ -866,14 +866,14 @@ String ScGlobal::GetAbsDocName( const String& rFileName,
{
String aAbsName;
if ( !pShell->HasName() )
- { // maybe relative to document path working directory
+ { // maybe relative to document path working directory
INetURLObject aObj;
SvtPathOptions aPathOpt;
aObj.SetSmartURL( aPathOpt.GetWorkPath() );
- aObj.setFinalSlash(); // it IS a path
+ aObj.setFinalSlash(); // it IS a path
bool bWasAbs = true;
aAbsName = aObj.smartRel2Abs( rFileName, bWasAbs ).GetMainURL(INetURLObject::NO_DECODE);
- // returned string must be encoded because it's used directly to create SfxMedium
+ // returned string must be encoded because it's used directly to create SfxMedium
}
else
{
@@ -884,7 +884,7 @@ String ScGlobal::GetAbsDocName( const String& rFileName,
aAbsName = pMedium->GetURLObject().smartRel2Abs( rFileName, bWasAbs ).GetMainURL(INetURLObject::NO_DECODE);
}
else
- { // This can't happen, but ...
+ { // This can't happen, but ...
// just to be sure to have the same encoding
INetURLObject aObj;
aObj.SetSmartURL( aAbsName );
@@ -903,13 +903,13 @@ String ScGlobal::GetDocTabName( const String& rFileName,
xub_StrLen nPos = 1;
while( (nPos = aDocTab.Search( '\'', nPos ))
!= STRING_NOTFOUND )
- { // escape Quotes
+ { // escape Quotes
aDocTab.Insert( '\\', nPos );
nPos += 2;
}
aDocTab += '\'';
aDocTab += SC_COMPILER_FILE_TAB_SEP;
- aDocTab += rTabName; // "'Doc'#Tab"
+ aDocTab += rTabName; // "'Doc'#Tab"
return aDocTab;
}
diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx
index 2accdadeb781..f1a1c8e6736c 100644
--- a/sc/source/core/data/globalx.cxx
+++ b/sc/source/core/data/globalx.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +70,8 @@ void ScGlobal::InitAddIns()
String aPath( aMultiPath.GetToken( 0, ';', nIndex ) );
if ( aPath.Len() > 0 )
{
- // use LocalFileHelper to convert the path to a URL that always points
- // to the file on the server
+ // use LocalFileHelper to convert the path to a URL that always points
+ // to the file on the server
String aUrl;
if ( utl::LocalFileHelper::ConvertPhysicalNameToURL( aPath, aUrl ) )
aPath = aUrl;
diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx
index aeca394437cd..dba34fc05990 100644
--- a/sc/source/core/data/markarr.cxx
+++ b/sc/source/core/data/markarr.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +76,12 @@ void ScMarkArray::Reset( BOOL bMarked )
BOOL ScMarkArray::Search( SCROW nRow, SCSIZE& nIndex ) const
{
- long nLo = 0;
- long nHi = static_cast<long>(nCount) - 1;
- long nStartRow = 0;
- long nEndRow = 0;
- long i = 0;
- BOOL bFound = (nCount == 1);
+ long nLo = 0;
+ long nHi = static_cast<long>(nCount) - 1;
+ long nStartRow = 0;
+ long nEndRow = 0;
+ long i = 0;
+ BOOL bFound = (nCount == 1);
if (pData)
{
while ( !bFound && nLo <= nHi )
@@ -248,7 +248,7 @@ void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked )
}
}
}
-// InfoBox(0, String(nCount) + String(" Eintraege") ).Execute();
+// InfoBox(0, String(nCount) + String(" Eintraege") ).Execute();
}
//UNUSED2009-05 void ScMarkArray::DeleteArea(SCROW nStartRow, SCROW nEndRow)
@@ -372,7 +372,7 @@ SCROW ScMarkArray::GetMarkEnd( SCROW nRow, BOOL bUp ) const
}
//
-// -------------- Iterator ----------------------------------------------
+// -------------- Iterator ----------------------------------------------
//
ScMarkArrayIter::ScMarkArrayIter( const ScMarkArray* pNewArray ) :
diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx
index 4401ac19d199..63d226af97a3 100644
--- a/sc/source/core/data/markdata.cxx
+++ b/sc/source/core/data/markdata.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +56,10 @@ ScMarkData::ScMarkData(const ScMarkData& rData) :
aMultiRange( rData.aMultiRange ),
pMultiSel( NULL )
{
- bMarked = rData.bMarked;
+ bMarked = rData.bMarked;
bMultiMarked = rData.bMultiMarked;
- bMarking = rData.bMarking;
- bMarkIsNeg = rData.bMarkIsNeg;
+ bMarking = rData.bMarking;
+ bMarkIsNeg = rData.bMarkIsNeg;
for (SCTAB i=0; i<=MAXTAB; i++)
bTabMarked[i] = rData.bTabMarked[i];
@@ -72,7 +72,7 @@ ScMarkData::ScMarkData(const ScMarkData& rData) :
}
}
-ScMarkData& ScMarkData::operator=(const ScMarkData& rData)
+ScMarkData& ScMarkData::operator=(const ScMarkData& rData)
{
if ( &rData == this )
return *this;
@@ -80,12 +80,12 @@ ScMarkData& ScMarkData::operator=(const ScMarkData& rData)
delete[] pMultiSel;
pMultiSel = NULL;
- aMarkRange = rData.aMarkRange;
+ aMarkRange = rData.aMarkRange;
aMultiRange = rData.aMultiRange;
- bMarked = rData.bMarked;
+ bMarked = rData.bMarked;
bMultiMarked = rData.bMultiMarked;
- bMarking = rData.bMarking;
- bMarkIsNeg = rData.bMarkIsNeg;
+ bMarking = rData.bMarking;
+ bMarkIsNeg = rData.bMarkIsNeg;
for (SCTAB i=0; i<=MAXTAB; i++)
bTabMarked[i] = rData.bTabMarked[i];
@@ -131,7 +131,7 @@ void ScMarkData::SetMarkArea( const ScRange& rRange )
void ScMarkData::GetMarkArea( ScRange& rRange ) const
{
- rRange = aMarkRange; //! inline ?
+ rRange = aMarkRange; //! inline ?
}
void ScMarkData::GetMultiMarkArea( ScRange& rRange ) const
@@ -164,7 +164,7 @@ void ScMarkData::SetMultiMarkArea( const ScRange& rRange, BOOL bMark )
for (nCol=nStartCol; nCol<=nEndCol; nCol++)
pMultiSel[nCol].SetMarkArea( nStartRow, nEndRow, bMark );
- if ( bMultiMarked ) // aMultiRange updaten
+ if ( bMultiMarked ) // aMultiRange updaten
{
if ( nStartCol < aMultiRange.aStart.Col() )
aMultiRange.aStart.SetCol( nStartCol );
@@ -177,7 +177,7 @@ void ScMarkData::SetMultiMarkArea( const ScRange& rRange, BOOL bMark )
}
else
{
- aMultiRange = rRange; // neu
+ aMultiRange = rRange; // neu
bMultiMarked = TRUE;
}
}
@@ -223,7 +223,7 @@ void ScMarkData::MarkToMulti()
SetMultiMarkArea( aMarkRange, !bMarkIsNeg );
bMarked = FALSE;
- // check if all multi mark ranges have been removed
+ // check if all multi mark ranges have been removed
if ( bMarkIsNeg && !HasAnyMultiMarks() )
ResetMark();
}
@@ -235,7 +235,7 @@ void ScMarkData::MarkToSimple()
return;
if ( bMultiMarked && bMarked )
- MarkToMulti(); // may result in bMarked and bMultiMarked reset
+ MarkToMulti(); // may result in bMarked and bMultiMarked reset
if ( bMultiMarked )
{
@@ -252,7 +252,7 @@ void ScMarkData::MarkToSimple()
while ( nStartCol < nEndCol && !pMultiSel[nEndCol].HasMarks() )
--nEndCol;
- // Zeilen werden nur aus MarkArray genommen
+ // Zeilen werden nur aus MarkArray genommen
SCROW nStartRow, nEndRow;
if ( pMultiSel[nStartCol].HasOneMark( nStartRow, nEndRow ) )
{
@@ -288,7 +288,7 @@ BOOL ScMarkData::IsCellMarked( SCCOL nCol, SCROW nRow, BOOL bNoSimple ) const
if (bMultiMarked)
{
- //! hier auf negative Markierung testen ?
+ //! hier auf negative Markierung testen ?
DBG_ASSERT(pMultiSel, "bMultiMarked, aber pMultiSel == 0");
return pMultiSel[nCol].GetMark( nRow );
@@ -299,12 +299,12 @@ BOOL ScMarkData::IsCellMarked( SCCOL nCol, SCROW nRow, BOOL bNoSimple ) const
BOOL ScMarkData::IsColumnMarked( SCCOL nCol ) const
{
- // bMarkIsNeg inzwischen auch fuer Spaltenkoepfe
- //! GetMarkColumnRanges fuer komplett markierte Spalten
+ // bMarkIsNeg inzwischen auch fuer Spaltenkoepfe
+ //! GetMarkColumnRanges fuer komplett markierte Spalten
if ( bMarked && !bMarkIsNeg &&
aMarkRange.aStart.Col() <= nCol && aMarkRange.aEnd.Col() >= nCol &&
- aMarkRange.aStart.Row() == 0 && aMarkRange.aEnd.Row() == MAXROW )
+ aMarkRange.aStart.Row() == 0 && aMarkRange.aEnd.Row() == MAXROW )
return TRUE;
if ( bMultiMarked && pMultiSel[nCol].IsAllMarked(0,MAXROW) )
@@ -315,11 +315,11 @@ BOOL ScMarkData::IsColumnMarked( SCCOL nCol ) const
BOOL ScMarkData::IsRowMarked( SCROW nRow ) const
{
- // bMarkIsNeg inzwischen auch fuer Zeilenkoepfe
- //! GetMarkRowRanges fuer komplett markierte Zeilen
+ // bMarkIsNeg inzwischen auch fuer Zeilenkoepfe
+ //! GetMarkRowRanges fuer komplett markierte Zeilen
if ( bMarked && !bMarkIsNeg &&
- aMarkRange.aStart.Col() == 0 && aMarkRange.aEnd.Col() == MAXCOL &&
+ aMarkRange.aStart.Col() == 0 && aMarkRange.aEnd.Col() == MAXCOL &&
aMarkRange.aStart.Row() <= nRow && aMarkRange.aEnd.Row() >= nRow )
return TRUE;
@@ -340,7 +340,7 @@ void ScMarkData::MarkFromRangeList( const ScRangeList& rList, BOOL bReset )
if (bReset)
{
for (SCTAB i=0; i<=MAXTAB; i++)
- bTabMarked[i] = FALSE; // Tabellen sind nicht in ResetMark
+ bTabMarked[i] = FALSE; // Tabellen sind nicht in ResetMark
ResetMark();
}
@@ -370,7 +370,7 @@ void ScMarkData::FillRangeListWithMarks( ScRangeList* pList, BOOL bClear ) const
if (bClear)
pList->RemoveAll();
- //! bei mehreren selektierten Tabellen mehrere Ranges eintragen !!!
+ //! bei mehreren selektierten Tabellen mehrere Ranges eintragen !!!
if ( bMultiMarked )
{
@@ -405,7 +405,7 @@ void ScMarkData::ExtendRangeListTables( ScRangeList* pList ) const
return;
ScRangeList aOldList(*pList);
- pList->RemoveAll(); //! oder die vorhandenen unten weglassen
+ pList->RemoveAll(); //! oder die vorhandenen unten weglassen
for (SCTAB nTab=0; nTab<=MAXTAB; nTab++)
if (bTabMarked[nTab])
@@ -585,7 +585,7 @@ BOOL ScMarkData::HasAnyMultiMarks() const
if ( pMultiSel[nCol].HasMarks() )
return TRUE;
- return FALSE; // nix
+ return FALSE; // nix
}
void ScMarkData::InsertTab( SCTAB nTab )
diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx
index af444c4b2123..9c52b02fdaae 100644
--- a/sc/source/core/data/olinetab.cxx
+++ b/sc/source/core/data/olinetab.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/pagepar.cxx b/sc/source/core/data/pagepar.cxx
index 318f5c19501b..94a9d01b45d8 100644
--- a/sc/source/core/data/pagepar.cxx
+++ b/sc/source/core/data/pagepar.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ void ScPageTableParam::Reset()
bCellContent = TRUE;
bNotes=bGrid=bHeaders=bDrawings=
bLeftRight=bScaleAll=bScaleTo=bScalePageNum=
- bFormulas=bNullVals=bSkipEmpty = FALSE;
- bTopDown=bScaleNone=bCharts=bObjects = TRUE;
+ bFormulas=bNullVals=bSkipEmpty = FALSE;
+ bTopDown=bScaleNone=bCharts=bObjects = TRUE;
nScaleAll = 100;
nScalePageNum = nScaleWidth = nScaleHeight = 0;
nFirstPageNo = 1;
@@ -104,19 +104,19 @@ void ScPageAreaParam::Reset()
BOOL ScPageAreaParam::operator==( const ScPageAreaParam& r ) const
{
BOOL bEqual =
- bPrintArea == r.bPrintArea
- && bRepeatRow == r.bRepeatRow
- && bRepeatCol == r.bRepeatCol;
+ bPrintArea == r.bPrintArea
+ && bRepeatRow == r.bRepeatRow
+ && bRepeatCol == r.bRepeatCol;
if ( bEqual )
if ( bPrintArea )
- bEqual = bEqual && ( aPrintArea == r.aPrintArea );
+ bEqual = bEqual && ( aPrintArea == r.aPrintArea );
if ( bEqual )
if ( bRepeatRow )
- bEqual = bEqual && ( aRepeatRow == r.aRepeatRow );
+ bEqual = bEqual && ( aRepeatRow == r.aRepeatRow );
if ( bEqual )
if ( bRepeatCol )
- bEqual = bEqual && ( aRepeatCol == r.aRepeatCol );
+ bEqual = bEqual && ( aRepeatCol == r.aRepeatCol );
return bEqual;
}
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index b66aea63dd05..7b6309366cbc 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,38 +80,38 @@ ScDocument* ScPatternAttr::pDoc = NULL;
// -----------------------------------------------------------------------
-//! move to some header file
-inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
-inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
+//! move to some header file
+inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
+inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
// -----------------------------------------------------------------------
ScPatternAttr::ScPatternAttr( SfxItemSet* pItemSet, const String& rStyleName )
- : SfxSetItem ( ATTR_PATTERN, pItemSet ),
- pName ( new String( rStyleName ) ),
- pStyle ( NULL )
+ : SfxSetItem ( ATTR_PATTERN, pItemSet ),
+ pName ( new String( rStyleName ) ),
+ pStyle ( NULL )
{
}
ScPatternAttr::ScPatternAttr( SfxItemSet* pItemSet, ScStyleSheet* pStyleSheet )
- : SfxSetItem ( ATTR_PATTERN, pItemSet ),
- pName ( NULL ),
- pStyle ( pStyleSheet )
+ : SfxSetItem ( ATTR_PATTERN, pItemSet ),
+ pName ( NULL ),
+ pStyle ( pStyleSheet )
{
if ( pStyleSheet )
GetItemSet().SetParent( &pStyleSheet->GetItemSet() );
}
ScPatternAttr::ScPatternAttr( SfxItemPool* pItemPool )
- : SfxSetItem ( ATTR_PATTERN, new SfxItemSet( *pItemPool, ATTR_PATTERN_START, ATTR_PATTERN_END ) ),
- pName ( NULL ),
- pStyle ( NULL )
+ : SfxSetItem ( ATTR_PATTERN, new SfxItemSet( *pItemPool, ATTR_PATTERN_START, ATTR_PATTERN_END ) ),
+ pName ( NULL ),
+ pStyle ( NULL )
{
}
ScPatternAttr::ScPatternAttr( const ScPatternAttr& rPatternAttr )
- : SfxSetItem ( rPatternAttr ),
- pStyle ( rPatternAttr.pStyle )
+ : SfxSetItem ( rPatternAttr ),
+ pStyle ( rPatternAttr.pStyle )
{
if (rPatternAttr.pName)
pName = new String(*rPatternAttr.pName);
@@ -165,8 +165,8 @@ int __EXPORT ScPatternAttr::operator==( const SfxPoolItem& rCmp ) const
SfxPoolItem* __EXPORT ScPatternAttr::Create( SvStream& rStream, USHORT /* nVersion */ ) const
{
String* pStr;
- BOOL bHasStyle;
- short eFamDummy;
+ BOOL bHasStyle;
+ short eFamDummy;
rStream >> bHasStyle;
@@ -196,7 +196,7 @@ SvStream& __EXPORT ScPatternAttr::Store(SvStream& rStream, USHORT /* nItemVersio
if ( pStyle )
rStream.WriteByteString( pStyle->GetName(), rStream.GetStreamCharSet() );
- else if ( pName ) // wenn Style geloescht ist/war
+ else if ( pName ) // wenn Style geloescht ist/war
rStream.WriteByteString( *pName, rStream.GetStreamCharSet() );
else
rStream.WriteByteString( ScGlobal::GetRscString(STR_STYLENAME_STANDARD),
@@ -240,7 +240,7 @@ void ScPatternAttr::GetFont(
const SfxItemSet* pCondSet, BYTE nScript,
const Color* pBackConfigColor, const Color* pTextConfigColor )
{
- // Items auslesen
+ // Items auslesen
const SvxFontItem* pFontAttr;
UINT32 nFontHeight;
@@ -376,9 +376,9 @@ void ScPatternAttr::GetFont(
}
DBG_ASSERT(pFontAttr,"nanu?");
- // auswerten
+ // auswerten
- // FontItem:
+ // FontItem:
if (rFont.GetName() != pFontAttr->GetFamilyName())
rFont.SetName( pFontAttr->GetFamilyName() );
@@ -391,7 +391,7 @@ void ScPatternAttr::GetFont(
rFont.SetLanguage(eLang);
- // Groesse
+ // Groesse
if ( pOutDev != NULL )
{
@@ -418,7 +418,7 @@ void ScPatternAttr::GetFont(
rFont.SetSize( Size( 0, (long) nFontHeight ) );
}
- // determine effective font color
+ // determine effective font color
if ( ( aColor.GetColor() == COL_AUTO && eAutoMode != SC_AUTOCOL_RAW ) ||
eAutoMode == SC_AUTOCOL_IGNOREFONT || eAutoMode == SC_AUTOCOL_IGNOREALL )
@@ -427,7 +427,7 @@ void ScPatternAttr::GetFont(
aColor.SetColor( COL_BLACK );
else
{
- // get background color from conditional or own set
+ // get background color from conditional or own set
Color aBackColor;
if ( pCondSet )
{
@@ -439,7 +439,7 @@ void ScPatternAttr::GetFont(
else
aBackColor = ((const SvxBrushItem&)rItemSet.Get( ATTR_BACKGROUND )).GetColor();
- // if background color attribute is transparent, use window color for brightness comparisons
+ // if background color attribute is transparent, use window color for brightness comparisons
if ( aBackColor == COL_TRANSPARENT ||
eAutoMode == SC_AUTOCOL_IGNOREBACK || eAutoMode == SC_AUTOCOL_IGNOREALL )
{
@@ -454,7 +454,7 @@ void ScPatternAttr::GetFont(
aBackColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor );
}
- // get system text color for comparison
+ // get system text color for comparison
Color aSysTextColor;
if ( eAutoMode == SC_AUTOCOL_PRINT )
aSysTextColor.SetColor( COL_BLACK );
@@ -466,26 +466,26 @@ void ScPatternAttr::GetFont(
else
aSysTextColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
- // select the resulting color
+ // select the resulting color
if ( aBackColor.IsDark() && aSysTextColor.IsDark() )
{
- // use white instead of dark on dark
+ // use white instead of dark on dark
aColor.SetColor( COL_WHITE );
}
else if ( aBackColor.IsBright() && aSysTextColor.IsBright() )
{
- // use black instead of bright on bright
+ // use black instead of bright on bright
aColor.SetColor( COL_BLACK );
}
else
{
- // use aSysTextColor (black for SC_AUTOCOL_PRINT, from style settings otherwise)
+ // use aSysTextColor (black for SC_AUTOCOL_PRINT, from style settings otherwise)
aColor = aSysTextColor;
}
}
}
- // set font effects
+ // set font effects
rFont.SetWeight( eWeight );
rFont.SetItalic( eItalic );
rFont.SetUnderline( eUnder );
@@ -512,29 +512,29 @@ void ScPatternAttr::GetFont(
void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& rSrcSet, const SfxItemSet* pCondSet )
{
- // Items auslesen
-
- SvxColorItem aColorItem(EE_CHAR_COLOR); // use item as-is
- SvxFontItem aFontItem(EE_CHAR_FONTINFO); // use item as-is
- SvxFontItem aCjkFontItem(EE_CHAR_FONTINFO_CJK);
- SvxFontItem aCtlFontItem(EE_CHAR_FONTINFO_CTL);
- long nTHeight, nCjkTHeight, nCtlTHeight; // Twips
- FontWeight eWeight, eCjkWeight, eCtlWeight;
+ // Items auslesen
+
+ SvxColorItem aColorItem(EE_CHAR_COLOR); // use item as-is
+ SvxFontItem aFontItem(EE_CHAR_FONTINFO); // use item as-is
+ SvxFontItem aCjkFontItem(EE_CHAR_FONTINFO_CJK);
+ SvxFontItem aCtlFontItem(EE_CHAR_FONTINFO_CTL);
+ long nTHeight, nCjkTHeight, nCtlTHeight; // Twips
+ FontWeight eWeight, eCjkWeight, eCtlWeight;
SvxUnderlineItem aUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE);
SvxOverlineItem aOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE);
- BOOL bWordLine;
- FontStrikeout eStrike;
- FontItalic eItalic, eCjkItalic, eCtlItalic;
- BOOL bOutline;
- BOOL bShadow;
- BOOL bForbidden;
+ BOOL bWordLine;
+ FontStrikeout eStrike;
+ FontItalic eItalic, eCjkItalic, eCtlItalic;
+ BOOL bOutline;
+ BOOL bShadow;
+ BOOL bForbidden;
FontEmphasisMark eEmphasis;
- FontRelief eRelief;
- LanguageType eLang, eCjkLang, eCtlLang;
- BOOL bHyphenate;
+ FontRelief eRelief;
+ LanguageType eLang, eCjkLang, eCtlLang;
+ BOOL bHyphenate;
SvxFrameDirection eDirection;
- //! additional parameter to control if language is needed?
+ //! additional parameter to control if language is needed?
if ( pCondSet )
{
@@ -637,7 +637,7 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r
pItem = &rSrcSet.Get( ATTR_WRITINGDIR );
eDirection = (SvxFrameDirection)((const SvxFrameDirectionItem*)pItem)->GetValue();
}
- else // alles direkt aus Pattern
+ else // alles direkt aus Pattern
{
aColorItem = (const SvxColorItem&) rSrcSet.Get( ATTR_FONT_COLOR );
aFontItem = (const SvxFontItem&) rSrcSet.Get( ATTR_FONT );
@@ -695,15 +695,15 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r
long nCjkHeight = TwipsToHMM(nCjkTHeight);
long nCtlHeight = TwipsToHMM(nCtlTHeight);
- // put items into EditEngine ItemSet
+ // put items into EditEngine ItemSet
if ( aColorItem.GetValue().GetColor() == COL_AUTO )
{
- // #108979# When cell attributes are converted to EditEngine paragraph attributes,
- // don't create a hard item for automatic color, because that would be converted
- // to black when the item's Store method is used in CreateTransferable/WriteBin.
- // COL_AUTO is the EditEngine's pool default, so ClearItem will result in automatic
- // color, too, without having to store the item.
+ // #108979# When cell attributes are converted to EditEngine paragraph attributes,
+ // don't create a hard item for automatic color, because that would be converted
+ // to black when the item's Store method is used in CreateTransferable/WriteBin.
+ // COL_AUTO is the EditEngine's pool default, so ClearItem will result in automatic
+ // color, too, without having to store the item.
rEditSet.ClearItem( EE_CHAR_COLOR );
}
else
@@ -869,8 +869,8 @@ void ScPatternAttr::GetFromEditItemSet( const SfxItemSet* pEditSet )
void ScPatternAttr::FillEditParaItems( SfxItemSet* pEditSet ) const
{
- // in GetFromEditItemSet schon dabei, in FillEditItemSet aber nicht
- // Hor. Ausrichtung Standard wird immer als "links" umgesetzt
+ // in GetFromEditItemSet schon dabei, in FillEditItemSet aber nicht
+ // Hor. Ausrichtung Standard wird immer als "links" umgesetzt
const SfxItemSet& rMySet = GetItemSet();
@@ -880,10 +880,10 @@ void ScPatternAttr::FillEditParaItems( SfxItemSet* pEditSet ) const
SvxAdjust eSvxAdjust;
switch (eHorJust)
{
- case SVX_HOR_JUSTIFY_RIGHT: eSvxAdjust = SVX_ADJUST_RIGHT; break;
+ case SVX_HOR_JUSTIFY_RIGHT: eSvxAdjust = SVX_ADJUST_RIGHT; break;
case SVX_HOR_JUSTIFY_CENTER: eSvxAdjust = SVX_ADJUST_CENTER; break;
- case SVX_HOR_JUSTIFY_BLOCK: eSvxAdjust = SVX_ADJUST_BLOCK; break;
- default: eSvxAdjust = SVX_ADJUST_LEFT; break;
+ case SVX_HOR_JUSTIFY_BLOCK: eSvxAdjust = SVX_ADJUST_BLOCK; break;
+ default: eSvxAdjust = SVX_ADJUST_LEFT; break;
}
pEditSet->Put( SvxAdjustItem( eSvxAdjust, EE_PARA_JUST ) );
}
@@ -898,19 +898,19 @@ void ScPatternAttr::DeleteUnchanged( const ScPatternAttr* pOldAttrs )
for ( USHORT nSubWhich=ATTR_PATTERN_START; nSubWhich<=ATTR_PATTERN_END; nSubWhich++ )
{
- // only items that are set are interesting
+ // only items that are set are interesting
if ( rThisSet.GetItemState( nSubWhich, FALSE, &pThisItem ) == SFX_ITEM_SET )
{
SfxItemState eOldState = rOldSet.GetItemState( nSubWhich, TRUE, &pOldItem );
if ( eOldState == SFX_ITEM_SET )
{
- // item is set in OldAttrs (or its parent) -> compare pointers
+ // item is set in OldAttrs (or its parent) -> compare pointers
if ( pThisItem == pOldItem )
rThisSet.ClearItem( nSubWhich );
}
else if ( eOldState != SFX_ITEM_DONTCARE )
{
- // not set in OldAttrs -> compare item value to default item
+ // not set in OldAttrs -> compare item value to default item
if ( *pThisItem == rThisSet.GetPool()->GetDefaultItem( nSubWhich ) )
rThisSet.ClearItem( nSubWhich );
}
@@ -936,9 +936,9 @@ void ScPatternAttr::ClearItems( const USHORT* pWhich )
SfxStyleSheetBase* lcl_CopyStyleToPool
(
- SfxStyleSheetBase* pSrcStyle,
- SfxStyleSheetBasePool* pSrcPool,
- SfxStyleSheetBasePool* pDestPool,
+ SfxStyleSheetBase* pSrcStyle,
+ SfxStyleSheetBasePool* pSrcPool,
+ SfxStyleSheetBasePool* pDestPool,
const SvNumberFormatterIndexTable* pFormatExchangeList
)
{
@@ -950,9 +950,9 @@ SfxStyleSheetBase* lcl_CopyStyleToPool
//--------------------------------------------------------
- const String aStrSrcStyle = pSrcStyle->GetName();
- const SfxStyleFamily eFamily = pSrcStyle->GetFamily();
- SfxStyleSheetBase* pDestStyle = pDestPool->Find( aStrSrcStyle, eFamily );
+ const String aStrSrcStyle = pSrcStyle->GetName();
+ const SfxStyleFamily eFamily = pSrcStyle->GetFamily();
+ SfxStyleSheetBase* pDestStyle = pDestPool->Find( aStrSrcStyle, eFamily );
if ( !pDestStyle )
{
@@ -1026,7 +1026,7 @@ ScPatternAttr* ScPatternAttr::PutInPool( ScDocument* pDestDoc, ScDocument* pSrcD
if ( nAttrId == ATTR_CONDITIONAL )
{
- // Bedingte Formate ins neue Dokument kopieren
+ // Bedingte Formate ins neue Dokument kopieren
ULONG nNewIndex = 0;
ScConditionalFormatList* pSrcList = pSrcDoc->GetCondFormList();
@@ -1038,8 +1038,8 @@ ScPatternAttr* ScPatternAttr::PutInPool( ScDocument* pDestDoc, ScDocument* pSrcD
{
nNewIndex = pDestDoc->AddCondFormat( *pOldData );
- // zugehoerige Styles auch mitkopieren
- //! nur wenn Format bei Add neu angelegt
+ // zugehoerige Styles auch mitkopieren
+ //! nur wenn Format bei Add neu angelegt
ScStyleSheetPool* pSrcSPool = pSrcDoc->GetStyleSheetPool();
ScStyleSheetPool* pDestSPool = pDestDoc->GetStyleSheetPool();
@@ -1058,7 +1058,7 @@ ScPatternAttr* ScPatternAttr::PutInPool( ScDocument* pDestDoc, ScDocument* pSrcD
}
else if ( nAttrId == ATTR_VALIDDATA )
{
- // Gueltigkeit ins neue Dokument kopieren
+ // Gueltigkeit ins neue Dokument kopieren
ULONG nNewIndex = 0;
ScValidationDataList* pSrcList = pSrcDoc->GetValidationList();
@@ -1073,7 +1073,7 @@ ScPatternAttr* ScPatternAttr::PutInPool( ScDocument* pDestDoc, ScDocument* pSrcD
}
else if ( nAttrId == ATTR_VALUE_FORMAT && pDestDoc->GetFormatExchangeList() )
{
- // Zahlformate nach Exchange-Liste
+ // Zahlformate nach Exchange-Liste
ULONG nOldFormat = ((const SfxUInt32Item*)pSrcItem)->GetValue();
sal_uInt32* pNewFormat = static_cast<sal_uInt32*>(pDestDoc->GetFormatExchangeList()->Get(nOldFormat));
@@ -1154,7 +1154,7 @@ BOOL ScPatternAttr::IsVisibleEqual( const ScPatternAttr& rOther ) const
OneEqual( rThisSet, rOtherSet, ATTR_BORDER_BLTR ) &&
OneEqual( rThisSet, rOtherSet, ATTR_SHADOW );
- //! auch hier nur wirklich sichtbare Werte testen !!!
+ //! auch hier nur wirklich sichtbare Werte testen !!!
}
const String* ScPatternAttr::GetStyleName() const
@@ -1167,7 +1167,7 @@ void ScPatternAttr::SetStyleSheet( ScStyleSheet* pNewStyle )
{
if (pNewStyle)
{
- SfxItemSet& rPatternSet = GetItemSet();
+ SfxItemSet& rPatternSet = GetItemSet();
const SfxItemSet& rStyleSet = pNewStyle->GetItemSet();
for (USHORT i=ATTR_PATTERN_START; i<=ATTR_PATTERN_END; i++)
@@ -1193,9 +1193,9 @@ void ScPatternAttr::UpdateStyleSheet()
{
pStyle = (ScStyleSheet*)pDoc->GetStyleSheetPool()->Find(*pName, SFX_STYLE_FAMILY_PARA);
- // wenn Style nicht gefunden, Standard nehmen,
- // damit keine leere Anzeige im Toolbox-Controller
- //! es wird vorausgesetzt, dass "Standard" immer der erste Eintrag ist!
+ // wenn Style nicht gefunden, Standard nehmen,
+ // damit keine leere Anzeige im Toolbox-Controller
+ //! es wird vorausgesetzt, dass "Standard" immer der erste Eintrag ist!
if (!pStyle)
{
SfxStyleSheetIterator* pIter = pDoc->GetStyleSheetPool()->CreateIterator(
@@ -1257,13 +1257,13 @@ ULONG ScPatternAttr::GetNumberFormat( SvNumberFormatter* pFormatter ) const
LanguageType eLang =
((SvxLanguageItem*)&GetItemSet().Get( ATTR_LANGUAGE_FORMAT ))->GetLanguage();
if ( nFormat < SV_COUNTRY_LANGUAGE_OFFSET && eLang == LANGUAGE_SYSTEM )
- ; // es bleibt wie es ist
+ ; // es bleibt wie es ist
else if ( pFormatter )
nFormat = pFormatter->GetFormatForLanguageIfBuiltIn( nFormat, eLang );
return nFormat;
}
-// dasselbe, wenn bedingte Formatierung im Spiel ist:
+// dasselbe, wenn bedingte Formatierung im Spiel ist:
ULONG ScPatternAttr::GetNumberFormat( SvNumberFormatter* pFormatter,
const SfxItemSet* pCondSet ) const
@@ -1296,7 +1296,7 @@ const SfxPoolItem& ScPatternAttr::GetItem( USHORT nSubWhich, const SfxItemSet* p
return GetItem( nSubWhich, GetItemSet(), pCondSet );
}
-// GetRotateVal testet vorher ATTR_ORIENTATION
+// GetRotateVal testet vorher ATTR_ORIENTATION
long ScPatternAttr::GetRotateVal( const SfxItemSet* pCondSet ) const
{
@@ -1328,7 +1328,7 @@ BYTE ScPatternAttr::GetRotateDir( const SfxItemSet* pCondSet ) const
nRet = SC_ROTDIR_CENTER;
else if ( eRotMode == SVX_ROTATE_MODE_TOP || eRotMode == SVX_ROTATE_MODE_BOTTOM )
{
- long nRot180 = nAttrRotate % 18000; // 1/100 Grad
+ long nRot180 = nAttrRotate % 18000; // 1/100 Grad
if ( nRot180 == 9000 )
nRet = SC_ROTDIR_CENTER;
else if ( ( eRotMode == SVX_ROTATE_MODE_TOP && nRot180 < 9000 ) ||
diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx
index 5a6174bc0129..66bfd3b86c11 100644
--- a/sc/source/core/data/pivot2.cxx
+++ b/sc/source/core/data/pivot2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "userlist.hxx"
#include "pivot.hxx"
#include "rechead.hxx"
-#include "formula/errorcodes.hxx" // fuer errNoValue
+#include "formula/errorcodes.hxx" // fuer errNoValue
#include "refupdat.hxx"
#include "stlpool.hxx"
#include "stlsheet.hxx"
diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx
index 010cc502798b..fda341f7d12c 100644
--- a/sc/source/core/data/poolhelp.cxx
+++ b/sc/source/core/data/poolhelp.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
// -----------------------------------------------------------------------
-ScPoolHelper::ScPoolHelper( ScDocument* pSourceDoc )
+ScPoolHelper::ScPoolHelper( ScDocument* pSourceDoc )
:pFormTable(NULL)
,pEditPool(NULL)
,pEnginePool(NULL)
@@ -63,18 +63,18 @@ ScPoolHelper::~ScPoolHelper()
mxStylePool.clear();
SfxItemPool::Free(pDocPool);
}
-SfxItemPool* ScPoolHelper::GetEditPool() const
+SfxItemPool* ScPoolHelper::GetEditPool() const
{
if ( !pEditPool )
{
pEditPool = EditEngine::CreatePool();
pEditPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM );
pEditPool->FreezeIdRanges();
- pEditPool->SetFileFormatVersion( SOFFICE_FILEFORMAT_50 ); // used in ScGlobal::EETextObjEqual
+ pEditPool->SetFileFormatVersion( SOFFICE_FILEFORMAT_50 ); // used in ScGlobal::EETextObjEqual
}
return pEditPool;
}
-SfxItemPool* ScPoolHelper::GetEnginePool() const
+SfxItemPool* ScPoolHelper::GetEnginePool() const
{
if ( !pEnginePool )
{
@@ -84,7 +84,7 @@ SfxItemPool* ScPoolHelper::GetEnginePool() const
} // ifg ( pEnginePool )
return pEnginePool;
}
-SvNumberFormatter* ScPoolHelper::GetFormTable() const
+SvNumberFormatter* ScPoolHelper::GetFormTable() const
{
if ( !pFormTable )
{
@@ -117,7 +117,7 @@ void ScPoolHelper::SetFormTableOpt(const ScDocOptions& rOpt)
void ScPoolHelper::SourceDocumentGone()
{
- // reset all pointers to the source document
+ // reset all pointers to the source document
mxStylePool->SetDocument( NULL );
if ( pFormTable )
pFormTable->SetColorLink( Link() );
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index a4bc9a473768..79f9e0714c41 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/scdpoutputimpl.cxx b/sc/source/core/data/scdpoutputimpl.cxx
index 6a667806e097..b780768b9d32 100644
--- a/sc/source/core/data/scdpoutputimpl.cxx
+++ b/sc/source/core/data/scdpoutputimpl.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.
*
@@ -49,16 +49,16 @@ void OutputImpl::OutputDataArea()
AddRow( mnDataStartRow );
AddCol( mnDataStartCol );
- mnCols.push_back( mnTabEndCol+1); //set last row bottom
+ mnCols.push_back( mnTabEndCol+1); //set last row bottom
mnRows.push_back( mnTabEndRow+1); //set last col bottom
-
+
BOOL bAllRows = ( ( mnTabEndRow - mnDataStartRow + 2 ) == (SCROW) mnRows.size() );
-
+
std::sort( mnCols.begin(), mnCols.end(), lcl_compareColfuc );
std::sort( mnRows.begin(), mnRows.end(), lcl_compareRowfuc );
-
+
for( SCCOL nCol = 0; nCol < (SCCOL)mnCols.size()-1; nCol ++ )
- {
+ {
if ( !bAllRows )
{
if ( nCol < (SCCOL)mnCols.size()-2)
@@ -66,7 +66,7 @@ void OutputImpl::OutputDataArea()
for ( SCROW i = nCol%2; i < (SCROW)mnRows.size()-2; i +=2 )
OutputBlockFrame( mnCols[nCol], mnRows[i], mnCols[nCol+1]-1, mnRows[i+1]-1 );
if ( mnRows.size()>=2 )
- OutputBlockFrame( mnCols[nCol], mnRows[mnRows.size()-2], mnCols[nCol+1]-1, mnRows[mnRows.size()-1]-1 );
+ OutputBlockFrame( mnCols[nCol], mnRows[mnRows.size()-2], mnCols[nCol+1]-1, mnRows[mnRows.size()-1]-1 );
}
else
{
@@ -74,7 +74,7 @@ void OutputImpl::OutputDataArea()
OutputBlockFrame( mnCols[nCol], mnRows[i], mnCols[nCol+1]-1, mnRows[i+1]-1 );
}
}
- else
+ else
OutputBlockFrame( mnCols[nCol], mnRows.front(), mnCols[nCol+1]-1, mnRows.back()-1, bAllRows );
}
//out put rows area outer framer
@@ -88,14 +88,14 @@ void OutputImpl::OutputDataArea()
OutputBlockFrame( mnDataStartCol, mnTabStartRow, mnTabEndCol, mnDataStartRow-1 );
}
-OutputImpl::OutputImpl( ScDocument* pDoc, USHORT nTab,
- SCCOL nTabStartCol,
- SCROW nTabStartRow,
- SCCOL nMemberStartCol,
- SCROW nMemberStartRow,
- SCCOL nDataStartCol,
- SCROW nDataStartRow,
- SCCOL nTabEndCol,
+OutputImpl::OutputImpl( ScDocument* pDoc, USHORT nTab,
+ SCCOL nTabStartCol,
+ SCROW nTabStartRow,
+ SCCOL nMemberStartCol,
+ SCROW nMemberStartRow,
+ SCCOL nDataStartCol,
+ SCROW nDataStartRow,
+ SCCOL nTabEndCol,
SCROW nTabEndRow ):
mpDoc( pDoc ),
mnTab( nTab ),
@@ -104,13 +104,13 @@ OutputImpl::OutputImpl( ScDocument* pDoc, USHORT nTab,
mnMemberStartCol( nMemberStartCol),
mnMemberStartRow( nMemberStartRow),
mnDataStartCol ( nDataStartCol ),
- mnDataStartRow ( nDataStartRow ),
+ mnDataStartRow ( nDataStartRow ),
mnTabEndCol( nTabEndCol ),
mnTabEndRow( nTabEndRow )
{
mbNeedLineCols.resize( nTabEndCol-nDataStartCol+1, false );
mbNeedLineRows.resize( nTabEndRow-nDataStartRow+1, false );
-
+
}
BOOL OutputImpl::AddRow( SCROW nRow )
@@ -127,7 +127,7 @@ BOOL OutputImpl::AddRow( SCROW nRow )
BOOL OutputImpl::AddCol( SCCOL nCol )
{
-
+
if ( !mbNeedLineCols[ nCol - mnDataStartCol ] )
{
mbNeedLineCols[ nCol - mnDataStartCol ] = true;
@@ -135,7 +135,7 @@ BOOL OutputImpl::AddCol( SCCOL nCol )
return TRUE;
}
else
- return FALSE;
+ return FALSE;
}
void OutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, BOOL bHori )
@@ -146,7 +146,7 @@ void OutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEnd
aLine.SetOutWidth( SC_DP_FRAME_INNER_BOLD );
aOutLine.SetColor( SC_DP_FRAME_COLOR );
aOutLine.SetOutWidth( SC_DP_FRAME_OUTER_BOLD );
-
+
SvxBoxItem aBox( ATTR_BORDER );
if ( nStartCol == mnTabStartCol )
@@ -158,18 +158,18 @@ void OutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEnd
aBox.SetLine(&aOutLine, BOX_LINE_TOP);
else
aBox.SetLine(&aLine, BOX_LINE_TOP);
-
+
if ( nEndCol == mnTabEndCol ) //bottom row
aBox.SetLine(&aOutLine, BOX_LINE_RIGHT);
- else
+ else
aBox.SetLine(&aLine, BOX_LINE_RIGHT);
- if ( nEndRow == mnTabEndRow ) //bottom
+ if ( nEndRow == mnTabEndRow ) //bottom
aBox.SetLine(&aOutLine, BOX_LINE_BOTTOM);
else
aBox.SetLine(&aLine, BOX_LINE_BOTTOM);
-
+
SvxBoxInfoItem aBoxInfo( ATTR_BORDER_INNER );
aBoxInfo.SetValid(VALID_VERT,FALSE );
if ( bHori )
diff --git a/sc/source/core/data/scdpoutputimpl.hxx b/sc/source/core/data/scdpoutputimpl.hxx
index 9148fe91ba02..34f61ed9943a 100755
--- a/sc/source/core/data/scdpoutputimpl.hxx
+++ b/sc/source/core/data/scdpoutputimpl.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.
*
@@ -33,47 +33,47 @@
#include "document.hxx"
-#define SC_DP_FRAME_INNER_BOLD 20
-#define SC_DP_FRAME_OUTER_BOLD 40
+#define SC_DP_FRAME_INNER_BOLD 20
+#define SC_DP_FRAME_OUTER_BOLD 40
-#define SC_DP_FRAME_COLOR Color(0,0,0) //( 0x20, 0x40, 0x68 )
+#define SC_DP_FRAME_COLOR Color(0,0,0) //( 0x20, 0x40, 0x68 )
class OutputImpl
{
- ScDocument* mpDoc;
- USHORT mnTab;
+ ScDocument* mpDoc;
+ USHORT mnTab;
::std::vector< bool > mbNeedLineCols;
::std::vector< SCCOL > mnCols;
-
+
::std::vector< bool > mbNeedLineRows;
::std::vector< SCROW > mnRows;
- SCCOL mnTabStartCol;
- SCROW mnTabStartRow;
- SCCOL mnMemberStartCol;
- SCROW mnMemberStartRow;
-
- SCCOL mnDataStartCol;
- SCROW mnDataStartRow;
- SCCOL mnTabEndCol;
- SCROW mnTabEndRow;
+ SCCOL mnTabStartCol;
+ SCROW mnTabStartRow;
+ SCCOL mnMemberStartCol;
+ SCROW mnMemberStartRow;
+
+ SCCOL mnDataStartCol;
+ SCROW mnDataStartRow;
+ SCCOL mnTabEndCol;
+ SCROW mnTabEndRow;
public:
- OutputImpl( ScDocument* pDoc, USHORT nTab,
- SCCOL nTabStartCol,
- SCROW nTabStartRow,
- SCCOL nMemberStartCol,
- SCROW nMemberStartRow,
- SCCOL nDataStartCol,
- SCROW nDataStartRow,
- SCCOL nTabEndCol,
+ OutputImpl( ScDocument* pDoc, USHORT nTab,
+ SCCOL nTabStartCol,
+ SCROW nTabStartRow,
+ SCCOL nMemberStartCol,
+ SCROW nMemberStartRow,
+ SCCOL nDataStartCol,
+ SCROW nDataStartRow,
+ SCCOL nTabEndCol,
SCROW nTabEndRow );
BOOL AddRow( SCROW nRow );
BOOL AddCol( SCCOL nCol );
-
+
void OutputDataArea();
void OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, BOOL bHori = FALSE );
-
+
};
-#endif
+#endif
diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx
index 86b53582d1d4..d45c3a85662f 100644
--- a/sc/source/core/data/segmenttree.cxx
+++ b/sc/source/core/data/segmenttree.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ typename ScFlatSegmentsImpl<_ValueType, _ExtValueType>::ValueType ScFlatSegments
}
template<typename _ValueType, typename _ExtValueType>
-typename ScFlatSegmentsImpl<_ValueType, _ExtValueType>::ExtValueType
+typename ScFlatSegmentsImpl<_ValueType, _ExtValueType>::ExtValueType
ScFlatSegmentsImpl<_ValueType, _ExtValueType>::getSumValue(SCCOLROW nPos1, SCCOLROW nPos2)
{
RangeData aData;
@@ -208,7 +208,7 @@ SCCOLROW ScFlatSegmentsImpl<_ValueType, _ExtValueType>::findLastNotOf(ValueType
{
SCCOLROW nPos = numeric_limits<SCCOLROW>::max(); // position not found.
typename fst_type::const_reverse_iterator itr = maSegments.rbegin(), itrEnd = maSegments.rend();
- // Note that when searching in reverse direction, we need to skip the first
+ // Note that when searching in reverse direction, we need to skip the first
// node, since the right-most leaf node does not store a valid value.
for (++itr; itr != itrEnd; ++itr)
{
@@ -300,7 +300,7 @@ bool ScFlatBoolRowSegments::ForwardIterator::getValue(SCROW nPos, bool& rVal)
ScFlatBoolRowSegments::RangeData aData;
if (!mrSegs.getRangeData(mnCurPos, aData))
return false;
-
+
mbCurValue = aData.mbValue;
mnLastPos = aData.mnRow2;
}
@@ -498,7 +498,7 @@ bool ScFlatUInt16RowSegments::ForwardIterator::getValue(SCROW nPos, sal_uInt16&
ScFlatUInt16RowSegments::RangeData aData;
if (!mrSegs.getRangeData(mnCurPos, aData))
return false;
-
+
mnCurValue = aData.mnValue;
mnLastPos = aData.mnRow2;
}
diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx
index e1875b5db15b..610a6ed8620c 100644
--- a/sc/source/core/data/sheetevents.cxx
+++ b/sc/source/core/data/sheetevents.cxx
@@ -131,7 +131,7 @@ const ScSheetEvents& ScSheetEvents::operator=(const ScSheetEvents& rOther)
if (rOther.mpScriptNames[nEvent])
mpScriptNames[nEvent] = new rtl::OUString(*rOther.mpScriptNames[nEvent]);
else
- mpScriptNames[nEvent] = NULL;
+ mpScriptNames[nEvent] = NULL;
}
return *this;
}
diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx
index 9e8d355e74fa..dd3a9cdf4d11 100644
--- a/sc/source/core/data/sortparam.cxx
+++ b/sc/source/core/data/sortparam.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScSortParam::ScSortParam( const ScSortParam& r ) :
{
for (USHORT i=0; i<MAXSORT; i++)
{
- bDoSort[i] = r.bDoSort[i];
- nField[i] = r.nField[i];
+ bDoSort[i] = r.bDoSort[i];
+ nField[i] = r.nField[i];
bAscending[i] = r.bAscending[i];
}
}
@@ -72,14 +72,14 @@ void ScSortParam::Clear()
nDestTab = 0;
nUserIndex = 0;
bHasHeader=bCaseSens=bUserDef = FALSE;
- bByRow=bIncludePattern=bInplace = TRUE;
+ bByRow=bIncludePattern=bInplace = TRUE;
aCollatorLocale = ::com::sun::star::lang::Locale();
aCollatorAlgorithm.Erase();
for (USHORT i=0; i<MAXSORT; i++)
{
- bDoSort[i] = FALSE;
- nField[i] = 0;
+ bDoSort[i] = FALSE;
+ nField[i] = 0;
bAscending[i] = TRUE;
}
}
@@ -88,27 +88,27 @@ void ScSortParam::Clear()
ScSortParam& ScSortParam::operator=( const ScSortParam& r )
{
- nCol1 = r.nCol1;
- nRow1 = r.nRow1;
- nCol2 = r.nCol2;
- nRow2 = r.nRow2;
- bHasHeader = r.bHasHeader;
- bCaseSens = r.bCaseSens;
- bByRow = r.bByRow;
- bUserDef = r.bUserDef;
- nUserIndex = r.nUserIndex;
- bIncludePattern = r.bIncludePattern;
- bInplace = r.bInplace;
- nDestTab = r.nDestTab;
- nDestCol = r.nDestCol;
- nDestRow = r.nDestRow;
- aCollatorLocale = r.aCollatorLocale;
- aCollatorAlgorithm = r.aCollatorAlgorithm;
+ nCol1 = r.nCol1;
+ nRow1 = r.nRow1;
+ nCol2 = r.nCol2;
+ nRow2 = r.nRow2;
+ bHasHeader = r.bHasHeader;
+ bCaseSens = r.bCaseSens;
+ bByRow = r.bByRow;
+ bUserDef = r.bUserDef;
+ nUserIndex = r.nUserIndex;
+ bIncludePattern = r.bIncludePattern;
+ bInplace = r.bInplace;
+ nDestTab = r.nDestTab;
+ nDestCol = r.nDestCol;
+ nDestRow = r.nDestRow;
+ aCollatorLocale = r.aCollatorLocale;
+ aCollatorAlgorithm = r.aCollatorAlgorithm;
for (USHORT i=0; i<MAXSORT; i++)
{
- bDoSort[i] = r.bDoSort[i];
- nField[i] = r.nField[i];
+ bDoSort[i] = r.bDoSort[i];
+ nField[i] = r.nField[i];
bAscending[i] = r.bAscending[i];
}
@@ -121,37 +121,37 @@ BOOL ScSortParam::operator==( const ScSortParam& rOther ) const
{
BOOL bEqual = FALSE;
// Anzahl der Sorts gleich?
- USHORT nLast = 0;
+ USHORT nLast = 0;
USHORT nOtherLast = 0;
while ( bDoSort[nLast++] && nLast < MAXSORT ) ;
while ( rOther.bDoSort[nOtherLast++] && nOtherLast < MAXSORT ) ;
nLast--;
nOtherLast--;
- if ( (nLast == nOtherLast)
- && (nCol1 == rOther.nCol1)
- && (nRow1 == rOther.nRow1)
- && (nCol2 == rOther.nCol2)
- && (nRow2 == rOther.nRow2)
- && (bHasHeader == rOther.bHasHeader)
- && (bByRow == rOther.bByRow)
- && (bCaseSens == rOther.bCaseSens)
- && (bUserDef == rOther.bUserDef)
- && (nUserIndex == rOther.nUserIndex)
+ if ( (nLast == nOtherLast)
+ && (nCol1 == rOther.nCol1)
+ && (nRow1 == rOther.nRow1)
+ && (nCol2 == rOther.nCol2)
+ && (nRow2 == rOther.nRow2)
+ && (bHasHeader == rOther.bHasHeader)
+ && (bByRow == rOther.bByRow)
+ && (bCaseSens == rOther.bCaseSens)
+ && (bUserDef == rOther.bUserDef)
+ && (nUserIndex == rOther.nUserIndex)
&& (bIncludePattern == rOther.bIncludePattern)
- && (bInplace == rOther.bInplace)
- && (nDestTab == rOther.nDestTab)
- && (nDestCol == rOther.nDestCol)
- && (nDestRow == rOther.nDestRow)
- && (aCollatorLocale.Language == rOther.aCollatorLocale.Language)
- && (aCollatorLocale.Country == rOther.aCollatorLocale.Country)
- && (aCollatorLocale.Variant == rOther.aCollatorLocale.Variant)
- && (aCollatorAlgorithm == rOther.aCollatorAlgorithm)
+ && (bInplace == rOther.bInplace)
+ && (nDestTab == rOther.nDestTab)
+ && (nDestCol == rOther.nDestCol)
+ && (nDestRow == rOther.nDestRow)
+ && (aCollatorLocale.Language == rOther.aCollatorLocale.Language)
+ && (aCollatorLocale.Country == rOther.aCollatorLocale.Country)
+ && (aCollatorLocale.Variant == rOther.aCollatorLocale.Variant)
+ && (aCollatorAlgorithm == rOther.aCollatorAlgorithm)
)
{
bEqual = TRUE;
for ( USHORT i=0; i<=nLast && bEqual; i++ )
{
- bEqual = (nField[i] == rOther.nField[i]) && (bAscending[i] == rOther.bAscending[i]);
+ bEqual = (nField[i] == rOther.nField[i]) && (bAscending[i] == rOther.bAscending[i]);
}
}
return bEqual;
@@ -170,21 +170,21 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld )
USHORT nNewCount = 0;
USHORT i;
- // zuerst die Gruppen aus den Teilergebnissen
+ // zuerst die Gruppen aus den Teilergebnissen
if (rSub.bDoSort)
for (i=0; i<MAXSUBTOTAL; i++)
if (rSub.bGroupActive[i])
{
if (nNewCount < MAXSORT)
{
- bDoSort[nNewCount] = TRUE;
- nField[nNewCount] = rSub.nField[i];
+ bDoSort[nNewCount] = TRUE;
+ nField[nNewCount] = rSub.nField[i];
bAscending[nNewCount] = rSub.bAscending;
++nNewCount;
}
}
- // dann dahinter die alten Einstellungen
+ // dann dahinter die alten Einstellungen
for (i=0; i<MAXSORT; i++)
if (rOld.bDoSort[i])
{
@@ -193,22 +193,22 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld )
for (USHORT j=0; j<nNewCount; j++)
if ( nField[j] == nThisField )
bDouble = TRUE;
- if (!bDouble) // ein Feld nicht zweimal eintragen
+ if (!bDouble) // ein Feld nicht zweimal eintragen
{
if (nNewCount < MAXSORT)
{
- bDoSort[nNewCount] = TRUE;
- nField[nNewCount] = nThisField;
+ bDoSort[nNewCount] = TRUE;
+ nField[nNewCount] = nThisField;
bAscending[nNewCount] = rOld.bAscending[i];
++nNewCount;
}
}
}
- for (i=nNewCount; i<MAXSORT; i++) // Rest loeschen
+ for (i=nNewCount; i<MAXSORT; i++) // Rest loeschen
{
- bDoSort[i] = FALSE;
- nField[i] = 0;
+ bDoSort[i] = FALSE;
+ nField[i] = 0;
bAscending[i] = TRUE;
}
}
@@ -228,8 +228,8 @@ ScSortParam::ScSortParam( const ScQueryParam& rParam, SCCOL nCol ) :
bAscending[0] = TRUE;
for (USHORT i=1; i<MAXSORT; i++)
{
- bDoSort[i] = FALSE;
- nField[i] = 0;
+ bDoSort[i] = FALSE;
+ nField[i] = 0;
bAscending[i] = TRUE;
}
}
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index d722856dc80a..863ff1c399f7 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
//========================================================================
ScStyleSheetPool::ScStyleSheetPool( SfxItemPool& rPoolP,
- ScDocument* pDocument )
+ ScDocument* pDocument )
: SfxStyleSheetPool( rPoolP ),
pActualStyleSheet( NULL ),
pDoc( pDocument ),
@@ -102,11 +102,11 @@ void ScStyleSheetPool::SetDocument( ScDocument* pDocument )
SfxStyleSheetBase& ScStyleSheetPool::Make( const String& rName,
SfxStyleFamily eFam, USHORT mask, USHORT nPos )
{
- // When updating styles from a template, Office 5.1 sometimes created
- // files with multiple default styles.
- // Create new styles in that case:
+ // When updating styles from a template, Office 5.1 sometimes created
+ // files with multiple default styles.
+ // Create new styles in that case:
- //! only when loading?
+ //! only when loading?
if ( rName.EqualsAscii(STRING_STANDARD) && Find( rName, eFam ) != NULL )
{
@@ -127,8 +127,8 @@ SfxStyleSheetBase& ScStyleSheetPool::Make( const String& rName,
//------------------------------------------------------------------------
SfxStyleSheetBase* __EXPORT ScStyleSheetPool::Create(
- const String& rName,
- SfxStyleFamily eFamily,
+ const String& rName,
+ SfxStyleFamily eFamily,
USHORT nMaskP )
{
ScStyleSheet* pSheet = new ScStyleSheet( rName, *this, eFamily, nMaskP );
@@ -165,7 +165,7 @@ void __EXPORT ScStyleSheetPool::Remove( SfxStyleSheetBase* pStyle )
void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool,
const String& rName, SfxStyleFamily eFamily )
{
- // this ist Dest-Pool
+ // this ist Dest-Pool
SfxStyleSheetBase* pStyleSheet = pSrcPool->Find( rName, eFamily );
if (pStyleSheet)
@@ -180,7 +180,7 @@ void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool,
const SfxPoolItem* pItem;
if ( eFamily == SFX_STYLE_FAMILY_PAGE )
{
- // Set-Items
+ // Set-Items
if ( rSourceSet.GetItemState( ATTR_PAGE_HEADERSET, FALSE, &pItem ) == SFX_ITEM_SET )
{
@@ -215,23 +215,23 @@ void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool,
//------------------------------------------------------------------------
//
-// Standard-Vorlagen
+// Standard-Vorlagen
//
//------------------------------------------------------------------------
-#define SCSTR(id) ScGlobal::GetRscString(id)
+#define SCSTR(id) ScGlobal::GetRscString(id)
void ScStyleSheetPool::CopyStdStylesFrom( ScStyleSheetPool* pSrcPool )
{
- // Default-Styles kopieren
-
- CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_STANDARD), SFX_STYLE_FAMILY_PARA );
- CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_RESULT), SFX_STYLE_FAMILY_PARA );
- CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_RESULT1), SFX_STYLE_FAMILY_PARA );
- CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_HEADLINE), SFX_STYLE_FAMILY_PARA );
- CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_HEADLINE1), SFX_STYLE_FAMILY_PARA );
- CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_STANDARD), SFX_STYLE_FAMILY_PAGE );
- CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_REPORT), SFX_STYLE_FAMILY_PAGE );
+ // Default-Styles kopieren
+
+ CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_STANDARD), SFX_STYLE_FAMILY_PARA );
+ CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_RESULT), SFX_STYLE_FAMILY_PARA );
+ CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_RESULT1), SFX_STYLE_FAMILY_PARA );
+ CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_HEADLINE), SFX_STYLE_FAMILY_PARA );
+ CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_HEADLINE1), SFX_STYLE_FAMILY_PARA );
+ CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_STANDARD), SFX_STYLE_FAMILY_PAGE );
+ CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_REPORT), SFX_STYLE_FAMILY_PAGE );
}
//------------------------------------------------------------------------
@@ -253,27 +253,27 @@ void lcl_CheckFont( SfxItemSet& rSet, LanguageType eLang, USHORT nFontType, USHO
void ScStyleSheetPool::CreateStandardStyles()
{
- // neue Eintraege auch bei CopyStdStylesFrom eintragen
-
- Color aColBlack ( COL_BLACK );
- Color aColGrey ( COL_LIGHTGRAY );
- String aStr;
- xub_StrLen nStrLen;
- String aHelpFile;//XXX JN welcher Text???
- //ULONG nNumFmt = 0L;
- SfxItemSet* pSet = NULL;
- SfxItemSet* pHFSet = NULL;
- SvxSetItem* pHFSetItem = NULL;
- ScEditEngineDefaulter* pEdEngine = new ScEditEngineDefaulter( EditEngine::CreatePool(), TRUE );
+ // neue Eintraege auch bei CopyStdStylesFrom eintragen
+
+ Color aColBlack ( COL_BLACK );
+ Color aColGrey ( COL_LIGHTGRAY );
+ String aStr;
+ xub_StrLen nStrLen;
+ String aHelpFile;//XXX JN welcher Text???
+ //ULONG nNumFmt = 0L;
+ SfxItemSet* pSet = NULL;
+ SfxItemSet* pHFSet = NULL;
+ SvxSetItem* pHFSetItem = NULL;
+ ScEditEngineDefaulter* pEdEngine = new ScEditEngineDefaulter( EditEngine::CreatePool(), TRUE );
pEdEngine->SetUpdateMode( FALSE );
- EditTextObject* pEmptyTxtObj = pEdEngine->CreateTextObject();
- EditTextObject* pTxtObj = NULL;
- ScPageHFItem* pHeaderItem = new ScPageHFItem( ATTR_PAGE_HEADERRIGHT );
- ScPageHFItem* pFooterItem = new ScPageHFItem( ATTR_PAGE_FOOTERRIGHT );
- ScStyleSheet* pSheet = NULL;
- SvxBorderLine aBorderLine ( &aColBlack, DEF_LINE_WIDTH_2 );
- SvxBoxItem aBoxItem ( ATTR_BORDER );
- SvxBoxInfoItem aBoxInfoItem ( ATTR_BORDER_INNER );
+ EditTextObject* pEmptyTxtObj = pEdEngine->CreateTextObject();
+ EditTextObject* pTxtObj = NULL;
+ ScPageHFItem* pHeaderItem = new ScPageHFItem( ATTR_PAGE_HEADERRIGHT );
+ ScPageHFItem* pFooterItem = new ScPageHFItem( ATTR_PAGE_FOOTERRIGHT );
+ ScStyleSheet* pSheet = NULL;
+ SvxBorderLine aBorderLine ( &aColBlack, DEF_LINE_WIDTH_2 );
+ SvxBoxItem aBoxItem ( ATTR_BORDER );
+ SvxBoxInfoItem aBoxInfoItem ( ATTR_BORDER_INNER );
String aStrStandard = ScGlobal::GetRscString(STR_STYLENAME_STANDARD);
@@ -287,18 +287,18 @@ void ScStyleSheetPool::CreateStandardStyles()
pSheet = (ScStyleSheet*) &Make( aStrStandard, SFX_STYLE_FAMILY_PARA, SCSTYLEBIT_STANDARD );
pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_STD );
- // if default fonts for the document's languages are different from the pool default,
- // put them into the default style
- // (not as pool defaults, because pool defaults can't be changed by the user)
- // the document languages must be set before creating the default styles!
+ // if default fonts for the document's languages are different from the pool default,
+ // put them into the default style
+ // (not as pool defaults, because pool defaults can't be changed by the user)
+ // the document languages must be set before creating the default styles!
pSet = &pSheet->GetItemSet();
LanguageType eLatin, eCjk, eCtl;
pDoc->GetLanguage( eLatin, eCjk, eCtl );
- // #108374# / #107782#: If the UI language is Korean, the default Latin font has to
- // be queried for Korean, too (the Latin language from the document can't be Korean).
- // This is the same logic as in SwDocShell::InitNew.
+ // #108374# / #107782#: If the UI language is Korean, the default Latin font has to
+ // be queried for Korean, too (the Latin language from the document can't be Korean).
+ // This is the same logic as in SwDocShell::InitNew.
LanguageType eUiLanguage = Application::GetSettings().GetUILanguage();
switch( eUiLanguage )
{
@@ -345,7 +345,7 @@ void ScStyleSheetPool::CreateStandardStyles()
// will now be done in GetItemSet();
// pSet = &pSheet->GetItemSet();
// nNumFmt = pDoc->GetFormatTable()->GetStandardFormat( NUMBERFORMAT_CURRENCY,
- // ScGlobal::eLnge );
+ // ScGlobal::eLnge );
// pSet->Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNumFmt ) );
//----------------
@@ -512,7 +512,7 @@ void ScStyleSheetPool::CreateStandardStyles()
//UNUSED2008-05 void ScStyleSheetPool::UpdateStdNames()
//UNUSED2008-05 {
//UNUSED2008-05 // Standard-Styles den richtigen Namen in der Programm-Sprache geben
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 String aHelpFile;
//UNUSED2008-05 sal_uInt32 nCount = aStyles.size();
//UNUSED2008-05 for (sal_uInt32 n=0; n<nCount; n++)
@@ -523,7 +523,7 @@ void ScStyleSheetPool::CreateStandardStyles()
//UNUSED2008-05 String aOldName = pStyle->GetName();
//UNUSED2008-05 ULONG nHelpId = pStyle->GetHelpId( aHelpFile );
//UNUSED2008-05 SfxStyleFamily eFam = pStyle->GetFamily();
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 BOOL bHelpKnown = TRUE;
//UNUSED2008-05 String aNewName;
//UNUSED2008-05 USHORT nNameId = 0;
@@ -544,13 +544,13 @@ void ScStyleSheetPool::CreateStandardStyles()
//UNUSED2008-05 {
//UNUSED2008-05 if ( nNameId )
//UNUSED2008-05 aNewName = SCSTR( nNameId );
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 if ( aNewName.Len() && aNewName != aOldName && !Find( aNewName, eFam ) )
//UNUSED2008-05 {
//UNUSED2008-05 DBG_TRACE( "Renaming style..." );
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 pStyle->SetName( aNewName ); // setzt auch Parents um
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 // Styles in Patterns sind schon auf Pointer umgesetzt
//UNUSED2008-05 if (eFam == SFX_STYLE_FAMILY_PAGE)
//UNUSED2008-05 {
@@ -565,12 +565,12 @@ void ScStyleSheetPool::CreateStandardStyles()
//UNUSED2008-05 else
//UNUSED2008-05 {
//UNUSED2008-05 // wrong or no HelpId -> set new HelpId
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 // no assertion for wrong HelpIds because this happens
//UNUSED2008-05 // with old files (#67218#) or with old files that were
//UNUSED2008-05 // saved again with a new version in a different language
//UNUSED2008-05 // (so SrcVersion doesn't help)
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 USHORT nNewId = 0;
//UNUSED2008-05 if ( eFam == SFX_STYLE_FAMILY_PARA )
//UNUSED2008-05 {
@@ -592,7 +592,7 @@ void ScStyleSheetPool::CreateStandardStyles()
//UNUSED2008-05 else if ( aOldName == SCSTR( STR_STYLENAME_REPORT ) )
//UNUSED2008-05 nNewId = HID_SC_SHEET_PAGE_REP;
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 if ( nNewId ) // new ID found from name -> set ID
//UNUSED2008-05 {
//UNUSED2008-05 pStyle->SetHelpId( aHelpFile, nNewId );
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index a3319eafd3fd..a747307faac2 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "attrib.hxx"
-#include <vcl/svapp.hxx> // GetSettings()
+#include <vcl/svapp.hxx> // GetSettings()
#include "globstr.hrc"
#include "sc.hrc"
@@ -59,14 +59,14 @@
TYPEINIT1(ScStyleSheet, SfxStyleSheet);
-#define TWO_CM 1134
-#define HFDIST_CM 142
+#define TWO_CM 1134
+#define HFDIST_CM 142
//========================================================================
-ScStyleSheet::ScStyleSheet( const String& rName,
+ScStyleSheet::ScStyleSheet( const String& rName,
ScStyleSheetPool& rPoolP,
- SfxStyleFamily eFamily,
+ SfxStyleFamily eFamily,
USHORT nMaskP )
: SfxStyleSheet ( rName, rPoolP, eFamily, nMaskP )
@@ -77,7 +77,7 @@ ScStyleSheet::ScStyleSheet( const String& rName,
//------------------------------------------------------------------------
ScStyleSheet::ScStyleSheet( const ScStyleSheet& rStyle )
- : SfxStyleSheet ( rStyle )
+ : SfxStyleSheet ( rStyle )
, eUsage( UNKNOWN )
{
}
@@ -103,8 +103,8 @@ BOOL __EXPORT ScStyleSheet::HasParentSupport () const
switch ( GetFamily() )
{
- case SFX_STYLE_FAMILY_PARA: bHasParentSupport = TRUE; break;
- case SFX_STYLE_FAMILY_PAGE: bHasParentSupport = FALSE; break;
+ case SFX_STYLE_FAMILY_PARA: bHasParentSupport = TRUE; break;
+ case SFX_STYLE_FAMILY_PAGE: bHasParentSupport = FALSE; break;
default:
{
// added to avoid warnings
@@ -165,40 +165,40 @@ SfxItemSet& __EXPORT ScStyleSheet::GetItemSet()
ATTR_USERDEF, ATTR_USERDEF,
0 );
- // Wenn gerade geladen wird, wird auch der Set hinterher aus der Datei
- // gefuellt, es brauchen also keine Defaults gesetzt zu werden.
- // GetPrinter wuerde dann auch einen neuen Printer anlegen, weil der
- // gespeicherte Printer noch nicht geladen ist!
+ // Wenn gerade geladen wird, wird auch der Set hinterher aus der Datei
+ // gefuellt, es brauchen also keine Defaults gesetzt zu werden.
+ // GetPrinter wuerde dann auch einen neuen Printer anlegen, weil der
+ // gespeicherte Printer noch nicht geladen ist!
ScDocument* pDoc = ((ScStyleSheetPool&)GetPool()).GetDocument();
if ( pDoc )
{
// Setzen von sinnvollen Default-Werten:
- SvxPageItem aPageItem( ATTR_PAGE );
- SvxSizeItem aPaperSizeItem( ATTR_PAGE_SIZE, SvxPaperInfo::GetDefaultPaperSize() );
+ SvxPageItem aPageItem( ATTR_PAGE );
+ SvxSizeItem aPaperSizeItem( ATTR_PAGE_SIZE, SvxPaperInfo::GetDefaultPaperSize() );
- SvxSetItem aHFSetItem(
+ SvxSetItem aHFSetItem(
(const SvxSetItem&)
rItemPool.GetDefaultItem(ATTR_PAGE_HEADERSET) );
- SfxItemSet& rHFSet = aHFSetItem.GetItemSet();
- SvxSizeItem aHFSizeItem( // 0,5 cm + Abstand
+ SfxItemSet& rHFSet = aHFSetItem.GetItemSet();
+ SvxSizeItem aHFSizeItem( // 0,5 cm + Abstand
ATTR_PAGE_SIZE,
Size( 0, (long)( 500 / HMM_PER_TWIPS ) + HFDIST_CM ) );
- SvxULSpaceItem aHFDistItem ( HFDIST_CM,// nUp
+ SvxULSpaceItem aHFDistItem ( HFDIST_CM,// nUp
HFDIST_CM,// nLow
ATTR_ULSPACE );
- SvxLRSpaceItem aLRSpaceItem( TWO_CM, // nLeft
- TWO_CM, // nRight
- TWO_CM, // nTLeft
- 0, // nFirstLineOffset
+ SvxLRSpaceItem aLRSpaceItem( TWO_CM, // nLeft
+ TWO_CM, // nRight
+ TWO_CM, // nTLeft
+ 0, // nFirstLineOffset
ATTR_LRSPACE );
- SvxULSpaceItem aULSpaceItem( TWO_CM, // nUp
- TWO_CM, // nLow
+ SvxULSpaceItem aULSpaceItem( TWO_CM, // nUp
+ TWO_CM, // nLow
ATTR_ULSPACE );
- SvxBoxInfoItem aBoxInfoItem( ATTR_BORDER_INNER );
+ SvxBoxInfoItem aBoxInfoItem( ATTR_BORDER_INNER );
aBoxInfoItem.SetTable( FALSE );
aBoxInfoItem.SetDist( TRUE );
@@ -217,10 +217,10 @@ SfxItemSet& __EXPORT ScStyleSheet::GetItemSet()
pSet->Put( aBoxInfoItem ); // PoolDefault wg. Formatvorlagen
// nicht ueberschreiben!
- // Writing direction: not as pool default because the default for cells
- // must remain FRMDIR_ENVIRONMENT, and each page style's setting is
- // supposed to be saved in the file format.
- // The page default depends on the system language.
+ // Writing direction: not as pool default because the default for cells
+ // must remain FRMDIR_ENVIRONMENT, and each page style's setting is
+ // supposed to be saved in the file format.
+ // The page default depends on the system language.
SvxFrameDirection eDirection = ScGlobal::IsSystemRTL() ?
FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP;
pSet->Put( SvxFrameDirectionItem( eDirection, ATTR_WRITINGDIR ), ATTR_WRITINGDIR );
@@ -292,8 +292,8 @@ void __EXPORT ScStyleSheet::Notify( SfxBroadcaster&, const SfxHint& rHint )
//------------------------------------------------------------------------
-// #66123# schmutzige Tricks, um die Standard-Vorlage immer als "Standard" zu speichern,
-// obwohl der fuer den Benutzer sichtbare Name uebersetzt ist:
+// #66123# schmutzige Tricks, um die Standard-Vorlage immer als "Standard" zu speichern,
+// obwohl der fuer den Benutzer sichtbare Name uebersetzt ist:
const String& ScStyleSheet::GetName() const
{
@@ -325,13 +325,13 @@ const String& ScStyleSheet::GetFollow() const
return rBase;
}
-// Verhindern, dass ein Style "Standard" angelegt wird, wenn das nicht der
-// Standard-Name ist, weil sonst beim Speichern zwei Styles denselben Namen haetten
-// (Beim Laden wird der Style direkt per Make mit dem Namen erzeugt, so dass diese
-// Abfrage dann nicht gilt)
-//! Wenn irgendwann aus dem Laden SetName aufgerufen wird, muss fuer das Laden ein
-//! Flag gesetzt und abgefragt werden.
-//! Die ganze Abfrage muss raus, wenn fuer eine neue Datei-Version die Namens-Umsetzung wegfaellt.
+// Verhindern, dass ein Style "Standard" angelegt wird, wenn das nicht der
+// Standard-Name ist, weil sonst beim Speichern zwei Styles denselben Namen haetten
+// (Beim Laden wird der Style direkt per Make mit dem Namen erzeugt, so dass diese
+// Abfrage dann nicht gilt)
+//! Wenn irgendwann aus dem Laden SetName aufgerufen wird, muss fuer das Laden ein
+//! Flag gesetzt und abgefragt werden.
+//! Die ganze Abfrage muss raus, wenn fuer eine neue Datei-Version die Namens-Umsetzung wegfaellt.
BOOL ScStyleSheet::SetName( const String& rNew )
{
diff --git a/sc/source/core/data/tabbgcolor.cxx b/sc/source/core/data/tabbgcolor.cxx
index a3d9eec16d99..5697227b7b1f 100644
--- a/sc/source/core/data/tabbgcolor.cxx
+++ b/sc/source/core/data/tabbgcolor.cxx
@@ -38,25 +38,25 @@
#include "tabbgcolor.hxx"
bool ScUndoTabColorInfo::IsDefaultOldTabBgColor() const
-{
- return maOldTabBgColor == Color(COL_AUTO);
+{
+ return maOldTabBgColor == Color(COL_AUTO);
}
-bool ScUndoTabColorInfo::IsDefaultNewTabBgColor() const
-{
- return maOldTabBgColor == Color(COL_AUTO);
+bool ScUndoTabColorInfo::IsDefaultNewTabBgColor() const
+{
+ return maOldTabBgColor == Color(COL_AUTO);
}
ScUndoTabColorInfo::ScUndoTabColorInfo(SCTAB nTab) :
- mnTabId(nTab),
- maOldTabBgColor(COL_AUTO),
+ mnTabId(nTab),
+ maOldTabBgColor(COL_AUTO),
maNewTabBgColor(COL_AUTO)
{
}
ScUndoTabColorInfo::ScUndoTabColorInfo(const ScUndoTabColorInfo& r) :
- mnTabId(r.mnTabId),
- maOldTabBgColor(r.maOldTabBgColor),
+ mnTabId(r.mnTabId),
+ maOldTabBgColor(r.maOldTabBgColor),
maNewTabBgColor(r.maNewTabBgColor)
{
}
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index baaabd3a8c8f..b6788ebae6d3 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "refupdat.hxx"
#include "markdata.hxx"
#include "progress.hxx"
-#include "hints.hxx" // fuer Paint-Broadcast
+#include "hints.hxx" // fuer Paint-Broadcast
#include "prnsave.hxx"
#include "tabprotection.hxx"
#include "sheetevents.hxx"
@@ -120,8 +120,8 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
if ( pDocument->IsDocVisible() )
{
- // when a sheet is added to a visible document,
- // initialize its RTL flag from the system locale
+ // when a sheet is added to a visible document,
+ // initialize its RTL flag from the system locale
bLayoutRTL = ScGlobal::IsSystemRTL();
}
@@ -131,7 +131,7 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
if ( pDrawLayer->ScAddPage( nTab ) ) // FALSE (not inserted) during Undo
{
pDrawLayer->ScRenamePage( nTab, aName );
- 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( static_cast<sal_uInt16>(nTab), Size( nx, ny ), false );
}
@@ -145,9 +145,9 @@ ScTable::~ScTable()
{
if (!pDocument->IsInDtorClear())
{
- // nicht im dtor die Pages in der falschen Reihenfolge loeschen
- // (nTab stimmt dann als Page-Number nicht!)
- // In ScDocument::Clear wird hinterher per Clear am Draw Layer alles geloescht.
+ // nicht im dtor die Pages in der falschen Reihenfolge loeschen
+ // (nTab stimmt dann als Page-Number nicht!)
+ // In ScDocument::Clear wird hinterher per Clear am Draw Layer alles geloescht.
ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
if (pDrawLayer)
@@ -242,11 +242,11 @@ void ScTable::SetLink( BYTE nMode,
const String& rTab, ULONG nRefreshDelay )
{
nLinkMode = nMode;
- aLinkDoc = rDoc; // Datei
- aLinkFlt = rFlt; // Filter
- aLinkOpt = rOpt; // Filter-Optionen
- aLinkTab = rTab; // Tabellenname in Quelldatei
- nLinkRefreshDelay = nRefreshDelay; // refresh delay in seconds, 0==off
+ aLinkDoc = rDoc; // Datei
+ aLinkFlt = rFlt; // Filter
+ aLinkOpt = rOpt; // Filter-Optionen
+ aLinkTab = rTab; // Tabellenname in Quelldatei
+ nLinkRefreshDelay = nRefreshDelay; // refresh delay in seconds, 0==off
if (IsStreamValid())
SetStreamValid(FALSE);
@@ -269,7 +269,7 @@ long ScTable::GetNeededSize( SCCOL nCol, SCROW nRow,
BOOL bWidth, BOOL bTotalSize )
{
ScNeededSizeOptions aOptions;
- aOptions.bSkipMerged = FALSE; // zusammengefasste mitzaehlen
+ aOptions.bSkipMerged = FALSE; // zusammengefasste mitzaehlen
aOptions.bTotalSize = bTotalSize;
return aCol[nCol].GetNeededSize
@@ -302,14 +302,14 @@ BOOL ScTable::SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT nExtra,
USHORT* pHeight = new USHORT[nCount]; // Twips !
memset( pHeight, 0, sizeof(USHORT) * nCount );
- // zuerst einmal ueber den ganzen Bereich
- // (mit der letzten Spalte in der Hoffnung, dass die am ehesten noch auf
- // Standard formatiert ist)
+ // zuerst einmal ueber den ganzen Bereich
+ // (mit der letzten Spalte in der Hoffnung, dass die am ehesten noch auf
+ // Standard formatiert ist)
aCol[MAXCOL].GetOptimalHeight(
nStartRow, nEndRow, pHeight, pDev, nPPTX, nPPTY, rZoomX, rZoomY, bForce, 0, 0 );
- // daraus Standardhoehe suchen, die im unteren Bereich gilt
+ // daraus Standardhoehe suchen, die im unteren Bereich gilt
USHORT nMinHeight = pHeight[nCount-1];
SCSIZE nPos = nCount-1;
@@ -318,7 +318,7 @@ BOOL ScTable::SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT nExtra,
SCROW nMinStart = nStartRow + nPos;
ULONG nWeightedCount = 0;
- for (SCCOL nCol=0; nCol<MAXCOL; nCol++) // MAXCOL schon oben
+ for (SCCOL nCol=0; nCol<MAXCOL; nCol++) // MAXCOL schon oben
{
aCol[nCol].GetOptimalHeight(
nStartRow, nEndRow, pHeight, pDev, nPPTX, nPPTY, rZoomX, rZoomY, bForce,
@@ -327,7 +327,7 @@ BOOL ScTable::SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT nExtra,
if (pProgress)
{
ULONG nWeight = aCol[nCol].GetWeightedCount();
- if (nWeight) // nochmal denselben Status muss auch nicht sein
+ if (nWeight) // nochmal denselben Status muss auch nicht sein
{
nWeightedCount += nWeight;
pProgress->SetState( nWeightedCount + nProgressStart );
@@ -402,7 +402,7 @@ BOOL ScTable::GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const
SCCOL nMaxX = 0;
SCROW nMaxY = 0;
for (SCCOL i=0; i<=MAXCOL; i++)
- if (!aCol[i].IsEmptyVisData(TRUE)) // TRUE = Notizen zaehlen auch
+ if (!aCol[i].IsEmptyVisData(TRUE)) // TRUE = Notizen zaehlen auch
{
bFound = TRUE;
nMaxX = i;
@@ -418,7 +418,7 @@ BOOL ScTable::GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const
BOOL ScTable::GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const
{
- BOOL bRet = TRUE; //! merken?
+ BOOL bRet = TRUE; //! merken?
if (!bTableAreaValid)
{
bRet = GetPrintArea( ((ScTable*)this)->nTableAreaX,
@@ -430,7 +430,7 @@ BOOL ScTable::GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const
return bRet;
}
-/* vorher:
+/* vorher:
BOOL bFound = FALSE;
SCCOL nMaxX = 0;
@@ -459,7 +459,7 @@ BOOL ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes ) const
SCROW nMaxY = 0;
SCCOL i;
- for (i=0; i<=MAXCOL; i++) // Daten testen
+ for (i=0; i<=MAXCOL; i++) // Daten testen
if (!aCol[i].IsEmptyVisData(bNotes))
{
bFound = TRUE;
@@ -472,7 +472,7 @@ BOOL ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes ) const
SCCOL nMaxDataX = nMaxX;
- for (i=0; i<=MAXCOL; i++) // Attribute testen
+ for (i=0; i<=MAXCOL; i++) // Attribute testen
{
SCROW nLastRow;
if (aCol[i].GetLastVisibleAttr( nLastRow ))
@@ -484,7 +484,7 @@ BOOL ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes ) const
}
}
- if (nMaxX == MAXCOL) // Attribute rechts weglassen
+ if (nMaxX == MAXCOL) // Attribute rechts weglassen
{
--nMaxX;
while ( nMaxX>0 && aCol[nMaxX].IsVisibleAttrEqual(aCol[nMaxX+1]) )
@@ -530,7 +530,7 @@ BOOL ScTable::GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
SCCOL nMaxX = 0;
SCCOL i;
- for (i=0; i<=MAXCOL; i++) // Attribute testen
+ for (i=0; i<=MAXCOL; i++) // Attribute testen
{
if (aCol[i].HasVisibleAttrIn( nStartRow, nEndRow ))
{
@@ -539,16 +539,16 @@ BOOL ScTable::GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
}
}
- if (nMaxX == MAXCOL) // Attribute rechts weglassen
+ if (nMaxX == MAXCOL) // Attribute rechts weglassen
{
--nMaxX;
while ( nMaxX>0 && aCol[nMaxX].IsVisibleAttrEqual(aCol[nMaxX+1], nStartRow, nEndRow) )
--nMaxX;
}
- for (i=0; i<=MAXCOL; i++) // Daten testen
+ for (i=0; i<=MAXCOL; i++) // Daten testen
{
- if (!aCol[i].IsEmptyBlock( nStartRow, nEndRow )) //! bNotes ??????
+ if (!aCol[i].IsEmptyBlock( nStartRow, nEndRow )) //! bNotes ??????
{
bFound = TRUE;
if (i>nMaxX)
@@ -567,7 +567,7 @@ BOOL ScTable::GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
SCROW nMaxY = 0;
SCCOL i;
- for (i=nStartCol; i<=nEndCol; i++) // Attribute testen
+ for (i=nStartCol; i<=nEndCol; i++) // Attribute testen
{
SCROW nLastRow;
if (aCol[i].GetLastVisibleAttr( nLastRow ))
@@ -578,7 +578,7 @@ BOOL ScTable::GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
}
}
- for (i=nStartCol; i<=nEndCol; i++) // Daten testen
+ for (i=nStartCol; i<=nEndCol; i++) // Daten testen
if (!aCol[i].IsEmptyVisData(bNotes))
{
bFound = TRUE;
@@ -598,7 +598,7 @@ BOOL ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
SCROW nMinY = MAXROW;
SCCOL i;
- for (i=0; i<=MAXCOL; i++) // Attribute testen
+ for (i=0; i<=MAXCOL; i++) // Attribute testen
{
SCROW nFirstRow;
if (aCol[i].GetFirstVisibleAttr( nFirstRow ))
@@ -611,9 +611,9 @@ BOOL ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
}
}
- if (nMinX == 0) // Attribute links weglassen
+ if (nMinX == 0) // Attribute links weglassen
{
- if ( aCol[0].IsVisibleAttrEqual(aCol[1]) ) // keine einzelnen
+ if ( aCol[0].IsVisibleAttrEqual(aCol[1]) ) // keine einzelnen
{
++nMinX;
while ( nMinX<MAXCOL && aCol[nMinX].IsVisibleAttrEqual(aCol[nMinX-1]) )
@@ -622,7 +622,7 @@ BOOL ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
}
BOOL bDatFound = FALSE;
- for (i=0; i<=MAXCOL; i++) // Daten testen
+ for (i=0; i<=MAXCOL; i++) // Daten testen
if (!aCol[i].IsEmptyVisData(TRUE))
{
if (!bDatFound && i<nMinX)
@@ -924,11 +924,11 @@ BOOL ScTable::ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark,
GetAttr(nCol,nRow,ATTR_PROTECTION))->GetProtection())
return FALSE;
- if (bMarked || bUnprotected) //! auch sonst ???
+ if (bMarked || bUnprotected) //! auch sonst ???
{
- // #53697# ausgeblendete muessen uebersprungen werden, weil der Cursor sonst
- // auf der naechsten Zelle landet, auch wenn die geschuetzt/nicht markiert ist.
- //! per Extra-Parameter steuern, nur fuer Cursor-Bewegung ???
+ // #53697# ausgeblendete muessen uebersprungen werden, weil der Cursor sonst
+ // auf der naechsten Zelle landet, auch wenn die geschuetzt/nicht markiert ist.
+ //! per Extra-Parameter steuern, nur fuer Cursor-Bewegung ???
if (RowHidden(nRow))
return FALSE;
@@ -943,7 +943,7 @@ BOOL ScTable::ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark,
void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark )
{
- if (bUnprotected && !IsProtected()) // Tabelle ueberhaupt geschuetzt?
+ if (bUnprotected && !IsProtected()) // Tabelle ueberhaupt geschuetzt?
bUnprotected = FALSE;
USHORT nWrap = 0;
@@ -960,10 +960,10 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
{
BOOL bUp = ( nMovY < 0 );
nRow = rMark.GetNextMarked( nCol, nRow, bUp );
- while ( VALIDROW(nRow) &&
+ while ( VALIDROW(nRow) &&
(RowHidden(nRow) || pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
{
- // #53697# ausgeblendete ueberspringen (s.o.)
+ // #53697# ausgeblendete ueberspringen (s.o.)
nRow += nMovY;
nRow = rMark.GetNextMarked( nCol, nRow, bUp );
}
@@ -972,7 +972,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
{
nCol = sal::static_int_cast<SCsCOL>( nCol + static_cast<SCsCOL>(nMovY) );
while ( VALIDCOL(nCol) && ColHidden(nCol) )
- nCol = sal::static_int_cast<SCsCOL>( nCol + static_cast<SCsCOL>(nMovY) ); // #53697# skip hidden rows (see above)
+ nCol = sal::static_int_cast<SCsCOL>( nCol + static_cast<SCsCOL>(nMovY) ); // #53697# skip hidden rows (see above)
if (nCol < 0)
{
nCol = MAXCOL;
@@ -990,10 +990,10 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
else if (nRow > MAXROW)
nRow = 0;
nRow = rMark.GetNextMarked( nCol, nRow, bUp );
- while ( VALIDROW(nRow) &&
+ while ( VALIDROW(nRow) &&
(RowHidden(nRow) || pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
{
- // #53697# ausgeblendete ueberspringen (s.o.)
+ // #53697# ausgeblendete ueberspringen (s.o.)
nRow += nMovY;
nRow = rMark.GetNextMarked( nCol, nRow, bUp );
}
@@ -1023,7 +1023,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
SCsROW* pNextRows = new SCsROW[MAXCOL+1];
SCCOL i;
- if ( nMovX > 0 ) // vorwaerts
+ if ( nMovX > 0 ) // vorwaerts
{
for (i=0; i<=MAXCOL; i++)
pNextRows[i] = (i<nCol) ? (nRow+1) : nRow;
@@ -1038,7 +1038,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
SCsROW nMinRow = MAXROW+1;
for (i=0; i<=MAXCOL; i++)
- if (pNextRows[i] < nMinRow) // bei gleichen den linken
+ if (pNextRows[i] < nMinRow) // bei gleichen den linken
{
nMinRow = pNextRows[i];
nCol = i;
@@ -1047,16 +1047,16 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
if ( nRow > MAXROW )
{
- if (++nWrap >= 2) break; // ungueltigen Wert behalten
+ if (++nWrap >= 2) break; // ungueltigen Wert behalten
nCol = 0;
nRow = 0;
for (i=0; i<=MAXCOL; i++)
- pNextRows[i] = 0; // alles ganz von vorne
+ pNextRows[i] = 0; // alles ganz von vorne
}
}
while ( !ValidNextPos(nCol, nRow, rMark, bMarked, bUnprotected) );
}
- else // rueckwaerts
+ else // rueckwaerts
{
for (i=0; i<=MAXCOL; i++)
pNextRows[i] = (i>nCol) ? (nRow-1) : nRow;
@@ -1071,7 +1071,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
SCsROW nMaxRow = -1;
for (i=0; i<=MAXCOL; i++)
- if (pNextRows[i] >= nMaxRow) // bei gleichen den rechten
+ if (pNextRows[i] >= nMaxRow) // bei gleichen den rechten
{
nMaxRow = pNextRows[i];
nCol = i;
@@ -1080,11 +1080,11 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
if ( nRow < 0 )
{
- if (++nWrap >= 2) break; // ungueltigen Wert behalten
+ if (++nWrap >= 2) break; // ungueltigen Wert behalten
nCol = MAXCOL;
nRow = MAXROW;
for (i=0; i<=MAXCOL; i++)
- pNextRows[i] = MAXROW; // alles ganz von vorne
+ pNextRows[i] = MAXROW; // alles ganz von vorne
}
}
while ( !ValidNextPos(nCol, nRow, rMark, bMarked, bUnprotected) );
@@ -1094,9 +1094,9 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
}
}
- // ungueltige Werte kommen z.b. bei Tab heraus,
- // wenn nicht markiert und nicht geschuetzt ist (linker / rechter Rand),
- // dann Werte unveraendert lassen
+ // ungueltige Werte kommen z.b. bei Tab heraus,
+ // wenn nicht markiert und nicht geschuetzt ist (linker / rechter Rand),
+ // dann Werte unveraendert lassen
if (VALIDCOLROW(nCol,nRow))
{
@@ -1112,7 +1112,7 @@ BOOL ScTable::GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMa
if ( !pMarkArray )
return FALSE;
- ++rRow; // naechste Zelle ist gesucht
+ ++rRow; // naechste Zelle ist gesucht
while ( rCol <= MAXCOL )
{
@@ -1131,33 +1131,33 @@ BOOL ScTable::GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMa
if ( pCell && pCell->GetCellType() != CELLTYPE_NOTE )
{
rRow = nCellRow;
- return TRUE; // Zelle gefunden
+ return TRUE; // Zelle gefunden
}
}
- rRow = nEnd + 1; // naechsten markierten Bereich suchen
+ rRow = nEnd + 1; // naechsten markierten Bereich suchen
}
else
- rRow = MAXROW + 1; // Ende der Spalte
+ rRow = MAXROW + 1; // Ende der Spalte
}
rRow = 0;
- ++rCol; // naechste Spalte testen
+ ++rCol; // naechste Spalte testen
}
- return FALSE; // alle Spalten durch
+ return FALSE; // alle Spalten durch
}
void ScTable::UpdateDrawRef( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
SCsCOL nDx, SCsROW nDy, SCsTAB nDz, bool bUpdateNoteCaptionPos )
{
- if ( nTab >= nTab1 && nTab <= nTab2 && nDz == 0 ) // only within the table
+ if ( nTab >= nTab1 && nTab <= nTab2 && nDz == 0 ) // only within the table
{
InitializeNoteCaptions();
ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
if ( eUpdateRefMode != URM_COPY && pDrawLayer )
{
if ( eUpdateRefMode == URM_MOVE )
- { // source range
+ { // source range
nCol1 = sal::static_int_cast<SCCOL>( nCol1 - nDx );
nRow1 = sal::static_int_cast<SCROW>( nRow1 - nDy );
nCol2 = sal::static_int_cast<SCCOL>( nCol2 - nDx );
@@ -1192,7 +1192,7 @@ void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW
if ( bIncludeDraw )
UpdateDrawRef( eUpdateRefMode, nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, nDx, nDy, nDz, bUpdateNoteCaptionPos );
- if ( nTab >= nTab1 && nTab <= nTab2 && nDz == 0 ) // print ranges: only within the table
+ if ( nTab >= nTab1 && nTab <= nTab2 && nDz == 0 ) // print ranges: only within the table
{
SCTAB nSTab = nTab;
SCTAB nETab = nTab;
@@ -1235,7 +1235,7 @@ void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW
{
*pRepeatColRange = ScRange( nSCol, nSRow, 0, nECol, nERow, 0 );
bRecalcPages = TRUE;
- nRepeatStartX = nSCol; // fuer UpdatePageBreaks
+ nRepeatStartX = nSCol; // fuer UpdatePageBreaks
nRepeatEndX = nECol;
}
}
@@ -1255,12 +1255,12 @@ void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW
{
*pRepeatRowRange = ScRange( nSCol, nSRow, 0, nECol, nERow, 0 );
bRecalcPages = TRUE;
- nRepeatStartY = nSRow; // fuer UpdatePageBreaks
+ nRepeatStartY = nSRow; // fuer UpdatePageBreaks
nRepeatEndY = nERow;
}
}
- // updating print ranges is not necessary with multiple print ranges
+ // updating print ranges is not necessary with multiple print ranges
if ( bRecalcPages && GetPrintRangeCount() <= 1 )
{
UpdatePageBreaks(NULL);
@@ -1525,14 +1525,14 @@ void ScTable::DoColResize( SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd )
}
#define SET_PRINTRANGE( p1, p2 ) \
- if ( (p2) ) \
- { \
- if ( (p1) ) \
- *(p1) = *(p2); \
- else \
- (p1) = new ScRange( *(p2) ); \
- } \
- else \
+ if ( (p2) ) \
+ { \
+ if ( (p1) ) \
+ *(p1) = *(p2); \
+ else \
+ (p1) = new ScRange( *(p2) ); \
+ } \
+ else \
DELETEZ( (p1) )
void ScTable::SetRepeatColRange( const ScRange* pNew )
@@ -1612,7 +1612,7 @@ ScTable::VisibleDataCellIterator::VisibleDataCellIterator(ScFlatBoolRowSegments&
mrRowSegs(rRowSegs),
mrColumn(rColumn),
mpCell(NULL),
- mnCurRow(ROW_NOT_FOUND),
+ mnCurRow(ROW_NOT_FOUND),
mnUBound(ROW_NOT_FOUND)
{
}
@@ -1624,20 +1624,20 @@ ScTable::VisibleDataCellIterator::~VisibleDataCellIterator()
ScBaseCell* ScTable::VisibleDataCellIterator::reset(SCROW nRow)
{
if (nRow > MAXROW)
- {
+ {
mnCurRow = ROW_NOT_FOUND;
return NULL;
}
ScFlatBoolRowSegments::RangeData aData;
if (!mrRowSegs.getRangeData(nRow, aData))
- {
+ {
mnCurRow = ROW_NOT_FOUND;
return NULL;
}
if (!aData.mbValue)
- {
+ {
// specified row is visible. Take it.
mnCurRow = nRow;
mnUBound = aData.mnRow2;
@@ -1649,7 +1649,7 @@ ScBaseCell* ScTable::VisibleDataCellIterator::reset(SCROW nRow)
mnCurRow = aData.mnRow2 + 1;
mnUBound = mnCurRow; // get range data on the next iteration.
if (mnCurRow > MAXROW)
- {
+ {
// Make sure the row doesn't exceed our current limit.
mnCurRow = ROW_NOT_FOUND;
return NULL;
@@ -1699,7 +1699,7 @@ ScBaseCell* ScTable::VisibleDataCellIterator::next()
return mpCell;
}
mnCurRow = ROW_NOT_FOUND;
- return NULL;
+ return NULL;
}
SCROW ScTable::VisibleDataCellIterator::getRow() const
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index d54e16b8cbd7..aeb2a19b05e6 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 "olinetab.hxx"
#include "rechead.hxx"
#include "stlpool.hxx"
-#include "attarray.hxx" // Iterator
+#include "attarray.hxx" // Iterator
#include "markdata.hxx"
#include "progress.hxx"
#include "dociter.hxx"
@@ -88,7 +88,7 @@ BOOL ScTable::SetOutlineTable( const ScOutlineTable* pNewOutline )
else
pOutlineTable = NULL;
- return ( nNewSizeX != nOldSizeX || nNewSizeY != nOldSizeY ); // Groesse geaendert ?
+ return ( nNewSizeX != nOldSizeX || nNewSizeY != nOldSizeY ); // Groesse geaendert ?
}
@@ -292,7 +292,7 @@ void ScTable::InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE
aCol[MAXCOL - nSize - i].MoveTo(nStartRow, nEndRow, aCol[MAXCOL - i]);
}
- if (nStartCol>0) // copy old attributes
+ if (nStartCol>0) // copy old attributes
{
USHORT nWhichArray[2];
nWhichArray[0] = ATTR_MERGE;
@@ -379,7 +379,7 @@ void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USH
if (nRow2 > MAXROW) nRow2 = MAXROW;
if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2))
{
-// IncRecalcLevel();
+// IncRecalcLevel();
{ // scope for bulk broadcast
ScBulkBroadcast aBulkBroadcast( pDocument->GetBASM());
@@ -398,7 +398,7 @@ void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USH
ApplyPatternArea( nCol1, nRow1, nCol2, nRow2, aPattern );
}
-// DecRecalcLevel();
+// DecRecalcLevel();
}
}
@@ -426,20 +426,20 @@ void ScTable::DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark )
}
-// pTable = Clipboard
+// pTable = Clipboard
void ScTable::CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
ScTable* pTable, BOOL bKeepScenarioFlags, BOOL bCloneNoteCaptions)
{
if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2))
{
- // Inhalte kopieren
+ // Inhalte kopieren
SCCOL i;
for ( i = nCol1; i <= nCol2; i++)
aCol[i].CopyToClip(nRow1, nRow2, pTable->aCol[i], bKeepScenarioFlags, bCloneNoteCaptions);
- // copy widths/heights, and only "hidden", "filtered" and "manual" flags
- // also for all preceding columns/rows, to have valid positions for drawing objects
+ // copy widths/heights, and only "hidden", "filtered" and "manual" flags
+ // also for all preceding columns/rows, to have valid positions for drawing objects
if (pColWidth && pTable->pColWidth)
for (i=0; i<=nCol2; i++)
@@ -457,7 +457,7 @@ void ScTable::CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
pTable->CopyRowHidden(*this, 0, nRow2);
pTable->CopyRowFiltered(*this, 0, nRow2);
- // ggf. Formeln durch Werte ersetzen
+ // ggf. Formeln durch Werte ersetzen
if ( IsProtected() )
for (i = nCol1; i <= nCol2; i++)
@@ -465,13 +465,13 @@ void ScTable::CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
}
}
-void ScTable::CopyToClip(const ScRangeList& rRanges, ScTable* pTable,
+void ScTable::CopyToClip(const ScRangeList& rRanges, ScTable* pTable,
bool bKeepScenarioFlags, bool bCloneNoteCaptions)
{
ScRangeList aRanges(rRanges);
for (ScRangePtr p = aRanges.First(); p; p = aRanges.Next())
{
- CopyToClip(p->aStart.Col(), p->aStart.Row(), p->aEnd.Col(), p->aEnd.Row(),
+ CopyToClip(p->aStart.Col(), p->aStart.Row(), p->aEnd.Col(), p->aEnd.Row(),
pTable, bKeepScenarioFlags, bCloneNoteCaptions);
}
}
@@ -534,7 +534,7 @@ void ScTable::MixData( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
}
-// Markierung von diesem Dokument
+// Markierung von diesem Dokument
void ScTable::MixMarked( const ScMarkData& rMark, USHORT nFunction,
BOOL bSkipEmpty, ScTable* pSrcTab )
{
@@ -557,18 +557,18 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
if ( bAsLink && nFlags == IDF_ALL )
{
- // #68989# with IDF_ALL, also create links (formulas) for empty cells
+ // #68989# with IDF_ALL, also create links (formulas) for empty cells
for ( nRow=nRow1; nRow<=nRow2; nRow++ )
{
- // create simple formula, as in ScColumn::CreateRefCell
+ // create simple formula, as in ScColumn::CreateRefCell
ScAddress aDestPos( static_cast<SCCOL>(nRow-nRow1), static_cast<SCROW>(nCol-nCol1), pTransClip->nTab );
ScSingleRefData aRef;
aRef.nCol = nCol;
aRef.nRow = nRow;
aRef.nTab = nTab;
- aRef.InitFlags(); // -> all absolute
+ aRef.InitFlags(); // -> all absolute
aRef.SetFlag3D(TRUE);
aRef.CalcRelFromAbs( aDestPos );
ScTokenArray aArr;
@@ -585,19 +585,19 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
{
ScAddress aDestPos( static_cast<SCCOL>(nRow-nRow1), static_cast<SCROW>(nCol-nCol1), pTransClip->nTab );
ScBaseCell* pNew;
- if ( bAsLink ) // Referenz erzeugen ?
+ if ( bAsLink ) // Referenz erzeugen ?
{
pNew = aCol[nCol].CreateRefCell( pDestDoc, aDestPos, aIter.GetIndex(), nFlags );
}
- else // kopieren
+ else // kopieren
{
ScAddress aOwnPos( nCol, nRow, nTab );
if (pCell->GetCellType() == CELLTYPE_FORMULA)
{
pNew = pCell->CloneWithNote( aOwnPos, *pDestDoc, aDestPos, SC_CLONECELL_STARTLISTENING );
- // Referenzen drehen
- // bei Cut werden Referenzen spaeter per UpdateTranspose angepasst
+ // Referenzen drehen
+ // bei Cut werden Referenzen spaeter per UpdateTranspose angepasst
if (!bWasCut)
((ScFormulaCell*)pNew)->TransposeReference();
@@ -611,7 +611,7 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
}
}
- // Attribute
+ // Attribute
SCROW nAttrRow1;
SCROW nAttrRow2;
@@ -729,9 +729,9 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
aCol[i].CopyToColumn(nRow1, nRow2, nFlags, bMarked,
pDestTab->aCol[i], pMarkData, bAsLink);
- if (bColRowFlags) // Spaltenbreiten/Zeilenhoehen/Flags
+ if (bColRowFlags) // Spaltenbreiten/Zeilenhoehen/Flags
{
- // Charts muessen beim Ein-/Ausblenden angepasst werden
+ // Charts muessen beim Ein-/Ausblenden angepasst werden
ScChartListenerCollection* pCharts = pDestTab->pDocument->GetChartListenerCollection();
bool bFlagChange = false;
@@ -753,8 +753,8 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
pDestTab->pColWidth[i] = pColWidth[i];
pDestTab->pColFlags[i] = pColFlags[i];
pDestTab->SetColHidden(i, i, bThisHidden);
- //! Aenderungen zusammenfassen?
- if (bHiddenChange && pCharts)
+ //! Aenderungen zusammenfassen?
+ if (bHiddenChange && pCharts)
pCharts->SetRangeDirty(ScRange( i, 0, nTab, i, MAXROW, nTab ));
if (bChange)
@@ -779,13 +779,13 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
SCROW nThisLastRow, nDestLastRow;
bool bThisHidden = RowHidden(i, NULL, &nThisLastRow);
bool bDestHidden = pDestTab->RowHidden(i, NULL, &nDestLastRow);
-
+
// If the segment sizes differ, we take the shorter segment of the two.
SCROW nLastRow = ::std::min(nThisLastRow, nDestLastRow);
if (nLastRow >= nRow2)
// the last row shouldn't exceed the upper bound the caller specified.
nLastRow = nRow2;
-
+
pDestTab->SetRowHidden(i, nLastRow, bThisHidden);
bool bThisHiddenChange = (bThisHidden != bDestHidden);
@@ -794,14 +794,14 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
// Hidden flags differ.
pCharts->SetRangeDirty(ScRange(0, i, nTab, MAXCOL, nLastRow, nTab));
}
-
+
if (bThisHiddenChange)
bFlagChange = true;
-
+
// Jump to the last row of the identical flag segment.
i = nLastRow;
}
-
+
// Filtered flags.
for (SCROW i = nRow1; i <= nRow2; ++i)
{
@@ -821,7 +821,7 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
if (bFlagChange)
pDestTab->InvalidatePageBreaks();
- pDestTab->SetOutlineTable( pOutlineTable ); // auch nur wenn bColRowFlags
+ pDestTab->SetOutlineTable( pOutlineTable ); // auch nur wenn bColRowFlags
}
}
}
@@ -903,7 +903,7 @@ void ScTable::MarkScenarioIn( ScMarkData& rDestMark, USHORT nNeededBits ) const
{
DBG_ASSERT( bScenario, "bScenario == FALSE" );
- if ( ( nScenarioFlags & nNeededBits ) != nNeededBits ) // alle Bits gesetzt?
+ if ( ( nScenarioFlags & nNeededBits ) != nNeededBits ) // alle Bits gesetzt?
return;
for (SCCOL i=0; i<=MAXCOL; i++)
@@ -914,16 +914,16 @@ BOOL ScTable::HasScenarioRange( const ScRange& rRange ) const
{
DBG_ASSERT( bScenario, "bScenario == FALSE" );
-// ScMarkData aMark;
-// MarkScenarioIn( aMark, 0 ); //! Bits als Parameter von HasScenarioRange?
-// return aMark.IsAllMarked( rRange );
+// ScMarkData aMark;
+// MarkScenarioIn( aMark, 0 ); //! Bits als Parameter von HasScenarioRange?
+// return aMark.IsAllMarked( rRange );
ScRange aTabRange = rRange;
aTabRange.aStart.SetTab( nTab );
aTabRange.aEnd.SetTab( nTab );
const ScRangeList* pList = GetScenarioRanges();
-// return ( pList && pList->Find( aTabRange ) );
+// return ( pList && pList->Find( aTabRange ) );
if (pList)
{
@@ -953,7 +953,7 @@ const ScRangeList* ScTable::GetScenarioRanges() const
{
((ScTable*)this)->pScenarioRanges = new ScRangeList;
ScMarkData aMark;
- MarkScenarioIn( aMark, 0 ); // immer
+ MarkScenarioIn( aMark, 0 ); // immer
aMark.FillRangeListWithMarks( pScenarioRanges, FALSE );
}
return pScenarioRanges;
@@ -1014,11 +1014,11 @@ void ScTable::PutCell( const ScAddress& rPos, ScBaseCell* pCell )
//UNUSED2009-05 }
-BOOL ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const String& rString,
+BOOL ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const String& rString,
SvNumberFormatter* pFormatter, bool bDetectNumberFormat )
{
if (ValidColRow(nCol,nRow))
- return aCol[nCol].SetString(
+ return aCol[nCol].SetString(
nRow, nTabP, rString, pDocument->GetAddressConvention(), pFormatter, bDetectNumberFormat );
else
return FALSE;
@@ -1213,7 +1213,7 @@ void ScTable::SetDirtyVar()
void ScTable::SetDirty()
{
BOOL bOldAutoCalc = pDocument->GetAutoCalc();
- pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
+ pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
for (SCCOL i=0; i<=MAXCOL; i++)
aCol[i].SetDirty();
pDocument->SetAutoCalc( bOldAutoCalc );
@@ -1223,7 +1223,7 @@ void ScTable::SetDirty()
void ScTable::SetDirty( const ScRange& rRange )
{
BOOL bOldAutoCalc = pDocument->GetAutoCalc();
- pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
+ pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
SCCOL nCol2 = rRange.aEnd.Col();
for (SCCOL i=rRange.aStart.Col(); i<=nCol2; i++)
aCol[i].SetDirty( rRange );
@@ -1234,7 +1234,7 @@ void ScTable::SetDirty( const ScRange& rRange )
void ScTable::SetTableOpDirty( const ScRange& rRange )
{
BOOL bOldAutoCalc = pDocument->GetAutoCalc();
- pDocument->SetAutoCalc( FALSE ); // no multiple recalculation
+ pDocument->SetAutoCalc( FALSE ); // no multiple recalculation
SCCOL nCol2 = rRange.aEnd.Col();
for (SCCOL i=rRange.aStart.Col(); i<=nCol2; i++)
aCol[i].SetTableOpDirty( rRange );
@@ -1245,7 +1245,7 @@ void ScTable::SetTableOpDirty( const ScRange& rRange )
void ScTable::SetDirtyAfterLoad()
{
BOOL bOldAutoCalc = pDocument->GetAutoCalc();
- pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
+ pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
for (SCCOL i=0; i<=MAXCOL; i++)
aCol[i].SetDirtyAfterLoad();
pDocument->SetAutoCalc( bOldAutoCalc );
@@ -1255,7 +1255,7 @@ void ScTable::SetDirtyAfterLoad()
void ScTable::SetRelNameDirty()
{
BOOL bOldAutoCalc = pDocument->GetAutoCalc();
- pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
+ pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
for (SCCOL i=0; i<=MAXCOL; i++)
aCol[i].SetRelNameDirty();
pDocument->SetAutoCalc( bOldAutoCalc );
@@ -1310,7 +1310,7 @@ void ScTable::ResetChanged( const ScRange& rRange )
aCol[nCol].ResetChanged(nStartRow, nEndRow);
}
-// Attribute
+// Attribute
const SfxPoolItem* ScTable::GetAttr( SCCOL nCol, SCROW nRow, USHORT nWhich ) const
{
@@ -1368,12 +1368,12 @@ bool ScTable::HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USH
//UNUSED2009-05 SCROW nRow2 = rRange.aEnd.Row();
//UNUSED2009-05 PutInOrder( nCol1, nCol2 );
//UNUSED2009-05 PutInOrder( nRow1, nRow2 );
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 BOOL bFound = FALSE;
//UNUSED2009-05 for (SCCOL i=nCol1; i<=nCol2; i++)
//UNUSED2009-05 if (aCol[i].HasLines( nRow1, nRow2, rSizes, (i==nCol1), (i==nCol2) ))
//UNUSED2009-05 bFound = TRUE;
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 return bFound;
//UNUSED2009-05 }
@@ -1422,16 +1422,16 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCO
SCCOL nCol, SCROW nAttrRow1, SCROW nAttrRow2, SCSIZE nArrY,
const ScPatternAttr* pPattern, const SfxItemSet* pCondSet )
{
- // Rueckgabe = neues nArrY
+ // Rueckgabe = neues nArrY
BYTE nRotDir = pPattern->GetRotateDir( pCondSet );
if ( nRotDir != SC_ROTDIR_NONE )
{
BOOL bHit = TRUE;
- if ( nCol+1 < nX1 ) // column to the left
+ if ( nCol+1 < nX1 ) // column to the left
bHit = ( nRotDir != SC_ROTDIR_LEFT );
- else if ( nCol > nX2+1 ) // column to the right
- bHit = ( nRotDir != SC_ROTDIR_RIGHT ); // SC_ROTDIR_STANDARD may now also be extended to the left
+ else if ( nCol > nX2+1 ) // column to the right
+ bHit = ( nRotDir != SC_ROTDIR_RIGHT ); // SC_ROTDIR_STANDARD may now also be extended to the left
if ( bHit )
{
@@ -1440,14 +1440,14 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCO
{
long nRotVal = ((const SfxInt32Item&) pPattern->
GetItem( ATTR_ROTATE_VALUE, pCondSet )).GetValue();
- double nRealOrient = nRotVal * F_PI18000; // 1/100 Grad
+ double nRealOrient = nRotVal * F_PI18000; // 1/100 Grad
double nCos = cos( nRealOrient );
double nSin = sin( nRealOrient );
- //! begrenzen !!!
- //! zusaetzlich Faktor fuer unterschiedliche PPT X/Y !!!
+ //! begrenzen !!!
+ //! zusaetzlich Faktor fuer unterschiedliche PPT X/Y !!!
- // bei SC_ROTDIR_LEFT kommt immer ein negativer Wert heraus,
- // wenn der Modus beruecksichtigt wird
+ // bei SC_ROTDIR_LEFT kommt immer ein negativer Wert heraus,
+ // wenn der Modus beruecksichtigt wird
nFactor = -fabs( nCos / nSin );
}
@@ -1495,7 +1495,7 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCC
return;
}
- // nRotMaxCol ist auf SC_ROTMAX_NONE initialisiert, nRowNo ist schon gesetzt
+ // nRotMaxCol ist auf SC_ROTMAX_NONE initialisiert, nRowNo ist schon gesetzt
SCROW nY1 = pRowInfo[0].nRowNo;
SCROW nY2 = pRowInfo[nArrCount-1].nRowNo;
@@ -1515,8 +1515,8 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCC
if ( pPattern->GetItemSet().GetItemState( ATTR_CONDITIONAL, TRUE, &pCondItem )
== SFX_ITEM_SET )
{
- // alle Formate durchgehen, damit die Zellen nicht einzeln
- // angeschaut werden muessen
+ // alle Formate durchgehen, damit die Zellen nicht einzeln
+ // angeschaut werden muessen
ULONG nIndex = ((const SfxUInt32Item*)pCondItem)->GetValue();
ScConditionalFormatList* pList = pDocument->GetCondFormList();
@@ -1539,7 +1539,7 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCC
FillMaxRot( pRowInfo, nArrCount, nX1, nX2,
nCol, nAttrRow1, nAttrRow2,
nArrY, pPattern, &pStyleSheet->GetItemSet() );
- // nArrY nicht veraendern
+ // nArrY nicht veraendern
}
}
}
@@ -1563,28 +1563,28 @@ BOOL ScTable::HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCR
USHORT nEdges;
if ( nCol1 == nCol2 )
- { // linke und rechte Spalte
+ { // linke und rechte Spalte
const USHORT n = 4 | 16;
nEdges = aCol[nCol1].GetBlockMatrixEdges( nRow1, nRow2, n );
// nicht (4 und 16) oder 1 oder 32
if ( nEdges && (((nEdges & n) != n) || (nEdges & 33)) )
- return TRUE; // linke oder rechte Kante fehlt oder offen
+ return TRUE; // linke oder rechte Kante fehlt oder offen
}
else
- { // linke Spalte
+ { // linke Spalte
nEdges = aCol[nCol1].GetBlockMatrixEdges( nRow1, nRow2, 4 );
// nicht 4 oder 1 oder 32
if ( nEdges && (((nEdges & 4) != 4) || (nEdges & 33)) )
- return TRUE; // linke Kante fehlt oder offen
+ return TRUE; // linke Kante fehlt oder offen
// rechte Spalte
nEdges = aCol[nCol2].GetBlockMatrixEdges( nRow1, nRow2, 16 );
// nicht 16 oder 1 oder 32
if ( nEdges && (((nEdges & 16) != 16) || (nEdges & 33)) )
- return TRUE; // rechte Kante fehlt oder offen
+ return TRUE; // rechte Kante fehlt oder offen
}
if ( nRow1 == nRow2 )
- { // obere und untere Zeile
+ { // obere und untere Zeile
BOOL bOpen = FALSE;
const USHORT n = 2 | 8;
for ( SCCOL i=nCol1; i<=nCol2; i++)
@@ -1593,17 +1593,17 @@ BOOL ScTable::HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCR
if ( nEdges )
{
if ( (nEdges & n) != n )
- return TRUE; // obere oder untere Kante fehlt
+ return TRUE; // obere oder untere Kante fehlt
if ( nEdges & 4 )
- bOpen = TRUE; // linke Kante oeffnet, weitersehen
+ bOpen = TRUE; // linke Kante oeffnet, weitersehen
else if ( !bOpen )
- return TRUE; // es gibt was, was nicht geoeffnet wurde
+ return TRUE; // es gibt was, was nicht geoeffnet wurde
if ( nEdges & 16 )
- bOpen = FALSE; // rechte Kante schliesst
+ bOpen = FALSE; // rechte Kante schliesst
}
}
if ( bOpen )
- return TRUE; // es geht noch weiter
+ return TRUE; // es geht noch weiter
}
else
{
@@ -1623,15 +1623,15 @@ BOOL ScTable::HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCR
if ( (nEdges & n) != n )
return TRUE;
if ( nEdges & 4 )
- bOpen = TRUE; // linke Kante oeffnet, weitersehen
+ bOpen = TRUE; // linke Kante oeffnet, weitersehen
else if ( !bOpen )
- return TRUE; // es gibt was, was nicht geoeffnet wurde
+ return TRUE; // es gibt was, was nicht geoeffnet wurde
if ( nEdges & 16 )
- bOpen = FALSE; // rechte Kante schliesst
+ bOpen = FALSE; // rechte Kante schliesst
}
}
if ( bOpen )
- return TRUE; // es geht noch weiter
+ return TRUE; // es geht noch weiter
}
}
return FALSE;
@@ -1944,8 +1944,8 @@ const ScStyleSheet* ScTable::GetSelectionStyle( const ScMarkData& rMark, BOOL& r
{
rFound = FALSE;
- BOOL bEqual = TRUE;
- BOOL bColFound;
+ BOOL bEqual = TRUE;
+ BOOL bColFound;
const ScStyleSheet* pStyle = NULL;
const ScStyleSheet* pNewStyle;
@@ -1958,7 +1958,7 @@ const ScStyleSheet* ScTable::GetSelectionStyle( const ScMarkData& rMark, BOOL& r
{
rFound = TRUE;
if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) )
- bEqual = FALSE; // unterschiedliche
+ bEqual = FALSE; // unterschiedliche
pStyle = pNewStyle;
}
}
@@ -1967,13 +1967,13 @@ const ScStyleSheet* ScTable::GetSelectionStyle( const ScMarkData& rMark, BOOL& r
}
-const ScStyleSheet* ScTable::GetAreaStyle( BOOL& rFound, SCCOL nCol1, SCROW nRow1,
+const ScStyleSheet* ScTable::GetAreaStyle( BOOL& rFound, SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2 ) const
{
rFound = FALSE;
- BOOL bEqual = TRUE;
- BOOL bColFound;
+ BOOL bEqual = TRUE;
+ BOOL bColFound;
const ScStyleSheet* pStyle = NULL;
const ScStyleSheet* pNewStyle;
@@ -1985,7 +1985,7 @@ const ScStyleSheet* ScTable::GetAreaStyle( BOOL& rFound, SCCOL nCol1, SCROW nRow
{
rFound = TRUE;
if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) )
- bEqual = FALSE; // unterschiedliche
+ bEqual = FALSE; // unterschiedliche
pStyle = pNewStyle;
}
}
@@ -2095,7 +2095,7 @@ void ScTable::ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark
}
-// Spaltenbreiten / Zeilenhoehen
+// Spaltenbreiten / Zeilenhoehen
void ScTable::SetColWidth( SCCOL nCol, USHORT nNewWidth )
{
@@ -2103,7 +2103,7 @@ void ScTable::SetColWidth( SCCOL nCol, USHORT nNewWidth )
{
if (!nNewWidth)
{
-// DBG_ERROR("Spaltenbreite 0 in SetColWidth");
+// DBG_ERROR("Spaltenbreite 0 in SetColWidth");
nNewWidth = STD_COL_WIDTH;
}
@@ -2159,12 +2159,12 @@ void ScTable::SetRowHeight( SCROW nRow, USHORT nNewHeight )
namespace {
-/**
- * Check if the new pixel size is different from the old size between
- * specified ranges.
+/**
+ * Check if the new pixel size is different from the old size between
+ * specified ranges.
*/
bool lcl_pixelSizeChanged(
- ScFlatUInt16RowSegments& rRowHeights, SCROW nStartRow, SCROW nEndRow,
+ ScFlatUInt16RowSegments& rRowHeights, SCROW nStartRow, SCROW nEndRow,
sal_uInt16 nNewHeight, double nPPTY)
{
long nNewPix = static_cast<long>(nNewHeight * nPPTY);
@@ -2177,7 +2177,7 @@ bool lcl_pixelSizeChanged(
break;
if (nHeight != nNewHeight)
- {
+ {
bool bChanged = (nNewPix != static_cast<long>(nHeight * nPPTY));
if (bChanged)
return true;
@@ -2323,7 +2323,7 @@ USHORT ScTable::GetColWidth( SCCOL nCol ) const
}
-USHORT ScTable::GetOriginalWidth( SCCOL nCol ) const // immer die eingestellte
+USHORT ScTable::GetOriginalWidth( SCCOL nCol ) const // immer die eingestellte
{
DBG_ASSERT(VALIDCOL(nCol),"Falsche Spaltennummer");
@@ -2336,7 +2336,7 @@ USHORT ScTable::GetOriginalWidth( SCCOL nCol ) const // immer die eingest
USHORT ScTable::GetCommonWidth( SCCOL nEndCol )
{
- // get the width that is used in the largest continuous column range (up to nEndCol)
+ // get the width that is used in the largest continuous column range (up to nEndCol)
if ( !ValidCol(nEndCol) )
{
@@ -2349,7 +2349,7 @@ USHORT ScTable::GetCommonWidth( SCCOL nEndCol )
SCCOL nRangeStart = 0;
while ( nRangeStart <= nEndCol )
{
- // skip hidden columns
+ // skip hidden columns
while ( nRangeStart <= nEndCol && ColHidden(nRangeStart) )
++nRangeStart;
if ( nRangeStart <= nEndCol )
@@ -2362,7 +2362,7 @@ USHORT ScTable::GetCommonWidth( SCCOL nEndCol )
++nThisCount;
++nRangeEnd;
- // skip hidden columns
+ // skip hidden columns
while ( nRangeEnd <= nEndCol && ColHidden(nRangeEnd) )
++nRangeEnd;
}
@@ -2373,7 +2373,7 @@ USHORT ScTable::GetCommonWidth( SCCOL nEndCol )
nMaxWidth = nThisWidth;
}
- nRangeStart = nRangeEnd; // next range
+ nRangeStart = nRangeEnd; // next range
}
}
@@ -2402,9 +2402,9 @@ USHORT ScTable::GetRowHeight( SCROW nRow, SCROW* pStartRow, SCROW* pEndRow, bool
return 0;
}
- // If bHiddenAsZero, pStartRow and pEndRow were initialized to
- // boundaries of a non-hidden segment. Assume that the previous and
- // next segment are hidden then and limit the current height
+ // If bHiddenAsZero, pStartRow and pEndRow were initialized to
+ // boundaries of a non-hidden segment. Assume that the previous and
+ // next segment are hidden then and limit the current height
// segment.
if (pStartRow)
*pStartRow = (bHiddenAsZero ? std::max( *pStartRow, aData.mnRow1) : aData.mnRow1);
@@ -2477,7 +2477,7 @@ ULONG ScTable::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale
}
-USHORT ScTable::GetOriginalHeight( SCROW nRow ) const // non-0 even if hidden
+USHORT ScTable::GetOriginalHeight( SCROW nRow ) const // non-0 even if hidden
{
DBG_ASSERT(VALIDROW(nRow),"wrong row number");
@@ -2488,7 +2488,7 @@ USHORT ScTable::GetOriginalHeight( SCROW nRow ) const // non-0 even if hid
}
-// Spalten-/Zeilen-Flags
+// Spalten-/Zeilen-Flags
SCROW ScTable::GetHiddenRowCount( SCROW nRow )
@@ -2504,7 +2504,7 @@ SCROW ScTable::GetHiddenRowCount( SCROW nRow )
}
-//! ShowRows / DBShowRows zusammenfassen
+//! ShowRows / DBShowRows zusammenfassen
void ScTable::ShowCol(SCCOL nCol, bool bShow)
{
@@ -2599,7 +2599,7 @@ void ScTable::DBShowRow(SCROW nRow, bool bShow)
}
}
- // Filter-Flag immer setzen, auch wenn Hidden unveraendert
+ // Filter-Flag immer setzen, auch wenn Hidden unveraendert
SetRowHidden(nRow, nRow, !bShow);
SetRowFiltered(nRow, nRow, !bShow);
DecRecalcLevel();
@@ -2662,9 +2662,9 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow)
nStartRow = nEndRow + 1;
}
- // #i12341# For Show/Hide rows, the outlines are updated separately from the outside.
- // For filtering, the changes aren't visible to the caller, so UpdateOutlineRow has
- // to be done here.
+ // #i12341# For Show/Hide rows, the outlines are updated separately from the outside.
+ // For filtering, the changes aren't visible to the caller, so UpdateOutlineRow has
+ // to be done here.
if (pOutlineTable)
UpdateOutlineRow( nRow1, nRow2, bShow );
@@ -2772,7 +2772,7 @@ SCROW ScTable::GetLastFlaggedRow() const
{
SCROW nLastFound = 0;
if (pRowFlags)
- {
+ {
SCROW nRow = pRowFlags->GetLastAnyBitAccess( 0, sal::static_int_cast<BYTE>(CR_ALL) );
if (ValidRow(nRow))
nLastFound = nRow;
@@ -2910,7 +2910,7 @@ void ScTable::StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 )
}
-// Auto-Outline
+// Auto-Outline
template< typename T >
short DiffSign( T a, T b )
@@ -2923,7 +2923,7 @@ short DiffSign( T a, T b )
void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow )
{
BOOL bSizeChanged = FALSE;
- BOOL bMissed = FALSE;
+ BOOL bMissed = FALSE;
SCCOL nCol;
SCROW nRow;
@@ -2932,7 +2932,7 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC
ScOutlineArray* pArray;
ScBaseCell* pCell;
ScRange aRef;
-/* ScPatternAttr aBoldPattern( pDocument->GetPool() ); //! spezielle Format-Vorlage
+/* ScPatternAttr aBoldPattern( pDocument->GetPool() ); //! spezielle Format-Vorlage
aBoldPattern.GetItemSet().Put( SvxWeightItem( WEIGHT_BOLD ) );
*/
@@ -2940,8 +2940,8 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC
// Zeilen
- SCROW nCount = nEndRow-nStartRow+1;
- BOOL* pUsed = new BOOL[nCount];
+ SCROW nCount = nEndRow-nStartRow+1;
+ BOOL* pUsed = new BOOL[nCount];
for (i=0; i<nCount; i++)
pUsed[i] = FALSE;
for (nCol=nStartCol; nCol<=nEndCol; nCol++)
@@ -2967,7 +2967,7 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC
{
if (pArray->Insert( aRef.aStart.Row(), aRef.aEnd.Row(), bSizeChanged ))
{
-// ApplyPatternArea( nStartCol, nRow, nEndCol, nRow, aBoldPattern );
+// ApplyPatternArea( nStartCol, nRow, nEndCol, nRow, aBoldPattern );
bFound = TRUE;
}
else
@@ -2998,7 +2998,7 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC
{
if (pArray->Insert( aRef.aStart.Col(), aRef.aEnd.Col(), bSizeChanged ))
{
-// ApplyPatternArea( nCol, nStartRow, nCol, nEndRow, aBoldPattern );
+// ApplyPatternArea( nCol, nStartRow, nCol, nEndRow, aBoldPattern );
bFound = TRUE;
}
else
@@ -3009,12 +3009,12 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC
}
}
- // CopyData - fuer Query in anderen Bereich
+ // CopyData - fuer Query in anderen Bereich
void ScTable::CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
SCCOL nDestCol, SCROW nDestRow, SCTAB nDestTab )
{
- //! wenn fuer mehrere Zeilen benutzt, nach Spalten optimieren!
+ //! wenn fuer mehrere Zeilen benutzt, nach Spalten optimieren!
ScAddress aSrc( nStartCol, nStartRow, nTab );
ScAddress aDest( nDestCol, nDestRow, nDestTab );
@@ -3080,7 +3080,7 @@ BOOL ScTable::RefVisible(ScFormulaCell* pCell)
}
}
- return TRUE; // irgendwie anders
+ return TRUE; // irgendwie anders
}
@@ -3105,7 +3105,7 @@ void ScTable::SetDrawPageSize(bool bResetStreamValid, bool bUpdateNoteCaptionPos
x = (long) ((double) x * HMM_PER_TWIPS);
y = (long) ((double) y * HMM_PER_TWIPS);
- if ( IsLayoutRTL() ) // IsNegativePage
+ if ( IsLayoutRTL() ) // IsNegativePage
x = -x;
pDrawLayer->SetPageSize( static_cast<sal_uInt16>(nTab), Size( x, y ), bUpdateNoteCaptionPos );
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index bd6a2c92c442..d3f025ba6084 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +64,12 @@
// STATIC DATA -----------------------------------------------------------
-const USHORT nMaxSorts = 3; // maximale Anzahl Sortierkriterien in aSortParam
+const USHORT nMaxSorts = 3; // maximale Anzahl Sortierkriterien in aSortParam
struct ScSortInfo
{
- ScBaseCell* pCell;
- SCCOLROW nOrg;
+ ScBaseCell* pCell;
+ SCCOLROW nOrg;
DECL_FIXEDMEMPOOL_NEWDEL( ScSortInfo );
};
const USHORT nMemPoolSortInfo = (0x8000 - 64) / sizeof(ScSortInfo);
@@ -81,10 +81,10 @@ IMPL_FIXEDMEMPOOL_NEWDEL( ScSortInfo, nMemPoolSortInfo, nMemPoolSortInfo )
class ScSortInfoArray
{
private:
- ScSortInfo** pppInfo[nMaxSorts];
- SCSIZE nCount;
- SCCOLROW nStart;
- USHORT nUsedSorts;
+ ScSortInfo** pppInfo[nMaxSorts];
+ SCSIZE nCount;
+ SCCOLROW nStart;
+ USHORT nUsedSorts;
public:
ScSortInfoArray( USHORT nSorts, SCCOLROW nInd1, SCCOLROW nInd2 ) :
@@ -109,9 +109,9 @@ public:
delete [] ppInfo;
}
}
- ScSortInfo* Get( USHORT nSort, SCCOLROW nInd )
+ ScSortInfo* Get( USHORT nSort, SCCOLROW nInd )
{ return (pppInfo[nSort])[ nInd - nStart ]; }
- void Swap( SCCOLROW nInd1, SCCOLROW nInd2 )
+ void Swap( SCCOLROW nInd1, SCCOLROW nInd2 )
{
SCSIZE n1 = static_cast<SCSIZE>(nInd1 - nStart);
SCSIZE n2 = static_cast<SCSIZE>(nInd2 - nStart);
@@ -123,10 +123,10 @@ public:
ppInfo[n2] = pTmp;
}
}
- USHORT GetUsedSorts() { return nUsedSorts; }
- ScSortInfo** GetFirstArray() { return pppInfo[0]; }
- SCCOLROW GetStart() { return nStart; }
- SCSIZE GetCount() { return nCount; }
+ USHORT GetUsedSorts() { return nUsedSorts; }
+ ScSortInfo** GetFirstArray() { return pppInfo[0]; }
+ SCCOLROW GetStart() { return nStart; }
+ SCSIZE GetCount() { return nCount; }
};
ScSortInfoArray* ScTable::CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2 )
@@ -170,7 +170,7 @@ ScSortInfoArray* ScTable::CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2 )
BOOL ScTable::IsSortCollatorGlobal() const
{
- return pSortCollator == ScGlobal::GetCollator() ||
+ return pSortCollator == ScGlobal::GetCollator() ||
pSortCollator == ScGlobal::GetCaseCollator();
}
@@ -185,7 +185,7 @@ void ScTable::InitSortCollator( const ScSortParam& rPar )
rPar.aCollatorLocale, (rPar.bCaseSens ? 0 : SC_COLLATOR_IGNORES) );
}
else
- { // SYSTEM
+ { // SYSTEM
DestroySortCollator();
pSortCollator = (rPar.bCaseSens ? ScGlobal::GetCaseCollator() :
ScGlobal::GetCollator());
@@ -268,7 +268,7 @@ short ScTable::CompareCell( USHORT nSort,
if ( eType2 == CELLTYPE_FORMULA && ((ScFormulaCell*)pCell2)->IsValue() )
bStr2 = FALSE;
- if ( bStr1 && bStr2 ) // nur Strings untereinander als String vergleichen!
+ if ( bStr1 && bStr2 ) // nur Strings untereinander als String vergleichen!
{
String aStr1;
String aStr2;
@@ -300,11 +300,11 @@ short ScTable::CompareCell( USHORT nSort,
if (!bUserDef)
nRes = (short) pSortCollator->compareString( aStr1, aStr2 );
}
- else if ( bStr1 ) // String <-> Zahl
- nRes = 1; // Zahl vorne
- else if ( bStr2 ) // Zahl <-> String
- nRes = -1; // Zahl vorne
- else // Zahlen untereinander
+ else if ( bStr1 ) // String <-> Zahl
+ nRes = 1; // Zahl vorne
+ else if ( bStr2 ) // Zahl <-> String
+ nRes = -1; // Zahl vorne
+ else // Zahlen untereinander
{
double nVal1;
double nVal2;
@@ -336,7 +336,7 @@ short ScTable::CompareCell( USHORT nSort,
if ( pCell2 )
nRes = 1;
else
- nRes = 0; // beide leer
+ nRes = 0; // beide leer
}
return nRes;
}
@@ -561,15 +561,15 @@ void ScTable::Sort(const ScSortParam& rSortParam, BOOL bKeepQuery)
}
-// Testen, ob beim Loeschen von Zwischenergebnissen andere Daten mit geloescht werden
-// (fuer Hinweis-Box)
+// Testen, ob beim Loeschen von Zwischenergebnissen andere Daten mit geloescht werden
+// (fuer Hinweis-Box)
BOOL ScTable::TestRemoveSubTotals( const ScSubTotalParam& rParam )
{
SCCOL nStartCol = rParam.nCol1;
- SCROW nStartRow = rParam.nRow1 + 1; // Header
+ SCROW nStartRow = rParam.nRow1 + 1; // Header
SCCOL nEndCol = rParam.nCol2;
- SCROW nEndRow = rParam.nRow2;
+ SCROW nEndRow = rParam.nRow2;
SCCOL nCol;
SCROW nRow;
@@ -594,15 +594,15 @@ BOOL ScTable::TestRemoveSubTotals( const ScSubTotalParam& rParam )
return bWillDelete;
}
-// alte Ergebnisse loeschen
-// rParam.nRow2 wird veraendert !
+// alte Ergebnisse loeschen
+// rParam.nRow2 wird veraendert !
void ScTable::RemoveSubTotals( ScSubTotalParam& rParam )
{
SCCOL nStartCol = rParam.nCol1;
- SCROW nStartRow = rParam.nRow1 + 1; // Header
+ SCROW nStartRow = rParam.nRow1 + 1; // Header
SCCOL nEndCol = rParam.nCol2;
- SCROW nEndRow = rParam.nRow2; // wird veraendert
+ SCROW nEndRow = rParam.nRow2; // wird veraendert
SCCOL nCol;
SCROW nRow;
@@ -624,10 +624,10 @@ void ScTable::RemoveSubTotals( ScSubTotalParam& rParam )
}
}
- rParam.nRow2 = nEndRow; // neues Ende
+ rParam.nRow2 = nEndRow; // neues Ende
}
-// harte Zahlenformate loeschen (fuer Ergebnisformeln)
+// harte Zahlenformate loeschen (fuer Ergebnisformeln)
void lcl_RemoveNumberFormat( ScTable* pTab, SCCOL nCol, SCROW nRow )
{
@@ -654,24 +654,24 @@ typedef struct lcl_ScTable_DoSubTotals_RowEntry
SCROW nFuncEnd;
} RowEntry;
-// neue Zwischenergebnisse
-// rParam.nRow2 wird veraendert !
+// neue Zwischenergebnisse
+// rParam.nRow2 wird veraendert !
BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
{
SCCOL nStartCol = rParam.nCol1;
- SCROW nStartRow = rParam.nRow1 + 1; // Header
+ SCROW nStartRow = rParam.nRow1 + 1; // Header
SCCOL nEndCol = rParam.nCol2;
- SCROW nEndRow = rParam.nRow2; // wird veraendert
+ SCROW nEndRow = rParam.nRow2; // wird veraendert
USHORT i;
- // Leerzeilen am Ende weglassen,
- // damit alle Ueberlaeufe (MAXROW) bei InsertRow gefunden werden (#35180#)
- // Wenn sortiert wurde, sind alle Leerzeilen am Ende.
+ // Leerzeilen am Ende weglassen,
+ // damit alle Ueberlaeufe (MAXROW) bei InsertRow gefunden werden (#35180#)
+ // Wenn sortiert wurde, sind alle Leerzeilen am Ende.
SCSIZE nEmpty = GetEmptyLinesInBlock( nStartCol, nStartRow, nEndCol, nEndRow, DIR_BOTTOM );
nEndRow -= nEmpty;
- USHORT nLevelCount = 0; // Anzahl Gruppierungen
+ USHORT nLevelCount = 0; // Anzahl Gruppierungen
BOOL bDoThis = TRUE;
for (i=0; i<MAXSUBTOTAL && bDoThis; i++)
if (rParam.bGroupActive[i])
@@ -679,23 +679,23 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
else
bDoThis = FALSE;
- if (nLevelCount==0) // nichts tun
+ if (nLevelCount==0) // nichts tun
return TRUE;
- SCCOL* nGroupCol = rParam.nField; // Spalten nach denen
+ SCCOL* nGroupCol = rParam.nField; // Spalten nach denen
// gruppiert wird
- // #44444# Durch (leer) als eigene Kategorie muss immer auf
- // Teilergebniszeilen aus den anderen Spalten getestet werden
- // (frueher nur, wenn eine Spalte mehrfach vorkam)
+ // #44444# Durch (leer) als eigene Kategorie muss immer auf
+ // Teilergebniszeilen aus den anderen Spalten getestet werden
+ // (frueher nur, wenn eine Spalte mehrfach vorkam)
BOOL bTestPrevSub = ( nLevelCount > 1 );
- String aSubString;
- String aOutString;
+ String aSubString;
+ String aOutString;
BOOL bIgnoreCase = !rParam.bCaseSens;
- String *pCompString[MAXSUBTOTAL]; // Pointer wegen Compiler-Problemen
+ String *pCompString[MAXSUBTOTAL]; // Pointer wegen Compiler-Problemen
for (i=0; i<MAXSUBTOTAL; i++)
pCompString[i] = new String;
@@ -704,7 +704,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
ScStyleSheet* pStyle = (ScStyleSheet*) pDocument->GetStyleSheetPool()->Find(
ScGlobal::GetRscString(STR_STYLENAME_RESULT), SFX_STYLE_FAMILY_PARA );
- BOOL bSpaceLeft = TRUE; // Erfolg beim Einfuegen?
+ BOOL bSpaceLeft = TRUE; // Erfolg beim Einfuegen?
// #90279# For performance reasons collect formula entries so their
// references don't have to be tested for updates each time a new row is
@@ -712,7 +712,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
RowEntry aRowEntry;
::std::vector< RowEntry > aRowVector;
- for (USHORT nLevel=0; nLevel<=nLevelCount && bSpaceLeft; nLevel++) // incl. Gesamtergebnis
+ for (USHORT nLevel=0; nLevel<=nLevelCount && bSpaceLeft; nLevel++) // incl. Gesamtergebnis
{
BOOL bTotal = ( nLevel == nLevelCount );
aRowEntry.nGroupNo = bTotal ? 0 : (nLevelCount-nLevel-1);
@@ -722,7 +722,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
// result functions
ScSubTotalFunc* eResFunc = rParam.pFunctions[aRowEntry.nGroupNo];
- if (nResCount > 0) // sonst nur sortieren
+ if (nResCount > 0) // sonst nur sortieren
{
for (i=0; i<=aRowEntry.nGroupNo; i++)
{
@@ -731,9 +731,9 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
*pCompString[i] = ScGlobal::pCharClass->upper( aSubString );
else
*pCompString[i] = aSubString;
- } // aSubString bleibt auf dem letzten stehen
+ } // aSubString bleibt auf dem letzten stehen
- BOOL bBlockVis = FALSE; // Gruppe eingeblendet?
+ BOOL bBlockVis = FALSE; // Gruppe eingeblendet?
aRowEntry.nSubStartRow = nStartRow;
for (SCROW nRow=nStartRow; nRow<=nEndRow+1 && bSpaceLeft; nRow++)
{
@@ -751,8 +751,8 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
GetString( nGroupCol[i], nRow, aString );
if (bIgnoreCase)
ScGlobal::pCharClass->toUpper( aString );
- // #41427# wenn sortiert, ist "leer" eine eigene Gruppe
- // sonst sind leere Zellen unten erlaubt
+ // #41427# wenn sortiert, ist "leer" eine eigene Gruppe
+ // sonst sind leere Zellen unten erlaubt
bChanged = ( ( aString.Len() || rParam.bDoSort ) &&
aString != *pCompString[i] );
}
@@ -804,10 +804,10 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
// collect formula positions
aRowVector.push_back( aRowEntry );
- if (bTotal) // "Gesamtergebnis"
+ if (bTotal) // "Gesamtergebnis"
aOutString = ScGlobal::GetRscString( STR_TABLE_GESAMTERGEBNIS );
else
- { // " Ergebnis"
+ { // " Ergebnis"
aOutString = aSubString;
if (!aOutString.Len())
aOutString = ScGlobal::GetRscString( STR_EMPTYDATA );
@@ -816,17 +816,17 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
if ( nResCount == 1 )
switch ( eResFunc[0] )
{
- case SUBTOTAL_FUNC_AVE: nStrId = STR_FUN_TEXT_AVG; break;
+ case SUBTOTAL_FUNC_AVE: nStrId = STR_FUN_TEXT_AVG; break;
case SUBTOTAL_FUNC_CNT:
- case SUBTOTAL_FUNC_CNT2: nStrId = STR_FUN_TEXT_COUNT; break;
- case SUBTOTAL_FUNC_MAX: nStrId = STR_FUN_TEXT_MAX; break;
- case SUBTOTAL_FUNC_MIN: nStrId = STR_FUN_TEXT_MIN; break;
- case SUBTOTAL_FUNC_PROD: nStrId = STR_FUN_TEXT_PRODUCT; break;
+ case SUBTOTAL_FUNC_CNT2: nStrId = STR_FUN_TEXT_COUNT; break;
+ case SUBTOTAL_FUNC_MAX: nStrId = STR_FUN_TEXT_MAX; break;
+ case SUBTOTAL_FUNC_MIN: nStrId = STR_FUN_TEXT_MIN; break;
+ case SUBTOTAL_FUNC_PROD: nStrId = STR_FUN_TEXT_PRODUCT; break;
case SUBTOTAL_FUNC_STD:
- case SUBTOTAL_FUNC_STDP: nStrId = STR_FUN_TEXT_STDDEV; break;
- case SUBTOTAL_FUNC_SUM: nStrId = STR_FUN_TEXT_SUM; break;
+ case SUBTOTAL_FUNC_STDP: nStrId = STR_FUN_TEXT_STDDEV; break;
+ case SUBTOTAL_FUNC_SUM: nStrId = STR_FUN_TEXT_SUM; break;
case SUBTOTAL_FUNC_VAR:
- case SUBTOTAL_FUNC_VARP: nStrId = STR_FUN_TEXT_VAR; break;
+ case SUBTOTAL_FUNC_VARP: nStrId = STR_FUN_TEXT_VAR; break;
default:
{
// added to avoid warnings
@@ -855,7 +855,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
}
else
{
-// DBG_ERROR( "nSubTotals==0 bei DoSubTotals" );
+// DBG_ERROR( "nSubTotals==0 bei DoSubTotals" );
}
}
@@ -893,16 +893,16 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
{
ApplyStyle( nResCols[nResult], iEntry->nDestRow, *pStyle );
- // Zahlformat loeschen
+ // Zahlformat loeschen
lcl_RemoveNumberFormat( this, nResCols[nResult], iEntry->nDestRow );
}
}
}
- //! je nach Einstellung Zwischensummen-Zeilen nach oben verschieben ?
+ //! je nach Einstellung Zwischensummen-Zeilen nach oben verschieben ?
- //! Outlines direkt erzeugen?
+ //! Outlines direkt erzeugen?
if (bSpaceLeft)
DoAutoOutline( nStartCol, nStartRow, nEndCol, nEndRow );
@@ -910,7 +910,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam )
for (i=0; i<MAXSUBTOTAL; i++)
delete pCompString[i];
- rParam.nRow2 = nEndRow; // neues Ende
+ rParam.nRow2 = nEndRow; // neues Ende
return bSpaceLeft;
}
@@ -931,9 +931,9 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
BOOL* pPasst = ( nEntryCount <= nFixedBools ? &aBool[0] : new BOOL[nEntryCount] );
BOOL* pTest = ( nEntryCount <= nFixedBools ? &aTest[0] : new BOOL[nEntryCount] );
- long nPos = -1;
- SCSIZE i = 0;
- BOOL bMatchWholeCell = pDocument->GetDocOptions().IsMatchWholeCell();
+ long nPos = -1;
+ SCSIZE i = 0;
+ BOOL bMatchWholeCell = pDocument->GetDocOptions().IsMatchWholeCell();
CollatorWrapper* pCollator = (rParam.bCaseSens ? ScGlobal::GetCaseCollator() :
ScGlobal::GetCollator());
::utl::TransliterationWrapper* pTransliteration = (rParam.bCaseSens ?
@@ -958,7 +958,7 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
}
else if ( !rEntry.bQueryByString && (pCell ? pCell->HasValueData() :
HasValueData( static_cast<SCCOL>(rEntry.nField), nRow)))
- { // by Value
+ { // by Value
double nCellVal;
if ( pCell )
{
@@ -978,11 +978,11 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
else
nCellVal = GetValue( static_cast<SCCOL>(rEntry.nField), nRow );
- /* NOTE: lcl_PrepareQuery() prepares a filter query such that if a
- * date+time format was queried rEntry.bQueryByDate is not set. In
- * case other queries wanted to use this mechanism they should do
- * the same, in other words only if rEntry.nVal is an integer value
- * rEntry.bQueryByDate should be true and the time fraction be
+ /* NOTE: lcl_PrepareQuery() prepares a filter query such that if a
+ * date+time format was queried rEntry.bQueryByDate is not set. In
+ * case other queries wanted to use this mechanism they should do
+ * the same, in other words only if rEntry.nVal is an integer value
+ * rEntry.bQueryByDate should be true and the time fraction be
* stripped here. */
if (rEntry.bQueryByDate)
{
@@ -991,15 +991,15 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
if (pEntry)
{
short nNumFmtType = pEntry->GetType();
- /* NOTE: Omitting the check for absence of
- * NUMBERFORMAT_TIME would include also date+time formatted
- * values of the same day. That may be desired in some
- * cases, querying all time values of a day, but confusing
- * in other cases. A user can always setup a standard
+ /* NOTE: Omitting the check for absence of
+ * NUMBERFORMAT_TIME would include also date+time formatted
+ * values of the same day. That may be desired in some
+ * cases, querying all time values of a day, but confusing
+ * in other cases. A user can always setup a standard
* filter query for x >= date AND x < date+1 */
if ((nNumFmtType & NUMBERFORMAT_DATE) && !(nNumFmtType & NUMBERFORMAT_TIME))
{
- // The format is of date type. Strip off the time
+ // The format is of date type. Strip off the time
// element.
nCellVal = ::rtl::math::approxFloor(nCellVal);
}
@@ -1037,15 +1037,15 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
}
}
else if ( (rEntry.eOp == SC_EQUAL || rEntry.eOp == SC_NOT_EQUAL) ||
- (rEntry.eOp == SC_CONTAINS || rEntry.eOp == SC_DOES_NOT_CONTAIN ||
+ (rEntry.eOp == SC_CONTAINS || rEntry.eOp == SC_DOES_NOT_CONTAIN ||
rEntry.eOp == SC_BEGINS_WITH || rEntry.eOp == SC_ENDS_WITH ||
rEntry.eOp == SC_DOES_NOT_BEGIN_WITH || rEntry.eOp == SC_DOES_NOT_END_WITH) ||
(rEntry.bQueryByString && (pCell ? pCell->HasStringData() :
HasStringData(
static_cast<SCCOL>(rEntry.nField),
nRow))))
- { // by String
- String aCellStr;
+ { // by String
+ String aCellStr;
if( rEntry.eOp == SC_CONTAINS || rEntry.eOp == SC_DOES_NOT_CONTAIN
|| rEntry.eOp == SC_BEGINS_WITH || rEntry.eOp == SC_ENDS_WITH
|| rEntry.eOp == SC_DOES_NOT_BEGIN_WITH || rEntry.eOp == SC_DOES_NOT_END_WITH )
@@ -1062,7 +1062,7 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
GetInputString( static_cast<SCCOL>(rEntry.nField), nRow, aCellStr );
BOOL bRealRegExp = (rParam.bRegExp && ((rEntry.eOp == SC_EQUAL)
- || (rEntry.eOp == SC_NOT_EQUAL) || (rEntry.eOp == SC_CONTAINS)
+ || (rEntry.eOp == SC_NOT_EQUAL) || (rEntry.eOp == SC_CONTAINS)
|| (rEntry.eOp == SC_DOES_NOT_CONTAIN) || (rEntry.eOp == SC_BEGINS_WITH)
|| (rEntry.eOp == SC_ENDS_WITH) || (rEntry.eOp == SC_DOES_NOT_BEGIN_WITH)
|| (rEntry.eOp == SC_DOES_NOT_END_WITH)));
@@ -1073,7 +1073,7 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
{
xub_StrLen nStart = 0;
xub_StrLen nEnd = aCellStr.Len();
-
+
// from 614 on, nEnd is behind the found text
BOOL bMatch = FALSE;
if ( rEntry.eOp == SC_ENDS_WITH || rEntry.eOp == SC_DOES_NOT_END_WITH )
@@ -1082,7 +1082,7 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
nStart = aCellStr.Len();
bMatch = (BOOL) rEntry.GetSearchTextPtr( rParam.bCaseSens )
->SearchBkwrd( aCellStr, &nStart, &nEnd );
- }
+ }
else
{
bMatch = (BOOL) rEntry.GetSearchTextPtr( rParam.bCaseSens )
@@ -1152,7 +1152,7 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
String aQuer( pTransliteration->transliterate(
*rEntry.pStr, ScGlobal::eLnge, 0, rEntry.pStr->Len(),
NULL ) );
- xub_StrLen nIndex = (rEntry.eOp == SC_ENDS_WITH
+ xub_StrLen nIndex = (rEntry.eOp == SC_ENDS_WITH
|| rEntry.eOp == SC_DOES_NOT_END_WITH)? (aCell.Len()-aQuer.Len()):0;
xub_StrLen nStrPos = aCell.Search( aQuer, nIndex );
switch (rEntry.eOp)
@@ -1289,7 +1289,7 @@ void ScTable::TopTenQuery( ScQueryParam& rParam )
case SC_BOTPERC:
{
ScSortParam aLocalSortParam( rParam, static_cast<SCCOL>(rEntry.nField) );
- aSortParam = aLocalSortParam; // used in CreateSortInfoArray, Compare
+ aSortParam = aLocalSortParam; // used in CreateSortInfoArray, Compare
if ( !bSortCollatorInitialized )
{
bSortCollatorInitialized = TRUE;
@@ -1311,9 +1311,9 @@ void ScTable::TopTenQuery( ScQueryParam& rParam )
if ( nValidCount > 0 )
{
if ( rEntry.bQueryByString )
- { // dat wird nix
+ { // dat wird nix
rEntry.bQueryByString = FALSE;
- rEntry.nVal = 10; // 10 bzw. 10%
+ rEntry.nVal = 10; // 10 bzw. 10%
}
SCSIZE nVal = (rEntry.nVal >= 1 ? static_cast<SCSIZE>(rEntry.nVal) : 1);
SCSIZE nOffset = 0;
@@ -1324,7 +1324,7 @@ void ScTable::TopTenQuery( ScQueryParam& rParam )
rEntry.eOp = SC_GREATER_EQUAL;
if ( nVal > nValidCount )
nVal = nValidCount;
- nOffset = nValidCount - nVal; // 1 <= nVal <= nValidCount
+ nOffset = nValidCount - nVal; // 1 <= nVal <= nValidCount
}
break;
case SC_BOTVAL:
@@ -1332,7 +1332,7 @@ void ScTable::TopTenQuery( ScQueryParam& rParam )
rEntry.eOp = SC_LESS_EQUAL;
if ( nVal > nValidCount )
nVal = nValidCount;
- nOffset = nVal - 1; // 1 <= nVal <= nValidCount
+ nOffset = nVal - 1; // 1 <= nVal <= nValidCount
}
break;
case SC_TOPPERC:
@@ -1465,16 +1465,16 @@ static void lcl_PrepareQuery( ScDocument* pDoc, ScTable* pTab, ScQueryParam& rPa
SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
{
ScQueryParam aParam( rParamOrg );
- ScStrCollection aScStrCollection;
- StrData* pStrData = NULL;
+ ScStrCollection aScStrCollection;
+ StrData* pStrData = NULL;
- BOOL bStarted = FALSE;
- BOOL bOldResult = TRUE;
- SCROW nOldStart = 0;
- SCROW nOldEnd = 0;
+ BOOL bStarted = FALSE;
+ BOOL bOldResult = TRUE;
+ SCROW nOldStart = 0;
+ SCROW nOldEnd = 0;
- SCSIZE nCount = 0;
- SCROW nOutRow = 0;
+ SCSIZE nCount = 0;
+ SCROW nOutRow = 0;
SCROW nHeader = aParam.bHasHeader ? 1 : 0;
SCSIZE nEntryCount = aParam.GetEntryCount();
@@ -1491,9 +1491,9 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
for (SCROW j=aParam.nRow1 + nHeader; j<=aParam.nRow2; j++)
{
- BOOL bResult; // Filterergebnis
+ BOOL bResult; // Filterergebnis
BOOL bValid = ValidQuery(j, aParam, pSpecial);
- if (!bValid && bKeepSub) // Subtotals stehenlassen
+ if (!bValid && bKeepSub) // Subtotals stehenlassen
{
for (SCCOL nCol=aParam.nCol1; nCol<=aParam.nCol2 && !bValid; nCol++)
{
@@ -1572,14 +1572,14 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
BOOL ScTable::CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam)
{
- BOOL bValid = TRUE;
+ BOOL bValid = TRUE;
SCCOL* pFields = new SCCOL[nCol2-nCol1+1];
- String aCellStr;
- SCCOL nCol = nCol1;
+ String aCellStr;
+ SCCOL nCol = nCol1;
DBG_ASSERT( rQueryParam.nTab != SCTAB_MAX, "rQueryParam.nTab no value, not bad but no good" );
- SCTAB nDBTab = (rQueryParam.nTab == SCTAB_MAX ? nTab : rQueryParam.nTab);
- SCROW nDBRow1 = rQueryParam.nRow1;
- SCCOL nDBCol2 = rQueryParam.nCol2;
+ SCTAB nDBTab = (rQueryParam.nTab == SCTAB_MAX ? nTab : rQueryParam.nTab);
+ SCROW nDBRow1 = rQueryParam.nRow1;
+ SCCOL nDBCol2 = rQueryParam.nCol2;
// Erste Zeile muessen Spaltenkoepfe sein
while (bValid && (nCol <= nCol2))
{
@@ -1669,9 +1669,9 @@ BOOL ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2
SCSIZE nIndex = 0;
SCROW nRow = nRow1;
DBG_ASSERT( rQueryParam.nTab != SCTAB_MAX, "rQueryParam.nTab no value, not bad but no good" );
- SCTAB nDBTab = (rQueryParam.nTab == SCTAB_MAX ? nTab : rQueryParam.nTab);
- SCROW nDBRow1 = rQueryParam.nRow1;
- SCCOL nDBCol2 = rQueryParam.nCol2;
+ SCTAB nDBTab = (rQueryParam.nTab == SCTAB_MAX ? nTab : rQueryParam.nTab);
+ SCROW nDBRow1 = rQueryParam.nRow1;
+ SCCOL nDBCol2 = rQueryParam.nCol2;
SCSIZE nNewEntries = static_cast<SCSIZE>(nRow2-nRow1+1);
rQueryParam.Resize( nNewEntries );
@@ -1775,13 +1775,13 @@ BOOL ScTable::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow
nCount = rQueryParam.GetEntryCount();
if (bValid)
{
- // bQueryByString muss gesetzt sein
+ // bQueryByString muss gesetzt sein
for (i=0; i < nCount; i++)
rQueryParam.GetEntry(i).bQueryByString = TRUE;
}
else
{
- // nix
+ // nix
for (i=0; i < nCount; i++)
rQueryParam.GetEntry(i).Clear();
}
@@ -1874,7 +1874,7 @@ ULONG ScTable::GetWeightedCount() const
ULONG nCellCount = 0;
for ( SCCOL nCol=0; nCol<=MAXCOL; nCol++ )
- if ( aCol[nCol].GetCellCount() ) // GetCellCount ist inline
+ if ( aCol[nCol].GetCellCount() ) // GetCellCount ist inline
nCellCount += aCol[nCol].GetWeightedCount();
return nCellCount;
@@ -1885,7 +1885,7 @@ ULONG ScTable::GetCodeCount() const
ULONG nCodeCount = 0;
for ( SCCOL nCol=0; nCol<=MAXCOL; nCol++ )
- if ( aCol[nCol].GetCellCount() ) // GetCellCount ist inline
+ if ( aCol[nCol].GetCellCount() ) // GetCellCount ist inline
nCodeCount += aCol[nCol].GetCodeCount();
return nCodeCount;
@@ -1900,7 +1900,7 @@ sal_Int32 ScTable::GetMaxStringLen( SCCOL nCol, SCROW nRowStart,
return 0;
}
-xub_StrLen ScTable::GetMaxNumberStringLen(
+xub_StrLen ScTable::GetMaxNumberStringLen(
sal_uInt16& nPrecision, SCCOL nCol, SCROW nRowStart, SCROW nRowEnd ) const
{
if ( ValidCol(nCol) )
@@ -1913,8 +1913,8 @@ void ScTable::UpdateSelectionFunction( ScFunctionData& rData,
SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
const ScMarkData& rMark )
{
- // Cursor neben einer Markierung nicht beruecksichtigen:
- //! nur noch MarkData uebergeben, Cursorposition ggf. hineinselektieren!!!
+ // Cursor neben einer Markierung nicht beruecksichtigen:
+ //! nur noch MarkData uebergeben, Cursorposition ggf. hineinselektieren!!!
BOOL bSingle = ( rMark.IsMarked() || !rMark.IsMultiMarked() );
// Mehrfachselektion:
@@ -1927,7 +1927,7 @@ void ScTable::UpdateSelectionFunction( ScFunctionData& rData,
bSingle && ( nCol >= nStartCol && nCol <= nEndCol ),
nStartRow, nEndRow );
- // Einfachselektion (oder Cursor) nur wenn nicht negativ (und s.o.):
+ // Einfachselektion (oder Cursor) nur wenn nicht negativ (und s.o.):
if ( bSingle && !rMark.IsMarkNegative() )
for (nCol=nStartCol; nCol<=nEndCol && !rData.bError; nCol++)
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 434144d06e00..cbb4f01817ce 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#define _D_MAX_LONG_ (double) 0x7fffffff
-extern USHORT nScFillModeMouseModifier; // global.cxx
+extern USHORT nScFillModeMouseModifier; // global.cxx
// -----------------------------------------------------------------------
@@ -111,9 +111,9 @@ short lcl_DecompValueString( String& aValue, sal_Int32& nVal, USHORT* pMinDigits
// prefer the one at the beginning only if it's followed by a space.
// Otherwise, use the number at the end, to enable things like IP addresses.
if ( nNum > nNeg && ( cNext == 0 || cNext == ' ' || !CharClass::isAsciiNumeric(cLast) ) )
- { // number at the beginning
+ { // number at the beginning
nVal = aValue.Copy( 0, nNum ).ToInt32();
- // #60893# any number with a leading zero sets the minimum number of digits
+ // #60893# any number with a leading zero sets the minimum number of digits
if ( p[nNeg] == '0' && pMinDigits && ( nNum - nNeg > *pMinDigits ) )
*pMinDigits = nNum - nNeg;
aValue.Erase( 0, nNum );
@@ -131,9 +131,9 @@ short lcl_DecompValueString( String& aValue, sal_Int32& nVal, USHORT* pMinDigits
nNeg = 1;
}
if ( nNum < nEnd - nNeg )
- { // number at the end
+ { // number at the end
nVal = aValue.Copy( nNum + 1 ).ToInt32();
- // #60893# any number with a leading zero sets the minimum number of digits
+ // #60893# any number with a leading zero sets the minimum number of digits
if ( p[nNum+1+nNeg] == '0' && pMinDigits && ( nEnd - nNum - nNeg > *pMinDigits ) )
*pMinDigits = nEnd - nNum - nNeg;
aValue.Erase( nNum + 1 );
@@ -147,7 +147,7 @@ short lcl_DecompValueString( String& aValue, sal_Int32& nVal, USHORT* pMinDigits
String lcl_ValueString( sal_Int32 nValue, USHORT nMinDigits )
{
if ( nMinDigits <= 1 )
- return String::CreateFromInt32( nValue ); // simple case...
+ return String::CreateFromInt32( nValue ); // simple case...
else
{
String aStr = String::CreateFromInt32( Abs( nValue ) );
@@ -157,7 +157,7 @@ String lcl_ValueString( sal_Int32 nValue, USHORT nMinDigits )
aZero.Fill( nMinDigits - aStr.Len(), '0' );
aStr.Insert( aZero, 0 );
}
- // nMinDigits doesn't include the '-' sign -> add after inserting zeros
+ // nMinDigits doesn't include the '-' sign -> add after inserting zeros
if ( nValue < 0 )
aStr.Insert( '-', 0 );
return aStr;
@@ -199,7 +199,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
rListData = NULL;
rCmd = FILL_SIMPLE;
if ( nScFillModeMouseModifier & KEY_MOD1 )
- return ; // Ctrl-Taste: Copy
+ return ; // Ctrl-Taste: Copy
SCCOL nAddX;
SCROW nAddY;
@@ -285,7 +285,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
nRow = sal::static_int_cast<SCROW>( nRow + nAddY );
}
else
- bVal = FALSE; // #50965# kein Datum passt auch nicht
+ bVal = FALSE; // #50965# kein Datum passt auch nicht
}
if (bVal)
{
@@ -300,7 +300,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
}
}
}
- else // einzelnes Datum -> Tage hochzaehlen
+ else // einzelnes Datum -> Tage hochzaehlen
{
rCmd = FILL_DATE;
rDateCmd = FILL_DAY;
@@ -359,8 +359,8 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
}
else if ( nCount > 1 )
{
- // pass rMinDigits to all DecompValueString calls
- // -> longest number defines rMinDigits
+ // pass rMinDigits to all DecompValueString calls
+ // -> longest number defines rMinDigits
sal_Int32 nVal1;
short nFlag1 = lcl_DecompValueString( aStr, nVal1, &rMinDigits );
@@ -408,7 +408,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
}
else
{
- // call DecompValueString to set rMinDigits
+ // call DecompValueString to set rMinDigits
sal_Int32 nDummy;
lcl_DecompValueString( aStr, nDummy, &rMinDigits );
}
@@ -418,11 +418,11 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
void ScTable::FillFormula(ULONG& /* nFormulaCounter */, BOOL /* bFirst */, ScFormulaCell* pSrcCell,
SCCOL nDestCol, SCROW nDestRow, BOOL bLast )
{
-/* USHORT nTokArrLen = pSrcCell->GetTokenArrayLen();
- if ( nTokArrLen > 15 ) // mehr als =A1 oder =67
+/* USHORT nTokArrLen = pSrcCell->GetTokenArrayLen();
+ if ( nTokArrLen > 15 ) // mehr als =A1 oder =67
{
ScRangeName* pRangeName = pDocument->GetRangeName();
- String aName("___SC_"); // Wird dieser String veraendert,
+ String aName("___SC_"); // Wird dieser String veraendert,
// auch in document2 EraseNonUsed...
// mitaendern!!
aName += pRangeName->GetSharedMaxIndex() + 1;
@@ -455,8 +455,8 @@ void ScTable::FillFormula(ULONG& /* nFormulaCounter */, BOOL /* bFirst */, ScFor
aCol[nDestCol].Insert(nDestRow, pDestCell);
}
else
-*/ {
- pDocument->SetNoListening( TRUE ); // noch falsche Referenzen
+*/ {
+ pDocument->SetNoListening( TRUE ); // noch falsche Referenzen
ScAddress aAddr( nDestCol, nDestRow, nTab );
ScFormulaCell* pDestCell = new ScFormulaCell( *pSrcCell, *pDocument, aAddr );
aCol[nDestCol].Insert(nDestRow, pDestCell);
@@ -509,7 +509,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
return;
//
- // Richtung auswerten
+ // Richtung auswerten
//
BOOL bVertical = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_TOP);
@@ -517,7 +517,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
ULONG nCol = 0;
ULONG nRow = 0;
- ULONG& rInner = bVertical ? nRow : nCol; // Schleifenvariablen
+ ULONG& rInner = bVertical ? nRow : nCol; // Schleifenvariablen
ULONG& rOuter = bVertical ? nCol : nRow;
ULONG nOStart;
ULONG nOEnd;
@@ -575,15 +575,15 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
ULONG nProgress = rProgress.GetState();
//
- // ausfuehren
+ // ausfuehren
//
ULONG nActFormCnt = 0;
for (rOuter = nOStart; rOuter <= nOEnd; rOuter++)
{
- ULONG nMaxFormCnt = 0; // fuer Formeln
+ ULONG nMaxFormCnt = 0; // fuer Formeln
- // Attributierung uebertragen
+ // Attributierung uebertragen
const ScPatternAttr* pSrcPattern = NULL;
const ScStyleSheet* pStyleSheet = NULL;
@@ -597,13 +597,13 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
{
if ( pNewPattern )
delete pNewPattern;
- if (bVertical) // rInner&:=nRow, rOuter&:=nCol
+ if (bVertical) // rInner&:=nRow, rOuter&:=nCol
pSrcPattern = aCol[nCol].GetPattern(static_cast<SCROW>(nAtSrc));
else // rInner&:=nCol, rOuter&:=nRow
pSrcPattern = aCol[nAtSrc].GetPattern(static_cast<SCROW>(nRow));
bGetPattern = FALSE;
pStyleSheet = pSrcPattern->GetStyleSheet();
- // Merge/Mergeflag nicht uebernehmen,
+ // Merge/Mergeflag nicht uebernehmen,
const SfxItemSet& rSet = pSrcPattern->GetItemSet();
if ( rSet.GetItemState(ATTR_MERGE, FALSE) == SFX_ITEM_SET
|| rSet.GetItemState(ATTR_MERGE_FLAG, FALSE) == SFX_ITEM_SET )
@@ -619,10 +619,10 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
if ( bVertical && nISrcStart == nISrcEnd )
{
- // Attribute komplett am Stueck setzen
+ // Attribute komplett am Stueck setzen
if (pNewPattern || pSrcPattern != pDocument->GetDefPattern())
{
- // Default steht schon da (DeleteArea)
+ // Default steht schon da (DeleteArea)
SCROW nY1 = static_cast<SCROW>(Min( nIStart, nIEnd ));
SCROW nY2 = static_cast<SCROW>(Max( nIStart, nIEnd ));
if ( pStyleSheet )
@@ -632,17 +632,17 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
else
aCol[nCol].ApplyPatternArea( nY1, nY2, *pSrcPattern );
}
- break; // Schleife abbrechen
+ break; // Schleife abbrechen
}
if ( pSrcPattern != aCol[nCol].GetPattern( static_cast<SCROW>(nRow) ) )
{
- // Vorlage auch uebernehmen
- //! am AttrArray mit ApplyPattern zusammenfassen ??
+ // Vorlage auch uebernehmen
+ //! am AttrArray mit ApplyPattern zusammenfassen ??
if ( pStyleSheet )
aCol[nCol].ApplyStyle( static_cast<SCROW>(nRow), *pStyleSheet );
- // ApplyPattern statt SetPattern um alte MergeFlags stehenzulassen
+ // ApplyPattern statt SetPattern um alte MergeFlags stehenzulassen
if ( pNewPattern )
aCol[nCol].ApplyPattern( static_cast<SCROW>(nRow), *pNewPattern );
else
@@ -652,7 +652,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
if (nAtSrc==nISrcEnd)
{
if ( nAtSrc != nISrcStart )
- { // mehr als eine Source-Zelle
+ { // mehr als eine Source-Zelle
nAtSrc = nISrcStart;
bGetPattern = TRUE;
}
@@ -674,7 +674,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
if ( pNewPattern )
delete pNewPattern;
- // Analyse
+ // Analyse
FillCmd eFillCmd;
FillDateCmd eDateCmd;
@@ -699,7 +699,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
USHORT nListCount = pListData->GetSubCount();
if ( !bPositive )
{
- // nListIndex auf FillAnalyse zeigt auf den letzten Eintrag -> anpassen
+ // nListIndex auf FillAnalyse zeigt auf den letzten Eintrag -> anpassen
ULONG nSub = nISrcStart - nISrcEnd;
for (ULONG i=0; i<nSub; i++)
{
@@ -729,7 +729,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
nProgress += nIMax - nIMin + 1;
rProgress.SetStateOnPercent( nProgress );
}
- else if (eFillCmd == FILL_SIMPLE) // Auffuellen mit Muster
+ else if (eFillCmd == FILL_SIMPLE) // Auffuellen mit Muster
{
ULONG nSource = nISrcStart;
double nDelta;
@@ -756,9 +756,9 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
{
if ( bGetCell )
{
- if (bVertical) // rInner&:=nRow, rOuter&:=nCol
+ if (bVertical) // rInner&:=nRow, rOuter&:=nCol
pSrcCell = aCol[nCol].GetCell( static_cast<SCROW>(nSource) );
- else // rInner&:=nCol, rOuter&:=nRow
+ else // rInner&:=nCol, rOuter&:=nRow
pSrcCell = aCol[nSource].GetCell( static_cast<SCROW>(nRow) );
bGetCell = FALSE;
if ( pSrcCell )
@@ -777,7 +777,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
((ScEditCell*)pSrcCell)->GetString( aValue );
if ( !(nScFillModeMouseModifier & KEY_MOD1) )
{
- nCellDigits = 0; // look at each source cell individually
+ nCellDigits = 0; // look at each source cell individually
nHeadNoneTail = lcl_DecompValueString(
aValue, nStringValue, &nCellDigits );
@@ -857,7 +857,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
if (nSource==nISrcEnd)
{
if ( nSource != nISrcStart )
- { // mehr als eine Source-Zelle
+ { // mehr als eine Source-Zelle
nSource = nISrcStart;
bGetCell = TRUE;
}
@@ -882,8 +882,8 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
bGetCell = TRUE;
}
- // Progress in der inneren Schleife nur bei teuren Zellen,
- // und auch dann nicht fuer jede einzelne
+ // Progress in der inneren Schleife nur bei teuren Zellen,
+ // und auch dann nicht fuer jede einzelne
++nProgress;
if ( eCellType == CELLTYPE_FORMULA || eCellType == CELLTYPE_EDIT )
@@ -928,29 +928,29 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
long nIndex = 0;
ULONG nSrcCount = 0;
FillDir eFillDir = FILL_TO_BOTTOM;
- if ( nEndX == nCol2 && nEndY == nRow2 ) // leer
+ if ( nEndX == nCol2 && nEndY == nRow2 ) // leer
bOk = FALSE;
- else if ( nEndX == nCol2 ) // nach oben/unten
+ else if ( nEndX == nCol2 ) // nach oben/unten
{
- nEndX = nCol2 = nCol1; // nur erste Spalte ansehen
+ nEndX = nCol2 = nCol1; // nur erste Spalte ansehen
nSrcCount = nRow2 - nRow1 + 1;
- nIndex = ((long)nEndY) - nRow1; // kann negativ werden
+ nIndex = ((long)nEndY) - nRow1; // kann negativ werden
if ( nEndY >= nRow1 )
eFillDir = FILL_TO_BOTTOM;
else
eFillDir = FILL_TO_TOP;
}
- else if ( nEndY == nRow2 ) // nach links/rechts
+ else if ( nEndY == nRow2 ) // nach links/rechts
{
- nEndY = nRow2 = nRow1; // nur erste Zeile ansehen
+ nEndY = nRow2 = nRow1; // nur erste Zeile ansehen
nSrcCount = nCol2 - nCol1 + 1;
- nIndex = ((long)nEndX) - nCol1; // kann negativ werden
+ nIndex = ((long)nEndX) - nCol1; // kann negativ werden
if ( nEndX >= nCol1 )
eFillDir = FILL_TO_RIGHT;
else
eFillDir = FILL_TO_LEFT;
}
- else // Richtung nicht eindeutig
+ else // Richtung nicht eindeutig
bOk = FALSE;
if ( bOk )
@@ -964,19 +964,19 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
FillAnalyse(nCol1,nRow1, nCol2,nRow2, eFillCmd,eDateCmd, nInc,nMinDigits, pListData,nListIndex);
- if ( pListData ) // benutzerdefinierte Liste
+ if ( pListData ) // benutzerdefinierte Liste
{
USHORT nListCount = pListData->GetSubCount();
if ( nListCount )
{
- ULONG nSub = nSrcCount - 1; // nListIndex ist vom letzten Source-Eintrag
+ ULONG nSub = nSrcCount - 1; // nListIndex ist vom letzten Source-Eintrag
while ( nIndex < sal::static_int_cast<long>(nSub) )
nIndex += nListCount;
ULONG nPos = ( nListIndex + nIndex - nSub ) % nListCount;
aValue = pListData->GetSubStr(sal::static_int_cast<USHORT>(nPos));
}
}
- else if ( eFillCmd == FILL_SIMPLE ) // Auffuellen mit Muster
+ else if ( eFillCmd == FILL_SIMPLE ) // Auffuellen mit Muster
{
long nPosIndex = nIndex;
while ( nPosIndex < 0 )
@@ -989,14 +989,14 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
else
nSrcX = sal::static_int_cast<SCCOL>( nSrcX + static_cast<SCCOL>(nPos) );
- ScBaseCell* pCell = GetCell( nSrcX, nSrcY );
+ ScBaseCell* pCell = GetCell( nSrcX, nSrcY );
if ( pCell )
{
sal_Int32 nDelta;
if (nIndex >= 0)
nDelta = nIndex / nSrcCount;
else
- nDelta = ( nIndex - nSrcCount + 1 ) / nSrcCount; // -1 -> -1
+ nDelta = ( nIndex - nSrcCount + 1 ) / nSrcCount; // -1 -> -1
CellType eType = pCell->GetCellType();
switch ( eType )
@@ -1011,7 +1011,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
if ( !(nScFillModeMouseModifier & KEY_MOD1) )
{
sal_Int32 nVal;
- USHORT nCellDigits = 0; // look at each source cell individually
+ USHORT nCellDigits = 0; // look at each source cell individually
short nFlag = lcl_DecompValueString( aValue, nVal, &nCellDigits );
if ( nFlag < 0 )
{
@@ -1027,7 +1027,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
break;
case CELLTYPE_VALUE:
{
- // dabei kann's keinen Ueberlauf geben...
+ // dabei kann's keinen Ueberlauf geben...
double nVal = ((ScValueCell*)pCell)->GetValue();
if ( !(nScFillModeMouseModifier & KEY_MOD1) )
nVal += (double) nDelta;
@@ -1038,7 +1038,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
GetOutputString( nVal, nNumFmt, aValue, &pColor );
}
break;
- // Formeln nicht
+ // Formeln nicht
default:
{
// added to avoid warnings
@@ -1046,13 +1046,13 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
}
}
}
- else if ( eFillCmd == FILL_LINEAR || eFillCmd == FILL_DATE ) // Werte
+ else if ( eFillCmd == FILL_LINEAR || eFillCmd == FILL_DATE ) // Werte
{
BOOL bValueOk;
double nStart;
sal_Int32 nVal = 0;
short nHeadNoneTail = 0;
- ScBaseCell* pCell = GetCell( nCol1, nRow1 );
+ ScBaseCell* pCell = GetCell( nCol1, nRow1 );
if ( pCell )
{
CellType eType = pCell->GetCellType();
@@ -1090,7 +1090,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
bValueOk = ( SubTotal::SafeMult( nAdd, (double) nIndex ) &&
SubTotal::SafePlus( nStart, nAdd ) );
}
- else // Datum
+ else // Datum
{
bValueOk = TRUE;
USHORT nDayOfMonth = 0;
@@ -1119,7 +1119,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
}
else
{
- //! Zahlformat je nach Index holen?
+ //! Zahlformat je nach Index holen?
Color* pColor;
ULONG nNumFmt = GetNumberFormat( nCol1, nRow1 );
pDocument->GetFormatTable()->
@@ -1148,7 +1148,7 @@ void ScTable::IncDate(double& rVal, USHORT& nDayOfMonth, double nStep, FillDateC
const USHORT nMinYear = 1583;
const USHORT nMaxYear = 9956;
- long nInc = (long) nStep; // nach oben/unten begrenzen ?
+ long nInc = (long) nStep; // nach oben/unten begrenzen ?
Date aNullDate = *pDocument->GetFormatTable()->GetNullDate();
Date aDate = aNullDate;
aDate += (long)rVal;
@@ -1177,7 +1177,7 @@ void ScTable::IncDate(double& rVal, USHORT& nDayOfMonth, double nStep, FillDateC
case FILL_MONTH:
{
if ( nDayOfMonth == 0 )
- nDayOfMonth = aDate.GetDay(); // init
+ nDayOfMonth = aDate.GetDay(); // init
long nMonth = aDate.GetMonth();
long nYear = aDate.GetYear();
@@ -1196,7 +1196,7 @@ void ScTable::IncDate(double& rVal, USHORT& nDayOfMonth, double nStep, FillDateC
{
if (nMonth < 1)
{
- long nYAdd = 1 - nMonth / 12; // positiv
+ long nYAdd = 1 - nMonth / 12; // positiv
nMonth += nYAdd * 12;
nYear -= nYAdd;
}
@@ -1242,7 +1242,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
BOOL bAttribs, ScProgress& rProgress )
{
//
- // Richtung auswerten
+ // Richtung auswerten
//
BOOL bVertical = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_TOP);
@@ -1250,7 +1250,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
ULONG nCol = 0;
ULONG nRow = 0;
- ULONG& rInner = bVertical ? nRow : nCol; // Schleifenvariablen
+ ULONG& rInner = bVertical ? nRow : nCol; // Schleifenvariablen
ULONG& rOuter = bVertical ? nCol : nRow;
ULONG nOStart;
ULONG nOEnd;
@@ -1311,7 +1311,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
ULONG nProgress = rProgress.GetState();
//
- // ausfuehren
+ // ausfuehren
//
ULONG nActFormCnt = 0;
@@ -1339,7 +1339,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
{
CellType eCellType = pSrcCell->GetCellType();
- if (eFillCmd == FILL_SIMPLE) // kopieren
+ if (eFillCmd == FILL_SIMPLE) // kopieren
{
if (eCellType == CELLTYPE_FORMULA)
{
@@ -1386,8 +1386,8 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
{
case FILL_LINEAR:
{
- // #86365# use multiplication instead of repeated addition
- // to avoid accumulating rounding errors
+ // #86365# use multiplication instead of repeated addition
+ // to avoid accumulating rounding errors
nVal = nStartVal;
double nAdd = nStepValue;
if ( !SubTotal::SafeMult( nAdd, (double) ++nIndex ) ||
@@ -1413,7 +1413,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
if (nStepValue >= 0)
{
- if (nVal > nMaxValue) // Zielwert erreicht?
+ if (nVal > nMaxValue) // Zielwert erreicht?
{
nVal = nMaxValue;
bOverflow = TRUE;
@@ -1480,8 +1480,8 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
{
case FILL_LINEAR:
{
- // #86365# use multiplication instead of repeated addition
- // to avoid accumulating rounding errors
+ // #86365# use multiplication instead of repeated addition
+ // to avoid accumulating rounding errors
nVal = nStartVal;
double nAdd = nStepValue;
if ( !SubTotal::SafeMult( nAdd, (double) ++nIndex ) ||
@@ -1501,7 +1501,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
if (nStepValue >= 0)
{
- if (nVal > nMaxValue) // Zielwert erreicht?
+ if (nVal > nMaxValue) // Zielwert erreicht?
{
nVal = nMaxValue;
bOverflow = TRUE;
@@ -1577,9 +1577,9 @@ void ScTable::Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
FillSeries(nCol1, nRow1, nCol2, nRow2, nFillCount, eFillDir,
eFillCmd, eFillDateCmd, nStepValue, nMaxValue, 0, TRUE, aProgress);
- if (bSharedNameInserted) // Wurde Shared-Name eingefuegt?
+ if (bSharedNameInserted) // Wurde Shared-Name eingefuegt?
pDocument->GetRangeName()->SetSharedMaxIndex(
- pDocument->GetRangeName()->GetSharedMaxIndex()+1); // dann hochzaehlen
+ pDocument->GetRangeName()->GetSharedMaxIndex()+1); // dann hochzaehlen
}
@@ -1592,7 +1592,7 @@ void ScTable::AutoFormatArea(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC
ScAutoFormatData* pData = (*pAutoFormat)[nFormatNo];
if (pData)
{
-// ScPatternAttr aPattern(pDocument->GetPool());
+// ScPatternAttr aPattern(pDocument->GetPool());
// pData->FillToItemSet(nIndex, aPattern.GetItemSet(), *pDocument);
ApplyPatternArea(nStartCol, nStartRow, nEndCol, nEndRow, rAttr);
}
@@ -1744,7 +1744,7 @@ void ScTable::AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW
void ScTable::GetAutoFormatAttr(SCCOL nCol, SCROW nRow, USHORT nIndex, ScAutoFormatData& rData)
{
UINT32 nFormatIndex = GetNumberFormat( nCol, nRow );
- ScNumFormatAbbrev aNumFormat( nFormatIndex, *pDocument->GetFormatTable() );
+ ScNumFormatAbbrev aNumFormat( nFormatIndex, *pDocument->GetFormatTable() );
rData.GetFromItemSet( nIndex, GetPattern( nCol, nRow )->GetItemSet(), aNumFormat );
}
@@ -1909,7 +1909,7 @@ void ScTable::UpdateInsertTabAbs(SCTAB nTable)
BOOL ScTable::GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, BOOL bInSel,
const ScMarkData& rMark) const
{
- if (rRow == MAXROW+2) // Tabellenende
+ if (rRow == MAXROW+2) // Tabellenende
{
rRow = 0;
rCol = 0;
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index 7c13756aab38..64e0577a28c0 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using ::std::set;
// STATIC DATA -----------------------------------------------------------
-#define GET_SCALEVALUE(set,id) ((const SfxUInt16Item&)(set.Get( id ))).GetValue()
+#define GET_SCALEVALUE(set,id) ((const SfxUInt16Item&)(set.Get( id ))).GetValue()
void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
@@ -70,14 +70,14 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
if ( pDocument->IsImportingXML() )
return;
- // pUserArea != NULL -> print area is specified. We need to force-update
+ // pUserArea != NULL -> print area is specified. We need to force-update
// the page breaks.
if (!pUserArea)
{
if (!bPageSizeValid)
return;
-
+
if (mbPageBreaksValid)
return;
}
@@ -109,7 +109,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
USHORT nAreaCount = GetPrintRangeCount();
if ( nAreaCount > 1 )
{
- // bei mehreren Bereichen nichts anzeigen:
+ // bei mehreren Bereichen nichts anzeigen:
for (nX=0; nX<MAXCOL; nX++)
RemoveColBreak(nX, true, false);
@@ -128,7 +128,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
nEndCol = pArea->aEnd.Col();
nEndRow = pArea->aEnd.Row();
}
- } // sonst alles
+ } // sonst alles
}
// get bSkipColBreaks/bSkipRowBreaks flags:
@@ -157,7 +157,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
long nPageSizeX = aPageSizeTwips.Width();
long nPageSizeY = aPageSizeTwips.Height();
- // Anfang: Breaks loeschen
+ // Anfang: Breaks loeschen
for (nX=0; nX<nStartCol; nX++)
RemoveColBreak(nX, true, false);
@@ -168,7 +168,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
if (nStartRow > 0)
SetRowBreak(nStartRow, true, false); // AREABREAK
- // Mittelteil: Breaks verteilen
+ // Mittelteil: Breaks verteilen
BOOL bRepeatCol = ( nRepeatStartX != SCCOL_REPEAT_NONE );
BOOL bColFound = FALSE;
@@ -220,7 +220,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
long nThisY = 0;
if (!bThisRowHidden)
{
- sal_uInt16 nTmp;
+ sal_uInt16 nTmp;
aIterHeights.getValue(nY, nTmp);
nThisY = static_cast<long>(nTmp);
}
@@ -276,7 +276,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
SCROW nLastCommon = ::std::min(nLastHidden, nLastHeight);
if (nNextManualBreak >= 0)
nLastCommon = ::std::min(nLastCommon, nNextManualBreak-1);
-
+
if (nLastCommon > nY)
{
long nMaxMultiple = static_cast<long>(nLastCommon - nY);
@@ -294,7 +294,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
nSizeY += nThisY;
}
- // Ende: Breaks loeschen
+ // Ende: Breaks loeschen
if (nEndCol < MAXCOL)
{
@@ -349,7 +349,7 @@ void ScTable::GetAllRowBreaks(set<SCROW>& rBreaks, bool bPage, bool bManual) con
if (bManual)
{
- using namespace std;
+ using namespace std;
copy(maRowManualBreaks.begin(), maRowManualBreaks.end(), inserter(rBreaks, rBreaks.begin()));
}
}
@@ -425,7 +425,7 @@ void ScTable::RemoveRowBreak(SCROW nRow, bool bPage, bool bManual)
maRowPageBreaks.erase(nRow);
if (bManual)
- {
+ {
maRowManualBreaks.erase(nRow);
InvalidatePageBreaks();
}
@@ -440,7 +440,7 @@ void ScTable::RemoveColBreak(SCCOL nCol, bool bPage, bool bManual)
maColPageBreaks.erase(nCol);
if (bManual)
- {
+ {
maColManualBreaks.erase(nCol);
InvalidatePageBreaks();
}
@@ -455,7 +455,7 @@ void ScTable::SetRowBreak(SCROW nRow, bool bPage, bool bManual)
maRowPageBreaks.insert(nRow);
if (bManual)
- {
+ {
maRowManualBreaks.insert(nRow);
InvalidatePageBreaks();
}
@@ -470,7 +470,7 @@ void ScTable::SetColBreak(SCCOL nCol, bool bPage, bool bManual)
maColPageBreaks.insert(nCol);
if (bManual)
- {
+ {
maColManualBreaks.insert(nCol);
InvalidatePageBreaks();
}
@@ -532,7 +532,7 @@ bool ScTable::RowHidden(SCROW nRow, SCROW* pFirstRow, SCROW* pLastRow) const
bool ScTable::RowHidden(SCROW nRow, SCROW& rLastRow) const
{
- rLastRow = nRow;
+ rLastRow = nRow;
if (!ValidRow(nRow))
return true;
@@ -562,7 +562,7 @@ bool ScTable::HasHiddenRows(SCROW nStartRow, SCROW nEndRow) const
bool ScTable::ColHidden(SCCOL nCol, SCCOL& rLastCol) const
{
- rLastCol = nCol;
+ rLastCol = nCol;
if (!ValidCol(nCol))
return true;
@@ -1051,7 +1051,7 @@ Size ScTable::GetPageSize() const
if ( bPageSizeValid )
return aPageSizeTwips;
else
- return Size(); // leer
+ return Size(); // leer
}
void ScTable::SetRepeatArea( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow )
@@ -1076,9 +1076,9 @@ void ScTable::SetPageStyle( const String& rName )
{
if ( aPageStyle != rName )
{
- String aStrNew = rName;
- SfxStyleSheetBasePool* pStylePool = pDocument->GetStyleSheetPool();
- SfxStyleSheetBase* pNewStyle = pStylePool->Find( aStrNew, SFX_STYLE_FAMILY_PAGE );
+ String aStrNew = rName;
+ SfxStyleSheetBasePool* pStylePool = pDocument->GetStyleSheetPool();
+ SfxStyleSheetBase* pNewStyle = pStylePool->Find( aStrNew, SFX_STYLE_FAMILY_PAGE );
if ( !pNewStyle )
{
@@ -1092,18 +1092,18 @@ void ScTable::SetPageStyle( const String& rName )
if ( pOldStyle && pNewStyle )
{
- SfxItemSet& rOldSet = pOldStyle->GetItemSet();
- SfxItemSet& rNewSet = pNewStyle->GetItemSet();
- const USHORT nOldScale = GET_SCALEVALUE(rOldSet,ATTR_PAGE_SCALE);
+ SfxItemSet& rOldSet = pOldStyle->GetItemSet();
+ SfxItemSet& rNewSet = pNewStyle->GetItemSet();
+ const USHORT nOldScale = GET_SCALEVALUE(rOldSet,ATTR_PAGE_SCALE);
const USHORT nOldScaleToPages = GET_SCALEVALUE(rOldSet,ATTR_PAGE_SCALETOPAGES);
- const USHORT nNewScale = GET_SCALEVALUE(rNewSet,ATTR_PAGE_SCALE);
+ const USHORT nNewScale = GET_SCALEVALUE(rNewSet,ATTR_PAGE_SCALE);
const USHORT nNewScaleToPages = GET_SCALEVALUE(rNewSet,ATTR_PAGE_SCALETOPAGES);
if ( (nOldScale != nNewScale) || (nOldScaleToPages != nNewScaleToPages) )
InvalidateTextWidth(NULL, NULL, FALSE, FALSE);
}
- if ( pNewStyle ) // auch ohne den alten (fuer UpdateStdNames)
+ if ( pNewStyle ) // auch ohne den alten (fuer UpdateStdNames)
aPageStyle = aStrNew;
if (IsStreamValid())
@@ -1130,7 +1130,7 @@ void ScTable::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* p
if ( bNumFormatChanged )
pCell->SetScriptType( SC_SCRIPTTYPE_UNKNOWN );
if ( bBroadcast )
- { // nur bei CalcAsShown
+ { // nur bei CalcAsShown
switch ( pCell->GetCellType() )
{
case CELLTYPE_VALUE :
@@ -1159,8 +1159,8 @@ void ScTable::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* p
for ( SCCOL nCol=nColStart; nCol<=nColEnd; nCol++ )
{
ScColumnIterator aIter( &aCol[nCol], nRowStart, nRowEnd );
- ScBaseCell* pCell = NULL;
- SCROW nRow = nRowStart;
+ ScBaseCell* pCell = NULL;
+ SCROW nRow = nRowStart;
while ( aIter.Next( nRow, pCell ) )
{
@@ -1168,7 +1168,7 @@ void ScTable::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* p
if ( bNumFormatChanged )
pCell->SetScriptType( SC_SCRIPTTYPE_UNKNOWN );
if ( bBroadcast )
- { // nur bei CalcAsShown
+ { // nur bei CalcAsShown
switch ( pCell->GetCellType() )
{
case CELLTYPE_VALUE :
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 500ac1bb3614..381cd9c00254 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
BOOL lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, String& rVal )
{
- // TRUE = more than 1 paragraph
+ // TRUE = more than 1 paragraph
const EditTextObject* pData = NULL;
rCell.GetData( pData );
@@ -64,11 +64,11 @@ BOOL lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, String& r
BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow,
const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc)
{
- BOOL bFound = FALSE;
- BOOL bDoSearch = TRUE;
- BOOL bDoBack = rSearchItem.GetBackward();
+ BOOL bFound = FALSE;
+ BOOL bDoSearch = TRUE;
+ BOOL bDoBack = rSearchItem.GetBackward();
- String aString;
+ String aString;
ScBaseCell* pCell;
if (rSearchItem.GetSelection())
bDoSearch = rMark.IsCellMarked(nCol, nRow);
@@ -159,8 +159,8 @@ BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo
BOOL bRepeat = !rSearchItem.GetWordOnly();
do
{
- // wenn der gefundene Text leer ist, nicht weitersuchen,
- // sonst wuerde man nie mehr aufhoeren (#35410#)
+ // wenn der gefundene Text leer ist, nicht weitersuchen,
+ // sonst wuerde man nie mehr aufhoeren (#35410#)
if ( nEnd < nStart || nEnd == STRING_MAXLEN )
bRepeat = FALSE;
@@ -178,7 +178,7 @@ BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo
aString.Insert(rSearchItem.GetReplaceString(), nStart);
}
- // Indizes anpassen
+ // Indizes anpassen
if (bDoBack)
{
nEnd = nStart;
@@ -190,7 +190,7 @@ BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo
nEnd = aString.Len();
}
- // weitersuchen ?
+ // weitersuchen ?
if (bRepeat)
{
if ( rSearchItem.GetCommand() != SVX_SEARCHCMD_REPLACE_ALL || nStart >= nEnd )
@@ -219,9 +219,9 @@ BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo
pNote->SetText( ScAddress( nCol, nRow, nTab ), aString );
}
else if ( cMatrixFlag != MM_NONE )
- { // #60558# Matrix nicht zerreissen
+ { // #60558# Matrix nicht zerreissen
if ( aString.Len() > 2 )
- { // {} raus, erst hier damit auch "{=" durch "{=..." ersetzt werden kann
+ { // {} raus, erst hier damit auch "{=" durch "{=..." ersetzt werden kann
if ( aString.GetChar( aString.Len()-1 ) == '}' )
aString.Erase( aString.Len()-1, 1 );
if ( aString.GetChar(0) == '{' )
@@ -382,7 +382,7 @@ BOOL ScTable::SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
SCCOL nCol = 0;
SCROW nRow = -1;
- ScMarkData aNewMark( rMark ); // Tabellen-Markierungen kopieren
+ ScMarkData aNewMark( rMark ); // Tabellen-Markierungen kopieren
aNewMark.ResetMark();
do
{
@@ -392,8 +392,8 @@ BOOL ScTable::SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
}
while (bFound);
- rMark = aNewMark; // Markierung kopieren
- //! pro Tabelle
+ rMark = aNewMark; // Markierung kopieren
+ //! pro Tabelle
return (aNewMark.IsMultiMarked());
}
@@ -430,15 +430,15 @@ BOOL ScTable::Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow
BOOL ScTable::ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
String& rUndoStr, ScDocument* pUndoDoc)
{
- BOOL bOldDouble = ScColumn::bDoubleAlloc; // sollte immer FALSE sein?
+ BOOL bOldDouble = ScColumn::bDoubleAlloc; // sollte immer FALSE sein?
DBG_ASSERT(!bOldDouble,"bDoubleAlloc ???");
- ScColumn::bDoubleAlloc = TRUE; // fuer Undo-Doc
+ ScColumn::bDoubleAlloc = TRUE; // fuer Undo-Doc
BOOL bFound = TRUE;
SCCOL nCol = 0;
SCROW nRow = -1;
- ScMarkData aNewMark( rMark ); // Tabellen-Markierungen kopieren
+ ScMarkData aNewMark( rMark ); // Tabellen-Markierungen kopieren
aNewMark.ResetMark();
do
{
@@ -450,8 +450,8 @@ BOOL ScTable::ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
ScColumn::bDoubleAlloc = bOldDouble;
- rMark = aNewMark; // Markierung kopieren
- //! pro Tabelle
+ rMark = aNewMark; // Markierung kopieren
+ //! pro Tabelle
return (aNewMark.IsMultiMarked());
}
@@ -472,7 +472,7 @@ BOOL ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW&
BOOL bBack = rSearchItem.GetBackward();
short nAdd = bBack ? -1 : 1;
- if (bRows) // zeilenweise
+ if (bRows) // zeilenweise
{
nRow += nAdd;
do
@@ -491,18 +491,18 @@ BOOL ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW&
}
while (!bFound && ValidCol(nCol));
}
- else // spaltenweise
+ else // spaltenweise
{
SCsROW nNextRows[MAXCOLCOUNT];
SCsCOL i;
for (i=0; i<=MAXCOL; i++)
{
SCsROW nSRow = nRow;
- if (bBack) { if (i>=nCol) --nSRow; }
- else { if (i<=nCol) ++nSRow; }
+ if (bBack) { if (i>=nCol) --nSRow; }
+ else { if (i<=nCol) ++nSRow; }
nNextRows[i] = aCol[i].SearchStyle( nSRow, pSearchStyle, bBack, bSelect, rMark );
}
- if (bBack) // rueckwaerts
+ if (bBack) // rueckwaerts
{
nRow = -1;
for (i=MAXCOL; i>=0; i--)
@@ -513,7 +513,7 @@ BOOL ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW&
bFound = TRUE;
}
}
- else // vorwaerts
+ else // vorwaerts
{
nRow = MAXROW+1;
for (i=0; i<=MAXCOL; i++)
@@ -534,7 +534,7 @@ BOOL ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW&
return bFound;
}
-//! einzelnes Pattern fuer Undo zurueckgeben
+//! einzelnes Pattern fuer Undo zurueckgeben
BOOL ScTable::ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
ScMarkData& rMark, BOOL bIsUndo)
@@ -569,7 +569,7 @@ BOOL ScTable::SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark
BOOL bSelect = rSearchItem.GetSelection();
BOOL bBack = rSearchItem.GetBackward();
- ScMarkData aNewMark( rMark ); // Tabellen-Markierungen kopieren
+ ScMarkData aNewMark( rMark ); // Tabellen-Markierungen kopieren
aNewMark.ResetMark();
for (SCCOL i=0; i<=MAXCOL; i++)
{
@@ -593,8 +593,8 @@ BOOL ScTable::SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark
}
}
- rMark = aNewMark; // Markierung kopieren
- //! pro Tabelle
+ rMark = aNewMark; // Markierung kopieren
+ //! pro Tabelle
return (aNewMark.IsMultiMarked());
}
@@ -653,13 +653,13 @@ BOOL ScTable::SearchAndReplace(const SvxSearchItem& rSearchItem,
}
else
{
- // SearchParam no longer needed - SearchOptions contains all settings
+ // SearchParam no longer needed - SearchOptions contains all settings
com::sun::star::util::SearchOptions aSearchOptions = rSearchItem.GetSearchOptions();
aSearchOptions.Locale = *ScGlobal::GetLocale();
- // #107259# reflect UseAsianOptions flag in SearchOptions
- // (use only ignore case and width if asian options are disabled).
- // This is also done in SvxSearchDialog CommandHdl, but not in API object.
+ // #107259# reflect UseAsianOptions flag in SearchOptions
+ // (use only ignore case and width if asian options are disabled).
+ // This is also done in SvxSearchDialog CommandHdl, but not in API object.
if ( !rSearchItem.IsUseAsianOptions() )
aSearchOptions.transliterateFlags &=
( com::sun::star::i18n::TransliterationModules_IGNORE_CASE |
diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx
index 2709dd54d1fb..a80cafa8c115 100644
--- a/sc/source/core/data/tabprotection.cxx
+++ b/sc/source/core/data/tabprotection.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -229,10 +229,10 @@ void ScTableProtectionImpl::setPasswordHash(const uno::Sequence<sal_Int8>& aPass
bool ScTableProtectionImpl::verifyPassword(const String& aPassText) const
{
-#if DEBUG_TAB_PROTECTION
+#if DEBUG_TAB_PROTECTION
fprintf(stdout, "ScTableProtectionImpl::verifyPassword: input = '%s'\n",
OUStringToOString(rtl::OUString(aPassText), RTL_TEXTENCODING_UTF8).getStr());
-#endif
+#endif
if (mbEmptyPass)
return aPassText.Len() == 0;
@@ -243,12 +243,12 @@ bool ScTableProtectionImpl::verifyPassword(const String& aPassText) const
Sequence<sal_Int8> aHash = hashPassword(aPassText, meHash);
-#if DEBUG_TAB_PROTECTION
+#if DEBUG_TAB_PROTECTION
fprintf(stdout, "ScTableProtectionImpl::verifyPassword: hash = ");
for (sal_Int32 i = 0; i < aHash.getLength(); ++i)
printf("%2.2X ", static_cast<sal_uInt8>(aHash[i]));
printf("\n");
-#endif
+#endif
return aHash == maPassHash;
}
diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx
index 466e83b15fad..b70d54fb54bd 100644
--- a/sc/source/core/data/userdat.cxx
+++ b/sc/source/core/data/userdat.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/validat.cxx b/sc/source/core/data/validat.cxx
index 2239b1d0f773..020ad95e4a30 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ SV_IMPL_OP_PTRARR_SORT( ScValidationEntries_Impl, ScValidationDataPtr );
//------------------------------------------------------------------------
//
-// Eintrag fuer Gueltigkeit (es gibt nur eine Bedingung)
+// Eintrag fuer Gueltigkeit (es gibt nur eine Bedingung)
//
ScValidationData::ScValidationData( ScValidationMode eMode, ScConditionMode eOper,
@@ -109,7 +109,7 @@ ScValidationData::ScValidationData( const ScValidationData& r ) :
aErrorTitle( r.aErrorTitle ),
aErrorMessage( r.aErrorMessage )
{
- // Formeln per RefCount kopiert
+ // Formeln per RefCount kopiert
}
ScValidationData::ScValidationData( ScDocument* pDocument, const ScValidationData& r ) :
@@ -125,7 +125,7 @@ ScValidationData::ScValidationData( ScDocument* pDocument, const ScValidationDat
aErrorTitle( r.aErrorTitle ),
aErrorMessage( r.aErrorMessage )
{
- // Formeln wirklich kopiert
+ // Formeln wirklich kopiert
}
ScValidationData::~ScValidationData()
@@ -141,18 +141,18 @@ BOOL ScValidationData::IsEmpty() const
BOOL ScValidationData::EqualEntries( const ScValidationData& r ) const
{
- // gleiche Parameter eingestellt (ohne Key)
+ // gleiche Parameter eingestellt (ohne Key)
return ScConditionEntry::operator==(r) &&
- eDataMode == r.eDataMode &&
- bShowInput == r.bShowInput &&
- bShowError == r.bShowError &&
- eErrorStyle == r.eErrorStyle &&
+ eDataMode == r.eDataMode &&
+ bShowInput == r.bShowInput &&
+ bShowError == r.bShowError &&
+ eErrorStyle == r.eErrorStyle &&
mnListType == r.mnListType &&
- aInputTitle == r.aInputTitle &&
- aInputMessage == r.aInputMessage &&
- aErrorTitle == r.aErrorTitle &&
- aErrorMessage == r.aErrorMessage;
+ aInputTitle == r.aInputTitle &&
+ aInputMessage == r.aInputMessage &&
+ aErrorTitle == r.aErrorTitle &&
+ aErrorMessage == r.aErrorMessage;
}
void ScValidationData::ResetInput()
@@ -198,16 +198,16 @@ BOOL ScValidationData::DoScript( const ScAddress& rPos, const String& rInput,
if ( !pDocSh || !pDocument->CheckMacroWarn() )
return FALSE;
- BOOL bScriptReturnedFalse = FALSE; // Standard: kein Abbruch
+ BOOL bScriptReturnedFalse = FALSE; // Standard: kein Abbruch
// Set up parameters
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aParams(2);
- // 1) eingegebener / berechneter Wert
+ // 1) eingegebener / berechneter Wert
String aValStr = rInput;
double nValue;
BOOL bIsValue = FALSE;
- if ( pCell ) // wenn Zelle gesetzt, aus Interpret gerufen
+ if ( pCell ) // wenn Zelle gesetzt, aus Interpret gerufen
{
bIsValue = pCell->IsValue();
if ( bIsValue )
@@ -220,13 +220,13 @@ BOOL ScValidationData::DoScript( const ScAddress& rPos, const String& rInput,
else
aParams[0] = ::com::sun::star::uno::makeAny( ::rtl::OUString( aValStr ) );
- // 2) Position der Zelle
+ // 2) Position der Zelle
String aPosStr;
rPos.Format( aPosStr, SCA_VALID | SCA_TAB_3D, pDocument, pDocument->GetAddressConvention() );
aParams[1] = ::com::sun::star::uno::makeAny( ::rtl::OUString( aPosStr ) );
- // use link-update flag to prevent closing the document
- // while the macro is running
+ // use link-update flag to prevent closing the document
+ // while the macro is running
BOOL bWasInLinkUpdate = pDocument->IsInLinkUpdate();
if ( !bWasInLinkUpdate )
pDocument->SetInLinkUpdate( TRUE );
@@ -261,7 +261,7 @@ BOOL ScValidationData::DoScript( const ScAddress& rPos, const String& rInput,
if ( eRet == ERRCODE_BASIC_METHOD_NOT_FOUND && !pCell )
// Makro nicht gefunden (nur bei Eingabe)
{
- //! andere Fehlermeldung, wenn gefunden, aber nicht bAllowed ??
+ //! andere Fehlermeldung, wenn gefunden, aber nicht bAllowed ??
ErrorBox aBox( pParent, WinBits(WB_OK),
ScGlobal::GetRscString( STR_VALID_MACRONOTFOUND ) );
@@ -287,15 +287,15 @@ BOOL ScValidationData::DoMacro( const ScAddress& rPos, const String& rInput,
return FALSE;
BOOL bDone = FALSE;
- BOOL bRet = FALSE; // Standard: kein Abbruch
+ BOOL bRet = FALSE; // Standard: kein Abbruch
SfxApplication* pSfxApp = SFX_APP();
- pSfxApp->EnterBasicCall(); // Dok-Basic anlegen etc.
+ pSfxApp->EnterBasicCall(); // Dok-Basic anlegen etc.
- // Wenn das Dok waehrend eines Basic-Calls geladen wurde,
- // ist das Sbx-Objekt evtl. nicht angelegt (?)
-// pDocSh->GetSbxObject();
+ // Wenn das Dok waehrend eines Basic-Calls geladen wurde,
+ // ist das Sbx-Objekt evtl. nicht angelegt (?)
+// pDocSh->GetSbxObject();
- // keine Sicherheitsabfrage mehr vorneweg (nur CheckMacroWarn), das passiert im CallBasic
+ // keine Sicherheitsabfrage mehr vorneweg (nur CheckMacroWarn), das passiert im CallBasic
#if 0
// Makro-Name liegt in folgender Form vor:
@@ -307,8 +307,8 @@ BOOL ScValidationData::DoMacro( const ScAddress& rPos, const String& rInput,
String aDocName = aErrorTitle.GetToken(3, '.');
#endif
- // Funktion ueber den einfachen Namen suchen,
- // dann aBasicStr, aMacroStr fuer SfxObjectShell::CallBasic zusammenbauen
+ // Funktion ueber den einfachen Namen suchen,
+ // dann aBasicStr, aMacroStr fuer SfxObjectShell::CallBasic zusammenbauen
StarBASIC* pRoot = pDocSh->GetBasic();
SbxVariable* pVar = pRoot->Find( aErrorTitle, SbxCLASS_METHOD );
@@ -324,24 +324,24 @@ BOOL ScValidationData::DoMacro( const ScAddress& rPos, const String& rInput,
aMacroStr += pMethod->GetName();
String aBasicStr;
- // #95867# the distinction between document- and app-basic has to be done
- // by checking the parent (as in ScInterpreter::ScMacro), not by looping
- // over all open documents, because this may be called from within loading,
- // when SfxObjectShell::GetFirst/GetNext won't find the document.
+ // #95867# the distinction between document- and app-basic has to be done
+ // by checking the parent (as in ScInterpreter::ScMacro), not by looping
+ // over all open documents, because this may be called from within loading,
+ // when SfxObjectShell::GetFirst/GetNext won't find the document.
if ( pObject->GetParent() )
- aBasicStr = pObject->GetParent()->GetName(); // Dokumentenbasic
+ aBasicStr = pObject->GetParent()->GetName(); // Dokumentenbasic
else
- aBasicStr = SFX_APP()->GetName(); // Applikationsbasic
+ aBasicStr = SFX_APP()->GetName(); // Applikationsbasic
- // Parameter fuer Makro
+ // Parameter fuer Makro
SbxArrayRef refPar = new SbxArray;
- // 1) eingegebener / berechneter Wert
+ // 1) eingegebener / berechneter Wert
String aValStr = rInput;
double nValue = 0.0;
BOOL bIsValue = FALSE;
- if ( pCell ) // wenn Zelle gesetzt, aus Interpret gerufen
+ if ( pCell ) // wenn Zelle gesetzt, aus Interpret gerufen
{
bIsValue = pCell->IsValue();
if ( bIsValue )
@@ -354,13 +354,13 @@ BOOL ScValidationData::DoMacro( const ScAddress& rPos, const String& rInput,
else
refPar->Get(1)->PutString( aValStr );
- // 2) Position der Zelle
+ // 2) Position der Zelle
String aPosStr;
rPos.Format( aPosStr, SCA_VALID | SCA_TAB_3D, pDocument, pDocument->GetAddressConvention() );
refPar->Get(2)->PutString( aPosStr );
- // use link-update flag to prevent closing the document
- // while the macro is running
+ // use link-update flag to prevent closing the document
+ // while the macro is running
BOOL bWasInLinkUpdate = pDocument->IsInLinkUpdate();
if ( !bWasInLinkUpdate )
pDocument->SetInLinkUpdate( TRUE );
@@ -375,16 +375,16 @@ BOOL ScValidationData::DoMacro( const ScAddress& rPos, const String& rInput,
if ( !bWasInLinkUpdate )
pDocument->SetInLinkUpdate( FALSE );
- // Eingabe abbrechen, wenn Basic-Makro FALSE zurueckgibt
+ // Eingabe abbrechen, wenn Basic-Makro FALSE zurueckgibt
if ( eRet == ERRCODE_NONE && refRes->GetType() == SbxBOOL && refRes->GetBool() == FALSE )
bRet = TRUE;
bDone = TRUE;
}
pSfxApp->LeaveBasicCall();
- if ( !bDone && !pCell ) // Makro nicht gefunden (nur bei Eingabe)
+ if ( !bDone && !pCell ) // Makro nicht gefunden (nur bei Eingabe)
{
- //! andere Fehlermeldung, wenn gefunden, aber nicht bAllowed ??
+ //! andere Fehlermeldung, wenn gefunden, aber nicht bAllowed ??
ErrorBox aBox( pParent, WinBits(WB_OK),
ScGlobal::GetRscString( STR_VALID_MACRONOTFOUND ) );
@@ -408,17 +408,17 @@ BOOL ScValidationData::DoError( Window* pParent, const String& rInput,
if ( eErrorStyle == SC_VALERR_MACRO )
return DoMacro( rPos, rInput, NULL, pParent );
- // Fehlermeldung ausgeben
+ // Fehlermeldung ausgeben
String aTitle = aErrorTitle;
if (!aTitle.Len())
- aTitle = ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ); // application title
+ aTitle = ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ); // application title
String aMessage = aErrorMessage;
if (!aMessage.Len())
aMessage = ScGlobal::GetRscString( STR_VALID_DEFERROR );
- //! ErrorBox / WarningBox / InfoBox ?
- //! (bei InfoBox immer nur OK-Button)
+ //! ErrorBox / WarningBox / InfoBox ?
+ //! (bei InfoBox immer nur OK-Button)
WinBits nStyle = 0;
switch (eErrorStyle)
@@ -449,17 +449,17 @@ BOOL ScValidationData::IsDataValid( const String& rTest, const ScPatternAttr& rP
const ScAddress& rPos ) const
{
if ( eDataMode == SC_VALID_ANY )
- return TRUE; // alles erlaubt
+ return TRUE; // alles erlaubt
if ( rTest.GetChar(0) == '=' )
- return FALSE; // Formeln sind sonst immer ungueltig
+ return FALSE; // Formeln sind sonst immer ungueltig
if ( !rTest.Len() )
- return IsIgnoreBlank(); // leer: wie eingestellt
+ return IsIgnoreBlank(); // leer: wie eingestellt
SvNumberFormatter* pFormatter = GetDocument()->GetFormatTable();
- // Test, was es denn ist - wie in ScColumn::SetString
+ // Test, was es denn ist - wie in ScColumn::SetString
sal_uInt32 nFormat = rPattern.GetNumberFormat( pFormatter );
@@ -509,8 +509,8 @@ BOOL ScValidationData::IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) c
pFCell->GetString( aString );
}
break;
- default: // Notizen, Broadcaster
- return IsIgnoreBlank(); // wie eingestellt
+ default: // Notizen, Broadcaster
+ return IsIgnoreBlank(); // wie eingestellt
}
BOOL bOk = TRUE;
@@ -520,23 +520,23 @@ BOOL ScValidationData::IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) c
case SC_VALID_WHOLE:
case SC_VALID_DECIMAL:
- case SC_VALID_DATE: // Date/Time ist nur Formatierung
+ case SC_VALID_DATE: // Date/Time ist nur Formatierung
case SC_VALID_TIME:
bOk = bIsVal;
if ( bOk && eDataMode == SC_VALID_WHOLE )
- bOk = ::rtl::math::approxEqual( nVal, floor(nVal+0.5) ); // ganze Zahlen
+ bOk = ::rtl::math::approxEqual( nVal, floor(nVal+0.5) ); // ganze Zahlen
if ( bOk )
bOk = IsCellValid( pCell, rPos );
break;
case SC_VALID_CUSTOM:
- // fuer Custom muss eOp == SC_COND_DIRECT sein
- //! der Wert muss im Dokument stehen !!!!!!!!!!!!!!!!!!!!
+ // fuer Custom muss eOp == SC_COND_DIRECT sein
+ //! der Wert muss im Dokument stehen !!!!!!!!!!!!!!!!!!!!
bOk = IsCellValid( pCell, rPos );
break;
case SC_VALID_TEXTLEN:
- bOk = !bIsVal; // nur Text
+ bOk = !bIsVal; // nur Text
if ( bOk )
{
double nLenVal = (double) aString.Len();
@@ -771,7 +771,7 @@ bool ScValidationData::GetSelectionFromFormula( TypedScStrCollection* pStrings,
//For external reference and a formula that results in an area or array, date formats are still lost.
if ( bRef )
{
- pDocument->GetInputString((SCCOL)(nCol+aRange.aStart.Col()),
+ pDocument->GetInputString((SCCOL)(nCol+aRange.aStart.Col()),
(SCROW)(nRow+aRange.aStart.Row()), aRange.aStart.Tab() , aValStr);
}
else
@@ -914,32 +914,32 @@ bool ScValidationData::IsListValid( ScBaseCell* pCell, const ScAddress& rPos ) c
ScValidationDataList::ScValidationDataList(const ScValidationDataList& rList) :
ScValidationEntries_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; i<nCount; i++)
InsertNew( rList[i]->Clone() );
- //! sortierte Eintraege aus rList schneller einfuegen ???
+ //! sortierte Eintraege aus rList schneller einfuegen ???
}
ScValidationDataList::ScValidationDataList(ScDocument* pNewDoc,
const ScValidationDataList& 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; i<nCount; i++)
InsertNew( rList[i]->Clone(pNewDoc) );
- //! sortierte Eintraege aus rList schneller einfuegen ???
+ //! sortierte Eintraege aus rList schneller einfuegen ???
}
ScValidationData* ScValidationDataList::GetData( sal_uInt32 nKey )
{
- //! binaer suchen
+ //! binaer suchen
USHORT nCount = Count();
for (USHORT i=0; i<nCount; i++)
@@ -987,8 +987,8 @@ BOOL ScValidationDataList::operator==( const ScValidationDataList& r ) const
USHORT nCount = Count();
BOOL bEqual = ( nCount == r.Count() );
- for (USHORT i=0; i<nCount && bEqual; i++) // Eintraege sind sortiert
- if ( !(*this)[i]->EqualEntries(*r[i]) ) // Eintraege unterschiedlich ?
+ for (USHORT i=0; i<nCount && bEqual; i++) // Eintraege sind sortiert
+ if ( !(*this)[i]->EqualEntries(*r[i]) ) // Eintraege unterschiedlich ?
bEqual = FALSE;
return bEqual;
diff --git a/sc/source/core/inc/addinhelpid.hxx b/sc/source/core/inc/addinhelpid.hxx
index b2f085ed64e5..f67a67d9c43a 100644
--- a/sc/source/core/inc/addinhelpid.hxx
+++ b/sc/source/core/inc/addinhelpid.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/inc/addinlis.hxx b/sc/source/core/inc/addinlis.hxx
index 6c0f98386920..ad4de2ba4754 100644
--- a/sc/source/core/inc/addinlis.hxx
+++ b/sc/source/core/inc/addinlis.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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_ADDINLIS_HXX
#define SC_ADDINLIS_HXX
-#include "adiasync.hxx" // for ScAddInDocs PtrArr
+#include "adiasync.hxx" // for ScAddInDocs PtrArr
#include <tools/list.hxx>
#include <com/sun/star/sheet/XResultListener.hpp>
#include <com/sun/star/sheet/XVolatileResult.hpp>
@@ -47,10 +47,10 @@ class ScAddInListener : public cppu::WeakImplHelper2<
{
private:
com::sun::star::uno::Reference<com::sun::star::sheet::XVolatileResult> xVolRes;
- com::sun::star::uno::Any aResult;
- ScAddInDocs* pDocs; // documents where this is used
+ com::sun::star::uno::Any aResult;
+ ScAddInDocs* pDocs; // documents where this is used
- static List aAllListeners;
+ static List aAllListeners;
// always allocated via CreateListener
ScAddInListener(
@@ -59,29 +59,29 @@ private:
ScDocument* pD );
public:
- virtual ~ScAddInListener();
+ virtual ~ScAddInListener();
// create Listener and put it into global list
- static ScAddInListener* CreateListener(
+ static ScAddInListener* CreateListener(
com::sun::star::uno::Reference<
com::sun::star::sheet::XVolatileResult> xVR,
ScDocument* pDoc );
- static ScAddInListener* Get( com::sun::star::uno::Reference<
+ static ScAddInListener* Get( com::sun::star::uno::Reference<
com::sun::star::sheet::XVolatileResult> xVR );
- static void RemoveDocument( ScDocument* pDocument );
+ static void RemoveDocument( ScDocument* pDocument );
- BOOL HasDocument( ScDocument* pDoc ) const { return pDocs->Seek_Entry( pDoc ); }
- void AddDocument( ScDocument* pDoc ) { pDocs->Insert( pDoc ); }
- const com::sun::star::uno::Any& GetResult() const { return aResult; }
+ BOOL HasDocument( ScDocument* pDoc ) const { return pDocs->Seek_Entry( pDoc ); }
+ void AddDocument( ScDocument* pDoc ) { pDocs->Insert( pDoc ); }
+ const com::sun::star::uno::Any& GetResult() const { return aResult; }
// XResultListener
- virtual void SAL_CALL modified( const ::com::sun::star::sheet::ResultEvent& aEvent )
+ virtual void SAL_CALL modified( const ::com::sun::star::sheet::ResultEvent& aEvent )
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);
// XServiceInfo
diff --git a/sc/source/core/inc/adiasync.hxx b/sc/source/core/inc/adiasync.hxx
index 4d0997fce63d..5391b65dce47 100644
--- a/sc/source/core/inc/adiasync.hxx
+++ b/sc/source/core/inc/adiasync.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +41,7 @@ void CALLTYPE ScAddInAsyncCallBack( double& nHandle, void* pData );
class ScAddInAsync;
typedef ScAddInAsync* ScAddInAsyncPtr;
SV_DECL_PTRARR_SORT( ScAddInAsyncs, ScAddInAsyncPtr, 4, 4 )
-extern ScAddInAsyncs theAddInAsyncTbl; // in adiasync.cxx
+extern ScAddInAsyncs theAddInAsyncTbl; // in adiasync.cxx
class ScDocument;
typedef ScDocument* ScAddInDocPtr;
@@ -54,14 +54,14 @@ class ScAddInAsync : public SvtBroadcaster
private:
union
{
- double nVal; // aktueller Wert
- String* pStr;
+ double nVal; // aktueller Wert
+ String* pStr;
};
- ScAddInDocs* pDocs; // Liste der benutzenden Dokumente
- FuncData* pFuncData; // Zeiger auf die Daten in der Collection
- ULONG nHandle; // wird von double auf ULONG gecasted
- ParamType eType; // PTR_DOUBLE oder PTR_STRING Ergebnis
- BOOL bValid; // ob Wert gueltig
+ ScAddInDocs* pDocs; // Liste der benutzenden Dokumente
+ FuncData* pFuncData; // Zeiger auf die Daten in der Collection
+ ULONG nHandle; // wird von double auf ULONG gecasted
+ ParamType eType; // PTR_DOUBLE oder PTR_STRING Ergebnis
+ BOOL bValid; // ob Wert gueltig
public:
// cTor nur wenn ScAddInAsync::Get fehlschlaegt!
@@ -70,17 +70,17 @@ public:
ScDocument* pDoc );
// default-cTor nur fuer das eine globale aSeekObj !!!
ScAddInAsync();
- virtual ~ScAddInAsync();
- static ScAddInAsync* Get( ULONG nHandle );
- static void CallBack( ULONG nHandle, void* pData );
- static void RemoveDocument( ScDocument* pDocument );
- BOOL IsValid() const { return bValid; }
- ParamType GetType() const { return eType; }
- double GetValue() const { return nVal; }
- const String& GetString() const { return *pStr; }
- BOOL HasDocument( ScDocument* pDoc ) const
+ virtual ~ScAddInAsync();
+ static ScAddInAsync* Get( ULONG nHandle );
+ static void CallBack( ULONG nHandle, void* pData );
+ static void RemoveDocument( ScDocument* pDocument );
+ BOOL IsValid() const { return bValid; }
+ ParamType GetType() const { return eType; }
+ double GetValue() const { return nVal; }
+ const String& GetString() const { return *pStr; }
+ BOOL HasDocument( ScDocument* pDoc ) const
{ return pDocs->Seek_Entry( pDoc ); }
- void AddDocument( ScDocument* pDoc ) { pDocs->Insert( pDoc ); }
+ void AddDocument( ScDocument* pDoc ) { pDocs->Insert( pDoc ); }
// Vergleichsoperatoren fuer PtrArrSort
BOOL operator < ( const ScAddInAsync& r ) { return nHandle < r.nHandle; }
diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx
index 13384b033628..42f06abeabe4 100644
--- a/sc/source/core/inc/bcaslot.hxx
+++ b/sc/source/core/inc/bcaslot.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +44,11 @@
class ScBroadcastArea
{
private:
- ScBroadcastArea* pUpdateChainNext;
+ ScBroadcastArea* pUpdateChainNext;
SvtBroadcaster aBroadcaster;
ScRange aRange;
- ULONG nRefCount;
- BOOL bInUpdateChain;
+ ULONG nRefCount;
+ BOOL bInUpdateChain;
public:
ScBroadcastArea( const ScRange& rRange )
@@ -56,18 +56,18 @@ public:
nRefCount( 0 ), bInUpdateChain( FALSE ) {}
inline SvtBroadcaster& GetBroadcaster() { return aBroadcaster; }
inline const SvtBroadcaster& GetBroadcaster() const { return aBroadcaster; }
- inline void UpdateRange( const ScRange& rNewRange )
+ inline void UpdateRange( const ScRange& rNewRange )
{ aRange = rNewRange; }
inline const ScRange& GetRange() const { return aRange; }
inline const ScAddress& GetStart() const { return aRange.aStart; }
inline const ScAddress& GetEnd() const { return aRange.aEnd; }
- inline void IncRef() { ++nRefCount; }
- inline ULONG DecRef() { return nRefCount ? --nRefCount : 0; }
- inline ULONG GetRef() { return nRefCount; }
+ inline void IncRef() { ++nRefCount; }
+ inline ULONG DecRef() { return nRefCount ? --nRefCount : 0; }
+ inline ULONG GetRef() { return nRefCount; }
inline ScBroadcastArea* GetUpdateChainNext() const { return pUpdateChainNext; }
- inline void SetUpdateChainNext( ScBroadcastArea* p ) { pUpdateChainNext = p; }
- inline BOOL IsInUpdateChain() const { return bInUpdateChain; }
- inline void SetInUpdateChain( BOOL b ) { bInUpdateChain = b; }
+ inline void SetUpdateChainNext( ScBroadcastArea* p ) { pUpdateChainNext = p; }
+ inline BOOL IsInUpdateChain() const { return bInUpdateChain; }
+ inline void SetInUpdateChain( BOOL b ) { bInUpdateChain = b; }
/** Equalness of this or range. */
inline bool operator==( const ScBroadcastArea & rArea ) const;
@@ -127,19 +127,19 @@ class ScBroadcastAreaSlotMachine;
class ScBroadcastAreaSlot
{
private:
- ScBroadcastAreas aBroadcastAreaTbl;
+ ScBroadcastAreas aBroadcastAreaTbl;
mutable ScBroadcastArea aTmpSeekBroadcastArea; // for FindBroadcastArea()
- ScDocument* pDoc;
+ ScDocument* pDoc;
ScBroadcastAreaSlotMachine* pBASM;
ScBroadcastAreas::iterator FindBroadcastArea( const ScRange& rRange ) const;
/**
- More hypothetical (memory would probably be doomed anyway) check
- whether there would be an overflow when adding an area, setting the
+ More hypothetical (memory would probably be doomed anyway) check
+ whether there would be an overflow when adding an area, setting the
proper state if so.
- @return TRUE if a HardRecalcState is effective and area is not to be
+ @return TRUE if a HardRecalcState is effective and area is not to be
added.
*/
bool CheckHardRecalcStateCondition() const;
@@ -148,49 +148,49 @@ public:
ScBroadcastAreaSlot( ScDocument* pDoc,
ScBroadcastAreaSlotMachine* pBASM );
~ScBroadcastAreaSlot();
- const ScBroadcastAreas& GetBroadcastAreas() const
+ const ScBroadcastAreas& GetBroadcastAreas() const
{ return aBroadcastAreaTbl; }
/**
Only here new ScBroadcastArea objects are created, prevention of dupes.
@param rpArea
- If NULL, a new ScBroadcastArea is created and assigned ton the
- reference if a matching area wasn't found. If a matching area was
- found, that is assigned. In any case, the SvtListener is added to
+ If NULL, a new ScBroadcastArea is created and assigned ton the
+ reference if a matching area wasn't found. If a matching area was
+ found, that is assigned. In any case, the SvtListener is added to
the broadcaster.
- If not NULL then no listeners are startet, only the area is
- inserted and the reference count incremented. Effectively the same
+ If not NULL then no listeners are startet, only the area is
+ inserted and the reference count incremented. Effectively the same
as InsertListeningArea(), so use that instead.
@return
- TRUE if rpArea passed was NULL and ScBroadcastArea is newly
- created.
+ TRUE if rpArea passed was NULL and ScBroadcastArea is newly
+ created.
*/
- bool StartListeningArea( const ScRange& rRange,
+ bool StartListeningArea( const ScRange& rRange,
SvtListener* pListener,
ScBroadcastArea*& rpArea );
/**
- Insert a ScBroadcastArea obtained via StartListeningArea() to
+ Insert a ScBroadcastArea obtained via StartListeningArea() to
subsequent slots.
*/
void InsertListeningArea( ScBroadcastArea* pArea );
- void EndListeningArea( const ScRange& rRange,
+ void EndListeningArea( const ScRange& rRange,
SvtListener* pListener,
ScBroadcastArea*& rpArea );
- BOOL AreaBroadcast( const ScHint& rHint ) const;
+ BOOL AreaBroadcast( const ScHint& rHint ) const;
/// @return TRUE if at least one broadcast occurred.
- BOOL AreaBroadcastInRange( const ScRange& rRange,
+ BOOL AreaBroadcastInRange( const ScRange& rRange,
const ScHint& rHint ) const;
- void DelBroadcastAreasInRange( const ScRange& rRange );
- void UpdateRemove( UpdateRefMode eUpdateRefMode,
+ void DelBroadcastAreasInRange( const ScRange& rRange );
+ void UpdateRemove( UpdateRefMode eUpdateRefMode,
const ScRange& rRange,
SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
void UpdateRemoveArea( ScBroadcastArea* pArea );
- void UpdateInsert( ScBroadcastArea* pArea );
+ void UpdateInsert( ScBroadcastArea* pArea );
};
@@ -222,14 +222,14 @@ private:
inline ScBroadcastAreaSlot** getSlots() { return ppSlots; }
/**
- Obtain slot pointer, no check on validity! It is assumed that
- all calls are made with the results of ComputeSlotOffset(),
+ Obtain slot pointer, no check on validity! It is assumed that
+ all calls are made with the results of ComputeSlotOffset(),
ComputeAreaPoints() and ComputeNextSlot()
*/
inline ScBroadcastAreaSlot* getAreaSlot( SCSIZE nOff ) { return *(ppSlots + nOff); }
private:
- ScBroadcastAreaSlot** ppSlots;
+ ScBroadcastAreaSlot** ppSlots;
// prevent usage
TableSlots( const TableSlots& );
@@ -247,23 +247,23 @@ private:
ScBroadcastArea *pEOUpdateChain;
ULONG nInBulkBroadcast;
- inline SCSIZE ComputeSlotOffset( const ScAddress& rAddress ) const;
- void ComputeAreaPoints( const ScRange& rRange,
+ inline SCSIZE ComputeSlotOffset( const ScAddress& rAddress ) const;
+ void ComputeAreaPoints( const ScRange& rRange,
SCSIZE& nStart, SCSIZE& nEnd,
SCSIZE& nRowBreak ) const;
public:
ScBroadcastAreaSlotMachine( ScDocument* pDoc );
~ScBroadcastAreaSlotMachine();
- void StartListeningArea( const ScRange& rRange,
+ void StartListeningArea( const ScRange& rRange,
SvtListener* pListener );
- void EndListeningArea( const ScRange& rRange,
+ void EndListeningArea( const ScRange& rRange,
SvtListener* pListener );
- BOOL AreaBroadcast( const ScHint& rHint ) const;
+ BOOL AreaBroadcast( const ScHint& rHint ) const;
// return: at least one broadcast occurred
BOOL AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHint ) const;
- 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 EnterBulkBroadcast();
diff --git a/sc/source/core/inc/cellkeytranslator.hxx b/sc/source/core/inc/cellkeytranslator.hxx
index 536e521a78da..065f16e9ac5e 100644
--- a/sc/source/core/inc/cellkeytranslator.hxx
+++ b/sc/source/core/inc/cellkeytranslator.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,18 +51,18 @@ struct ScCellKeyword
typedef ::std::hash_map< String, ::std::list<ScCellKeyword>, ScStringHashCode, ::std::equal_to<String> > ScCellKeywordHashMap;
/** Translate cell function keywords.
-
+
This class provides a convenient way to translate a string keyword used as
a cell function argument. Since Calc's built-in cell functions don't
localize string keywords, this class is used mainly to deal with an Excel
document where string names may be localized.
-
+
To use, simply call the
-
+
ScCellKeywordTranslator::transKeyword(...)
-
+
function.
-
+
Note that when the locale and/or the opcode is specified, the function
tries to find a string with matching locale and/or opcode. But when it
fails to find one that satisfies the specified locale and/or opcode, it
@@ -78,8 +78,8 @@ private:
ScCellKeywordTranslator();
void init();
- void addToMap(const String& rKey, const sal_Char* pName,
- const ::com::sun::star::lang::Locale& rLocale,
+ void addToMap(const String& rKey, const sal_Char* pName,
+ const ::com::sun::star::lang::Locale& rLocale,
OpCode eOpCode = ocNone);
void addToMap(const TransItem* pItems, const ::com::sun::star::lang::Locale& rLocale);
diff --git a/sc/source/core/inc/core_pch.hxx b/sc/source/core/inc/core_pch.hxx
index 899169154d8d..5461e8c46f0f 100644
--- a/sc/source/core/inc/core_pch.hxx
+++ b/sc/source/core/inc/core_pch.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
*
************************************************************************/
-// ItemID-Defines etc. muessen immer ganz vorne stehen
+// ItemID-Defines etc. muessen immer ganz vorne stehen
#include "scitems.hxx"
@@ -34,9 +34,9 @@
#define SC_PROGRESS_CXX
-// ab hier automatisch per makepch generiert
-// folgende duerfen nicht aufgenommen werden:
-// setjmp.h
+// ab hier automatisch per makepch generiert
+// folgende duerfen nicht aufgenommen werden:
+// setjmp.h
#include <tools/solar.h>
#include <string.h>
diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx
index 4f0652753e65..7450b284fb7b 100644
--- a/sc/source/core/inc/ddelink.hxx
+++ b/sc/source/core/inc/ddelink.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,18 +41,18 @@ class SvStream;
class ScDdeLink : public ::sfx2::SvBaseLink, public SvtBroadcaster
{
private:
-static BOOL bIsInUpdate;
+static BOOL bIsInUpdate;
- ScDocument* pDoc;
+ ScDocument* pDoc;
- String aAppl; // Verbindungsdaten
- String aTopic;
- String aItem;
- BYTE nMode; // Zahlformat-Modus
+ String aAppl; // Verbindungsdaten
+ String aTopic;
+ String aItem;
+ BYTE nMode; // Zahlformat-Modus
- BOOL bNeedUpdate; // wird gesetzt, wenn Update nicht moeglich war
+ BOOL bNeedUpdate; // wird gesetzt, wenn Update nicht moeglich war
- ScMatrixRef pResult; // Ergebnis
+ ScMatrixRef pResult; // Ergebnis
public:
TYPEINFO();
@@ -64,14 +64,14 @@ public:
ScDdeLink( ScDocument* pD, const ScDdeLink& rOther );
virtual ~ScDdeLink();
- void Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const;
+ void Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const;
// von SvBaseLink ueberladen:
- virtual void DataChanged( const String& rMimeType,
+ virtual void DataChanged( const String& rMimeType,
const ::com::sun::star::uno::Any & rValue );
// von SvtBroadcaster ueberladen:
- virtual void ListenersGone();
+ virtual void ListenersGone();
// fuer Interpreter:
@@ -81,17 +81,17 @@ public:
// XML and Excel import after NewData()
ScMatrixRef GetModifiableResult() { return pResult; }
- const String& GetAppl() const { return aAppl; }
- const String& GetTopic() const { return aTopic; }
- const String& GetItem() const { return aItem; }
- BYTE GetMode() const { return nMode; }
+ const String& GetAppl() const { return aAppl; }
+ const String& GetTopic() const { return aTopic; }
+ const String& GetItem() const { return aItem; }
+ BYTE GetMode() const { return nMode; }
- void ResetValue(); // Wert zuruecksetzen
- void TryUpdate();
+ void ResetValue(); // Wert zuruecksetzen
+ void TryUpdate();
- BOOL NeedsUpdate() const { return bNeedUpdate; }
+ BOOL NeedsUpdate() const { return bNeedUpdate; }
- static BOOL IsInUpdate() { return bIsInUpdate; }
+ static BOOL IsInUpdate() { return bIsInUpdate; }
};
diff --git a/sc/source/core/inc/doubleref.hxx b/sc/source/core/inc/doubleref.hxx
index 10221d942c9c..e3a6dccc8e8f 100644
--- a/sc/source/core/inc/doubleref.hxx
+++ b/sc/source/core/inc/doubleref.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
@@ -41,8 +41,8 @@ struct ScQueryParamBase;
// ============================================================================
-/**
- * Base class for abstracting range data backends for database functions.
+/**
+ * Base class for abstracting range data backends for database functions.
*/
class ScDBRangeBase
{
@@ -57,9 +57,9 @@ public:
virtual SCROW getRowSize() const = 0;
virtual SCSIZE getVisibleDataCellCount() const = 0;
- /**
- * Get a string value of a specified cell position. Note that the
- * position of the upper left cell of the range is always (0, 0) even if
+ /**
+ * Get a string value of a specified cell position. Note that the
+ * position of the upper left cell of the range is always (0, 0) even if
* the reference type is of internal range.
*
* @param nCol column position (0 to column size-1)
@@ -69,13 +69,13 @@ public:
virtual SCCOL getFirstFieldColumn() const = 0;
- /**
+ /**
* Get a <i>0-based</i> column index that corresponds with the passed field
- * index. Note that the field index passed as the 1st parameter is
- * <i>1-based.</i>
+ * index. Note that the field index passed as the 1st parameter is
+ * <i>1-based.</i>
*
* @param nIndex 1-based field index.
- *
+ *
* @return 0-based column index
*/
virtual SCCOL findFieldColumn(SCCOL nIndex) const = 0;
@@ -87,8 +87,8 @@ protected:
ScDBRangeBase(ScDocument* pDoc, RefType eType);
ScDocument* getDoc() const;
- /**
- * Populate query options that are always the same for all database
+ /**
+ * Populate query options that are always the same for all database
* queries.
*/
static void fillQueryOptions(ScQueryParamBase* pParam);
@@ -114,9 +114,9 @@ public:
virtual SCROW getRowSize() const;
virtual SCSIZE getVisibleDataCellCount() const;
- /**
- * Get a string value of a specified cell position. Note that the
- * position of the upper left cell of the range is always (0, 0) even if
+ /**
+ * Get a string value of a specified cell position. Note that the
+ * position of the upper left cell of the range is always (0, 0) even if
* the reference type is of internal range.
*
* @param nCol column position (0 to column size-1)
@@ -125,13 +125,13 @@ public:
virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const;
virtual SCCOL getFirstFieldColumn() const;
- /**
+ /**
* Get a <i>0-based</i> column index that corresponds with the passed field
- * index. Note that the field index passed as the 1st parameter is
- * <i>1-based.</i>
+ * index. Note that the field index passed as the 1st parameter is
+ * <i>1-based.</i>
*
* @param nIndex 1-based field index.
- *
+ *
* @return 0-based column index
*/
virtual SCCOL findFieldColumn(SCCOL nIndex) const;
@@ -158,9 +158,9 @@ public:
virtual SCROW getRowSize() const;
virtual SCSIZE getVisibleDataCellCount() const;
- /**
- * Get a string value of a specified cell position. Note that the
- * position of the upper left cell of the range is always (0, 0) even if
+ /**
+ * Get a string value of a specified cell position. Note that the
+ * position of the upper left cell of the range is always (0, 0) even if
* the reference type is of internal range.
*
* @param nCol column position (0 to column size-1)
@@ -170,13 +170,13 @@ public:
virtual SCCOL getFirstFieldColumn() const;
- /**
+ /**
* Get a <i>0-based</i> column index that corresponds with the passed field
- * index. Note that the field index passed as the 1st parameter is
- * <i>1-based.</i>
+ * index. Note that the field index passed as the 1st parameter is
+ * <i>1-based.</i>
*
* @param nIndex 1-based field index.
- *
+ *
* @return 0-based column index
*/
virtual SCCOL findFieldColumn(SCCOL nIndex) const;
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index edecaadb39f0..d80573a60fa7 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ private:
ScFormulaCell* pMyFormulaCell; // the cell of this formula expression
SvNumberFormatter* pFormatter;
- const formula::FormulaToken*
+ const formula::FormulaToken*
pCur; // current token
String aTempStr; // for GetString()
ScTokenStack* pStackObj; // contains the stacks
@@ -537,10 +537,10 @@ void ScTTT();
/** Obtain the date serial number for a given date.
@param bStrict
- If FALSE, nYear < 100 takes the two-digit year setting into account,
- and rollover of invalid calendar dates takes place, e.g. 1999-02-31 =>
+ If FALSE, nYear < 100 takes the two-digit year setting into account,
+ and rollover of invalid calendar dates takes place, e.g. 1999-02-31 =>
1999-03-03.
- If TRUE, the date passed must be a valid Gregorian calendar date. No
+ If TRUE, the date passed must be a valid Gregorian calendar date. No
two-digit expanding or rollover is done.
*/
double GetDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, bool bStrict );
@@ -803,7 +803,7 @@ public:
formula::StackVar GetResultType() const { return xResult->GetType(); }
const String& GetStringResult() const { return xResult->GetString(); }
double GetNumResult() const { return xResult->GetDouble(); }
- formula::FormulaTokenRef
+ formula::FormulaTokenRef
GetResultToken() const { return xResult; }
short GetRetFormatType() const { return nRetFmtType; }
ULONG GetRetFormatIndex() const { return nRetFmtIndex; }
diff --git a/sc/source/core/inc/jumpmatrix.hxx b/sc/source/core/inc/jumpmatrix.hxx
index 8089d6653730..36c20beba5de 100644
--- a/sc/source/core/inc/jumpmatrix.hxx
+++ b/sc/source/core/inc/jumpmatrix.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/inc/parclass.hxx b/sc/source/core/inc/parclass.hxx
index 39844de7ae22..eaf794d985a3 100644
--- a/sc/source/core/inc/parclass.hxx
+++ b/sc/source/core/inc/parclass.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +71,10 @@ public:
of a parameter of this function. */
ForceArray,
- /** Area reference is not converted to array, but ForceArray must be
- propagated to subsequent operators and functions being part of a
- parameter of this function. Used with functions that treat
- references separately from arrays, but need the forced array
+ /** Area reference is not converted to array, but ForceArray must be
+ propagated to subsequent operators and functions being part of a
+ parameter of this function. Used with functions that treat
+ references separately from arrays, but need the forced array
calculation of parameters that are not references.*/
ReferenceOrForceArray
};
diff --git a/sc/source/core/inc/poolhelp.hxx b/sc/source/core/inc/poolhelp.hxx
index f98963513c59..bfc024f9f80d 100644
--- a/sc/source/core/inc/poolhelp.hxx
+++ b/sc/source/core/inc/poolhelp.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,28 +44,28 @@ class ScPoolHelper : public vos::OReference
{
private:
ScDocOptions aOpt;
- ScDocumentPool* pDocPool;
+ ScDocumentPool* pDocPool;
rtl::Reference< ScStyleSheetPool > mxStylePool;
- mutable SvNumberFormatter* pFormTable;
- mutable SfxItemPool* pEditPool; // EditTextObjectPool
- mutable SfxItemPool* pEnginePool; // EditEnginePool
+ mutable SvNumberFormatter* pFormTable;
+ mutable SfxItemPool* pEditPool; // EditTextObjectPool
+ mutable SfxItemPool* pEnginePool; // EditEnginePool
ScDocument* m_pSourceDoc;
void UseDocOptions() const;
public:
ScPoolHelper( ScDocument* pSourceDoc );
- virtual ~ScPoolHelper();
+ virtual ~ScPoolHelper();
// called in dtor of main document
- void SourceDocumentGone();
+ void SourceDocumentGone();
// access to pointers (are never 0):
- ScDocumentPool* GetDocPool() const { return pDocPool; }
- ScStyleSheetPool* GetStylePool() const { return mxStylePool.get(); }
- SvNumberFormatter* GetFormTable() const;
- SfxItemPool* GetEditPool() const;
- SfxItemPool* GetEnginePool() const;
+ ScDocumentPool* GetDocPool() const { return pDocPool; }
+ ScStyleSheetPool* GetStylePool() const { return mxStylePool.get(); }
+ SvNumberFormatter* GetFormTable() const;
+ SfxItemPool* GetEditPool() const;
+ SfxItemPool* GetEnginePool() const;
void SetFormTableOpt(const ScDocOptions& rOpt);
};
diff --git a/sc/source/core/inc/refupdat.hxx b/sc/source/core/inc/refupdat.hxx
index 17da3bf5e635..d27bcb273eaa 100644
--- a/sc/source/core/inc/refupdat.hxx
+++ b/sc/source/core/inc/refupdat.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +37,9 @@ class ScAddress;
class ScRange;
enum ScRefUpdateRes {
- UR_NOTHING = 0, // keine Anpassungen
- UR_UPDATED = 1, // Anpassungen erfolgt
- UR_INVALID = 2 // Referenz wurde ungueltig
+ UR_NOTHING = 0, // keine Anpassungen
+ UR_UPDATED = 1, // Anpassungen erfolgt
+ UR_INVALID = 2 // Referenz wurde ungueltig
};
class ScRefUpdate
@@ -78,7 +78,7 @@ public:
SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
ScComplexRefData& rRef, BOOL bWrap, BOOL bAbsolute );
- static void MoveRelWrap( ScDocument* pDoc, const ScAddress& rPos,
+ static void MoveRelWrap( ScDocument* pDoc, const ScAddress& rPos,
SCCOL nMaxCol, SCROW nMaxRow, ScComplexRefData& rRef );
/// Before calling, the absolute references must be up-to-date!
diff --git a/sc/source/core/inc/scrdata.hxx b/sc/source/core/inc/scrdata.hxx
index b569bddddd6b..5e3e79354268 100644
--- a/sc/source/core/inc/scrdata.hxx
+++ b/sc/source/core/inc/scrdata.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/src/compiler.src b/sc/source/core/src/compiler.src
index a45c2b6aa458..885cb3647a3d 100644
--- a/sc/source/core/src/compiler.src
+++ b/sc/source/core/src/compiler.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/source/core/tool/addincfg.cxx b/sc/source/core/tool/addincfg.cxx
index c76b60eae077..bd80f272af06 100644
--- a/sc/source/core/tool/addincfg.cxx
+++ b/sc/source/core/tool/addincfg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 07b79c11b373..5f5fc02a1a04 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -1589,7 +1589,7 @@ void ScUnoAddInCall::ExecuteCallWithArgs(uno::Sequence<uno::Any>& rCallArgs)
else
nErrCode = errNoValue;
}
-
+
catch(uno::Exception&)
{
nErrCode = errNoValue;
diff --git a/sc/source/core/tool/addinhelpid.cxx b/sc/source/core/tool/addinhelpid.cxx
index a4de52e27b1b..01a5e77f090c 100644
--- a/sc/source/core/tool/addinhelpid.cxx
+++ b/sc/source/core/tool/addinhelpid.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/tool/addinlis.cxx b/sc/source/core/tool/addinlis.cxx
index ad6b60073ccb..c2bce37ae9e5 100644
--- a/sc/source/core/tool/addinlis.cxx
+++ b/sc/source/core/tool/addinlis.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
#include "addinlis.hxx"
-#include "miscuno.hxx" // SC_IMPL_SERVICE_INFO
+#include "miscuno.hxx" // SC_IMPL_SERVICE_INFO
#include "document.hxx"
#include "brdcst.hxx"
#include "unoguard.hxx"
@@ -55,17 +55,17 @@ List ScAddInListener::aAllListeners;
//------------------------------------------------------------------------
-// static
+// static
ScAddInListener* ScAddInListener::CreateListener(
uno::Reference<sheet::XVolatileResult> xVR, ScDocument* pDoc )
{
ScAddInListener* pNew = new ScAddInListener( xVR, pDoc );
- pNew->acquire(); // for aAllListeners
+ pNew->acquire(); // for aAllListeners
aAllListeners.Insert( pNew, LIST_APPEND );
- if ( xVR.is() )
- xVR->addResultListener( pNew ); // after at least 1 ref exists!
+ if ( xVR.is() )
+ xVR->addResultListener( pNew ); // after at least 1 ref exists!
return pNew;
}
@@ -94,17 +94,17 @@ ScAddInListener* ScAddInListener::Get( uno::Reference<sheet::XVolatileResult> xV
if ( pComp == (sheet::XVolatileResult*)pLst->xVolRes.get() )
return pLst;
}
- return NULL; // not found
+ return NULL; // not found
}
-//! move to some container object?
+//! move to some container object?
// static
void ScAddInListener::RemoveDocument( ScDocument* pDocumentP )
{
ULONG nPos = aAllListeners.Count();
while (nPos)
{
- // loop backwards because elements are removed
+ // loop backwards because elements are removed
--nPos;
ScAddInListener* pLst = (ScAddInListener*)aAllListeners.GetObject(nPos);
ScAddInDocs* p = pLst->pDocs;
@@ -115,14 +115,14 @@ void ScAddInListener::RemoveDocument( ScDocument* pDocumentP )
if ( p->Count() == 0 )
{
// this AddIn is no longer used
- // dont delete, just remove the ref for the list
+ // dont delete, just remove the ref for the list
aAllListeners.Remove( nPos );
- if ( pLst->xVolRes.is() )
+ if ( pLst->xVolRes.is() )
pLst->xVolRes->removeResultListener( pLst );
- pLst->release(); // Ref for aAllListeners - pLst may be deleted here
+ pLst->release(); // Ref for aAllListeners - pLst may be deleted here
}
}
}
@@ -135,25 +135,25 @@ void ScAddInListener::RemoveDocument( ScDocument* pDocumentP )
void SAL_CALL ScAddInListener::modified( const ::com::sun::star::sheet::ResultEvent& aEvent )
throw(::com::sun::star::uno::RuntimeException)
{
- ScUnoGuard aGuard; //! or generate a UserEvent
+ ScUnoGuard aGuard; //! or generate a UserEvent
- aResult = aEvent.Value; // store result
+ aResult = aEvent.Value; // store result
if ( !HasListeners() )
{
- //! remove from list and removeListener, as in RemoveDocument ???
+ //! remove from list and removeListener, as in RemoveDocument ???
#if 0
- //! this will crash if called before first StartListening !!!
+ //! this will crash if called before first StartListening !!!
aAllListeners.Remove( this );
- if ( xVolRes.is() )
+ if ( xVolRes.is() )
xVolRes->removeResultListener( this );
- release(); // Ref for aAllListeners - this may be deleted here
+ release(); // Ref for aAllListeners - this may be deleted here
return;
#endif
}
- // notify document of changes
+ // notify document of changes
Broadcast( ScHint( SC_HINT_DATACHANGED, ScAddress(), NULL ) );
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index ccbecd52d9f2..a4a77c9fe0e7 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +68,16 @@ ScAddress::Details::Details ( const ScDocument* pDoc,
#include <iostream>
-/**
- * Parse from the opening single quote to the closing single quote. Inside
- * the quotes, a single quote character is encoded by double single-quote
- * characters.
+/**
+ * Parse from the opening single quote to the closing single quote. Inside
+ * the quotes, a single quote character is encoded by double single-quote
+ * characters.
*
- * @param p pointer to the first character to begin parsing.
- * @param rName (reference) parsed name within the quotes. If the name is
+ * @param p pointer to the first character to begin parsing.
+ * @param rName (reference) parsed name within the quotes. If the name is
* empty, either the parsing failed or it's an empty quote.
- *
- * @return pointer to the character immediately after the closing single
+ *
+ * @return pointer to the character immediately after the closing single
* quote.
*/
static const sal_Unicode* lcl_ParseQuotedName( const sal_Unicode* p, String& rName )
@@ -93,7 +93,7 @@ static const sal_Unicode* lcl_ParseQuotedName( const sal_Unicode* p, String& rNa
if (*p == '\'')
{
if (cPrev == '\'')
- {
+ {
// double single-quote equals one single quote.
rName += *p;
cPrev = 0;
@@ -152,17 +152,17 @@ const sal_Unicode* lcl_eatWhiteSpace( const sal_Unicode* p )
return p;
}
-/** Determines the number of sheets an external reference spans and sets
- rRange.aEnd.nTab accordingly. If a sheet is not found, the corresponding
- bits in rFlags are cleared. pExtInfo is filled if it wasn't already. If in
- cached order rStartTabName comes after rEndTabName, pExtInfo->maTabName
+/** Determines the number of sheets an external reference spans and sets
+ rRange.aEnd.nTab accordingly. If a sheet is not found, the corresponding
+ bits in rFlags are cleared. pExtInfo is filled if it wasn't already. If in
+ cached order rStartTabName comes after rEndTabName, pExtInfo->maTabName
is set to rEndTabName.
- @returns <FALSE/> if pExtInfo is already filled and rExternDocName does not
+ @returns <FALSE/> if pExtInfo is already filled and rExternDocName does not
result in the identical file ID. Else <TRUE/>.
*/
static bool lcl_ScRange_External_TabSpan(
ScRange & rRange,
- USHORT & rFlags,
+ USHORT & rFlags,
ScAddress::ExternalInfo* pExtInfo,
const String & rExternDocName,
const String & rStartTabName,
@@ -216,10 +216,10 @@ static bool lcl_ScRange_External_TabSpan(
}
/** Returns NULL if the string should be a sheet name, but is invalid.
- Returns a pointer to the first character after the sheet name, if there was
+ Returns a pointer to the first character after the sheet name, if there was
any, else pointer to start.
@param pMsoxlQuoteStop
- Starting _within_ a quoted name, but still may be 3D; quoted name stops
+ Starting _within_ a quoted name, but still may be 3D; quoted name stops
at pMsoxlQuoteStop
*/
static const sal_Unicode *
@@ -242,7 +242,7 @@ lcl_XL_ParseSheetRef( const sal_Unicode* start,
// We pre-analyzed the quoting, no checks needed here.
if (*++p == '\'')
{
- aTabName.Append( pCurrentStart,
+ aTabName.Append( pCurrentStart,
sal::static_int_cast<xub_StrLen>( p - pCurrentStart));
pCurrentStart = ++p;
}
@@ -411,8 +411,8 @@ const sal_Unicode* ScRange::Parse_XL_Header(
}
else if (*p == '\'')
{
- // Sickness in Excel's ODF msoxl namespace:
- // 'E:\[EXTDATA8.XLS]Sheet1'!$A$7 or
+ // Sickness in Excel's ODF msoxl namespace:
+ // 'E:\[EXTDATA8.XLS]Sheet1'!$A$7 or
// 'E:\[EXTDATA12B.XLSB]Sheet1:Sheet3'!$A$11
// But, 'Sheet1'!B3 would also be a valid!
// Excel does not allow [ and ] characters in sheet names though.
@@ -437,7 +437,7 @@ const sal_Unicode* ScRange::Parse_XL_Header(
rExternDocName.Erase( nClose);
rExternDocName.Erase( nOpen, 1);
pMsoxlQuoteStop = p - 1; // the ' quote char
- // There may be embedded escaped quotes, just matching the
+ // There may be embedded escaped quotes, just matching the
// doc name's length may not work.
for (p = start; *p != '['; ++p)
;
@@ -465,7 +465,7 @@ const sal_Unicode* ScRange::Parse_XL_Header(
p = lcl_XL_ParseSheetRef( p+1, rEndTabName, false, pMsoxlQuoteStop);
if( p == NULL )
{
- nFlags = nSaveFlags;
+ nFlags = nSaveFlags;
return start; // invalid tab
}
nFlags |= SCA_VALID_TAB2 | SCA_TAB2_3D | SCA_TAB2_ABSOLUTE;
@@ -520,12 +520,12 @@ const sal_Unicode* ScRange::Parse_XL_Header(
if (rEndTabName.Len())
{
if (!pDoc->GetTable(rEndTabName, nTab))
- {
+ {
// invalid table name.
nFlags &= ~SCA_VALID_TAB2;
nTab = -1;
}
-
+
aEnd.SetTab(nTab);
}
}
@@ -645,11 +645,11 @@ lcl_ScRange_Parse_XL_R1C1( ScRange& r,
std::cerr << "parse::XL::R1C1 \'" << aStr.GetBuffer() << '\'' << std::endl;
}
#endif
- p = r.Parse_XL_Header( p, pDoc, aExternDocName, aStartTabName,
+ p = r.Parse_XL_Header( p, pDoc, aExternDocName, aStartTabName,
aEndTabName, nFlags, bOnlyAcceptSingle, NULL );
if (aExternDocName.Len() > 0)
- lcl_ScRange_External_TabSpan( r, nFlags, pExtInfo, aExternDocName,
+ lcl_ScRange_External_TabSpan( r, nFlags, pExtInfo, aExternDocName,
aStartTabName, aEndTabName, pDoc);
if( NULL == p )
@@ -685,7 +685,7 @@ lcl_ScRange_Parse_XL_R1C1( ScRange& r,
return nFlags;
}
- nFlags |=
+ nFlags |=
SCA_VALID_COL | SCA_VALID_COL2 |
SCA_COL_ABSOLUTE | SCA_COL2_ABSOLUTE;
r.aStart.SetCol( 0 );
@@ -720,7 +720,7 @@ lcl_ScRange_Parse_XL_R1C1( ScRange& r,
if (p && p[0] != 0)
{
// any trailing invalid character must invalidate the whole range.
- nFlags &= ~(SCA_VALID | SCA_VALID_COL | SCA_VALID_ROW | SCA_VALID_TAB |
+ nFlags &= ~(SCA_VALID | SCA_VALID_COL | SCA_VALID_ROW | SCA_VALID_TAB |
SCA_VALID_COL2 | SCA_VALID_ROW2 | SCA_VALID_TAB2);
return nFlags;
}
@@ -753,7 +753,7 @@ lcl_ScRange_Parse_XL_R1C1( ScRange& r,
return nFlags;
}
- nFlags |=
+ nFlags |=
SCA_VALID_ROW | SCA_VALID_ROW2 |
SCA_ROW_ABSOLUTE | SCA_ROW2_ABSOLUTE;
r.aStart.SetRow( 0 );
@@ -827,11 +827,11 @@ lcl_ScRange_Parse_XL_A1( ScRange& r,
std::cerr << "parse::XL::A1 \'" << aStr.GetBuffer() << '\'' << std::endl;
}
#endif
- p = r.Parse_XL_Header( p, pDoc, aExternDocName, aStartTabName,
+ p = r.Parse_XL_Header( p, pDoc, aExternDocName, aStartTabName,
aEndTabName, nFlags, bOnlyAcceptSingle, pExternalLinks );
if (aExternDocName.Len() > 0)
- lcl_ScRange_External_TabSpan( r, nFlags, pExtInfo, aExternDocName,
+ lcl_ScRange_External_TabSpan( r, nFlags, pExtInfo, aExternDocName,
aStartTabName, aEndTabName, pDoc);
if( NULL == p )
@@ -844,7 +844,7 @@ lcl_ScRange_Parse_XL_A1( ScRange& r,
return 0;
tmp1 = lcl_a1_get_row( p, &r.aStart, &nFlags );
-
+
tmp1 = lcl_eatWhiteSpace( tmp1 );
if( !tmp1 || *tmp1++ != ':' ) // Even a singleton requires ':' (eg 2:2)
return 0;
@@ -855,7 +855,7 @@ lcl_ScRange_Parse_XL_A1( ScRange& r,
return 0;
r.aStart.SetCol( 0 ); r.aEnd.SetCol( MAXCOL );
- nFlags |=
+ nFlags |=
SCA_VALID_COL | SCA_VALID_COL2 |
SCA_COL_ABSOLUTE | SCA_COL2_ABSOLUTE;
nFlags |= (nFlags2 << 4);
@@ -878,7 +878,7 @@ lcl_ScRange_Parse_XL_A1( ScRange& r,
return 0;
r.aStart.SetRow( 0 ); r.aEnd.SetRow( MAXROW );
- nFlags |=
+ nFlags |=
SCA_VALID_ROW | SCA_VALID_ROW2 |
SCA_ROW_ABSOLUTE | SCA_ROW2_ABSOLUTE;
nFlags |= (nFlags2 << 4);
@@ -904,7 +904,7 @@ lcl_ScRange_Parse_XL_A1( ScRange& r,
tmp2 = lcl_eatWhiteSpace( tmp2 );
if( *tmp2 != ':' )
{
- // Sheet1:Sheet2!C4 is a valid range, without a second sheet it is
+ // Sheet1:Sheet2!C4 is a valid range, without a second sheet it is
// not. Any trailing invalid character invalidates the range.
if (*tmp2 == 0 && (nFlags & SCA_TAB2_3D))
{
@@ -943,12 +943,12 @@ lcl_ScRange_Parse_XL_A1( ScRange& r,
}
/**
- @param pRange pointer to range where rAddr effectively is *pRange->aEnd,
- used in conjunction with pExtInfo to determine the tab span
+ @param pRange pointer to range where rAddr effectively is *pRange->aEnd,
+ used in conjunction with pExtInfo to determine the tab span
of a 3D reference.
*/
static USHORT
-lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAddr,
+lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAddr,
ScAddress::ExternalInfo* pExtInfo = NULL, ScRange* pRange = NULL )
{
USHORT nRes = 0;
@@ -967,7 +967,7 @@ lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAdd
if (*p++ == SC_COMPILER_FILE_TAB_SEP)
bExtDoc = true;
else
- // This is not a document name. Perhaps a quoted relative table
+ // This is not a document name. Perhaps a quoted relative table
// name.
p = pStart;
}
@@ -1119,8 +1119,8 @@ lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAdd
pExtInfo->maTabName = aTab;
pExtInfo->mnFileId = nFileId;
- if (pRefMgr->getSingleRefToken(nFileId, aTab,
- ScAddress(nCol, nRow, 0), NULL,
+ if (pRefMgr->getSingleRefToken(nFileId, aTab,
+ ScAddress(nCol, nRow, 0), NULL,
&nTab).get())
{
rAddr.SetTab( nTab);
@@ -1131,15 +1131,15 @@ lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAdd
}
else
{
- // This is a call for the second part of the reference,
+ // This is a call for the second part of the reference,
// we must have the range to adapt tab span.
if (!pRange)
nRes = 0;
else
{
USHORT nFlags = nRes | SCA_VALID_TAB2;
- if (!lcl_ScRange_External_TabSpan( *pRange, nFlags,
- pExtInfo, aDocName,
+ if (!lcl_ScRange_External_TabSpan( *pRange, nFlags,
+ pExtInfo, aDocName,
pExtInfo->maTabName, aTab, pDoc))
nRes &= ~SCA_VALID_TAB;
else
@@ -1594,7 +1594,7 @@ lcl_r1c1_append_r ( String &r, int nRow, bool bIsAbs,
}
}
-static String
+static String
getFileNameFromDoc( const ScDocument* pDoc )
{
// TODO : er points at ScGlobal::GetAbsDocName()
@@ -1615,7 +1615,7 @@ getFileNameFromDoc( const ScDocument* pDoc )
}
else
sFileName = pShell->GetTitle();
- }
+ }
}
#if 0
{
diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx
index 4f19a043a34d..e23e24cd542e 100644
--- a/sc/source/core/tool/adiasync.cxx
+++ b/sc/source/core/tool/adiasync.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "brdcst.hxx"
#include "global.hxx"
#include "document.hxx"
-#include "sc.hrc" // FID_DATACHANGED
+#include "sc.hrc" // FID_DATACHANGED
#include <osl/thread.h>
@@ -64,7 +64,7 @@ void CALLTYPE ScAddInAsyncCallBack( double& nHandle, void* pData )
ScAddInAsync::ScAddInAsync() :
SvtBroadcaster(),
nHandle( 0 )
-{ // nur fuer aSeekObj !
+{ // nur fuer aSeekObj !
}
@@ -91,7 +91,7 @@ ScAddInAsync::~ScAddInAsync()
{
// im dTor wg. theAddInAsyncTbl.DeleteAndDestroy in ScGlobal::Clear
pFuncData->Unadvice( (double)nHandle );
- if ( eType == PTR_STRING && pStr ) // mit Typvergleich wg. Union!
+ if ( eType == PTR_STRING && pStr ) // mit Typvergleich wg. Union!
delete pStr;
delete pDocs;
}
@@ -164,14 +164,14 @@ void ScAddInAsync::RemoveDocument( ScDocument* pDocumentP )
const ScAddInAsync** ppAsync =
(const ScAddInAsync**) theAddInAsyncTbl.GetData() + nPos - 1;
for ( ; nPos-- >0; ppAsync-- )
- { // rueckwaerts wg. Pointer-Aufrueckerei im Array
+ { // rueckwaerts wg. Pointer-Aufrueckerei im Array
ScAddInDocs* p = ((ScAddInAsync*)*ppAsync)->pDocs;
USHORT nFoundPos;
if ( p->Seek_Entry( pDocumentP, &nFoundPos ) )
{
p->Remove( nFoundPos );
if ( p->Count() == 0 )
- { // dieses AddIn wird nicht mehr benutzt
+ { // dieses AddIn wird nicht mehr benutzt
ScAddInAsync* pAsync = (ScAddInAsync*)*ppAsync;
theAddInAsyncTbl.Remove( nPos );
delete pAsync;
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index 857efd972886..e14b16c2a164 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,19 +83,19 @@ ScAppOptions::~ScAppOptions()
void ScAppOptions::SetDefaults()
{
if ( ScOptionsUtil::IsMetricSystem() )
- eMetric = FUNIT_CM; // default for countries with metric system
+ eMetric = FUNIT_CM; // default for countries with metric system
else
- eMetric = FUNIT_INCH; // default for others
+ eMetric = FUNIT_INCH; // default for others
- nZoom = 100;
- eZoomType = SVX_ZOOM_PERCENT;
+ nZoom = 100;
+ eZoomType = SVX_ZOOM_PERCENT;
bSynchronizeZoom = TRUE;
- nStatusFunc = SUBTOTAL_FUNC_SUM;
- bAutoComplete = TRUE;
- bDetectiveAuto = TRUE;
+ nStatusFunc = SUBTOTAL_FUNC_SUM;
+ bAutoComplete = TRUE;
+ bDetectiveAuto = TRUE;
delete [] pLRUList;
- pLRUList = new USHORT[5]; // sinnvoll vorbelegen
+ pLRUList = new USHORT[5]; // sinnvoll vorbelegen
pLRUList[0] = SC_OPCODE_SUM;
pLRUList[1] = SC_OPCODE_AVERAGE;
pLRUList[2] = SC_OPCODE_MIN;
@@ -107,7 +107,7 @@ void ScAppOptions::SetDefaults()
nTrackInsertColor = COL_TRANSPARENT;
nTrackDeleteColor = COL_TRANSPARENT;
nTrackMoveColor = COL_TRANSPARENT;
- eLinkMode = LM_ON_DEMAND;
+ eLinkMode = LM_ON_DEMAND;
nDefaultObjectSizeWidth = 8000;
nDefaultObjectSizeHeight = 5000;
@@ -119,19 +119,19 @@ void ScAppOptions::SetDefaults()
const ScAppOptions& ScAppOptions::operator=( const ScAppOptions& rCpy )
{
- eMetric = rCpy.eMetric;
- eZoomType = rCpy.eZoomType;
+ eMetric = rCpy.eMetric;
+ eZoomType = rCpy.eZoomType;
bSynchronizeZoom = rCpy.bSynchronizeZoom;
- nZoom = rCpy.nZoom;
+ nZoom = rCpy.nZoom;
SetLRUFuncList( rCpy.pLRUList, rCpy.nLRUFuncCount );
- nStatusFunc = rCpy.nStatusFunc;
- bAutoComplete = rCpy.bAutoComplete;
- bDetectiveAuto = rCpy.bDetectiveAuto;
+ nStatusFunc = rCpy.nStatusFunc;
+ bAutoComplete = rCpy.bAutoComplete;
+ bDetectiveAuto = rCpy.bDetectiveAuto;
nTrackContentColor = rCpy.nTrackContentColor;
nTrackInsertColor = rCpy.nTrackInsertColor;
nTrackDeleteColor = rCpy.nTrackDeleteColor;
nTrackMoveColor = rCpy.nTrackMoveColor;
- eLinkMode = rCpy.eLinkMode;
+ eLinkMode = rCpy.eLinkMode;
nDefaultObjectSizeWidth = rCpy.nDefaultObjectSizeWidth;
nDefaultObjectSizeHeight = rCpy.nDefaultObjectSizeHeight;
mbShowSharedDocumentWarning = rCpy.mbShowSharedDocumentWarning;
@@ -140,7 +140,7 @@ const ScAppOptions& ScAppOptions::operator=( const ScAppOptions& rCpy )
//------------------------------------------------------------------------
-void ScAppOptions::SetLRUFuncList( const USHORT* pList, const USHORT nCount )
+void ScAppOptions::SetLRUFuncList( const USHORT* pList, const USHORT nCount )
{
delete [] pLRUList;
@@ -158,7 +158,7 @@ void ScAppOptions::SetLRUFuncList( const USHORT* pList, const USHORT nCount )
}
//==================================================================
-// Config Item containing app options
+// Config Item containing app options
//==================================================================
void lcl_SetLastFunctions( ScAppOptions& rOpt, const Any& rValue )
@@ -194,7 +194,7 @@ void lcl_GetLastFunctions( Any& rDest, const ScAppOptions& rOpt )
rDest <<= aSeq;
}
else
- rDest <<= Sequence<sal_Int32>(0); // empty
+ rDest <<= Sequence<sal_Int32>(0); // empty
}
void lcl_SetSortList( const Any& rValue )
@@ -206,8 +206,8 @@ void lcl_SetSortList( const Any& rValue )
const OUString* pArray = aSeq.getConstArray();
ScUserList aList;
- // if setting is "default", keep default values from ScUserList ctor
- //! mark "default" in a safe way
+ // if setting is "default", keep default values from ScUserList ctor
+ //! mark "default" in a safe way
BOOL bDefault = ( nCount == 1 &&
pArray[0].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "NULL" ) ) );
@@ -240,60 +240,60 @@ void lcl_GetSortList( Any& rDest )
rDest <<= aSeq;
}
else
- rDest <<= Sequence<OUString>(0); // empty
+ rDest <<= Sequence<OUString>(0); // empty
}
//------------------------------------------------------------------
-#define CFGPATH_LAYOUT "Office.Calc/Layout"
+#define CFGPATH_LAYOUT "Office.Calc/Layout"
-#define SCLAYOUTOPT_MEASURE 0
-#define SCLAYOUTOPT_STATUSBAR 1
-#define SCLAYOUTOPT_ZOOMVAL 2
-#define SCLAYOUTOPT_ZOOMTYPE 3
+#define SCLAYOUTOPT_MEASURE 0
+#define SCLAYOUTOPT_STATUSBAR 1
+#define SCLAYOUTOPT_ZOOMVAL 2
+#define SCLAYOUTOPT_ZOOMTYPE 3
#define SCLAYOUTOPT_SYNCZOOM 4
#define SCLAYOUTOPT_COUNT 5
-#define CFGPATH_INPUT "Office.Calc/Input"
+#define CFGPATH_INPUT "Office.Calc/Input"
-#define SCINPUTOPT_LASTFUNCS 0
-#define SCINPUTOPT_AUTOINPUT 1
-#define SCINPUTOPT_DET_AUTO 2
-#define SCINPUTOPT_COUNT 3
+#define SCINPUTOPT_LASTFUNCS 0
+#define SCINPUTOPT_AUTOINPUT 1
+#define SCINPUTOPT_DET_AUTO 2
+#define SCINPUTOPT_COUNT 3
-#define CFGPATH_REVISION "Office.Calc/Revision/Color"
+#define CFGPATH_REVISION "Office.Calc/Revision/Color"
-#define SCREVISOPT_CHANGE 0
-#define SCREVISOPT_INSERTION 1
-#define SCREVISOPT_DELETION 2
-#define SCREVISOPT_MOVEDENTRY 3
-#define SCREVISOPT_COUNT 4
+#define SCREVISOPT_CHANGE 0
+#define SCREVISOPT_INSERTION 1
+#define SCREVISOPT_DELETION 2
+#define SCREVISOPT_MOVEDENTRY 3
+#define SCREVISOPT_COUNT 4
-#define CFGPATH_CONTENT "Office.Calc/Content/Update"
+#define CFGPATH_CONTENT "Office.Calc/Content/Update"
-#define SCCONTENTOPT_LINK 0
-#define SCCONTENTOPT_COUNT 1
+#define SCCONTENTOPT_LINK 0
+#define SCCONTENTOPT_COUNT 1
-#define CFGPATH_SORTLIST "Office.Calc/SortList"
+#define CFGPATH_SORTLIST "Office.Calc/SortList"
-#define SCSORTLISTOPT_LIST 0
-#define SCSORTLISTOPT_COUNT 1
+#define SCSORTLISTOPT_LIST 0
+#define SCSORTLISTOPT_COUNT 1
-#define CFGPATH_MISC "Office.Calc/Misc"
+#define CFGPATH_MISC "Office.Calc/Misc"
-#define SCMISCOPT_DEFOBJWIDTH 0
-#define SCMISCOPT_DEFOBJHEIGHT 1
+#define SCMISCOPT_DEFOBJWIDTH 0
+#define SCMISCOPT_DEFOBJHEIGHT 1
#define SCMISCOPT_SHOWSHAREDDOCWARN 2
-#define SCMISCOPT_COUNT 3
+#define SCMISCOPT_COUNT 3
Sequence<OUString> ScAppCfg::GetLayoutPropertyNames()
{
static const char* aPropNames[] =
{
- "Other/MeasureUnit/NonMetric", // SCLAYOUTOPT_MEASURE
- "Other/StatusbarFunction", // SCLAYOUTOPT_STATUSBAR
- "Zoom/Value", // SCLAYOUTOPT_ZOOMVAL
+ "Other/MeasureUnit/NonMetric", // SCLAYOUTOPT_MEASURE
+ "Other/StatusbarFunction", // SCLAYOUTOPT_STATUSBAR
+ "Zoom/Value", // SCLAYOUTOPT_ZOOMVAL
"Zoom/Type", // SCLAYOUTOPT_ZOOMTYPE
"Zoom/Synchronize" // SCLAYOUTOPT_SYNCZOOM
};
@@ -302,7 +302,7 @@ Sequence<OUString> ScAppCfg::GetLayoutPropertyNames()
for(int i = 0; i < SCLAYOUTOPT_COUNT; i++)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
- // adjust for metric system
+ // adjust for metric system
if (ScOptionsUtil::IsMetricSystem())
pNames[SCLAYOUTOPT_MEASURE] = OUString::createFromAscii( "Other/MeasureUnit/Metric" );
@@ -313,9 +313,9 @@ Sequence<OUString> ScAppCfg::GetInputPropertyNames()
{
static const char* aPropNames[] =
{
- "LastFunctions", // SCINPUTOPT_LASTFUNCS
- "AutoInput", // SCINPUTOPT_AUTOINPUT
- "DetectiveAuto" // SCINPUTOPT_DET_AUTO
+ "LastFunctions", // SCINPUTOPT_LASTFUNCS
+ "AutoInput", // SCINPUTOPT_AUTOINPUT
+ "DetectiveAuto" // SCINPUTOPT_DET_AUTO
};
Sequence<OUString> aNames(SCINPUTOPT_COUNT);
OUString* pNames = aNames.getArray();
@@ -329,10 +329,10 @@ Sequence<OUString> ScAppCfg::GetRevisionPropertyNames()
{
static const char* aPropNames[] =
{
- "Change", // SCREVISOPT_CHANGE
- "Insertion", // SCREVISOPT_INSERTION
- "Deletion", // SCREVISOPT_DELETION
- "MovedEntry" // SCREVISOPT_MOVEDENTRY
+ "Change", // SCREVISOPT_CHANGE
+ "Insertion", // SCREVISOPT_INSERTION
+ "Deletion", // SCREVISOPT_DELETION
+ "MovedEntry" // SCREVISOPT_MOVEDENTRY
};
Sequence<OUString> aNames(SCREVISOPT_COUNT);
OUString* pNames = aNames.getArray();
@@ -346,7 +346,7 @@ Sequence<OUString> ScAppCfg::GetContentPropertyNames()
{
static const char* aPropNames[] =
{
- "Link" // SCCONTENTOPT_LINK
+ "Link" // SCCONTENTOPT_LINK
};
Sequence<OUString> aNames(SCCONTENTOPT_COUNT);
OUString* pNames = aNames.getArray();
@@ -360,7 +360,7 @@ Sequence<OUString> ScAppCfg::GetSortListPropertyNames()
{
static const char* aPropNames[] =
{
- "List" // SCSORTLISTOPT_LIST
+ "List" // SCSORTLISTOPT_LIST
};
Sequence<OUString> aNames(SCSORTLISTOPT_COUNT);
OUString* pNames = aNames.getArray();
@@ -374,7 +374,7 @@ Sequence<OUString> ScAppCfg::GetMiscPropertyNames()
{
static const char* aPropNames[] =
{
- "DefaultObjectSize/Width", // SCMISCOPT_DEFOBJWIDTH
+ "DefaultObjectSize/Width", // SCMISCOPT_DEFOBJWIDTH
"DefaultObjectSize/Height", // SCMISCOPT_DEFOBJHEIGHT
"SharedDocument/ShowWarning" // SCMISCOPT_SHOWSHAREDDOCWARN
};
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 5a7f117e75d9..0ed8c1962a74 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,23 +55,23 @@
const sal_Char *linker_dummy = "";
-// Standard-Name ist jetzt STR_STYLENAME_STANDARD (wie Vorlagen)
+// Standard-Name ist jetzt STR_STYLENAME_STANDARD (wie Vorlagen)
//static const sal_Char __FAR_DATA cStandardName[] = "Standard";
static const sal_Char __FAR_DATA sAutoTblFmtName[] = "autotbl.fmt";
// bis SO5PF
-const USHORT AUTOFORMAT_ID_X = 9501;
-const USHORT AUTOFORMAT_ID_358 = 9601;
-const USHORT AUTOFORMAT_DATA_ID_X = 9502;
+const USHORT AUTOFORMAT_ID_X = 9501;
+const USHORT AUTOFORMAT_ID_358 = 9601;
+const USHORT AUTOFORMAT_DATA_ID_X = 9502;
// ab SO5
//! in nachfolgenden Versionen muss der Betrag dieser IDs groesser sein
-const USHORT AUTOFORMAT_ID_504 = 9801;
-const USHORT AUTOFORMAT_DATA_ID_504 = 9802;
+const USHORT AUTOFORMAT_ID_504 = 9801;
+const USHORT AUTOFORMAT_DATA_ID_504 = 9802;
-const USHORT AUTOFORMAT_ID_552 = 9901;
-const USHORT AUTOFORMAT_DATA_ID_552 = 9902;
+const USHORT AUTOFORMAT_ID_552 = 9901;
+const USHORT AUTOFORMAT_DATA_ID_552 = 9902;
// --- from 641 on: CJK and CTL font settings
const USHORT AUTOFORMAT_ID_641 = 10001;
@@ -95,13 +95,13 @@ const USHORT AUTOFORMAT_DATA_ID = AUTOFORMAT_DATA_ID_300OVRLN;
#ifdef READ_OLDVERS
-const USHORT AUTOFORMAT_OLD_ID_OLD = 4201;
-const USHORT AUTOFORMAT_OLD_DATA_ID = 4202;
-const USHORT AUTOFORMAT_OLD_ID_NEW = 4203;
+const USHORT AUTOFORMAT_OLD_ID_OLD = 4201;
+const USHORT AUTOFORMAT_OLD_DATA_ID = 4202;
+const USHORT AUTOFORMAT_OLD_ID_NEW = 4203;
#endif
-// Struct mit Versionsnummern der Items
+// Struct mit Versionsnummern der Items
struct ScAfVersions
{
@@ -220,10 +220,10 @@ void ScAfVersions::Write(SvStream& rStream)
rStream << SfxInt32Item(ATTR_ROTATE_VALUE).GetVersion(SOFFICE_FILEFORMAT_40);
rStream << SvxRotateModeItem(SVX_ROTATE_MODE_STANDARD,0).GetVersion(SOFFICE_FILEFORMAT_40);
- rStream << (USHORT)0; // Num-Format
+ rStream << (USHORT)0; // Num-Format
}
-// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
ScAutoFormatDataField::ScAutoFormatDataField() :
aFont( ATTR_FONT ),
@@ -480,7 +480,7 @@ BOOL ScAutoFormatDataField::Save( SvStream& rStream )
}
-// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
ScAutoFormatData::ScAutoFormatData()
{
@@ -870,7 +870,7 @@ BOOL ScAutoFormatData::Save(SvStream& rStream)
rStream.WriteByteString( aName, RTL_TEXTENCODING_UTF8 );
#if 0
- // This was an internal flag to allow creating AutoFormats with localized names
+ // This was an internal flag to allow creating AutoFormats with localized names
if ( USHRT_MAX == nStrResId )
{
@@ -914,7 +914,7 @@ BOOL ScAutoFormatData::Save(SvStream& rStream)
ScAutoFormat::ScAutoFormat(USHORT nLim, USHORT nDel, BOOL bDup):
ScSortedCollection (nLim, nDel, bDup),
- bSaveLater (FALSE)
+ bSaveLater (FALSE)
{
// create default autoformat
ScAutoFormatData* pData = new ScAutoFormatData;
@@ -999,13 +999,13 @@ ScAutoFormat::ScAutoFormat(USHORT nLim, USHORT nDel, BOOL bDup):
ScAutoFormat::ScAutoFormat(const ScAutoFormat& rAutoFormat) :
ScSortedCollection (rAutoFormat),
- bSaveLater (FALSE)
+ bSaveLater (FALSE)
{}
ScAutoFormat::~ScAutoFormat()
{
- // Bei Aenderungen per StarOne wird nicht sofort gespeichert, sondern zuerst nur
- // das SaveLater Flag gesetzt. Wenn das Flag noch gesetzt ist, jetzt speichern.
+ // Bei Aenderungen per StarOne wird nicht sofort gespeichert, sondern zuerst nur
+ // das SaveLater Flag gesetzt. Wenn das Flag noch gesetzt ist, jetzt speichern.
if (bSaveLater)
Save();
@@ -1062,8 +1062,8 @@ BOOL ScAutoFormat::Load()
BYTE nChrSet, nCnt;
long nPos = rStream.Tell();
rStream >> nCnt >> nChrSet;
-// if( 4 <= nCnt )
-// rStream >> nFileVers;
+// if( 4 <= nCnt )
+// rStream >> nFileVers;
if( rStream.Tell() != ULONG(nPos + nCnt) )
{
DBG_ERRORFILE( "Der Header enthaelt mehr/neuere Daten" );
@@ -1076,7 +1076,7 @@ BOOL ScAutoFormat::Load()
if( nVal == AUTOFORMAT_ID_358 || nVal == AUTOFORMAT_ID_X ||
(AUTOFORMAT_ID_504 <= nVal && nVal <= AUTOFORMAT_ID) )
{
- aVersions.Load( rStream, nVal ); // Item-Versionen
+ aVersions.Load( rStream, nVal ); // Item-Versionen
ScAutoFormatData* pData;
USHORT nAnz = 0;
@@ -1157,13 +1157,13 @@ BOOL ScAutoFormat::Save()
// Achtung hier muss ein allgemeiner Header gespeichert werden
USHORT nVal = AUTOFORMAT_ID;
rStream << nVal
- << (BYTE)2 // Anzahl von Zeichen des Headers incl. diesem
+ << (BYTE)2 // Anzahl von Zeichen des Headers incl. diesem
<< (BYTE)::GetSOStoreTextEncoding(
gsl_getSystemTextEncoding(), sal::static_int_cast<USHORT>(rStream.GetVersion()) );
-// << (BYTE)4 // Anzahl von Zeichen des Headers incl. diesem
-// << (BYTE)::GetStoreCharSet(::GetSystemCharSet())
-// << (UNIT16)SOFFICE_FILEFORMAT_NOW;
- ScAfVersions::Write(rStream); // Item-Versionen
+// << (BYTE)4 // Anzahl von Zeichen des Headers incl. diesem
+// << (BYTE)::GetStoreCharSet(::GetSystemCharSet())
+// << (UNIT16)SOFFICE_FILEFORMAT_NOW;
+ ScAfVersions::Write(rStream); // Item-Versionen
bRet = (rStream.GetError() == 0);
//-----------------------------------------------------------
@@ -1181,7 +1181,7 @@ BOOL ScAutoFormat::Save()
USHORT ScAutoFormat::FindIndexPerName( const String& rName ) const
{
- String aName;
+ String aName;
for( USHORT i=0; i<nCount ; i++ )
{
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index e8e2b28f3f8e..966706bbc806 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,32 +69,32 @@ typedef void (CALLTYPE* SetLanguagePtr)( USHORT& nLanguage );
typedef void (CALLTYPE* GetParamDesc)
(USHORT& nNo, USHORT& nParam, sal_Char* pName, sal_Char* pDesc );
-typedef void (CALLTYPE* IsAsync) ( USHORT& nNo,
- ParamType* peType );
-typedef void (CALLTYPE* Advice) ( USHORT& nNo,
- AdvData& pfCallback );
-typedef void (CALLTYPE* Unadvice)( double& nHandle );
+typedef void (CALLTYPE* IsAsync) ( USHORT& nNo,
+ ParamType* peType );
+typedef void (CALLTYPE* Advice) ( USHORT& nNo,
+ AdvData& pfCallback );
+typedef void (CALLTYPE* Unadvice)( double& nHandle );
typedef void (CALLTYPE* FARPROC) ( void );
}
#if defined(OS2) && defined(BLC)
-#define GETFUNCTIONCOUNT "_GetFunctionCount"
-#define GETFUNCTIONDATA "_GetFunctionData"
-#define SETLANGUAGE "_SetLanguage"
-#define GETPARAMDESC "_GetParameterDescription"
-#define ISASYNC "_IsAsync"
-#define ADVICE "_Advice"
-#define UNADVICE "_Unadvice"
+#define GETFUNCTIONCOUNT "_GetFunctionCount"
+#define GETFUNCTIONDATA "_GetFunctionData"
+#define SETLANGUAGE "_SetLanguage"
+#define GETPARAMDESC "_GetParameterDescription"
+#define ISASYNC "_IsAsync"
+#define ADVICE "_Advice"
+#define UNADVICE "_Unadvice"
#else // Pascal oder extern "C"
-#define GETFUNCTIONCOUNT "GetFunctionCount"
-#define GETFUNCTIONDATA "GetFunctionData"
-#define SETLANGUAGE "SetLanguage"
-#define GETPARAMDESC "GetParameterDescription"
-#define ISASYNC "IsAsync"
-#define ADVICE "Advice"
-#define UNADVICE "Unadvice"
+#define GETFUNCTIONCOUNT "GetFunctionCount"
+#define GETFUNCTIONDATA "GetFunctionData"
+#define SETLANGUAGE "SetLanguage"
+#define GETPARAMDESC "GetParameterDescription"
+#define ISASYNC "IsAsync"
+#define ADVICE "Advice"
+#define UNADVICE "Unadvice"
#endif
#define LIBFUNCNAME( name ) \
@@ -103,12 +103,12 @@ typedef void (CALLTYPE* FARPROC) ( void );
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
FuncData::FuncData(const String& rIName) :
- pModuleData (NULL),
+ pModuleData (NULL),
aInternalName (rIName),
-// aFuncName (""),
- nNumber (0),
- nParamCount (0),
- eAsyncType (NONE)
+// aFuncName (""),
+ nNumber (0),
+ nParamCount (0),
+ eAsyncType (NONE)
{
for (USHORT i = 0; i < MAXFUNCPARAM; i++)
eParamType[i] = PTR_DOUBLE;
@@ -117,18 +117,18 @@ FuncData::FuncData(const String& rIName) :
//------------------------------------------------------------------------
FuncData::FuncData(const ModuleData*pModule,
- const String& rIName,
- const String& rFName,
- USHORT nNo,
- USHORT nCount,
+ const String& rIName,
+ const String& rFName,
+ USHORT nNo,
+ USHORT nCount,
const ParamType* peType,
ParamType eType) :
- pModuleData (pModule),
+ pModuleData (pModule),
aInternalName (rIName),
- aFuncName (rFName),
- nNumber (nNo),
- nParamCount (nCount),
- eAsyncType (eType)
+ aFuncName (rFName),
+ nNumber (nNo),
+ nParamCount (nCount),
+ eAsyncType (eType)
{
for (USHORT i = 0; i < MAXFUNCPARAM; i++)
eParamType[i] = peType[i];
@@ -138,12 +138,12 @@ FuncData::FuncData(const ModuleData*pModule,
FuncData::FuncData(const FuncData& rData) :
ScDataObject(),
- pModuleData (rData.pModuleData),
+ pModuleData (rData.pModuleData),
aInternalName (rData.aInternalName),
- aFuncName (rData.aFuncName),
- nNumber (rData.nNumber),
- nParamCount (rData.nParamCount),
- eAsyncType (rData.eAsyncType)
+ aFuncName (rData.aFuncName),
+ nNumber (rData.nNumber),
+ nParamCount (rData.nParamCount),
+ eAsyncType (rData.eAsyncType)
{
for (USHORT i = 0; i < MAXFUNCPARAM; i++)
eParamType[i] = rData.eParamType[i];
@@ -169,17 +169,17 @@ BOOL FuncCollection::SearchFunc( const String& rName, USHORT& rIndex ) const
class ModuleData : public ScDataObject
{
friend class ModuleCollection;
- String aName;
+ String aName;
osl::Module* pInstance;
public:
ModuleData(const String& rStr, osl::Module* pInst) : aName (rStr), pInstance (pInst) {}
ModuleData(const ModuleData& rData) : ScDataObject(), aName (rData.aName) {pInstance = new osl::Module(aName);}
~ModuleData() { delete pInstance; }
- virtual ScDataObject* Clone() const { return new ModuleData(*this); }
+ virtual ScDataObject* Clone() const { return new ModuleData(*this); }
- const String& GetName() const { return aName; }
+ const String& GetName() const { return aName; }
osl::Module* GetInstance() const { return pInstance; }
- void FreeInstance() { delete pInstance; pInstance = 0; }
+ void FreeInstance() { delete pInstance; pInstance = 0; }
};
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -189,10 +189,10 @@ public:
ModuleCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE) : ScSortedCollection ( nLim, nDel, bDup ) {}
ModuleCollection(const ModuleCollection& rModuleCollection) : ScSortedCollection ( rModuleCollection ) {}
- virtual ScDataObject* Clone() const { return new ModuleCollection(*this); }
- ModuleData* operator[]( const USHORT nIndex) const {return (ModuleData*)At(nIndex);}
- virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const;
- BOOL SearchModule( const String& rName,
+ virtual ScDataObject* Clone() const { return new ModuleCollection(*this); }
+ ModuleData* operator[]( const USHORT nIndex) const {return (ModuleData*)At(nIndex);}
+ virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const;
+ BOOL SearchModule( const String& rName,
const ModuleData*& rpModule ) const;
};
@@ -451,7 +451,7 @@ BOOL FuncData::GetParamDesc( String& aName, String& aDesc, USHORT nParam )
sal_Char pcName[256];
sal_Char pcDesc[256];
*pcName = *pcDesc = 0;
- USHORT nFuncNo = nNumber; // nicht per Reference versauen lassen..
+ USHORT nFuncNo = nNumber; // nicht per Reference versauen lassen..
((::GetParamDesc)fProc)( nFuncNo, nParam, pcName, pcDesc );
aName = String( pcName, osl_getThreadTextEncoding() );
aDesc = String( pcDesc, osl_getThreadTextEncoding() );
diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index 45d2c4a890bb..5c1dbf8e1f8e 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 ScCellFormat::GetString( ScBaseCell* pCell, ULONG nFormat, String& rString,
break;
case CELLTYPE_FORMULA:
{
- ScFormulaCell* pFCell = (ScFormulaCell*)pCell;
+ ScFormulaCell* pFCell = (ScFormulaCell*)pCell;
if ( bFormula )
pFCell->GetFormula( rString );
else
diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx
index 4db8c22d19d8..06195d296136 100644
--- a/sc/source/core/tool/cellkeytranslator.cxx
+++ b/sc/source/core/tool/cellkeytranslator.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScCellKeyword::ScCellKeyword(const sal_Char* pName, OpCode eOpCode, const Locale
::std::auto_ptr<ScCellKeywordTranslator> ScCellKeywordTranslator::spInstance(NULL);
-static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap,
+static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap,
OpCode eOpCode = ocNone, const Locale* pLocale = NULL)
{
ScCellKeywordHashMap::const_iterator itrEnd = aMap.end();
@@ -173,7 +173,7 @@ void ScCellKeywordTranslator::transKeyword(String& rName, const Locale* pLocale,
}
ScCellKeywordTranslator::ScCellKeywordTranslator() :
- maTransWrapper( ::comphelper::getProcessServiceFactory(),
+ maTransWrapper( ::comphelper::getProcessServiceFactory(),
i18n::TransliterationModules_LOWERCASE_UPPERCASE )
{
init();
@@ -197,11 +197,11 @@ void ScCellKeywordTranslator::init()
// The file below has been autogenerated by sc/workben/celltrans/parse.py.
// To add new locale keywords, edit sc/workben/celltrans/keywords_utf16.txt
// and re-run the parse.py script.
- //
- // All keywords must be uppercase, and the mapping must be from the
+ //
+ // All keywords must be uppercase, and the mapping must be from the
// localized keyword to the English keyword.
- //
- // Make sure that the original keyword file (keywords_utf16.txt) is
+ //
+ // Make sure that the original keyword file (keywords_utf16.txt) is
// encoded in UCS-2/UTF-16!
#include "cellkeywords.inl"
diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx
index 573763141b18..4a359b54bf24 100644
--- a/sc/source/core/tool/chartarr.cxx
+++ b/sc/source/core/tool/chartarr.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
#include "scitems.hxx"
#include <svl/intitem.hxx>
#include <svl/zforlist.hxx>
-#include <float.h> // DBL_MIN
+#include <float.h> // DBL_MIN
#include "chartarr.hxx"
#include "document.hxx"
@@ -140,7 +140,7 @@ ScMemChart* ScChartArray::CreateMemChart()
return CreateMemChartSingle();
}
else
- return CreateMemChartMulti(); // kann 0 Range besser ab als Single
+ return CreateMemChartMulti(); // kann 0 Range besser ab als Single
}
ScMemChart* ScChartArray::CreateMemChartSingle()
@@ -149,7 +149,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
SCSIZE nRow;
//
- // wirkliche Groesse (ohne versteckte Zeilen/Spalten)
+ // wirkliche Groesse (ohne versteckte Zeilen/Spalten)
//
SCCOL nColAdd = HasRowHeaders() ? 1 : 0;
@@ -164,7 +164,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
ScRangeListRef aRangeListRef(GetRangeList());
aRangeListRef->First()->GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
- SCCOL nStrCol = nCol1; // fuer Beschriftung merken
+ SCCOL nStrCol = nCol1; // fuer Beschriftung merken
SCROW nStrRow = nRow1;
// Skip hidden columns.
// TODO: make use of last column value once implemented.
@@ -240,15 +240,15 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
}
//
- // Daten
+ // Daten
//
ScMemChart* pMemChart = new ScMemChart(
static_cast<short>(nColCount), static_cast<short>(nRowCount) );
if (pMemChart)
{
-// SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
-// pMemChart->SetNumberFormatter( pFormatter );
+// SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
+// pMemChart->SetNumberFormatter( pFormatter );
if ( bValidData )
{
BOOL bCalcAsShown = pDocument->GetDocOptions().IsCalcAsShown();
@@ -257,7 +257,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
{
for (nRow=0; nRow<nRowCount; nRow++)
{
- double nVal = DBL_MIN; // Hack fuer Chart, um leere Zellen zu erkennen
+ double nVal = DBL_MIN; // Hack fuer Chart, um leere Zellen zu erkennen
pDocument->GetCell( aCols[nCol], aRows[nRow], nTab1, pCell );
if (pCell)
@@ -287,7 +287,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
}
else
{
- //! Flag, dass Daten ungueltig ??
+ //! Flag, dass Daten ungueltig ??
for (nCol=0; nCol<nColCount; nCol++)
for (nRow=0; nRow<nRowCount; nRow++)
@@ -295,7 +295,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
}
//
- // Spalten-Header
+ // Spalten-Header
//
for (nCol=0; nCol<nColCount; nCol++)
@@ -316,11 +316,11 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
// ULONG nNumberAttr = (nTotalRows ? pDocument->GetNumberFormat(
// ScAddress( pCols[nCol], nRow1, nTab1)) : 0);
-// pMemChart->SetNumFormatIdCol( static_cast<long>(nCol), nNumberAttr );
+// pMemChart->SetNumFormatIdCol( static_cast<long>(nCol), nNumberAttr );
}
//
- // Zeilen-Header
+ // Zeilen-Header
//
for (nRow=0; nRow<nRowCount; nRow++)
@@ -341,31 +341,31 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
// ULONG nNumberAttr = (nTotalCols ? pDocument->GetNumberFormat(
// ScAddress( nCol1, pRows[nRow], nTab1)) : 0);
-// pMemChart->SetNumFormatIdRow( static_cast<long>(nRow), nNumberAttr );
+// pMemChart->SetNumFormatIdRow( static_cast<long>(nRow), nNumberAttr );
}
//
// Titel
//
-// pMemChart->SetMainTitle(ScGlobal::GetRscString(STR_CHART_MAINTITLE));
-// pMemChart->SetSubTitle(ScGlobal::GetRscString(STR_CHART_SUBTITLE));
-// pMemChart->SetXAxisTitle(ScGlobal::GetRscString(STR_CHART_XTITLE));
-// pMemChart->SetYAxisTitle(ScGlobal::GetRscString(STR_CHART_YTITLE));
-// pMemChart->SetZAxisTitle(ScGlobal::GetRscString(STR_CHART_ZTITLE));
+// pMemChart->SetMainTitle(ScGlobal::GetRscString(STR_CHART_MAINTITLE));
+// pMemChart->SetSubTitle(ScGlobal::GetRscString(STR_CHART_SUBTITLE));
+// pMemChart->SetXAxisTitle(ScGlobal::GetRscString(STR_CHART_XTITLE));
+// pMemChart->SetYAxisTitle(ScGlobal::GetRscString(STR_CHART_YTITLE));
+// pMemChart->SetZAxisTitle(ScGlobal::GetRscString(STR_CHART_ZTITLE));
//
- // Zahlen-Typ
+ // Zahlen-Typ
//
// ULONG nNumberAttr = (nTotalCols && nTotalRows ?
// pDocument->GetNumberFormat( ScAddress( nCol1, nRow1, nTab1)) :
// 0);
-// if (pFormatter)
-// pMemChart->SetDataType(pFormatter->GetType( nNumberAttr ));
+// if (pFormatter)
+// pMemChart->SetDataType(pFormatter->GetType( nNumberAttr ));
//
- // Parameter-Strings
+ // Parameter-Strings
//
// SetExtraStrings( *pMemChart );
@@ -402,14 +402,14 @@ ScMemChart* ScChartArray::CreateMemChartMulti()
}
//
- // Daten
+ // Daten
//
ScMemChart* pMemChart = new ScMemChart(
static_cast<short>(nColCount), static_cast<short>(nRowCount) );
if (pMemChart)
{
-// pMemChart->SetNumberFormatter( pDocument->GetFormatTable() );
+// pMemChart->SetNumberFormatter( pDocument->GetFormatTable() );
BOOL bCalcAsShown = pDocument->GetDocOptions().IsCalcAsShown();
ULONG nIndex = 0;
if (bValidData)
@@ -418,10 +418,10 @@ ScMemChart* ScChartArray::CreateMemChartMulti()
{
for ( nRow = 0; nRow < nRowCount; nRow++, nIndex++ )
{
- double nVal = DBL_MIN; // Hack fuer Chart, um leere Zellen zu erkennen
+ double nVal = DBL_MIN; // Hack fuer Chart, um leere Zellen zu erkennen
const ScAddress* pPos = GetPositionMap()->GetPosition( nIndex );
if ( pPos )
- { // sonst: Luecke
+ { // sonst: Luecke
ScBaseCell* pCell = pDocument->GetCell( *pPos );
if (pCell)
{
@@ -451,10 +451,10 @@ ScMemChart* ScChartArray::CreateMemChartMulti()
{
for ( nRow = 0; nRow < nRowCount; nRow++, nIndex++ )
{
- double nVal = DBL_MIN; // Hack fuer Chart, um leere Zellen zu erkennen
+ double nVal = DBL_MIN; // Hack fuer Chart, um leere Zellen zu erkennen
const ScAddress* pPos = GetPositionMap()->GetPosition( nIndex );
if ( pPos )
- { // sonst: Luecke
+ { // sonst: Luecke
ScBaseCell* pCell = pDocument->GetCell( *pPos );
if (pCell)
{
@@ -483,7 +483,7 @@ ScMemChart* ScChartArray::CreateMemChartMulti()
//2do: Beschriftung bei Luecken
//
- // Spalten-Header
+ // Spalten-Header
//
SCCOL nPosCol = 0;
@@ -509,15 +509,15 @@ ScMemChart* ScChartArray::CreateMemChartMulti()
}
pMemChart->SetColText( static_cast<short>(nCol), aString);
-// ULONG nNumberAttr = 0;
-// pPos = GetPositionMap()->GetPosition( nCol, 0 );
-// if ( pPos )
-// nNumberAttr = pDocument->GetNumberFormat( *pPos );
-// pMemChart->SetNumFormatIdCol( static_cast<long>(nCol), nNumberAttr );
+// ULONG nNumberAttr = 0;
+// pPos = GetPositionMap()->GetPosition( nCol, 0 );
+// if ( pPos )
+// nNumberAttr = pDocument->GetNumberFormat( *pPos );
+// pMemChart->SetNumFormatIdCol( static_cast<long>(nCol), nNumberAttr );
}
//
- // Zeilen-Header
+ // Zeilen-Header
//
SCROW nPosRow = 0;
@@ -542,43 +542,43 @@ ScMemChart* ScChartArray::CreateMemChartMulti()
}
pMemChart->SetRowText( static_cast<short>(nRow), aString);
-// ULONG nNumberAttr = 0;
-// pPos = GetPositionMap()->GetPosition( 0, nRow );
-// if ( pPos )
-// nNumberAttr = pDocument->GetNumberFormat( *pPos );
-// pMemChart->SetNumFormatIdRow( static_cast<long>(nRow), nNumberAttr );
+// ULONG nNumberAttr = 0;
+// pPos = GetPositionMap()->GetPosition( 0, nRow );
+// if ( pPos )
+// nNumberAttr = pDocument->GetNumberFormat( *pPos );
+// pMemChart->SetNumFormatIdRow( static_cast<long>(nRow), nNumberAttr );
}
//
// Titel
//
-// pMemChart->SetMainTitle(ScGlobal::GetRscString(STR_CHART_MAINTITLE));
-// pMemChart->SetSubTitle(ScGlobal::GetRscString(STR_CHART_SUBTITLE));
-// pMemChart->SetXAxisTitle(ScGlobal::GetRscString(STR_CHART_XTITLE));
-// pMemChart->SetYAxisTitle(ScGlobal::GetRscString(STR_CHART_YTITLE));
-// pMemChart->SetZAxisTitle(ScGlobal::GetRscString(STR_CHART_ZTITLE));
+// pMemChart->SetMainTitle(ScGlobal::GetRscString(STR_CHART_MAINTITLE));
+// pMemChart->SetSubTitle(ScGlobal::GetRscString(STR_CHART_SUBTITLE));
+// pMemChart->SetXAxisTitle(ScGlobal::GetRscString(STR_CHART_XTITLE));
+// pMemChart->SetYAxisTitle(ScGlobal::GetRscString(STR_CHART_YTITLE));
+// pMemChart->SetZAxisTitle(ScGlobal::GetRscString(STR_CHART_ZTITLE));
//
- // Zahlen-Typ
+ // Zahlen-Typ
//
-// SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
-// if (pFormatter)
-// {
-// ULONG nIndex = 0;
-// ULONG nCount = GetPositionMap()->GetCount();
-// const ScAddress* pPos;
-// do
-// {
-// pPos = GetPositionMap()->GetPosition( nIndex );
-// } while ( !pPos && ++nIndex < nCount );
-// ULONG nFormat = ( pPos ? pDocument->GetNumberFormat( *pPos ) : 0 );
-// pMemChart->SetDataType( pFormatter->GetType( nFormat ) );
-// }
+// SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
+// if (pFormatter)
+// {
+// ULONG nIndex = 0;
+// ULONG nCount = GetPositionMap()->GetCount();
+// const ScAddress* pPos;
+// do
+// {
+// pPos = GetPositionMap()->GetPosition( nIndex );
+// } while ( !pPos && ++nIndex < nCount );
+// ULONG nFormat = ( pPos ? pDocument->GetNumberFormat( *pPos ) : 0 );
+// pMemChart->SetDataType( pFormatter->GetType( nFormat ) );
+// }
//
- // Parameter-Strings
+ // Parameter-Strings
//
// SetExtraStrings( *pMemChart );
@@ -593,10 +593,10 @@ ScMemChart* ScChartArray::CreateMemChartMulti()
//
-// Collection
+// Collection
//
-ScDataObject* ScChartCollection::Clone() const
+ScDataObject* ScChartCollection::Clone() const
{
return new ScChartCollection(*this);
}
diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx
index 1b2cde3d4a6d..024addca2c3f 100644
--- a/sc/source/core/tool/charthelper.cxx
+++ b/sc/source/core/tool/charthelper.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ USHORT lcl_DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, BOOL bAllCha
BOOL lcl_AdjustRanges( ScRangeList& rRanges, SCTAB nSourceTab, SCTAB nDestTab, SCTAB nTabCount )
{
- //! if multiple sheets are copied, update references into the other copied sheets?
+ //! if multiple sheets are copied, update references into the other copied sheets?
BOOL bChanged = FALSE;
@@ -262,7 +262,7 @@ void ScChartHelper::SetChartRanges( const uno::Reference< chart2::XChartDocument
// the range string must be in Calc A1 format.
uno::Reference< chart2::data::XDataSequence > xNewSeq(
xDataProvider->createDataSequenceByRangeRepresentation( rRanges[nRange++] ));
-
+
uno::Reference< beans::XPropertySet > xNewProps( xNewSeq, uno::UNO_QUERY );
if( xNewProps.is() )
xNewProps->setPropertyValue( aPropertyNameRole, xLabel->getPropertyValue( aPropertyNameRole ) );
@@ -278,7 +278,7 @@ void ScChartHelper::SetChartRanges( const uno::Reference< chart2::XChartDocument
// the range string must be in Calc A1 format.
uno::Reference< chart2::data::XDataSequence > xNewSeq(
xDataProvider->createDataSequenceByRangeRepresentation( rRanges[nRange++] ));
-
+
uno::Reference< beans::XPropertySet > xNewProps( xNewSeq, uno::UNO_QUERY );
if( xNewProps.is() )
xNewProps->setPropertyValue( aPropertyNameRole, xValues->getPropertyValue( aPropertyNameRole ) );
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index b729ce0b30b5..926a89690cb3 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using ::std::unary_function;
using ::std::for_each;
//2do: DocOption TimeOut?
-//#define SC_CHARTTIMEOUT 1000 // eine Sekunde keine Aenderung/KeyEvent
+//#define SC_CHARTTIMEOUT 1000 // eine Sekunde keine Aenderung/KeyEvent
// Update chart listeners quickly, to get a similar behavior to loaded charts
// which register UNO listeners.
@@ -57,8 +57,8 @@ using ::std::for_each;
class ScChartUnoData
{
- uno::Reference< chart::XChartDataChangeEventListener > xListener;
- uno::Reference< chart::XChartData > xSource;
+ uno::Reference< chart::XChartDataChangeEventListener > xListener;
+ uno::Reference< chart::XChartData > xSource;
public:
ScChartUnoData( const uno::Reference< chart::XChartDataChangeEventListener >& rL,
@@ -66,8 +66,8 @@ public:
xListener( rL ), xSource( rS ) {}
~ScChartUnoData() {}
- const uno::Reference< chart::XChartDataChangeEventListener >& GetListener() const { return xListener; }
- const uno::Reference< chart::XChartData >& GetSource() const { return xSource; }
+ const uno::Reference< chart::XChartDataChangeEventListener >& GetListener() const { return xListener; }
+ const uno::Reference< chart::XChartData >& GetSource() const { return xSource; }
};
@@ -95,7 +95,7 @@ void ScChartListener::ExternalRefListener::notify(sal_uInt16 nFileId, ScExternal
case ScExternalRefManager::LINK_MODIFIED:
{
if (maFileIds.count(nFileId))
- // We are listening to this external document. Send an update
+ // We are listening to this external document. Send an update
// requst to the chart.
mrParent.SetUpdateQueue();
}
@@ -127,8 +127,8 @@ ScChartListener::ScChartListener( const String& rName, ScDocument* pDocP,
const ScRange& rRange ) :
StrData( rName ),
SvtListener(),
- mpExtRefListener(NULL),
- mpTokens(new vector<ScSharedTokenRef>),
+ mpExtRefListener(NULL),
+ mpTokens(new vector<ScSharedTokenRef>),
pUnoData( NULL ),
pDoc( pDocP ),
bUsed( FALSE ),
@@ -142,8 +142,8 @@ ScChartListener::ScChartListener( const String& rName, ScDocument* pDocP,
const ScRangeListRef& rRangeList ) :
StrData( rName ),
SvtListener(),
- mpExtRefListener(NULL),
- mpTokens(new vector<ScSharedTokenRef>),
+ mpExtRefListener(NULL),
+ mpTokens(new vector<ScSharedTokenRef>),
pUnoData( NULL ),
pDoc( pDocP ),
bUsed( FALSE ),
@@ -156,7 +156,7 @@ ScChartListener::ScChartListener( const String& rName, ScDocument* pDocP,
ScChartListener::ScChartListener( const String& rName, ScDocument* pDocP, vector<ScSharedTokenRef>* pTokens ) :
StrData( rName ),
SvtListener(),
- mpExtRefListener(NULL),
+ mpExtRefListener(NULL),
mpTokens(pTokens),
pUnoData( NULL ),
pDoc( pDocP ),
@@ -169,7 +169,7 @@ ScChartListener::ScChartListener( const String& rName, ScDocument* pDocP, vector
ScChartListener::ScChartListener( const ScChartListener& r ) :
StrData( r ),
SvtListener(),
- mpExtRefListener(NULL),
+ mpExtRefListener(NULL),
mpTokens(new vector<ScSharedTokenRef>(*r.mpTokens)),
pUnoData( NULL ),
pDoc( r.pDoc ),
@@ -182,7 +182,7 @@ ScChartListener::ScChartListener( const ScChartListener& r ) :
if (r.mpExtRefListener.get())
{
- // Re-register this new listener for the files that the old listener
+ // Re-register this new listener for the files that the old listener
// was listening to.
ScExternalRefManager* pRefMgr = pDoc->GetExternalRefManager();
@@ -223,7 +223,7 @@ void ScChartListener::SetUno(
const uno::Reference< chart::XChartDataChangeEventListener >& rListener,
const uno::Reference< chart::XChartData >& rSource )
{
-// DBG_ASSERT( rListener.is() && rSource.is(), "Nullpointer bei SetUno" );
+// DBG_ASSERT( rListener.is() && rSource.is(), "Nullpointer bei SetUno" );
delete pUnoData;
pUnoData = new ScChartUnoData( rListener, rSource );
}
@@ -252,7 +252,7 @@ void ScChartListener::Notify( SvtBroadcaster&, const SfxHint& rHint )
void ScChartListener::Update()
{
if ( pDoc->IsInInterpreter() )
- { // #73482# If interpreting do nothing and restart timer so we don't
+ { // #73482# If interpreting do nothing and restart timer so we don't
// interfere with interpreter and don't produce an Err522 or similar.
// This may happen if we are rescheduled via Basic function.
pDoc->GetChartListenerCollection()->StartTimer();
@@ -261,7 +261,7 @@ void ScChartListener::Update()
if ( pUnoData )
{
bDirty = FALSE;
- //! irgendwann mal erkennen, was sich innerhalb des Charts geaendert hat
+ //! irgendwann mal erkennen, was sich innerhalb des Charts geaendert hat
chart::ChartDataChangeEvent aEvent( pUnoData->GetSource(),
chart::ChartDataChangeType_ALL,
0, 0, 0, 0 );
@@ -440,7 +440,7 @@ BOOL ScChartListener::operator==( const ScChartListener& r )
bool b1 = (mpTokens.get() && !mpTokens->empty());
bool b2 = (r.mpTokens.get() && !r.mpTokens->empty());
- if (pDoc != r.pDoc || bUsed != r.bUsed || bDirty != r.bDirty ||
+ if (pDoc != r.pDoc || bUsed != r.bUsed || bDirty != r.bDirty ||
bSeriesRangesScheduled != r.bSeriesRangesScheduled ||
GetString() != r.GetString() || b1 != b2)
return false;
@@ -487,15 +487,15 @@ ScChartListenerCollection::ScChartListenerCollection(
ScChartListenerCollection::~ScChartListenerCollection()
{
- // #96783# remove ChartListener objects before aTimer dtor is called, because
- // ScChartListener::EndListeningTo may cause ScChartListenerCollection::StartTimer
- // to be called if an empty ScNoteCell is deleted
+ // #96783# remove ChartListener objects before aTimer dtor is called, because
+ // ScChartListener::EndListeningTo may cause ScChartListenerCollection::StartTimer
+ // to be called if an empty ScNoteCell is deleted
if (GetCount())
FreeAll();
}
-ScDataObject* ScChartListenerCollection::Clone() const
+ScDataObject* ScChartListenerCollection::Clone() const
{
return new ScChartListenerCollection( *this );
}
@@ -536,8 +536,8 @@ void ScChartListenerCollection::FreeUnused()
for ( USHORT nIndex = nCount; nIndex-- >0; )
{
ScChartListener* pCL = (ScChartListener*) pItems[ nIndex ];
- // Uno-Charts nicht rauskicken
- // (werden per FreeUno von aussen geloescht)
+ // Uno-Charts nicht rauskicken
+ // (werden per FreeUno von aussen geloescht)
if ( !pCL->IsUno() )
{
if ( pCL->IsUsed() )
@@ -561,7 +561,7 @@ void ScChartListenerCollection::FreeUno( const uno::Reference< chart::XChartData
{
Free( pCL );
}
- //! sollte nur einmal vorkommen?
+ //! sollte nur einmal vorkommen?
}
}
@@ -590,7 +590,7 @@ void ScChartListenerCollection::UpdateDirtyCharts()
if ( pCL->IsDirty() )
pCL->Update();
if ( aTimer.IsActive() && !pDoc->IsImportingXML())
- break; // da kam einer dazwischen
+ break; // da kam einer dazwischen
}
}
@@ -615,7 +615,7 @@ void ScChartListenerCollection::SetDiffDirty(
ScChartListener* pCL = (ScChartListener*) pItems[ nIndex ];
USHORT nFound;
BOOL bFound = rCmp.Search( pCL, nFound );
- if ( !bFound || (*pCL != *((const ScChartListener*) rCmp.pItems[ nFound ])) )
+ if ( !bFound || (*pCL != *((const ScChartListener*) rCmp.pItems[ nFound ])) )
{
if ( bSetChartRangeLists )
{
diff --git a/sc/source/core/tool/chartlock.cxx b/sc/source/core/tool/chartlock.cxx
index 54a49fb4b4aa..65ba85df7c0c 100644
--- a/sc/source/core/tool/chartlock.cxx
+++ b/sc/source/core/tool/chartlock.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx
index fc3d9bf51be2..fec8c6998e01 100644
--- a/sc/source/core/tool/chartpos.cxx
+++ b/sc/source/core/tool/chartpos.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ void ScChartPositioner::GlueState()
if ( pR->aStart.Tab() == pR->aEnd.Tab() )
eGlue = SC_CHARTGLUE_NONE;
else
- eGlue = SC_CHARTGLUE_COLS; // mehrere Tabellen spaltenweise
+ eGlue = SC_CHARTGLUE_COLS; // mehrere Tabellen spaltenweise
nStartCol = pR->aStart.Col();
nStartRow = pR->aStart.Row();
}
@@ -124,7 +124,7 @@ void ScChartPositioner::GlueState()
}
return;
}
-// ULONG nOldPos = aRangeListRef->GetCurPos();
+// ULONG nOldPos = aRangeListRef->GetCurPos();
pR = aRangeListRef->First();
nStartCol = pR->aStart.Col();
@@ -134,7 +134,7 @@ void ScChartPositioner::GlueState()
nMaxCols = nEndCol = 0;
nMaxRows = nEndRow = 0;
do
- { // umspannenden Bereich etc. feststellen
+ { // umspannenden Bereich etc. feststellen
SCCOLROW nTmp, n1, n2;
if ( (n1 = pR->aStart.Col()) < nStartCol )
nStartCol = static_cast<SCCOL>(n1);
@@ -180,7 +180,7 @@ void ScChartPositioner::GlueState()
BYTE huge* p;
BYTE huge* pA = (BYTE huge*) SvMemAlloc( nCR );
if ( nCR > (ULONG)((USHORT)~0) )
- { // in 32k Bloecken initialisieren
+ { // in 32k Bloecken initialisieren
ULONG j;
for ( j=0; j<nCR; j+=0x8000 )
{
@@ -198,7 +198,7 @@ void ScChartPositioner::GlueState()
SCCOL nCol, nCol1, nCol2;
SCROW nRow, nRow1, nRow2;
for ( pR = aRangeListRef->First(); pR; pR = aRangeListRef->Next() )
- { // Selektionen 2D als belegt markieren
+ { // Selektionen 2D als belegt markieren
nCol1 = pR->aStart.Col() - nStartCol;
nCol2 = pR->aEnd.Col() - nStartCol;
nRow1 = pR->aStart.Row() - nStartRow;
@@ -214,16 +214,16 @@ void ScChartPositioner::GlueState()
BOOL bGlueCols = FALSE;
for ( nCol = 0; bGlue && nCol < nC; nCol++ )
- { // Spalten probieren durchzugehen und als frei markieren
+ { // Spalten probieren durchzugehen und als frei markieren
p = pA + (ULONG)nCol * nR;
for ( nRow = 0; bGlue && nRow < nR; nRow++, p++ )
{
if ( *p == nOccu )
- { // Wenn einer mittendrin liegt ist keine Zusammenfassung
+ { // Wenn einer mittendrin liegt ist keine Zusammenfassung
// moeglich. Am Rand koennte ok sein, wenn in dieser Spalte
// in jeder belegten Zeile einer belegt ist.
if ( nRow > 0 && nCol > 0 )
- bGlue = FALSE; // nCol==0 kann DummyUpperLeft sein
+ bGlue = FALSE; // nCol==0 kann DummyUpperLeft sein
else
nRow = nR;
}
@@ -231,22 +231,22 @@ void ScChartPositioner::GlueState()
*p = nFree;
}
if ( bGlue && *(p = (pA + ((((ULONG)nCol+1) * nR) - 1))) == nFree )
- { // Spalte als komplett frei markieren
+ { // Spalte als komplett frei markieren
*p = nGlue;
- bGlueCols = TRUE; // mindestens eine freie Spalte
+ bGlueCols = TRUE; // mindestens eine freie Spalte
}
}
BOOL bGlueRows = FALSE;
for ( nRow = 0; bGlue && nRow < nR; nRow++ )
- { // Zeilen probieren durchzugehen und als frei markieren
+ { // Zeilen probieren durchzugehen und als frei markieren
p = pA + nRow;
for ( nCol = 0; bGlue && nCol < nC; nCol++, p+=nR )
{
if ( *p == nOccu )
{
if ( nCol > 0 && nRow > 0 )
- bGlue = FALSE; // nRow==0 kann DummyUpperLeft sein
+ bGlue = FALSE; // nRow==0 kann DummyUpperLeft sein
else
nCol = nC;
}
@@ -254,9 +254,9 @@ void ScChartPositioner::GlueState()
*p = nFree;
}
if ( bGlue && *(p = (pA + ((((ULONG)nC-1) * nR) + nRow))) == nFree )
- { // Zeile als komplett frei markieren
+ { // Zeile als komplett frei markieren
*p = nGlue;
- bGlueRows = TRUE; // mindestens eine freie Zeile
+ bGlueRows = TRUE; // mindestens eine freie Zeile
}
}
@@ -264,7 +264,7 @@ void ScChartPositioner::GlueState()
// hinzugezogen werden
p = pA + 1;
for ( ULONG n = 1; bGlue && n < nCR; n++, p++ )
- { // ein unberuehrtes Feld heisst, dass es weder spaltenweise noch
+ { // ein unberuehrtes Feld heisst, dass es weder spaltenweise noch
// zeilenweise zu erreichen war, also nichts zusamenzufassen
if ( *p == nHole )
bGlue = FALSE;
@@ -330,7 +330,7 @@ void ScChartPositioner::CheckColRowHeaders()
pR->GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
BOOL bTopRow = (nRow1 == nStartRow);
if ( bRowStrings && (bVert || nCol1 == nStartCol) )
- { // NONE oder ROWS: RowStrings in jeder Selektion moeglich
+ { // NONE oder ROWS: RowStrings in jeder Selektion moeglich
// COLS oder BOTH: nur aus der ersten Spalte
if ( nCol1 <= nCol2 )
for (iRow=nRow1; iRow<=nRow2 && bRowStrings; iRow++)
@@ -340,7 +340,7 @@ void ScChartPositioner::CheckColRowHeaders()
}
}
if ( bColStrings && bTopRow )
- { // ColStrings nur aus der ersten Zeile
+ { // ColStrings nur aus der ersten Zeile
if ( nRow1 <= nRow2 )
for (iCol=nCol1; iCol<=nCol2 && bColStrings; iCol++)
{
@@ -380,7 +380,7 @@ void ScChartPositioner::CreatePositionMap()
SCTAB nTab, nTab1, nTab2;
//
- // wirkliche Groesse (ohne versteckte Zeilen/Spalten)
+ // wirkliche Groesse (ohne versteckte Zeilen/Spalten)
//
SCSIZE nColCount = 0;
@@ -407,7 +407,7 @@ void ScChartPositioner::CreatePositionMap()
for ( nCol = nCol1; nCol <= nCol2; ++nCol, ++nInsCol )
{
if ( bNoGlue || eGlue == SC_CHARTGLUE_ROWS )
- { // meistens gleiche Cols
+ { // meistens gleiche Cols
if ( (pCol = (Table*) pCols->Get( nInsCol ))==NULL )
{
pCols->Insert( nInsCol, pNewRowTable );
@@ -416,7 +416,7 @@ void ScChartPositioner::CreatePositionMap()
}
}
else
- { // meistens neue Cols
+ { // meistens neue Cols
if ( pCols->Insert( nInsCol, pNewRowTable ) )
{
pCol = pNewRowTable;
@@ -449,7 +449,7 @@ void ScChartPositioner::CreatePositionMap()
if ( (pCol = (Table*) pCols->First())!=NULL )
{
if ( bDummyUpperLeft )
- pCol->Insert( 0, (void*)0 ); // Dummy fuer Beschriftung
+ pCol->Insert( 0, (void*)0 ); // Dummy fuer Beschriftung
nRowCount = static_cast< SCSIZE >( pCol->Count());
}
else
@@ -460,7 +460,7 @@ void ScChartPositioner::CreatePositionMap()
nRowCount -= nRowAdd;
if ( nColCount==0 || nRowCount==0 )
- { // einen Eintrag ohne Daten erzeugen
+ { // einen Eintrag ohne Daten erzeugen
pR = aRangeListRef->First();
if ( pCols->Count() > 0 )
pCol = (Table*) pCols->First();
@@ -471,7 +471,7 @@ void ScChartPositioner::CreatePositionMap()
}
nColCount = 1;
if ( pCol->Count() > 0 )
- { // kann ja eigentlich nicht sein, wenn nColCount==0 || nRowCount==0
+ { // kann ja eigentlich nicht sein, wenn nColCount==0 || nRowCount==0
pPos = (ScAddress*) pCol->First();
if ( pPos )
{
@@ -488,7 +488,7 @@ void ScChartPositioner::CreatePositionMap()
else
{
if ( bNoGlue )
- { // Luecken mit Dummies fuellen, erste Spalte ist Master
+ { // Luecken mit Dummies fuellen, erste Spalte ist Master
Table* pFirstCol = (Table*) pCols->First();
ULONG nCount = pFirstCol->Count();
pFirstCol->First();
@@ -497,7 +497,7 @@ void ScChartPositioner::CreatePositionMap()
ULONG nKey = pFirstCol->GetCurKey();
pCols->First();
while ( (pCol = (Table*) pCols->Next())!=NULL )
- pCol->Insert( nKey, (void*)0 ); // keine Daten
+ pCol->Insert( nKey, (void*)0 ); // keine Daten
}
}
}
@@ -505,9 +505,9 @@ void ScChartPositioner::CreatePositionMap()
pPositionMap = new ScChartPositionMap( static_cast<SCCOL>(nColCount), static_cast<SCROW>(nRowCount),
static_cast<SCCOL>(nColAdd), static_cast<SCROW>(nRowAdd), *pCols );
- // Aufraeumen
+ // Aufraeumen
for ( pCol = (Table*) pCols->First(); pCol; pCol = (Table*) pCols->Next() )
- { //! nur Tables loeschen, nicht die ScAddress*
+ { //! nur Tables loeschen, nicht die ScAddress*
delete pCol;
}
delete pCols;
@@ -539,7 +539,7 @@ ScChartPositionMap::ScChartPositionMap( SCCOL nChartCols, SCROW nChartRows,
if ( nRowAdd )
pPos = (ScAddress*) pCol->Next();
if ( nColAdd )
- { // eigenstaendig
+ { // eigenstaendig
for ( nRow = 0; nRow < nRowCount; nRow++ )
{
ppRowHeader[ nRow ] = pPos;
@@ -547,7 +547,7 @@ ScChartPositionMap::ScChartPositionMap( SCCOL nChartCols, SCROW nChartRows,
}
}
else
- { // Kopie
+ { // Kopie
for ( nRow = 0; nRow < nRowCount; nRow++ )
{
ppRowHeader[ nRow ] = ( pPos ? new ScAddress( *pPos ) : NULL );
@@ -566,7 +566,7 @@ ScChartPositionMap::ScChartPositionMap( SCCOL nChartCols, SCROW nChartRows,
pPos = (ScAddress*) pCol->First();
if ( nRowAdd )
{
- ppColHeader[ nCol ] = pPos; // eigenstaendig
+ ppColHeader[ nCol ] = pPos; // eigenstaendig
pPos = (ScAddress*) pCol->Next();
}
else
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index ba3f3e47bfb7..944324aeecab 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 <tools/debug.hxx>
-#include <tools/shl.hxx> // SHL_CALC
+#include <tools/shl.hxx> // SHL_CALC
#include <tools/stack.hxx>
#include <tools/rtti.hxx>
#include <svl/zforlist.hxx>
@@ -47,8 +47,8 @@
#include "global.hxx"
#include "rechead.hxx"
#include "scerrors.hxx"
-#include "scmod.hxx" // SC_MOD
-#include "inputopt.hxx" // GetExpandRefs
+#include "scmod.hxx" // SC_MOD
+#include "inputopt.hxx" // GetExpandRefs
#include "patattr.hxx"
#include "hints.hxx"
@@ -68,8 +68,8 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionLinkEntry, nMemPoolChangeActionLinkEntry, nMemPoolChangeActionLinkEntry )
// loaded MSB > eigenes => inkompatibel
-#define SC_CHGTRACK_FILEFORMAT_FIRST 0x0001
-#define SC_CHGTRACK_FILEFORMAT 0x0001
+#define SC_CHGTRACK_FILEFORMAT_FIRST 0x0001
+#define SC_CHGTRACK_FILEFORMAT 0x0001
// --- ScChangeActionLinkEntry ---------------------------------------------
@@ -201,7 +201,7 @@ BOOL ScChangeAction::IsClickable() const
if ( eCCT == SC_CACCT_MATREF )
return FALSE;
if ( eCCT == SC_CACCT_MATORG )
- { // no Accept-Select if one of the references is in a deleted col/row
+ { // no Accept-Select if one of the references is in a deleted col/row
const ScChangeActionLinkEntry* pL =
((ScChangeActionContent*)this)->GetFirstDependentEntry();
while ( pL )
@@ -212,9 +212,9 @@ BOOL ScChangeAction::IsClickable() const
pL = pL->GetNext();
}
}
- return TRUE; // for Select() a content doesn't have to be touchable
+ return TRUE; // for Select() a content doesn't have to be touchable
}
- return IsTouchable(); // Accept()/Reject() only on touchables
+ return IsTouchable(); // Accept()/Reject() only on touchables
}
@@ -230,8 +230,8 @@ BOOL ScChangeAction::IsRejectable() const
ScChangeActionContent* pNextContent =
((ScChangeActionContent*)this)->GetNextContent();
if ( pNextContent == NULL )
- return TRUE; // *this is TopContent
- return pNextContent->IsRejected(); // *this is next rejectable
+ return TRUE; // *this is TopContent
+ return pNextContent->IsRejected(); // *this is next rejectable
}
return IsTouchable();
}
@@ -249,8 +249,8 @@ BOOL ScChangeAction::IsInternalRejectable() const
ScChangeActionContent* pNextContent =
((ScChangeActionContent*)this)->GetNextContent();
if ( pNextContent == NULL )
- return TRUE; // *this is TopContent
- return pNextContent->IsRejected(); // *this is next rejectable
+ return TRUE; // *this is TopContent
+ return pNextContent->IsRejected(); // *this is next rejectable
}
return IsTouchable();
}
@@ -258,7 +258,7 @@ BOOL ScChangeAction::IsInternalRejectable() const
BOOL ScChangeAction::IsDialogRoot() const
{
- return IsInternalRejectable(); // only rejectables in root
+ return IsInternalRejectable(); // only rejectables in root
}
@@ -320,7 +320,7 @@ void ScChangeAction::RemoveAllLinks()
void ScChangeAction::RemoveAllAnyLinks()
{
while ( pLinkAny )
- delete pLinkAny; // rueckt sich selbst hoch
+ delete pLinkAny; // rueckt sich selbst hoch
}
@@ -359,7 +359,7 @@ void ScChangeAction::RemoveAllDeletedIn()
{
//! nicht vom evtl. TopContent sondern wirklich dieser
while ( pLinkDeletedIn )
- delete pLinkDeletedIn; // rueckt sich selbst hoch
+ delete pLinkDeletedIn; // rueckt sich selbst hoch
}
@@ -412,14 +412,14 @@ void ScChangeAction::SetDeletedIn( ScChangeAction* p )
void ScChangeAction::RemoveAllDeleted()
{
while ( pLinkDeleted )
- delete pLinkDeleted; // rueckt sich selbst hoch
+ delete pLinkDeleted; // rueckt sich selbst hoch
}
void ScChangeAction::RemoveAllDependent()
{
while ( pLinkDependent )
- delete pLinkDependent; // rueckt sich selbst hoch
+ delete pLinkDependent; // rueckt sich selbst hoch
}
@@ -602,8 +602,8 @@ void ScChangeAction::RejectRestoreContents( ScChangeTrack* pTrack,
pListContents = pE;
}
}
- SetState( SC_CAS_REJECTED ); // vor UpdateReference fuer Move
- pTrack->UpdateReference( this, TRUE ); // LinkDeleted freigeben
+ SetState( SC_CAS_REJECTED ); // vor UpdateReference fuer Move
+ pTrack->UpdateReference( this, TRUE ); // LinkDeleted freigeben
DBG_ASSERT( !pLinkDeleted, "ScChangeAction::RejectRestoreContents: pLinkDeleted != NULL" );
// Liste der Contents abarbeiten und loeschen
ScDocument* pDoc = pTrack->GetDocument();
@@ -618,7 +618,7 @@ void ScChangeAction::RejectRestoreContents( ScChangeTrack* pTrack,
delete pE;
pE = pNextEntry;
}
- DeleteCellEntries(); // weg mit den generierten
+ DeleteCellEntries(); // weg mit den generierten
}
@@ -1113,12 +1113,12 @@ BOOL ScChangeActionDel::Reject( ScDocument* pDoc )
BOOL bOk = TRUE;
if ( IsTopDelete() )
- { // den kompletten Bereich in einem Rutsch restaurieren
+ { // den kompletten Bereich in einem Rutsch restaurieren
ScBigRange aTmpRange( GetOverAllRange() );
if ( !aTmpRange.IsValid( pDoc ) )
{
if ( GetType() == SC_CAT_DELETE_TABS )
- { // wird Tab angehaengt?
+ { // wird Tab angehaengt?
if ( aTmpRange.aStart.Tab() > pDoc->GetMaxTableNumber() )
bOk = FALSE;
}
@@ -1137,7 +1137,7 @@ BOOL ScChangeActionDel::Reject( ScDocument* pDoc )
{
case SC_CAT_DELETE_COLS :
if ( !(aRange.aStart.Col() == 0 && aRange.aEnd.Col() == MAXCOL) )
- { // nur wenn nicht TabDelete
+ { // nur wenn nicht TabDelete
if ( ( bOk = pDoc->CanInsertCol( aRange ) ) != FALSE )
bOk = pDoc->InsertCol( aRange );
}
@@ -1181,7 +1181,7 @@ BOOL ScChangeActionDel::Reject( ScDocument* pDoc )
void ScChangeActionDel::UndoCutOffMoves()
-{ // abgeschnittene Moves wiederherstellen, Entries/Links deleten
+{ // abgeschnittene Moves wiederherstellen, Entries/Links deleten
while ( pLinkMove )
{
ScChangeActionMove* pMove = pLinkMove->GetMove();
@@ -1224,12 +1224,12 @@ void ScChangeActionDel::UndoCutOffMoves()
// added to avoid warnings
}
}
- delete pLinkMove; // rueckt sich selbst hoch
+ delete pLinkMove; // rueckt sich selbst hoch
}
}
void ScChangeActionDel::UndoCutOffInsert()
-{ // abgeschnittenes Insert wiederherstellen
+{ // abgeschnittenes Insert wiederherstellen
if ( pCutOff )
{
switch ( pCutOff->GetType() )
@@ -1372,7 +1372,7 @@ BOOL ScChangeActionMove::Reject( ScDocument* pDoc )
if ( !bOk )
return FALSE;
- pTrack->LookUpContents( aToRange, pDoc, 0, 0, 0 ); // zu movende Contents
+ pTrack->LookUpContents( aToRange, pDoc, 0, 0, 0 ); // zu movende Contents
pDoc->DeleteAreaTab( aToRange, IDF_ALL );
pDoc->DeleteAreaTab( aFrmRange, IDF_ALL );
@@ -1404,7 +1404,7 @@ BOOL ScChangeActionMove::Reject( ScDocument* pDoc )
if ( pTrack->IsGenerated( pContent->GetActionNumber() ) &&
!pContent->IsDeletedIn() )
{
- pLinkDependent->UnLink(); //! sonst wird der mitgeloescht
+ pLinkDependent->UnLink(); //! sonst wird der mitgeloescht
pTrack->DeleteGeneratedDelContent( pContent );
}
}
@@ -1711,7 +1711,7 @@ BOOL ScChangeActionContent::Select( ScDocument* pDoc, ScChangeTrack* pTrack,
}
if ( bOldest || pEnd != this )
- { // wenn nicht aeltester: ist es ueberhaupt ein anderer als der letzte?
+ { // wenn nicht aeltester: ist es ueberhaupt ein anderer als der letzte?
ScRange aRange( aBigRange.aStart.MakeAddress() );
const ScAddress& rPos = aRange.aStart;
@@ -1770,7 +1770,7 @@ void ScChangeActionContent::GetStringOfCell( String& rStr,
case CELLTYPE_VALUE :
{
double nValue = ((ScValueCell*)pCell)->GetValue();
- pDoc->GetFormatTable()->GetInputLineString( nValue, nFormat,
+ pDoc->GetFormatTable()->GetInputLineString( nValue, nFormat,
rStr );
}
break;
@@ -1859,7 +1859,7 @@ void ScChangeActionContent::SetValue( String& rStr, ScBaseCell*& pCell,
switch ( pOrgCell->GetCellType() )
{
case CELLTYPE_VALUE :
- { // z.B. Datum auch als solches merken
+ { // z.B. Datum auch als solches merken
double nValue = ((ScValueCell*)pOrgCell)->GetValue();
pFromDoc->GetFormatTable()->GetInputLineString( nValue,
nFormat, rStr );
@@ -1889,7 +1889,7 @@ void ScChangeActionContent::SetCell( String& rStr, ScBaseCell* pCell,
switch ( pCell->GetCellType() )
{
case CELLTYPE_VALUE :
- { // e.g. remember date as date string
+ { // e.g. remember date as date string
double nValue = ((ScValueCell*)pCell)->GetValue();
pDoc->GetFormatTable()->GetInputLineString( nValue,
nFormat, rStr );
@@ -1922,7 +1922,7 @@ void ScChangeActionContent::GetValueString( String& rStr,
case CELLTYPE_EDIT :
((ScEditCell*)pCell)->GetString( rStr );
break;
- case CELLTYPE_VALUE : // ist immer in rValue
+ case CELLTYPE_VALUE : // ist immer in rValue
rStr = rValue;
break;
case CELLTYPE_FORMULA :
@@ -1986,7 +1986,7 @@ void ScChangeActionContent::PutValueToDoc( ScBaseCell* pCell,
{
switch ( pCell->GetCellType() )
{
- case CELLTYPE_VALUE : // ist immer in rValue
+ case CELLTYPE_VALUE : // ist immer in rValue
pDoc->SetString( aPos.Col(), aPos.Row(), aPos.Tab(), rValue );
break;
default:
@@ -2088,12 +2088,12 @@ void ScChangeActionContent::UpdateReference( const ScChangeTrack* pTrack,
}
if ( pTrack->IsInDelete() && !pTrack->IsInDeleteTop() )
- return ; // Formeln nur kompletten Bereich updaten
+ return ; // Formeln nur kompletten Bereich updaten
BOOL bOldFormula = ( pOldCell && pOldCell->GetCellType() == CELLTYPE_FORMULA );
BOOL bNewFormula = ( pNewCell && pNewCell->GetCellType() == CELLTYPE_FORMULA );
if ( bOldFormula || bNewFormula )
- { // via ScFormulaCell UpdateReference anpassen (dort)
+ { // via ScFormulaCell UpdateReference anpassen (dort)
if ( pTrack->IsInDelete() )
{
const ScRange& rDelRange = pTrack->GetInDeleteRange();
@@ -2115,7 +2115,7 @@ void ScChangeActionContent::UpdateReference( const ScChangeTrack* pTrack,
{
case URM_INSDEL :
if ( nDx < 0 || nDy < 0 || nDz < 0 )
- { // Delete startet dort hinter geloeschtem Bereich,
+ { // Delete startet dort hinter geloeschtem Bereich,
// Position wird dort angepasst.
if ( nDx )
aTmpRange.aStart.IncCol( -nDx );
@@ -2161,7 +2161,7 @@ void ScChangeActionContent::UpdateReference( const ScChangeTrack* pTrack,
((ScFormulaCell*)pNewCell)->UpdateReference( eMode, aRange,
(SCsCOL) nDx, (SCsROW) nDy, (SCsTAB) nDz, NULL );
if ( !aBigRange.aStart.IsValid( pTrack->GetDocument() ) )
- { //! HACK!
+ { //! HACK!
//! UpdateReference kann nicht mit Positionen ausserhalb des
//! Dokuments umgehen, deswegen alles auf #REF! setzen
//2do: make it possible! das bedeutet grossen Umbau von ScAddress etc.!
@@ -2367,7 +2367,7 @@ void __EXPORT ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster
void ScChangeTrack::SetUser( const String& rUser )
{
if ( IsLoadSave() )
- return ; // nicht die Collection zerschiessen
+ return ; // nicht die Collection zerschiessen
aUser = rUser;
StrData* pStrData = new StrData( aUser );
@@ -2382,7 +2382,7 @@ void ScChangeTrack::StartBlockModify( ScChangeTrackMsgType eMsgType,
if ( aModifiedLink.IsSet() )
{
if ( pBlockModifyMsg )
- aMsgStackTmp.Push( pBlockModifyMsg ); // Block im Block
+ aMsgStackTmp.Push( pBlockModifyMsg ); // Block im Block
pBlockModifyMsg = new ScChangeTrackMsgInfo;
pBlockModifyMsg->eMsgType = eMsgType;
pBlockModifyMsg->nStartAction = nStartAction;
@@ -2404,7 +2404,7 @@ void ScChangeTrack::EndBlockModify( ULONG nEndAction )
}
else
delete pBlockModifyMsg;
- pBlockModifyMsg = aMsgStackTmp.Pop(); // evtl. Block im Block
+ pBlockModifyMsg = aMsgStackTmp.Pop(); // evtl. Block im Block
}
if ( !pBlockModifyMsg )
{
@@ -2430,7 +2430,7 @@ void ScChangeTrack::NotifyModified( ScChangeTrackMsgType eMsgType,
if ( !pBlockModifyMsg || pBlockModifyMsg->eMsgType != eMsgType ||
(IsGenerated( nStartAction ) &&
(eMsgType == SC_CTM_APPEND || eMsgType == SC_CTM_REMOVE)) )
- { // Append innerhalb von Append z.B. nicht
+ { // Append innerhalb von Append z.B. nicht
StartBlockModify( eMsgType, nStartAction );
EndBlockModify( nEndAction );
}
@@ -2455,7 +2455,7 @@ void ScChangeTrack::MasterLinks( ScChangeAction* pAppend )
}
if ( pAppend->IsRejecting() )
- return ; // Rejects haben keine Abhaengigkeiten
+ return ; // Rejects haben keine Abhaengigkeiten
switch ( eType )
{
@@ -2593,13 +2593,13 @@ void ScChangeTrack::AppendDeleteRange( const ScRange& rRange,
if ( !pRefDoc || nTab < pRefDoc->GetTableCount() )
{
if ( nCol1 == 0 && nCol2 == MAXCOL )
- { // ganze Zeilen und/oder Tabellen
+ { // ganze Zeilen und/oder Tabellen
if ( nRow1 == 0 && nRow2 == MAXROW )
- { // ganze Tabellen
+ { // ganze Tabellen
//2do: geht nicht auch komplette Tabelle als ganzes?
ScRange aRange( 0, 0, nTab, 0, MAXROW, nTab );
for ( SCCOL nCol = nCol1; nCol <= nCol2; nCol++ )
- { // spaltenweise ist weniger als zeilenweise
+ { // spaltenweise ist weniger als zeilenweise
aRange.aStart.SetCol( nCol );
aRange.aEnd.SetCol( nCol );
if ( nCol == nCol2 )
@@ -2612,7 +2612,7 @@ void ScChangeTrack::AppendDeleteRange( const ScRange& rRange,
nTab-nTab1 + nDz, nRejectingInsert );
}
else
- { // ganze Zeilen
+ { // ganze Zeilen
ScRange aRange( 0, 0, nTab, MAXCOL, 0, nTab );
for ( SCROW nRow = nRow1; nRow <= nRow2; nRow++ )
{
@@ -2626,7 +2626,7 @@ void ScChangeTrack::AppendDeleteRange( const ScRange& rRange,
}
}
else if ( nRow1 == 0 && nRow2 == MAXROW )
- { // ganze Spalten
+ { // ganze Spalten
ScRange aRange( 0, 0, nTab, 0, MAXROW, nTab );
for ( SCCOL nCol = nCol1; nCol <= nCol2; nCol++ )
{
@@ -2701,7 +2701,7 @@ void ScChangeTrack::LookUpContents( const ScRange& rOrgRange,
aIter.GetTab() + nDz );
ScChangeActionContent* pContent = SearchContentAt( aBigPos, NULL );
if ( !pContent )
- { // nicht getrackte Contents
+ { // nicht getrackte Contents
aPos.Set( aIter.GetCol() + nDx, aIter.GetRow() + nDy,
aIter.GetTab() + nDz );
GenerateDelContent( aPos, pCell, pRefDoc );
@@ -2720,7 +2720,7 @@ void ScChangeTrack::AppendMove( const ScRange& rFromRange,
const ScRange& rToRange, ScDocument* pRefDoc )
{
ScChangeActionMove* pAct = new ScChangeActionMove( rFromRange, rToRange, this );
- LookUpContents( rToRange, pRefDoc, 0, 0, 0 ); // ueberschriebene Contents
+ LookUpContents( rToRange, pRefDoc, 0, 0, 0 ); // ueberschriebene Contents
Append( pAct );
}
@@ -2750,7 +2750,7 @@ void ScChangeTrack::AppendContent( const ScAddress& rPos,
ScChangeActionContent::GetStringOfCell( aOldValue, pOldCell, pDoc, rPos );
if ( aOldValue != rNewValue ||
IsMatrixFormulaRangeDifferent( pOldCell, NULL ) )
- { // nur wirkliche Aenderung tracken
+ { // nur wirkliche Aenderung tracken
ScRange aRange( rPos );
ScChangeActionContent* pAct = new ScChangeActionContent( aRange );
pAct->SetOldValue( pOldCell, pDoc, pDoc );
@@ -2772,7 +2772,7 @@ void ScChangeTrack::AppendContent( const ScAddress& rPos,
ScChangeActionContent::GetStringOfCell( aNewValue, pNewCell, pDoc, rPos );
if ( aOldValue != aNewValue ||
IsMatrixFormulaRangeDifferent( pOldCell, pNewCell ) )
- { // nur wirkliche Aenderung tracken
+ { // nur wirkliche Aenderung tracken
ScRange aRange( rPos );
ScChangeActionContent* pAct = new ScChangeActionContent( aRange );
pAct->SetOldValue( pOldCell, pRefDoc, pDoc, nOldFormat );
@@ -2793,7 +2793,7 @@ void ScChangeTrack::AppendContent( const ScAddress& rPos,
ScChangeActionContent::GetStringOfCell( aNewValue, pNewCell, pDoc, rPos );
if ( aOldValue != aNewValue ||
IsMatrixFormulaRangeDifferent( pOldCell, pNewCell ) )
- { // nur wirkliche Aenderung tracken
+ { // nur wirkliche Aenderung tracken
ScRange aRange( rPos );
ScChangeActionContent* pAct = new ScChangeActionContent( aRange );
pAct->SetOldValue( pOldCell, pRefDoc, pDoc );
@@ -2881,7 +2881,7 @@ void ScChangeTrack::AppendContentRange( const ScRange& rRange,
bDoContents = TRUE;
}
r = aRange;
- Undo( nStartLastCut, nEndLastCut ); // hier werden sich die Cuts gemerkt
+ Undo( nStartLastCut, nEndLastCut ); // hier werden sich die Cuts gemerkt
//! StartAction erst nach Undo
nStartAction = GetActionMax() + 1;
StartBlockModify( SC_CTM_APPEND, nStartAction );
@@ -3003,7 +3003,7 @@ ScChangeActionContent* ScChangeTrack::GenerateDelContent(
rPos, pCell, pFromDoc, pDoc );
// pNextContent und pPrevContent werden nicht gesetzt
if ( pFirstGeneratedDelContent )
- { // vorne reinhaengen
+ { // vorne reinhaengen
pFirstGeneratedDelContent->pPrev = pContent;
pContent->pNext = pFirstGeneratedDelContent;
}
@@ -3027,7 +3027,7 @@ void ScChangeTrack::DeleteGeneratedDelContent( ScChangeActionContent* pContent )
delete pContent;
NotifyModified( SC_CTM_REMOVE, nAct, nAct );
if ( nAct == nGeneratedMin )
- ++nGeneratedMin; //! erst nach NotifyModified wg. IsGenerated
+ ++nGeneratedMin; //! erst nach NotifyModified wg. IsGenerated
}
@@ -3071,13 +3071,13 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct )
ScChangeActionType eActType = pAct->GetType();
if ( eActType == SC_CAT_REJECT ||
(eActType == SC_CAT_MOVE && pAct->IsRejecting()) )
- return ; // diese Rejects sind nicht abhaengig
+ return ; // diese Rejects sind nicht abhaengig
if ( eActType == SC_CAT_CONTENT )
{
if ( !(((ScChangeActionContent*)pAct)->GetNextContent() ||
((ScChangeActionContent*)pAct)->GetPrevContent()) )
- { // Contents an gleicher Position verketten
+ { // Contents an gleicher Position verketten
ScChangeActionContent* pContent = SearchContentAt(
pAct->GetBigRange().aStart, pAct );
if ( pContent )
@@ -3104,9 +3104,9 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct )
}
if ( !(pLinkInsertCol || pLinkInsertRow || pLinkInsertTab || pLinkMove) )
- return ; // keine Dependencies
+ return ; // keine Dependencies
if ( pAct->IsRejecting() )
- return ; // ausser Content keine Dependencies
+ return ; // ausser Content keine Dependencies
// Insert in einem entsprechenden Insert haengt davon ab, sonst muesste
// der vorherige Insert gesplittet werden.
@@ -3132,7 +3132,7 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct )
pTest->GetBigRange().Intersects( rRange ) )
{
AddDependentWithNotify( pTest, pAct );
- break; // for
+ break; // for
}
}
}
@@ -3146,7 +3146,7 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct )
pTest->GetBigRange().Intersects( rRange ) )
{
AddDependentWithNotify( pTest, pAct );
- break; // for
+ break; // for
}
}
}
@@ -3160,7 +3160,7 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct )
pTest->GetBigRange().Intersects( rRange ) )
{
AddDependentWithNotify( pTest, pAct );
- break; // for
+ break; // for
}
}
}
@@ -3168,7 +3168,7 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct )
if ( pLinkMove )
{
if ( eActType == SC_CAT_CONTENT )
- { // Content ist von FromRange abhaengig
+ { // Content ist von FromRange abhaengig
const ScBigAddress& rPos = rRange.aStart;
for ( ScChangeActionLinkEntry* pL = pLinkMove; pL; pL = pL->GetNext() )
{
@@ -3181,7 +3181,7 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct )
}
}
else if ( eActType == SC_CAT_MOVE )
- { // Move FromRange ist von ToRange abhaengig
+ { // Move FromRange ist von ToRange abhaengig
const ScBigRange& rFromRange = ((ScChangeActionMove*)pAct)->GetFromRange();
for ( ScChangeActionLinkEntry* pL = pLinkMove; pL; pL = pL->GetNext() )
{
@@ -3194,7 +3194,7 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct )
}
}
else
- { // Inserts und Deletes sind abhaengig, sobald sie FromRange oder
+ { // Inserts und Deletes sind abhaengig, sobald sie FromRange oder
// ToRange kreuzen
for ( ScChangeActionLinkEntry* pL = pLinkMove; pL; pL = pL->GetNext() )
{
@@ -3253,7 +3253,7 @@ void ScChangeTrack::Remove( ScChangeAction* pRemove )
}
if ( IsInPasteCut() && pRemove->GetType() == SC_CAT_CONTENT )
- { //! Content wird wiederverwertet
+ { //! Content wird wiederverwertet
ScChangeActionContent* pContent = (ScChangeActionContent*) pRemove;
pContent->RemoveAllLinks();
pContent->ClearTrack();
@@ -3282,7 +3282,7 @@ void ScChangeTrack::Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge )
ResetLastCut();
StartBlockModify( SC_CTM_REMOVE, nStartAction );
for ( ULONG j = nEndAction; j >= nStartAction; --j )
- { // rueckwaerts um evtl. nActionMax zu recyclen und schnelleren
+ { // rueckwaerts um evtl. nActionMax zu recyclen und schnelleren
// Zugriff via pLast, Deletes in richtiger Reihenfolge
ScChangeAction* pAct = ( (j == nActionMax && pLast &&
pLast->GetActionNumber() == j) ? pLast : GetAction( j ) );
@@ -3311,7 +3311,7 @@ void ScChangeTrack::Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge )
ULONG nStart = pMove->GetStartLastCut();
ULONG nEnd = pMove->GetEndLastCut();
if ( nStart && nStart <= nEnd )
- { // LastCut wiederherstellen
+ { // LastCut wiederherstellen
//! Links vor Cut-Append aufloesen
pMove->RemoveAllLinks();
StartBlockModify( SC_CTM_APPEND, nStart );
@@ -3359,12 +3359,12 @@ void ScChangeTrack::Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge )
BOOL ScChangeTrack::MergeIgnore( const ScChangeAction& rAction, ULONG nFirstMerge )
{
if ( rAction.IsRejected() )
- return TRUE; // da kommt noch eine passende Reject-Action
+ return TRUE; // da kommt noch eine passende Reject-Action
if ( rAction.IsRejecting() && rAction.GetRejectAction() >= nFirstMerge )
- return TRUE; // da ist sie
+ return TRUE; // da ist sie
- return FALSE; // alles andere
+ return FALSE; // alles andere
}
@@ -3377,7 +3377,7 @@ void ScChangeTrack::MergePrepare( ScChangeAction* pFirstMerge, bool bShared )
{
SetLastMerge( pAct->GetActionNumber() );
while ( pAct )
- { // rueckwaerts, Deletes in richtiger Reihenfolge
+ { // rueckwaerts, Deletes in richtiger Reihenfolge
// #i94841# [Collaboration] When deleting rows is rejected, the content is sometimes wrong
if ( bShared || !ScChangeTrack::MergeIgnore( *pAct, nFirstMerge ) )
{
@@ -3392,12 +3392,12 @@ void ScChangeTrack::MergePrepare( ScChangeAction* pFirstMerge, bool bShared )
}
UpdateReference( pAct, TRUE );
SetInDeleteTop( FALSE );
- pAct->DeleteCellEntries(); // sonst GPF bei Track Clear()
+ pAct->DeleteCellEntries(); // sonst GPF bei Track Clear()
}
pAct = ( pAct == pFirstMerge ? NULL : pAct->GetPrev() );
}
}
- SetMergeState( SC_CTMS_OTHER ); //! nachfolgende per default MergeOther
+ SetMergeState( SC_CTMS_OTHER ); //! nachfolgende per default MergeOther
}
@@ -3418,7 +3418,7 @@ void ScChangeTrack::MergeOwn( ScChangeAction* pAct, ULONG nFirstMerge, bool bSha
}
UpdateReference( pAct, FALSE );
SetInDeleteTop( FALSE );
- SetMergeState( SC_CTMS_OTHER ); //! nachfolgende per default MergeOther
+ SetMergeState( SC_CTMS_OTHER ); //! nachfolgende per default MergeOther
}
}
@@ -3526,11 +3526,11 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
nDz = -nDz;
}
if ( bDel )
- { //! fuer diesen Mechanismus gilt:
+ { //! fuer diesen Mechanismus gilt:
//! es gibt nur ganze, einfache geloeschte Spalten/Zeilen
ScChangeActionDel* pActDel = (ScChangeActionDel*) pAct;
if ( !bUndo )
- { // Delete
+ { // Delete
ScChangeActionType eInsType = SC_CAT_NONE; // for Insert-Undo-"Deletes"
switch ( eActType )
{
@@ -3551,11 +3551,11 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
for ( ScChangeAction* p = *ppFirstAction; p; p = p->GetNext() )
{
if ( p == pAct )
- continue; // for
+ continue; // for
BOOL bUpdate = TRUE;
if ( GetMergeState() == SC_CTMS_OTHER &&
p->GetActionNumber() <= GetLastMerge() )
- { // Delete in mergendem Dokument, Action im zu mergenden
+ { // Delete in mergendem Dokument, Action im zu mergenden
if ( p->IsInsertType() )
{
// Bei Insert Referenzen nur anpassen, wenn das Delete
@@ -3566,7 +3566,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
}
else if ( p->GetType() == SC_CAT_CONTENT &&
p->IsDeletedInDelType( eInsType ) )
- { // Content in Insert-Undo-"Delete"
+ { // Content in Insert-Undo-"Delete"
// Nicht anpassen, wenn dieses Delete in dem
// Insert-"Delete" sein wuerde (ist nur verschoben).
if ( aDelRange.In( p->GetBigRange().aStart ) )
@@ -3585,7 +3585,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
}
}
if ( !bUpdate )
- continue; // for
+ continue; // for
}
if ( aDelRange.In( p->GetBigRange() ) )
{
@@ -3755,16 +3755,16 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
if ( p->GetType() == eActType && !p->IsRejected() &&
!pActDel->IsDeletedIn() &&
p->GetBigRange().In( aDelRange ) )
- pActDel->SetDeletedIn( p ); // "druntergerutscht"
+ pActDel->SetDeletedIn( p ); // "druntergerutscht"
}
}
}
else
- { // Undo Delete
+ { // Undo Delete
for ( ScChangeAction* p = *ppFirstAction; p; p = p->GetNext() )
{
if ( p == pAct )
- continue; // for
+ continue; // for
BOOL bUpdate = TRUE;
if ( aDelRange.In( p->GetBigRange() ) )
{
@@ -3783,7 +3783,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
{
if ( p->GetType() != SC_CAT_CONTENT ||
((ScChangeActionContent*)p)->IsTopContent() )
- { // erst der TopContent wird wirklich entfernt
+ { // erst der TopContent wird wirklich entfernt
p->RemoveDeletedIn( pActDel );
// GeneratedDelContent _nicht_ aus Liste loeschen,
// wir brauchen ihn evtl. noch fuer Reject,
@@ -3794,13 +3794,13 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
}
else if ( eActType != SC_CAT_DELETE_TABS &&
p->IsDeletedInDelType( SC_CAT_DELETE_TABS ) )
- { // in geloeschten Tabellen nicht updaten,
+ { // in geloeschten Tabellen nicht updaten,
// ausser wenn Tabelle verschoben wird
bUpdate = FALSE;
}
if ( p->GetType() == eActType && pActDel->IsDeletedIn( p ) )
{
- pActDel->RemoveDeletedIn( p ); // "druntergerutscht"
+ pActDel->RemoveDeletedIn( p ); // "druntergerutscht"
bUpdate = TRUE;
}
}
@@ -3808,7 +3808,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
p->UpdateReference( this, eMode, aRange, nDx, nDy, nDz );
}
if ( !bGeneratedDelContents )
- { // die werden sonst noch fuer das echte Undo gebraucht
+ { // die werden sonst noch fuer das echte Undo gebraucht
pActDel->UndoCutOffInsert();
pActDel->UndoCutOffMoves();
}
@@ -3821,11 +3821,11 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
const ScBigRange& rTo = pActMove->GetBigRange();
const ScBigRange& rFrom = pActMove->GetFromRange();
if ( !bUndo )
- { // Move
+ { // Move
for ( ScChangeAction* p = *ppFirstAction; p; p = p->GetNext() )
{
if ( p == pAct )
- continue; // for
+ continue; // for
if ( p->GetType() == SC_CAT_CONTENT )
{
// Inhalt in Ziel deleten (Inhalt in Quelle moven)
@@ -3842,7 +3842,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
else if ( bLastCutMove &&
p->GetActionNumber() > nEndLastCut &&
rFrom.In( p->GetBigRange() ) )
- { // Paste Cut: neuer Content nach Cut eingefuegt, bleibt.
+ { // Paste Cut: neuer Content nach Cut eingefuegt, bleibt.
// Aufsplitten der ContentChain
ScChangeActionContent *pHere, *pTmp;
pHere = (ScChangeActionContent*) p;
@@ -3850,12 +3850,12 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
pTmp->GetActionNumber() > nEndLastCut )
pHere = pTmp;
if ( pTmp )
- { // wird TopContent des Move
+ { // wird TopContent des Move
pTmp->SetNextContent( NULL );
pHere->SetPrevContent( NULL );
}
do
- { // Abhaengigkeit vom FromRange herstellen
+ { // Abhaengigkeit vom FromRange herstellen
AddDependentWithNotify( pActMove, pHere );
} while ( ( pHere = pHere->GetNextContent() ) != NULL );
}
@@ -3866,19 +3866,19 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
}
}
else
- { // Undo Move
+ { // Undo Move
BOOL bActRejected = pActMove->IsRejected();
for ( ScChangeAction* p = *ppFirstAction; p; p = p->GetNext() )
{
if ( p == pAct )
- continue; // for
+ continue; // for
if ( p->GetType() == SC_CAT_CONTENT )
{
// Inhalt in Ziel moven, wenn nicht deleted, sonst undelete
if ( p->IsDeletedIn( pActMove ) )
{
if ( ((ScChangeActionContent*)p)->IsTopContent() )
- { // erst der TopContent wird wirklich entfernt
+ { // erst der TopContent wird wirklich entfernt
p->RemoveDeletedIn( pActMove );
// GeneratedDelContent _nicht_ aus Liste loeschen,
// wir brauchen ihn evtl. noch fuer Reject,
@@ -3891,7 +3891,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
if ( bActRejected &&
((ScChangeActionContent*)p)->IsTopContent() &&
rFrom.In( p->GetBigRange() ) )
- { // Abhaengigkeit herstellen, um Content zu schreiben
+ { // Abhaengigkeit herstellen, um Content zu schreiben
ScChangeActionLinkEntry* pLink =
pActMove->AddDependent( p );
p->AddLink( pActMove, pLink );
@@ -3901,7 +3901,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
}
}
else
- { // Insert / Undo Insert
+ { // Insert / Undo Insert
switch ( GetMergeState() )
{
case SC_CTMS_NONE :
@@ -3910,7 +3910,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
for ( ScChangeAction* p = *ppFirstAction; p; p = p->GetNext() )
{
if ( p == pAct )
- continue; // for
+ continue; // for
p->UpdateReference( this, eMode, aRange, nDx, nDy, nDz );
}
}
@@ -3944,7 +3944,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
for ( ScChangeAction* p = *ppFirstAction; p; p = p->GetNext() )
{
if ( p == pAct )
- continue; // for
+ continue; // for
if ( !p->IsDeletedIn( pAct )
// #i95212# [Collaboration] Bad handling of row insertion in shared spreadsheet
&& p->GetActionNumber() <= pAct->GetActionNumber() )
@@ -3959,7 +3959,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction,
for ( ScChangeAction* p = *ppFirstAction; p; p = p->GetNext() )
{
if ( p == pAct )
- continue; // for
+ continue; // for
if ( !p->IsDeletedIn( pAct )
// #i95212# [Collaboration] Bad handling of row insertion in shared spreadsheet
&& p->GetActionNumber() <= pAct->GetActionNumber() )
@@ -4070,7 +4070,7 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct,
else if ( pCur->IsDeleteType() )
{
if ( bIsDelete )
- { // Inhalte geloeschter Bereiche interessieren nur bei Delete
+ { // Inhalte geloeschter Bereiche interessieren nur bei Delete
ScChangeActionDel* pDel = (ScChangeActionDel*) pCur;
if ( !bAllFlat && bIsMasterDelete && pCur == pAct )
{
@@ -4104,7 +4104,7 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct,
else
{
if ( p->IsDeleteType() )
- { // weiteres TopDelete in gleiche Ebene,
+ { // weiteres TopDelete in gleiche Ebene,
// es ist nicht rejectable
if ( ((ScChangeActionDel*)p)->IsTopDelete() )
rTable.Insert( p->GetActionNumber(), p );
@@ -4164,7 +4164,7 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct,
}
}
else if ( pCur->GetType() == SC_CAT_CONTENT )
- { // alle Aenderungen an gleicher Position
+ { // alle Aenderungen an gleicher Position
ScChangeActionContent* pContent = (ScChangeActionContent*) pCur;
// alle vorherigen
while ( ( pContent = pContent->GetPrevContent() ) != NULL )
@@ -4325,7 +4325,7 @@ BOOL ScChangeTrack::RejectAll()
{
BOOL bOk = TRUE;
for ( ScChangeAction* p = GetLast(); p && bOk; p = p->GetPrev() )
- { //! rueckwaerts, weil abhaengige hinten und RejectActions angehaengt
+ { //! rueckwaerts, weil abhaengige hinten und RejectActions angehaengt
if ( p->IsInternalRejectable() )
bOk = Reject( p );
}
@@ -4375,9 +4375,9 @@ BOOL ScChangeTrack::Reject( ScChangeAction* pAct, ScChangeActionTable* pTable,
if ( p->GetType() == SC_CAT_CONTENT )
p->SetRejected();
else if ( p->IsDeleteType() )
- p->Accept(); // geloeschtes ins Nirvana
+ p->Accept(); // geloeschtes ins Nirvana
else
- bOk = Reject( p, NULL, TRUE ); //! rekursiv
+ bOk = Reject( p, NULL, TRUE ); //! rekursiv
}
}
if ( bOk && (bRejected = pAct->Reject( pDoc )) != FALSE )
@@ -4487,7 +4487,7 @@ BOOL ScChangeTrack::Reject( ScChangeAction* pAct, ScChangeActionTable* pTable,
DBG_ASSERT( pTable, "ScChangeTrack::Reject: Move ohne Table" );
for ( ScChangeAction* p = pTable->Last(); p && bOk; p = pTable->Prev() )
{
- bOk = Reject( p, NULL, TRUE ); //! rekursiv
+ bOk = Reject( p, NULL, TRUE ); //! rekursiv
}
}
if ( bOk && (bRejected = pAct->Reject( pDoc )) != FALSE )
diff --git a/sc/source/core/tool/chgviset.cxx b/sc/source/core/tool/chgviset.cxx
index ac587db2bd12..17e874642989 100644
--- a/sc/source/core/tool/chgviset.cxx
+++ b/sc/source/core/tool/chgviset.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScChangeViewSettings::ScChangeViewSettings( const ScChangeViewSettings& r )
{
SetTheComment(r.aComment);
- aFirstDateTime =r.aFirstDateTime;
- aLastDateTime =r.aLastDateTime;
- aAuthorToShow =r.aAuthorToShow;
- aRangeList =r.aRangeList;
- eDateMode =r.eDateMode;
- bShowIt =r.bShowIt;
- bIsDate =r.bIsDate;
- bIsAuthor =r.bIsAuthor;
- bIsComment =r.bIsComment;
- bIsRange =r.bIsRange;
- bEveryoneButMe =r.bEveryoneButMe;
- bShowAccepted =r.bShowAccepted;
- bShowRejected =r.bShowRejected;
+ aFirstDateTime =r.aFirstDateTime;
+ aLastDateTime =r.aLastDateTime;
+ aAuthorToShow =r.aAuthorToShow;
+ aRangeList =r.aRangeList;
+ eDateMode =r.eDateMode;
+ bShowIt =r.bShowIt;
+ bIsDate =r.bIsDate;
+ bIsAuthor =r.bIsAuthor;
+ bIsComment =r.bIsComment;
+ bIsRange =r.bIsRange;
+ bEveryoneButMe =r.bEveryoneButMe;
+ bShowAccepted =r.bShowAccepted;
+ bShowRejected =r.bShowRejected;
mbIsActionRange = r.mbIsActionRange;
mnFirstAction = r.mnFirstAction;
mnLastAction = r.mnLastAction;
@@ -70,19 +70,19 @@ ScChangeViewSettings& ScChangeViewSettings::operator=( const ScChangeViewSetting
{
SetTheComment(r.aComment);
- aFirstDateTime =r.aFirstDateTime;
- aLastDateTime =r.aLastDateTime;
- aAuthorToShow =r.aAuthorToShow;
- aRangeList =r.aRangeList;
- eDateMode =r.eDateMode;
- bShowIt =r.bShowIt;
- bIsDate =r.bIsDate;
- bIsAuthor =r.bIsAuthor;
- bIsComment =r.bIsComment;
- bIsRange =r.bIsRange;
- bEveryoneButMe =r.bEveryoneButMe;
- bShowAccepted =r.bShowAccepted;
- bShowRejected =r.bShowRejected;
+ aFirstDateTime =r.aFirstDateTime;
+ aLastDateTime =r.aLastDateTime;
+ aAuthorToShow =r.aAuthorToShow;
+ aRangeList =r.aRangeList;
+ eDateMode =r.eDateMode;
+ bShowIt =r.bShowIt;
+ bIsDate =r.bIsDate;
+ bIsAuthor =r.bIsAuthor;
+ bIsComment =r.bIsComment;
+ bIsRange =r.bIsRange;
+ bEveryoneButMe =r.bEveryoneButMe;
+ bShowAccepted =r.bShowAccepted;
+ bShowRejected =r.bShowRejected;
mbIsActionRange = r.mbIsActionRange;
mnFirstAction = r.mnFirstAction;
mnLastAction = r.mnLastAction;
@@ -125,7 +125,7 @@ void ScChangeViewSettings::SetTheComment(const String& rString)
void ScChangeViewSettings::AdjustDateMode( const ScDocument& rDoc )
{
switch ( eDateMode )
- { // corresponds with ScViewUtil::IsActionShown
+ { // corresponds with ScViewUtil::IsActionShown
case SCDM_DATE_EQUAL :
case SCDM_DATE_NOTEQUAL :
aFirstDateTime.SetTime( 0 );
diff --git a/sc/source/core/tool/collect.cxx b/sc/source/core/tool/collect.cxx
index c7aa72343fbb..64bf727df9d6 100644
--- a/sc/source/core/tool/collect.cxx
+++ b/sc/source/core/tool/collect.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "rechead.hxx"
#include "collect.hxx"
-#include "document.hxx" // fuer TypedStrData Konstruktor
+#include "document.hxx" // fuer TypedStrData Konstruktor
// -----------------------------------------------------------------------
@@ -99,7 +99,7 @@ void ScCollection::AtFree(USHORT nIndex)
if ((pItems) && (nIndex < nCount))
{
delete pItems[nIndex];
- --nCount; // before memmove
+ --nCount; // before memmove
memmove ( &pItems[nIndex], &pItems[nIndex + 1], (nCount - nIndex) * sizeof(ScDataObject*));
pItems[nCount] = NULL;
}
@@ -193,7 +193,7 @@ ScCollection& ScCollection::operator=( const ScCollection& r )
//------------------------------------------------------------------------
-ScDataObject* ScCollection::Clone() const
+ScDataObject* ScCollection::Clone() const
{
return new ScCollection(*this);
}
@@ -296,16 +296,16 @@ BOOL ScSortedCollection::operator==(const ScSortedCollection& rCmp) const
//------------------------------------------------------------------------
-// IsEqual - komplette Inhalte vergleichen
+// IsEqual - komplette Inhalte vergleichen
BOOL ScSortedCollection::IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const
{
- return ( Compare(pKey1, pKey2) == 0 ); // Default: nur Index vergleichen
+ return ( Compare(pKey1, pKey2) == 0 ); // Default: nur Index vergleichen
}
//------------------------------------------------------------------------
-ScDataObject* StrData::Clone() const
+ScDataObject* StrData::Clone() const
{
return new StrData(*this);
}
@@ -325,7 +325,7 @@ short ScStrCollection::Compare(ScDataObject* pKey1, ScDataObject* pKey2) const
//------------------------------------------------------------------------
-ScDataObject* ScStrCollection::Clone() const
+ScDataObject* ScStrCollection::Clone() const
{
return new ScStrCollection(*this);
}
@@ -353,15 +353,15 @@ ScDataObject* ScStrCollection::Clone() const
//UNUSED2008-05 }
-ScDataObject* TypedStrData::Clone() const
+ScDataObject* TypedStrData::Clone() const
{
return new TypedStrData(*this);
}
TypedScStrCollection::TypedScStrCollection( USHORT nLim , USHORT nDel , BOOL bDup )
- : ScSortedCollection( nLim, nDel, bDup )
+ : ScSortedCollection( nLim, nDel, bDup )
{
- bCaseSensitive = FALSE;
+ bCaseSensitive = FALSE;
}
TypedScStrCollection::~TypedScStrCollection()
@@ -371,16 +371,16 @@ ScDataObject* TypedScStrCollection::Clone() const
return new TypedScStrCollection(*this);
}
-TypedStrData* TypedScStrCollection::operator[]( const USHORT nIndex) const
-{
- return (TypedStrData*)At(nIndex);
+TypedStrData* TypedScStrCollection::operator[]( const USHORT nIndex) const
+{
+ return (TypedStrData*)At(nIndex);
}
-void TypedScStrCollection::SetCaseSensitive( BOOL bSet )
-{
- bCaseSensitive = bSet;
+void TypedScStrCollection::SetCaseSensitive( BOOL bSet )
+{
+ bCaseSensitive = bSet;
}
-
+
short TypedScStrCollection::Compare( ScDataObject* pKey1, ScDataObject* pKey2 ) const
{
short nResult = 0;
@@ -426,8 +426,8 @@ short TypedScStrCollection::Compare( ScDataObject* pKey1, ScDataObject* pKey2 )
BOOL TypedScStrCollection::FindText( const String& rStart, String& rResult,
USHORT& rPos, BOOL bBack ) const
{
- // Die Collection ist nach String-Vergleichen sortiert, darum muss hier
- // alles durchsucht werden
+ // Die Collection ist nach String-Vergleichen sortiert, darum muss hier
+ // alles durchsucht werden
BOOL bFound = FALSE;
@@ -439,11 +439,11 @@ BOOL TypedScStrCollection::FindText( const String& rStart, String& rResult,
aOldResult = pData->aStrValue;
}
- if ( bBack ) // rueckwaerts
+ if ( bBack ) // rueckwaerts
{
USHORT nStartPos = nCount;
if ( rPos != SCPOS_INVALID )
- nStartPos = rPos; // weitersuchen...
+ nStartPos = rPos; // weitersuchen...
for ( USHORT i=nStartPos; i>0; )
{
@@ -453,8 +453,8 @@ BOOL TypedScStrCollection::FindText( const String& rStart, String& rResult,
{
if ( ScGlobal::GetpTransliteration()->isMatch( rStart, pData->aStrValue ) )
{
- // If the collection is case sensitive, it may contain several entries
- // that are equal when compared case-insensitive. They are skipped here.
+ // If the collection is case sensitive, it may contain several entries
+ // that are equal when compared case-insensitive. They are skipped here.
if ( !bCaseSensitive || !aOldResult.Len() ||
!ScGlobal::GetpTransliteration()->isEqual(
pData->aStrValue, aOldResult ) )
@@ -468,11 +468,11 @@ BOOL TypedScStrCollection::FindText( const String& rStart, String& rResult,
}
}
}
- else // vorwaerts
+ else // vorwaerts
{
USHORT nStartPos = 0;
if ( rPos != SCPOS_INVALID )
- nStartPos = rPos + 1; // weitersuchen...
+ nStartPos = rPos + 1; // weitersuchen...
for ( USHORT i=nStartPos; i<nCount; i++ )
{
@@ -481,8 +481,8 @@ BOOL TypedScStrCollection::FindText( const String& rStart, String& rResult,
{
if ( ScGlobal::GetpTransliteration()->isMatch( rStart, pData->aStrValue ) )
{
- // If the collection is case sensitive, it may contain several entries
- // that are equal when compared case-insensitive. They are skipped here.
+ // If the collection is case sensitive, it may contain several entries
+ // that are equal when compared case-insensitive. They are skipped here.
if ( !bCaseSensitive || !aOldResult.Len() ||
!ScGlobal::GetpTransliteration()->isEqual(
pData->aStrValue, aOldResult ) )
@@ -510,7 +510,7 @@ BOOL TypedScStrCollection::GetExactMatch( String& rString ) const
if ( pData->nStrType && ScGlobal::GetpTransliteration()->isEqual(
pData->aStrValue, rString ) )
{
- rString = pData->aStrValue; // String anpassen
+ rString = pData->aStrValue; // String anpassen
return TRUE;
}
}
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 828c9ae64c7d..f2d5b99c2c93 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -320,7 +320,7 @@ bool ScCompiler::IsEnglishSymbol( const String& rName )
{
return true;
}
- return false; // no valid function name
+ return false; // no valid function name
}
// static
@@ -2469,7 +2469,7 @@ Label_MaskStateMachine:
}
if (mnRangeOpPosInSymbol >= 0 && mnRangeOpPosInSymbol == (pSym-1) - &cSymbol[0])
{
- // This is a trailing range operator, which is nonsense. Will be caught
+ // This is a trailing range operator, which is nonsense. Will be caught
// in next round.
mnRangeOpPosInSymbol = -1;
*--pSym = 0;
@@ -2506,10 +2506,10 @@ BOOL ScCompiler::IsOpCode( const String& rName, bool bInArray )
}
else if (mxSymbols->isODFF())
{
- // ODFF names that are not written in the current mapping but to be
- // recognized. New names will be written in a future relase, then
- // exchange (!) with the names in
- // formula/source/core/resource/core_resource.src to be able to still
+ // ODFF names that are not written in the current mapping but to be
+ // recognized. New names will be written in a future relase, then
+ // exchange (!) with the names in
+ // formula/source/core/resource/core_resource.src to be able to still
// read the old names as well.
struct FunctionName
{
@@ -2887,7 +2887,7 @@ BOOL ScCompiler::IsReference( const String& rName )
{
if (IsDoubleReference( rName))
return true;
- // Now try with a symbol up to the range operator, rewind source
+ // Now try with a symbol up to the range operator, rewind source
// position.
sal_Int32 nLen = mnRangeOpPosInSymbol;
while (cSymbol[++nLen])
@@ -2900,8 +2900,8 @@ BOOL ScCompiler::IsReference( const String& rName )
}
else
{
- // Special treatment for the 'E:\[doc]Sheet1:Sheet3'!D5 Excel sickness,
- // mnRangeOpPosInSymbol did not catch the range operator as it is
+ // Special treatment for the 'E:\[doc]Sheet1:Sheet3'!D5 Excel sickness,
+ // mnRangeOpPosInSymbol did not catch the range operator as it is
// within a quoted name.
switch (pConv->meConv)
{
@@ -2932,9 +2932,9 @@ BOOL ScCompiler::IsMacro( const String& rName )
else
pObj = pSfxApp->GetBasic();
- // ODFF recommends to store user-defined functions prefixed with "USER.",
- // use only unprefixed name if encountered. BASIC doesn't allow '.' in a
- // function name so a function "USER.FOO" could not exist, and macro check
+ // ODFF recommends to store user-defined functions prefixed with "USER.",
+ // use only unprefixed name if encountered. BASIC doesn't allow '.' in a
+ // function name so a function "USER.FOO" could not exist, and macro check
// is assigned the lowest priority in function name check.
if (FormulaGrammar::isODFF( GetGrammar()) && aName.EqualsIgnoreCaseAscii( "USER.", 0, 5))
aName.Erase( 0, 5);
@@ -3533,7 +3533,7 @@ inline bool lcl_UpperAsciiOrI18n( String& rUpper, const String& rOrg, FormulaGra
{
if (FormulaGrammar::isODFF( eGrammar ))
{
- // ODFF has a defined set of English function names, avoid i18n
+ // ODFF has a defined set of English function names, avoid i18n
// overhead.
rUpper = rOrg;
rUpper.ToUpperAscii();
@@ -3704,8 +3704,8 @@ BOOL ScCompiler::NextNewToken( bool bInArray )
return false;
}
- // Provide single token information and continue. Do not set an error, that
- // would prematurely end compilation. Simple unknown names are handled by
+ // Provide single token information and continue. Do not set an error, that
+ // would prematurely end compilation. Simple unknown names are handled by
// the interpreter.
ScGlobal::pCharClass->toLower( aUpper );
ScRawToken aToken;
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index addd92082cfd..b1b018cb6a3a 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +45,13 @@
#include <math.h>
#include <string.h>
-#define SC_CONS_NOTFOUND -1
+#define SC_CONS_NOTFOUND -1
// STATIC DATA -----------------------------------------------------------
-/* Strings bei Gelegenheit ganz raus...
-static USHORT nFuncRes[] = { // Reihenfolge wie bei enum ScSubTotalFunc
- 0, // none
+/* Strings bei Gelegenheit ganz raus...
+static USHORT nFuncRes[] = { // Reihenfolge wie bei enum ScSubTotalFunc
+ 0, // none
STR_PIVOTFUNC_AVG,
STR_PIVOTFUNC_COUNT,
STR_PIVOTFUNC_COUNT2,
@@ -65,8 +65,8 @@ static USHORT nFuncRes[] = { // Reihenfolge wie bei enum ScSubTo
STR_PIVOTFUNC_VAR2 };
*/
-static OpCode eOpCodeTable[] = { // Reihenfolge wie bei enum ScSubTotalFunc
- ocBad, // none
+static OpCode eOpCodeTable[] = { // Reihenfolge wie bei enum ScSubTotalFunc
+ ocBad, // none
ocAverage,
ocCount,
ocCount2,
@@ -149,24 +149,24 @@ ScConsData::~ScConsData()
}
-#define DELETEARR(ppArray,nCount) \
-{ \
- ULONG i; \
- if (ppArray) \
- for(i=0; i<nCount; i++) \
- delete[] ppArray[i]; \
- delete[] ppArray; \
- ppArray = NULL; \
+#define DELETEARR(ppArray,nCount) \
+{ \
+ ULONG i; \
+ if (ppArray) \
+ for(i=0; i<nCount; i++) \
+ delete[] ppArray[i]; \
+ delete[] ppArray; \
+ ppArray = NULL; \
}
-#define DELETESTR(ppArray,nCount) \
-{ \
- ULONG i; \
- if (ppArray) \
- for(i=0; i<nCount; i++) \
- delete ppArray[i]; \
- delete[] ppArray; \
- ppArray = NULL; \
+#define DELETESTR(ppArray,nCount) \
+{ \
+ ULONG i; \
+ if (ppArray) \
+ for(i=0; i<nCount; i++) \
+ delete ppArray[i]; \
+ delete[] ppArray; \
+ ppArray = NULL; \
}
void ScConsData::DeleteData()
@@ -184,12 +184,12 @@ void ScConsData::DeleteData()
ppRefs = NULL;
}
-// DELETEARR( ppData1, nColCount );
-// DELETEARR( ppData2, nColCount );
+// DELETEARR( ppData1, nColCount );
+// DELETEARR( ppData2, nColCount );
DELETEARR( ppCount, nColCount );
DELETEARR( ppSum, nColCount );
DELETEARR( ppSumSqr,nColCount );
- DELETEARR( ppUsed, nColCount ); // erst nach ppRefs !!!
+ DELETEARR( ppUsed, nColCount ); // erst nach ppRefs !!!
DELETEARR( ppTitlePos, nRowCount );
DELETESTR( ppColHeaders, nColCount );
DELETESTR( ppRowHeaders, nRowCount );
@@ -197,7 +197,7 @@ void ScConsData::DeleteData()
nTitleCount = 0;
nDataCount = 0;
- if (bColByName) nColCount = 0; // sonst stimmt ppColHeaders nicht
+ if (bColByName) nColCount = 0; // sonst stimmt ppColHeaders nicht
if (bRowByName) nRowCount = 0;
bCornerUsed = FALSE;
@@ -247,11 +247,11 @@ void ScConsData::InitData( BOOL bDelete )
for (SCSIZE i=0; i<nRowCount; i++)
{
ppTitlePos[i] = new SCSIZE[nDataCount];
- memset( ppTitlePos[i], 0, nDataCount * sizeof(SCSIZE) ); //! unnoetig ?
+ memset( ppTitlePos[i], 0, nDataCount * sizeof(SCSIZE) ); //! unnoetig ?
}
}
- // CornerText: einzelner String
+ // CornerText: einzelner String
}
void ScConsData::DoneFields()
@@ -292,8 +292,8 @@ void ScConsData::AddFields( ScDocument* pSrcDoc, SCTAB nTab,
SCCOL nStartCol = nCol1;
SCROW nStartRow = nRow1;
- if (bColByName) ++nStartRow;
- if (bRowByName) ++nStartCol;
+ if (bColByName) ++nStartRow;
+ if (bRowByName) ++nStartCol;
if (bColByName)
{
@@ -341,7 +341,7 @@ void ScConsData::AddName( const String& rName )
for (nArrY=0; nArrY<nRowCount; nArrY++)
{
- // Daten auf gleiche Laenge bringen
+ // Daten auf gleiche Laenge bringen
SCSIZE nMax = 0;
for (nArrX=0; nArrX<nColCount; nArrX++)
@@ -358,7 +358,7 @@ void ScConsData::AddName( const String& rName )
ppRefs[nArrX][nArrY].SetFullSize(nMax);
}
- // Positionen eintragen
+ // Positionen eintragen
if (ppTitlePos)
if (nTitleCount < nDataCount)
@@ -539,7 +539,7 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
SCCOL nCol;
SCROW nRow;
- // Ecke links oben
+ // Ecke links oben
if ( bColByName && bRowByName )
{
@@ -557,15 +557,15 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
}
}
- // Titel suchen
+ // Titel suchen
SCCOL nStartCol = nCol1;
SCROW nStartRow = nRow1;
- if (bColByName) ++nStartRow;
- if (bRowByName) ++nStartCol;
+ if (bColByName) ++nStartRow;
+ if (bRowByName) ++nStartCol;
String aTitle;
- SCCOL* pDestCols = NULL;
- SCROW* pDestRows = NULL;
+ SCCOL* pDestCols = NULL;
+ SCROW* pDestRows = NULL;
if (bColByName)
{
pDestCols = new SCCOL[nCol2-nStartCol+1];
@@ -611,19 +611,19 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
nCol1 = nStartCol;
nRow1 = nStartRow;
- // Daten
+ // Daten
BOOL bAnyCell = ( eFunction == SUBTOTAL_FUNC_CNT2 );
for (nCol=nCol1; nCol<=nCol2; nCol++)
{
SCCOL nArrX = nCol-nCol1;
- if (bColByName) nArrX = pDestCols[nArrX];
+ if (bColByName) nArrX = pDestCols[nArrX];
if (nArrX != SC_CONS_NOTFOUND)
{
for (nRow=nRow1; nRow<=nRow2; nRow++)
{
SCROW nArrY = nRow-nRow1;
- if (bRowByName) nArrY = pDestRows[nArrY];
+ if (bRowByName) nArrY = pDestRows[nArrY];
if ( nArrY != SC_CONS_NOTFOUND && (
bAnyCell ? pSrcDoc->HasData( nCol, nRow, nTab )
: pSrcDoc->HasValueData( nCol, nRow, nTab ) ) )
@@ -664,7 +664,7 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
delete[] pDestRows;
}
-// vorher testen, wieviele Zeilen eingefuegt werden (fuer Undo)
+// vorher testen, wieviele Zeilen eingefuegt werden (fuer Undo)
SCROW ScConsData::GetInsertCount() const
{
@@ -686,8 +686,8 @@ SCROW ScConsData::GetInsertCount() const
return nInsert;
}
-// fertige Daten ins Dokument schreiben
-//! optimieren nach Spalten?
+// fertige Daten ins Dokument schreiben
+//! optimieren nach Spalten?
void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, SCTAB nTab )
{
@@ -696,17 +696,17 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow,
SCSIZE nArrX;
SCSIZE nArrY;
- // Ecke links oben
+ // Ecke links oben
if ( bColByName && bRowByName && aCornerText.Len() )
pDestDoc->SetString( nCol, nRow, nTab, aCornerText );
- // Titel
+ // Titel
SCCOL nStartCol = nCol;
SCROW nStartRow = nRow;
- if (bColByName) ++nStartRow;
- if (bRowByName) ++nStartCol;
+ if (bColByName) ++nStartRow;
+ if (bRowByName) ++nStartCol;
if (bColByName)
for (SCSIZE i=0; i<nColCount; i++)
@@ -718,9 +718,9 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow,
nCol = nStartCol;
nRow = nStartRow;
- // Daten
+ // Daten
- if ( ppCount && ppUsed ) // Werte direkt einfuegen
+ if ( ppCount && ppUsed ) // Werte direkt einfuegen
{
for (nArrX=0; nArrX<nColCount; nArrX++)
for (nArrY=0; nArrY<nRowCount; nArrY++)
@@ -738,16 +738,16 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow,
}
}
- if ( ppRefs && ppUsed ) // Referenzen einfuegen
+ if ( ppRefs && ppUsed ) // Referenzen einfuegen
{
//! unterscheiden, ob nach Kategorien aufgeteilt
String aString;
- ScSingleRefData aSRef; // Daten fuer Referenz-Formelzellen
+ ScSingleRefData aSRef; // Daten fuer Referenz-Formelzellen
aSRef.InitFlags();
aSRef.SetFlag3D(TRUE);
- ScComplexRefData aCRef; // Daten fuer Summen-Zellen
+ ScComplexRefData aCRef; // Daten fuer Summen-Zellen
aCRef.InitFlags();
aCRef.Ref1.SetColRel(TRUE); aCRef.Ref1.SetRowRel(TRUE); aCRef.Ref1.SetTabRel(TRUE);
aCRef.Ref2.SetColRel(TRUE); aCRef.Ref2.SetRowRel(TRUE); aCRef.Ref2.SetTabRel(TRUE);
@@ -775,7 +775,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow,
ScReferenceEntry aRef = rList.GetEntry(nPos);
if (aRef.nTab != SC_CONS_NOTFOUND)
{
- // Referenz einfuegen (absolut, 3d)
+ // Referenz einfuegen (absolut, 3d)
aSRef.nCol = aRef.nCol;
aSRef.nRow = aRef.nRow;
@@ -791,7 +791,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow,
}
}
- // Summe einfuegen (relativ, nicht 3d)
+ // Summe einfuegen (relativ, nicht 3d)
ScAddress aDest( sal::static_int_cast<SCCOL>(nCol+nArrX),
sal::static_int_cast<SCROW>(nRow+nArrY+nNeeded), nTab );
@@ -803,7 +803,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow,
aCRef.CalcRelFromAbs( aDest );
ScTokenArray aArr;
- aArr.AddOpCode(eOpCode); // ausgewaehlte Funktion
+ aArr.AddOpCode(eOpCode); // ausgewaehlte Funktion
aArr.AddOpCode(ocOpen);
aArr.AddDoubleReference(aCRef);
aArr.AddOpCode(ocClose);
@@ -813,7 +813,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow,
}
}
- // Gliederung einfuegen
+ // Gliederung einfuegen
ScOutlineArray* pOutArr = pDestDoc->GetOutlineTable( nTab, TRUE )->GetRowArray();
SCROW nOutStart = nRow+nArrY;
@@ -824,7 +824,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow,
pDestDoc->ShowRow( nOutRow, nTab, FALSE );
pDestDoc->UpdateOutlineRow( nOutStart, nOutEnd, nTab, FALSE );
- // Zwischentitel
+ // Zwischentitel
if (ppTitlePos && ppTitles && ppRowHeaders)
{
@@ -835,7 +835,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow,
BOOL bDo = TRUE;
if (nPos+1<nDataCount)
if (ppTitlePos[nArrY][nPos+1] == nTPos)
- bDo = FALSE; // leer
+ bDo = FALSE; // leer
if ( bDo && nTPos < nNeeded )
{
aString = *ppRowHeaders[nArrY];
diff --git a/sc/source/core/tool/dbcolect.cxx b/sc/source/core/tool/dbcolect.cxx
index 7f94cb64c827..0f1d26fd65c1 100644
--- a/sc/source/core/tool/dbcolect.cxx
+++ b/sc/source/core/tool/dbcolect.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,22 +47,22 @@ ScDBData::ScDBData( const String& rName,
SCTAB nTab,
SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
BOOL bByR, BOOL bHasH) :
- aName (rName),
- nTable (nTab),
- nStartCol (nCol1),
- nStartRow (nRow1),
- nEndCol (nCol2),
- nEndRow (nRow2),
- bByRow (bByR),
- bHasHeader (bHasH),
- bDoSize (FALSE),
- bKeepFmt (FALSE),
- bStripData (FALSE),
- bIsAdvanced (FALSE),
+ aName (rName),
+ nTable (nTab),
+ nStartCol (nCol1),
+ nStartRow (nRow1),
+ nEndCol (nCol2),
+ nEndRow (nRow2),
+ bByRow (bByR),
+ bHasHeader (bHasH),
+ bDoSize (FALSE),
+ bKeepFmt (FALSE),
+ bStripData (FALSE),
+ bIsAdvanced (FALSE),
bDBSelection(FALSE),
- nIndex (0),
+ nIndex (0),
bAutoFilter (FALSE),
- bModified (FALSE)
+ bModified (FALSE)
{
USHORT i;
@@ -89,86 +89,86 @@ ScDBData::ScDBData( const String& rName,
ScDBData::ScDBData( const ScDBData& rData ) :
ScDataObject(),
- ScRefreshTimer ( rData ),
- aName (rData.aName),
- nTable (rData.nTable),
- nStartCol (rData.nStartCol),
- nStartRow (rData.nStartRow),
- nEndCol (rData.nEndCol),
- nEndRow (rData.nEndRow),
- bByRow (rData.bByRow),
- bHasHeader (rData.bHasHeader),
- bDoSize (rData.bDoSize),
- bKeepFmt (rData.bKeepFmt),
- bStripData (rData.bStripData),
- bSortCaseSens (rData.bSortCaseSens),
- bIncludePattern (rData.bIncludePattern),
- bSortInplace (rData.bSortInplace),
- bSortUserDef (rData.bSortUserDef),
- nSortUserIndex (rData.nSortUserIndex),
- nSortDestTab (rData.nSortDestTab),
- nSortDestCol (rData.nSortDestCol),
- nSortDestRow (rData.nSortDestRow),
- aSortLocale (rData.aSortLocale),
- aSortAlgorithm (rData.aSortAlgorithm),
- bQueryInplace (rData.bQueryInplace),
- bQueryCaseSens (rData.bQueryCaseSens),
- bQueryRegExp (rData.bQueryRegExp),
- bQueryDuplicate (rData.bQueryDuplicate),
- nQueryDestTab (rData.nQueryDestTab),
- nQueryDestCol (rData.nQueryDestCol),
- nQueryDestRow (rData.nQueryDestRow),
- bIsAdvanced (rData.bIsAdvanced),
- aAdvSource (rData.aAdvSource),
- bSubRemoveOnly (rData.bSubRemoveOnly),
- bSubReplace (rData.bSubReplace),
- bSubPagebreak (rData.bSubPagebreak),
- bSubCaseSens (rData.bSubCaseSens),
- bSubDoSort (rData.bSubDoSort),
- bSubAscending (rData.bSubAscending),
- bSubIncludePattern (rData.bSubIncludePattern),
- bSubUserDef (rData.bSubUserDef),
- nSubUserIndex (rData.nSubUserIndex),
- bDBImport (rData.bDBImport),
- aDBName (rData.aDBName),
- aDBStatement (rData.aDBStatement),
- bDBNative (rData.bDBNative),
- bDBSelection (rData.bDBSelection),
- bDBSql (rData.bDBSql),
- nDBType (rData.nDBType),
- nIndex (rData.nIndex),
- bAutoFilter (rData.bAutoFilter),
- bModified (rData.bModified)
+ ScRefreshTimer ( rData ),
+ aName (rData.aName),
+ nTable (rData.nTable),
+ nStartCol (rData.nStartCol),
+ nStartRow (rData.nStartRow),
+ nEndCol (rData.nEndCol),
+ nEndRow (rData.nEndRow),
+ bByRow (rData.bByRow),
+ bHasHeader (rData.bHasHeader),
+ bDoSize (rData.bDoSize),
+ bKeepFmt (rData.bKeepFmt),
+ bStripData (rData.bStripData),
+ bSortCaseSens (rData.bSortCaseSens),
+ bIncludePattern (rData.bIncludePattern),
+ bSortInplace (rData.bSortInplace),
+ bSortUserDef (rData.bSortUserDef),
+ nSortUserIndex (rData.nSortUserIndex),
+ nSortDestTab (rData.nSortDestTab),
+ nSortDestCol (rData.nSortDestCol),
+ nSortDestRow (rData.nSortDestRow),
+ aSortLocale (rData.aSortLocale),
+ aSortAlgorithm (rData.aSortAlgorithm),
+ bQueryInplace (rData.bQueryInplace),
+ bQueryCaseSens (rData.bQueryCaseSens),
+ bQueryRegExp (rData.bQueryRegExp),
+ bQueryDuplicate (rData.bQueryDuplicate),
+ nQueryDestTab (rData.nQueryDestTab),
+ nQueryDestCol (rData.nQueryDestCol),
+ nQueryDestRow (rData.nQueryDestRow),
+ bIsAdvanced (rData.bIsAdvanced),
+ aAdvSource (rData.aAdvSource),
+ bSubRemoveOnly (rData.bSubRemoveOnly),
+ bSubReplace (rData.bSubReplace),
+ bSubPagebreak (rData.bSubPagebreak),
+ bSubCaseSens (rData.bSubCaseSens),
+ bSubDoSort (rData.bSubDoSort),
+ bSubAscending (rData.bSubAscending),
+ bSubIncludePattern (rData.bSubIncludePattern),
+ bSubUserDef (rData.bSubUserDef),
+ nSubUserIndex (rData.nSubUserIndex),
+ bDBImport (rData.bDBImport),
+ aDBName (rData.aDBName),
+ aDBStatement (rData.aDBStatement),
+ bDBNative (rData.bDBNative),
+ bDBSelection (rData.bDBSelection),
+ bDBSql (rData.bDBSql),
+ nDBType (rData.nDBType),
+ nIndex (rData.nIndex),
+ bAutoFilter (rData.bAutoFilter),
+ bModified (rData.bModified)
{
USHORT i;
USHORT j;
for (i=0; i<MAXSORT; i++)
{
- bDoSort[i] = rData.bDoSort[i];
- nSortField[i] = rData.nSortField[i];
- bAscending[i] = rData.bAscending[i];
+ bDoSort[i] = rData.bDoSort[i];
+ nSortField[i] = rData.nSortField[i];
+ bAscending[i] = rData.bAscending[i];
}
for (i=0; i<MAXQUERY; i++)
{
- bDoQuery[i] = rData.bDoQuery[i];
- nQueryField[i] = rData.nQueryField[i];
- eQueryOp[i] = rData.eQueryOp[i];
- bQueryByString[i] = rData.bQueryByString[i];
+ bDoQuery[i] = rData.bDoQuery[i];
+ nQueryField[i] = rData.nQueryField[i];
+ eQueryOp[i] = rData.eQueryOp[i];
+ bQueryByString[i] = rData.bQueryByString[i];
bQueryByDate[i] = rData.bQueryByDate[i];
- pQueryStr[i] = new String( *(rData.pQueryStr[i]) );
- nQueryVal[i] = rData.nQueryVal[i];
- eQueryConnect[i] = rData.eQueryConnect[i];
+ pQueryStr[i] = new String( *(rData.pQueryStr[i]) );
+ nQueryVal[i] = rData.nQueryVal[i];
+ eQueryConnect[i] = rData.eQueryConnect[i];
}
for (i=0; i<MAXSUBTOTAL; i++)
{
- bDoSubTotal[i] = rData.bDoSubTotal[i];
- nSubField[i] = rData.nSubField[i];
+ bDoSubTotal[i] = rData.bDoSubTotal[i];
+ nSubField[i] = rData.nSubField[i];
- SCCOL nCount = rData.nSubTotals[i];
- nSubTotals[i] = nCount;
- pFunctions[i] = nCount > 0 ? new ScSubTotalFunc [nCount] : NULL;
- pSubTotals[i] = nCount > 0 ? new SCCOL [nCount] : NULL;
+ SCCOL nCount = rData.nSubTotals[i];
+ nSubTotals[i] = nCount;
+ pFunctions[i] = nCount > 0 ? new ScSubTotalFunc [nCount] : NULL;
+ pSubTotals[i] = nCount > 0 ? new SCCOL [nCount] : NULL;
for (j=0; j<nCount; j++)
{
@@ -184,83 +184,83 @@ ScDBData& ScDBData::operator= (const ScDBData& rData)
USHORT j;
ScRefreshTimer::operator=( rData );
- aName = rData.aName;
- nTable = rData.nTable;
- nStartCol = rData.nStartCol;
- nStartRow = rData.nStartRow;
- nEndCol = rData.nEndCol;
- nEndRow = rData.nEndRow;
- bByRow = rData.bByRow;
- bHasHeader = rData.bHasHeader;
- bDoSize = rData.bDoSize;
- bKeepFmt = rData.bKeepFmt;
- bStripData = rData.bStripData;
- bSortCaseSens = rData.bSortCaseSens;
- bIncludePattern = rData.bIncludePattern;
- bSortInplace = rData.bSortInplace;
- nSortDestTab = rData.nSortDestTab;
- nSortDestCol = rData.nSortDestCol;
- nSortDestRow = rData.nSortDestRow;
- bSortUserDef = rData.bSortUserDef;
- nSortUserIndex = rData.nSortUserIndex;
- aSortLocale = rData.aSortLocale;
- aSortAlgorithm = rData.aSortAlgorithm;
- bQueryInplace = rData.bQueryInplace;
- bQueryCaseSens = rData.bQueryCaseSens;
- bQueryRegExp = rData.bQueryRegExp;
- bQueryDuplicate = rData.bQueryDuplicate;
- nQueryDestTab = rData.nQueryDestTab;
- nQueryDestCol = rData.nQueryDestCol;
- nQueryDestRow = rData.nQueryDestRow;
- bIsAdvanced = rData.bIsAdvanced;
- aAdvSource = rData.aAdvSource;
- bSubRemoveOnly = rData.bSubRemoveOnly;
- bSubReplace = rData.bSubReplace;
- bSubPagebreak = rData.bSubPagebreak;
- bSubCaseSens = rData.bSubCaseSens;
- bSubDoSort = rData.bSubDoSort;
- bSubAscending = rData.bSubAscending;
- bSubIncludePattern = rData.bSubIncludePattern;
- bSubUserDef = rData.bSubUserDef;
- nSubUserIndex = rData.nSubUserIndex;
- bDBImport = rData.bDBImport;
- aDBName = rData.aDBName;
- aDBStatement = rData.aDBStatement;
- bDBNative = rData.bDBNative;
- bDBSelection = rData.bDBSelection;
- bDBSql = rData.bDBSql;
- nDBType = rData.nDBType;
- nIndex = rData.nIndex;
+ aName = rData.aName;
+ nTable = rData.nTable;
+ nStartCol = rData.nStartCol;
+ nStartRow = rData.nStartRow;
+ nEndCol = rData.nEndCol;
+ nEndRow = rData.nEndRow;
+ bByRow = rData.bByRow;
+ bHasHeader = rData.bHasHeader;
+ bDoSize = rData.bDoSize;
+ bKeepFmt = rData.bKeepFmt;
+ bStripData = rData.bStripData;
+ bSortCaseSens = rData.bSortCaseSens;
+ bIncludePattern = rData.bIncludePattern;
+ bSortInplace = rData.bSortInplace;
+ nSortDestTab = rData.nSortDestTab;
+ nSortDestCol = rData.nSortDestCol;
+ nSortDestRow = rData.nSortDestRow;
+ bSortUserDef = rData.bSortUserDef;
+ nSortUserIndex = rData.nSortUserIndex;
+ aSortLocale = rData.aSortLocale;
+ aSortAlgorithm = rData.aSortAlgorithm;
+ bQueryInplace = rData.bQueryInplace;
+ bQueryCaseSens = rData.bQueryCaseSens;
+ bQueryRegExp = rData.bQueryRegExp;
+ bQueryDuplicate = rData.bQueryDuplicate;
+ nQueryDestTab = rData.nQueryDestTab;
+ nQueryDestCol = rData.nQueryDestCol;
+ nQueryDestRow = rData.nQueryDestRow;
+ bIsAdvanced = rData.bIsAdvanced;
+ aAdvSource = rData.aAdvSource;
+ bSubRemoveOnly = rData.bSubRemoveOnly;
+ bSubReplace = rData.bSubReplace;
+ bSubPagebreak = rData.bSubPagebreak;
+ bSubCaseSens = rData.bSubCaseSens;
+ bSubDoSort = rData.bSubDoSort;
+ bSubAscending = rData.bSubAscending;
+ bSubIncludePattern = rData.bSubIncludePattern;
+ bSubUserDef = rData.bSubUserDef;
+ nSubUserIndex = rData.nSubUserIndex;
+ bDBImport = rData.bDBImport;
+ aDBName = rData.aDBName;
+ aDBStatement = rData.aDBStatement;
+ bDBNative = rData.bDBNative;
+ bDBSelection = rData.bDBSelection;
+ bDBSql = rData.bDBSql;
+ nDBType = rData.nDBType;
+ nIndex = rData.nIndex;
bAutoFilter = rData.bAutoFilter;
for (i=0; i<MAXSORT; i++)
{
- bDoSort[i] = rData.bDoSort[i];
- nSortField[i] = rData.nSortField[i];
- bAscending[i] = rData.bAscending[i];
+ bDoSort[i] = rData.bDoSort[i];
+ nSortField[i] = rData.nSortField[i];
+ bAscending[i] = rData.bAscending[i];
}
for (i=0; i<MAXQUERY; i++)
{
- bDoQuery[i] = rData.bDoQuery[i];
- nQueryField[i] = rData.nQueryField[i];
- eQueryOp[i] = rData.eQueryOp[i];
- bQueryByString[i] = rData.bQueryByString[i];
+ bDoQuery[i] = rData.bDoQuery[i];
+ nQueryField[i] = rData.nQueryField[i];
+ eQueryOp[i] = rData.eQueryOp[i];
+ bQueryByString[i] = rData.bQueryByString[i];
bQueryByDate[i] = rData.bQueryByDate[i];
- *pQueryStr[i] = *rData.pQueryStr[i];
- nQueryVal[i] = rData.nQueryVal[i];
- eQueryConnect[i] = rData.eQueryConnect[i];
+ *pQueryStr[i] = *rData.pQueryStr[i];
+ nQueryVal[i] = rData.nQueryVal[i];
+ eQueryConnect[i] = rData.eQueryConnect[i];
}
for (i=0; i<MAXSUBTOTAL; i++)
{
- bDoSubTotal[i] = rData.bDoSubTotal[i];
- nSubField[i] = rData.nSubField[i];
- SCCOL nCount = rData.nSubTotals[i];
- nSubTotals[i] = nCount;
+ bDoSubTotal[i] = rData.bDoSubTotal[i];
+ nSubField[i] = rData.nSubField[i];
+ SCCOL nCount = rData.nSubTotals[i];
+ nSubTotals[i] = nCount;
delete[] pSubTotals[i];
delete[] pFunctions[i];
- pSubTotals[i] = nCount > 0 ? new SCCOL [nCount] : NULL;
+ pSubTotals[i] = nCount > 0 ? new SCCOL [nCount] : NULL;
pFunctions[i] = nCount > 0 ? new ScSubTotalFunc [nCount] : NULL;
for (j=0; j<nCount; j++)
{
@@ -274,13 +274,13 @@ ScDBData& ScDBData::operator= (const ScDBData& rData)
BOOL ScDBData::operator== (const ScDBData& rData) const
{
- // Daten, die nicht in den Params sind
+ // Daten, die nicht in den Params sind
- if ( nTable != rData.nTable ||
- bDoSize != rData.bDoSize ||
- bKeepFmt != rData.bKeepFmt ||
+ if ( nTable != rData.nTable ||
+ bDoSize != rData.bDoSize ||
+ bKeepFmt != rData.bKeepFmt ||
bIsAdvanced!= rData.bIsAdvanced||
- bStripData != rData.bStripData ||
+ bStripData != rData.bStripData ||
// SAB: I think this should be here, but I don't want to break something
// bAutoFilter!= rData.bAutoFilter||
ScRefreshTimer::operator!=( rData )
@@ -392,7 +392,7 @@ void ScDBData::GetArea(ScRange& rRange) const
void ScDBData::SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2)
{
- nTable = nTab;
+ nTable = nTab;
nStartCol = nCol1;
nStartRow = nRow1;
nEndCol = nCol2;
@@ -414,7 +414,7 @@ void ScDBData::MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n
if (nSortField[i] > nSortEnd)
{
nSortField[i] = 0;
- bDoSort[i] = FALSE;
+ bDoSort[i] = FALSE;
}
}
for (i=0; i<MAXQUERY; i++)
@@ -423,7 +423,7 @@ void ScDBData::MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n
if (nQueryField[i] > nCol2)
{
nQueryField[i] = 0;
- bDoQuery[i] = FALSE;
+ bDoQuery[i] = FALSE;
}
}
for (i=0; i<MAXSUBTOTAL; i++)
@@ -453,12 +453,12 @@ void ScDBData::GetSortParam( ScSortParam& rSortParam ) const
rSortParam.nDestCol = nSortDestCol;
rSortParam.nDestRow = nSortDestRow;
rSortParam.bIncludePattern = bIncludePattern;
- rSortParam.bUserDef = bSortUserDef;
+ rSortParam.bUserDef = bSortUserDef;
rSortParam.nUserIndex = nSortUserIndex;
for (USHORT i=0; i<MAXSORT; i++)
{
- rSortParam.bDoSort[i] = bDoSort[i];
- rSortParam.nField[i] = nSortField[i];
+ rSortParam.bDoSort[i] = bDoSort[i];
+ rSortParam.nField[i] = nSortField[i];
rSortParam.bAscending[i] = bAscending[i];
}
rSortParam.aCollatorLocale = aSortLocale;
@@ -477,7 +477,7 @@ void ScDBData::SetSortParam( const ScSortParam& rSortParam )
nSortUserIndex = rSortParam.nUserIndex;
for (USHORT i=0; i<MAXSORT; i++)
{
- bDoSort[i] = rSortParam.bDoSort[i];
+ bDoSort[i] = rSortParam.bDoSort[i];
nSortField[i] = rSortParam.nField[i];
bAscending[i] = rSortParam.bAscending[i];
}
@@ -527,8 +527,8 @@ void ScDBData::SetQueryParam(const ScQueryParam& rQueryParam)
!rQueryParam.GetEntry(MAXQUERY).bDoQuery,
"zuviele Eintraege bei ScDBData::SetQueryParam" );
- // set bIsAdvanced to FALSE for everything that is not from the
- // advanced filter dialog
+ // set bIsAdvanced to FALSE for everything that is not from the
+ // advanced filter dialog
bIsAdvanced = FALSE;
bQueryInplace = rQueryParam.bInplace;
@@ -580,20 +580,20 @@ void ScDBData::GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const
rSubTotalParam.nCol2 = nEndCol;
rSubTotalParam.nRow2 = nEndRow;
- rSubTotalParam.bRemoveOnly = bSubRemoveOnly;
- rSubTotalParam.bReplace = bSubReplace;
- rSubTotalParam.bPagebreak = bSubPagebreak;
- rSubTotalParam.bCaseSens = bSubCaseSens;
- rSubTotalParam.bDoSort = bSubDoSort;
- rSubTotalParam.bAscending = bSubAscending;
- rSubTotalParam.bIncludePattern = bSubIncludePattern;
- rSubTotalParam.bUserDef = bSubUserDef;
- rSubTotalParam.nUserIndex = nSubUserIndex;
+ rSubTotalParam.bRemoveOnly = bSubRemoveOnly;
+ rSubTotalParam.bReplace = bSubReplace;
+ rSubTotalParam.bPagebreak = bSubPagebreak;
+ rSubTotalParam.bCaseSens = bSubCaseSens;
+ rSubTotalParam.bDoSort = bSubDoSort;
+ rSubTotalParam.bAscending = bSubAscending;
+ rSubTotalParam.bIncludePattern = bSubIncludePattern;
+ rSubTotalParam.bUserDef = bSubUserDef;
+ rSubTotalParam.nUserIndex = nSubUserIndex;
for (i=0; i<MAXSUBTOTAL; i++)
{
- rSubTotalParam.bGroupActive[i] = bDoSubTotal[i];
- rSubTotalParam.nField[i] = nSubField[i];
+ rSubTotalParam.bGroupActive[i] = bDoSubTotal[i];
+ rSubTotalParam.nField[i] = nSubField[i];
SCCOL nCount = nSubTotals[i];
rSubTotalParam.nSubTotals[i] = nCount;
@@ -615,26 +615,26 @@ void ScDBData::SetSubTotalParam(const ScSubTotalParam& rSubTotalParam)
USHORT i;
USHORT j;
- bSubRemoveOnly = rSubTotalParam.bRemoveOnly;
- bSubReplace = rSubTotalParam.bReplace;
- bSubPagebreak = rSubTotalParam.bPagebreak;
- bSubCaseSens = rSubTotalParam.bCaseSens;
- bSubDoSort = rSubTotalParam.bDoSort;
- bSubAscending = rSubTotalParam.bAscending;
- bSubIncludePattern = rSubTotalParam.bIncludePattern;
- bSubUserDef = rSubTotalParam.bUserDef;
- nSubUserIndex = rSubTotalParam.nUserIndex;
+ bSubRemoveOnly = rSubTotalParam.bRemoveOnly;
+ bSubReplace = rSubTotalParam.bReplace;
+ bSubPagebreak = rSubTotalParam.bPagebreak;
+ bSubCaseSens = rSubTotalParam.bCaseSens;
+ bSubDoSort = rSubTotalParam.bDoSort;
+ bSubAscending = rSubTotalParam.bAscending;
+ bSubIncludePattern = rSubTotalParam.bIncludePattern;
+ bSubUserDef = rSubTotalParam.bUserDef;
+ nSubUserIndex = rSubTotalParam.nUserIndex;
for (i=0; i<MAXSUBTOTAL; i++)
{
- bDoSubTotal[i] = rSubTotalParam.bGroupActive[i];
- nSubField[i] = rSubTotalParam.nField[i];
+ bDoSubTotal[i] = rSubTotalParam.bGroupActive[i];
+ nSubField[i] = rSubTotalParam.nField[i];
SCCOL nCount = rSubTotalParam.nSubTotals[i];
nSubTotals[i] = nCount;
delete[] pSubTotals[i];
delete[] pFunctions[i];
- pSubTotals[i] = nCount > 0 ? new SCCOL [nCount] : NULL;
+ pSubTotals[i] = nCount > 0 ? new SCCOL [nCount] : NULL;
pFunctions[i] = nCount > 0 ? new ScSubTotalFunc [nCount] : NULL;
for (j=0; j<nCount; j++)
{
@@ -651,22 +651,22 @@ void ScDBData::GetImportParam(ScImportParam& rImportParam) const
rImportParam.nCol2 = nEndCol;
rImportParam.nRow2 = nEndRow;
- rImportParam.bImport = bDBImport;
- rImportParam.aDBName = aDBName;
- rImportParam.aStatement = aDBStatement;
- rImportParam.bNative = bDBNative;
- rImportParam.bSql = bDBSql;
- rImportParam.nType = nDBType;
+ rImportParam.bImport = bDBImport;
+ rImportParam.aDBName = aDBName;
+ rImportParam.aStatement = aDBStatement;
+ rImportParam.bNative = bDBNative;
+ rImportParam.bSql = bDBSql;
+ rImportParam.nType = nDBType;
}
void ScDBData::SetImportParam(const ScImportParam& rImportParam)
{
- bDBImport = rImportParam.bImport;
- aDBName = rImportParam.aDBName;
- aDBStatement = rImportParam.aStatement;
- bDBNative = rImportParam.bNative;
- bDBSql = rImportParam.bSql;
- nDBType = rImportParam.nType;
+ bDBImport = rImportParam.bImport;
+ aDBName = rImportParam.aDBName;
+ aDBStatement = rImportParam.aStatement;
+ bDBNative = rImportParam.bNative;
+ bDBSql = rImportParam.bSql;
+ nDBType = rImportParam.nType;
}
BOOL ScDBData::IsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly) const
@@ -690,14 +690,14 @@ BOOL ScDBData::IsDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCR
&& (nCol2 == nEndCol) && (nRow2 == nEndRow));
}
-ScDataObject* ScDBData::Clone() const
+ScDataObject* ScDBData::Clone() const
{
return new ScDBData(*this);
}
//---------------------------------------------------------------------------------------
-// Compare zum Sortieren
+// Compare zum Sortieren
short ScDBCollection::Compare(ScDataObject* pKey1, ScDataObject* pKey2) const
{
@@ -706,7 +706,7 @@ short ScDBCollection::Compare(ScDataObject* pKey1, ScDataObject* pKey2) const
return (short) ScGlobal::GetpTransliteration()->compareString( rStr1, rStr2 );
}
-// IsEqual - alles gleich
+// IsEqual - alles gleich
BOOL ScDBCollection::IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const
{
@@ -730,7 +730,7 @@ ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL
return pDB;
}
}
- return pNoNameData; // "unbenannt" nur zurueck, wenn sonst nichts gefunden
+ return pNoNameData; // "unbenannt" nur zurueck, wenn sonst nichts gefunden
}
ScDBData* ScDBCollection::GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const
@@ -750,7 +750,7 @@ ScDBData* ScDBCollection::GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCO
return pDB;
}
}
- return pNoNameData; // "unbenannt" nur zurueck, wenn sonst nichts gefunden
+ return pNoNameData; // "unbenannt" nur zurueck, wenn sonst nichts gefunden
}
BOOL ScDBCollection::SearchName( const String& rName, USHORT& rIndex ) const
@@ -811,40 +811,40 @@ void ScDBCollection::UpdateReference(UpdateRefMode eUpdateRefMode,
aAdvSource.aEnd.Set( theCol2,theRow2,theTab2 );
((ScDBData*)pItems[i])->SetAdvancedQuerySource( &aAdvSource );
- bDoUpdate = TRUE; // DBData is modified
+ bDoUpdate = TRUE; // DBData is modified
}
}
((ScDBData*)pItems[i])->SetModified(bDoUpdate);
- //! Testen, ob mitten aus dem Bereich geloescht/eingefuegt wurde !!!
+ //! Testen, ob mitten aus dem Bereich geloescht/eingefuegt wurde !!!
}
}
void ScDBCollection::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos )
{
- // wenn nOldPos vor nNewPos liegt, ist nNewPos schon angepasst
+ // wenn nOldPos vor nNewPos liegt, ist nNewPos schon angepasst
for (USHORT i=0; i<nCount; i++)
{
ScRange aRange;
ScDBData* pData = (ScDBData*)pItems[i];
pData->GetArea( aRange );
- SCTAB nTab = aRange.aStart.Tab(); // hat nur eine Tabelle
+ SCTAB nTab = aRange.aStart.Tab(); // hat nur eine Tabelle
- // anpassen wie die aktuelle Tabelle bei ScTablesHint (tabvwsh5.cxx)
+ // anpassen wie die aktuelle Tabelle bei ScTablesHint (tabvwsh5.cxx)
- if ( nTab == nOldPos ) // verschobene Tabelle
+ if ( nTab == nOldPos ) // verschobene Tabelle
nTab = nNewPos;
- else if ( nOldPos < nNewPos ) // nach hinten verschoben
+ else if ( nOldPos < nNewPos ) // nach hinten verschoben
{
- if ( nTab > nOldPos && nTab <= nNewPos ) // nachrueckender Bereich
+ if ( nTab > nOldPos && nTab <= nNewPos ) // nachrueckender Bereich
--nTab;
}
- else // nach vorne verschoben
+ else // nach vorne verschoben
{
- if ( nTab >= nNewPos && nTab < nOldPos ) // nachrueckender Bereich
+ if ( nTab >= nNewPos && nTab < nOldPos ) // nachrueckender Bereich
++nTab;
}
@@ -853,7 +853,7 @@ void ScDBCollection::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos )
pData->SetArea( nTab, aRange.aStart.Col(), aRange.aStart.Row(),
aRange.aEnd.Col(),aRange.aEnd .Row() );
- // MoveTo ist nicht noetig, wenn nur die Tabelle geaendert ist
+ // MoveTo ist nicht noetig, wenn nur die Tabelle geaendert ist
pData->SetModified(bChanged);
}
@@ -875,7 +875,7 @@ ScDBData* ScDBCollection::FindIndex(USHORT nIndex)
BOOL ScDBCollection::Insert(ScDataObject* pScDataObject)
{
ScDBData* pData = (ScDBData*) pScDataObject;
- if (!pData->GetIndex()) // schon gesetzt?
+ if (!pData->GetIndex()) // schon gesetzt?
pData->SetIndex(nEntryIndex++);
BOOL bInserted = ScSortedCollection::Insert(pScDataObject);
if ( bInserted && pData->HasImportParam() && !pData->HasImportSelection() )
diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx
index 977161760eb0..b3959f79c7c2 100644
--- a/sc/source/core/tool/ddelink.cxx
+++ b/sc/source/core/tool/ddelink.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
TYPEINIT2(ScDdeLink,::sfx2::SvBaseLink,SfxBroadcaster);
-#define DDE_TXT_ENCODING gsl_getSystemTextEncoding()
+#define DDE_TXT_ENCODING gsl_getSystemTextEncoding()
BOOL ScDdeLink::bIsInUpdate = FALSE;
@@ -76,13 +76,13 @@ __EXPORT ScDdeLink::~ScDdeLink()
ScDdeLink::ScDdeLink( ScDocument* pD, const ScDdeLink& rOther ) :
::sfx2::SvBaseLink(sfx2::LINKUPDATE_ALWAYS,FORMAT_STRING),
- pDoc ( pD ),
- aAppl ( rOther.aAppl ),
- aTopic ( rOther.aTopic ),
- aItem ( rOther.aItem ),
- nMode ( rOther.nMode ),
+ pDoc ( pD ),
+ aAppl ( rOther.aAppl ),
+ aTopic ( rOther.aTopic ),
+ aItem ( rOther.aItem ),
+ nMode ( rOther.nMode ),
bNeedUpdate( FALSE ),
- pResult ( NULL )
+ pResult ( NULL )
{
if (rOther.pResult)
pResult = rOther.pResult->Clone();
@@ -106,7 +106,7 @@ ScDdeLink::ScDdeLink( ScDocument* pD, SvStream& rStream, ScMultipleReadHeader& r
if ( bHasValue )
pResult = new ScMatrix( rStream );
- if (rHdr.BytesLeft()) // neu in 388b und der 364w (RealTime-Client) Version
+ if (rHdr.BytesLeft()) // neu in 388b und der 364w (RealTime-Client) Version
rStream >> nMode;
else
nMode = SC_DDE_DEFAULT;
@@ -128,11 +128,11 @@ void ScDdeLink::Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const
if (bHasValue)
pResult->Store( rStream );
- if( rStream.GetVersion() > SOFFICE_FILEFORMAT_40 ) // nicht bei 4.0 Export
- rStream << nMode; // seit 388b
+ if( rStream.GetVersion() > SOFFICE_FILEFORMAT_40 ) // nicht bei 4.0 Export
+ rStream << nMode; // seit 388b
- // Links mit Mode != SC_DDE_DEFAULT werden bei 4.0 Export komplett weggelassen
- // (aus ScDocument::SaveDdeLinks)
+ // Links mit Mode != SC_DDE_DEFAULT werden bei 4.0 Export komplett weggelassen
+ // (aus ScDocument::SaveDdeLinks)
rHdr.EndEntry();
}
@@ -140,7 +140,7 @@ void ScDdeLink::Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const
void __EXPORT ScDdeLink::DataChanged( const String& rMimeType,
const ::com::sun::star::uno::Any & rValue )
{
- // wir koennen nur Strings...
+ // wir koennen nur Strings...
if ( FORMAT_STRING != SotExchange::GetFormatIdFromMimeType( rMimeType ))
return;
@@ -148,14 +148,14 @@ void __EXPORT ScDdeLink::DataChanged( const String& rMimeType,
ScByteSequenceToString::GetString( aLinkStr, rValue, DDE_TXT_ENCODING );
aLinkStr.ConvertLineEnd(LINEEND_LF);
- // wenn String mit Zeilenende aufhoert, streichen:
+ // wenn String mit Zeilenende aufhoert, streichen:
xub_StrLen nLen = aLinkStr.Len();
if (nLen && aLinkStr.GetChar(nLen-1) == '\n')
aLinkStr.Erase(nLen-1);
String aLine;
- SCSIZE nCols = 1; // Leerstring -> eine leere Zelle
+ SCSIZE nCols = 1; // Leerstring -> eine leere Zelle
SCSIZE nRows = 1;
if (aLinkStr.Len())
{
@@ -165,25 +165,25 @@ void __EXPORT ScDdeLink::DataChanged( const String& rMimeType,
nCols = static_cast<SCSIZE>(aLine.GetTokenCount( '\t' ));
}
- if (!nRows || !nCols) // keine Daten
+ if (!nRows || !nCols) // keine Daten
{
pResult.Clear();
}
- else // Daten aufteilen
+ else // Daten aufteilen
{
- // Matrix immer neu anlegen, damit bIsString nicht durcheinanderkommt
+ // Matrix immer neu anlegen, damit bIsString nicht durcheinanderkommt
pResult = new ScMatrix( nCols, nRows );
SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
- // nMode bestimmt, wie der Text interpretiert wird (#44455#/#49783#):
- // SC_DDE_DEFAULT - Zahlformat aus Zellvorlage "Standard"
- // SC_DDE_ENGLISH - Standard-Zahlformat fuer English/US
- // SC_DDE_TEXT - ohne NumberFormatter direkt als String
+ // nMode bestimmt, wie der Text interpretiert wird (#44455#/#49783#):
+ // SC_DDE_DEFAULT - Zahlformat aus Zellvorlage "Standard"
+ // SC_DDE_ENGLISH - Standard-Zahlformat fuer English/US
+ // SC_DDE_TEXT - ohne NumberFormatter direkt als String
ULONG nStdFormat = 0;
if ( nMode == SC_DDE_DEFAULT )
{
- ScPatternAttr* pDefPattern = pDoc->GetDefPattern(); // enthaelt Standard-Vorlage
+ ScPatternAttr* pDefPattern = pDoc->GetDefPattern(); // enthaelt Standard-Vorlage
if ( pDefPattern )
nStdFormat = pDefPattern->GetNumberFormat( pFormatter );
}
@@ -207,22 +207,22 @@ void __EXPORT ScDdeLink::DataChanged( const String& rMimeType,
}
}
- // Es hat sich was getan...
+ // Es hat sich was getan...
if (HasListeners())
{
Broadcast( ScHint( SC_HINT_DATACHANGED, ScAddress(), NULL ) );
- pDoc->TrackFormulas(); // muss sofort passieren
+ pDoc->TrackFormulas(); // muss sofort passieren
pDoc->StartTrackTimer();
- // StartTrackTimer ruft asynchron TrackFormulas, Broadcast(FID_DATACHANGED),
- // ResetChanged, SetModified und Invalidate(SID_SAVEDOC/SID_DOC_MODIFIED)
- // TrackFormulas zusaetzlich nochmal sofort, damit nicht z.B. durch IdleCalc
- // eine Formel berechnet wird, die noch im FormulaTrack steht (#61676#)
+ // StartTrackTimer ruft asynchron TrackFormulas, Broadcast(FID_DATACHANGED),
+ // ResetChanged, SetModified und Invalidate(SID_SAVEDOC/SID_DOC_MODIFIED)
+ // TrackFormulas zusaetzlich nochmal sofort, damit nicht z.B. durch IdleCalc
+ // eine Formel berechnet wird, die noch im FormulaTrack steht (#61676#)
- // notify Uno objects (for XRefreshListener)
- // must be after TrackFormulas
- //! do this asynchronously?
+ // notify Uno objects (for XRefreshListener)
+ // must be after TrackFormulas
+ //! do this asynchronously?
ScLinkRefreshedHint aHint;
aHint.SetDdeLink( aAppl, aTopic, aItem, nMode );
pDoc->BroadcastUno( aHint );
@@ -233,8 +233,8 @@ void ScDdeLink::ResetValue()
{
pResult.Clear();
- // Es hat sich was getan...
- // Tracking, FID_DATACHANGED etc. passiert von aussen
+ // Es hat sich was getan...
+ // Tracking, FID_DATACHANGED etc. passiert von aussen
if (HasListeners())
Broadcast( ScHint( SC_HINT_DATACHANGED, ScAddress(), NULL ) );
@@ -243,16 +243,16 @@ void ScDdeLink::ResetValue()
void __EXPORT ScDdeLink::ListenersGone()
{
BOOL bWas = bIsInUpdate;
- bIsInUpdate = TRUE; // Remove() kann Reschedule ausloesen??!?
+ bIsInUpdate = TRUE; // Remove() kann Reschedule ausloesen??!?
- ScDocument* pStackDoc = pDoc; // member pDoc can't be used after removing the link
+ ScDocument* pStackDoc = pDoc; // member pDoc can't be used after removing the link
sfx2::LinkManager* pLinkMgr = pDoc->GetLinkManager();
- pLinkMgr->Remove( this); // deletes this
+ pLinkMgr->Remove( this); // deletes this
- if ( !pLinkMgr->GetLinks().Count() ) // letzten geloescht ?
+ if ( !pLinkMgr->GetLinks().Count() ) // letzten geloescht ?
{
- SfxBindings* pBindings = pStackDoc->GetViewBindings(); // don't use member pDoc!
+ SfxBindings* pBindings = pStackDoc->GetViewBindings(); // don't use member pDoc!
if (pBindings)
pBindings->Invalidate( SID_LINKS );
}
@@ -263,11 +263,11 @@ void __EXPORT ScDdeLink::ListenersGone()
void ScDdeLink::TryUpdate()
{
if (bIsInUpdate)
- bNeedUpdate = TRUE; // kann jetzt nicht ausgefuehrt werden
+ bNeedUpdate = TRUE; // kann jetzt nicht ausgefuehrt werden
else
{
bIsInUpdate = TRUE;
- //Application::Reschedule(); //! OS/2-Simulation
+ //Application::Reschedule(); //! OS/2-Simulation
pDoc->IncInDdeLinkUpdate();
Update();
pDoc->DecInDdeLinkUpdate();
diff --git a/sc/source/core/tool/detdata.cxx b/sc/source/core/tool/detdata.cxx
index a1add9ca6939..619a0c335c8b 100644
--- a/sc/source/core/tool/detdata.cxx
+++ b/sc/source/core/tool/detdata.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +107,8 @@ BOOL ScDetOpList::operator==( const ScDetOpList& r ) const
USHORT nCount = Count();
BOOL bEqual = ( nCount == r.Count() );
- for (USHORT i=0; i<nCount && bEqual; i++) // Reihenfolge muss auch gleich sein
- if ( !(*(*this)[i] == *r[i]) ) // Eintraege unterschiedlich ?
+ for (USHORT i=0; i<nCount && bEqual; i++) // Reihenfolge muss auch gleich sein
+ if ( !(*(*this)[i] == *r[i]) ) // Eintraege unterschiedlich ?
bEqual = FALSE;
return bEqual;
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index e86bb22646c8..b1045922c565 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +82,11 @@
// #99319# line ends are now created with an empty name.
// The checkForUniqueItem method then finds a unique name for the item's value.
-#define SC_LINEEND_NAME EMPTY_STRING
+#define SC_LINEEND_NAME EMPTY_STRING
//------------------------------------------------------------------------
-enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
+enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
DET_INS_CONTINUE,
DET_INS_INSERTED,
DET_INS_EMPTY,
@@ -98,24 +98,24 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Leve
class ScDetectiveData
{
private:
- SfxItemSet aBoxSet;
- SfxItemSet aArrowSet;
- SfxItemSet aToTabSet;
- SfxItemSet aFromTabSet;
- SfxItemSet aCircleSet; //! einzeln ?
- USHORT nMaxLevel;
+ SfxItemSet aBoxSet;
+ SfxItemSet aArrowSet;
+ SfxItemSet aToTabSet;
+ SfxItemSet aFromTabSet;
+ SfxItemSet aCircleSet; //! einzeln ?
+ USHORT nMaxLevel;
public:
ScDetectiveData( SdrModel* pModel );
- SfxItemSet& GetBoxSet() { return aBoxSet; }
- SfxItemSet& GetArrowSet() { return aArrowSet; }
- SfxItemSet& GetToTabSet() { return aToTabSet; }
- SfxItemSet& GetFromTabSet() { return aFromTabSet; }
- SfxItemSet& GetCircleSet() { return aCircleSet; }
+ SfxItemSet& GetBoxSet() { return aBoxSet; }
+ SfxItemSet& GetArrowSet() { return aArrowSet; }
+ SfxItemSet& GetToTabSet() { return aToTabSet; }
+ SfxItemSet& GetFromTabSet() { return aFromTabSet; }
+ SfxItemSet& GetCircleSet() { return aCircleSet; }
- void SetMaxLevel( USHORT nVal ) { nMaxLevel = nVal; }
- USHORT GetMaxLevel() const { return nMaxLevel; }
+ void SetMaxLevel( USHORT nVal ) { nMaxLevel = nVal; }
+ USHORT GetMaxLevel() const { return nMaxLevel; }
};
class ScCommentData
@@ -123,11 +123,11 @@ class ScCommentData
public:
ScCommentData( ScDocument& rDoc, SdrModel* pModel );
- SfxItemSet& GetCaptionSet() { return aCaptionSet; }
- void UpdateCaptionSet( const SfxItemSet& rItemSet );
+ SfxItemSet& GetCaptionSet() { return aCaptionSet; }
+ void UpdateCaptionSet( const SfxItemSet& rItemSet );
private:
- SfxItemSet aCaptionSet;
+ SfxItemSet aCaptionSet;
};
//------------------------------------------------------------------------
@@ -160,8 +160,8 @@ ScDetectiveData::ScDetectiveData( SdrModel* pModel ) :
aBoxSet.Put( XLineColorItem( EMPTY_STRING, Color( ScDetectiveFunc::GetArrowColor() ) ) );
aBoxSet.Put( XFillStyleItem( XFILL_NONE ) );
- // #66479# Standard-Linienenden (wie aus XLineEndList::Create) selber zusammenbasteln,
- // um von den konfigurierten Linienenden unabhaengig zu sein
+ // #66479# Standard-Linienenden (wie aus XLineEndList::Create) selber zusammenbasteln,
+ // um von den konfigurierten Linienenden unabhaengig zu sein
basegfx::B2DPolygon aTriangle;
aTriangle.append(basegfx::B2DPoint(10.0, 0.0));
@@ -204,7 +204,7 @@ ScDetectiveData::ScDetectiveData( SdrModel* pModel ) :
aCircleSet.Put( XLineColorItem( String(), Color( ScDetectiveFunc::GetErrorColor() ) ) );
aCircleSet.Put( XFillStyleItem( XFILL_NONE ) );
- USHORT nWidth = 55; // 54 = 1 Pixel
+ USHORT nWidth = 55; // 54 = 1 Pixel
aCircleSet.Put( XLineWidthItem( nWidth ) );
}
@@ -226,15 +226,15 @@ ScCommentData::ScCommentData( ScDocument& rDoc, SdrModel* pModel ) :
Color aYellow( ScDetectiveFunc::GetCommentColor() );
aCaptionSet.Put( XFillColorItem( String(), aYellow ) );
- // shadow
- // SdrShadowItem has FALSE, instead the shadow is set for the rectangle
- // only with SetSpecialTextBoxShadow when the object is created
- // (item must be set to adjust objects from older files)
+ // shadow
+ // SdrShadowItem has FALSE, instead the shadow is set for the rectangle
+ // only with SetSpecialTextBoxShadow when the object is created
+ // (item must be set to adjust objects from older files)
aCaptionSet.Put( SdrShadowItem( FALSE ) );
aCaptionSet.Put( SdrShadowXDistItem( 100 ) );
aCaptionSet.Put( SdrShadowYDistItem( 100 ) );
- // text attributes
+ // text attributes
aCaptionSet.Put( SdrTextLeftDistItem( 100 ) );
aCaptionSet.Put( SdrTextRightDistItem( 100 ) );
aCaptionSet.Put( SdrTextUpperDistItem( 100 ) );
@@ -243,8 +243,8 @@ ScCommentData::ScCommentData( ScDocument& rDoc, SdrModel* pModel ) :
aCaptionSet.Put( SdrTextAutoGrowWidthItem( FALSE ) );
aCaptionSet.Put( SdrTextAutoGrowHeightItem( TRUE ) );
- // #78943# do use the default cell style, so the user has a chance to
- // modify the font for the annotations
+ // #78943# do use the default cell style, so the user has a chance to
+ // modify the font for the annotations
((const ScPatternAttr&)rDoc.GetPool()->GetDefaultItem(ATTR_PATTERN)).
FillEditItemSet( &aCaptionSet );
@@ -386,7 +386,7 @@ Rectangle ScDetectiveFunc::GetDrawRect( SCCOL nCol, SCROW nRow ) const
BOOL lcl_IsOtherTab( const basegfx::B2DPolyPolygon& rPolyPolygon )
{
- // test if rPolygon is the line end for "other table" (rectangle)
+ // test if rPolygon is the line end for "other table" (rectangle)
if(1L == rPolyPolygon.count())
{
const basegfx::B2DPolygon aSubPoly(rPolyPolygon.getB2DPolygon(0L));
@@ -454,7 +454,7 @@ BOOL ScDetectiveFunc::HasArrow( const ScAddress& rStart,
return bFound;
}
-BOOL ScDetectiveFunc::IsNonAlienArrow( SdrObject* pObject ) // static
+BOOL ScDetectiveFunc::IsNonAlienArrow( SdrObject* pObject ) // static
{
if ( pObject->GetLayer()==SC_LAYER_INTERN &&
pObject->IsPolyObj() && pObject->GetPointCount()==2 )
@@ -474,7 +474,7 @@ BOOL ScDetectiveFunc::IsNonAlienArrow( SdrObject* pObject ) // static
//------------------------------------------------------------------------
-// InsertXXX: called from DrawEntry/DrawAlienEntry and InsertObject
+// InsertXXX: called from DrawEntry/DrawAlienEntry and InsertObject
BOOL ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow,
SCCOL nRefStartCol, SCROW nRefStartRow,
@@ -505,7 +505,7 @@ BOOL ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow,
pData->maEnd.Set( nRefEndCol, nRefEndRow, nTab);
}
- Point aStartPos = GetDrawPos( nRefStartCol, nRefStartRow, DRAWPOS_DETARROW );
+ Point aStartPos = GetDrawPos( nRefStartCol, nRefStartRow, DRAWPOS_DETARROW );
Point aEndPos = GetDrawPos( nCol, nRow, DRAWPOS_DETARROW );
if (bFromOtherTab)
@@ -523,9 +523,9 @@ BOOL ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow,
SfxItemSet& rAttrSet = bFromOtherTab ? rData.GetFromTabSet() : rData.GetArrowSet();
if (bArea && !bFromOtherTab)
- rAttrSet.Put( XLineWidthItem( 50 ) ); // Bereich
+ rAttrSet.Put( XLineWidthItem( 50 ) ); // Bereich
else
- rAttrSet.Put( XLineWidthItem( 0 ) ); // einzelne Referenz
+ rAttrSet.Put( XLineWidthItem( 0 ) ); // einzelne Referenz
ColorData nColorData = ( bRed ? GetErrorColor() : GetArrowColor() );
rAttrSet.Put( XLineColorItem( String(), Color( nColorData ) ) );
@@ -534,7 +534,7 @@ BOOL ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow,
aTempPoly.append(basegfx::B2DPoint(aStartPos.X(), aStartPos.Y()));
aTempPoly.append(basegfx::B2DPoint(aEndPos.X(), aEndPos.Y()));
SdrPathObj* pArrow = new SdrPathObj(OBJ_LINE, basegfx::B2DPolyPolygon(aTempPoly));
- pArrow->NbcSetLogicRect(Rectangle(aStartPos,aEndPos)); //! noetig ???
+ pArrow->NbcSetLogicRect(Rectangle(aStartPos,aEndPos)); //! noetig ???
pArrow->SetMergedItemSetAndBroadcast(rAttrSet);
ScDrawLayer::SetAnchor( pArrow, SCA_CELL );
@@ -582,16 +582,16 @@ BOOL ScDetectiveFunc::InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow,
BOOL bNegativePage = pDoc->IsNegativePage( nTab );
long nPageSign = bNegativePage ? -1 : 1;
- Point aStartPos = GetDrawPos( nStartCol, nStartRow, DRAWPOS_DETARROW );
+ Point aStartPos = GetDrawPos( nStartCol, nStartRow, DRAWPOS_DETARROW );
Point aEndPos = Point( aStartPos.X() + 1000 * nPageSign, aStartPos.Y() - 1000 );
if (aEndPos.Y() < 0)
aEndPos.Y() += 2000;
SfxItemSet& rAttrSet = rData.GetToTabSet();
if (bArea)
- rAttrSet.Put( XLineWidthItem( 50 ) ); // Bereich
+ rAttrSet.Put( XLineWidthItem( 50 ) ); // Bereich
else
- rAttrSet.Put( XLineWidthItem( 0 ) ); // einzelne Referenz
+ rAttrSet.Put( XLineWidthItem( 0 ) ); // einzelne Referenz
ColorData nColorData = ( bRed ? GetErrorColor() : GetArrowColor() );
rAttrSet.Put( XLineColorItem( String(), Color( nColorData ) ) );
@@ -600,7 +600,7 @@ BOOL ScDetectiveFunc::InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow,
aTempPoly.append(basegfx::B2DPoint(aStartPos.X(), aStartPos.Y()));
aTempPoly.append(basegfx::B2DPoint(aEndPos.X(), aEndPos.Y()));
SdrPathObj* pArrow = new SdrPathObj(OBJ_LINE, basegfx::B2DPolyPolygon(aTempPoly));
- pArrow->NbcSetLogicRect(Rectangle(aStartPos,aEndPos)); //! noetig ???
+ pArrow->NbcSetLogicRect(Rectangle(aStartPos,aEndPos)); //! noetig ???
pArrow->SetMergedItemSetAndBroadcast(rAttrSet);
@@ -619,12 +619,12 @@ BOOL ScDetectiveFunc::InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow,
//------------------------------------------------------------------------
-// DrawEntry: Formel auf dieser Tabelle,
-// Referenz auf dieser oder anderer
-// DrawAlienEntry: Formel auf anderer Tabelle,
-// Referenz auf dieser
+// DrawEntry: Formel auf dieser Tabelle,
+// Referenz auf dieser oder anderer
+// DrawAlienEntry: Formel auf anderer Tabelle,
+// Referenz auf dieser
-// return FALSE: da war schon ein Pfeil
+// return FALSE: da war schon ein Pfeil
BOOL ScDetectiveFunc::DrawEntry( SCCOL nCol, SCROW nRow,
const ScRange& rRef,
@@ -663,10 +663,10 @@ void ScDetectiveFunc::DrawCircle( SCCOL nCol, SCROW nRow, ScDetectiveData& rData
SdrPage* pPage = pModel->GetPage(static_cast<sal_uInt16>(nTab));
Rectangle aRect = GetDrawRect( nCol, nRow );
- aRect.Left() -= 250;
- aRect.Right() += 250;
- aRect.Top() -= 70;
- aRect.Bottom() += 70;
+ aRect.Left() -= 250;
+ aRect.Right() += 250;
+ aRect.Top() -= 70;
+ aRect.Bottom() += 70;
SdrCircObj* pCircle = new SdrCircObj( OBJ_CIRC, aRect );
SfxItemSet& rAttrSet = rData.GetCircleSet();
@@ -695,8 +695,8 @@ void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW nRow, BOOL bDestPnt )
pPage->RecalcObjOrdNums();
- long nDelCount = 0;
- ULONG nObjCount = pPage->GetObjCount();
+ long nDelCount = 0;
+ ULONG nObjCount = pPage->GetObjCount();
if (nObjCount)
{
SdrObject** ppObj = new SdrObject*[nObjCount];
@@ -708,7 +708,7 @@ void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW nRow, BOOL bDestPnt )
if ( pObject->GetLayer()==SC_LAYER_INTERN &&
pObject->IsPolyObj() && pObject->GetPointCount()==2 )
{
- if (aRect.IsInside(pObject->GetPoint(bDestPnt))) // Start/Zielpunkt
+ if (aRect.IsInside(pObject->GetPoint(bDestPnt))) // Start/Zielpunkt
ppObj[nDelCount++] = pObject;
}
@@ -728,9 +728,9 @@ void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW nRow, BOOL bDestPnt )
}
}
- // Box um Referenz loeschen
+ // Box um Referenz loeschen
-#define SC_DET_TOLERANCE 50
+#define SC_DET_TOLERANCE 50
inline BOOL RectIsPoints( const Rectangle& rRect, const Point& rStart, const Point& rEnd )
{
@@ -748,7 +748,7 @@ inline BOOL RectIsPoints( const Rectangle& rRect, const Point& rStart, const Poi
void ScDetectiveFunc::DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 )
{
-/* String aStr;
+/* String aStr;
aStr += nCol1;
aStr += '/';
aStr += nRow1;
@@ -770,8 +770,8 @@ void ScDetectiveFunc::DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nR
pPage->RecalcObjOrdNums();
- long nDelCount = 0;
- ULONG nObjCount = pPage->GetObjCount();
+ long nDelCount = 0;
+ ULONG nObjCount = pPage->GetObjCount();
if (nObjCount)
{
SdrObject** ppObj = new SdrObject*[nObjCount];
@@ -853,7 +853,7 @@ USHORT ScDetectiveFunc::InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData
return DET_INS_CIRCULAR;
if (pFCell->GetDirty())
- pFCell->Interpret(); // nach SetRunning geht's nicht mehr!
+ pFCell->Interpret(); // nach SetRunning geht's nicht mehr!
pFCell->SetRunning(TRUE);
USHORT nResult = DET_INS_EMPTY;
@@ -864,11 +864,11 @@ USHORT ScDetectiveFunc::InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData
{
if (DrawEntry( nCol, nRow, aRef, rData ))
{
- nResult = DET_INS_INSERTED; // neuer Pfeil eingetragen
+ nResult = DET_INS_INSERTED; // neuer Pfeil eingetragen
}
else
{
- // weiterverfolgen
+ // weiterverfolgen
if ( nLevel < rData.GetMaxLevel() )
{
@@ -896,7 +896,7 @@ USHORT ScDetectiveFunc::InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData
// DET_INS_EMPTY: unveraendert lassen
}
}
- else // nMaxLevel erreicht
+ else // nMaxLevel erreicht
if (nResult != DET_INS_INSERTED)
nResult = DET_INS_CONTINUE;
}
@@ -928,7 +928,7 @@ USHORT ScDetectiveFunc::FindPredLevelArea( const ScRange& rRef,
return nResult;
}
- // nDeleteLevel != 0 -> loeschen
+ // nDeleteLevel != 0 -> loeschen
USHORT ScDetectiveFunc::FindPredLevel( SCCOL nCol, SCROW nRow, USHORT nLevel, USHORT nDeleteLevel )
{
@@ -946,7 +946,7 @@ USHORT ScDetectiveFunc::FindPredLevel( SCCOL nCol, SCROW nRow, USHORT nLevel, US
return nLevel;
if (pFCell->GetDirty())
- pFCell->Interpret(); // nach SetRunning geht's nicht mehr!
+ pFCell->Interpret(); // nach SetRunning geht's nicht mehr!
pFCell->SetRunning(TRUE);
USHORT nResult = nLevel;
@@ -954,7 +954,7 @@ USHORT ScDetectiveFunc::FindPredLevel( SCCOL nCol, SCROW nRow, USHORT nLevel, US
if ( bDelete )
{
- DeleteArrowsAt( nCol, nRow, TRUE ); // Pfeile, die hierher zeigen
+ DeleteArrowsAt( nCol, nRow, TRUE ); // Pfeile, die hierher zeigen
}
ScDetectiveRefIter aIter( (ScFormulaCell*) pCell );
@@ -963,14 +963,14 @@ USHORT ScDetectiveFunc::FindPredLevel( SCCOL nCol, SCROW nRow, USHORT nLevel, US
{
BOOL bArea = ( aRef.aStart != aRef.aEnd );
- if ( bDelete ) // Rahmen loeschen ?
+ if ( bDelete ) // Rahmen loeschen ?
{
if (bArea)
{
DeleteBox( aRef.aStart.Col(), aRef.aStart.Row(), aRef.aEnd.Col(), aRef.aEnd.Row() );
}
}
- else // weitersuchen
+ else // weitersuchen
{
if ( HasArrow( aRef.aStart, nCol,nRow,nTab ) )
{
@@ -1008,7 +1008,7 @@ USHORT ScDetectiveFunc::InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveDat
return DET_INS_CIRCULAR;
if (pFCell->GetDirty())
- pFCell->Interpret(); // nach SetRunning geht's nicht mehr!
+ pFCell->Interpret(); // nach SetRunning geht's nicht mehr!
pFCell->SetRunning(TRUE);
USHORT nResult = DET_INS_EMPTY;
@@ -1025,9 +1025,9 @@ USHORT ScDetectiveFunc::InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveDat
if (DrawEntry( nCol, nRow, ScRange( aErrorPos), rData ))
nResult = DET_INS_INSERTED;
- // und weiterverfolgen
+ // und weiterverfolgen
- if ( nLevel < rData.GetMaxLevel() ) // praktisch immer
+ if ( nLevel < rData.GetMaxLevel() ) // praktisch immer
{
if (InsertErrorLevel( aErrorPos.Col(), aErrorPos.Row(),
rData, nLevel+1 ) == DET_INS_INSERTED)
@@ -1051,11 +1051,11 @@ USHORT ScDetectiveFunc::InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveDat
USHORT ScDetectiveFunc::InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
ScDetectiveData& rData, USHORT nLevel )
{
- // ueber ganzes Dokument
+ // ueber ganzes Dokument
USHORT nResult = DET_INS_EMPTY;
-// ScCellIterator aCellIter( pDoc, 0,0, nTab, MAXCOL,MAXROW, nTab );
- ScCellIterator aCellIter( pDoc, 0,0,0, MAXCOL,MAXROW,MAXTAB ); // alle Tabellen
+// ScCellIterator aCellIter( pDoc, 0,0, nTab, MAXCOL,MAXROW, nTab );
+ ScCellIterator aCellIter( pDoc, 0,0,0, MAXCOL,MAXROW,MAXTAB ); // alle Tabellen
ScBaseCell* pCell = aCellIter.GetFirst();
while (pCell)
{
@@ -1065,7 +1065,7 @@ USHORT ScDetectiveFunc::InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
BOOL bRunning = pFCell->IsRunning();
if (pFCell->GetDirty())
- pFCell->Interpret(); // nach SetRunning geht's nicht mehr!
+ pFCell->Interpret(); // nach SetRunning geht's nicht mehr!
pFCell->SetRunning(TRUE);
ScDetectiveRefIter aIter( (ScFormulaCell*) pCell );
@@ -1087,7 +1087,7 @@ USHORT ScDetectiveFunc::InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
aRef, rData );
if (bDrawRet)
{
- nResult = DET_INS_INSERTED; // neuer Pfeil eingetragen
+ nResult = DET_INS_INSERTED; // neuer Pfeil eingetragen
}
else
{
@@ -1098,7 +1098,7 @@ USHORT ScDetectiveFunc::InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
}
else
{
- // weiterverfolgen
+ // weiterverfolgen
if ( nLevel < rData.GetMaxLevel() )
{
@@ -1122,7 +1122,7 @@ USHORT ScDetectiveFunc::InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
// DET_INS_EMPTY: unveraendert lassen
}
}
- else // nMaxLevel erreicht
+ else // nMaxLevel erreicht
if (nResult != DET_INS_INSERTED)
nResult = DET_INS_CONTINUE;
}
@@ -1156,7 +1156,7 @@ USHORT ScDetectiveFunc::FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SC
BOOL bRunning = pFCell->IsRunning();
if (pFCell->GetDirty())
- pFCell->Interpret(); // nach SetRunning geht's nicht mehr!
+ pFCell->Interpret(); // nach SetRunning geht's nicht mehr!
pFCell->SetRunning(TRUE);
ScDetectiveRefIter aIter( (ScFormulaCell*) pCell );
@@ -1169,7 +1169,7 @@ USHORT ScDetectiveFunc::FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SC
aRef.aStart.Col(),aRef.aStart.Row(),
aRef.aEnd.Col(),aRef.aEnd.Row() ))
{
- if ( bDelete ) // Pfeile, die hier anfangen
+ if ( bDelete ) // Pfeile, die hier anfangen
{
if (aRef.aStart != aRef.aEnd)
{
@@ -1202,7 +1202,7 @@ USHORT ScDetectiveFunc::FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SC
//
-// --------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------
//
BOOL ScDetectiveFunc::ShowPred( SCCOL nCol, SCROW nRow )
@@ -1272,7 +1272,7 @@ BOOL ScDetectiveFunc::DeleteSucc( SCCOL nCol, SCROW nRow )
USHORT nLevelCount = FindSuccLevel( nCol, nRow, nCol, nRow, 0, 0 );
if ( nLevelCount )
- FindSuccLevel( nCol, nRow, nCol, nRow, 0, nLevelCount ); // loeschen
+ FindSuccLevel( nCol, nRow, nCol, nRow, 0, nLevelCount ); // loeschen
return ( nLevelCount != 0 );
}
@@ -1285,7 +1285,7 @@ BOOL ScDetectiveFunc::DeletePred( SCCOL nCol, SCROW nRow )
USHORT nLevelCount = FindPredLevel( nCol, nRow, 0, 0 );
if ( nLevelCount )
- FindPredLevel( nCol, nRow, 0, nLevelCount ); // loeschen
+ FindPredLevel( nCol, nRow, 0, nLevelCount ); // loeschen
return ( nLevelCount != 0 );
}
@@ -1301,8 +1301,8 @@ BOOL ScDetectiveFunc::DeleteAll( ScDetectiveDelete eWhat )
pPage->RecalcObjOrdNums();
- long nDelCount = 0;
- ULONG nObjCount = pPage->GetObjCount();
+ long nDelCount = 0;
+ ULONG nObjCount = pPage->GetObjCount();
if (nObjCount)
{
SdrObject** ppObj = new SdrObject*[nObjCount];
@@ -1318,12 +1318,12 @@ BOOL ScDetectiveFunc::DeleteAll( ScDetectiveDelete eWhat )
{
BOOL bCircle = ( pObject->ISA(SdrCircObj) );
BOOL bCaption = ScDrawLayer::IsNoteCaption( pObject );
- if ( eWhat == SC_DET_DETECTIVE ) // Detektiv, aus Menue
- bDoThis = !bCaption; // auch Kreise
- else if ( eWhat == SC_DET_CIRCLES ) // Kreise, wenn neue erzeugt werden
+ if ( eWhat == SC_DET_DETECTIVE ) // Detektiv, aus Menue
+ bDoThis = !bCaption; // auch Kreise
+ else if ( eWhat == SC_DET_CIRCLES ) // Kreise, wenn neue erzeugt werden
bDoThis = bCircle;
- else if ( eWhat == SC_DET_ARROWS ) // DetectiveRefresh
- bDoThis = !bCaption && !bCircle; // don't include circles
+ else if ( eWhat == SC_DET_ARROWS ) // DetectiveRefresh
+ bDoThis = !bCaption && !bCircle; // don't include circles
else
{
DBG_ERROR("wat?");
@@ -1358,12 +1358,12 @@ BOOL ScDetectiveFunc::MarkInvalid(BOOL& rOverflow)
if (!pModel)
return FALSE;
- BOOL bDeleted = DeleteAll( SC_DET_CIRCLES ); // nur die Kreise
+ BOOL bDeleted = DeleteAll( SC_DET_CIRCLES ); // nur die Kreise
ScDetectiveData aData( pModel );
long nInsCount = 0;
- // Stellen suchen, wo Gueltigkeit definiert ist
+ // Stellen suchen, wo Gueltigkeit definiert ist
ScDocAttrIterator aAttrIter( pDoc, nTab, 0,0,MAXCOL,MAXROW );
SCCOL nCol;
@@ -1375,10 +1375,10 @@ BOOL ScDetectiveFunc::MarkInvalid(BOOL& rOverflow)
ULONG nIndex = ((const SfxUInt32Item&)pPattern->GetItem(ATTR_VALIDDATA)).GetValue();
if (nIndex)
{
- const ScValidationData* pData = pDoc->GetValidationEntry( nIndex );
+ const ScValidationData* pData = pDoc->GetValidationEntry( nIndex );
if ( pData )
{
- // Zellen in dem Bereich durchgehen
+ // Zellen in dem Bereich durchgehen
BOOL bMarkEmpty = !pData->IsIgnoreBlank();
SCROW nNextRow = nRow1;
@@ -1422,10 +1422,10 @@ BOOL ScDetectiveFunc::MarkInvalid(BOOL& rOverflow)
void ScDetectiveFunc::UpdateAllComments( ScDocument& rDoc )
{
- // for all caption objects, update attributes and SpecialTextBoxShadow flag
- // (on all tables - nTab is ignored!)
+ // for all caption objects, update attributes and SpecialTextBoxShadow flag
+ // (on all tables - nTab is ignored!)
- // no undo actions, this is refreshed after undo
+ // no undo actions, this is refreshed after undo
ScDrawLayer* pModel = rDoc.GetDrawLayer();
if (!pModel)
@@ -1467,7 +1467,7 @@ void ScDetectiveFunc::UpdateAllComments( ScDocument& rDoc )
void ScDetectiveFunc::UpdateAllArrowColors()
{
- // no undo actions necessary
+ // no undo actions necessary
ScDrawLayer* pModel = pDoc->GetDrawLayer();
if (!pModel)
@@ -1493,7 +1493,7 @@ void ScDetectiveFunc::UpdateAllArrowColors()
ScDetectiveObjType eType = GetDetectiveObjectType( pObject, nObjTab, aPos, aSource, bDummy );
if ( eType == SC_DETOBJ_ARROW || eType == SC_DETOBJ_TOOTHERTAB )
{
- // source is valid, determine error flag from source range
+ // source is valid, determine error flag from source range
ScAddress aErrPos;
if ( HasError( aSource, aErrPos ) )
@@ -1503,9 +1503,9 @@ void ScDetectiveFunc::UpdateAllArrowColors()
}
else if ( eType == SC_DETOBJ_FROMOTHERTAB )
{
- // source range is no longer known, take error flag from formula itself
- // (this means, if the formula has an error, all references to other tables
- // are marked red)
+ // source range is no longer known, take error flag from formula itself
+ // (this means, if the formula has an error, all references to other tables
+ // are marked red)
ScAddress aErrPos;
if ( HasError( ScRange( aPos), aErrPos ) )
@@ -1515,13 +1515,13 @@ void ScDetectiveFunc::UpdateAllArrowColors()
}
else if ( eType == SC_DETOBJ_CIRCLE )
{
- // circles (error marks) are always red
+ // circles (error marks) are always red
bError = TRUE;
}
else if ( eType == SC_DETOBJ_NONE )
{
- // frame for area reference has no ObjType, always gets arrow color
+ // frame for area reference has no ObjType, always gets arrow color
if ( pObject->ISA( SdrRectObj ) && !pObject->ISA( SdrCaptionObj ) )
{
@@ -1547,8 +1547,8 @@ void ScDetectiveFunc::UpdateAllArrowColors()
BOOL ScDetectiveFunc::FindFrameForObject( SdrObject* pObject, ScRange& rRange )
{
- // find the rectangle for an arrow (always the object directly before the arrow)
- // rRange must be initialized to the source cell of the arrow (start of area)
+ // find the rectangle for an arrow (always the object directly before the arrow)
+ // rRange must be initialized to the source cell of the arrow (start of area)
ScDrawLayer* pModel = pDoc->GetDrawLayer();
if (!pModel) return FALSE;
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index 95ce357b3217..0768b5fb2314 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,20 +55,20 @@ TYPEINIT1(ScTpCalcItem, SfxPoolItem);
//------------------------------------------------------------------------
-//! these functions should be moved to some header file
-inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
-inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
+//! these functions should be moved to some header file
+inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
+inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
-inline long TwipsToEvenHMM(long nTwips) { return ( (nTwips * 127 + 72) / 144 ) * 2; }
+inline long TwipsToEvenHMM(long nTwips) { return ( (nTwips * 127 + 72) / 144 ) * 2; }
//------------------------------------------------------------------------
USHORT lcl_GetDefaultTabDist()
{
if ( ScOptionsUtil::IsMetricSystem() )
- return 709; // 1,25 cm
+ return 709; // 1,25 cm
else
- return 720; // 1/2"
+ return 720; // 1/2"
}
//========================================================================
@@ -111,20 +111,20 @@ ScDocOptions::~ScDocOptions()
void ScDocOptions::ResetDocOptions()
{
- bIsIgnoreCase = FALSE;
- bIsIter = FALSE;
- nIterCount = 100;
- fIterEps = 1.0E-3;
+ bIsIgnoreCase = FALSE;
+ bIsIter = FALSE;
+ nIterCount = 100;
+ fIterEps = 1.0E-3;
nPrecStandardFormat = SvNumberFormatter::UNLIMITED_PRECISION;
- nDay = 30;
- nMonth = 12;
- nYear = 1899;
- nYear2000 = SvNumberFormatter::GetYear2000Default();
- nTabDistance = lcl_GetDefaultTabDist();
- bCalcAsShown = FALSE;
- bMatchWholeCell = TRUE;
- bDoAutoSpell = FALSE;
- bLookUpColRowNames = TRUE;
+ nDay = 30;
+ nMonth = 12;
+ nYear = 1899;
+ nYear2000 = SvNumberFormatter::GetYear2000Default();
+ nTabDistance = lcl_GetDefaultTabDist();
+ bCalcAsShown = FALSE;
+ bMatchWholeCell = TRUE;
+ bDoAutoSpell = FALSE;
+ bLookUpColRowNames = TRUE;
bFormulaRegexEnabled= TRUE;
}
@@ -140,15 +140,15 @@ void ScDocOptions::ResetDocOptions()
ScTpCalcItem::ScTpCalcItem( USHORT nWhichP, const ScDocOptions& rOpt )
: SfxPoolItem ( nWhichP ),
- theOptions ( rOpt )
+ theOptions ( rOpt )
{
}
//------------------------------------------------------------------------
ScTpCalcItem::ScTpCalcItem( const ScTpCalcItem& rItem )
- : SfxPoolItem ( rItem ),
- theOptions ( rItem.theOptions )
+ : SfxPoolItem ( rItem ),
+ theOptions ( rItem.theOptions )
{
}
@@ -184,45 +184,45 @@ SfxPoolItem* __EXPORT ScTpCalcItem::Clone( SfxItemPool * ) const
}
//==================================================================
-// Config Item containing document options
+// Config Item containing document options
//==================================================================
-#define CFGPATH_CALC "Office.Calc/Calculate"
-
-#define SCCALCOPT_ITER_ITER 0
-#define SCCALCOPT_ITER_STEPS 1
-#define SCCALCOPT_ITER_MINCHG 2
-#define SCCALCOPT_DATE_DAY 3
-#define SCCALCOPT_DATE_MONTH 4
-#define SCCALCOPT_DATE_YEAR 5
-#define SCCALCOPT_DECIMALS 6
-#define SCCALCOPT_CASESENSITIVE 7
-#define SCCALCOPT_PRECISION 8
-#define SCCALCOPT_SEARCHCRIT 9
-#define SCCALCOPT_FINDLABEL 10
+#define CFGPATH_CALC "Office.Calc/Calculate"
+
+#define SCCALCOPT_ITER_ITER 0
+#define SCCALCOPT_ITER_STEPS 1
+#define SCCALCOPT_ITER_MINCHG 2
+#define SCCALCOPT_DATE_DAY 3
+#define SCCALCOPT_DATE_MONTH 4
+#define SCCALCOPT_DATE_YEAR 5
+#define SCCALCOPT_DECIMALS 6
+#define SCCALCOPT_CASESENSITIVE 7
+#define SCCALCOPT_PRECISION 8
+#define SCCALCOPT_SEARCHCRIT 9
+#define SCCALCOPT_FINDLABEL 10
#define SCCALCOPT_REGEX 11
#define SCCALCOPT_COUNT 12
-#define CFGPATH_DOCLAYOUT "Office.Calc/Layout/Other"
+#define CFGPATH_DOCLAYOUT "Office.Calc/Layout/Other"
-#define SCDOCLAYOUTOPT_TABSTOP 0
-#define SCDOCLAYOUTOPT_COUNT 1
+#define SCDOCLAYOUTOPT_TABSTOP 0
+#define SCDOCLAYOUTOPT_COUNT 1
Sequence<OUString> ScDocCfg::GetCalcPropertyNames()
{
static const char* aPropNames[] =
{
- "IterativeReference/Iteration", // SCCALCOPT_ITER_ITER
- "IterativeReference/Steps", // SCCALCOPT_ITER_STEPS
- "IterativeReference/MinimumChange", // SCCALCOPT_ITER_MINCHG
- "Other/Date/DD", // SCCALCOPT_DATE_DAY
- "Other/Date/MM", // SCCALCOPT_DATE_MONTH
- "Other/Date/YY", // SCCALCOPT_DATE_YEAR
- "Other/DecimalPlaces", // SCCALCOPT_DECIMALS
- "Other/CaseSensitive", // SCCALCOPT_CASESENSITIVE
- "Other/Precision", // SCCALCOPT_PRECISION
- "Other/SearchCriteria", // SCCALCOPT_SEARCHCRIT
+ "IterativeReference/Iteration", // SCCALCOPT_ITER_ITER
+ "IterativeReference/Steps", // SCCALCOPT_ITER_STEPS
+ "IterativeReference/MinimumChange", // SCCALCOPT_ITER_MINCHG
+ "Other/Date/DD", // SCCALCOPT_DATE_DAY
+ "Other/Date/MM", // SCCALCOPT_DATE_MONTH
+ "Other/Date/YY", // SCCALCOPT_DATE_YEAR
+ "Other/DecimalPlaces", // SCCALCOPT_DECIMALS
+ "Other/CaseSensitive", // SCCALCOPT_CASESENSITIVE
+ "Other/Precision", // SCCALCOPT_PRECISION
+ "Other/SearchCriteria", // SCCALCOPT_SEARCHCRIT
"Other/FindLabel", // SCCALCOPT_FINDLABEL
"Other/RegularExpressions" // SCCALCOPT_REGEX
};
@@ -238,14 +238,14 @@ Sequence<OUString> ScDocCfg::GetLayoutPropertyNames()
{
static const char* aPropNames[] =
{
- "TabStop/NonMetric" // SCDOCLAYOUTOPT_TABSTOP
+ "TabStop/NonMetric" // SCDOCLAYOUTOPT_TABSTOP
};
Sequence<OUString> aNames(SCDOCLAYOUTOPT_COUNT);
OUString* pNames = aNames.getArray();
for(int i = 0; i < SCDOCLAYOUTOPT_COUNT; i++)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
- // adjust for metric system
+ // adjust for metric system
if (ScOptionsUtil::IsMetricSystem())
pNames[SCDOCLAYOUTOPT_TABSTOP] = OUString::createFromAscii( "TabStop/Metric" );
@@ -418,9 +418,9 @@ IMPL_LINK( ScDocCfg, LayoutCommitHdl, void *, EMPTYARG )
switch(nProp)
{
case SCDOCLAYOUTOPT_TABSTOP:
- // TabDistance in ScDocOptions is in twips
- // use only even numbers, so defaults don't get changed
- // by modifying other settings in the same config item
+ // TabDistance in ScDocOptions is in twips
+ // use only even numbers, so defaults don't get changed
+ // by modifying other settings in the same config item
pValues[nProp] <<= (sal_Int32) TwipsToEvenHMM( GetTabDistance() );
break;
}
diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx
index 740413ea8533..c90e7d52068c 100644
--- a/sc/source/core/tool/doubleref.cxx
+++ b/sc/source/core/tool/doubleref.cxx
@@ -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
@@ -114,7 +114,7 @@ bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef,
else
bValid = false;
}
-
+
if (bValid)
{
// equality, non-equality operator in the 3rd column.
@@ -142,7 +142,7 @@ bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef,
rEntry.eOp = SC_EQUAL;
}
-
+
if (bValid)
{
// Finally, the right-hand-side value in the 4th column.
@@ -259,7 +259,7 @@ bool lcl_fillQueryEntries(
// ============================================================================
-ScDBRangeBase::ScDBRangeBase(ScDocument* pDoc, RefType eType) :
+ScDBRangeBase::ScDBRangeBase(ScDocument* pDoc, RefType eType) :
mpDoc(pDoc), meType(eType)
{
}
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index 483f0cea6b57..66a275de8416 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
// STATIC DATA -----------------------------------------------------------
-// Delimiters zusaetzlich zu EditEngine-Default:
+// Delimiters zusaetzlich zu EditEngine-Default:
const sal_Char __FAR_DATA ScEditUtil::pCalcDelimiters[] = "=()+-*/^&<>";
@@ -75,7 +75,7 @@ const sal_Char __FAR_DATA ScEditUtil::pCalcDelimiters[] = "=()+-*/^&<>";
String ScEditUtil::ModifyDelimiters( const String& rOld )
{
String aRet = rOld;
- aRet.EraseAllChars( '_' ); // underscore is used in function argument names
+ aRet.EraseAllChars( '_' ); // underscore is used in function argument names
aRet.AppendAscii( RTL_CONSTASCII_STRINGPARAM( pCalcDelimiters ) );
aRet.Append(ScCompiler::GetNativeSymbol(ocSep)); // argument separator is localized.
return aRet;
@@ -139,18 +139,18 @@ Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, BOOL bForceToT
if ( ((const SvxHorJustifyItem&)pPattern->GetItem(ATTR_HOR_JUSTIFY)).GetValue() ==
SVX_HOR_JUSTIFY_LEFT )
nIndent = ((const SfxUInt16Item&)pPattern->GetItem(ATTR_INDENT)).GetValue();
- long nPixDifX = (long) ( ( pMargin->GetLeftMargin() + nIndent ) * nPPTX );
- aStartPos.X() += nPixDifX * nLayoutSign;
- nCellX -= nPixDifX + (long) ( pMargin->GetRightMargin() * nPPTX ); // wegen Umbruch etc.
+ long nPixDifX = (long) ( ( pMargin->GetLeftMargin() + nIndent ) * nPPTX );
+ aStartPos.X() += nPixDifX * nLayoutSign;
+ nCellX -= nPixDifX + (long) ( pMargin->GetRightMargin() * nPPTX ); // wegen Umbruch etc.
- // vertikale Position auf die in der Tabelle anpassen
+ // vertikale Position auf die in der Tabelle anpassen
long nPixDifY;
long nTopMargin = (long) ( pMargin->GetTopMargin() * nPPTY );
SvxCellVerJustify eJust = (SvxCellVerJustify) ((const SvxVerJustifyItem&)pPattern->
GetItem(ATTR_VER_JUSTIFY)).GetValue();
- // asian vertical is always edited top-aligned
+ // asian vertical is always edited top-aligned
BOOL bAsianVertical = ((const SfxBoolItem&)pPattern->GetItem( ATTR_STACKED )).GetValue() &&
((const SfxBoolItem&)pPattern->GetItem( ATTR_VERTICAL_ASIAN )).GetValue();
@@ -165,7 +165,7 @@ Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, BOOL bForceToT
long nTextHeight = pDoc->GetNeededSize( nCol, nRow, nTab,
pDev, nPPTX, nPPTY, aZoomX, aZoomY, FALSE );
if (!nTextHeight)
- { // leere Zelle
+ { // leere Zelle
Font aFont;
// font color doesn't matter here
pPattern->GetFont( aFont, SC_AUTOCOL_BLACK, pDev, &aZoomY );
@@ -177,23 +177,23 @@ Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, BOOL bForceToT
pDev->SetMapMode(aMode);
if ( nTextHeight > nCellY + nTopMargin || bForceToTop )
- nPixDifY = 0; // zu gross -> oben anfangen
+ nPixDifY = 0; // zu gross -> oben anfangen
else
{
if ( eJust == SVX_VER_JUSTIFY_CENTER )
nPixDifY = nTopMargin + ( nCellY - nTextHeight ) / 2;
else
- nPixDifY = nCellY - nTextHeight + nTopMargin; // JUSTIFY_BOTTOM
+ nPixDifY = nCellY - nTextHeight + nTopMargin; // JUSTIFY_BOTTOM
}
}
aStartPos.Y() += nPixDifY;
- nCellY -= nPixDifY;
+ nCellY -= nPixDifY;
if ( bLayoutRTL )
- aStartPos.X() -= nCellX - 2; // excluding grid on both sides
+ aStartPos.X() -= nCellX - 2; // excluding grid on both sides
- // -1 -> Gitter nicht ueberschreiben
+ // -1 -> Gitter nicht ueberschreiben
return Rectangle( aStartPos, Size(nCellX-1,nCellY-1) );
}
@@ -207,7 +207,7 @@ ScEditAttrTester::ScEditAttrTester( ScEditEngineDefaulter* pEng ) :
{
if ( pEngine->GetParagraphCount() > 1 )
{
- bNeedsObject = TRUE; //! Zellatribute finden ?
+ bNeedsObject = TRUE; //! Zellatribute finden ?
}
else
{
@@ -226,10 +226,10 @@ ScEditAttrTester::ScEditAttrTester( ScEditEngineDefaulter* pEng ) :
if ( nId == EE_CHAR_ESCAPEMENT || nId == EE_CHAR_PAIRKERNING ||
nId == EE_CHAR_KERNING || nId == EE_CHAR_XMLATTRIBS )
{
- // Escapement and kerning are kept in EditEngine because there are no
- // corresponding cell format items. User defined attributes are kept in
- // EditEngine because "user attributes applied to all the text" is different
- // from "user attributes applied to the cell".
+ // Escapement and kerning are kept in EditEngine because there are no
+ // corresponding cell format items. User defined attributes are kept in
+ // EditEngine because "user attributes applied to all the text" is different
+ // from "user attributes applied to the cell".
if ( *pItem != rEditDefaults.Get(nId) )
bNeedsObject = TRUE;
@@ -242,13 +242,13 @@ ScEditAttrTester::ScEditAttrTester( ScEditEngineDefaulter* pEng ) :
}
}
- // Feldbefehle enthalten?
+ // Feldbefehle enthalten?
SfxItemState eFieldState = pEditAttrs->GetItemState( EE_FEATURE_FIELD, FALSE );
if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET )
bNeedsObject = TRUE;
- // not converted characters?
+ // not converted characters?
SfxItemState eConvState = pEditAttrs->GetItemState( EE_FEATURE_NOTCONV, FALSE );
if ( eConvState == SFX_ITEM_DONTCARE || eConvState == SFX_ITEM_SET )
@@ -302,8 +302,8 @@ ScEditEngineDefaulter::ScEditEngineDefaulter( SfxItemPool* pEnginePoolP,
ScEnginePoolHelper( pEnginePoolP, bDeleteEnginePoolP ),
EditEngine( pEnginePoolP )
{
- // All EditEngines use ScGlobal::GetEditDefaultLanguage as DefaultLanguage.
- // DefaultLanguage for InputHandler's EditEngine is updated later.
+ // All EditEngines use ScGlobal::GetEditDefaultLanguage as DefaultLanguage.
+ // DefaultLanguage for InputHandler's EditEngine is updated later.
SetDefaultLanguage( ScGlobal::GetEditDefaultLanguage() );
}
@@ -481,7 +481,7 @@ void ScEditEngineDefaulter::RemoveParaAttribs()
const SfxPoolItem* pParaItem;
if ( rParaAttribs.GetItemState( nWhich, FALSE, &pParaItem ) == SFX_ITEM_SET )
{
- // if defaults are set, use only items that are different from default
+ // if defaults are set, use only items that are different from default
if ( !pDefaults || *pParaItem != pDefaults->Get(nWhich) )
{
if (!pCharItems)
@@ -496,8 +496,8 @@ void ScEditEngineDefaulter::RemoveParaAttribs()
SvUShorts aPortions;
GetPortions( nPar, aPortions );
- // loop through the portions of the paragraph, and set only those items
- // that are not overridden by existing character attributes
+ // loop through the portions of the paragraph, and set only those items
+ // that are not overridden by existing character attributes
USHORT nPCount = aPortions.Count();
USHORT nStart = 0;
@@ -509,8 +509,8 @@ void ScEditEngineDefaulter::RemoveParaAttribs()
SfxItemSet aNewCharAttrs = *pCharItems;
for (nWhich = EE_CHAR_START; nWhich <= EE_CHAR_END; nWhich ++)
{
- // Clear those items that are different from existing character attributes.
- // Where no character attributes are set, GetAttribs returns the paragraph attributes.
+ // Clear those items that are different from existing character attributes.
+ // Where no character attributes are set, GetAttribs returns the paragraph attributes.
const SfxPoolItem* pItem;
if ( aNewCharAttrs.GetItemState( nWhich, FALSE, &pItem ) == SFX_ITEM_SET &&
*pItem != aOldCharAttrs.Get(nWhich) )
@@ -529,8 +529,8 @@ void ScEditEngineDefaulter::RemoveParaAttribs()
if ( rParaAttribs.Count() )
{
- // clear all paragraph attributes (including defaults),
- // so they are not contained in resulting EditTextObjects
+ // clear all paragraph attributes (including defaults),
+ // so they are not contained in resulting EditTextObjects
SetParaAttribs( nPar, SfxItemSet( *rParaAttribs.GetPool(), rParaAttribs.GetRanges() ) );
}
@@ -568,11 +568,11 @@ void ScTabEditEngine::Init( const ScPatternAttr& rPattern )
}
//------------------------------------------------------------------------
-// Feldbefehle fuer Kopf- und Fusszeilen
+// Feldbefehle fuer Kopf- und Fusszeilen
//------------------------------------------------------------------------
//
-// Zahlen aus \sw\source\core\doc\numbers.cxx
+// Zahlen aus \sw\source\core\doc\numbers.cxx
//
String lcl_GetCharStr( sal_Int32 nNo )
@@ -619,10 +619,10 @@ String lcl_GetNumStr( sal_Int32 nNo, SvxNumType eType )
aTmpStr.Erase();
break;
-// CHAR_SPECIAL:
-// ????
+// CHAR_SPECIAL:
+// ????
-// case ARABIC: ist jetzt default
+// case ARABIC: ist jetzt default
default:
aTmpStr = String::CreateFromInt32( nNo );
break;
@@ -650,7 +650,7 @@ String __EXPORT ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField,
Color*& /* rTxtColor */, Color*& /* rFldColor */ )
{
String aRet;
- const SvxFieldData* pFieldData = rField.GetField();
+ const SvxFieldData* pFieldData = rField.GetField();
if ( pFieldData )
{
TypeId aType = pFieldData->Type();
@@ -694,7 +694,7 @@ String __EXPORT ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField,
//------------------------------------------------------------------------
//
-// Feld-Daten
+// Feld-Daten
//
//------------------------------------------------------------------------
@@ -706,7 +706,7 @@ ScFieldEditEngine::ScFieldEditEngine( SfxItemPool* pEnginePoolP,
{
if ( pTextObjectPool )
SetEditTextObjectPool( pTextObjectPool );
- // EE_CNTRL_URLSFXEXECUTE nicht, weil die Edit-Engine den ViewFrame nicht kennt
+ // EE_CNTRL_URLSFXEXECUTE nicht, weil die Edit-Engine den ViewFrame nicht kennt
// wir haben keine StyleSheets fuer Text
SetControlWord( (GetControlWord() | EE_CNTRL_MARKFIELDS) & ~EE_CNTRL_RTFSTYLESHEETS );
}
@@ -716,7 +716,7 @@ String __EXPORT ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField,
Color*& rTxtColor, Color*& /* rFldColor */ )
{
String aRet;
- const SvxFieldData* pFieldData = rField.GetField();
+ const SvxFieldData* pFieldData = rField.GetField();
if ( pFieldData )
{
@@ -749,8 +749,8 @@ String __EXPORT ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField,
}
}
- if (!aRet.Len()) // leer ist baeh
- aRet = ' '; // Space ist Default der Editengine
+ if (!aRet.Len()) // leer ist baeh
+ aRet = ' '; // Space ist Default der Editengine
return aRet;
}
diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx
index 7ac3d710b420..9ac27c0f85bf 100644
--- a/sc/source/core/tool/filtopt.cxx
+++ b/sc/source/core/tool/filtopt.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,20 +46,20 @@ using namespace com::sun::star::uno;
//------------------------------------------------------------------
-#define CFGPATH_FILTER "Office.Calc/Filter/Import"
+#define CFGPATH_FILTER "Office.Calc/Filter/Import"
-#define SCFILTOPT_COLSCALE 0
-#define SCFILTOPT_ROWSCALE 1
-#define SCFILTOPT_WK3 2
-#define SCFILTOPT_COUNT 3
+#define SCFILTOPT_COLSCALE 0
+#define SCFILTOPT_ROWSCALE 1
+#define SCFILTOPT_WK3 2
+#define SCFILTOPT_COUNT 3
Sequence<OUString> ScFilterOptions::GetPropertyNames()
{
static const char* aPropNames[] =
{
- "MS_Excel/ColScale", // SCFILTOPT_COLSCALE
- "MS_Excel/RowScale", // SCFILTOPT_ROWSCALE
- "Lotus123/WK3" // SCFILTOPT_WK3
+ "MS_Excel/ColScale", // SCFILTOPT_COLSCALE
+ "MS_Excel/RowScale", // SCFILTOPT_ROWSCALE
+ "Lotus123/WK3" // SCFILTOPT_WK3
};
Sequence<OUString> aNames(SCFILTOPT_COUNT);
OUString* pNames = aNames.getArray();
@@ -77,7 +77,7 @@ ScFilterOptions::ScFilterOptions() :
{
Sequence<OUString> aNames = GetPropertyNames();
Sequence<Any> aValues = GetProperties(aNames);
-// EnableNotification(aNames);
+// EnableNotification(aNames);
const Any* pValues = aValues.getConstArray();
DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed");
if(aValues.getLength() == aNames.getLength())
diff --git a/sc/source/core/tool/formulaparserpool.cxx b/sc/source/core/tool/formulaparserpool.cxx
index 75d1c874eba8..251f037f8933 100644
--- a/sc/source/core/tool/formulaparserpool.cxx
+++ b/sc/source/core/tool/formulaparserpool.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/tool/hints.cxx b/sc/source/core/tool/hints.cxx
index b2a8266705c7..4ca62d87e7d7 100644
--- a/sc/source/core/tool/hints.cxx
+++ b/sc/source/core/tool/hints.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index ed5a74582348..469d2c61c9db 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using namespace com::sun::star::uno;
//------------------------------------------------------------------
-// Version, ab der das Item kompatibel ist
+// Version, ab der das Item kompatibel ist
#define SC_VERSION ((USHORT)351)
@@ -81,15 +81,15 @@ ScInputOptions::~ScInputOptions()
void ScInputOptions::SetDefaults()
{
- nMoveDir = DIR_BOTTOM;
- bMoveSelection = TRUE;
- bEnterEdit = FALSE;
- bExtendFormat = FALSE;
- bRangeFinder = TRUE;
- bExpandRefs = FALSE;
- bMarkHeader = TRUE;
- bUseTabCol = FALSE;
- bTextWysiwyg = FALSE;
+ nMoveDir = DIR_BOTTOM;
+ bMoveSelection = TRUE;
+ bEnterEdit = FALSE;
+ bExtendFormat = FALSE;
+ bRangeFinder = TRUE;
+ bExpandRefs = FALSE;
+ bMarkHeader = TRUE;
+ bUseTabCol = FALSE;
+ bTextWysiwyg = FALSE;
bReplCellsWarn = TRUE;
}
@@ -97,15 +97,15 @@ void ScInputOptions::SetDefaults()
const ScInputOptions& ScInputOptions::operator=( const ScInputOptions& rCpy )
{
- nMoveDir = rCpy.nMoveDir;
- bMoveSelection = rCpy.bMoveSelection;
- bEnterEdit = rCpy.bEnterEdit;
- bExtendFormat = rCpy.bExtendFormat;
- bRangeFinder = rCpy.bRangeFinder;
- bExpandRefs = rCpy.bExpandRefs;
- bMarkHeader = rCpy.bMarkHeader;
- bUseTabCol = rCpy.bUseTabCol;
- bTextWysiwyg = rCpy.bTextWysiwyg;
+ nMoveDir = rCpy.nMoveDir;
+ bMoveSelection = rCpy.bMoveSelection;
+ bEnterEdit = rCpy.bEnterEdit;
+ bExtendFormat = rCpy.bExtendFormat;
+ bRangeFinder = rCpy.bRangeFinder;
+ bExpandRefs = rCpy.bExpandRefs;
+ bMarkHeader = rCpy.bMarkHeader;
+ bUseTabCol = rCpy.bUseTabCol;
+ bTextWysiwyg = rCpy.bTextWysiwyg;
bReplCellsWarn = rCpy.bReplCellsWarn;
return *this;
@@ -113,20 +113,20 @@ const ScInputOptions& ScInputOptions::operator=( const ScInputOptions& rCpy )
//==================================================================
-// Config Item containing input options
+// Config Item containing input options
//==================================================================
-#define CFGPATH_INPUT "Office.Calc/Input"
-
-#define SCINPUTOPT_MOVEDIR 0
-#define SCINPUTOPT_MOVESEL 1
-#define SCINPUTOPT_EDTEREDIT 2
-#define SCINPUTOPT_EXTENDFMT 3
-#define SCINPUTOPT_RANGEFIND 4
-#define SCINPUTOPT_EXPANDREFS 5
-#define SCINPUTOPT_MARKHEADER 6
-#define SCINPUTOPT_USETABCOL 7
-#define SCINPUTOPT_TEXTWYSIWYG 8
+#define CFGPATH_INPUT "Office.Calc/Input"
+
+#define SCINPUTOPT_MOVEDIR 0
+#define SCINPUTOPT_MOVESEL 1
+#define SCINPUTOPT_EDTEREDIT 2
+#define SCINPUTOPT_EXTENDFMT 3
+#define SCINPUTOPT_RANGEFIND 4
+#define SCINPUTOPT_EXPANDREFS 5
+#define SCINPUTOPT_MARKHEADER 6
+#define SCINPUTOPT_USETABCOL 7
+#define SCINPUTOPT_TEXTWYSIWYG 8
#define SCINPUTOPT_REPLCELLSWARN 9
#define SCINPUTOPT_COUNT 10
@@ -134,14 +134,14 @@ Sequence<OUString> ScInputCfg::GetPropertyNames()
{
static const char* aPropNames[] =
{
- "MoveSelectionDirection", // SCINPUTOPT_MOVEDIR
- "MoveSelection", // SCINPUTOPT_MOVESEL
- "SwitchToEditMode", // SCINPUTOPT_EDTEREDIT
- "ExpandFormatting", // SCINPUTOPT_EXTENDFMT
- "ShowReference", // SCINPUTOPT_RANGEFIND
- "ExpandReference", // SCINPUTOPT_EXPANDREFS
- "HighlightSelection", // SCINPUTOPT_MARKHEADER
- "UseTabCol", // SCINPUTOPT_USETABCOL
+ "MoveSelectionDirection", // SCINPUTOPT_MOVEDIR
+ "MoveSelection", // SCINPUTOPT_MOVESEL
+ "SwitchToEditMode", // SCINPUTOPT_EDTEREDIT
+ "ExpandFormatting", // SCINPUTOPT_EXTENDFMT
+ "ShowReference", // SCINPUTOPT_RANGEFIND
+ "ExpandReference", // SCINPUTOPT_EXPANDREFS
+ "HighlightSelection", // SCINPUTOPT_MARKHEADER
+ "UseTabCol", // SCINPUTOPT_USETABCOL
"UsePrinterMetrics", // SCINPUTOPT_TEXTWYSIWYG
"ReplaceCellsWarning" // SCINPUTOPT_REPLCELLSWARN
};
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 35c63f52a92b..2249ff236791 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -328,7 +328,7 @@ void lcl_AdjustJumpMatrix( ScJumpMatrix* pJumpM, ScMatrixRef& pResMat, SCSIZE nP
SCSIZE nAdjustCols, nAdjustRows;
pJumpM->GetDimensions( nJumpCols, nJumpRows );
pJumpM->GetResMatDimensions( nResCols, nResRows );
- if (( nJumpCols == 1 && nParmCols > nResCols ) ||
+ if (( nJumpCols == 1 && nParmCols > nResCols ) ||
( nJumpRows == 1 && nParmRows > nResRows ))
{
if ( nJumpCols == 1 && nJumpRows == 1 )
@@ -637,8 +637,8 @@ ScCompareOptions::ScCompareOptions( ScDocument* pDoc, const ScQueryEntry& rEntry
bIgnoreCase(true)
{
bRegEx = (bRegEx && (aQueryEntry.eOp == SC_EQUAL || aQueryEntry.eOp == SC_NOT_EQUAL));
- // Interpreter functions usually are case insensitive, except the simple
- // comparison operators, for which these options aren't used. Override in
+ // Interpreter functions usually are case insensitive, except the simple
+ // comparison operators, for which these options aren't used. Override in
// struct if needed.
}
@@ -718,8 +718,8 @@ double ScInterpreter::CompareFunc( const ScCompare& rComp, ScCompareOptions* pOp
// Both strings.
if (pOptions)
{
- // All similar to Sctable::ValidQuery(), *rComp.pVal[1] actually
- // is/must be identical to *rEntry.pStr, which is essential for
+ // All similar to Sctable::ValidQuery(), *rComp.pVal[1] actually
+ // is/must be identical to *rEntry.pStr, which is essential for
// regex to work through GetSearchTextPtr().
ScQueryEntry& rEntry = pOptions->aQueryEntry;
DBG_ASSERT( *rComp.pVal[1] == *rEntry.pStr, "ScInterpreter::CompareFunc: broken options");
@@ -727,8 +727,8 @@ double ScInterpreter::CompareFunc( const ScCompare& rComp, ScCompareOptions* pOp
{
xub_StrLen nStart = 0;
xub_StrLen nStop = rComp.pVal[0]->Len();
- bool bMatch = rEntry.GetSearchTextPtr(
- !pOptions->bIgnoreCase)->SearchFrwrd( *rComp.pVal[0],
+ bool bMatch = rEntry.GetSearchTextPtr(
+ !pOptions->bIgnoreCase)->SearchFrwrd( *rComp.pVal[0],
&nStart, &nStop);
if (bMatch && pOptions->bMatchWholeCell && (nStart != 0 || nStop != rComp.pVal[0]->Len()))
bMatch = false; // RegEx must match entire string.
@@ -736,19 +736,19 @@ double ScInterpreter::CompareFunc( const ScCompare& rComp, ScCompareOptions* pOp
}
else if (rEntry.eOp == SC_EQUAL || rEntry.eOp == SC_NOT_EQUAL)
{
- ::utl::TransliterationWrapper* pTransliteration =
- (pOptions->bIgnoreCase ? ScGlobal::GetpTransliteration() :
+ ::utl::TransliterationWrapper* pTransliteration =
+ (pOptions->bIgnoreCase ? ScGlobal::GetpTransliteration() :
ScGlobal::GetCaseTransliteration());
bool bMatch;
if (pOptions->bMatchWholeCell)
bMatch = pTransliteration->isEqual( *rComp.pVal[0], *rComp.pVal[1]);
else
{
- String aCell( pTransliteration->transliterate(
- *rComp.pVal[0], ScGlobal::eLnge, 0,
+ String aCell( pTransliteration->transliterate(
+ *rComp.pVal[0], ScGlobal::eLnge, 0,
rComp.pVal[0]->Len(), NULL));
- String aQuer( pTransliteration->transliterate(
- *rComp.pVal[1], ScGlobal::eLnge, 0,
+ String aQuer( pTransliteration->transliterate(
+ *rComp.pVal[1], ScGlobal::eLnge, 0,
rComp.pVal[1]->Len(), NULL));
bMatch = (aCell.Search( aQuer ) != STRING_NOTFOUND);
}
@@ -1926,7 +1926,7 @@ void ScInterpreter::ScCell()
else if( aInfoType.EqualsAscii( "COORD" ) )
{ // address, lotus 1-2-3 formatted: $TABLE:$COL$ROW
// Yes, passing tab as col is intentional!
- ScAddress( static_cast<SCCOL>(aCellPos.Tab()), 0, 0 ).Format(
+ ScAddress( static_cast<SCCOL>(aCellPos.Tab()), 0, 0 ).Format(
aFuncResult, (SCA_COL_ABSOLUTE|SCA_VALID_COL), NULL, pDok->GetAddressConvention() );
aFuncResult += ':';
String aCellStr;
@@ -2481,22 +2481,13 @@ void ScInterpreter::ScN()
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScN" );
USHORT nErr = nGlobalError;
nGlobalError = 0;
- double fVal;
- if ( GetRawStackType() == svString )
- {
- fVal = 0.0;
- Pop();
- }
- else
- {
- // Temporarily override the ConvertStringToValue() error for
- // GetCellValue() / GetCellValueOrZero()
- USHORT nSErr = mnStringNoValueError;
- mnStringNoValueError = errCellNoValue;
- fVal = GetDouble();
- mnStringNoValueError = nSErr;
- }
- if ( nGlobalError == NOTAVAILABLE || nGlobalError == errIllegalArgument )
+ // Temporarily override the ConvertStringToValue() error for
+ // GetCellValue() / GetCellValueOrZero()
+ USHORT nSErr = mnStringNoValueError;
+ mnStringNoValueError = errCellNoValue;
+ double fVal = GetDouble();
+ mnStringNoValueError = nSErr;
+ if ( nGlobalError == NOTAVAILABLE || nGlobalError == errCellNoValue )
nGlobalError = 0; // N(#NA) and N("text") are ok
if ( !nGlobalError && nErr != NOTAVAILABLE )
nGlobalError = nErr;
@@ -2784,7 +2775,7 @@ static ::rtl::OUString lcl_convertIntoFullWidth( const ::rtl::OUString & rStr )
{
aTrans.loadModuleByImplName( ::rtl::OUString::createFromAscii( "HALFWIDTH_FULLWIDTH_LIKE_JIS" ), LANGUAGE_SYSTEM );
bFirstJISCall = false;
- }
+ }
return aTrans.transliterate( rStr, 0, USHORT( rStr.getLength() ), NULL );
}
@@ -2843,7 +2834,7 @@ void ScInterpreter::ScUnichar()
if ( MustHaveParamCount( GetByte(), 1 ) )
{
double dVal = ::rtl::math::approxFloor( GetDouble() );
- if ((dVal < 0x000000) || (dVal > 0x10FFFF))
+ if ((dVal < 0x000000) || (dVal > 0x10FFFF))
PushIllegalArgument();
else
{
@@ -3227,7 +3218,7 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, BOOL bTextAsZero )
case ifPRODUCT: fRes *= fVal; break;
case ifCOUNT:
if ( nGlobalError )
- {
+ {
nGlobalError = 0;
nCount--;
}
@@ -4547,7 +4538,7 @@ void ScInterpreter::ScCountIf()
SCSIZE nSize = pResultMatrix->GetElementCount();
for (SCSIZE nIndex = 0; nIndex < nSize; ++nIndex)
{
- if (pResultMatrix->IsValue( nIndex) &&
+ if (pResultMatrix->IsValue( nIndex) &&
pResultMatrix->GetDouble( nIndex))
++fSum;
}
@@ -4837,7 +4828,7 @@ void ScInterpreter::ScSumIf()
{
for (SCROW nRow = nRow1; nRow <= nRow2; ++nRow)
{
- if (pResultMatrix->IsValue( nCol, nRow) &&
+ if (pResultMatrix->IsValue( nCol, nRow) &&
pResultMatrix->GetDouble( nCol, nRow))
{
SCSIZE nC = nCol + nColDiff;
@@ -4972,9 +4963,9 @@ void ScInterpreter::ScLookup()
case svDoubleRef:
{
SCTAB nTabJunk;
- PopDoubleRef(nResCol1, nResRow1, nResTab,
+ PopDoubleRef(nResCol1, nResRow1, nResTab,
nResCol2, nResRow2, nTabJunk);
- if (nResTab != nTabJunk ||
+ if (nResTab != nTabJunk ||
((nResRow2 - nResRow1) > 0 && (nResCol2 - nResCol1) > 0))
{
// The result array must be a vector.
@@ -5108,7 +5099,7 @@ void ScInterpreter::ScLookup()
{
// Delta position for a single value is always 0.
- // Found if data <= query, but not if query is string and found data is
+ // Found if data <= query, but not if query is string and found data is
// numeric or vice versa. This is how Excel does it but doesn't
// document it.
@@ -5267,7 +5258,7 @@ void ScInterpreter::ScLookup()
}
// With 0-9 < A-Z, if query is numeric and data found is string, or
- // vice versa, the (yet another undocumented) Excel behavior is to
+ // vice versa, the (yet another undocumented) Excel behavior is to
// return #N/A instead.
if (bFound)
@@ -5920,7 +5911,7 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( BOOL& rMissingField )
else
SetError( errIllegalParameter );
}
-
+
if (nGlobalError)
return NULL;
@@ -5931,7 +5922,7 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( BOOL& rMissingField )
nField = pDBRef->findFieldColumn(static_cast<SCCOL>(nVal));
else
{
- sal_uInt16 nErr = 0;
+ sal_uInt16 nErr = 0;
nField = pDBRef->findFieldColumn(aStr, &nErr);
SetError(nErr);
}
@@ -6082,7 +6073,7 @@ void ScInterpreter::ScDBCount()
do
{
nCount++;
- }
+ }
while ( aValIter.GetNext(aValue) && !aValue.mnError );
}
SetError(aValue.mnError);
@@ -6110,7 +6101,7 @@ void ScInterpreter::ScDBCount2()
do
{
nCount++;
- }
+ }
while ( aValIter.GetNext(aValue) && !aValue.mnError );
}
SetError(aValue.mnError);
@@ -6180,7 +6171,7 @@ void ScInterpreter::GetDBStVarParams( double& rVal, double& rValCount )
SetError( errIllegalParameter);
vMean = fSum / values.size();
-
+
for (size_t i = 0; i < values.size(); i++)
vSum += (values[i] - vMean) * (values[i] - vMean);
@@ -6224,8 +6215,8 @@ void ScInterpreter::ScDBVarP()
}
-ScTokenArray* lcl_CreateExternalRefTokenArray( const ScAddress& rPos, ScDocument* pDoc,
- const ScAddress::ExternalInfo& rExtInfo, const ScRefAddress& rRefAd1,
+ScTokenArray* lcl_CreateExternalRefTokenArray( const ScAddress& rPos, ScDocument* pDoc,
+ const ScAddress::ExternalInfo& rExtInfo, const ScRefAddress& rRefAd1,
const ScRefAddress* pRefAd2 )
{
ScExternalRefManager* pRefMgr = pDoc->GetExternalRefManager();
@@ -6259,10 +6250,10 @@ ScTokenArray* lcl_CreateExternalRefTokenArray( const ScAddress& rPos, ScDocument
pTokenArray->AddExternalSingleReference( rExtInfo.mnFileId,
(pRealTab ? *pRealTab : rExtInfo.maTabName), aRef);
}
- // The indirect usage of the external table can't be detected during the
- // store-to-file cycle, mark it as permanently referenced so it gets stored
+ // The indirect usage of the external table can't be detected during the
+ // store-to-file cycle, mark it as permanently referenced so it gets stored
// even if not directly referenced anywhere.
- pRefMgr->setCacheTableReferencedPermanently( rExtInfo.mnFileId,
+ pRefMgr->setCacheTableReferencedPermanently( rExtInfo.mnFileId,
rExtInfo.maTabName, nSheets);
ScCompiler aComp( pDoc, rPos, *pTokenArray);
aComp.CompileTokenArray();
@@ -6295,12 +6286,12 @@ void ScInterpreter::ScIndirect()
{
if (aExtInfo.mbExternal)
{
- /* TODO: future versions should implement a proper subroutine
- * token. This procedure here is a minimally invasive fix for
+ /* TODO: future versions should implement a proper subroutine
+ * token. This procedure here is a minimally invasive fix for
* #i101645# in OOo3.1.1 */
- // Push a subroutine on the instruction code stack that
+ // Push a subroutine on the instruction code stack that
// resolves the external reference as the next instruction.
- aCode.Push( lcl_CreateExternalRefTokenArray( aPos, pDok,
+ aCode.Push( lcl_CreateExternalRefTokenArray( aPos, pDok,
aExtInfo, aRefAd, &aRefAd2));
// Signal subroutine call to interpreter.
PushTempToken( new FormulaUnknownToken( ocCall));
@@ -6315,12 +6306,12 @@ void ScInterpreter::ScIndirect()
{
if (aExtInfo.mbExternal)
{
- /* TODO: future versions should implement a proper subroutine
- * token. This procedure here is a minimally invasive fix for
+ /* TODO: future versions should implement a proper subroutine
+ * token. This procedure here is a minimally invasive fix for
* #i101645# in OOo3.1.1 */
- // Push a subroutine on the instruction code stack that
+ // Push a subroutine on the instruction code stack that
// resolves the external reference as the next instruction.
- aCode.Push( lcl_CreateExternalRefTokenArray( aPos, pDok,
+ aCode.Push( lcl_CreateExternalRefTokenArray( aPos, pDok,
aExtInfo, aRefAd, NULL));
// Signal subroutine call to interpreter.
PushTempToken( new FormulaUnknownToken( ocCall));
@@ -6337,7 +6328,7 @@ void ScInterpreter::ScIndirect()
break;
USHORT nPos = 0;
- if (!pNames->SearchName( sRefStr, nPos))
+ if (!pNames->SearchName( sRefStr, nPos))
break;
ScRangeData* rData = (*pNames)[nPos];
@@ -6351,12 +6342,12 @@ void ScInterpreter::ScIndirect()
#if 0
// This is some really odd Excel behavior and renders named
// ranges containing relative references totally useless.
- if (!rData->IsReference(aRange, ScAddress( aPos.Tab(), 0, 0)))
+ if (!rData->IsReference(aRange, ScAddress( aPos.Tab(), 0, 0)))
break;
#else
// This is the usual way to treat named ranges containing
// relative references.
- if (!rData->IsReference( aRange, aPos))
+ if (!rData->IsReference( aRange, aPos))
break;
#endif
@@ -7108,17 +7099,13 @@ void ScInterpreter::ScText()
case svDouble:
fVal = PopDouble();
break;
- case svString:
- aStr = PopString();
- bString = true;
- break;
default:
{
FormulaTokenRef xTok( PopToken());
if (!nGlobalError)
{
PushTempToken( xTok);
- // Temporarily override the ConvertStringToValue()
+ // Temporarily override the ConvertStringToValue()
// error for GetCellValue() / GetCellValueOrZero()
USHORT nSErr = mnStringNoValueError;
mnStringNoValueError = errNotNumericString;
@@ -7151,7 +7138,7 @@ void ScInterpreter::ScText()
eCellLang = ScGlobal::eLnge;
if (bString)
{
- if (!pFormatter->GetPreviewString( sFormatString, aStr,
+ if (!pFormatter->GetPreviewString( sFormatString, aStr,
aResult, &pColor, eCellLang))
PushIllegalArgument();
else
@@ -7159,7 +7146,7 @@ void ScInterpreter::ScText()
}
else
{
- if (!pFormatter->GetPreviewStringGuess( sFormatString, fVal,
+ if (!pFormatter->GetPreviewStringGuess( sFormatString, fVal,
aResult, &pColor, eCellLang))
PushIllegalArgument();
else
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index dac5f0c99ac5..09b6408fad05 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ double ScInterpreter::GetDateSerial( INT16 nYear, INT16 nMonth, INT16 nDay, bool
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetDateSerial" );
if ( nYear < 100 && !bStrict )
nYear = pFormatter->ExpandTwoDigitYear( nYear );
- // Do not use a default Date ctor here because it asks system time with a
+ // Do not use a default Date ctor here because it asks system time with a
// performance penalty.
INT16 nY, nM, nD;
if (bStrict)
@@ -1806,7 +1806,7 @@ void ScInterpreter::ScIntersect()
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIntersect" );
formula::FormulaTokenRef p2nd = PopToken();
formula::FormulaTokenRef p1st = PopToken();
-
+
if (nGlobalError || !p2nd || !p1st)
{
PushIllegalArgument();
@@ -1954,7 +1954,7 @@ void ScInterpreter::ScRangeFunc()
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScRangeFunc" );
formula::FormulaTokenRef x2 = PopToken();
formula::FormulaTokenRef x1 = PopToken();
-
+
if (nGlobalError || !x2 || !x1)
{
PushIllegalArgument();
@@ -1973,7 +1973,7 @@ void ScInterpreter::ScUnionFunc()
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScUnionFunc" );
formula::FormulaTokenRef p2nd = PopToken();
formula::FormulaTokenRef p1st = PopToken();
-
+
if (nGlobalError || !p2nd || !p1st)
{
PushIllegalArgument();
@@ -1992,7 +1992,7 @@ void ScInterpreter::ScUnionFunc()
ScToken* x1 = static_cast<ScToken*>(p1st.get());
ScToken* x2 = static_cast<ScToken*>(p2nd.get());
-
+
ScTokenRef xRes;
// Append to an existing RefList if there is one.
if (sv1 == svRefList)
@@ -2976,7 +2976,7 @@ void ScInterpreter::ScGetPivotData()
//! should allow numeric constraint values
aFilters[i].mbValIsStr = TRUE;
aFilters[i].maValStr = GetString();
-
+
aFilters[i].maFieldName = GetString();
}
}
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index bcea57703d78..912d52ac31a3 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -754,7 +754,7 @@ double ScInterpreter::GetChiSqDistPDF(double fX, double fDF)
else // fDF is small in most cases, we can iterate
{
if (fmod(fDF,2.0)<0.5)
- {
+ {
// even
fValue = 0.5;
fCount = 2.0;
@@ -862,7 +862,7 @@ double ScInterpreter::GetBeta(double fAlpha, double fBeta)
fResult *= fLanczos;
return fResult;
}
-
+
// Same as GetBeta but with logarithm
double ScInterpreter::GetLogBeta(double fAlpha, double fBeta)
{
@@ -938,7 +938,7 @@ double ScInterpreter::GetBetaDistPDF(double fX, double fA, double fB)
if (fB < 1.0 && fX == 1.0)
{
SetError(errIllegalArgument);
- return HUGE_VAL;
+ return HUGE_VAL;
}
else
return 0.0;
@@ -1124,7 +1124,7 @@ double ScInterpreter::GetBetaDist(double fXin, double fAlpha, double fBeta)
return;
}
}
-
+
void ScInterpreter::ScPhi()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPhi" );
@@ -1344,7 +1344,7 @@ void ScInterpreter::ScB()
}
}
else
- {
+ {
if ( bIsValidX ) // not(0<p<1)
{
if ( p == 0.0 )
@@ -1352,7 +1352,7 @@ void ScInterpreter::ScB()
else if ( p == 1.0 )
PushDouble( (xe == n) ? 1.0 : 0.0 );
else
- PushIllegalArgument();
+ PushIllegalArgument();
}
else
PushIllegalArgument();
@@ -1535,7 +1535,7 @@ void ScInterpreter::ScLogNormDist() //expanded, see #i100119#
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLogNormDist" );
BYTE nParamCount = GetByte();
- if ( !MustHaveParamCount( nParamCount, 1, 4))
+ if ( !MustHaveParamCount( nParamCount, 1, 4))
return;
bool bCumulative = nParamCount == 4 ? GetBool() : true; // cumulative
double sigma = nParamCount >= 3 ? GetDouble() : 1.0; // standard deviation
@@ -3013,7 +3013,7 @@ bool ScInterpreter::CalculateSkew(double& fSum,double& fCount,double& vSum,std::
short nParamCount = GetByte();
if ( !MustHaveParamCountMin( nParamCount, 1 ) )
return false;
-
+
fSum = 0.0;
fCount = 0.0;
vSum = 0.0;
@@ -3302,9 +3302,9 @@ void ScInterpreter::CalculateSmallLarge(BOOL bSmall)
}
SCSIZE k = static_cast<SCSIZE>(f);
vector<double> aSortArray;
- /* TODO: using nth_element() is best for one single value, but LARGE/SMALL
- * actually are defined to return an array of values if an array of
- * positions was passed, in which case, depending on the number of values,
+ /* TODO: using nth_element() is best for one single value, but LARGE/SMALL
+ * actually are defined to return an array of values if an array of
+ * positions was passed, in which case, depending on the number of values,
* we may or will need a real sorted array again, see #i32345. */
//GetSortArray(1, aSortArray);
GetNumberSequenceArray(1, aSortArray);
@@ -3323,7 +3323,7 @@ void ScInterpreter::CalculateSmallLarge(BOOL bSmall)
void ScInterpreter::ScLarge()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLarge" );
- CalculateSmallLarge(FALSE);
+ CalculateSmallLarge(FALSE);
}
void ScInterpreter::ScSmall()
@@ -3962,7 +3962,7 @@ void ScInterpreter::ScProbability()
void ScInterpreter::ScCorrel()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCorrel" );
- // This is identical to ScPearson()
+ // This is identical to ScPearson()
ScPearson();
}
@@ -3972,12 +3972,12 @@ void ScInterpreter::ScCovar()
CalculatePearsonCovar(FALSE,FALSE);
}
-void ScInterpreter::ScPearson()
+void ScInterpreter::ScPearson()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPearson" );
CalculatePearsonCovar(TRUE,FALSE);
}
-void ScInterpreter::CalculatePearsonCovar(BOOL _bPearson,BOOL _bStexy)
+void ScInterpreter::CalculatePearsonCovar(BOOL _bPearson,BOOL _bStexy)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculatePearsonCovar" );
if ( !MustHaveParamCount( GetByte(), 2 ) )
@@ -4088,7 +4088,7 @@ void ScInterpreter::ScRSQ()
void ScInterpreter::ScSTEXY()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSTEXY" );
- CalculatePearsonCovar(TRUE,TRUE);
+ CalculatePearsonCovar(TRUE,TRUE);
}
void ScInterpreter::CalculateSlopeIntercept(BOOL bSlope)
{
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 5c326001ff02..d248211fa7fe 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -198,11 +198,11 @@ double ScInterpreter::GetValueCellValue( const ScAddress& rPos, const ScValueCel
/** Convert string content to numeric value.
-
- Converted are only integer numbers including exponent, and ISO 8601 dates
- and times in their extended formats with separators. Anything else,
- especially fractional numeric values with decimal separators or dates other
- than ISO 8601 would be locale dependent and is a no-no. Leading and
+
+ Converted are only integer numbers including exponent, and ISO 8601 dates
+ and times in their extended formats with separators. Anything else,
+ especially fractional numeric values with decimal separators or dates other
+ than ISO 8601 would be locale dependent and is a no-no. Leading and
trailing blanks are ignored.
The following ISO 8601 formats are converted:
@@ -217,13 +217,13 @@ double ScInterpreter::GetValueCellValue( const ScAddress& rPos, const ScValueCel
hh:mm:ss,s
hh:mm:ss.s
- The century CC may not be omitted and the two-digit year setting is not
- taken into account. Instead of the T date and time separator exactly one
+ The century CC may not be omitted and the two-digit year setting is not
+ taken into account. Instead of the T date and time separator exactly one
blank may be used.
- If a date is given, it must be a valid Gregorian calendar date. In this
+ If a date is given, it must be a valid Gregorian calendar date. In this
case the optional time must be in the range 00:00 to 23:59:59.99999...
- If only time is given, it may have any value for hours, taking elapsed time
+ If only time is given, it may have any value for hours, taking elapsed time
into account; minutes and seconds are limited to the value 59 as well.
*/
@@ -231,16 +231,22 @@ double ScInterpreter::ConvertStringToValue( const String& rStr )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ConvertStringToValue" );
double fValue = 0.0;
+ if (mnStringNoValueError == errCellNoValue)
+ {
+ // Requested that all strings result in 0, error handled by caller.
+ SetError( mnStringNoValueError);
+ return fValue;
+ }
::rtl::OUString aStr( rStr);
rtl_math_ConversionStatus eStatus;
sal_Int32 nParseEnd;
- // Decimal and group separator 0 => only integer and possibly exponent,
+ // Decimal and group separator 0 => only integer and possibly exponent,
// stops at first non-digit non-sign.
fValue = ::rtl::math::stringToDouble( aStr, 0, 0, &eStatus, &nParseEnd);
sal_Int32 nLen;
if (eStatus == rtl_math_ConversionStatus_Ok && nParseEnd < (nLen = aStr.getLength()))
{
- // Not at string end, check for trailing blanks or switch to date or
+ // Not at string end, check for trailing blanks or switch to date or
// time parsing or bail out.
const sal_Unicode* const pStart = aStr.getStr();
const sal_Unicode* p = pStart + nParseEnd;
@@ -264,8 +270,8 @@ double ScInterpreter::ConvertStringToValue( const String& rStr )
nCurFmtType = (bDate ? NUMBERFORMAT_DATE : NUMBERFORMAT_TIME);
nUnit[eState-1] = aStr.copy( 0, nParseEnd).toInt32();
const sal_Unicode* pLastStart = p;
- // Ensure there's no preceding sign. Negative dates
- // currently aren't handled correctly. Also discard
+ // Ensure there's no preceding sign. Negative dates
+ // currently aren't handled correctly. Also discard
// +CCYY-MM-DD
p = pStart;
while (p < pStop && *p == ' ')
@@ -293,12 +299,12 @@ double ScInterpreter::ConvertStringToValue( const String& rStr )
SetError( mnStringNoValueError);
}
pLastStart = p + 1; // hypothetical next start
- // Delimiters must match, a trailing delimiter
+ // Delimiters must match, a trailing delimiter
// yields an invalid date/time.
switch (eState)
{
case month:
- // Month must be followed by separator and
+ // Month must be followed by separator and
// day, no trailing blanks.
if (*p != '-' || (p+1 == pStop))
SetError( mnStringNoValueError);
@@ -306,11 +312,11 @@ double ScInterpreter::ConvertStringToValue( const String& rStr )
case day:
if ((*p != 'T' || (p+1 == pStop)) && *p != ' ')
SetError( mnStringNoValueError);
- // Take one blank as a valid delimiter
+ // Take one blank as a valid delimiter
// between date and time.
break;
case hour:
- // Hour must be followed by separator and
+ // Hour must be followed by separator and
// minute, no trailing blanks.
if (*p != ':' || (p+1 == pStop))
SetError( mnStringNoValueError);
@@ -372,13 +378,13 @@ double ScInterpreter::ConvertStringToValue( const String& rStr )
{
if (bDate && nUnit[day] == 0)
nUnit[day] = 1;
- double fFraction = (nUnit[fraction] <= 0 ? 0.0 :
+ double fFraction = (nUnit[fraction] <= 0 ? 0.0 :
::rtl::math::pow10Exp( nUnit[fraction],
static_cast<int>( -ceil( log10( static_cast<double>( nUnit[fraction]))))));
- fValue = (bDate ? GetDateSerial(
- sal::static_int_cast<INT16>(nUnit[year]),
- sal::static_int_cast<INT16>(nUnit[month]),
- sal::static_int_cast<INT16>(nUnit[day]),
+ fValue = (bDate ? GetDateSerial(
+ sal::static_int_cast<INT16>(nUnit[year]),
+ sal::static_int_cast<INT16>(nUnit[month]),
+ sal::static_int_cast<INT16>(nUnit[day]),
true) : 0.0);
fValue += ((nUnit[hour] * 3600) + (nUnit[minute] * 60) + nUnit[second] + fFraction) / 86400.0;
}
@@ -454,7 +460,7 @@ double ScInterpreter::GetCellValueOrZero( const ScAddress& rPos, const ScBaseCel
case CELLTYPE_STRING:
case CELLTYPE_EDIT:
{
- // SUM(A1:A2) differs from A1+A2. No good. But people insist on
+ // SUM(A1:A2) differs from A1+A2. No good. But people insist on
// it ... #i5658#
String aStr;
if ( eType == CELLTYPE_STRING )
@@ -1230,7 +1236,7 @@ void ScInterpreter::DoubleRefToVars( const ScToken* p,
ScDBRangeBase* ScInterpreter::PopDoubleRef()
{
if (!sp)
- {
+ {
SetError(errUnknownStackVariable);
return NULL;
}
@@ -1247,9 +1253,9 @@ ScDBRangeBase* ScInterpreter::PopDoubleRef()
SCCOL nCol1, nCol2;
SCROW nRow1, nRow2;
SCTAB nTab1, nTab2;
- DoubleRefToVars(static_cast<ScToken*>(p),
+ DoubleRefToVars(static_cast<ScToken*>(p),
nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, false);
-
+
return new ScDBInternalRange(pDok,
ScRange(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2));
}
@@ -3720,8 +3726,8 @@ StackVar ScInterpreter::Interpret()
default : PushError( errUnknownOpCode); break;
}
- // If the function signalled that it pushed a subroutine on the
- // instruction code stack instead of a result, continue with
+ // If the function signalled that it pushed a subroutine on the
+ // instruction code stack instead of a result, continue with
// execution of the subroutine.
if (sp > nStackBase && pStack[sp-1]->GetOpCode() == ocCall)
{
@@ -3964,5 +3970,10 @@ StackVar ScInterpreter::Interpret()
while( maxsp-- )
(*p++)->DecRef();
- return xResult->GetType();
+ StackVar eType = xResult->GetType();
+ if (eType == svMatrix)
+ // Results are immutable in case they would be reused as input for new
+ // interpreters.
+ static_cast<ScToken*>(xResult.operator->())->GetMatrix()->SetImmutable( true);
+ return eType;
}
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index ba4322a3281a..e342a89861ca 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,35 +67,35 @@ const double fInvEpsilon = 1.0E-7;
// -----------------------------------------------------------------------
struct MatrixAdd : public ::std::binary_function<double,double,double>
{
- inline double operator() (const double& lhs, const double& rhs) const
+ inline double operator() (const double& lhs, const double& rhs) const
{
return ::rtl::math::approxAdd( lhs,rhs);
}
};
struct MatrixSub : public ::std::binary_function<double,double,double>
{
- inline double operator() (const double& lhs, const double& rhs) const
+ inline double operator() (const double& lhs, const double& rhs) const
{
return ::rtl::math::approxSub( lhs,rhs);
}
};
struct MatrixMul : public ::std::binary_function<double,double,double>
{
- inline double operator() (const double& lhs, const double& rhs) const
+ inline double operator() (const double& lhs, const double& rhs) const
{
return lhs * rhs;
}
};
struct MatrixDiv : public ::std::binary_function<double,double,double>
{
- inline double operator() (const double& lhs, const double& rhs) const
+ inline double operator() (const double& lhs, const double& rhs) const
{
return ScInterpreter::div( lhs,rhs);
}
};
struct MatrixPow : public ::std::binary_function<double,double,double>
{
- inline double operator() (const double& lhs, const double& rhs) const
+ inline double operator() (const double& lhs, const double& rhs) const
{
return ::pow( lhs,rhs);
}
@@ -310,6 +310,9 @@ ScMatrixRef ScInterpreter::GetNewMat(SCSIZE nC, SCSIZE nR)
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetNewMat" );
ScMatrix* pMat = new ScMatrix( nC, nR);
pMat->SetErrorInterpreter( this);
+ // A temporary matrix is mutable and ScMatrix::CloneIfConst() returns the
+ // very matrix.
+ pMat->SetImmutable( false);
SCSIZE nCols, nRows;
pMat->GetDimensions( nCols, nRows);
if ( nCols != nC || nRows != nR )
@@ -2054,7 +2057,7 @@ void ScInterpreter::ScRGP()
CalulateRGPRKP(FALSE);
}
bool ScInterpreter::CheckMatrix(BOOL _bLOG,BOOL _bTrendGrowth,BYTE& nCase,SCSIZE& nCX,SCSIZE& nCY,SCSIZE& nRX,SCSIZE& nRY,SCSIZE& M,SCSIZE& N,ScMatrixRef& pMatX,ScMatrixRef& pMatY)
-{
+{
nCX = 0;
nCY = 0;
nRX = 0;
@@ -2069,23 +2072,25 @@ bool ScInterpreter::CheckMatrix(BOOL _bLOG,BOOL _bTrendGrowth,BYTE& nCase,SCSIZE
{
PushIllegalArgument();
return false;
- } // if (!pMatY->IsValue(i))
- } // for ( SCSIZE i = 0; i < nCountY; i++ )
+ }
+ }
+
if ( _bLOG )
{
+ ScMatrixRef pNewY = pMatY->CloneIfConst();
for (SCSIZE nElem = 0; nElem < nCountY; nElem++)
{
- const double fVal = pMatY->GetDouble(nElem);
+ const double fVal = pNewY->GetDouble(nElem);
if (fVal <= 0.0)
{
PushIllegalArgument();
return false;
}
else
- pMatY->PutDouble(log(fVal), nElem);
- } // for (nElem = 0; nElem < nCountY; nElem++)
- } // if ( _bRKP )
-
+ pNewY->PutDouble(log(fVal), nElem);
+ }
+ pMatY = pNewY;
+ }
if (pMatX)
{
@@ -2182,7 +2187,7 @@ void ScInterpreter::CalulateRGPRKP(BOOL _bRKP)
SCSIZE M = 0, N = 0;
if ( !CheckMatrix(_bRKP,FALSE,nCase,nCX,nCY,nRX,nRY,M,N,pMatX,pMatY) )
return;
-
+
ScMatrixRef pResMat;
if (nCase == 1)
{
@@ -2341,7 +2346,7 @@ void ScInterpreter::CalulateRGPRKP(BOOL _bRKP)
}
if ( !Calculate4(_bRKP,pResMat,pQ,bConstant,N,M) )
return;
-
+
if (bStats)
Calculate(pResMat,pE,pQ,pV,pMatX,bConstant,N,M,nCase);
}
@@ -2397,7 +2402,7 @@ bool ScInterpreter::Calculate4(BOOL _bExp,ScMatrixRef& pResMat,ScMatrixRef& pQ,B
{
if ( !Calculate3(M,pQ) )
return false;
-
+
}
for (SCSIZE i = 0; i < M+1; i++)
{
@@ -2585,8 +2590,8 @@ void ScInterpreter::CalculateTrendGrowth(BOOL _bGrowth)
SCSIZE M = 0, N = 0;
if ( !CheckMatrix(_bGrowth,TRUE,nCase,nCX,nCY,nRX,nRY,M,N,pMatX,pMatY) )
return;
-
-
+
+
SCSIZE nCXN, nRXN;
SCSIZE nCountXN;
if (!pMatNewX)
diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index 1e3a9a292f16..9596d52ce18f 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ double ScInterpreter::GetGammaContFraction( double fA, double fX )
fPk = fPkm1 * fDenom - fPkm2 * fNum;
fQk = fQkm1 * fDenom - fQkm2 * fNum;
if (fQk != 0.0)
- {
+ {
fR = fPk/fQk;
bFinished = (fabs( (fApprox - fR)/fR ) <= fHalfMachEps);
fApprox = fR;
@@ -139,7 +139,7 @@ double ScInterpreter::GetLowRegIGamma( double fA, double fX )
double ScInterpreter::GetUpRegIGamma( double fA, double fX )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetUpRegIGamma" );
-
+
double fLnFactor= fA*log(fX)-fX-GetLogGamma(fA);
double fFactor = exp(fLnFactor); //Do I need more accuracy than exp(ln()) has?;
if (fX>fA+1.0) // includes fX>1.0
@@ -165,7 +165,7 @@ double ScInterpreter::GetGammaDistPDF( double fX, double fAlpha, double fLambda
const double fLogDblMax = log( ::std::numeric_limits<double>::max());
if (log(fXr) * (fAlpha-1.0) < fLogDblMax && fAlpha < fMaxGammaArgument)
{
- return pow( fXr, fAlpha-1.0) * exp(-fXr) / fLambda / GetGamma(fAlpha);
+ return pow( fXr, fAlpha-1.0) * exp(-fXr) / fLambda / GetGamma(fAlpha);
}
else
{
diff --git a/sc/source/core/tool/lookupcache.cxx b/sc/source/core/tool/lookupcache.cxx
index 3ba66011d0e4..86452a54efde 100644
--- a/sc/source/core/tool/lookupcache.cxx
+++ b/sc/source/core/tool/lookupcache.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/tool/navicfg.cxx b/sc/source/core/tool/navicfg.cxx
index 0991071774ed..21b25ca6ffc5 100644
--- a/sc/source/core/tool/navicfg.cxx
+++ b/sc/source/core/tool/navicfg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 CFGPATH_NAVIPI "Office.Calc/Navigator"
+//! #define CFGPATH_NAVIPI "Office.Calc/Navigator"
//------------------------------------------------------------------
ScNavipiCfg::ScNavipiCfg() :
-//! ConfigItem( OUString::createFromAscii( CFGPATH_NAVIPI ) ),
+//! ConfigItem( OUString::createFromAscii( CFGPATH_NAVIPI ) ),
nListMode(0),
nDragMode(0),
nRootType(0)
@@ -55,7 +55,7 @@ void ScNavipiCfg::SetListMode(USHORT nNew)
if ( nListMode != nNew )
{
nListMode = nNew;
-//! SetModified();
+//! SetModified();
}
}
@@ -64,7 +64,7 @@ void ScNavipiCfg::SetDragMode(USHORT nNew)
if ( nDragMode != nNew )
{
nDragMode = nNew;
-//! SetModified();
+//! SetModified();
}
}
@@ -73,7 +73,7 @@ void ScNavipiCfg::SetRootType(USHORT nNew)
if ( nRootType != nNew )
{
nRootType = nNew;
-//! SetModified();
+//! SetModified();
}
}
diff --git a/sc/source/core/tool/odffmap.cxx b/sc/source/core/tool/odffmap.cxx
index 0ffaa4aae025..4966eb62146b 100644
--- a/sc/source/core/tool/odffmap.cxx
+++ b/sc/source/core/tool/odffmap.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx
index dc63c7819eff..28a2cb7dea8c 100644
--- a/sc/source/core/tool/optutil.cxx
+++ b/sc/source/core/tool/optutil.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +41,9 @@
// static
BOOL ScOptionsUtil::IsMetricSystem()
{
- //! which language should be used here - system language or installed office language?
+ //! which language should be used here - system language or installed office language?
-// MeasurementSystem eSys = Application::GetAppInternational().GetMeasurementSystem();
+// MeasurementSystem eSys = Application::GetAppInternational().GetMeasurementSystem();
MeasurementSystem eSys = ScGlobal::pLocaleData->getMeasurementSystemEnum();
return ( eSys == MEASURE_METRIC );
@@ -68,7 +68,7 @@ void ScLinkConfigItem::SetCommitLink( const Link& rLink )
void ScLinkConfigItem::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& /* aPropertyNames */ )
{
- //! not implemented yet...
+ //! not implemented yet...
}
void ScLinkConfigItem::Commit()
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index a863bc0a68c2..89206e5ba49c 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx
index c701c558310b..e952b9e01d95 100644
--- a/sc/source/core/tool/printopt.cxx
+++ b/sc/source/core/tool/printopt.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +93,13 @@ int ScPrintOptions::operator!=( const ScPrintOptions& rOpt ) const
ScTpPrintItem::ScTpPrintItem( USHORT nWhichP, const ScPrintOptions& rOpt ) :
SfxPoolItem ( nWhichP ),
- theOptions ( rOpt )
+ theOptions ( rOpt )
{
}
ScTpPrintItem::ScTpPrintItem( const ScTpPrintItem& rItem ) :
- SfxPoolItem ( rItem ),
- theOptions ( rItem.theOptions )
+ SfxPoolItem ( rItem ),
+ theOptions ( rItem.theOptions )
{
}
@@ -127,18 +127,18 @@ SfxPoolItem* ScTpPrintItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-#define CFGPATH_PRINT "Office.Calc/Print"
+#define CFGPATH_PRINT "Office.Calc/Print"
-#define SCPRINTOPT_EMPTYPAGES 0
-#define SCPRINTOPT_ALLSHEETS 1
-#define SCPRINTOPT_COUNT 2
+#define SCPRINTOPT_EMPTYPAGES 0
+#define SCPRINTOPT_ALLSHEETS 1
+#define SCPRINTOPT_COUNT 2
Sequence<OUString> ScPrintCfg::GetPropertyNames()
{
static const char* aPropNames[] =
{
- "Page/EmptyPages", // SCPRINTOPT_EMPTYPAGES
- "Other/AllSheets" // SCPRINTOPT_ALLSHEETS
+ "Page/EmptyPages", // SCPRINTOPT_EMPTYPAGES
+ "Other/AllSheets" // SCPRINTOPT_ALLSHEETS
};
Sequence<OUString> aNames(SCPRINTOPT_COUNT);
OUString* pNames = aNames.getArray();
@@ -153,7 +153,7 @@ ScPrintCfg::ScPrintCfg() :
{
Sequence<OUString> aNames = GetPropertyNames();
Sequence<Any> aValues = GetProperties(aNames);
-// EnableNotification(aNames);
+// EnableNotification(aNames);
const Any* pValues = aValues.getConstArray();
DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed");
if(aValues.getLength() == aNames.getLength())
diff --git a/sc/source/core/tool/prnsave.cxx b/sc/source/core/tool/prnsave.cxx
index b432f585e854..39650d786225 100644
--- a/sc/source/core/tool/prnsave.cxx
+++ b/sc/source/core/tool/prnsave.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
//------------------------------------------------------------------
//
-// Daten pro Tabelle
+// Daten pro Tabelle
//
ScPrintSaverTab::ScPrintSaverTab() :
@@ -88,7 +88,7 @@ BOOL ScPrintSaverTab::operator==( const ScPrintSaverTab& rCmp ) const
}
//
-// Daten fuer das ganze Dokument
+// Daten fuer das ganze Dokument
//
ScPrintRangeSaver::ScPrintRangeSaver( SCTAB nCount ) :
diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx
index a2fa45764bcc..9d1c5bcae06e 100644
--- a/sc/source/core/tool/progress.cxx
+++ b/sc/source/core/tool/progress.cxx
@@ -49,16 +49,16 @@
static ScProgress theDummyInterpretProgress;
-SfxProgress* ScProgress::pGlobalProgress = NULL;
-ULONG ScProgress::nGlobalRange = 0;
-ULONG ScProgress::nGlobalPercent = 0;
-BOOL ScProgress::bGlobalNoUserBreak = TRUE;
-ScProgress* ScProgress::pInterpretProgress = &theDummyInterpretProgress;
-ScProgress* ScProgress::pOldInterpretProgress = NULL;
-ULONG ScProgress::nInterpretProgress = 0;
-BOOL ScProgress::bAllowInterpretProgress = TRUE;
-ScDocument* ScProgress::pInterpretDoc;
-BOOL ScProgress::bIdleWasDisabled = FALSE;
+SfxProgress* ScProgress::pGlobalProgress = NULL;
+ULONG ScProgress::nGlobalRange = 0;
+ULONG ScProgress::nGlobalPercent = 0;
+BOOL ScProgress::bGlobalNoUserBreak = TRUE;
+ScProgress* ScProgress::pInterpretProgress = &theDummyInterpretProgress;
+ScProgress* ScProgress::pOldInterpretProgress = NULL;
+ULONG ScProgress::nInterpretProgress = 0;
+BOOL ScProgress::bAllowInterpretProgress = TRUE;
+ScDocument* ScProgress::pInterpretDoc;
+BOOL ScProgress::bIdleWasDisabled = FALSE;
BOOL lcl_IsHiddenDocument( SfxObjectShell* pObjSh )
@@ -97,17 +97,17 @@ ScProgress::ScProgress( SfxObjectShell* pObjSh, const String& rText,
}
else if ( SFX_APP()->IsDowning() )
{
- // kommt vor z.B. beim Speichern des Clipboard-Inhalts als OLE beim Beenden
- // Dann wuerde ein SfxProgress wild im Speicher rummuellen
- //! Soll das so sein ???
+ // kommt vor z.B. beim Speichern des Clipboard-Inhalts als OLE beim Beenden
+ // Dann wuerde ein SfxProgress wild im Speicher rummuellen
+ //! Soll das so sein ???
pProgress = NULL;
}
else if ( pObjSh && ( pObjSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ||
pObjSh->GetProgress() ) )
{
- // #62808# no own progress for embedded objects,
- // #73633# no second progress if the document already has one
+ // #62808# no own progress for embedded objects,
+ // #73633# no second progress if the document already has one
pProgress = NULL;
}
@@ -124,7 +124,7 @@ ScProgress::ScProgress( SfxObjectShell* pObjSh, const String& rText,
ScProgress::ScProgress() :
pProgress( NULL )
-{ // DummyInterpret
+{ // DummyInterpret
}
diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx
index 5b3b92f78ee4..7b129e646856 100644
--- a/sc/source/core/tool/queryparam.cxx
+++ b/sc/source/core/tool/queryparam.cxx
@@ -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
@@ -169,7 +169,7 @@ ScQueryParamTable::~ScQueryParamTable()
// ============================================================================
-ScQueryParam::ScQueryParam() :
+ScQueryParam::ScQueryParam() :
ScQueryParamBase(),
ScQueryParamTable(),
bDestPers(true),
@@ -198,7 +198,7 @@ ScQueryParam::ScQueryParam( const ScDBQueryParamInternal& r ) :
nDestRow(0)
{
}
-
+
//------------------------------------------------------------------------
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 1ab978866c67..6bd25c53aa39 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +31,10 @@
//------------------------------------------------------------------------
-#define SC_RANGELST_CXX //fuer ICC
+#define SC_RANGELST_CXX //fuer ICC
#include <tools/debug.hxx>
-#include <stdlib.h> // qsort
+#include <stdlib.h> // qsort
#include <unotools/collatorwrapper.hxx>
#include "rangelst.hxx"
@@ -67,15 +67,15 @@ USHORT ScRangeList::Parse( const String& rStr, ScDocument* pDoc, USHORT nMask,
if (!cDelimiter)
cDelimiter = ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
- nMask |= SCA_VALID; // falls das jemand vergessen sollte
- USHORT nResult = (USHORT)~0; // alle Bits setzen
- ScRange aRange;
+ nMask |= SCA_VALID; // falls das jemand vergessen sollte
+ USHORT nResult = (USHORT)~0; // alle Bits setzen
+ ScRange aRange;
String aOne;
SCTAB nTab = 0;
if ( pDoc )
{
- //! erste markierte Tabelle gibts nicht mehr am Dokument
- //! -> uebergeben? oder spaeter an den Ranges setzen
+ //! erste markierte Tabelle gibts nicht mehr am Dokument
+ //! -> uebergeben? oder spaeter an den Ranges setzen
}
else
nTab = 0;
@@ -85,18 +85,18 @@ USHORT ScRangeList::Parse( const String& rStr, ScDocument* pDoc, USHORT nMask,
aOne = rStr.GetToken( i, cDelimiter );
// FIXME : broken for Lotus
if ( aOne.Search( ':' ) == STRING_NOTFOUND )
- { // Range muss es sein
+ { // Range muss es sein
String aStrTmp( aOne );
aOne += ':';
aOne += aStrTmp;
}
- aRange.aStart.SetTab( nTab ); // Default Tab wenn nicht angegeben
+ aRange.aStart.SetTab( nTab ); // Default Tab wenn nicht angegeben
USHORT nRes = aRange.Parse( aOne, pDoc, eConv );
if ( (nRes & nMask) == nMask )
Append( aRange );
- nResult &= nRes; // alle gemeinsamen Bits bleiben erhalten
+ nResult &= nRes; // alle gemeinsamen Bits bleiben erhalten
}
- return nResult; // SCA_VALID gesetzt wenn alle ok
+ return nResult; // SCA_VALID gesetzt wenn alle ok
}
else
return 0;
@@ -137,44 +137,44 @@ void ScRangeList::Join( const ScRange& r, BOOL bIsInList )
SCCOL nCol2 = r.aEnd.Col();
SCROW nRow2 = r.aEnd.Row();
SCTAB nTab2 = r.aEnd.Tab();
- ScRangePtr pOver = (ScRangePtr) &r; // fies aber wahr wenn bInList
+ ScRangePtr pOver = (ScRangePtr) &r; // fies aber wahr wenn bInList
ULONG nOldPos = 0;
if ( bIsInList )
- { // merken um ggbf. zu loeschen bzw. wiederherzustellen
+ { // merken um ggbf. zu loeschen bzw. wiederherzustellen
nOldPos = GetPos( pOver );
}
BOOL bJoinedInput = FALSE;
for ( ScRangePtr p = First(); p && pOver; p = Next() )
{
if ( p == pOver )
- continue; // derselbe, weiter mit dem naechsten
+ continue; // derselbe, weiter mit dem naechsten
BOOL bJoined = FALSE;
if ( p->In( r ) )
- { // Range r in Range p enthalten oder identisch
+ { // Range r in Range p enthalten oder identisch
if ( bIsInList )
- bJoined = TRUE; // weg mit Range r
+ bJoined = TRUE; // weg mit Range r
else
- { // das war's dann
- bJoinedInput = TRUE; // nicht anhaengen
- break; // for
+ { // das war's dann
+ bJoinedInput = TRUE; // nicht anhaengen
+ break; // for
}
}
else if ( r.In( *p ) )
- { // Range p in Range r enthalten, r zum neuen Range machen
+ { // Range p in Range r enthalten, r zum neuen Range machen
*p = r;
bJoined = TRUE;
}
if ( !bJoined && p->aStart.Tab() == nTab1 && p->aEnd.Tab() == nTab2 )
- { // 2D
+ { // 2D
if ( p->aStart.Col() == nCol1 && p->aEnd.Col() == nCol2 )
{
if ( p->aStart.Row() == nRow2+1 )
- { // oben
+ { // oben
p->aStart.SetRow( nRow1 );
bJoined = TRUE;
}
else if ( p->aEnd.Row() == nRow1-1 )
- { // unten
+ { // unten
p->aEnd.SetRow( nRow2 );
bJoined = TRUE;
}
@@ -182,12 +182,12 @@ void ScRangeList::Join( const ScRange& r, BOOL bIsInList )
else if ( p->aStart.Row() == nRow1 && p->aEnd.Row() == nRow2 )
{
if ( p->aStart.Col() == nCol2+1 )
- { // links
+ { // links
p->aStart.SetCol( nCol1 );
bJoined = TRUE;
}
else if ( p->aEnd.Col() == nCol1-1 )
- { // rechts
+ { // rechts
p->aEnd.SetCol( nCol2 );
bJoined = TRUE;
}
@@ -196,15 +196,15 @@ void ScRangeList::Join( const ScRange& r, BOOL bIsInList )
if ( bJoined )
{
if ( bIsInList )
- { // innerhalb der Liste Range loeschen
+ { // innerhalb der Liste Range loeschen
Remove( nOldPos );
delete pOver;
pOver = NULL;
if ( nOldPos )
- nOldPos--; // Seek richtig aufsetzen
+ nOldPos--; // Seek richtig aufsetzen
}
bJoinedInput = TRUE;
- Join( *p, TRUE ); // rekursiv!
+ Join( *p, TRUE ); // rekursiv!
}
}
if ( bIsInList )
@@ -217,14 +217,14 @@ void ScRangeList::Join( const ScRange& r, BOOL bIsInList )
BOOL ScRangeList::operator==( const ScRangeList& r ) const
{
if ( this == &r )
- return TRUE; // identische Referenz
+ return TRUE; // identische Referenz
if ( Count() != r.Count() )
return FALSE;
ULONG nCnt = Count();
for ( ULONG nIdx = 0; nIdx < nCnt; nIdx++ )
{
if ( *GetObject( nIdx ) != *r.GetObject( nIdx ) )
- return FALSE; // auch andere Reihenfolge ist ungleich
+ return FALSE; // auch andere Reihenfolge ist ungleich
}
return TRUE;
}
@@ -369,34 +369,34 @@ void ScRangePairList::Join( const ScRangePair& r, BOOL bIsInList )
SCCOL nCol2 = r1.aEnd.Col();
SCROW nRow2 = r1.aEnd.Row();
SCTAB nTab2 = r1.aEnd.Tab();
- ScRangePair* pOver = (ScRangePair*) &r; // fies aber wahr wenn bInList
+ ScRangePair* pOver = (ScRangePair*) &r; // fies aber wahr wenn bInList
ULONG nOldPos = 0;
if ( bIsInList )
- { // merken um ggbf. zu loeschen bzw. wiederherzustellen
+ { // merken um ggbf. zu loeschen bzw. wiederherzustellen
nOldPos = GetPos( pOver );
}
BOOL bJoinedInput = FALSE;
for ( ScRangePair* p = First(); p && pOver; p = Next() )
{
if ( p == pOver )
- continue; // derselbe, weiter mit dem naechsten
+ continue; // derselbe, weiter mit dem naechsten
BOOL bJoined = FALSE;
ScRange& rp1 = p->GetRange(0);
ScRange& rp2 = p->GetRange(1);
if ( rp2 == r2 )
- { // nur wenn Range2 gleich ist
+ { // nur wenn Range2 gleich ist
if ( rp1.In( r1 ) )
- { // RangePair r in RangePair p enthalten oder identisch
+ { // RangePair r in RangePair p enthalten oder identisch
if ( bIsInList )
- bJoined = TRUE; // weg mit RangePair r
+ bJoined = TRUE; // weg mit RangePair r
else
- { // das war's dann
- bJoinedInput = TRUE; // nicht anhaengen
- break; // for
+ { // das war's dann
+ bJoinedInput = TRUE; // nicht anhaengen
+ break; // for
}
}
else if ( r1.In( rp1 ) )
- { // RangePair p in RangePair r enthalten, r zum neuen RangePair machen
+ { // RangePair p in RangePair r enthalten, r zum neuen RangePair machen
*p = r;
bJoined = TRUE;
}
@@ -404,21 +404,21 @@ void ScRangePairList::Join( const ScRangePair& r, BOOL bIsInList )
if ( !bJoined && rp1.aStart.Tab() == nTab1 && rp1.aEnd.Tab() == nTab2
&& rp2.aStart.Tab() == r2.aStart.Tab()
&& rp2.aEnd.Tab() == r2.aEnd.Tab() )
- { // 2D, Range2 muss genauso nebeneinander liegen wie Range1
+ { // 2D, Range2 muss genauso nebeneinander liegen wie Range1
if ( rp1.aStart.Col() == nCol1 && rp1.aEnd.Col() == nCol2
&& rp2.aStart.Col() == r2.aStart.Col()
&& rp2.aEnd.Col() == r2.aEnd.Col() )
{
if ( rp1.aStart.Row() == nRow2+1
&& rp2.aStart.Row() == r2.aEnd.Row()+1 )
- { // oben
+ { // oben
rp1.aStart.SetRow( nRow1 );
rp2.aStart.SetRow( r2.aStart.Row() );
bJoined = TRUE;
}
else if ( rp1.aEnd.Row() == nRow1-1
&& rp2.aEnd.Row() == r2.aStart.Row()-1 )
- { // unten
+ { // unten
rp1.aEnd.SetRow( nRow2 );
rp2.aEnd.SetRow( r2.aEnd.Row() );
bJoined = TRUE;
@@ -430,14 +430,14 @@ void ScRangePairList::Join( const ScRangePair& r, BOOL bIsInList )
{
if ( rp1.aStart.Col() == nCol2+1
&& rp2.aStart.Col() == r2.aEnd.Col()+1 )
- { // links
+ { // links
rp1.aStart.SetCol( nCol1 );
rp2.aStart.SetCol( r2.aStart.Col() );
bJoined = TRUE;
}
else if ( rp1.aEnd.Col() == nCol1-1
&& rp2.aEnd.Col() == r2.aEnd.Col()-1 )
- { // rechts
+ { // rechts
rp1.aEnd.SetCol( nCol2 );
rp2.aEnd.SetCol( r2.aEnd.Col() );
bJoined = TRUE;
@@ -447,15 +447,15 @@ void ScRangePairList::Join( const ScRangePair& r, BOOL bIsInList )
if ( bJoined )
{
if ( bIsInList )
- { // innerhalb der Liste RangePair loeschen
+ { // innerhalb der Liste RangePair loeschen
Remove( nOldPos );
delete pOver;
pOver = NULL;
if ( nOldPos )
- nOldPos--; // Seek richtig aufsetzen
+ nOldPos--; // Seek richtig aufsetzen
}
bJoinedInput = TRUE;
- Join( *p, TRUE ); // rekursiv!
+ Join( *p, TRUE ); // rekursiv!
}
}
if ( bIsInList )
@@ -468,14 +468,14 @@ void ScRangePairList::Join( const ScRangePair& r, BOOL bIsInList )
BOOL ScRangePairList::operator==( const ScRangePairList& r ) const
{
if ( this == &r )
- return TRUE; // identische Referenz
+ return TRUE; // identische Referenz
if ( Count() != r.Count() )
return FALSE;
ULONG nCnt = Count();
for ( ULONG nIdx = 0; nIdx < nCnt; nIdx++ )
{
if ( *GetObject( nIdx ) != *r.GetObject( nIdx ) )
- return FALSE; // auch andere Reihenfolge ist ungleich
+ return FALSE; // auch andere Reihenfolge ist ungleich
}
return TRUE;
}
@@ -586,8 +586,8 @@ ScRangePairList* ScRangePairList::Clone() const
struct ScRangePairNameSort
{
- ScRangePair* pPair;
- ScDocument* pDoc;
+ ScRangePair* pPair;
+ ScDocument* pDoc;
};
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index e81f1f3bd94d..8ac76763f4f0 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +65,14 @@ ScRangeData::ScRangeData( ScDocument* pDok,
const ScAddress& rAddress,
RangeType nType,
const FormulaGrammar::Grammar eGrammar ) :
- aName ( rName ),
+ aName ( rName ),
aUpperName ( ScGlobal::pCharClass->upper( rName ) ),
- pCode ( NULL ),
- aPos ( rAddress ),
- eType ( nType ),
- pDoc ( pDok ),
- nIndex ( 0 ),
- bModified ( FALSE ),
+ pCode ( NULL ),
+ aPos ( rAddress ),
+ eType ( nType ),
+ pDoc ( pDok ),
+ nIndex ( 0 ),
+ bModified ( FALSE ),
mnMaxRow (-1),
mnMaxCol (-1)
{
@@ -113,14 +113,14 @@ ScRangeData::ScRangeData( ScDocument* pDok,
const ScTokenArray& rArr,
const ScAddress& rAddress,
RangeType nType ) :
- aName ( rName ),
+ aName ( rName ),
aUpperName ( ScGlobal::pCharClass->upper( rName ) ),
- pCode ( new ScTokenArray( rArr ) ),
- aPos ( rAddress ),
- eType ( nType ),
- pDoc ( pDok ),
- nIndex ( 0 ),
- bModified ( FALSE ),
+ pCode ( new ScTokenArray( rArr ) ),
+ aPos ( rAddress ),
+ eType ( nType ),
+ pDoc ( pDok ),
+ nIndex ( 0 ),
+ bModified ( FALSE ),
mnMaxRow (-1),
mnMaxCol (-1)
{
@@ -137,27 +137,27 @@ ScRangeData::ScRangeData( ScDocument* pDok,
}
// Die Importfilter haben diesen Test nicht,
// da die benannten Bereiche z.T. noch unvollstaendig sind.
-// if( !pCode->GetCodeLen() )
-// {
-// // ggf. den Fehlercode wg. unvollstaendiger Formel setzen!
-// ScCompiler aComp( pDok, aPos, *pCode );
-// aComp.CompileTokenArray();
-// pCode->DelRPN();
-// }
+// if( !pCode->GetCodeLen() )
+// {
+// // ggf. den Fehlercode wg. unvollstaendiger Formel setzen!
+// ScCompiler aComp( pDok, aPos, *pCode );
+// aComp.CompileTokenArray();
+// pCode->DelRPN();
+// }
}
}
ScRangeData::ScRangeData( ScDocument* pDok,
const String& rName,
const ScAddress& rTarget ) :
- aName ( rName ),
+ aName ( rName ),
aUpperName ( ScGlobal::pCharClass->upper( rName ) ),
- pCode ( new ScTokenArray() ),
- aPos ( rTarget ),
- eType ( RT_NAME ),
- pDoc ( pDok ),
- nIndex ( 0 ),
- bModified ( FALSE ),
+ pCode ( new ScTokenArray() ),
+ aPos ( rTarget ),
+ eType ( RT_NAME ),
+ pDoc ( pDok ),
+ nIndex ( 0 ),
+ bModified ( FALSE ),
mnMaxRow (-1),
mnMaxCol (-1)
{
@@ -174,14 +174,14 @@ ScRangeData::ScRangeData( ScDocument* pDok,
ScRangeData::ScRangeData(const ScRangeData& rScRangeData) :
ScDataObject(),
- aName (rScRangeData.aName),
+ aName (rScRangeData.aName),
aUpperName (rScRangeData.aUpperName),
- pCode (rScRangeData.pCode ? rScRangeData.pCode->Clone() : new ScTokenArray()), // echte Kopie erzeugen (nicht copy-ctor)
- aPos (rScRangeData.aPos),
- eType (rScRangeData.eType),
- pDoc (rScRangeData.pDoc),
- nIndex (rScRangeData.nIndex),
- bModified (rScRangeData.bModified),
+ pCode (rScRangeData.pCode ? rScRangeData.pCode->Clone() : new ScTokenArray()), // echte Kopie erzeugen (nicht copy-ctor)
+ aPos (rScRangeData.aPos),
+ eType (rScRangeData.eType),
+ pDoc (rScRangeData.pDoc),
+ nIndex (rScRangeData.nIndex),
+ bModified (rScRangeData.bModified),
mnMaxRow (rScRangeData.mnMaxRow),
mnMaxCol (rScRangeData.mnMaxCol)
{}
@@ -198,8 +198,8 @@ ScDataObject* ScRangeData::Clone() const
void ScRangeData::GuessPosition()
{
- // setzt eine Position, mit der alle relative Referenzen bei CalcAbsIfRel
- // ohne Fehler verabsolutiert werden koennen
+ // setzt eine Position, mit der alle relative Referenzen bei CalcAbsIfRel
+ // ohne Fehler verabsolutiert werden koennen
DBG_ASSERT(aPos == ScAddress(), "die Position geht jetzt verloren");
@@ -233,9 +233,9 @@ void ScRangeData::GuessPosition()
aPos = ScAddress( (SCCOL)(-nMinCol), (SCROW)(-nMinRow), (SCTAB)(-nMinTab) );
- //! Test
-// DBG_ERROR(String("Pos ")+String((SCCOL)(-nMinCol))+String("/")+
-// String((SCROW)(-nMinRow))+String("/")+String((SCTAB)(-nMinTab)));
+ //! Test
+// DBG_ERROR(String("Pos ")+String((SCCOL)(-nMinCol))+String("/")+
+// String((SCROW)(-nMinRow))+String("/")+String((SCTAB)(-nMinTab)));
}
void ScRangeData::GetSymbol( String& rSymbol, const FormulaGrammar::Grammar eGrammar ) const
@@ -245,7 +245,7 @@ void ScRangeData::GetSymbol( String& rSymbol, const FormulaGrammar::Grammar eGra
aComp.CreateStringFromTokenArray( rSymbol );
}
-void ScRangeData::UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress& rPos,
+void ScRangeData::UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress& rPos,
const FormulaGrammar::Grammar eGrammar )
{
::std::auto_ptr<ScTokenArray> pTemp( pCode->Clone() );
@@ -255,7 +255,7 @@ void ScRangeData::UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress& r
aComp.CreateStringFromTokenArray( rBuffer );
}
-void ScRangeData::UpdateReference( UpdateRefMode eUpdateRefMode,
+void ScRangeData::UpdateReference( UpdateRefMode eUpdateRefMode,
const ScRange& r,
SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
{
@@ -336,15 +336,15 @@ void ScRangeData::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY )
}
}
- bModified = bChanged; // muss direkt hinterher ausgewertet werden
+ bModified = bChanged; // muss direkt hinterher ausgewertet werden
}
-BOOL ScRangeData::operator== (const ScRangeData& rData) const // fuer Undo
+BOOL ScRangeData::operator== (const ScRangeData& rData) const // fuer Undo
{
- if ( nIndex != rData.nIndex ||
- aName != rData.aName ||
- aPos != rData.aPos ||
- eType != rData.eType ) return FALSE;
+ if ( nIndex != rData.nIndex ||
+ aName != rData.aName ||
+ aPos != rData.aPos ||
+ eType != rData.eType ) return FALSE;
USHORT nLen = pCode->GetLen();
if ( nLen != rData.pCode->GetLen() ) return FALSE;
@@ -423,13 +423,13 @@ void ScRangeData::UpdateTabRef(SCTAB nOldTable, USHORT nFlag, SCTAB nNewTable)
aComp.SetGrammar(pDoc->GetGrammar());
switch (nFlag)
{
- case 1: // einfache InsertTab (doc.cxx)
- pRangeData = aComp.UpdateInsertTab(nOldTable, TRUE ); // und CopyTab (doc2.cxx)
+ case 1: // einfache InsertTab (doc.cxx)
+ pRangeData = aComp.UpdateInsertTab(nOldTable, TRUE ); // und CopyTab (doc2.cxx)
break;
- case 2: // einfaches delete (doc.cxx)
+ case 2: // einfaches delete (doc.cxx)
pRangeData = aComp.UpdateDeleteTab(nOldTable, FALSE, TRUE, bChanged);
break;
- case 3: // move (doc2.cxx)
+ case 3: // move (doc2.cxx)
{
pRangeData = aComp.UpdateMoveTab(nOldTable, nNewTable, TRUE );
}
@@ -451,7 +451,7 @@ void ScRangeData::UpdateTabRef(SCTAB nOldTable, USHORT nFlag, SCTAB nNewTable)
}
-void ScRangeData::MakeValidName( String& rName ) // static
+void ScRangeData::MakeValidName( String& rName ) // static
{
//ScCompiler::InitSymbolsNative();
@@ -463,7 +463,7 @@ void ScRangeData::MakeValidName( String& rName ) // static
if ( nPos>0 )
rName.Erase(0,nPos);
- // if the first character is an invalid start character, precede with '_'
+ // if the first character is an invalid start character, precede with '_'
if ( rName.Len() && !ScCompiler::IsCharFlagAllConventions( rName, 0, SC_COMPILER_C_CHAR_NAME ) )
rName.Insert('_',0);
@@ -475,14 +475,14 @@ void ScRangeData::MakeValidName( String& rName ) // static
rName.SetChar( nPos, '_' );
}
- // Ensure that the proposed name is not a reference under any convention,
+ // Ensure that the proposed name is not a reference under any convention,
// same as in IsNameValid()
ScAddress aAddr;
ScRange aRange;
for (int nConv = FormulaGrammar::CONV_UNSPECIFIED; ++nConv < FormulaGrammar::CONV_LAST; )
{
ScAddress::Details details( static_cast<FormulaGrammar::AddressConvention>( nConv ) );
- // Don't check Parse on VALID, any partial only VALID may result in
+ // Don't check Parse on VALID, any partial only VALID may result in
// #REF! during compile later!
while (aRange.Parse( rName, NULL, details) || aAddr.Parse( rName, NULL, details))
{
@@ -496,7 +496,7 @@ void ScRangeData::MakeValidName( String& rName ) // static
BOOL ScRangeData::IsNameValid( const String& rName, ScDocument* pDoc )
{
- /* XXX If changed, sc/source/filter/ftools/ftools.cxx
+ /* XXX If changed, sc/source/filter/ftools/ftools.cxx
* ScfTools::ConvertToScDefinedName needs to be changed too. */
xub_StrLen nPos = 0;
xub_StrLen nLen = rName.Len();
@@ -512,7 +512,7 @@ BOOL ScRangeData::IsNameValid( const String& rName, ScDocument* pDoc )
for (int nConv = FormulaGrammar::CONV_UNSPECIFIED; ++nConv < FormulaGrammar::CONV_LAST; )
{
ScAddress::Details details( static_cast<FormulaGrammar::AddressConvention>( nConv ) );
- // Don't check Parse on VALID, any partial only VALID may result in
+ // Don't check Parse on VALID, any partial only VALID may result in
// #REF! during compile later!
if (aRange.Parse( rName, pDoc, details) || aAddr.Parse( rName, pDoc, details))
return FALSE;
@@ -608,13 +608,13 @@ void ScRangeData::ReplaceRangeNamesInUse( const IndexMap& rMap )
void ScRangeData::ValidateTabRefs()
{
- // try to make sure all relative references and the reference position
- // are within existing tables, so they can be represented as text
- // (if the range of used tables is more than the existing tables,
- // the result may still contain invalid tables, because the relative
- // references aren't changed so formulas stay the same)
+ // try to make sure all relative references and the reference position
+ // are within existing tables, so they can be represented as text
+ // (if the range of used tables is more than the existing tables,
+ // the result may still contain invalid tables, because the relative
+ // references aren't changed so formulas stay the same)
- // find range of used tables
+ // find range of used tables
SCTAB nMinTab = aPos.Tab();
SCTAB nMaxTab = nMinTab;
@@ -646,8 +646,8 @@ void ScRangeData::ValidateTabRefs()
SCTAB nTabCount = pDoc->GetTableCount();
if ( nMaxTab >= nTabCount && nMinTab > 0 )
{
- // move position and relative tab refs
- // The formulas that use the name are not changed by this
+ // move position and relative tab refs
+ // The formulas that use the name are not changed by this
SCTAB nMove = nMinTab;
aPos.SetTab( aPos.Tab() - nMove );
@@ -729,7 +729,7 @@ BOOL ScRangeName::SearchName( const String& rName, USHORT& rIndex ) const
return FALSE;
}
-void ScRangeName::UpdateReference( UpdateRefMode eUpdateRefMode,
+void ScRangeName::UpdateReference( UpdateRefMode eUpdateRefMode,
const ScRange& rRange,
SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
{
@@ -757,7 +757,7 @@ BOOL ScRangeName::IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const
BOOL ScRangeName::Insert(ScDataObject* pScDataObject)
{
- if (!((ScRangeData*)pScDataObject)->GetIndex()) // schon gesetzt?
+ if (!((ScRangeData*)pScDataObject)->GetIndex()) // schon gesetzt?
{
((ScRangeData*)pScDataObject)->SetIndex( GetEntryIndex() );
}
diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx
index 5584fb1c37e2..6eeaa5ef8d0e 100644
--- a/sc/source/core/tool/rangeseq.cxx
+++ b/sc/source/core/tool/rangeseq.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ long lcl_DoubleToLong( double fVal )
if ( fInt >= LONG_MIN && fInt <= LONG_MAX )
return (long)fInt;
else
- return 0; // out of range
+ return 0; // out of range
}
BOOL ScRangeToSequence::FillLongArray( uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange )
@@ -78,7 +78,7 @@ BOOL ScRangeToSequence::FillLongArray( uno::Any& rAny, ScDocument* pDoc, const S
}
rAny <<= aRowSeq;
- return TRUE; //! check for errors
+ return TRUE; //! check for errors
}
@@ -134,7 +134,7 @@ BOOL ScRangeToSequence::FillDoubleArray( uno::Any& rAny, ScDocument* pDoc, const
}
rAny <<= aRowSeq;
- return TRUE; //! check for errors
+ return TRUE; //! check for errors
}
@@ -193,7 +193,7 @@ BOOL ScRangeToSequence::FillStringArray( uno::Any& rAny, ScDocument* pDoc, const
}
rAny <<= aRowSeq;
- return TRUE; //! check for errors
+ return TRUE; //! check for errors
}
@@ -241,13 +241,13 @@ BOOL ScRangeToSequence::FillStringArray( uno::Any& rAny, const ScMatrix* pMatrix
double lcl_GetValueFromCell( ScBaseCell& rCell )
{
- //! ScBaseCell member function?
+ //! ScBaseCell member function?
CellType eType = rCell.GetCellType();
if ( eType == CELLTYPE_VALUE )
return ((ScValueCell&)rCell).GetValue();
else if ( eType == CELLTYPE_FORMULA )
- return ((ScFormulaCell&)rCell).GetValue(); // called only if result is value
+ return ((ScFormulaCell&)rCell).GetValue(); // called only if result is value
DBG_ERROR( "GetValueFromCell: wrong type" );
return 0;
@@ -291,7 +291,7 @@ BOOL ScRangeToSequence::FillMixedArray( uno::Any& rAny, ScDocument* pDoc, const
rElement <<= rtl::OUString( pCell->GetStringData() );
}
else
- rElement <<= rtl::OUString(); // empty: empty string
+ rElement <<= rtl::OUString(); // empty: empty string
}
pRowAry[nRow] = aColSeq;
}
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 9f6526a54cf6..97f55d40157a 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +52,10 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-BOOL ScRangeUtil::MakeArea( const String& rAreaStr,
- ScArea& rArea,
- ScDocument* pDoc,
- SCTAB nTab,
+BOOL ScRangeUtil::MakeArea( const String& rAreaStr,
+ ScArea& rArea,
+ ScDocument* pDoc,
+ SCTAB nTab,
ScAddress::Details const & rDetails ) const
{
// Eingabe in rAreaStr: "$Tabelle1.$A1:$D17"
@@ -63,12 +63,12 @@ BOOL ScRangeUtil::MakeArea( const String& rAreaStr,
// BROKEN BROKEN BROKEN
// but it is only used in the consolidate dialog. Ignore for now.
- BOOL nSuccess = FALSE;
- USHORT nPointPos = rAreaStr.Search('.');
- USHORT nColonPos = rAreaStr.Search(':');
- String aStrArea( rAreaStr );
- ScRefAddress startPos;
- ScRefAddress endPos;
+ BOOL nSuccess = FALSE;
+ USHORT nPointPos = rAreaStr.Search('.');
+ USHORT nColonPos = rAreaStr.Search(':');
+ String aStrArea( rAreaStr );
+ ScRefAddress startPos;
+ ScRefAddress endPos;
if ( nColonPos == STRING_NOTFOUND )
if ( nPointPos != STRING_NOTFOUND )
@@ -81,22 +81,22 @@ BOOL ScRangeUtil::MakeArea( const String& rAreaStr,
if ( nSuccess )
rArea = ScArea( startPos.Tab(),
- startPos.Col(), startPos.Row(),
- endPos.Col(), endPos.Row() );
+ startPos.Col(), startPos.Row(),
+ endPos.Col(), endPos.Row() );
return nSuccess;
}
//------------------------------------------------------------------------
-void ScRangeUtil::CutPosString( const String& theAreaStr,
- String& thePosStr ) const
+void ScRangeUtil::CutPosString( const String& theAreaStr,
+ String& thePosStr ) const
{
- String aPosStr;
+ String aPosStr;
// BROKEN BROKEN BROKEN
// but it is only used in the consolidate dialog. Ignore for now.
- USHORT nColonPos = theAreaStr.Search(':');
+ USHORT nColonPos = theAreaStr.Search(':');
if ( nColonPos != STRING_NOTFOUND )
aPosStr = theAreaStr.Copy( 0, nColonPos ); // ':' nicht mitkopieren
@@ -108,10 +108,10 @@ void ScRangeUtil::CutPosString( const String& theAreaStr,
//------------------------------------------------------------------------
-BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr,
- ScDocument* pDoc,
- ScArea*** pppAreas,
- USHORT* pAreaCount,
+BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr,
+ ScDocument* pDoc,
+ ScArea*** pppAreas,
+ USHORT* pAreaCount,
BOOL /* bAcceptCellRef */,
ScAddress::Details const & rDetails ) const
{
@@ -124,9 +124,9 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr,
/*
* Erwartet wird ein String der Form
- * "$Tabelle1.$A$1:$Tabelle3.$D$17"
+ * "$Tabelle1.$A$1:$Tabelle3.$D$17"
* Wenn bAcceptCellRef == TRUE ist, wird auch ein String der Form
- * "$Tabelle1.$A$1"
+ * "$Tabelle1.$A$1"
* akzeptiert.
*
* als Ergebnis wird ein ScArea-Array angelegt,
@@ -134,10 +134,10 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr,
* wieder geloescht werden muss!
*/
- BOOL bStrOk = FALSE;
- String aTempAreaStr(rAreaStr);
- String aStartPosStr;
- String aEndPosStr;
+ BOOL bStrOk = FALSE;
+ String aTempAreaStr(rAreaStr);
+ String aStartPosStr;
+ String aEndPosStr;
if ( STRING_NOTFOUND == aTempAreaStr.Search(':') )
{
@@ -145,16 +145,16 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr,
aTempAreaStr.Append(rAreaStr);
}
- USHORT nColonPos = aTempAreaStr.Search(':');
+ USHORT nColonPos = aTempAreaStr.Search(':');
if ( STRING_NOTFOUND != nColonPos
&& STRING_NOTFOUND != aTempAreaStr.Search('.') )
{
- ScRefAddress aStartPos;
- ScRefAddress aEndPos;
+ ScRefAddress aStartPos;
+ ScRefAddress aEndPos;
- aStartPosStr = aTempAreaStr.Copy( 0, nColonPos );
- aEndPosStr = aTempAreaStr.Copy( nColonPos+1, STRING_LEN );
+ aStartPosStr = aTempAreaStr.Copy( 0, nColonPos );
+ aEndPosStr = aTempAreaStr.Copy( nColonPos+1, STRING_LEN );
if ( ConvertSingleRef( pDoc, aStartPosStr, 0, aStartPos, rDetails ) )
{
@@ -171,13 +171,13 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr,
if ( pppAreas && pAreaCount ) // Array zurueckgegeben?
{
- SCTAB nStartTab = aStartPos.Tab();
- SCTAB nEndTab = aEndPos.Tab();
- USHORT nTabCount = static_cast<USHORT>(nEndTab-nStartTab+1);
- ScArea** theAreas = new ScArea*[nTabCount];
- SCTAB nTab = 0;
- USHORT i = 0;
- ScArea theArea( 0, aStartPos.Col(), aStartPos.Row(),
+ SCTAB nStartTab = aStartPos.Tab();
+ SCTAB nEndTab = aEndPos.Tab();
+ USHORT nTabCount = static_cast<USHORT>(nEndTab-nStartTab+1);
+ ScArea** theAreas = new ScArea*[nTabCount];
+ SCTAB nTab = 0;
+ USHORT i = 0;
+ ScArea theArea( 0, aStartPos.Col(), aStartPos.Row(),
aEndPos.Col(), aEndPos.Row() );
nTab = nStartTab;
@@ -199,17 +199,17 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr,
//------------------------------------------------------------------------
-BOOL ScRangeUtil::IsAbsArea( const String& rAreaStr,
- ScDocument* pDoc,
- SCTAB nTab,
- String* pCompleteStr,
- ScRefAddress* pStartPos,
- ScRefAddress* pEndPos,
+BOOL ScRangeUtil::IsAbsArea( const String& rAreaStr,
+ ScDocument* pDoc,
+ SCTAB nTab,
+ String* pCompleteStr,
+ ScRefAddress* pStartPos,
+ ScRefAddress* pEndPos,
ScAddress::Details const & rDetails ) const
{
- BOOL bIsAbsArea = FALSE;
- ScRefAddress startPos;
- ScRefAddress endPos;
+ BOOL bIsAbsArea = FALSE;
+ ScRefAddress startPos;
+ ScRefAddress endPos;
bIsAbsArea = ConvertDoubleRef( pDoc, rAreaStr, nTab, startPos, endPos, rDetails );
@@ -241,17 +241,17 @@ BOOL ScRangeUtil::IsAbsArea( const String& rAreaStr,
//------------------------------------------------------------------------
-BOOL ScRangeUtil::IsAbsPos( const String& rPosStr,
- ScDocument* pDoc,
- SCTAB nTab,
- String* pCompleteStr,
- ScRefAddress* pPosTripel,
+BOOL ScRangeUtil::IsAbsPos( const String& rPosStr,
+ ScDocument* pDoc,
+ SCTAB nTab,
+ String* pCompleteStr,
+ ScRefAddress* pPosTripel,
ScAddress::Details const & rDetails ) const
{
- BOOL bIsAbsPos = FALSE;
- ScRefAddress thePos;
+ BOOL bIsAbsPos = FALSE;
+ ScRefAddress thePos;
- bIsAbsPos = ConvertSingleRef( pDoc, rPosStr, nTab, thePos, rDetails );
+ bIsAbsPos = ConvertSingleRef( pDoc, rPosStr, nTab, thePos, rDetails );
thePos.SetRelCol( FALSE );
thePos.SetRelRow( FALSE );
thePos.SetRelTab( FALSE );
@@ -269,16 +269,16 @@ BOOL ScRangeUtil::IsAbsPos( const String& rPosStr,
//------------------------------------------------------------------------
-BOOL ScRangeUtil::MakeRangeFromName (
- const String& rName,
- ScDocument* pDoc,
- SCTAB nCurTab,
- ScRange& rRange,
- RutlNameScope eScope,
+BOOL ScRangeUtil::MakeRangeFromName (
+ const String& rName,
+ ScDocument* pDoc,
+ SCTAB nCurTab,
+ ScRange& rRange,
+ RutlNameScope eScope,
ScAddress::Details const & rDetails ) const
{
BOOL bResult=FALSE;
- ScRangeUtil aRangeUtil;
+ ScRangeUtil aRangeUtil;
SCTAB nTab = 0;
SCCOL nColStart = 0;
SCCOL nColEnd = 0;
@@ -288,26 +288,26 @@ BOOL ScRangeUtil::MakeRangeFromName (
if( eScope==RUTL_NAMES )
{
ScRangeName& rRangeNames = *(pDoc->GetRangeName());
- USHORT nAt = 0;
+ USHORT nAt = 0;
if ( rRangeNames.SearchName( rName, nAt ) )
{
ScRangeData* pData = rRangeNames[nAt];
- String aStrArea;
- ScRefAddress aStartPos;
- ScRefAddress aEndPos;
+ String aStrArea;
+ ScRefAddress aStartPos;
+ ScRefAddress aEndPos;
pData->GetSymbol( aStrArea );
if ( IsAbsArea( aStrArea, pDoc, nCurTab,
NULL, &aStartPos, &aEndPos, rDetails ) )
{
- nTab = aStartPos.Tab();
+ nTab = aStartPos.Tab();
nColStart = aStartPos.Col();
nRowStart = aStartPos.Row();
nColEnd = aEndPos.Col();
nRowEnd = aEndPos.Row();
- bResult = TRUE;
+ bResult = TRUE;
}
else
{
@@ -316,25 +316,25 @@ BOOL ScRangeUtil::MakeRangeFromName (
if ( IsAbsPos( aStrArea, pDoc, nCurTab,
NULL, &aStartPos, rDetails ) )
{
- nTab = aStartPos.Tab();
+ nTab = aStartPos.Tab();
nColStart = nColEnd = aStartPos.Col();
nRowStart = nRowEnd = aStartPos.Row();
- bResult = TRUE;
+ bResult = TRUE;
}
}
}
}
else if( eScope==RUTL_DBASE )
{
- ScDBCollection& rDbNames = *(pDoc->GetDBCollection());
- USHORT nAt = 0;
+ ScDBCollection& rDbNames = *(pDoc->GetDBCollection());
+ USHORT nAt = 0;
if ( rDbNames.SearchName( rName, nAt ) )
{
ScDBData* pData = rDbNames[nAt];
pData->GetArea( nTab, nColStart, nRowStart,
- nColEnd, nRowEnd );
+ nColEnd, nRowEnd );
bResult = TRUE;
}
}
@@ -378,10 +378,10 @@ sal_Int32 ScRangeStringConverter::IndexOf(
sal_Int32 nOffset,
sal_Unicode cQuote )
{
- sal_Int32 nLength = rString.getLength();
- sal_Int32 nIndex = nOffset;
- sal_Bool bQuoted = sal_False;
- sal_Bool bExitLoop = sal_False;
+ sal_Int32 nLength = rString.getLength();
+ sal_Int32 nIndex = nOffset;
+ sal_Bool bQuoted = sal_False;
+ sal_Bool bExitLoop = sal_False;
while( !bExitLoop && (nIndex < nLength) )
{
@@ -399,9 +399,9 @@ sal_Int32 ScRangeStringConverter::IndexOfDifferent(
sal_Unicode cSearchChar,
sal_Int32 nOffset )
{
- sal_Int32 nLength = rString.getLength();
- sal_Int32 nIndex = nOffset;
- sal_Bool bExitLoop = sal_False;
+ sal_Int32 nLength = rString.getLength();
+ sal_Int32 nIndex = nOffset;
+ sal_Bool bExitLoop = sal_False;
while( !bExitLoop && (nIndex < nLength) )
{
@@ -447,9 +447,9 @@ void ScRangeStringConverter::AppendTableName(OUStringBuffer& rBuf, const OUStrin
sal_Int32 ScRangeStringConverter::GetTokenCount( const OUString& rString, sal_Unicode cSeperator, sal_Unicode cQuote )
{
- OUString sToken;
- sal_Int32 nCount = 0;
- sal_Int32 nOffset = 0;
+ OUString sToken;
+ sal_Int32 nCount = 0;
+ sal_Int32 nOffset = 0;
while( nOffset >= 0 )
{
GetTokenByOffset( sToken, rString, nOffset, cQuote, cSeperator );
@@ -521,7 +521,7 @@ sal_Bool ScRangeStringConverter::GetRangeFromString(
// #i77703# chart ranges in the file format contain both sheet names, even for an external reference sheet.
// This isn't parsed by ScRange, so try to parse the two Addresses then.
if (!bResult)
- {
+ {
bResult = ((rRange.aStart.Parse( aUIString.Copy(0, (xub_StrLen)nIndex), const_cast<ScDocument*>(pDocument),
eConv) & SCA_VALID) == SCA_VALID) &&
((rRange.aEnd.Parse( aUIString.Copy((xub_StrLen)nIndex+1), const_cast<ScDocument*>(pDocument),
@@ -777,7 +777,7 @@ void ScRangeStringConverter::GetStringFromRangeList(
}
static void lcl_appendCellAddress(
- rtl::OUStringBuffer& rBuf, ScDocument* pDoc, const ScAddress& rCell,
+ rtl::OUStringBuffer& rBuf, ScDocument* pDoc, const ScAddress& rCell,
const ScAddress::ExternalInfo& rExtInfo)
{
if (rExtInfo.mbExternal)
@@ -893,7 +893,7 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con
OUStringBuffer aBuf = aBeginCell.copy(0, nDotPos);
if (nEndCellDotPos == 0)
- {
+ {
// workaround for old syntax (probably pre-chart2 age?)
// e.g. Sheet1.A1:.B2
aBuf.append(aEndCell);
@@ -906,7 +906,7 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con
}
aEndCell = aBuf.makeStringAndClear();
}
-
+
ScAddress::ExternalInfo aExtInfo1, aExtInfo2;
ScAddress aCell1, aCell2;
rtl::OUString aBuf;
@@ -961,18 +961,18 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con
ScArea::ScArea( SCTAB tab,
SCCOL colStart, SCROW rowStart,
SCCOL colEnd, SCROW rowEnd ) :
- nTab ( tab ),
- nColStart( colStart ), nRowStart( rowStart ),
- nColEnd ( colEnd ), nRowEnd ( rowEnd )
+ nTab ( tab ),
+ nColStart( colStart ), nRowStart( rowStart ),
+ nColEnd ( colEnd ), nRowEnd ( rowEnd )
{
}
//------------------------------------------------------------------------
ScArea::ScArea( const ScArea& r ) :
- nTab ( r.nTab ),
- nColStart( r.nColStart ), nRowStart( r.nRowStart ),
- nColEnd ( r.nColEnd ), nRowEnd ( r.nRowEnd )
+ nTab ( r.nTab ),
+ nColStart( r.nColStart ), nRowStart( r.nRowStart ),
+ nColEnd ( r.nColEnd ), nRowEnd ( r.nRowEnd )
{
}
@@ -980,11 +980,11 @@ ScArea::ScArea( const ScArea& r ) :
ScArea& ScArea::operator=( const ScArea& r )
{
- nTab = r.nTab;
- nColStart = r.nColStart;
- nRowStart = r.nRowStart;
- nColEnd = r.nColEnd;
- nRowEnd = r.nRowEnd;
+ nTab = r.nTab;
+ nColStart = r.nColStart;
+ nRowStart = r.nRowStart;
+ nColEnd = r.nColEnd;
+ nRowEnd = r.nRowEnd;
return *this;
}
@@ -992,11 +992,11 @@ ScArea& ScArea::operator=( const ScArea& r )
BOOL ScArea::operator==( const ScArea& r ) const
{
- return ( (nTab == r.nTab)
- && (nColStart == r.nColStart)
- && (nRowStart == r.nRowStart)
- && (nColEnd == r.nColEnd)
- && (nRowEnd == r.nRowEnd) );
+ return ( (nTab == r.nTab)
+ && (nColStart == r.nColStart)
+ && (nRowStart == r.nRowStart)
+ && (nColEnd == r.nColEnd)
+ && (nRowEnd == r.nRowEnd) );
}
//------------------------------------------------------------------------
@@ -1014,7 +1014,7 @@ BOOL ScAreaNameIterator::Next( String& rName, ScRange& rRange )
{
for (;;)
{
- if ( bFirstPass ) // erst Bereichsnamen
+ if ( bFirstPass ) // erst Bereichsnamen
{
if ( pRangeName && nPos < pRangeName->GetCount() )
{
@@ -1022,7 +1022,7 @@ BOOL ScAreaNameIterator::Next( String& rName, ScRange& rRange )
if ( pData && pData->IsValidReference(rRange) )
{
rName = pData->GetName();
- return TRUE; // gefunden
+ return TRUE; // gefunden
}
}
else
@@ -1031,7 +1031,7 @@ BOOL ScAreaNameIterator::Next( String& rName, ScRange& rRange )
nPos = 0;
}
}
- if ( !bFirstPass ) // dann DB-Bereiche
+ if ( !bFirstPass ) // dann DB-Bereiche
{
if ( pDBCollection && nPos < pDBCollection->GetCount() )
{
@@ -1040,11 +1040,11 @@ BOOL ScAreaNameIterator::Next( String& rName, ScRange& rRange )
{
pData->GetArea( rRange );
rName = pData->GetName();
- return TRUE; // gefunden
+ return TRUE; // gefunden
}
}
else
- return FALSE; // gibt nichts mehr
+ return FALSE; // gibt nichts mehr
}
}
}
diff --git a/sc/source/core/tool/rechead.cxx b/sc/source/core/tool/rechead.cxx
index 6da946463697..0207a9b024fb 100644
--- a/sc/source/core/tool/rechead.cxx
+++ b/sc/source/core/tool/rechead.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScMultipleReadHeader::ScMultipleReadHeader(SvStream& rNewStream) :
if ( rStream.GetError() == SVSTREAM_OK )
rStream.SetError( SVSTREAM_FILEFORMAT_ERROR );
- // alles auf 0, damit BytesLeft() wenigstens abbricht
+ // alles auf 0, damit BytesLeft() wenigstens abbricht
pBuf = NULL; pMemStream = NULL;
nEntryEnd = nDataPos;
}
@@ -98,10 +98,10 @@ void ScMultipleReadHeader::EndEntry()
{
if ( rStream.GetError() == SVSTREAM_OK )
rStream.SetError( SCWARN_IMPORT_INFOLOST );
- rStream.Seek( nEntryEnd ); // Rest ueberspringen
+ rStream.Seek( nEntryEnd ); // Rest ueberspringen
}
- nEntryEnd = nTotalEnd; // den ganzen Rest, wenn kein StartEntry kommt
+ nEntryEnd = nTotalEnd; // den ganzen Rest, wenn kein StartEntry kommt
}
void ScMultipleReadHeader::StartEntry()
@@ -145,12 +145,12 @@ ScMultipleWriteHeader::~ScMultipleWriteHeader()
rStream << static_cast<sal_uInt32>(aMemStream.Tell());
rStream.Write( aMemStream.GetData(), aMemStream.Tell() );
- if ( nDataEnd - nDataPos != nDataSize ) // Default getroffen?
+ if ( nDataEnd - nDataPos != nDataSize ) // Default getroffen?
{
nDataSize = nDataEnd - nDataPos;
ULONG nPos = rStream.Tell();
rStream.Seek(nDataPos-sizeof(sal_uInt32));
- rStream << nDataSize; // Groesse am Anfang eintragen
+ rStream << nDataSize; // Groesse am Anfang eintragen
rStream.Seek(nPos);
}
}
diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx
index 47774d348044..bc739e2d1cf2 100644
--- a/sc/source/core/tool/refdata.cxx
+++ b/sc/source/core/tool/refdata.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -137,29 +137,29 @@ void ScSingleRefData::CalcAbsIfRel( const ScAddress& rPos )
//UNUSED2008-05 if ( !Flags.bFlag3D )
//UNUSED2008-05 Flags.bTabRel = TRUE; // ist bei einigen aelteren Dokumenten nicht gesetzt
//UNUSED2008-05 }
-//UNUSED2008-05
-//UNUSED2008-05
+//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 /*
//UNUSED2008-05 bis Release 3.1 sah Store so aus
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 BYTE n = ( ( r.bOldFlag3D & 0x03 ) << 6 ) // RelName, 3D
//UNUSED2008-05 | ( ( r.bRelTab & 0x03 ) << 4 ) // Relative, RelAbs
//UNUSED2008-05 | ( ( r.bRelRow & 0x03 ) << 2 )
//UNUSED2008-05 | ( r.bRelCol & 0x03 );
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 bis Release 3.1 sah Load so aus
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 r.bRelCol = ( n & 0x03 );
//UNUSED2008-05 r.bRelRow = ( ( n >> 2 ) & 0x03 );
//UNUSED2008-05 r.bRelTab = ( ( n >> 4 ) & 0x03 );
//UNUSED2008-05 r.bOldFlag3D = ( ( n >> 6 ) & 0x03 );
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 bRelCol == SR_DELETED war identisch mit bRelCol == (SR_RELATIVE | SR_RELABS)
//UNUSED2008-05 leider..
//UNUSED2008-05 3.1 liest Zukunft: Deleted wird nicht unbedingt erkannt, nur wenn auch Relativ.
//UNUSED2008-05 Aber immer noch nCol > MAXCOL und gut sollte sein..
//UNUSED2008-05 */
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 BYTE ScSingleRefData::CreateStoreByteFromFlags() const
//UNUSED2008-05 {
//UNUSED2008-05 return (BYTE)(
@@ -173,8 +173,8 @@ void ScSingleRefData::CalcAbsIfRel( const ScAddress& rPos )
//UNUSED2008-05 | (Flags.bColRel & 0x01)
//UNUSED2008-05 );
//UNUSED2008-05 }
-//UNUSED2008-05
-//UNUSED2008-05
+//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 void ScSingleRefData::CreateFlagsFromLoadByte( BYTE n )
//UNUSED2008-05 {
//UNUSED2008-05 Flags.bColRel = (n & 0x01 );
@@ -347,7 +347,7 @@ ScComplexRefData& ScComplexRefData::Extend( const ScSingleRefData & rRef, const
Ref2.SetColRel( aRef.IsColRel());
if (Ref2.nRow == aRef.nRow)
Ref2.SetRowRel( aRef.IsRowRel());
- // $Sheet1.$A$5:$A$6 => $Sheet1.$A$5:$A$5:$A$6 => $Sheet1.$A$5:$A$6, and
+ // $Sheet1.$A$5:$A$6 => $Sheet1.$A$5:$A$5:$A$6 => $Sheet1.$A$5:$A$6, and
// not $Sheet1.$A$5:Sheet1.$A$6 (with invisible second 3D, but relative).
if (Ref2.nTab == aRef.nTab)
Ref2.SetTabRel( bInherit3Dtemp ? Ref1.IsTabRel() : aRef.IsTabRel());
diff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxx
index cdb5962b2b9c..5e30e16655a8 100644
--- a/sc/source/core/tool/reffind.cxx
+++ b/sc/source/core/tool/reffind.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +41,7 @@
// STATIC DATA -----------------------------------------------------------
-// incl. Doppelpunkt -> Doppelte Referenzen werden einzeln behandelt
+// incl. Doppelpunkt -> Doppelte Referenzen werden einzeln behandelt
const sal_Unicode __FAR_DATA ScRefFinder::pDelimiters[] = {
'=','(',')',';','+','-','*','/','^','&',' ','{','}','<','>',':', 0
};
@@ -80,11 +80,11 @@ ScRefFinder::~ScRefFinder()
USHORT lcl_NextFlags( USHORT nOld )
{
- USHORT nNew = nOld & 7; // die drei Abs-Flags
- nNew = ( nNew - 1 ) & 7; // weiterzaehlen
+ USHORT nNew = nOld & 7; // die drei Abs-Flags
+ nNew = ( nNew - 1 ) & 7; // weiterzaehlen
if (!(nOld & SCA_TAB_3D))
- nNew &= ~SCA_TAB_ABSOLUTE; // nicht 3D -> nie absolut!
+ nNew &= ~SCA_TAB_ABSOLUTE; // nicht 3D -> nie absolut!
return ( nOld & 0xfff8 ) | nNew;
}
@@ -94,9 +94,9 @@ void ScRefFinder::ToggleRel( xub_StrLen nStartPos, xub_StrLen nEndPos )
xub_StrLen nLen = aFormula.Len();
if (!nLen)
return;
- const sal_Unicode* pSource = aFormula.GetBuffer(); // fuer schnellen Zugriff
+ const sal_Unicode* pSource = aFormula.GetBuffer(); // fuer schnellen Zugriff
- // Selektion erweitern, und statt Selektion Start- und Endindex
+ // Selektion erweitern, und statt Selektion Start- und Endindex
if ( nEndPos < nStartPos )
{
@@ -118,7 +118,7 @@ void ScRefFinder::ToggleRel( xub_StrLen nStartPos, xub_StrLen nEndPos )
xub_StrLen nLoopStart = nStartPos;
while ( nLoopStart <= nEndPos )
{
- // Formel zerlegen
+ // Formel zerlegen
xub_StrLen nEStart = nLoopStart;
while ( nEStart <= nEndPos && !IsText(pSource[nEStart]) )
@@ -132,7 +132,7 @@ void ScRefFinder::ToggleRel( xub_StrLen nStartPos, xub_StrLen nEndPos )
aSep = aFormula.Copy( nLoopStart, nEStart-nLoopStart );
aExpr = aFormula.Copy( nEStart, nEEnd-nEStart );
- // Test, ob aExpr eine Referenz ist
+ // Test, ob aExpr eine Referenz ist
USHORT nResult = aAddr.Parse( aExpr, pDoc, pDoc->GetAddressConvention() );
if ( nResult & SCA_VALID )
@@ -142,13 +142,13 @@ void ScRefFinder::ToggleRel( xub_StrLen nStartPos, xub_StrLen nEndPos )
xub_StrLen nAbsStart = nStartPos+aResult.Len()+aSep.Len();
- if (!nFound) // erste Referenz ?
+ if (!nFound) // erste Referenz ?
nSelStart = nAbsStart;
- nSelEnd = nAbsStart+aExpr.Len(); // Selektion, keine Indizes
+ nSelEnd = nAbsStart+aExpr.Len(); // Selektion, keine Indizes
++nFound;
}
- // zusammenbauen
+ // zusammenbauen
aResult += aSep;
aResult += aExpr;
diff --git a/sc/source/core/tool/refreshtimer.cxx b/sc/source/core/tool/refreshtimer.cxx
index 5520aac6d6eb..af8e54e0695c 100644
--- a/sc/source/core/tool/refreshtimer.cxx
+++ b/sc/source/core/tool/refreshtimer.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/tool/reftokenhelper.cxx b/sc/source/core/tool/reftokenhelper.cxx
index f4976a914c39..b89e9fe2f026 100644
--- a/sc/source/core/tool/reftokenhelper.cxx
+++ b/sc/source/core/tool/reftokenhelper.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxx
index ad11190be75d..2a5e297a80b0 100644
--- a/sc/source/core/tool/refupdat.cxx
+++ b/sc/source/core/tool/refupdat.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ BOOL lcl_MoveStart( R& rRef, U nStart, S nDelta, U nMask )
if ( rRef >= nStart )
rRef = sal::static_int_cast<R>( rRef + nDelta );
else if ( nDelta < 0 && rRef >= nStart + nDelta )
- rRef = nStart + nDelta; //! begrenzen ???
+ rRef = nStart + nDelta; //! begrenzen ???
if ( rRef < 0 )
{
rRef = 0;
@@ -68,7 +68,7 @@ BOOL lcl_MoveEnd( R& rRef, U nStart, S nDelta, U nMask )
if ( rRef >= nStart )
rRef = sal::static_int_cast<R>( rRef + nDelta );
else if ( nDelta < 0 && rRef >= nStart + nDelta )
- rRef = nStart + nDelta - 1; //! begrenzen ???
+ rRef = nStart + nDelta - 1; //! begrenzen ???
if ( rRef < 0 )
{
rRef = 0;
@@ -91,25 +91,25 @@ BOOL lcl_MoveReorder( R& rRef, U nStart, U nEnd, S nDelta )
return TRUE;
}
- if ( nDelta > 0 ) // nach hinten schieben
+ if ( nDelta > 0 ) // nach hinten schieben
{
if ( rRef >= nStart && rRef <= nEnd + nDelta )
{
if ( rRef <= nEnd )
rRef = sal::static_int_cast<R>( rRef + nDelta ); // in the moved range
else
- rRef -= nEnd - nStart + 1; // nachruecken
+ rRef -= nEnd - nStart + 1; // nachruecken
return TRUE;
}
}
- else // nach vorne schieben
+ else // nach vorne schieben
{
if ( rRef >= nStart + nDelta && rRef <= nEnd )
{
if ( rRef >= nStart )
rRef = sal::static_int_cast<R>( rRef + nDelta ); // in the moved range
else
- rRef += nEnd - nStart + 1; // nachruecken
+ rRef += nEnd - nStart + 1; // nachruecken
return TRUE;
}
}
@@ -173,7 +173,7 @@ BOOL lcl_MoveRefPart( R& rRef1Val, BOOL& rRef1Del, BOOL bDo1,
}
}
if ( bDel )
- { // move deleted along
+ { // move deleted along
rRef1Val = sal::static_int_cast<R>( rRef1Val + nDelta );
rRef2Val = sal::static_int_cast<R>( rRef2Val + nDelta );
}
@@ -204,23 +204,23 @@ BOOL lcl_MoveRefPart( R& rRef1Val, BOOL& rRef1Del, BOOL bDo1,
template< typename R, typename S, typename U >
BOOL IsExpand( R n1, R n2, U nStart, S nD )
-{ //! vor normalem Move...
+{ //! vor normalem Move...
return
- nD > 0 // Insert
- && n1 < n2 // mindestens zwei Cols/Rows/Tabs in Ref
+ nD > 0 // Insert
+ && n1 < n2 // mindestens zwei Cols/Rows/Tabs in Ref
&& (
- (nStart <= n1 && n1 < nStart + nD) // n1 innerhalb des Insert
- || (n2 + 1 == nStart) // n2 direkt vor Insert
- ); // n1 < nStart <= n2 wird sowieso expanded!
+ (nStart <= n1 && n1 < nStart + nD) // n1 innerhalb des Insert
+ || (n2 + 1 == nStart) // n2 direkt vor Insert
+ ); // n1 < nStart <= n2 wird sowieso expanded!
}
template< typename R, typename S, typename U >
void Expand( R& n1, R& n2, U nStart, S nD )
-{ //! nach normalem Move..., nur wenn IsExpand vorher TRUE war!
+{ //! nach normalem Move..., nur wenn IsExpand vorher TRUE war!
//! erst das Ende
if ( n2 + 1 == nStart )
- { // am Ende
+ { // am Ende
n2 = sal::static_int_cast<R>( n2 + nD );
return;
}
@@ -374,7 +374,7 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eUpdateRefMo
}
else if (eUpdateRefMode == URM_REORDER)
{
- // bisher nur fuer nDz (MoveTab)
+ // bisher nur fuer nDz (MoveTab)
DBG_ASSERT ( !nDx && !nDy, "URM_REORDER fuer x und y noch nicht implementiert" );
if ( nDz && (theCol1 >= nCol1) && (theCol2 <= nCol2) &&
@@ -390,11 +390,11 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eUpdateRefMo
if ( eRet == UR_NOTHING )
{
if (oldCol1 != theCol1
- || oldRow1 != theRow1
- || oldTab1 != theTab1
- || oldCol2 != theCol2
- || oldRow2 != theRow2
- || oldTab2 != theTab2
+ || oldRow1 != theRow1
+ || oldTab1 != theTab1
+ || oldCol2 != theCol2
+ || oldRow2 != theRow2
+ || oldTab2 != theTab2
)
eRet = UR_UPDATED;
}
@@ -662,11 +662,11 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eMode,
if ( eRet == UR_NOTHING )
{
if (oldCol1 != rRef.Ref1.nCol
- || oldRow1 != rRef.Ref1.nRow
- || oldTab1 != rRef.Ref1.nTab
- || oldCol2 != rRef.Ref2.nCol
- || oldRow2 != rRef.Ref2.nRow
- || oldTab2 != rRef.Ref2.nTab
+ || oldRow1 != rRef.Ref1.nRow
+ || oldTab1 != rRef.Ref1.nTab
+ || oldCol2 != rRef.Ref2.nCol
+ || oldRow2 != rRef.Ref2.nRow
+ || oldTab2 != rRef.Ref2.nTab
)
eRet = UR_UPDATED;
}
@@ -684,7 +684,7 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eMode,
&& rRef.Ref2.nRow <= nRow2-nDy
&& rRef.Ref2.nTab <= nTab2-nDz )
{
- eRet = Move( pDoc, rPos, nDx, nDy, nDz, rRef, FALSE, TRUE ); // immer verschieben
+ eRet = Move( pDoc, rPos, nDx, nDy, nDz, rRef, FALSE, TRUE ); // immer verschieben
}
else if ( nDz && r.In( rPos ) )
{
@@ -698,7 +698,7 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eMode,
rRef.CalcRelFromAbs( rPos );
}
else if( eMode == URM_COPY && r.In( rPos ) )
- eRet = Move( pDoc, rPos, nDx, nDy, nDz, rRef, FALSE, FALSE ); // nur relative
+ eRet = Move( pDoc, rPos, nDx, nDy, nDz, rRef, FALSE, FALSE ); // nur relative
// sollte nicht mehr verwendet werden muessen
else if (eWhat != ScRefUpdate::ABSOLUTE)
rRef.CalcRelFromAbs( rPos );
@@ -803,11 +803,11 @@ ScRefUpdateRes ScRefUpdate::Move( ScDocument* pDoc, const ScAddress& rPos,
if ( eRet == UR_NOTHING )
{
if (oldCol1 != rRef.Ref1.nCol
- || oldRow1 != rRef.Ref1.nRow
- || oldTab1 != rRef.Ref1.nTab
- || oldCol2 != rRef.Ref2.nCol
- || oldRow2 != rRef.Ref2.nRow
- || oldTab2 != rRef.Ref2.nTab
+ || oldRow1 != rRef.Ref1.nRow
+ || oldTab1 != rRef.Ref1.nTab
+ || oldCol2 != rRef.Ref2.nCol
+ || oldRow2 != rRef.Ref2.nRow
+ || oldTab2 != rRef.Ref2.nTab
)
eRet = UR_UPDATED;
}
@@ -817,7 +817,7 @@ ScRefUpdateRes ScRefUpdate::Move( ScDocument* pDoc, const ScAddress& rPos,
return eRet;
}
-void ScRefUpdate::MoveRelWrap( ScDocument* pDoc, const ScAddress& rPos,
+void ScRefUpdate::MoveRelWrap( ScDocument* pDoc, const ScAddress& rPos,
SCCOL nMaxCol, SCROW nMaxRow, ScComplexRefData& rRef )
{
if( rRef.Ref1.IsColRel() )
@@ -900,8 +900,8 @@ ScRefUpdateRes ScRefUpdate::UpdateTranspose( ScDocument* pDoc,
//------------------------------------------------------------------
-// UpdateGrow - erweitert Referenzen, die genau auf den Bereich zeigen
-// kommt ohne Dokument aus
+// UpdateGrow - erweitert Referenzen, die genau auf den Bereich zeigen
+// kommt ohne Dokument aus
ScRefUpdateRes ScRefUpdate::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY,
@@ -909,8 +909,8 @@ ScRefUpdateRes ScRefUpdate::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCRO
{
ScRefUpdateRes eRet = UR_NOTHING;
- // in Y-Richtung darf die Ref auch eine Zeile weiter unten anfangen,
- // falls ein Bereich Spaltenkoepfe enthaelt
+ // in Y-Richtung darf die Ref auch eine Zeile weiter unten anfangen,
+ // falls ein Bereich Spaltenkoepfe enthaelt
BOOL bUpdateX = ( nGrowX &&
rRef.Ref1.nCol == rArea.aStart.Col() && rRef.Ref2.nCol == rArea.aEnd.Col() &&
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index fbb859b64ebf..96fca9077869 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
//------------------------------------------------------------------------
-void ScMatrix::CreateMatrix(SCSIZE nC, SCSIZE nR) // nur fuer ctor
+void ScMatrix::CreateMatrix(SCSIZE nC, SCSIZE nR) // nur fuer ctor
{
pErrorInterpreter = NULL;
nColCount = nC;
@@ -81,6 +81,11 @@ ScMatrix* ScMatrix::Clone() const
return pScMat;
}
+ScMatrix* ScMatrix::CloneIfConst()
+{
+ return (mbCloneIfConst || IsEternalRef()) ? Clone() : this;
+}
+
void ScMatrix::Resize( SCSIZE nC, SCSIZE nR)
{
Clear();
@@ -91,7 +96,7 @@ ScMatrix* ScMatrix::CloneAndExtend( SCSIZE nNewCols, SCSIZE nNewRows ) const
{
ScMatrix* pScMat = new ScMatrix( nNewCols, nNewRows);
MatCopy(*pScMat);
- pScMat->SetErrorInterpreter( pErrorInterpreter);
+ pScMat->SetErrorInterpreter( pErrorInterpreter);
return pScMat;
}
@@ -102,15 +107,15 @@ void ScMatrix::SetErrorAtInterpreter( USHORT nError ) const
}
//
-// File format: USHORT columns, USHORT rows, (columns*rows) entries:
-// BYTE type ( CELLTYPE_NONE, CELLTYPE_VALUE, CELLTYPE_STRING ); nothing, double or String
+// File format: USHORT columns, USHORT rows, (columns*rows) entries:
+// BYTE type ( CELLTYPE_NONE, CELLTYPE_VALUE, CELLTYPE_STRING ); nothing, double or String
//
ScMatrix::ScMatrix(SvStream& /* rStream */)
: pErrorInterpreter( NULL)
, nRefCnt(0)
{
-#if SC_ROWLIMIT_STREAM_ACCESS
+#if SC_ROWLIMIT_STREAM_ACCESS
#error address types changed!
USHORT nC;
USHORT nR;
@@ -147,7 +152,7 @@ ScMatrix::ScMatrix(SvStream& /* rStream */)
if ( i < nCount )
{
if (!mnValType)
- ResetIsString(); // init string flags
+ ResetIsString(); // init string flags
mnValType[i] = ( nType == CELLTYPE_NONE ? SC_MATVAL_EMPTY : SC_MATVAL_STRING );
mnNonValue++;
@@ -165,7 +170,7 @@ ScMatrix::ScMatrix(SvStream& /* rStream */)
void ScMatrix::Store(SvStream& /* rStream */) const
{
-#if SC_ROWLIMIT_STREAM_ACCESS
+#if SC_ROWLIMIT_STREAM_ACCESS
#error address types changed!
SCSIZE nCount = nColCount * nRowCount;
// Don't store matrix with more than USHORT max elements, old versions
@@ -692,7 +697,7 @@ void ScMatrix::CompareEqual()
if ( mnValType )
{
for ( SCSIZE j=0; j<n; j++ )
- if ( IsValueType( mnValType[j]) ) // else: #WERT!
+ if ( IsValueType( mnValType[j]) ) // else: #WERT!
if ( ::rtl::math::isFinite( pMat[j].fVal)) // else: DoubleError
pMat[j].fVal = (pMat[j].fVal == 0.0);
}
@@ -710,7 +715,7 @@ void ScMatrix::CompareNotEqual()
if ( mnValType )
{
for ( SCSIZE j=0; j<n; j++ )
- if ( IsValueType( mnValType[j]) ) // else: #WERT!
+ if ( IsValueType( mnValType[j]) ) // else: #WERT!
if ( ::rtl::math::isFinite( pMat[j].fVal)) // else: DoubleError
pMat[j].fVal = (pMat[j].fVal != 0.0);
}
@@ -728,7 +733,7 @@ void ScMatrix::CompareLess()
if ( mnValType )
{
for ( SCSIZE j=0; j<n; j++ )
- if ( IsValueType( mnValType[j]) ) // else: #WERT!
+ if ( IsValueType( mnValType[j]) ) // else: #WERT!
if ( ::rtl::math::isFinite( pMat[j].fVal)) // else: DoubleError
pMat[j].fVal = (pMat[j].fVal < 0.0);
}
@@ -746,7 +751,7 @@ void ScMatrix::CompareGreater()
if ( mnValType )
{
for ( SCSIZE j=0; j<n; j++ )
- if ( IsValueType( mnValType[j]) ) // else: #WERT!
+ if ( IsValueType( mnValType[j]) ) // else: #WERT!
if ( ::rtl::math::isFinite( pMat[j].fVal)) // else: DoubleError
pMat[j].fVal = (pMat[j].fVal > 0.0);
}
@@ -764,7 +769,7 @@ void ScMatrix::CompareLessEqual()
if ( mnValType )
{
for ( SCSIZE j=0; j<n; j++ )
- if ( IsValueType( mnValType[j]) ) // else: #WERT!
+ if ( IsValueType( mnValType[j]) ) // else: #WERT!
if ( ::rtl::math::isFinite( pMat[j].fVal)) // else: DoubleError
pMat[j].fVal = (pMat[j].fVal <= 0.0);
}
@@ -782,7 +787,7 @@ void ScMatrix::CompareGreaterEqual()
if ( mnValType )
{
for ( SCSIZE j=0; j<n; j++ )
- if ( IsValueType( mnValType[j]) ) // else: #WERT!
+ if ( IsValueType( mnValType[j]) ) // else: #WERT!
if ( ::rtl::math::isFinite( pMat[j].fVal)) // else: DoubleError
pMat[j].fVal = (pMat[j].fVal >= 0.0);
}
diff --git a/sc/source/core/tool/stringutil.cxx b/sc/source/core/tool/stringutil.cxx
index 28a4bc6755c2..ae6247ffadef 100644
--- a/sc/source/core/tool/stringutil.cxx
+++ b/sc/source/core/tool/stringutil.cxx
@@ -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/source/core/tool/subtotal.cxx b/sc/source/core/tool/subtotal.cxx
index 077b5a9d9751..15d85de5c337 100644
--- a/sc/source/core/tool/subtotal.cxx
+++ b/sc/source/core/tool/subtotal.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/tool/token.cxx b/sc/source/core/tool/token.cxx
index 81862c49fd21..66665b0ea8cd 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ namespace
rRef.SetFlag3D( ( rAPI.Flags & sheet::ReferenceFlags::SHEET_3D ) != 0 );
rRef.SetRelName( ( rAPI.Flags & sheet::ReferenceFlags::RELATIVE_NAME ) != 0 );
}
-
+
void lcl_ExternalRefToCalc( ScSingleRefData& rRef, const sheet::SingleReference& rAPI )
{
rRef.InitFlags();
@@ -108,7 +108,7 @@ namespace
}
//
} // namespace
-//
+//
// ImpTokenIterator wird je Interpreter angelegt, mehrfache auch durch
// SubCode via FormulaTokenIterator Push/Pop moeglich
IMPL_FIXEDMEMPOOL_NEWDEL( ImpTokenIterator, 32, 16 )
@@ -245,7 +245,7 @@ void ScRawToken::SetExternalSingleRef( sal_uInt16 nFileId, const String& rTabNam
nRefCnt = 0;
extref.nFileId = nFileId;
- extref.aRef.Ref1 =
+ extref.aRef.Ref1 =
extref.aRef.Ref2 = rRef;
xub_StrLen n = rTabName.Len();
@@ -286,7 +286,7 @@ void ScRawToken::SetExternalName( sal_uInt16 nFileId, const String& rName )
//UNUSED2008-05 eType = svDouble;
//UNUSED2008-05 nValue = (double)rVal;
//UNUSED2008-05 nRefCnt = 0;
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 }
//UNUSED2008-05 void ScRawToken::SetMatrix( ScMatrix* p )
//UNUSED2008-05 {
@@ -295,13 +295,13 @@ void ScRawToken::SetExternalName( sal_uInt16 nFileId, const String& rName )
//UNUSED2008-05 pMat = p;
//UNUSED2008-05 nRefCnt = 0;
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 ScComplexRefData& ScRawToken::GetReference()
//UNUSED2008-05 {
//UNUSED2008-05 DBG_ASSERT( lcl_IsReference( eOp, GetType() ), "GetReference: no Ref" );
//UNUSED2008-05 return aRef;
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 void ScRawToken::SetReference( ScComplexRefData& rRef )
//UNUSED2008-05 {
//UNUSED2008-05 DBG_ASSERT( lcl_IsReference( eOp, GetType() ), "SetReference: no Ref" );
@@ -573,7 +573,7 @@ BOOL ScToken::Is3DRef() const
FormulaTokenRef ScToken::ExtendRangeReference( FormulaToken & rTok1, FormulaToken & rTok2,
const ScAddress & rPos, bool bReuseDoubleRef )
{
-
+
StackVar sv1, sv2;
// Doing a RangeOp with RefList is probably utter nonsense, but Xcl
// supports it, so do we.
@@ -849,7 +849,7 @@ ScExternalSingleRefToken::ScExternalSingleRefToken( sal_uInt16 nFileId, const St
}
ScExternalSingleRefToken::ScExternalSingleRefToken( const ScExternalSingleRefToken& r ) :
- ScToken(r),
+ ScToken(r),
mnFileId(r.mnFileId),
maTabName(r.maTabName),
maSingleRef(r.maSingleRef)
@@ -915,7 +915,7 @@ ScExternalDoubleRefToken::ScExternalDoubleRefToken( sal_uInt16 nFileId, const St
}
ScExternalDoubleRefToken::ScExternalDoubleRefToken( const ScExternalDoubleRefToken& r ) :
- ScToken(r),
+ ScToken(r),
mnFileId(r.mnFileId),
maTabName(r.maTabName),
maDoubleRef(r.maDoubleRef)
@@ -1054,10 +1054,10 @@ ScJumpMatrixToken::~ScJumpMatrixToken()
}
double ScEmptyCellToken::GetDouble() const { return 0.0; }
-const String & ScEmptyCellToken::GetString() const
-{
+const String & ScEmptyCellToken::GetString() const
+{
static String aDummyString;
- return aDummyString;
+ return aDummyString;
}
BOOL ScEmptyCellToken::operator==( const FormulaToken& r ) const
{
@@ -1310,7 +1310,7 @@ BOOL ScTokenArray::IsValidReference( ScRange& rRange ) const
////////////////////////////////////////////////////////////////////////////
-ScTokenArray::ScTokenArray()
+ScTokenArray::ScTokenArray()
{
}
diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx
index 21f80cb1c628..7905159e5440 100644
--- a/sc/source/core/tool/unitconv.cxx
+++ b/sc/source/core/tool/unitconv.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
#include "unitconv.hxx"
#include "global.hxx"
-#include "viewopti.hxx" //! move ScLinkConfigItem to separate header!
+#include "viewopti.hxx" //! move ScLinkConfigItem to separate header!
using namespace utl;
using namespace rtl;
@@ -43,7 +43,7 @@ using namespace com::sun::star::uno;
// --------------------------------------------------------------------
-const sal_Unicode cDelim = 0x01; // Delimiter zwischen From und To
+const sal_Unicode cDelim = 0x01; // Delimiter zwischen From und To
// --- ScUnitConverterData --------------------------------------------
@@ -97,16 +97,16 @@ void ScUnitConverterData::BuildIndexString( String& rStr,
// --- ScUnitConverter ------------------------------------------------
-#define CFGPATH_UNIT "Office.Calc/UnitConversion"
-#define CFGSTR_UNIT_FROM "FromUnit"
-#define CFGSTR_UNIT_TO "ToUnit"
-#define CFGSTR_UNIT_FACTOR "Factor"
+#define CFGPATH_UNIT "Office.Calc/UnitConversion"
+#define CFGSTR_UNIT_FROM "FromUnit"
+#define CFGSTR_UNIT_TO "ToUnit"
+#define CFGSTR_UNIT_FACTOR "Factor"
ScUnitConverter::ScUnitConverter( USHORT nInit, USHORT nDeltaP ) :
ScStrCollection( nInit, nDeltaP, FALSE )
{
- // read from configuration - "convert.ini" is no longer used
- //! config item as member to allow change of values
+ // read from configuration - "convert.ini" is no longer used
+ //! config item as member to allow change of values
ScLinkConfigItem aConfigItem( OUString::createFromAscii( CFGPATH_UNIT ) );
diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx
index 08609eeff940..aeef03325819 100644
--- a/sc/source/core/tool/userlist.cxx
+++ b/sc/source/core/tool/userlist.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -180,7 +180,7 @@ StringCompare ScUserListData::ICompare(const String& rSubStr1, const String& rSu
}
ScUserList::ScUserList(USHORT nLim, USHORT nDel) :
- ScCollection ( nLim, nDel )
+ ScCollection ( nLim, nDel )
{
using namespace ::com::sun::star;
@@ -253,8 +253,8 @@ ScDataObject* ScUserList::Clone() const
ScUserListData* ScUserList::GetData(const String& rSubStr) const
{
- USHORT nIndex;
- USHORT i = 0;
+ USHORT nIndex;
+ USHORT i = 0;
for (i=0; i < nCount; i++)
if (((ScUserListData*)pItems[i])->GetSubIndex(rSubStr, nIndex))
return (ScUserListData*)pItems[i];
@@ -276,7 +276,7 @@ BOOL ScUserList::operator==( const ScUserList& r ) const
pOtherData = (ScUserListData*)r.At(i);
bEqual =( (pMyData->nTokenCount == pOtherData->nTokenCount)
- && (pMyData->aStr == pOtherData->aStr) );
+ && (pMyData->aStr == pOtherData->aStr) );
}
}
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 7dc36bc1b548..518f713b68bb 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +50,7 @@ using namespace com::sun::star::uno;
//------------------------------------------------------------------
-TYPEINIT1(ScTpViewItem, SfxPoolItem);
+TYPEINIT1(ScTpViewItem, SfxPoolItem);
#define SC_VERSION ((USHORT)302)
@@ -64,19 +64,19 @@ void ScGridOptions::SetDefaults()
{
*this = ScGridOptions();
- // Raster-Defaults sind jetzt zwischen den Apps unterschiedlich
- // darum hier selber eintragen (alles in 1/100mm)
+ // Raster-Defaults sind jetzt zwischen den Apps unterschiedlich
+ // darum hier selber eintragen (alles in 1/100mm)
if ( ScOptionsUtil::IsMetricSystem() )
{
- nFldDrawX = 1000; // 1cm
+ nFldDrawX = 1000; // 1cm
nFldDrawY = 1000;
nFldSnapX = 1000;
nFldSnapY = 1000;
}
else
{
- nFldDrawX = 1270; // 0,5"
+ nFldDrawX = 1270; // 0,5"
nFldDrawY = 1270;
nFldSnapX = 1270;
nFldSnapY = 1270;
@@ -89,17 +89,17 @@ void ScGridOptions::SetDefaults()
const ScGridOptions& ScGridOptions::operator=( const ScGridOptions& rCpy )
{
- nFldDrawX = rCpy.nFldDrawX; // UINT32
- nFldDrawX = rCpy.nFldDrawX;
- nFldDivisionX = rCpy.nFldDivisionX;
- nFldDrawY = rCpy.nFldDrawY;
- nFldDivisionY = rCpy.nFldDivisionY;
- nFldSnapX = rCpy.nFldSnapX;
- nFldSnapY = rCpy.nFldSnapY;
- bUseGridsnap = rCpy.bUseGridsnap; // BitBool
- bSynchronize = rCpy.bSynchronize;
- bGridVisible = rCpy.bGridVisible;
- bEqualGrid = rCpy.bEqualGrid;
+ nFldDrawX = rCpy.nFldDrawX; // UINT32
+ nFldDrawX = rCpy.nFldDrawX;
+ nFldDivisionX = rCpy.nFldDivisionX;
+ nFldDrawY = rCpy.nFldDrawY;
+ nFldDivisionY = rCpy.nFldDivisionY;
+ nFldSnapX = rCpy.nFldSnapX;
+ nFldSnapY = rCpy.nFldSnapY;
+ bUseGridsnap = rCpy.bUseGridsnap; // BitBool
+ bSynchronize = rCpy.bSynchronize;
+ bGridVisible = rCpy.bGridVisible;
+ bEqualGrid = rCpy.bEqualGrid;
return *this;
}
@@ -108,17 +108,17 @@ const ScGridOptions& ScGridOptions::operator=( const ScGridOptions& rCpy )
int ScGridOptions::operator==( const ScGridOptions& rCpy ) const
{
- return ( nFldDrawX == rCpy.nFldDrawX
- && nFldDrawX == rCpy.nFldDrawX
- && nFldDivisionX == rCpy.nFldDivisionX
- && nFldDrawY == rCpy.nFldDrawY
- && nFldDivisionY == rCpy.nFldDivisionY
- && nFldSnapX == rCpy.nFldSnapX
- && nFldSnapY == rCpy.nFldSnapY
- && bUseGridsnap == rCpy.bUseGridsnap
- && bSynchronize == rCpy.bSynchronize
- && bGridVisible == rCpy.bGridVisible
- && bEqualGrid == rCpy.bEqualGrid );
+ return ( nFldDrawX == rCpy.nFldDrawX
+ && nFldDrawX == rCpy.nFldDrawX
+ && nFldDivisionX == rCpy.nFldDivisionX
+ && nFldDrawY == rCpy.nFldDrawY
+ && nFldDivisionY == rCpy.nFldDivisionY
+ && nFldSnapX == rCpy.nFldSnapX
+ && nFldSnapY == rCpy.nFldSnapY
+ && bUseGridsnap == rCpy.bUseGridsnap
+ && bSynchronize == rCpy.bSynchronize
+ && bGridVisible == rCpy.bGridVisible
+ && bEqualGrid == rCpy.bEqualGrid );
}
@@ -148,22 +148,22 @@ __EXPORT ScViewOptions::~ScViewOptions()
void ScViewOptions::SetDefaults()
{
- aOptArr[ VOPT_FORMULAS ] =
- aOptArr[ VOPT_SYNTAX ] =
+ aOptArr[ VOPT_FORMULAS ] =
+ aOptArr[ VOPT_SYNTAX ] =
aOptArr[ VOPT_HELPLINES ] =
aOptArr[ VOPT_BIGHANDLES ] = FALSE;
- aOptArr[ VOPT_NOTES ] =
- aOptArr[ VOPT_NULLVALS ] =
- aOptArr[ VOPT_VSCROLL ] =
- aOptArr[ VOPT_HSCROLL ] =
+ aOptArr[ VOPT_NOTES ] =
+ aOptArr[ VOPT_NULLVALS ] =
+ aOptArr[ VOPT_VSCROLL ] =
+ aOptArr[ VOPT_HSCROLL ] =
aOptArr[ VOPT_TABCONTROLS ] =
- aOptArr[ VOPT_OUTLINER ] =
- aOptArr[ VOPT_HEADER ] =
- aOptArr[ VOPT_GRID ] =
- aOptArr[ VOPT_ANCHOR ] =
+ aOptArr[ VOPT_OUTLINER ] =
+ aOptArr[ VOPT_HEADER ] =
+ aOptArr[ VOPT_GRID ] =
+ aOptArr[ VOPT_ANCHOR ] =
aOptArr[ VOPT_PAGEBREAKS ] =
aOptArr[ VOPT_SOLIDHANDLES] =
- aOptArr[ VOPT_CLIPMARKS ] = TRUE;
+ aOptArr[ VOPT_CLIPMARKS ] = TRUE;
aModeArr[VOBJ_TYPE_OLE ] =
aModeArr[VOBJ_TYPE_CHART] =
@@ -191,12 +191,12 @@ const ScViewOptions& ScViewOptions::operator=( const ScViewOptions& rCpy )
{
USHORT i;
- for ( i=0; i<MAX_OPT; i++ ) aOptArr [i] = rCpy.aOptArr[i];
+ for ( i=0; i<MAX_OPT; i++ ) aOptArr [i] = rCpy.aOptArr[i];
for ( i=0; i<MAX_TYPE; i++ ) aModeArr[i] = rCpy.aModeArr[i];
- aGridCol = rCpy.aGridCol;
- aGridColName = rCpy.aGridColName;
- aGridOpt = rCpy.aGridOpt;
+ aGridCol = rCpy.aGridCol;
+ aGridColName = rCpy.aGridColName;
+ aGridOpt = rCpy.aGridOpt;
return *this;
}
@@ -205,15 +205,15 @@ const ScViewOptions& ScViewOptions::operator=( const ScViewOptions& rCpy )
int ScViewOptions::operator==( const ScViewOptions& rOpt ) const
{
- BOOL bEqual = TRUE;
- USHORT i;
+ BOOL bEqual = TRUE;
+ USHORT i;
for ( i=0; i<MAX_OPT && bEqual; i++ ) bEqual = (aOptArr [i] == rOpt.aOptArr[i]);
for ( i=0; i<MAX_TYPE && bEqual; i++ ) bEqual = (aModeArr[i] == rOpt.aModeArr[i]);
bEqual = bEqual && (aGridCol == rOpt.aGridCol);
bEqual = bEqual && (aGridColName == rOpt.aGridColName);
- bEqual = bEqual && (aGridOpt == rOpt.aGridOpt);
+ bEqual = bEqual && (aGridOpt == rOpt.aGridOpt);
return bEqual;
}
@@ -224,16 +224,16 @@ SvxGridItem* ScViewOptions::CreateGridItem( USHORT nId /* = SID_ATTR_GRID_OPTION
{
SvxGridItem* pItem = new SvxGridItem( nId );
- pItem->SetFldDrawX ( aGridOpt.GetFldDrawX() );
- pItem->SetFldDivisionX ( aGridOpt.GetFldDivisionX() );
- pItem->SetFldDrawY ( aGridOpt.GetFldDrawY() );
- pItem->SetFldDivisionY ( aGridOpt.GetFldDivisionY() );
- pItem->SetFldSnapX ( aGridOpt.GetFldSnapX() );
- pItem->SetFldSnapY ( aGridOpt.GetFldSnapY() );
- pItem->SetUseGridSnap ( aGridOpt.GetUseGridSnap() );
- pItem->SetSynchronize ( aGridOpt.GetSynchronize() );
- pItem->SetGridVisible ( aGridOpt.GetGridVisible() );
- pItem->SetEqualGrid ( aGridOpt.GetEqualGrid() );
+ pItem->SetFldDrawX ( aGridOpt.GetFldDrawX() );
+ pItem->SetFldDivisionX ( aGridOpt.GetFldDivisionX() );
+ pItem->SetFldDrawY ( aGridOpt.GetFldDrawY() );
+ pItem->SetFldDivisionY ( aGridOpt.GetFldDivisionY() );
+ pItem->SetFldSnapX ( aGridOpt.GetFldSnapX() );
+ pItem->SetFldSnapY ( aGridOpt.GetFldSnapY() );
+ pItem->SetUseGridSnap ( aGridOpt.GetUseGridSnap() );
+ pItem->SetSynchronize ( aGridOpt.GetSynchronize() );
+ pItem->SetGridVisible ( aGridOpt.GetGridVisible() );
+ pItem->SetEqualGrid ( aGridOpt.GetEqualGrid() );
return pItem;
}
@@ -250,15 +250,15 @@ SvxGridItem* ScViewOptions::CreateGridItem( USHORT nId /* = SID_ATTR_GRID_OPTION
ScTpViewItem::ScTpViewItem( USHORT nWhichP, const ScViewOptions& rOpt )
: SfxPoolItem ( nWhichP ),
- theOptions ( rOpt )
+ theOptions ( rOpt )
{
}
//------------------------------------------------------------------------
ScTpViewItem::ScTpViewItem( const ScTpViewItem& rItem )
- : SfxPoolItem ( rItem ),
- theOptions ( rItem.theOptions )
+ : SfxPoolItem ( rItem ),
+ theOptions ( rItem.theOptions )
{
}
@@ -294,67 +294,67 @@ SfxPoolItem* __EXPORT ScTpViewItem::Clone( SfxItemPool * ) const
}
//==================================================================
-// Config Item containing view options
+// Config Item containing view options
//==================================================================
-#define CFGPATH_LAYOUT "Office.Calc/Layout"
-
-#define SCLAYOUTOPT_GRIDLINES 0
-#define SCLAYOUTOPT_GRIDCOLOR 1
-#define SCLAYOUTOPT_PAGEBREAK 2
-#define SCLAYOUTOPT_GUIDE 3
-#define SCLAYOUTOPT_SIMPLECONT 4
-#define SCLAYOUTOPT_LARGECONT 5
-#define SCLAYOUTOPT_COLROWHDR 6
-#define SCLAYOUTOPT_HORISCROLL 7
-#define SCLAYOUTOPT_VERTSCROLL 8
-#define SCLAYOUTOPT_SHEETTAB 9
-#define SCLAYOUTOPT_OUTLINE 10
-#define SCLAYOUTOPT_COUNT 11
-
-#define CFGPATH_DISPLAY "Office.Calc/Content/Display"
-
-#define SCDISPLAYOPT_FORMULA 0
-#define SCDISPLAYOPT_ZEROVALUE 1
-#define SCDISPLAYOPT_NOTETAG 2
-#define SCDISPLAYOPT_VALUEHI 3
-#define SCDISPLAYOPT_ANCHOR 4
-#define SCDISPLAYOPT_TEXTOVER 5
-#define SCDISPLAYOPT_OBJECTGRA 6
-#define SCDISPLAYOPT_CHART 7
-#define SCDISPLAYOPT_DRAWING 8
-#define SCDISPLAYOPT_COUNT 9
-
-#define CFGPATH_GRID "Office.Calc/Grid"
-
-#define SCGRIDOPT_RESOLU_X 0
-#define SCGRIDOPT_RESOLU_Y 1
-#define SCGRIDOPT_SUBDIV_X 2
-#define SCGRIDOPT_SUBDIV_Y 3
-#define SCGRIDOPT_OPTION_X 4
-#define SCGRIDOPT_OPTION_Y 5
-#define SCGRIDOPT_SNAPTOGRID 6
-#define SCGRIDOPT_SYNCHRON 7
-#define SCGRIDOPT_VISIBLE 8
-#define SCGRIDOPT_SIZETOGRID 9
-#define SCGRIDOPT_COUNT 10
+#define CFGPATH_LAYOUT "Office.Calc/Layout"
+
+#define SCLAYOUTOPT_GRIDLINES 0
+#define SCLAYOUTOPT_GRIDCOLOR 1
+#define SCLAYOUTOPT_PAGEBREAK 2
+#define SCLAYOUTOPT_GUIDE 3
+#define SCLAYOUTOPT_SIMPLECONT 4
+#define SCLAYOUTOPT_LARGECONT 5
+#define SCLAYOUTOPT_COLROWHDR 6
+#define SCLAYOUTOPT_HORISCROLL 7
+#define SCLAYOUTOPT_VERTSCROLL 8
+#define SCLAYOUTOPT_SHEETTAB 9
+#define SCLAYOUTOPT_OUTLINE 10
+#define SCLAYOUTOPT_COUNT 11
+
+#define CFGPATH_DISPLAY "Office.Calc/Content/Display"
+
+#define SCDISPLAYOPT_FORMULA 0
+#define SCDISPLAYOPT_ZEROVALUE 1
+#define SCDISPLAYOPT_NOTETAG 2
+#define SCDISPLAYOPT_VALUEHI 3
+#define SCDISPLAYOPT_ANCHOR 4
+#define SCDISPLAYOPT_TEXTOVER 5
+#define SCDISPLAYOPT_OBJECTGRA 6
+#define SCDISPLAYOPT_CHART 7
+#define SCDISPLAYOPT_DRAWING 8
+#define SCDISPLAYOPT_COUNT 9
+
+#define CFGPATH_GRID "Office.Calc/Grid"
+
+#define SCGRIDOPT_RESOLU_X 0
+#define SCGRIDOPT_RESOLU_Y 1
+#define SCGRIDOPT_SUBDIV_X 2
+#define SCGRIDOPT_SUBDIV_Y 3
+#define SCGRIDOPT_OPTION_X 4
+#define SCGRIDOPT_OPTION_Y 5
+#define SCGRIDOPT_SNAPTOGRID 6
+#define SCGRIDOPT_SYNCHRON 7
+#define SCGRIDOPT_VISIBLE 8
+#define SCGRIDOPT_SIZETOGRID 9
+#define SCGRIDOPT_COUNT 10
Sequence<OUString> ScViewCfg::GetLayoutPropertyNames()
{
static const char* aPropNames[] =
{
- "Line/GridLine", // SCLAYOUTOPT_GRIDLINES
- "Line/GridLineColor", // SCLAYOUTOPT_GRIDCOLOR
- "Line/PageBreak", // SCLAYOUTOPT_PAGEBREAK
- "Line/Guide", // SCLAYOUTOPT_GUIDE
- "Line/SimpleControlPoint", // SCLAYOUTOPT_SIMPLECONT
- "Line/LargeControlPoint", // SCLAYOUTOPT_LARGECONT
- "Window/ColumnRowHeader", // SCLAYOUTOPT_COLROWHDR
- "Window/HorizontalScroll", // SCLAYOUTOPT_HORISCROLL
- "Window/VerticalScroll", // SCLAYOUTOPT_VERTSCROLL
- "Window/SheetTab", // SCLAYOUTOPT_SHEETTAB
- "Window/OutlineSymbol" // SCLAYOUTOPT_OUTLINE
+ "Line/GridLine", // SCLAYOUTOPT_GRIDLINES
+ "Line/GridLineColor", // SCLAYOUTOPT_GRIDCOLOR
+ "Line/PageBreak", // SCLAYOUTOPT_PAGEBREAK
+ "Line/Guide", // SCLAYOUTOPT_GUIDE
+ "Line/SimpleControlPoint", // SCLAYOUTOPT_SIMPLECONT
+ "Line/LargeControlPoint", // SCLAYOUTOPT_LARGECONT
+ "Window/ColumnRowHeader", // SCLAYOUTOPT_COLROWHDR
+ "Window/HorizontalScroll", // SCLAYOUTOPT_HORISCROLL
+ "Window/VerticalScroll", // SCLAYOUTOPT_VERTSCROLL
+ "Window/SheetTab", // SCLAYOUTOPT_SHEETTAB
+ "Window/OutlineSymbol" // SCLAYOUTOPT_OUTLINE
};
Sequence<OUString> aNames(SCLAYOUTOPT_COUNT);
OUString* pNames = aNames.getArray();
@@ -368,15 +368,15 @@ Sequence<OUString> ScViewCfg::GetDisplayPropertyNames()
{
static const char* aPropNames[] =
{
- "Formula", // SCDISPLAYOPT_FORMULA
- "ZeroValue", // SCDISPLAYOPT_ZEROVALUE
- "NoteTag", // SCDISPLAYOPT_NOTETAG
- "ValueHighlighting", // SCDISPLAYOPT_VALUEHI
- "Anchor", // SCDISPLAYOPT_ANCHOR
- "TextOverflow", // SCDISPLAYOPT_TEXTOVER
- "ObjectGraphic", // SCDISPLAYOPT_OBJECTGRA
- "Chart", // SCDISPLAYOPT_CHART
- "DrawingObject" // SCDISPLAYOPT_DRAWING
+ "Formula", // SCDISPLAYOPT_FORMULA
+ "ZeroValue", // SCDISPLAYOPT_ZEROVALUE
+ "NoteTag", // SCDISPLAYOPT_NOTETAG
+ "ValueHighlighting", // SCDISPLAYOPT_VALUEHI
+ "Anchor", // SCDISPLAYOPT_ANCHOR
+ "TextOverflow", // SCDISPLAYOPT_TEXTOVER
+ "ObjectGraphic", // SCDISPLAYOPT_OBJECTGRA
+ "Chart", // SCDISPLAYOPT_CHART
+ "DrawingObject" // SCDISPLAYOPT_DRAWING
};
Sequence<OUString> aNames(SCDISPLAYOPT_COUNT);
OUString* pNames = aNames.getArray();
@@ -390,23 +390,23 @@ Sequence<OUString> ScViewCfg::GetGridPropertyNames()
{
static const char* aPropNames[] =
{
- "Resolution/XAxis/NonMetric", // SCGRIDOPT_RESOLU_X
- "Resolution/YAxis/NonMetric", // SCGRIDOPT_RESOLU_Y
- "Subdivision/XAxis", // SCGRIDOPT_SUBDIV_X
- "Subdivision/YAxis", // SCGRIDOPT_SUBDIV_Y
- "Option/XAxis/NonMetric", // SCGRIDOPT_OPTION_X
- "Option/YAxis/NonMetric", // SCGRIDOPT_OPTION_Y
- "Option/SnapToGrid", // SCGRIDOPT_SNAPTOGRID
- "Option/Synchronize", // SCGRIDOPT_SYNCHRON
- "Option/VisibleGrid", // SCGRIDOPT_VISIBLE
- "Option/SizeToGrid" // SCGRIDOPT_SIZETOGRID
+ "Resolution/XAxis/NonMetric", // SCGRIDOPT_RESOLU_X
+ "Resolution/YAxis/NonMetric", // SCGRIDOPT_RESOLU_Y
+ "Subdivision/XAxis", // SCGRIDOPT_SUBDIV_X
+ "Subdivision/YAxis", // SCGRIDOPT_SUBDIV_Y
+ "Option/XAxis/NonMetric", // SCGRIDOPT_OPTION_X
+ "Option/YAxis/NonMetric", // SCGRIDOPT_OPTION_Y
+ "Option/SnapToGrid", // SCGRIDOPT_SNAPTOGRID
+ "Option/Synchronize", // SCGRIDOPT_SYNCHRON
+ "Option/VisibleGrid", // SCGRIDOPT_VISIBLE
+ "Option/SizeToGrid" // SCGRIDOPT_SIZETOGRID
};
Sequence<OUString> aNames(SCGRIDOPT_COUNT);
OUString* pNames = aNames.getArray();
for(int i = 0; i < SCGRIDOPT_COUNT; i++)
pNames[i] = OUString::createFromAscii(aPropNames[i]);
- // adjust for metric system
+ // adjust for metric system
if (ScOptionsUtil::IsMetricSystem())
{
pNames[SCGRIDOPT_RESOLU_X] = OUString::createFromAscii( "Resolution/XAxis/Metric" );
@@ -546,7 +546,7 @@ ScViewCfg::ScViewCfg() :
}
aDisplayItem.SetCommitLink( LINK( this, ScViewCfg, DisplayCommitHdl ) );
- ScGridOptions aGrid = GetGridOptions(); //! initialization necessary?
+ ScGridOptions aGrid = GetGridOptions(); //! initialization necessary?
aNames = GetGridPropertyNames();
aValues = aGridItem.GetProperties(aNames);
aGridItem.EnableNotification(aNames);
diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx
index b505e5a5051c..ba286d36bc0c 100644
--- a/sc/source/core/tool/zforauto.cxx
+++ b/sc/source/core/tool/zforauto.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ static const sal_Char __FAR_DATA pStandardName[] = "Standard";
//------------------------------------------------------------------------
ScNumFormatAbbrev::ScNumFormatAbbrev() :
- sFormatstring ( RTL_CONSTASCII_USTRINGPARAM( pStandardName ) ),
- eLnge (LANGUAGE_SYSTEM),
- eSysLnge (LANGUAGE_GERMAN) // sonst passt "Standard" nicht
+ sFormatstring ( RTL_CONSTASCII_USTRINGPARAM( pStandardName ) ),
+ eLnge (LANGUAGE_SYSTEM),
+ eSysLnge (LANGUAGE_GERMAN) // sonst passt "Standard" nicht
{
}
ScNumFormatAbbrev::ScNumFormatAbbrev(const ScNumFormatAbbrev& aFormat) :
- sFormatstring (aFormat.sFormatstring),
- eLnge (aFormat.eLnge),
- eSysLnge (aFormat.eSysLnge)
+ sFormatstring (aFormat.sFormatstring),
+ eLnge (aFormat.eLnge),
+ eSysLnge (aFormat.eSysLnge)
{
}
@@ -91,7 +91,7 @@ void ScNumFormatAbbrev::PutFormatIndex(ULONG nFormat,
{
DBG_ERROR("SCNumFormatAbbrev:: unbekanntes Zahlformat");
eLnge = LANGUAGE_SYSTEM;
- eSysLnge = LANGUAGE_GERMAN; // sonst passt "Standard" nicht
+ eSysLnge = LANGUAGE_GERMAN; // sonst passt "Standard" nicht
sFormatstring.AssignAscii( RTL_CONSTASCII_STRINGPARAM( pStandardName ) );
}
}
diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx
index 69421879983e..965324d4eddb 100644
--- a/sc/source/filter/dif/difexp.cxx
+++ b/sc/source/filter/dif/difexp.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +49,11 @@
FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* pDoc,
const ScAddress& rOutPos, const CharSet eNach, UINT32 nDifOption )
{
- SCCOL nEndCol;
- SCROW nEndRow;
+ SCCOL nEndCol;
+ SCROW nEndRow;
pDoc->GetTableArea( rOutPos.Tab(), nEndCol, nEndRow );
- ScAddress aEnd( nEndCol, nEndRow, rOutPos.Tab() );
- ScAddress aStart( rOutPos );
+ ScAddress aEnd( nEndCol, nEndRow, rOutPos.Tab() );
+ ScAddress aStart( rOutPos );
aStart.PutInOrder( aEnd );
@@ -98,25 +98,25 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc
bContextOrNotAsciiEncoding = FALSE;
}
- const sal_Char* p2DoubleQuotes_LF = "\"\"\n";
- const sal_Char* pSpecDataType_LF = "-1,0\n";
- const sal_Char* pEmptyData = "1,0\n\"\"\n";
- const sal_Char* pStringData = "1,0\n";
- const sal_Char* pNumData = "0,";
- const sal_Char* pNumDataERROR = "0,0\nERROR\n";
+ const sal_Char* p2DoubleQuotes_LF = "\"\"\n";
+ const sal_Char* pSpecDataType_LF = "-1,0\n";
+ const sal_Char* pEmptyData = "1,0\n\"\"\n";
+ const sal_Char* pStringData = "1,0\n";
+ const sal_Char* pNumData = "0,";
+ const sal_Char* pNumDataERROR = "0,0\nERROR\n";
- FltError eRet = eERR_OK;
- String aOS;
- String aString;
- SCCOL nEndCol = rRange.aEnd.Col();
- SCROW nEndRow = rRange.aEnd.Row();
- SCCOL nNumCols = nEndCol - rRange.aStart.Col() + 1;
- SCROW nNumRows = nEndRow - rRange.aStart.Row() + 1;
- SCTAB nTab = rRange.aStart.Tab();
+ FltError eRet = eERR_OK;
+ String aOS;
+ String aString;
+ SCCOL nEndCol = rRange.aEnd.Col();
+ SCROW nEndRow = rRange.aEnd.Row();
+ SCCOL nNumCols = nEndCol - rRange.aStart.Col() + 1;
+ SCROW nNumRows = nEndRow - rRange.aStart.Row() + 1;
+ SCTAB nTab = rRange.aStart.Tab();
- double fVal;
+ double fVal;
- const BOOL bPlain = ( nDifOption == SC_DIFOPT_PLAIN );
+ const BOOL bPlain = ( nDifOption == SC_DIFOPT_PLAIN );
ScProgress aPrgrsBar( pDoc->GetDocumentShell(), ScGlobal::GetRscString( STR_LOAD_DOC ), nNumRows );
@@ -155,9 +155,9 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc
aOS.AppendAscii( p2DoubleQuotes_LF );
rOut.WriteUnicodeOrByteText( aOS );
- SCCOL nColCnt;
- SCROW nRowCnt;
- ScBaseCell* pAkt;
+ SCCOL nColCnt;
+ SCROW nRowCnt;
+ ScBaseCell* pAkt;
for( nRowCnt = rRange.aStart.Row() ; nRowCnt <= nEndRow ; nRowCnt++ )
{
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 2088cc84a791..a099013e17ac 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,21 +63,21 @@ const sal_Unicode pKey1_0[] = { '1', ',', '0', 0 };
FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, const ScAddress& rInsPos,
const CharSet eVon, UINT32 nDifOption )
{
- DifParser aDifParser( rIn, nDifOption, *pDoc, eVon );
+ DifParser aDifParser( rIn, nDifOption, *pDoc, eVon );
- const BOOL bPlain = aDifParser.IsPlain();
+ const BOOL bPlain = aDifParser.IsPlain();
- SCTAB nBaseTab = rInsPos.Tab();
+ SCTAB nBaseTab = rInsPos.Tab();
- TOPIC eTopic = T_UNKNOWN;
- BOOL bSyntErrWarn = FALSE;
- BOOL bOverflowWarn = FALSE;
+ TOPIC eTopic = T_UNKNOWN;
+ BOOL bSyntErrWarn = FALSE;
+ BOOL bOverflowWarn = FALSE;
- String& rData = aDifParser.aData;
- BOOL bData = FALSE;
+ String& rData = aDifParser.aData;
+ BOOL bData = FALSE;
- SCCOL nNumCols = 0;
- SCROW nNumRows = 0;
+ SCCOL nNumCols = 0;
+ SCROW nNumRows = 0;
rIn.Seek( 0 );
@@ -147,14 +147,14 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
if( eTopic == T_DATA )
- { // Ab hier kommen die Daten
- SCCOL nBaseCol = rInsPos.Col();
+ { // Ab hier kommen die Daten
+ SCCOL nBaseCol = rInsPos.Col();
- SCCOL nColCnt = SCCOL_MAX;
- SCROW nRowCnt = rInsPos.Row();
- DifAttrCache aAttrCache( bPlain );
+ SCCOL nColCnt = SCCOL_MAX;
+ SCROW nRowCnt = rInsPos.Row();
+ DifAttrCache aAttrCache( bPlain );
- DATASET eAkt = D_UNKNOWN;
+ DATASET eAkt = D_UNKNOWN;
while( eAkt != D_EOD )
{
@@ -171,13 +171,13 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
break;
case D_EOD:
break;
- case D_NUMERIC: // Numbercell
+ case D_NUMERIC: // Numbercell
if( nColCnt == SCCOL_MAX )
nColCnt = nBaseCol;
if( ValidCol(nColCnt) && ValidRow(nRowCnt) )
{
- ScBaseCell* pCell;
+ ScBaseCell* pCell;
if( DifParser::IsV( rData.GetBuffer() ) )
{
pCell = new ScValueCell( aDifParser.fVal );
@@ -211,7 +211,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
nColCnt++;
break;
- case D_STRING: // Textcell
+ case D_STRING: // Textcell
if( nColCnt == SCCOL_MAX )
nColCnt = nBaseCol;
@@ -290,9 +290,9 @@ TOPIC DifParser::GetNextTopic( void )
static const sal_Unicode pKeyDISPLAYUNITS[] = { 'D', 'I', 'S', 'P', 'L', 'A', 'Y', 'U', 'N', 'I', 'T', 'S', 0 };
static const sal_Unicode pKeyUNKNOWN[] = { 0 };
- static const sal_Unicode* ppKeys[] =
+ static const sal_Unicode* ppKeys[] =
{
- pKeyTABLE, // 0
+ pKeyTABLE, // 0
pKeyVECTORS,
pKeyTUPLES,
pKeyDATA,
@@ -305,29 +305,29 @@ TOPIC DifParser::GetNextTopic( void )
pKeyTRUELENGTH, // 10
pKeyUINITS,
pKeyDISPLAYUNITS,
- pKeyUNKNOWN // 13
+ pKeyUNKNOWN // 13
};
- static const TOPIC pTopics[] =
+ static const TOPIC pTopics[] =
{
- T_TABLE, // 0
+ T_TABLE, // 0
T_VECTORS,
T_TUPLES,
T_DATA,
T_LABEL,
- T_COMMENT, // 5
+ T_COMMENT, // 5
T_SIZE,
T_PERIODICITY,
T_MAJORSTART,
T_MINORSTART,
- T_TRUELENGTH, // 10
+ T_TRUELENGTH, // 10
T_UINITS,
T_DISPLAYUNITS,
- T_UNKNOWN // 13
+ T_UNKNOWN // 13
};
- STATE eS = S_START;
- String aLine;
+ STATE eS = S_START;
+ String aLine;
nVector = 0;
nVal = 0;
@@ -345,9 +345,9 @@ TOPIC DifParser::GetNextTopic( void )
{
case S_START:
{
- const sal_Unicode* pRef;
- UINT16 nCnt = 0;
- BOOL bSearch = TRUE;
+ const sal_Unicode* pRef;
+ UINT16 nCnt = 0;
+ BOOL bSearch = TRUE;
pRef = ppKeys[ nCnt ];
@@ -375,7 +375,7 @@ TOPIC DifParser::GetNextTopic( void )
break;
case S_VectorVal:
{
- const sal_Unicode* pCur = aLine.GetBuffer();
+ const sal_Unicode* pCur = aLine.GetBuffer();
pCur = ScanIntVal( pCur, nVector );
@@ -404,7 +404,7 @@ TOPIC DifParser::GetNextTopic( void )
case S_UNKNOWN:
// 2 Zeilen ueberlesen
ReadNextLine( aLine );
- case S_ERROR_L2: // Fehler in Line 2 aufgetreten
+ case S_ERROR_L2: // Fehler in Line 2 aufgetreten
// eine Zeile ueberlesen
ReadNextLine( aLine );
eS = S_END;
@@ -420,10 +420,10 @@ TOPIC DifParser::GetNextTopic( void )
static void lcl_DeEscapeQuotesDif( String& rString )
{
- // Special handling for DIF import: Escaped (duplicated) quotes are resolved.
- // Single quote characters are left in place because older versions didn't
- // escape quotes in strings (and Excel doesn't when using the clipboard).
- // The quotes around the string are removed before this function is called.
+ // Special handling for DIF import: Escaped (duplicated) quotes are resolved.
+ // Single quote characters are left in place because older versions didn't
+ // escape quotes in strings (and Excel doesn't when using the clipboard).
+ // The quotes around the string are removed before this function is called.
static const sal_Unicode aDQ[] = { '"', '"', 0 };
xub_StrLen nPos = 0;
@@ -477,7 +477,7 @@ bool DifParser::ReadNextLine( String& rStr )
}
}
-// Look ahead in the stream to determine if the next line is the first line of
+// Look ahead in the stream to determine if the next line is the first line of
// a valid data record structure
bool DifParser::LookAhead()
{
@@ -517,11 +517,11 @@ bool DifParser::LookAhead()
return bValidStructure;
}
-DATASET DifParser::GetNextDataset( void )
+DATASET DifParser::GetNextDataset( void )
{
- DATASET eRet = D_UNKNOWN;
- String aLine;
- const sal_Unicode* pAktBuffer;
+ DATASET eRet = D_UNKNOWN;
+ String aLine;
+ const sal_Unicode* pAktBuffer;
ReadNextLine( aLine );
@@ -529,7 +529,7 @@ DATASET DifParser::GetNextDataset( void )
switch( *pAktBuffer )
{
- case '-': // Special Datatype
+ case '-': // Special Datatype
pAktBuffer++;
if( Is1_0( pAktBuffer ) )
@@ -541,8 +541,8 @@ DATASET DifParser::GetNextDataset( void )
eRet = D_EOD;
}
break;
- case '0': // Numeric Data
- pAktBuffer++; // Wert in fVal, 2. Zeile in aData
+ case '0': // Numeric Data
+ pAktBuffer++; // Wert in fVal, 2. Zeile in aData
if( *pAktBuffer == ',' )
{
pAktBuffer++;
@@ -560,7 +560,7 @@ DATASET DifParser::GetNextDataset( void )
}
}
break;
- case '1': // String Data
+ case '1': // String Data
if( Is1_0( aLine.GetBuffer() ) )
{
ReadNextLine( aLine );
@@ -570,7 +570,7 @@ DATASET DifParser::GetNextDataset( void )
if( nLineLength >= 1 && *pLine == '"' )
{
// Quotes are not always escaped (duplicated), see lcl_DeEscapeQuotesDif
- // A look ahead into the next line is needed in order to deal with
+ // A look ahead into the next line is needed in order to deal with
// multiline strings containing quotes
if( LookAhead() )
{
@@ -633,7 +633,7 @@ const sal_Unicode* DifParser::ScanIntVal( const sal_Unicode* pStart, UINT32& rRe
while (*pStart == ' ' || *pStart == '\t')
++pStart;
- sal_Unicode cAkt = *pStart;
+ sal_Unicode cAkt = *pStart;
if( IsNumber( cAkt ) )
rRet = ( UINT32 ) ( cAkt - '0' );
@@ -658,20 +658,20 @@ const sal_Unicode* DifParser::ScanIntVal( const sal_Unicode* pStart, UINT32& rRe
BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart )
{
- double fNewVal = 0.0;
- BOOL bNeg = FALSE;
+ double fNewVal = 0.0;
+ BOOL bNeg = FALSE;
double fFracPos = 1.0;
- INT32 nExp = 0;
- BOOL bExpNeg = FALSE;
- BOOL bExpOverflow = FALSE;
- static const UINT16 nExpLimit = 4096; // ACHTUNG: muss genauer ermittelt werden!
+ INT32 nExp = 0;
+ BOOL bExpNeg = FALSE;
+ BOOL bExpOverflow = FALSE;
+ static const UINT16 nExpLimit = 4096; // ACHTUNG: muss genauer ermittelt werden!
- sal_Unicode cAkt;
- BOOL bRet = FALSE;
+ sal_Unicode cAkt;
+ BOOL bRet = FALSE;
enum STATE { S_FIRST, S_PRE, S_POST, S_EXP_FIRST, S_EXP, S_END, S_FINDEND };
- STATE eS = S_FIRST;
+ STATE eS = S_FIRST;
fNewVal = 0.0;
@@ -699,7 +699,7 @@ BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart )
bNeg = !bNeg;
break;
case '.':
- case ',': //!
+ case ',': //!
eS = S_POST;
fFracPos = 0.1;
break;
@@ -719,7 +719,7 @@ BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart )
switch( cAkt )
{
case '.':
- case ',': //!
+ case ',': //!
eS = S_POST;
fFracPos = 0.1;
break;
@@ -727,9 +727,9 @@ BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart )
case 'E':
eS = S_EXP;
break;
- case 0x00: // IsNumberEnding( cAkt )
- bRet = TRUE; // no
- default: // break!
+ case 0x00: // IsNumberEnding( cAkt )
+ bRet = TRUE; // no
+ default: // break!
eS = S_END;
}
}
@@ -748,9 +748,9 @@ BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart )
case 'E':
eS = S_EXP_FIRST;
break;
- case 0x00: // IsNumberEnding( cAkt )
- bRet = TRUE; // no
- default: // break!
+ case 0x00: // IsNumberEnding( cAkt )
+ bRet = TRUE; // no
+ default: // break!
eS = S_END;
}
}
@@ -802,7 +802,7 @@ BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart )
case S_FINDEND:
if( IsNumberEnding( cAkt ) )
{
- bRet = TRUE; // damit sinnvoll weitergeparst werden kann
+ bRet = TRUE; // damit sinnvoll weitergeparst werden kann
eS = S_END;
}
break;
@@ -818,7 +818,7 @@ BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart )
if( bRet )
{
if( bExpOverflow )
- return sal_False; // ACHTUNG: hier muss noch differenziert werden
+ return sal_False; // ACHTUNG: hier muss noch differenziert werden
if( bNeg )
fNewVal *= 1.0;
@@ -919,8 +919,8 @@ void DifColumn::Apply( ScDocument& rDoc, const SCCOL nCol, const SCTAB nTab, con
void DifColumn::Apply( ScDocument& rDoc, const SCCOL nCol, const SCTAB nTab )
{
- ScPatternAttr aAttr( rDoc.GetPool() );
- SfxItemSet& rItemSet = aAttr.GetItemSet();
+ ScPatternAttr aAttr( rDoc.GetPool() );
+ SfxItemSet& rItemSet = aAttr.GetItemSet();
ENTRY* pEntry = ( ENTRY* ) List::First();
@@ -974,7 +974,7 @@ void DifAttrCache::Apply( ScDocument& rDoc, SCTAB nTab )
{
if( bPlain )
{
- ScPatternAttr* pPatt = NULL;
+ ScPatternAttr* pPatt = NULL;
for( SCCOL nCol = 0 ; nCol <= MAXCOL ; nCol++ )
{
diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx
index 01587c036dea..b62ebea9dd1e 100644
--- a/sc/source/filter/excel/colrowst.cxx
+++ b/sc/source/filter/excel/colrowst.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index 458629979172..0c61538574ba 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using ::rtl::OString;
static String lcl_GetVbaTabName( SCTAB n )
{
- String aRet( RTL_CONSTASCII_USTRINGPARAM( "__VBA__" ) );
+ String aRet( RTL_CONSTASCII_USTRINGPARAM( "__VBA__" ) );
aRet += String::CreateFromInt32( static_cast<sal_uInt16>(n) );
return aRet;
}
@@ -194,8 +194,8 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList )
else
Add( new ExcBofW8 );
- SCTAB nC;
- String aTmpString;
+ SCTAB nC;
+ String aTmpString;
SCTAB nScTabCount = rTabInfo.GetScTabCount();
UINT16 nExcTabCount = rTabInfo.GetXclTabCount();
UINT16 nCodenames = static_cast< UINT16 >( GetExtDocOptions().GetCodeNameCount() );
@@ -250,7 +250,7 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList )
Add( new XclExpUInt16Record( EXC_ID_FNGROUPCOUNT, 14 ) );
// erst Namen- und Tabellen-Eintraege aufbauen
- String aName;
+ String aName;
for( nC = 0 ; nC < nScTabCount ; nC++ )
if( rTabInfo.IsExportTab( nC ) )
diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index 3a43a23cd624..cd95b023eb37 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index 0652363e8822..cf22c81a38b8 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +55,14 @@ void ImportExcel::Formula25()
{
XclAddress aXclPos;
UINT16 nXF = 0, nFormLen;
- double fCurVal;
- BYTE nAttr0, nFlag0;
- BOOL bShrFmla;
+ double fCurVal;
+ BYTE nAttr0, nFlag0;
+ BOOL bShrFmla;
aIn >> aXclPos;
if( GetBiff() == EXC_BIFF2 )
- {// BIFF2
+ {// BIFF2
BYTE nDummy;
aIn.Ignore( 3 );
@@ -72,16 +72,16 @@ void ImportExcel::Formula25()
aIn >> nDummy;
nFormLen = nDummy;
bShrFmla = FALSE;
- nAttr0 = 0x01; // Always calculate
+ nAttr0 = 0x01; // Always calculate
}
else
- {// BIFF5
+ {// BIFF5
aIn >> nXF >> fCurVal >> nFlag0;
aIn.Ignore( 5 );
aIn >> nFormLen;
- bShrFmla = nFlag0 & 0x08; // shared or not shared
+ bShrFmla = nFlag0 & 0x08; // shared or not shared
}
nLastXF = nXF;
@@ -100,8 +100,8 @@ void ImportExcel::Formula4()
{
XclAddress aXclPos;
UINT16 nXF, nFormLen;
- double fCurVal;
- BYTE nFlag0;
+ double fCurVal;
+ BYTE nFlag0;
aIn >> aXclPos >> nXF >> fCurVal >> nFlag0;
aIn.Ignore( 1 );
@@ -123,7 +123,7 @@ void ImportExcel::Formula( const XclAddress& rXclPos,
{
// jetzt steht Lesemarke auf Formel, Laenge in nFormLen
const ScTokenArray* pErgebnis = 0;
- BOOL bConvert;
+ BOOL bConvert;
pFormConv->Reset( aScPos );
@@ -135,7 +135,7 @@ void ImportExcel::Formula( const XclAddress& rXclPos,
if( bConvert )
eErr = pFormConv->Convert( pErgebnis, maStrm, nFormLen, true, FT_CellFormula);
- ScFormulaCell* pZelle = NULL;
+ ScFormulaCell* pZelle = NULL;
if( pErgebnis )
{
@@ -144,8 +144,8 @@ void ImportExcel::Formula( const XclAddress& rXclPos,
}
else
{
- CellType eCellType;
- ScBaseCell* pBaseCell;
+ CellType eCellType;
+ ScBaseCell* pBaseCell;
pD->GetCellType( aScPos.Col(), aScPos.Row(), aScPos.Tab(), eCellType );
if( eCellType == CELLTYPE_FORMULA )
{
@@ -201,20 +201,20 @@ void ExcelToSc::GetDummy( const ScTokenArray*& pErgebnis )
ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT )
{
RootData& rR = GetOldRoot();
- BYTE nOp, nLen, nByte;
+ BYTE nOp, nLen, nByte;
UINT16 nUINT16;
- INT16 nINT16;
- double fDouble;
- String aString;
- BOOL bError = FALSE;
- BOOL bArrayFormula = FALSE;
- TokenId nMerk0;
- const BOOL bRangeName = eFT == FT_RangeName;
- const BOOL bSharedFormula = eFT == FT_SharedFormula;
- const BOOL bRNorSF = bRangeName || bSharedFormula;
-
- ScSingleRefData aSRD;
- ScComplexRefData aCRD;
+ INT16 nINT16;
+ double fDouble;
+ String aString;
+ BOOL bError = FALSE;
+ BOOL bArrayFormula = FALSE;
+ TokenId nMerk0;
+ const BOOL bRangeName = eFT == FT_RangeName;
+ const BOOL bSharedFormula = eFT == FT_SharedFormula;
+ const BOOL bRNorSF = bRangeName || bSharedFormula;
+
+ ScSingleRefData aSRD;
+ ScComplexRefData aCRD;
ExtensionTypeVec aExtensions;
bExternName = FALSE;
@@ -243,11 +243,11 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
aSRD.InitFlags();
aCRD.InitFlags();
- switch( nOp ) // Buch Seite:
- { // SDK4 SDK5
- case 0x01: // Array Formula [325 ]
- // Array Formula or Shared Formula [ 277]
- case 0x02: // Data Table [325 277]
+ switch( nOp ) // Buch Seite:
+ { // SDK4 SDK5
+ case 0x01: // Array Formula [325 ]
+ // Array Formula or Shared Formula [ 277]
+ case 0x02: // Data Table [325 277]
nUINT16 = 3;
if( meBiff != EXC_BIFF2 )
@@ -257,82 +257,82 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
bArrayFormula = TRUE;
break;
- case 0x03: // Addition [312 264]
+ case 0x03: // Addition [312 264]
aStack >> nMerk0;
aPool << aStack << ocAdd << nMerk0;
aPool >> aStack;
break;
- case 0x04: // Subtraction [313 264]
+ case 0x04: // Subtraction [313 264]
// SECOMD-TOP minus TOP
aStack >> nMerk0;
aPool << aStack << ocSub << nMerk0;
aPool >> aStack;
break;
- case 0x05: // Multiplication [313 264]
+ case 0x05: // Multiplication [313 264]
aStack >> nMerk0;
aPool << aStack << ocMul << nMerk0;
aPool >> aStack;
break;
- case 0x06: // Division [313 264]
+ case 0x06: // Division [313 264]
// divide TOP by SECOND-TOP
aStack >> nMerk0;
aPool << aStack << ocDiv << nMerk0;
aPool >> aStack;
break;
- case 0x07: // Exponetiation [313 265]
+ case 0x07: // Exponetiation [313 265]
// raise SECOND-TOP to power of TOP
aStack >> nMerk0;
aPool << aStack << ocPow << nMerk0;
aPool >> aStack;
break;
- case 0x08: // Concatenation [313 265]
+ case 0x08: // Concatenation [313 265]
// append TOP to SECOND-TOP
aStack >> nMerk0;
aPool << aStack << ocAmpersand << nMerk0;
aPool >> aStack;
break;
- case 0x09: // Less Than [313 265]
+ case 0x09: // Less Than [313 265]
// SECOND-TOP < TOP
aStack >> nMerk0;
aPool << aStack << ocLess << nMerk0;
aPool >> aStack;
break;
- case 0x0A: // Less Than or Equal [313 265]
+ case 0x0A: // Less Than or Equal [313 265]
// SECOND-TOP <= TOP
aStack >> nMerk0;
aPool << aStack << ocLessEqual << nMerk0;
aPool >> aStack;
break;
- case 0x0B: // Equal [313 265]
+ case 0x0B: // Equal [313 265]
// SECOND-TOP == TOP
aStack >> nMerk0;
aPool << aStack << ocEqual << nMerk0;
aPool >> aStack;
break;
- case 0x0C: // Greater Than or Equal [313 265]
+ case 0x0C: // Greater Than or Equal [313 265]
// SECOND-TOP == TOP
aStack >> nMerk0;
aPool << aStack << ocGreaterEqual << nMerk0;
aPool >> aStack;
break;
- case 0x0D: // Greater Than [313 265]
+ case 0x0D: // Greater Than [313 265]
// SECOND-TOP == TOP
aStack >> nMerk0;
aPool << aStack << ocGreater << nMerk0;
aPool >> aStack;
break;
- case 0x0E: // Not Equal [313 265]
+ case 0x0E: // Not Equal [313 265]
// SECOND-TOP == TOP
aStack >> nMerk0;
aPool << aStack << ocNotEqual << nMerk0;
aPool >> aStack;
break;
- case 0x0F: // Intersection [314 265]
+ case 0x0F: // Intersection [314 265]
aStack >> nMerk0;
aPool << aStack << ocIntersect << nMerk0;
aPool >> aStack;
break;
- case 0x10: // Union [314 265]
+ case 0x10: // Union [314 265]
// ocSep behelfsweise statt 'ocUnion'
aStack >> nMerk0;
//#100928# aPool << ocOpen << aStack << ocSep << nMerk0 << ocClose;
@@ -340,42 +340,42 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
// doesn't fit exactly, but is more Excel-like
aPool >> aStack;
break;
- case 0x11: // Range [314 265]
+ case 0x11: // Range [314 265]
aStack >> nMerk0;
aPool << aStack << ocRange << nMerk0;
aPool >> aStack;
break;
- case 0x12: // Unary Plus [312 264]
+ case 0x12: // Unary Plus [312 264]
aPool << ocAdd << aStack;
aPool >> aStack;
break;
- case 0x13: // Unary Minus [312 264]
+ case 0x13: // Unary Minus [312 264]
aPool << ocNegSub << aStack;
aPool >> aStack;
break;
- case 0x14: // Percent Sign [312 264]
+ case 0x14: // Percent Sign [312 264]
aPool << aStack << ocPercentSign;
aPool >> aStack;
break;
- case 0x15: // Parenthesis [326 278]
+ case 0x15: // Parenthesis [326 278]
aPool << ocOpen << aStack << ocClose;
aPool >> aStack;
break;
- case 0x16: // Missing Argument [314 266]
+ case 0x16: // Missing Argument [314 266]
aPool << ocMissing;
aPool >> aStack;
GetTracer().TraceFormulaMissingArg();
break;
- case 0x17: // String Constant [314 266]
+ case 0x17: // String Constant [314 266]
aIn >> nLen;
aString = aIn.ReadRawByteString( nLen );
aStack << aPool.Store( aString );
break;
- case 0x19: // Special Attribute [327 279]
+ case 0x19: // Special Attribute [327 279]
{
- UINT16 nData, nFakt;
- BYTE nOpt;
+ UINT16 nData, nFakt;
+ BYTE nOpt;
aIn >> nOpt;
@@ -391,15 +391,15 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
}
if( nOpt & 0x04 )
- {// nFakt -> Bytes oder Words ueberlesen AttrChoose
+ {// nFakt -> Bytes oder Words ueberlesen AttrChoose
nData++;
aIn.Ignore( nData * nFakt );
}
- else if( nOpt & 0x10 ) // AttrSum
+ else if( nOpt & 0x10 ) // AttrSum
DoMulArgs( ocSum, 1 );
}
break;
- case 0x1A: // External Reference [330 ]
+ case 0x1A: // External Reference [330 ]
switch( meBiff )
{
case EXC_BIFF2: aIn.Ignore( 7 ); break;
@@ -411,7 +411,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
DBG_WARNING( "-ExcelToSc::Convert(): Ein wenig vergesslich, was?" );
}
break;
- case 0x1B: // End External Reference [330 ]
+ case 0x1B: // End External Reference [330 ]
switch( meBiff )
{
case EXC_BIFF2: aIn.Ignore( 3 ); break;
@@ -423,13 +423,13 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
DBG_WARNING( "-ExcelToSc::Convert(): Ein wenig vergesslich, was?" );
}
break;
- case 0x1C: // Error Value [314 266]
+ case 0x1C: // Error Value [314 266]
{
aIn >> nByte;
#if 0 // erAck
aPool.StoreError( XclTools::GetScErrorCode( nByte ) );
#else
- DefTokenId eOc;
+ DefTokenId eOc;
switch( nByte )
{
case EXC_ERR_NULL:
@@ -448,7 +448,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
aPool >> aStack;
}
break;
- case 0x1D: // Boolean [315 266]
+ case 0x1D: // Boolean [315 266]
aIn >> nByte;
if( nByte == 0 )
aPool << ocFalse << ocOpen << ocClose;
@@ -456,17 +456,17 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
aPool << ocTrue << ocOpen << ocClose;
aPool >> aStack;
break;
- case 0x1E: // Integer [315 266]
+ case 0x1E: // Integer [315 266]
aIn >> nUINT16;
aStack << aPool.Store( ( double ) nUINT16 );
break;
- case 0x1F: // Number [315 266]
+ case 0x1F: // Number [315 266]
aIn >> fDouble;
aStack << aPool.Store( fDouble );
break;
case 0x40:
case 0x60:
- case 0x20: // Array Constant [317 268]
+ case 0x20: // Array Constant [317 268]
aIn >> nByte >> nUINT16;
aIn.Ignore( (meBiff == EXC_BIFF2) ? 3 : 4 );
if( bAllowArrays )
@@ -482,7 +482,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
break;
case 0x41:
case 0x61:
- case 0x21: // Function, Fixed Number of Arguments [333 282]
+ case 0x21: // Function, Fixed Number of Arguments [333 282]
{
sal_uInt16 nXclFunc;
if( meBiff <= EXC_BIFF3 )
@@ -497,7 +497,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
break;
case 0x42:
case 0x62:
- case 0x22: // Function, Variable Number of Arg. [333 283]
+ case 0x22: // Function, Variable Number of Arg. [333 283]
{
sal_uInt16 nXclFunc;
sal_uInt8 nParamCount;
@@ -515,7 +515,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
break;
case 0x43:
case 0x63:
- case 0x23: // Name [318 269]
+ case 0x23: // Name [318 269]
{
aIn >> nUINT16;
switch( meBiff )
@@ -537,10 +537,10 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
break;
case 0x44:
case 0x64:
- case 0x24: // Cell Reference [319 270]
+ case 0x24: // Cell Reference [319 270]
case 0x4A:
case 0x6A:
- case 0x2A: // Deleted Cell Reference [323 273]
+ case 0x2A: // Deleted Cell Reference [323 273]
aIn >> nUINT16 >> nByte;
aSRD.nCol = static_cast<SCsCOL>(nByte);
aSRD.nRow = nUINT16 & 0x3FFF;
@@ -554,7 +554,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
{
case 0x4A:
case 0x6A:
- case 0x2A: // Deleted Cell Reference [323 273]
+ case 0x2A: // Deleted Cell Reference [323 273]
// no information which part is deleted, set both
aSRD.SetColDeleted( TRUE );
aSRD.SetRowDeleted( TRUE );
@@ -564,15 +564,15 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
break;
case 0x45:
case 0x65:
- case 0x25: // Area Reference [320 270]
+ case 0x25: // Area Reference [320 270]
case 0x4B:
case 0x6B:
- case 0x2B: // Deleted Area Refernce [323 273]
+ case 0x2B: // Deleted Area Refernce [323 273]
{
- UINT16 nRowFirst, nRowLast;
- UINT8 nColFirst, nColLast;
- ScSingleRefData& rSRef1 = aCRD.Ref1;
- ScSingleRefData& rSRef2 = aCRD.Ref2;
+ UINT16 nRowFirst, nRowLast;
+ UINT8 nColFirst, nColLast;
+ ScSingleRefData& rSRef1 = aCRD.Ref1;
+ ScSingleRefData& rSRef2 = aCRD.Ref2;
aIn >> nRowFirst >> nRowLast >> nColFirst >> nColLast;
@@ -594,7 +594,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
{
case 0x4B:
case 0x6B:
- case 0x2B: // Deleted Area Refernce [323 273]
+ case 0x2B: // Deleted Area Refernce [323 273]
// no information which part is deleted, set all
rSRef1.SetColDeleted( TRUE );
rSRef1.SetRowDeleted( TRUE );
@@ -607,13 +607,13 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
break;
case 0x46:
case 0x66:
- case 0x26: // Constant Reference Subexpression [321 271]
+ case 0x26: // Constant Reference Subexpression [321 271]
aExtensions.push_back( EXTENSION_MEMAREA );
// fall through
case 0x47:
case 0x67:
- case 0x27: // Erroneous Constant Reference Subexpr. [322 272]
+ case 0x27: // Erroneous Constant Reference Subexpr. [322 272]
case 0x48:
case 0x68:
case 0x28: // Incomplete Constant Reference Subexpr.[331 281]
@@ -621,10 +621,10 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
break;
case 0x4C:
case 0x6C:
- case 0x2C: // Cell Reference Within a Name [323 ]
+ case 0x2C: // Cell Reference Within a Name [323 ]
// Cell Reference Within a Shared Formula[ 273]
{
- aIn >> nUINT16 >> nByte; // >> Attribute, Row >> Col
+ aIn >> nUINT16 >> nByte; // >> Attribute, Row >> Col
aSRD.nRelTab = 0;
aSRD.SetTabRel( TRUE );
@@ -637,10 +637,10 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
break;
case 0x4D:
case 0x6D:
- case 0x2D: // Area Reference Within a Name [324 ]
- { // Area Reference Within a Shared Formula[ 274]
- UINT16 nRowFirst, nRowLast;
- UINT8 nColFirst, nColLast;
+ case 0x2D: // Area Reference Within a Name [324 ]
+ { // Area Reference Within a Shared Formula[ 274]
+ UINT16 nRowFirst, nRowLast;
+ UINT8 nColFirst, nColLast;
aCRD.Ref1.nRelTab = aCRD.Ref2.nRelTab = 0;
aCRD.Ref1.SetTabRel( TRUE );
@@ -666,15 +666,15 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
case 0x29: // Variable Reference Subexpression [331 281]
case 0x4E:
case 0x6E:
- case 0x2E: // Reference Subexpression Within a Name [332 282]
+ case 0x2E: // Reference Subexpression Within a Name [332 282]
case 0x4F:
case 0x6F:
- case 0x2F: // Incomplete Reference Subexpression... [332 282]
+ case 0x2F: // Incomplete Reference Subexpression... [332 282]
aIn.Ignore( (meBiff == EXC_BIFF2) ? 1 : 2 );
break;
case 0x58:
case 0x78:
- case 0x38: // Command-Equivalent Function [333 ]
+ case 0x38: // Command-Equivalent Function [333 ]
aString.AssignAscii( "COMM_EQU_FUNC" );
aIn >> nByte;
aString += String::CreateFromInt32( nByte );
@@ -684,7 +684,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
break;
case 0x59:
case 0x79:
- case 0x39: // Name or External Name [ 275]
+ case 0x39: // Name or External Name [ 275]
aIn >> nINT16;
aIn.Ignore( 8 );
aIn >> nUINT16;
@@ -694,14 +694,14 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
if( pExtName && pExtName->IsDDE() &&
rR.pExtSheetBuff->IsLink( ( UINT16 ) nINT16 ) )
{
- String aAppl, aExtDoc;
- TokenId nPar1, nPar2;
+ String aAppl, aExtDoc;
+ TokenId nPar1, nPar2;
rR.pExtSheetBuff->GetLink( ( UINT16 ) nINT16 , aAppl, aExtDoc );
nPar1 = aPool.Store( aAppl );
nPar2 = aPool.Store( aExtDoc );
nMerk0 = aPool.Store( pExtName->aName );
- aPool << ocDde << ocOpen << nPar1 << ocSep << nPar2 << ocSep
+ aPool << ocDde << ocOpen << nPar1 << ocSep << nPar2 << ocSep
<< nMerk0 << ocClose;
GetDoc().CreateDdeLink( aAppl, aExtDoc, pExtName->aName, SC_DDE_DEFAULT );
@@ -717,36 +717,36 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
break;
case 0x5A:
case 0x7A:
- case 0x3A: // 3-D Cell Reference [ 275]
+ case 0x3A: // 3-D Cell Reference [ 275]
case 0x5C:
case 0x7C:
- case 0x3C: // Deleted 3-D Cell Reference [ 277]
+ case 0x3C: // Deleted 3-D Cell Reference [ 277]
{
- UINT16 nTabFirst, nTabLast, nRow;
- INT16 nExtSheet;
- BYTE nCol;
+ UINT16 nTabFirst, nTabLast, nRow;
+ INT16 nExtSheet;
+ BYTE nCol;
aIn >> nExtSheet;
aIn.Ignore( 8 );
aIn >> nTabFirst >> nTabLast >> nRow >> nCol;
if( nExtSheet >= 0 )
- { // von extern
+ { // von extern
if( rR.pExtSheetBuff->GetScTabIndex( nExtSheet, nTabLast ) )
{
nTabFirst = nTabLast;
- nExtSheet = 0; // gefunden
+ nExtSheet = 0; // gefunden
}
else
{
aPool << ocBad;
aPool >> aStack;
- nExtSheet = 1; // verhindert Erzeugung einer SingleRef
+ nExtSheet = 1; // verhindert Erzeugung einer SingleRef
}
}
if( nExtSheet <= 0 )
- { // in aktuellem Workbook
+ { // in aktuellem Workbook
aSRD.nTab = static_cast<SCTAB>(nTabFirst);
aSRD.SetFlag3D( TRUE );
aSRD.SetTabRel( FALSE );
@@ -757,7 +757,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
{
case 0x5C:
case 0x7C:
- case 0x3C: // Deleted 3-D Cell Reference [ 277]
+ case 0x3C: // Deleted 3-D Cell Reference [ 277]
// no information which part is deleted, set both
aSRD.SetColDeleted( TRUE );
aSRD.SetRowDeleted( TRUE );
@@ -780,14 +780,14 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
break;
case 0x5B:
case 0x7B:
- case 0x3B: // 3-D Area Reference [ 276]
+ case 0x3B: // 3-D Area Reference [ 276]
case 0x5D:
case 0x7D:
- case 0x3D: // Deleted 3-D Area Reference [ 277]
+ case 0x3D: // Deleted 3-D Area Reference [ 277]
{
- UINT16 nTabFirst, nTabLast, nRowFirst, nRowLast;
- INT16 nExtSheet;
- BYTE nColFirst, nColLast;
+ UINT16 nTabFirst, nTabLast, nRowFirst, nRowLast;
+ INT16 nExtSheet;
+ BYTE nColFirst, nColLast;
aIn >> nExtSheet;
aIn.Ignore( 8 );
@@ -800,21 +800,21 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
if( rR.pExtSheetBuff->GetScTabIndex( nExtSheet, nTabLast ) )
{
nTabFirst = nTabLast;
- nExtSheet = 0; // gefunden
+ nExtSheet = 0; // gefunden
}
else
{
aPool << ocBad;
aPool >> aStack;
- nExtSheet = 1; // verhindert Erzeugung einer CompleteRef
+ nExtSheet = 1; // verhindert Erzeugung einer CompleteRef
}
}
if( nExtSheet <= 0 )
{// in aktuellem Workbook
// erster Teil des Bereichs
- ScSingleRefData& rR1 = aCRD.Ref1;
- ScSingleRefData& rR2 = aCRD.Ref2;
+ ScSingleRefData& rR1 = aCRD.Ref1;
+ ScSingleRefData& rR2 = aCRD.Ref2;
rR1.nTab = static_cast<SCTAB>(nTabFirst);
rR2.nTab = static_cast<SCTAB>(nTabLast);
@@ -835,7 +835,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
{
case 0x5D:
case 0x7D:
- case 0x3D: // Deleted 3-D Area Reference [ 277]
+ case 0x3D: // Deleted 3-D Area Reference [ 277]
// no information which part is deleted, set all
rR1.SetColDeleted( TRUE );
rR1.SetRowDeleted( TRUE );
@@ -901,18 +901,18 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal_Size nFormulaLen, const FORMULA_TYPE eFT )
{
RootData& rR = GetOldRoot();
- BYTE nOp, nLen;
+ BYTE nOp, nLen;
sal_Size nIgnore;
- UINT16 nUINT16;
- UINT8 nByte;
- BOOL bError = FALSE;
- BOOL bArrayFormula = FALSE;
- const BOOL bRangeName = eFT == FT_RangeName;
- const BOOL bSharedFormula = eFT == FT_SharedFormula;
- const BOOL bRNorSF = bRangeName || bSharedFormula;
-
- ScSingleRefData aSRD;
- ScComplexRefData aCRD;
+ UINT16 nUINT16;
+ UINT8 nByte;
+ BOOL bError = FALSE;
+ BOOL bArrayFormula = FALSE;
+ const BOOL bRangeName = eFT == FT_RangeName;
+ const BOOL bSharedFormula = eFT == FT_SharedFormula;
+ const BOOL bRNorSF = bRangeName || bSharedFormula;
+
+ ScSingleRefData aSRD;
+ ScComplexRefData aCRD;
aCRD.Ref1.nTab = aCRD.Ref2.nTab = aEingPos.Tab();
bExternName = FALSE;
@@ -937,42 +937,42 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
aSRD.InitFlags();
aCRD.InitFlags();
- switch( nOp ) // Buch Seite:
- { // SDK4 SDK5
- case 0x01: // Array Formula [325 ]
- // Array Formula or Shared Formula [ 277]
+ switch( nOp ) // Buch Seite:
+ { // SDK4 SDK5
+ case 0x01: // Array Formula [325 ]
+ // Array Formula or Shared Formula [ 277]
nIgnore = (meBiff == EXC_BIFF2) ? 3 : 4;
bArrayFormula = TRUE;
break;
- case 0x02: // Data Table [325 277]
+ case 0x02: // Data Table [325 277]
nIgnore = (meBiff == EXC_BIFF2) ? 3 : 4;
break;
- case 0x03: // Addition [312 264]
- case 0x04: // Subtraction [313 264]
- case 0x05: // Multiplication [313 264]
- case 0x06: // Division [313 264]
- case 0x07: // Exponetiation [313 265]
- case 0x08: // Concatenation [313 265]
- case 0x09: // Less Than [313 265]
- case 0x0A: // Less Than or Equal [313 265]
- case 0x0B: // Equal [313 265]
- case 0x0C: // Greater Than or Equal [313 265]
- case 0x0D: // Greater Than [313 265]
- case 0x0E: // Not Equal [313 265]
- case 0x0F: // Intersection [314 265]
- case 0x10: // Union [314 265]
- case 0x11: // Range [314 265]
- case 0x12: // Unary Plus [312 264]
- case 0x13: // Unary Minus [312 264]
- case 0x14: // Percent Sign [312 264]
- case 0x15: // Parenthesis [326 278]
- case 0x16: // Missing Argument [314 266]
- break;
- case 0x17: // String Constant [314 266]
+ case 0x03: // Addition [312 264]
+ case 0x04: // Subtraction [313 264]
+ case 0x05: // Multiplication [313 264]
+ case 0x06: // Division [313 264]
+ case 0x07: // Exponetiation [313 265]
+ case 0x08: // Concatenation [313 265]
+ case 0x09: // Less Than [313 265]
+ case 0x0A: // Less Than or Equal [313 265]
+ case 0x0B: // Equal [313 265]
+ case 0x0C: // Greater Than or Equal [313 265]
+ case 0x0D: // Greater Than [313 265]
+ case 0x0E: // Not Equal [313 265]
+ case 0x0F: // Intersection [314 265]
+ case 0x10: // Union [314 265]
+ case 0x11: // Range [314 265]
+ case 0x12: // Unary Plus [312 264]
+ case 0x13: // Unary Minus [312 264]
+ case 0x14: // Percent Sign [312 264]
+ case 0x15: // Parenthesis [326 278]
+ case 0x16: // Missing Argument [314 266]
+ break;
+ case 0x17: // String Constant [314 266]
aIn >> nLen;
nIgnore = nLen;
break;
- case 0x19: // Special Attribute [327 279]
+ case 0x19: // Special Attribute [327 279]
{
UINT16 nData, nFakt;
BYTE nOpt;
@@ -991,13 +991,13 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
}
if( nOpt & 0x04 )
- {// nFakt -> Bytes oder Words ueberlesen AttrChoose
+ {// nFakt -> Bytes oder Words ueberlesen AttrChoose
nData++;
aIn.Ignore( nData * nFakt );
}
}
break;
- case 0x1A: // External Reference [330 ]
+ case 0x1A: // External Reference [330 ]
switch( meBiff )
{
case EXC_BIFF2: nIgnore = 7; break;
@@ -1007,7 +1007,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
default: DBG_WARNING( "-ExcelToSc::Convert(): Ein wenig vergesslich, was?" );
}
break;
- case 0x1B: // End External Reference [330 ]
+ case 0x1B: // End External Reference [330 ]
switch( meBiff )
{
case EXC_BIFF2: nIgnore = 3; break;
@@ -1017,34 +1017,34 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
default: DBG_WARNING( "-ExcelToSc::Convert(): Ein wenig vergesslich, was?" );
}
break;
- case 0x1C: // Error Value [314 266]
- case 0x1D: // Boolean [315 266]
+ case 0x1C: // Error Value [314 266]
+ case 0x1D: // Boolean [315 266]
nIgnore = 1;
break;
- case 0x1E: // Integer [315 266]
+ case 0x1E: // Integer [315 266]
nIgnore = 2;
break;
- case 0x1F: // Number [315 266]
+ case 0x1F: // Number [315 266]
nIgnore = 8;
break;
case 0x40:
case 0x60:
- case 0x20: // Array Constant [317 268]
+ case 0x20: // Array Constant [317 268]
nIgnore = (meBiff == EXC_BIFF2) ? 6 : 7;
break;
case 0x41:
case 0x61:
- case 0x21: // Function, Fixed Number of Arguments [333 282]
+ case 0x21: // Function, Fixed Number of Arguments [333 282]
nIgnore = (meBiff <= EXC_BIFF3) ? 1 : 2;
break;
case 0x42:
case 0x62:
- case 0x22: // Function, Variable Number of Arg. [333 283]
+ case 0x22: // Function, Variable Number of Arg. [333 283]
nIgnore = (meBiff <= EXC_BIFF3) ? 2 : 3;
break;
case 0x43:
case 0x63:
- case 0x23: // Name [318 269]
+ case 0x23: // Name [318 269]
switch( meBiff )
{
case EXC_BIFF2: nIgnore = 7; break;
@@ -1056,7 +1056,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
break;
case 0x44:
case 0x64:
- case 0x24: // Cell Reference [319 270]
+ case 0x24: // Cell Reference [319 270]
aIn >> nUINT16 >> nByte;
aSRD.nCol = static_cast<SCsCOL>(nByte);
aSRD.nRow = nUINT16 & 0x3FFF;
@@ -1070,12 +1070,12 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
break;
case 0x45:
case 0x65:
- case 0x25: // Area Reference [320 270]
+ case 0x25: // Area Reference [320 270]
{
- UINT16 nRowFirst, nRowLast;
- UINT8 nColFirst, nColLast;
- ScSingleRefData &rSRef1 = aCRD.Ref1;
- ScSingleRefData &rSRef2 = aCRD.Ref2;
+ UINT16 nRowFirst, nRowLast;
+ UINT8 nColFirst, nColLast;
+ ScSingleRefData &rSRef1 = aCRD.Ref1;
+ ScSingleRefData &rSRef2 = aCRD.Ref2;
aIn >> nRowFirst >> nRowLast >> nColFirst >> nColLast;
@@ -1098,10 +1098,10 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
break;
case 0x46:
case 0x66:
- case 0x26: // Constant Reference Subexpression [321 271]
+ case 0x26: // Constant Reference Subexpression [321 271]
case 0x47:
case 0x67:
- case 0x27: // Erroneous Constant Reference Subexpr. [322 272]
+ case 0x27: // Erroneous Constant Reference Subexpr. [322 272]
case 0x48:
case 0x68:
case 0x28: // Incomplete Constant Reference Subexpr.[331 281]
@@ -1109,20 +1109,20 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
break;
case 0x4A:
case 0x6A:
- case 0x2A: // Deleted Cell Reference [323 273]
+ case 0x2A: // Deleted Cell Reference [323 273]
nIgnore = 3;
break;
case 0x4B:
case 0x6B:
- case 0x2B: // Deleted Area Refernce [323 273]
+ case 0x2B: // Deleted Area Refernce [323 273]
nIgnore = 6;
break;
case 0x4C:
case 0x6C:
- case 0x2C: // Cell Reference Within a Name [323 ]
+ case 0x2C: // Cell Reference Within a Name [323 ]
// Cell Reference Within a Shared Formula[ 273]
{
- aIn >> nUINT16 >> nByte; // >> Attribute, Row >> Col
+ aIn >> nUINT16 >> nByte; // >> Attribute, Row >> Col
aSRD.nRelTab = 0;
aSRD.SetTabRel( TRUE );
@@ -1135,10 +1135,10 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
break;
case 0x4D:
case 0x6D:
- case 0x2D: // Area Reference Within a Name [324 ]
- { // Area Reference Within a Shared Formula[ 274]
- UINT16 nRowFirst, nRowLast;
- UINT8 nColFirst, nColLast;
+ case 0x2D: // Area Reference Within a Name [324 ]
+ { // Area Reference Within a Shared Formula[ 274]
+ UINT16 nRowFirst, nRowLast;
+ UINT8 nColFirst, nColLast;
aCRD.Ref1.nRelTab = aCRD.Ref2.nRelTab = 0;
aCRD.Ref1.SetTabRel( TRUE );
@@ -1164,29 +1164,29 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
case 0x29: // Variable Reference Subexpression [331 281]
case 0x4E:
case 0x6E:
- case 0x2E: // Reference Subexpression Within a Name [332 282]
+ case 0x2E: // Reference Subexpression Within a Name [332 282]
case 0x4F:
case 0x6F:
- case 0x2F: // Incomplete Reference Subexpression... [332 282]
+ case 0x2F: // Incomplete Reference Subexpression... [332 282]
nIgnore = (meBiff == EXC_BIFF2) ? 1 : 2;
break;
case 0x58:
case 0x78:
- case 0x38: // Command-Equivalent Function [333 ]
+ case 0x38: // Command-Equivalent Function [333 ]
nIgnore = 2;
break;
case 0x59:
case 0x79:
- case 0x39: // Name or External Name [ 275]
+ case 0x39: // Name or External Name [ 275]
nIgnore = 24;
break;
case 0x5A:
case 0x7A:
- case 0x3A: // 3-D Cell Reference [ 275]
+ case 0x3A: // 3-D Cell Reference [ 275]
{
- UINT16 nTabFirst, nTabLast, nRow;
- INT16 nExtSheet;
- BYTE nCol;
+ UINT16 nTabFirst, nTabLast, nRow;
+ INT16 nExtSheet;
+ BYTE nCol;
aIn >> nExtSheet;
aIn.Ignore( 8 );
@@ -1198,13 +1198,13 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
if( rR.pExtSheetBuff->GetScTabIndex( nExtSheet, nTabLast ) )
{
nTabFirst = nTabLast;
- nExtSheet = 0; // gefunden
+ nExtSheet = 0; // gefunden
}
else
{
aPool << ocBad;
aPool >> aStack;
- nExtSheet = 1; // verhindert Erzeugung einer SingleRef
+ nExtSheet = 1; // verhindert Erzeugung einer SingleRef
}
}
@@ -1236,11 +1236,11 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
break;
case 0x5B:
case 0x7B:
- case 0x3B: // 3-D Area Reference [ 276]
+ case 0x3B: // 3-D Area Reference [ 276]
{
- UINT16 nTabFirst, nTabLast, nRowFirst, nRowLast;
- INT16 nExtSheet;
- BYTE nColFirst, nColLast;
+ UINT16 nTabFirst, nTabLast, nRowFirst, nRowLast;
+ INT16 nExtSheet;
+ BYTE nColFirst, nColLast;
aIn >> nExtSheet;
aIn.Ignore( 8 );
@@ -1253,21 +1253,21 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
if( rR.pExtSheetBuff->GetScTabIndex( nExtSheet, nTabLast ) )
{
nTabFirst = nTabLast;
- nExtSheet = 0; // gefunden
+ nExtSheet = 0; // gefunden
}
else
{
aPool << ocBad;
aPool >> aStack;
- nExtSheet = 1; // verhindert Erzeugung einer CompleteRef
+ nExtSheet = 1; // verhindert Erzeugung einer CompleteRef
}
}
if( nExtSheet <= 0 )
{// in aktuellem Workbook
// erster Teil des Bereichs
- ScSingleRefData &rR1 = aCRD.Ref1;
- ScSingleRefData &rR2 = aCRD.Ref2;
+ ScSingleRefData &rR1 = aCRD.Ref1;
+ ScSingleRefData &rR2 = aCRD.Ref2;
rR1.nTab = static_cast<SCTAB>(nTabFirst);
rR2.nTab = static_cast<SCTAB>(nTabLast);
@@ -1290,12 +1290,12 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
break;
case 0x5C:
case 0x7C:
- case 0x3C: // Deleted 3-D Cell Reference [ 277]
+ case 0x3C: // Deleted 3-D Cell Reference [ 277]
nIgnore = 17;
break;
case 0x5D:
case 0x7D:
- case 0x3D: // Deleted 3-D Area Reference [ 277]
+ case 0x3D: // Deleted 3-D Area Reference [ 277]
nIgnore = 20;
break;
default: bError = TRUE;
@@ -1536,12 +1536,12 @@ BOOL ExcelToSc::GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Si
void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz, sal_uInt8 nMinParamCount )
{
- TokenId eParam[ 256 ];
- INT32 nLauf;
+ TokenId eParam[ 256 ];
+ INT32 nLauf;
if( eId == ocCeil || eId == ocFloor )
{
- aStack << aPool.Store( 1.0 ); // default, da in Excel nicht vorhanden
+ aStack << aPool.Store( 1.0 ); // default, da in Excel nicht vorhanden
nAnz++;
}
@@ -1553,7 +1553,7 @@ void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz, sal_uInt8 nMinParamCo
if( nAnz > 0 && eId == ocExternal )
{
- TokenId n = eParam[ nAnz - 1 ];
+ TokenId n = eParam[ nAnz - 1 ];
//##### GRUETZE FUER BASIC-FUNCS RICHTEN!
if( const String* pExt = aPool.GetExternal( n ) )
{
@@ -1574,19 +1574,19 @@ void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz, sal_uInt8 nMinParamCo
if( nAnz > 0 )
{
// attention: 0 = last parameter, nAnz-1 = first parameter
- INT16 nNull = -1; // skip this parameter
- INT16 nSkipEnd = -1; // skip all parameters <= nSkipEnd
+ INT16 nNull = -1; // skip this parameter
+ INT16 nSkipEnd = -1; // skip all parameters <= nSkipEnd
INT16 nLast = nAnz - 1;
// Funktionen, bei denen Parameter wegfallen muessen
if( eId == ocPercentrank && nAnz == 3 )
- nSkipEnd = 0; // letzten Parameter bei Bedarf weglassen
+ nSkipEnd = 0; // letzten Parameter bei Bedarf weglassen
// Joost-Spezialfaelle
else if( eId == ocIf )
{
- UINT16 nNullParam = 0;
+ UINT16 nNullParam = 0;
for( nLauf = 0 ; nLauf < nAnz ; nLauf++ )
{
if( aPool.IsSingleOp( eParam[ nLauf ], ocMissing ) )
@@ -1608,8 +1608,8 @@ void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz, sal_uInt8 nMinParamCo
aPool.IsSingleOp( eParam[ nSkipEnd + 1 ], ocMissing ) )
nSkipEnd++;
-// fprintf (stderr, "Fn %d nSkipEnd %d nLast %d nMinParamCnt %d %d\n",
-// eId, nSkipEnd, nLast, nMinParamCount, nLastRemovable);
+// fprintf (stderr, "Fn %d nSkipEnd %d nLast %d nMinParamCnt %d %d\n",
+// eId, nSkipEnd, nLast, nMinParamCount, nLastRemovable);
// [Parameter{;Parameter}]
if( nLast > nSkipEnd )
@@ -1634,29 +1634,29 @@ void ExcelToSc::ExcRelToScRel( UINT16 nRow, UINT8 nCol, ScSingleRefData &rSRD, c
{
// C O L
if( nRow & 0x4000 )
- {// rel Col
+ {// rel Col
rSRD.SetColRel( TRUE );
rSRD.nRelCol = static_cast<SCsCOL>(static_cast<INT8>(nCol));
}
else
- {// abs Col
+ {// abs Col
rSRD.SetColRel( FALSE );
rSRD.nCol = static_cast<SCCOL>(nCol);
}
// R O W
if( nRow & 0x8000 )
- {// rel Row
+ {// rel Row
rSRD.SetRowRel( TRUE );
- if( nRow & 0x2000 ) // Bit 13 gesetzt?
- // -> Row negativ
+ if( nRow & 0x2000 ) // Bit 13 gesetzt?
+ // -> Row negativ
rSRD.nRelRow = static_cast<SCsROW>(static_cast<INT16>(nRow | 0xC000));
else
- // -> Row positiv
+ // -> Row positiv
rSRD.nRelRow = static_cast<SCsROW>(nRow & nRowMask);
}
else
- {// abs Row
+ {// abs Row
rSRD.SetRowRel( FALSE );
rSRD.nRow = static_cast<SCROW>(nRow & nRowMask);
}
@@ -1691,11 +1691,11 @@ void ExcelToSc::ExcRelToScRel( UINT16 nRow, UINT8 nCol, ScSingleRefData &rSRD, c
const ScTokenArray* ExcelToSc::GetBoolErr( XclBoolError eType )
{
- UINT16 nError;
+ UINT16 nError;
aPool.Reset();
aStack.Reset();
- DefTokenId eOc;
+ DefTokenId eOc;
switch( eType )
{
@@ -1721,7 +1721,7 @@ const ScTokenArray* ExcelToSc::GetBoolErr( XclBoolError eType )
aPool >> aStack;
- const ScTokenArray* pErgebnis = aPool[ aStack.Get() ];
+ const ScTokenArray* pErgebnis = aPool[ aStack.Get() ];
if( nError )
( ( ScTokenArray* ) pErgebnis )->SetCodeError( nError );
@@ -1735,8 +1735,8 @@ const ScTokenArray* ExcelToSc::GetBoolErr( XclBoolError eType )
// else stream pointer stays unchanged
BOOL ExcelToSc::GetShrFmla( const ScTokenArray*& rpErgebnis, XclImpStream& aIn, sal_Size nFormulaLen )
{
- BYTE nOp;
- BOOL bRet = TRUE;
+ BYTE nOp;
+ BOOL bRet = TRUE;
if( nFormulaLen == 0 )
bRet = FALSE;
@@ -1746,7 +1746,7 @@ BOOL ExcelToSc::GetShrFmla( const ScTokenArray*& rpErgebnis, XclImpStream& aIn,
aIn >> nOp;
- if( nOp == 0x01 ) // Shared Formula [ 277]
+ if( nOp == 0x01 ) // Shared Formula [ 277]
{
UINT16 nCol, nRow;
@@ -1778,10 +1778,10 @@ BOOL ExcelToSc::GetShrFmla( const ScTokenArray*& rpErgebnis, XclImpStream& aIn,
#if 0
BOOL ExcelToSc::SetCurVal( ScFormulaCell &rCell, double &rfCurVal )
{
- UINT16 nInd;
- BYTE nType;
- BYTE nVal;
- BOOL bString = FALSE;
+ UINT16 nInd;
+ BYTE nType;
+ BYTE nVal;
+ BOOL bString = FALSE;
#ifdef OSL_BIGENDIAN
// Code fuer alle anstaendigen Prozessoren
@@ -1802,17 +1802,17 @@ BOOL ExcelToSc::SetCurVal( ScFormulaCell &rCell, double &rfCurVal )
{
switch( nType )
{
- case 0: // String
+ case 0: // String
bString = TRUE;
break;
- case 1: // Bool
+ case 1: // Bool
if( nVal )
rfCurVal = 1.0;
else
rfCurVal = 0.0;
rCell.SetHybridDouble( rfCurVal );
break;
- case 2: // Error
+ case 2: // Error
rCell.SetErrCode( XclTools::GetScErrorCode( nVal ) );
break;
}
@@ -1825,15 +1825,15 @@ BOOL ExcelToSc::SetCurVal( ScFormulaCell &rCell, double &rfCurVal )
void ExcelToSc::SetError( ScFormulaCell &rCell, const ConvErr eErr )
{
- UINT16 nInd;
+ UINT16 nInd;
switch( eErr )
{
- case ConvErrNi: nInd = errUnknownToken; break;
- case ConvErrNoMem: nInd = errCodeOverflow; break;
- case ConvErrExternal: nInd = errNoName; break;
- case ConvErrCount: nInd = errCodeOverflow; break;
- default: nInd = errNoCode; // hier fiel mir nichts
+ case ConvErrNi: nInd = errUnknownToken; break;
+ case ConvErrNoMem: nInd = errCodeOverflow; break;
+ case ConvErrExternal: nInd = errNoName; break;
+ case ConvErrCount: nInd = errCodeOverflow; break;
+ default: nInd = errNoCode; // hier fiel mir nichts
// Besseres ein...
}
@@ -1843,7 +1843,7 @@ void ExcelToSc::SetError( ScFormulaCell &rCell, const ConvErr eErr )
void ExcelToSc::SetComplCol( ScComplexRefData &rCRD )
{
- ScSingleRefData &rSRD = rCRD.Ref2;
+ ScSingleRefData &rSRD = rCRD.Ref2;
if( rSRD.IsColRel() )
rSRD.nRelCol = MAXCOL - aEingPos.Col();
else
@@ -1853,7 +1853,7 @@ void ExcelToSc::SetComplCol( ScComplexRefData &rCRD )
void ExcelToSc::SetComplRow( ScComplexRefData &rCRD )
{
- ScSingleRefData &rSRD = rCRD.Ref2;
+ ScSingleRefData &rSRD = rCRD.Ref2;
if( rSRD.IsRowRel() )
rSRD.nRelRow = MAXROW - aEingPos.Row();
else
diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx
index 148b1542913a..c50151c21974 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,20 +96,20 @@ bool ExcelToSc8::Read3DTabReference( UINT16 nIxti, SCTAB& rFirstTab, SCTAB& rLas
// otherwise it will seek to the first byte past additional content after <nFormulaLen>
ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT )
{
- BYTE nOp, nLen, nByte;
+ BYTE nOp, nLen, nByte;
UINT16 nUINT16;
- double fDouble;
- String aString;
- BOOL bError = FALSE;
- BOOL bArrayFormula = FALSE;
- TokenId nMerk0;
- const BOOL bRangeName = eFT == FT_RangeName;
- const BOOL bSharedFormula = eFT == FT_SharedFormula;
- const BOOL bRNorSF = bRangeName || bSharedFormula;
-
- ScSingleRefData aSRD;
- ScComplexRefData aCRD;
- ExtensionTypeVec aExtensions;
+ double fDouble;
+ String aString;
+ BOOL bError = FALSE;
+ BOOL bArrayFormula = FALSE;
+ TokenId nMerk0;
+ const BOOL bRangeName = eFT == FT_RangeName;
+ const BOOL bSharedFormula = eFT == FT_SharedFormula;
+ const BOOL bRNorSF = bRangeName || bSharedFormula;
+
+ ScSingleRefData aSRD;
+ ScComplexRefData aCRD;
+ ExtensionTypeVec aExtensions;
if( eStatus != ConvOK )
{
@@ -135,91 +135,91 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
aSRD.InitFlags();
aCRD.InitFlags();
- switch( nOp ) // Buch Seite:
- { // SDK4 SDK5
- case 0x01: // Array Formula [325 ]
- // Array Formula or Shared Formula [ 277]
- case 0x02: // Data Table [325 277]
+ switch( nOp ) // Buch Seite:
+ { // SDK4 SDK5
+ case 0x01: // Array Formula [325 ]
+ // Array Formula or Shared Formula [ 277]
+ case 0x02: // Data Table [325 277]
aIn.Ignore( 4 );
bArrayFormula = TRUE;
break;
- case 0x03: // Addition [312 264]
+ case 0x03: // Addition [312 264]
aStack >> nMerk0;
aPool << aStack << ocAdd << nMerk0;
aPool >> aStack;
break;
- case 0x04: // Subtraction [313 264]
+ case 0x04: // Subtraction [313 264]
// SECOMD-TOP minus TOP
aStack >> nMerk0;
aPool << aStack << ocSub << nMerk0;
aPool >> aStack;
break;
- case 0x05: // Multiplication [313 264]
+ case 0x05: // Multiplication [313 264]
aStack >> nMerk0;
aPool << aStack << ocMul << nMerk0;
aPool >> aStack;
break;
- case 0x06: // Division [313 264]
+ case 0x06: // Division [313 264]
// divide TOP by SECOND-TOP
aStack >> nMerk0;
aPool << aStack << ocDiv << nMerk0;
aPool >> aStack;
break;
- case 0x07: // Exponetiation [313 265]
+ case 0x07: // Exponetiation [313 265]
// raise SECOND-TOP to power of TOP
aStack >> nMerk0;
aPool << aStack << ocPow << nMerk0;
aPool >> aStack;
break;
- case 0x08: // Concatenation [313 265]
+ case 0x08: // Concatenation [313 265]
// append TOP to SECOND-TOP
aStack >> nMerk0;
aPool << aStack << ocAmpersand << nMerk0;
aPool >> aStack;
break;
- case 0x09: // Less Than [313 265]
+ case 0x09: // Less Than [313 265]
// SECOND-TOP < TOP
aStack >> nMerk0;
aPool << aStack << ocLess << nMerk0;
aPool >> aStack;
break;
- case 0x0A: // Less Than or Equal [313 265]
+ case 0x0A: // Less Than or Equal [313 265]
// SECOND-TOP <= TOP
aStack >> nMerk0;
aPool << aStack << ocLessEqual << nMerk0;
aPool >> aStack;
break;
- case 0x0B: // Equal [313 265]
+ case 0x0B: // Equal [313 265]
// SECOND-TOP == TOP
aStack >> nMerk0;
aPool << aStack << ocEqual << nMerk0;
aPool >> aStack;
break;
- case 0x0C: // Greater Than or Equal [313 265]
+ case 0x0C: // Greater Than or Equal [313 265]
// SECOND-TOP == TOP
aStack >> nMerk0;
aPool << aStack << ocGreaterEqual << nMerk0;
aPool >> aStack;
break;
- case 0x0D: // Greater Than [313 265]
+ case 0x0D: // Greater Than [313 265]
// SECOND-TOP == TOP
aStack >> nMerk0;
aPool << aStack << ocGreater << nMerk0;
aPool >> aStack;
break;
- case 0x0E: // Not Equal [313 265]
+ case 0x0E: // Not Equal [313 265]
// SECOND-TOP == TOP
aStack >> nMerk0;
aPool << aStack << ocNotEqual << nMerk0;
aPool >> aStack;
break;
- case 0x0F: // Intersection [314 265]
+ case 0x0F: // Intersection [314 265]
aStack >> nMerk0;
aPool << aStack << ocIntersect << nMerk0;
aPool >> aStack;
break;
- case 0x10: // Union [314 265]
+ case 0x10: // Union [314 265]
// ocSep behelfsweise statt 'ocUnion'
aStack >> nMerk0;
//#100928# aPool << ocOpen << aStack << ocSep << nMerk0 << ocClose;
@@ -227,54 +227,54 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
// doesn't fit exactly, but is more Excel-like
aPool >> aStack;
break;
- case 0x11: // Range [314 265]
+ case 0x11: // Range [314 265]
aStack >> nMerk0;
aPool << aStack << ocRange << nMerk0;
aPool >> aStack;
break;
- case 0x12: // Unary Plus [312 264]
+ case 0x12: // Unary Plus [312 264]
aPool << ocAdd << aStack;
aPool >> aStack;
break;
- case 0x13: // Unary Minus [312 264]
+ case 0x13: // Unary Minus [312 264]
aPool << ocNegSub << aStack;
aPool >> aStack;
break;
- case 0x14: // Percent Sign [312 264]
+ case 0x14: // Percent Sign [312 264]
aPool << aStack << ocPercentSign;
aPool >> aStack;
break;
- case 0x15: // Parenthesis [326 278]
+ case 0x15: // Parenthesis [326 278]
aPool << ocOpen << aStack << ocClose;
aPool >> aStack;
break;
- case 0x16: // Missing Argument [314 266]
+ case 0x16: // Missing Argument [314 266]
aPool << ocMissing;
aPool >> aStack;
GetTracer().TraceFormulaMissingArg();
break;
- case 0x17: // String Constant [314 266]
- aIn >> nLen; // und?
+ case 0x17: // String Constant [314 266]
+ aIn >> nLen; // und?
aString = aIn.ReadUniString( nLen ); // reads Grbit even if nLen==0
aStack << aPool.Store( aString );
break;
- case 0x18: // natural language formula
+ case 0x18: // natural language formula
{
- UINT8 nEptg;
- UINT16 nCol, nRow;
+ UINT8 nEptg;
+ UINT16 nCol, nRow;
aIn >> nEptg;
switch( nEptg )
- { // name size ext type
- case 0x01: // Lel 4 - err
+ { // name size ext type
+ case 0x01: // Lel 4 - err
aIn.Ignore( 4 );
aPool << ocBad;
aPool >> aStack;
break;
- case 0x02: // Rw 4 - ref
- case 0x03: // Col 4 - ref
- case 0x06: // RwV 4 - val
- case 0x07: // ColV 4 - val
+ case 0x02: // Rw 4 - ref
+ case 0x03: // Col 4 - ref
+ case 0x06: // RwV 4 - val
+ case 0x07: // ColV 4 - val
aIn >> nRow >> nCol;
aSRD.InitAddress( ScAddress( static_cast<SCCOL>(nCol & 0xFF), static_cast<SCROW>(nRow), aEingPos.Tab() ) );
@@ -288,7 +288,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
aStack << aPool.StoreNlf( aSRD );
break;
- case 0x0A: // Radical 13 - ref
+ case 0x0A: // Radical 13 - ref
aIn >> nRow >> nCol;
aIn.Ignore( 9 );
@@ -300,13 +300,13 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
aStack << aPool.StoreNlf( aSRD );
break;
- case 0x0B: // RadicalS 13 x ref
+ case 0x0B: // RadicalS 13 x ref
aIn.Ignore( 13 );
aExtensions.push_back( EXTENSION_NLR );
aPool << ocBad;
aPool >> aStack;
break;
- case 0x0C: // RwS 4 x ref
+ case 0x0C: // RwS 4 x ref
case 0x0D: // ColS 4 x ref
case 0x0E: // RwSV 4 x val
case 0x0F: // ColSV 4 x val
@@ -315,7 +315,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
aPool << ocBad;
aPool >> aStack;
break;
- case 0x10: // RadicalLel 4 - err
+ case 0x10: // RadicalLel 4 - err
case 0x1D: // SxName 4 - val
aIn.Ignore( 4 );
aPool << ocBad;
@@ -327,7 +327,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
}
}
break;
- case 0x19: // Special Attribute [327 279]
+ case 0x19: // Special Attribute [327 279]
{
UINT16 nData, nFakt;
BYTE nOpt;
@@ -336,21 +336,21 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
nFakt = 2;
if( nOpt & 0x04 )
- {// nFakt -> Bytes oder Words ueberlesen AttrChoose
+ {// nFakt -> Bytes oder Words ueberlesen AttrChoose
nData++;
aIn.Ignore( nData * nFakt );
}
- else if( nOpt & 0x10 ) // AttrSum
+ else if( nOpt & 0x10 ) // AttrSum
DoMulArgs( ocSum, 1 );
}
break;
- case 0x1C: // Error Value [314 266]
+ case 0x1C: // Error Value [314 266]
{
aIn >> nByte;
#if 0 // erAck
aPool.StoreError( XclTools::GetScErrorCode( nByte ) );
#else
- DefTokenId eOc;
+ DefTokenId eOc;
switch( nByte )
{
case EXC_ERR_NULL:
@@ -369,7 +369,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
aPool >> aStack;
}
break;
- case 0x1D: // Boolean [315 266]
+ case 0x1D: // Boolean [315 266]
aIn >> nByte;
if( nByte == 0 )
aPool << ocFalse << ocOpen << ocClose;
@@ -377,17 +377,17 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
aPool << ocTrue << ocOpen << ocClose;
aPool >> aStack;
break;
- case 0x1E: // Integer [315 266]
+ case 0x1E: // Integer [315 266]
aIn >> nUINT16;
aStack << aPool.Store( ( double ) nUINT16 );
break;
- case 0x1F: // Number [315 266]
+ case 0x1F: // Number [315 266]
aIn >> fDouble;
aStack << aPool.Store( fDouble );
break;
case 0x40:
case 0x60:
- case 0x20: // Array Constant [317 268]
+ case 0x20: // Array Constant [317 268]
aIn >> nByte >> nUINT16;
aIn.Ignore( 4 );
if( bAllowArrays )
@@ -403,7 +403,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
break;
case 0x41:
case 0x61:
- case 0x21: // Function, Fixed Number of Arguments [333 282]
+ case 0x21: // Function, Fixed Number of Arguments [333 282]
{
sal_uInt16 nXclFunc;
aIn >> nXclFunc;
@@ -415,7 +415,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
break;
case 0x42:
case 0x62:
- case 0x22: // Function, Variable Number of Arg. [333 283]
+ case 0x22: // Function, Variable Number of Arg. [333 283]
{
sal_uInt16 nXclFunc;
sal_uInt8 nParamCount;
@@ -429,7 +429,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
break;
case 0x43:
case 0x63:
- case 0x23: // Name [318 269]
+ case 0x23: // Name [318 269]
aIn >> nUINT16;
{
aIn.Ignore( 2 );
@@ -443,12 +443,12 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
break;
case 0x44:
case 0x64:
- case 0x24: // Cell Reference [319 270]
+ case 0x24: // Cell Reference [319 270]
case 0x4A:
case 0x6A:
- case 0x2A: // Deleted Cell Reference [323 273]
+ case 0x2A: // Deleted Cell Reference [323 273]
{
- UINT16 nCol, nRow;
+ UINT16 nCol, nRow;
aIn >> nRow >> nCol;
@@ -464,7 +464,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
{
case 0x4A:
case 0x6A:
- case 0x2A: // Deleted Cell Reference [323 273]
+ case 0x2A: // Deleted Cell Reference [323 273]
// no information which part is deleted, set both
aSRD.SetColDeleted( TRUE );
aSRD.SetRowDeleted( TRUE );
@@ -475,15 +475,15 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
break;
case 0x45:
case 0x65:
- case 0x25: // Area Reference [320 270]
+ case 0x25: // Area Reference [320 270]
case 0x4B:
case 0x6B:
- case 0x2B: // Deleted Area Refernce [323 273]
+ case 0x2B: // Deleted Area Refernce [323 273]
{
- UINT16 nRowFirst, nRowLast;
- UINT16 nColFirst, nColLast;
- ScSingleRefData &rSRef1 = aCRD.Ref1;
- ScSingleRefData &rSRef2 = aCRD.Ref2;
+ UINT16 nRowFirst, nRowLast;
+ UINT16 nColFirst, nColLast;
+ ScSingleRefData &rSRef1 = aCRD.Ref1;
+ ScSingleRefData &rSRef2 = aCRD.Ref2;
aIn >> nRowFirst >> nRowLast >> nColFirst >> nColLast;
@@ -505,7 +505,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
{
case 0x4B:
case 0x6B:
- case 0x2B: // Deleted Area Refernce [323 273]
+ case 0x2B: // Deleted Area Refernce [323 273]
// no information which part is deleted, set all
rSRef1.SetColDeleted( TRUE );
rSRef1.SetRowDeleted( TRUE );
@@ -518,13 +518,13 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
break;
case 0x46:
case 0x66:
- case 0x26: // Constant Reference Subexpression [321 271]
+ case 0x26: // Constant Reference Subexpression [321 271]
aExtensions.push_back( EXTENSION_MEMAREA );
aIn.Ignore( 6 ); // mehr steht da nicht!
break;
case 0x47:
case 0x67:
- case 0x27: // Erroneous Constant Reference Subexpr. [322 272]
+ case 0x27: // Erroneous Constant Reference Subexpr. [322 272]
aIn.Ignore( 6 ); // mehr steht da nicht!
// aPool << ocBad;
// aPool >> aStack;
@@ -538,15 +538,15 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
break;
case 0x49:
case 0x69:
- case 0x29: // Variable Reference Subexpression [331 281]
+ case 0x29: // Variable Reference Subexpression [331 281]
aIn.Ignore( 2 ); // mehr steht da nicht!
break;
case 0x4C:
case 0x6C:
- case 0x2C: // Cell Reference Within a Name [323 ]
+ case 0x2C: // Cell Reference Within a Name [323 ]
// Cell Reference Within a Shared Formula[ 273]
{
- UINT16 nRow, nCol;
+ UINT16 nRow, nCol;
aIn >> nRow >> nCol;
@@ -561,10 +561,10 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
break;
case 0x4D:
case 0x6D:
- case 0x2D: // Area Reference Within a Name [324 ]
- { // Area Reference Within a Shared Formula[ 274]
- UINT16 nRowFirst, nRowLast;
- UINT16 nColFirst, nColLast;
+ case 0x2D: // Area Reference Within a Name [324 ]
+ { // Area Reference Within a Shared Formula[ 274]
+ UINT16 nRowFirst, nRowLast;
+ UINT16 nColFirst, nColLast;
aCRD.Ref1.nRelTab = aCRD.Ref2.nRelTab = 0;
aCRD.Ref1.SetTabRel( TRUE );
@@ -587,21 +587,21 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
break;
case 0x4E:
case 0x6E:
- case 0x2E: // Reference Subexpression Within a Name [332 282]
+ case 0x2E: // Reference Subexpression Within a Name [332 282]
aIn.Ignore( 2 ); // mehr steht da nicht!
// aPool << ocBad;
// aPool >> aStack;
break;
case 0x4F:
case 0x6F:
- case 0x2F: // Incomplete Reference Subexpression... [332 282]
+ case 0x2F: // Incomplete Reference Subexpression... [332 282]
aIn.Ignore( 2 ); // mehr steht da nicht!
// aPool << ocBad;
// aPool >> aStack;
break;
case 0x58:
case 0x78:
- case 0x38: // Command-Equivalent Function [333 ]
+ case 0x38: // Command-Equivalent Function [333 ]
aString.AssignAscii( "COMM_EQU_FUNC" );
aIn >> nByte;
aString += String::CreateFromInt32( nByte );
@@ -611,7 +611,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
break;
case 0x59:
case 0x79:
- case 0x39: // Name or External Name [ 275]
+ case 0x39: // Name or External Name [ 275]
{
sal_uInt16 nXtiIndex, nNameIdx;
aIn >> nXtiIndex >> nNameIdx;
@@ -697,10 +697,10 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
break;
case 0x5A:
case 0x7A:
- case 0x3A: // 3-D Cell Reference [ 275]
+ case 0x3A: // 3-D Cell Reference [ 275]
case 0x5C:
case 0x7C:
- case 0x3C: // Deleted 3-D Cell Reference [ 277]
+ case 0x3C: // Deleted 3-D Cell Reference [ 277]
{
UINT16 nIxti, nRw, nGrbitCol;
SCTAB nTabFirst, nTabLast;
@@ -725,7 +725,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
{
case 0x5C:
case 0x7C:
- case 0x3C: // Deleted 3-D Cell Reference [ 277]
+ case 0x3C: // Deleted 3-D Cell Reference [ 277]
// no information which part is deleted, set both
aSRD.SetColDeleted( TRUE );
aSRD.SetRowDeleted( TRUE );
@@ -767,10 +767,10 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
break;
case 0x5B:
case 0x7B:
- case 0x3B: // 3-D Area Reference [ 276]
+ case 0x3B: // 3-D Area Reference [ 276]
case 0x5D:
case 0x7D:
- case 0x3D: // Deleted 3-D Area Reference [ 277]
+ case 0x3D: // Deleted 3-D Area Reference [ 277]
{
UINT16 nIxti, nRw1, nGrbitCol1, nRw2, nGrbitCol2;
SCTAB nTabFirst, nTabLast;
@@ -783,8 +783,8 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
aPool >> aStack;
break;
}
- ScSingleRefData &rR1 = aCRD.Ref1;
- ScSingleRefData &rR2 = aCRD.Ref2;
+ ScSingleRefData &rR1 = aCRD.Ref1;
+ ScSingleRefData &rR2 = aCRD.Ref2;
rR1.nTab = nTabFirst;
@@ -806,7 +806,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
{
case 0x5D:
case 0x7D:
- case 0x3D: // Deleted 3-D Area Reference [ 277]
+ case 0x3D: // Deleted 3-D Area Reference [ 277]
// no information which part is deleted, set all
rR1.SetColDeleted( TRUE );
rR1.SetRowDeleted( TRUE );
@@ -873,15 +873,15 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
// stream seeks to first byte after <nFormulaLen>
ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal_Size nFormulaLen, const FORMULA_TYPE eFT )
{
- BYTE nOp, nLen;//, nByte;
- BOOL bError = FALSE;
- BOOL bArrayFormula = FALSE;
- const BOOL bRangeName = eFT == FT_RangeName;
- const BOOL bSharedFormula = eFT == FT_SharedFormula;
- const BOOL bRNorSF = bRangeName || bSharedFormula;
-
- ScSingleRefData aSRD;
- ScComplexRefData aCRD;
+ BYTE nOp, nLen;//, nByte;
+ BOOL bError = FALSE;
+ BOOL bArrayFormula = FALSE;
+ const BOOL bRangeName = eFT == FT_RangeName;
+ const BOOL bSharedFormula = eFT == FT_SharedFormula;
+ const BOOL bRNorSF = bRangeName || bSharedFormula;
+
+ ScSingleRefData aSRD;
+ ScComplexRefData aCRD;
bExternName = FALSE;
@@ -904,44 +904,44 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
aSRD.InitFlags();
aCRD.InitFlags();
- switch( nOp ) // Buch Seite:
- { // SDK4 SDK5
- case 0x01: // Array Formula [325 ]
- // Array Formula or Shared Formula [ 277]
+ switch( nOp ) // Buch Seite:
+ { // SDK4 SDK5
+ case 0x01: // Array Formula [325 ]
+ // Array Formula or Shared Formula [ 277]
aIn.Ignore( 4 );
bArrayFormula = TRUE;
break;
- case 0x02: // Data Table [325 277]
+ case 0x02: // Data Table [325 277]
aIn.Ignore( 4 );
break;
- case 0x03: // Addition [312 264]
- case 0x04: // Subtraction [313 264]
- case 0x05: // Multiplication [313 264]
- case 0x06: // Division [313 264]
- case 0x07: // Exponetiation [313 265]
- case 0x08: // Concatenation [313 265]
- case 0x09: // Less Than [313 265]
- case 0x0A: // Less Than or Equal [313 265]
- case 0x0B: // Equal [313 265]
- case 0x0C: // Greater Than or Equal [313 265]
- case 0x0D: // Greater Than [313 265]
- case 0x0E: // Not Equal [313 265]
- case 0x0F: // Intersection [314 265]
- case 0x10: // Union [314 265]
- case 0x11: // Range [314 265]
- case 0x12: // Unary Plus [312 264]
- case 0x13: // Unary Minus [312 264]
- case 0x14: // Percent Sign [312 264]
- case 0x15: // Parenthesis [326 278]
- case 0x16: // Missing Argument [314 266]
- break;
- case 0x17: // String Constant [314 266]
- aIn >> nLen; // und?
-
- aIn.IgnoreUniString( nLen ); // reads Grbit even if nLen==0
- break;
- case 0x19: // Special Attribute [327 279]
+ case 0x03: // Addition [312 264]
+ case 0x04: // Subtraction [313 264]
+ case 0x05: // Multiplication [313 264]
+ case 0x06: // Division [313 264]
+ case 0x07: // Exponetiation [313 265]
+ case 0x08: // Concatenation [313 265]
+ case 0x09: // Less Than [313 265]
+ case 0x0A: // Less Than or Equal [313 265]
+ case 0x0B: // Equal [313 265]
+ case 0x0C: // Greater Than or Equal [313 265]
+ case 0x0D: // Greater Than [313 265]
+ case 0x0E: // Not Equal [313 265]
+ case 0x0F: // Intersection [314 265]
+ case 0x10: // Union [314 265]
+ case 0x11: // Range [314 265]
+ case 0x12: // Unary Plus [312 264]
+ case 0x13: // Unary Minus [312 264]
+ case 0x14: // Percent Sign [312 264]
+ case 0x15: // Parenthesis [326 278]
+ case 0x16: // Missing Argument [314 266]
+ break;
+ case 0x17: // String Constant [314 266]
+ aIn >> nLen; // und?
+
+ aIn.IgnoreUniString( nLen ); // reads Grbit even if nLen==0
+ break;
+ case 0x19: // Special Attribute [327 279]
{
UINT16 nData, nFakt;
BYTE nOpt;
@@ -950,47 +950,47 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
nFakt = 2;
if( nOpt & 0x04 )
- {// nFakt -> Bytes oder Words ueberlesen AttrChoose
+ {// nFakt -> Bytes oder Words ueberlesen AttrChoose
nData++;
aIn.Ignore( nData * nFakt );
}
}
break;
- case 0x1C: // Error Value [314 266]
- case 0x1D: // Boolean [315 266]
+ case 0x1C: // Error Value [314 266]
+ case 0x1D: // Boolean [315 266]
aIn.Ignore( 1 );
break;
- case 0x1E: // Integer [315 266]
+ case 0x1E: // Integer [315 266]
aIn.Ignore( 2 );
break;
- case 0x1F: // Number [315 266]
+ case 0x1F: // Number [315 266]
aIn.Ignore( 8 );
break;
case 0x40:
case 0x60:
- case 0x20: // Array Constant [317 268]
+ case 0x20: // Array Constant [317 268]
aIn.Ignore( 7 );
break;
case 0x41:
case 0x61:
- case 0x21: // Function, Fixed Number of Arguments [333 282]
+ case 0x21: // Function, Fixed Number of Arguments [333 282]
aIn.Ignore( 2 );
break;
case 0x42:
case 0x62:
- case 0x22: // Function, Variable Number of Arg. [333 283]
+ case 0x22: // Function, Variable Number of Arg. [333 283]
aIn.Ignore( 3 );
break;
case 0x43:
case 0x63:
- case 0x23: // Name [318 269]
+ case 0x23: // Name [318 269]
aIn.Ignore( 4 );
break;
case 0x44:
case 0x64:
- case 0x24: // Cell Reference [319 270]
+ case 0x24: // Cell Reference [319 270]
{
- UINT16 nCol, nRow;
+ UINT16 nCol, nRow;
aIn >> nRow >> nCol;
@@ -1007,12 +1007,12 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
break;
case 0x45:
case 0x65:
- case 0x25: // Area Reference [320 270]
+ case 0x25: // Area Reference [320 270]
{
- UINT16 nRowFirst, nRowLast;
- UINT16 nColFirst, nColLast;
- ScSingleRefData &rSRef1 = aCRD.Ref1;
- ScSingleRefData &rSRef2 = aCRD.Ref2;
+ UINT16 nRowFirst, nRowLast;
+ UINT16 nColFirst, nColLast;
+ ScSingleRefData &rSRef1 = aCRD.Ref1;
+ ScSingleRefData &rSRef2 = aCRD.Ref2;
aIn >> nRowFirst >> nRowLast >> nColFirst >> nColLast;
@@ -1035,10 +1035,10 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
break;
case 0x46:
case 0x66:
- case 0x26: // Constant Reference Subexpression [321 271]
+ case 0x26: // Constant Reference Subexpression [321 271]
case 0x47:
case 0x67:
- case 0x27: // Erroneous Constant Reference Subexpr. [322 272]
+ case 0x27: // Erroneous Constant Reference Subexpr. [322 272]
case 0x48:
case 0x68:
case 0x28: // Incomplete Constant Reference Subexpr.[331 281]
@@ -1046,25 +1046,25 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
break;
case 0x49:
case 0x69:
- case 0x29: // Variable Reference Subexpression [331 281]
+ case 0x29: // Variable Reference Subexpression [331 281]
aIn.Ignore( 2 ); // mehr steht da nicht!
break;
case 0x4A:
case 0x6A:
- case 0x2A: // Deleted Cell Reference [323 273]
+ case 0x2A: // Deleted Cell Reference [323 273]
aIn.Ignore( 3 );
break;
case 0x4B:
case 0x6B:
- case 0x2B: // Deleted Area Refernce [323 273]
+ case 0x2B: // Deleted Area Refernce [323 273]
aIn.Ignore( 6 );
break;
case 0x4C:
case 0x6C:
- case 0x2C: // Cell Reference Within a Name [323 ]
+ case 0x2C: // Cell Reference Within a Name [323 ]
// Cell Reference Within a Shared Formula[ 273]
{
- UINT16 nRow, nCol;
+ UINT16 nRow, nCol;
aIn >> nRow >> nCol;
@@ -1079,10 +1079,10 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
break;
case 0x4D:
case 0x6D:
- case 0x2D: // Area Reference Within a Name [324 ]
- { // Area Reference Within a Shared Formula[ 274]
- UINT16 nRowFirst, nRowLast;
- UINT16 nColFirst, nColLast;
+ case 0x2D: // Area Reference Within a Name [324 ]
+ { // Area Reference Within a Shared Formula[ 274]
+ UINT16 nRowFirst, nRowLast;
+ UINT16 nColFirst, nColLast;
aCRD.Ref1.nRelTab = aCRD.Ref2.nRelTab = 0;
aCRD.Ref1.SetTabRel( TRUE );
@@ -1105,25 +1105,25 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
break;
case 0x4E:
case 0x6E:
- case 0x2E: // Reference Subexpression Within a Name [332 282]
+ case 0x2E: // Reference Subexpression Within a Name [332 282]
case 0x4F:
case 0x6F:
- case 0x2F: // Incomplete Reference Subexpression... [332 282]
+ case 0x2F: // Incomplete Reference Subexpression... [332 282]
case 0x58:
case 0x78:
- case 0x38: // Command-Equivalent Function [333 ]
+ case 0x38: // Command-Equivalent Function [333 ]
aIn.Ignore( 2 );
break;
case 0x59:
case 0x79:
- case 0x39: // Name or External Name [ 275]
+ case 0x39: // Name or External Name [ 275]
aIn.Ignore( 24 );
break;
case 0x5A:
case 0x7A:
- case 0x3A: // 3-D Cell Reference [ 275]
+ case 0x3A: // 3-D Cell Reference [ 275]
{
- UINT16 nIxti, nRw, nGrbitCol;
+ UINT16 nIxti, nRw, nGrbitCol;
aIn >> nIxti >> nRw >> nGrbitCol;
@@ -1151,17 +1151,17 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
break;
case 0x5B:
case 0x7B:
- case 0x3B: // 3-D Area Reference [ 276]
+ case 0x3B: // 3-D Area Reference [ 276]
{
- UINT16 nIxti, nRw1, nGrbitCol1, nRw2, nGrbitCol2;
+ UINT16 nIxti, nRw1, nGrbitCol1, nRw2, nGrbitCol2;
aIn >> nIxti >> nRw1 >> nRw2 >> nGrbitCol1 >> nGrbitCol2;
SCTAB nFirstScTab, nLastScTab;
if( rLinkMan.GetScTabRange( nFirstScTab, nLastScTab, nIxti ) )
{
- ScSingleRefData &rR1 = aCRD.Ref1;
- ScSingleRefData &rR2 = aCRD.Ref2;
+ ScSingleRefData &rR1 = aCRD.Ref1;
+ ScSingleRefData &rR2 = aCRD.Ref2;
rR1.nTab = nFirstScTab;
rR2.nTab = nLastScTab;
@@ -1184,12 +1184,12 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
break;
case 0x5C:
case 0x7C:
- case 0x3C: // Deleted 3-D Cell Reference [ 277]
+ case 0x3C: // Deleted 3-D Cell Reference [ 277]
aIn.Ignore( 6 );
break;
case 0x5D:
case 0x7D:
- case 0x3D: // Deleted 3-D Area Reference [ 277]
+ case 0x3D: // Deleted 3-D Area Reference [ 277]
aIn.Ignore( 10 );
break;
default:
@@ -1365,9 +1365,9 @@ ConvErr ExcelToSc8::ConvertExternName( const ScTokenArray*& rpArray, XclImpStrea
void ExcelToSc8::ExcRelToScRel8( UINT16 nRow, UINT16 nC, ScSingleRefData &rSRD, const BOOL bName )
{
- const BOOL bColRel = ( nC & 0x4000 ) != 0;
- const BOOL bRowRel = ( nC & 0x8000 ) != 0;
- const UINT8 nCol = static_cast<UINT8>(nC);
+ const BOOL bColRel = ( nC & 0x4000 ) != 0;
+ const BOOL bRowRel = ( nC & 0x8000 ) != 0;
+ const UINT8 nCol = static_cast<UINT8>(nC);
rSRD.SetColRel( bColRel );
rSRD.SetRowRel( bRowRel );
@@ -1376,18 +1376,18 @@ void ExcelToSc8::ExcRelToScRel8( UINT16 nRow, UINT16 nC, ScSingleRefData &rSRD,
{
// C O L
if( bColRel )
- // rel Col
+ // rel Col
rSRD.nRelCol = static_cast<SCsCOL>(static_cast<INT8>(nC));
else
- // abs Col
+ // abs Col
rSRD.nCol = static_cast<SCCOL>(nCol);
// R O W
if( bRowRel )
- // rel Row
+ // rel Row
rSRD.nRelRow = static_cast<SCsROW>(static_cast<INT16>(nRow));
else
- // abs Row
+ // abs Row
rSRD.nRow = Min( static_cast<SCROW>(nRow), MAXROW);
// T A B
@@ -1420,10 +1420,10 @@ void ExcelToSc8::ExcRelToScRel8( UINT16 nRow, UINT16 nC, ScSingleRefData &rSRD,
// stream seeks to first byte after <nLen>
BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen )
{
- UINT8 nOp;
- UINT16 nRow1, nRow2, nCol1, nCol2;
+ UINT8 nOp;
+ UINT16 nRow1, nRow2, nCol1, nCol2;
SCTAB nTab1, nTab2;
- UINT16 nIxti;
+ UINT16 nIxti;
sal_Size nSeek;
@@ -1438,10 +1438,10 @@ BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen )
{
case 0x44:
case 0x64:
- case 0x24: // Cell Reference [319 270]
+ case 0x24: // Cell Reference [319 270]
case 0x4C:
case 0x6C:
- case 0x2C: // Cell Reference Within a Name [323 ]
+ case 0x2C: // Cell Reference Within a Name [323 ]
// Cell Reference Within a Shared Formula[ 273]
aIn >> nRow1 >> nCol1;
@@ -1451,10 +1451,10 @@ BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen )
goto _common;
case 0x45:
case 0x65:
- case 0x25: // Area Reference [320 270]
+ case 0x25: // Area Reference [320 270]
case 0x4D:
case 0x6D:
- case 0x2D: // Area Reference Within a Name [324 ]
+ case 0x2D: // Area Reference Within a Name [324 ]
// Area Reference Within a Shared Formula[ 274]
aIn >> nRow1 >> nRow2 >> nCol1 >> nCol2;
@@ -1462,7 +1462,7 @@ BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen )
goto _common;
case 0x5A:
case 0x7A:
- case 0x3A: // 3-D Cell Reference [ 275]
+ case 0x3A: // 3-D Cell Reference [ 275]
aIn >> nIxti >> nRow1 >> nCol1;
nRow2 = nRow1;
@@ -1471,7 +1471,7 @@ BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen )
goto _3d_common;
case 0x5B:
case 0x7B:
- case 0x3B: // 3-D Area Reference [ 276]
+ case 0x3B: // 3-D Area Reference [ 276]
aIn >> nIxti >> nRow1 >> nRow2 >> nCol1 >> nCol2;
_3d_common:
@@ -1491,55 +1491,55 @@ BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen )
r.Append( aScRange );
}
break;
- case 0x1C: // Error Value [314 266]
- case 0x1D: // Boolean [315 266]
+ case 0x1C: // Error Value [314 266]
+ case 0x1D: // Boolean [315 266]
nSeek = 1;
break;
- case 0x1E: // Integer [315 266]
+ case 0x1E: // Integer [315 266]
case 0x41:
case 0x61:
- case 0x21: // Function, Fixed Number of Arguments [333 282]
+ case 0x21: // Function, Fixed Number of Arguments [333 282]
case 0x49:
case 0x69:
- case 0x29: // Variable Reference Subexpression [331 281]
+ case 0x29: // Variable Reference Subexpression [331 281]
case 0x4E:
case 0x6E:
- case 0x2E: // Reference Subexpression Within a Name [332 282]
+ case 0x2E: // Reference Subexpression Within a Name [332 282]
case 0x4F:
case 0x6F:
- case 0x2F: // Incomplete Reference Subexpression... [332 282]
+ case 0x2F: // Incomplete Reference Subexpression... [332 282]
case 0x58:
case 0x78:
- case 0x38: // Command-Equivalent Function [333 ]
+ case 0x38: // Command-Equivalent Function [333 ]
nSeek = 2;
break;
case 0x42:
case 0x62:
- case 0x22: // Function, Variable Number of Arg. [333 283]
+ case 0x22: // Function, Variable Number of Arg. [333 283]
nSeek = 3;
break;
- case 0x01: // Array Formula [325 ]
- case 0x02: // Data Table [325 277]
+ case 0x01: // Array Formula [325 ]
+ case 0x02: // Data Table [325 277]
case 0x43:
case 0x63:
- case 0x23: // Name [318 269]
+ case 0x23: // Name [318 269]
case 0x4A:
case 0x6A:
- case 0x2A: // Deleted Cell Reference [323 273]
+ case 0x2A: // Deleted Cell Reference [323 273]
nSeek = 4;
break;
case 0x46:
case 0x66:
- case 0x26: // Constant Reference Subexpression [321 271]
+ case 0x26: // Constant Reference Subexpression [321 271]
case 0x47:
case 0x67:
- case 0x27: // Erroneous Constant Reference Subexpr. [322 272]
+ case 0x27: // Erroneous Constant Reference Subexpr. [322 272]
case 0x48:
case 0x68:
case 0x28: // Incomplete Constant Reference Subexpr.[331 281]
case 0x5C:
case 0x7C:
- case 0x3C: // Deleted 3-D Cell Reference [ 277]
+ case 0x3C: // Deleted 3-D Cell Reference [ 277]
case 0x59:
case 0x79:
case 0x39: // Name or External Name [ 275]
@@ -1547,21 +1547,21 @@ BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen )
break;
case 0x40:
case 0x60:
- case 0x20: // Array Constant [317 268]
+ case 0x20: // Array Constant [317 268]
nSeek = 7;
break;
- case 0x1F: // Number [315 266]
+ case 0x1F: // Number [315 266]
case 0x4B:
case 0x6B:
- case 0x2B: // Deleted Area Refernce [323 273]
+ case 0x2B: // Deleted Area Refernce [323 273]
nSeek = 8;
break;
case 0x5D:
case 0x7D:
- case 0x3D: // Deleted 3-D Area Reference [ 277]
+ case 0x3D: // Deleted 3-D Area Reference [ 277]
nSeek = 10;
break;
- case 0x17: // String Constant [314 266]
+ case 0x17: // String Constant [314 266]
{
UINT8 nStrLen;
aIn >> nStrLen;
@@ -1569,13 +1569,13 @@ BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen )
nSeek = 0;
}
break;
- case 0x19: // Special Attribute [327 279]
+ case 0x19: // Special Attribute [327 279]
{
- UINT16 nData;
- UINT8 nOpt;
+ UINT16 nData;
+ UINT8 nOpt;
aIn >> nOpt >> nData;
if( nOpt & 0x04 )
- {// nFakt -> Bytes oder Words ueberlesen AttrChoose
+ {// nFakt -> Bytes oder Words ueberlesen AttrChoose
nData++;
nSeek = nData * 2;
}
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index d75a0e669603..a601d7663fe9 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -125,7 +125,7 @@ ImportExcel8::~ImportExcel8()
void ImportExcel8::Calccount( void )
{
- ScDocOptions aOpt = pD->GetDocOptions();
+ ScDocOptions aOpt = pD->GetDocOptions();
aOpt.SetIterCount( aIn.ReaduInt16() );
pD->SetDocOptions( aOpt );
}
@@ -141,7 +141,7 @@ void ImportExcel8::Precision( void )
void ImportExcel8::Delta( void )
{
- ScDocOptions aOpt = pD->GetDocOptions();
+ ScDocOptions aOpt = pD->GetDocOptions();
aOpt.SetIterEps( aIn.ReadDouble() );
pD->SetDocOptions( aOpt );
}
@@ -149,7 +149,7 @@ void ImportExcel8::Delta( void )
void ImportExcel8::Iteration( void )
{
- ScDocOptions aOpt = pD->GetDocOptions();
+ ScDocOptions aOpt = pD->GetDocOptions();
aOpt.SetIter( aIn.ReaduInt16() == 1 );
pD->SetDocOptions( aOpt );
}
@@ -157,8 +157,8 @@ void ImportExcel8::Iteration( void )
void ImportExcel8::Boundsheet( void )
{
- UINT8 nLen;
- UINT16 nGrbit;
+ UINT8 nLen;
+ UINT16 nGrbit;
aIn.DisableDecryption();
maSheetOffsets.push_back( aIn.ReaduInt32() );
@@ -190,7 +190,7 @@ void ImportExcel8::Boundsheet( void )
void ImportExcel8::Scenman( void )
{
- UINT16 nLastDispl;
+ UINT16 nLastDispl;
aIn.Ignore( 4 );
aIn >> nLastDispl;
@@ -273,7 +273,7 @@ void ImportExcel8::PostDocLoad( void )
// Scenarien bemachen! ACHTUNG: Hier wird Tabellen-Anzahl im Dokument erhoeht!!
if( !pD->IsClipboard() && aScenList.Count() )
{
- pD->UpdateChartListenerCollection(); // references in charts must be updated
+ pD->UpdateChartListenerCollection(); // references in charts must be updated
aScenList.Apply( GetRoot() );
}
@@ -386,8 +386,8 @@ void XclImpAutoFilterData::InsertQueryParam()
{
if( pCurrDBData && !bHasConflict )
{
- ScRange aAdvRange;
- BOOL bHasAdv = pCurrDBData->GetAdvancedQuerySource( aAdvRange );
+ ScRange aAdvRange;
+ BOOL bHasAdv = pCurrDBData->GetAdvancedQuerySource( aAdvRange );
if( bHasAdv )
pExcRoot->pIR->GetDoc().CreateQueryParam( aAdvRange.aStart.Col(),
aAdvRange.aStart.Row(), aAdvRange.aEnd.Col(), aAdvRange.aEnd.Row(),
@@ -445,8 +445,8 @@ void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm )
BOOL bTop10 = ::get_flag( nFlags, EXC_AFFLAG_TOP10 );
BOOL bTopOfTop10 = ::get_flag( nFlags, EXC_AFFLAG_TOP10TOP );
BOOL bPercent = ::get_flag( nFlags, EXC_AFFLAG_TOP10PERC );
- UINT16 nCntOfTop10 = nFlags >> 7;
- SCSIZE nCount = aParam.GetEntryCount();
+ UINT16 nCntOfTop10 = nFlags >> 7;
+ SCSIZE nCount = aParam.GetEntryCount();
if( bTop10 )
{
@@ -467,12 +467,12 @@ void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm )
}
else
{
- UINT8 nE, nType, nOper, nBoolErr, nVal;
+ UINT8 nE, nType, nOper, nBoolErr, nVal;
INT32 nRK;
- double fVal;
- BOOL bIgnore;
+ double fVal;
+ BOOL bIgnore;
- UINT8 nStrLen[ 2 ] = { 0, 0 };
+ UINT8 nStrLen[ 2 ] = { 0, 0 };
ScQueryEntry *pQueryEntries[ 2 ] = { NULL, NULL };
for( nE = 0; nE < 2; nE++ )
@@ -629,7 +629,7 @@ void XclImpAutoFilterData::CreateScDBData( const BOOL bUseUnNamed )
if( bActive || bCriteria)
{
ScDBCollection& rColl = pExcRoot->pIR->GetDatabaseRanges();
- pCurrDBData = rColl.GetDBAtArea( Tab(), StartCol(), StartRow(), EndCol(), EndRow() );
+ pCurrDBData = rColl.GetDBAtArea( Tab(), StartCol(), StartRow(), EndCol(), EndRow() );
if( !pCurrDBData )
{
AmendAFName(bUseUnNamed);
diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index 9a66325db419..bee06f17ec21 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using ::com::sun::star::uno::Sequence;
using ::rtl::OString;
//--------------------------------------------------------- class ExcDummy_00 -
-const BYTE ExcDummy_00::pMyData[] = {
+const BYTE ExcDummy_00::pMyData[] = {
0x5c, 0x00, 0x20, 0x00, 0x04, 'C', 'a', 'l', 'c', // WRITEACCESS
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
@@ -113,25 +113,25 @@ const BYTE ExcDummy_00::pMyData[] = {
const sal_Size ExcDummy_00::nMyLen = sizeof( ExcDummy_00::pMyData );
//-------------------------------------------------------- class ExcDummy_04x -
-const BYTE ExcDummy_040::pMyData[] = {
- 0x40, 0x00, 0x02, 0x00, 0x00, 0x00, // BACKUP
- 0x8d, 0x00, 0x02, 0x00, 0x00, 0x00, // HIDEOBJ
+const BYTE ExcDummy_040::pMyData[] = {
+ 0x40, 0x00, 0x02, 0x00, 0x00, 0x00, // BACKUP
+ 0x8d, 0x00, 0x02, 0x00, 0x00, 0x00, // HIDEOBJ
};
const sal_Size ExcDummy_040::nMyLen = sizeof( ExcDummy_040::pMyData );
-const BYTE ExcDummy_041::pMyData[] = {
- 0x0e, 0x00, 0x02, 0x00, 0x01, 0x00, // PRECISION
- 0xda, 0x00, 0x02, 0x00, 0x00, 0x00 // BOOKBOOL
+const BYTE ExcDummy_041::pMyData[] = {
+ 0x0e, 0x00, 0x02, 0x00, 0x01, 0x00, // PRECISION
+ 0xda, 0x00, 0x02, 0x00, 0x00, 0x00 // BOOKBOOL
};
const sal_Size ExcDummy_041::nMyLen = sizeof( ExcDummy_041::pMyData );
//-------------------------------------------------------- class ExcDummy_02a -
const BYTE ExcDummy_02a::pMyData[] = {
- 0x0d, 0x00, 0x02, 0x00, 0x01, 0x00, // CALCMODE
- 0x0c, 0x00, 0x02, 0x00, 0x64, 0x00, // CALCCOUNT
- 0x0f, 0x00, 0x02, 0x00, 0x01, 0x00, // REFMODE
- 0x11, 0x00, 0x02, 0x00, 0x00, 0x00, // ITERATION
- 0x10, 0x00, 0x08, 0x00, 0xfc, 0xa9, 0xf1, 0xd2, 0x4d, // DELTA
+ 0x0d, 0x00, 0x02, 0x00, 0x01, 0x00, // CALCMODE
+ 0x0c, 0x00, 0x02, 0x00, 0x64, 0x00, // CALCCOUNT
+ 0x0f, 0x00, 0x02, 0x00, 0x01, 0x00, // REFMODE
+ 0x11, 0x00, 0x02, 0x00, 0x00, 0x00, // ITERATION
+ 0x10, 0x00, 0x08, 0x00, 0xfc, 0xa9, 0xf1, 0xd2, 0x4d, // DELTA
0x62, 0x50, 0x3f,
0x5f, 0x00, 0x02, 0x00, 0x01, 0x00 // SAVERECALC
};
@@ -226,8 +226,8 @@ sal_Size ExcBoolRecord::GetLen( void ) const
//--------------------------------------------------------- class ExcBof_Base -
ExcBof_Base::ExcBof_Base() :
- nRupBuild( 0x096C ), // copied from Excel
- nRupYear( 0x07C9 ) // copied from Excel
+ nRupBuild( 0x096C ), // copied from Excel
+ nRupYear( 0x07C9 ) // copied from Excel
{
}
@@ -423,9 +423,9 @@ ExcBundlesheet::ExcBundlesheet( RootData& rRootData, SCTAB _nTab ) :
void ExcBundlesheet::SaveCont( XclExpStream& rStrm )
{
nOwnPos = rStrm.GetSvStreamPos();
- rStrm << (UINT32) 0x00000000 // dummy (stream position of the sheet)
+ rStrm << (UINT32) 0x00000000 // dummy (stream position of the sheet)
<< nGrbit;
- rStrm.WriteByteString( aName ); // 8 bit length, max 255 chars
+ rStrm.WriteByteString( aName ); // 8 bit length, max 255 chars
}
@@ -684,8 +684,8 @@ BOOL XclExpAutofilter::AddCondition( ScQueryConnect eConn, UINT8 nType, UINT8 nO
BOOL XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry )
{
- BOOL bConflict = FALSE;
- String sText;
+ BOOL bConflict = FALSE;
+ String sText;
if( rEntry.pStr )
{
@@ -724,10 +724,10 @@ BOOL XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry )
// other conditions
else
{
- double fVal = 0.0;
- sal_uInt32 nIndex = 0;
+ double fVal = 0.0;
+ sal_uInt32 nIndex = 0;
BOOL bIsNum = bLen ? GetFormatter().IsNumberFormat( sText, nIndex, fVal ) : TRUE;
- String* pText = bIsNum ? NULL : &sText;
+ String* pText = bIsNum ? NULL : &sText;
// top10 flags
UINT16 nNewFlags = 0x0000;
@@ -754,8 +754,8 @@ BOOL XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry )
{
if( bNewTop10 )
{
- if( fVal < 0 ) fVal = 0;
- if( fVal >= 501 ) fVal = 500;
+ if( fVal < 0 ) fVal = 0;
+ if( fVal >= 501 ) fVal = 500;
nFlags |= (nNewFlags | (UINT16)(fVal) << 7);
}
// normal condition
@@ -766,12 +766,12 @@ BOOL XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry )
switch( rEntry.eOp )
{
- case SC_EQUAL: nOper = EXC_AFOPER_EQUAL; break;
- case SC_LESS: nOper = EXC_AFOPER_LESS; break;
- case SC_GREATER: nOper = EXC_AFOPER_GREATER; break;
- case SC_LESS_EQUAL: nOper = EXC_AFOPER_LESSEQUAL; break;
- case SC_GREATER_EQUAL: nOper = EXC_AFOPER_GREATEREQUAL; break;
- case SC_NOT_EQUAL: nOper = EXC_AFOPER_NOTEQUAL; break;
+ case SC_EQUAL: nOper = EXC_AFOPER_EQUAL; break;
+ case SC_LESS: nOper = EXC_AFOPER_LESS; break;
+ case SC_GREATER: nOper = EXC_AFOPER_GREATER; break;
+ case SC_LESS_EQUAL: nOper = EXC_AFOPER_LESSEQUAL; break;
+ case SC_GREATER_EQUAL: nOper = EXC_AFOPER_GREATEREQUAL; break;
+ case SC_NOT_EQUAL: nOper = EXC_AFOPER_NOTEQUAL; break;
case SC_CONTAINS:
case SC_BEGINS_WITH:
case SC_ENDS_WITH:
@@ -843,11 +843,11 @@ ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) :
XclExpNameManager& rNameMgr = GetNameManager();
// search for first DB-range with filter
- UINT16 nIndex = 0;
- BOOL bFound = FALSE;
- BOOL bAdvanced = FALSE;
- ScDBData* pData = NULL;
- ScRange aAdvRange;
+ UINT16 nIndex = 0;
+ BOOL bFound = FALSE;
+ BOOL bAdvanced = FALSE;
+ ScDBData* pData = NULL;
+ ScRange aAdvRange;
while( (nIndex < rDBColl.GetCount()) && !bFound )
{
pData = rDBColl[ nIndex ];
@@ -865,12 +865,12 @@ ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) :
if( pData && bFound )
{
- ScQueryParam aParam;
+ ScQueryParam aParam;
pData->GetQueryParam( aParam );
- ScRange aRange( aParam.nCol1, aParam.nRow1, aParam.nTab,
+ ScRange aRange( aParam.nCol1, aParam.nRow1, aParam.nTab,
aParam.nCol2, aParam.nRow2, aParam.nTab );
- SCCOL nColCnt = aParam.nCol2 - aParam.nCol1 + 1;
+ SCCOL nColCnt = aParam.nCol2 - aParam.nCol1 + 1;
maRef = aRange;
@@ -898,15 +898,15 @@ ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) :
// AutoFilter
else
{
- BOOL bConflict = FALSE;
- BOOL bContLoop = TRUE;
- BOOL bHasOr = FALSE;
+ BOOL bConflict = FALSE;
+ BOOL bContLoop = TRUE;
+ BOOL bHasOr = FALSE;
SCCOLROW nFirstField = aParam.GetEntry( 0 ).nField;
// create AUTOFILTER records for filtered columns
for( SCSIZE nEntry = 0; !bConflict && bContLoop && (nEntry < aParam.GetEntryCount()); nEntry++ )
{
- const ScQueryEntry& rEntry = aParam.GetEntry( nEntry );
+ const ScQueryEntry& rEntry = aParam.GetEntry( nEntry );
bContLoop = rEntry.bDoQuery;
if( bContLoop )
diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx
index e6453c2f11e2..c6a5e5e24b24 100644
--- a/sc/source/filter/excel/exctools.cxx
+++ b/sc/source/filter/excel/exctools.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +143,11 @@ void XclImpOutlineBuffer::MakeScOutline( void )
if( !pOutlineArray || !HasOutline() )
return;
- const UINT16 nNumLev = 8;
- BOOL bPreOutedLevel = FALSE;
- BYTE nCurrLevel = 0;
- BOOL bMakeHidden[ nNumLev ];
- BOOL bMakeVisible[ nNumLev + 1 ];
+ const UINT16 nNumLev = 8;
+ BOOL bPreOutedLevel = FALSE;
+ BYTE nCurrLevel = 0;
+ BOOL bMakeHidden[ nNumLev ];
+ BOOL bMakeVisible[ nNumLev + 1 ];
sal_uInt16 nLevel;
for( nLevel = 0; nLevel < nNumLev; ++nLevel )
@@ -162,9 +162,9 @@ void XclImpOutlineBuffer::MakeScOutline( void )
{
for( BYTE nWorkLevel = 1; nWorkLevel <= nMaxLevel; nWorkLevel++ )
{
- UINT16 nStartPos = 0;
+ UINT16 nStartPos = 0;
BYTE nCurrLevel2 = 0;
- BYTE nPrevLevel = 0;
+ BYTE nPrevLevel = 0;
for( SCSIZE nC = 0 ; nC <= nLast ; nC++ )
{
@@ -190,20 +190,20 @@ void XclImpOutlineBuffer::MakeScOutline( void )
bPreOutedLevel = pHidden[ 0 ];
// generate SC outlines
- UINT16 nPrevC;
- UINT16 nStart[ nNumLev ];
- BOOL bDummy;
- BOOL bPrevOuted = bPreOutedLevel;
- BOOL bCurrHidden = FALSE;
- BOOL bPrevHidden = FALSE;
+ UINT16 nPrevC;
+ UINT16 nStart[ nNumLev ];
+ BOOL bDummy;
+ BOOL bPrevOuted = bPreOutedLevel;
+ BOOL bCurrHidden = FALSE;
+ BOOL bPrevHidden = FALSE;
for( SCSIZE nC = 0; nC <= nLast; nC++ )
{
BYTE nWorkLevel = pLevel[ nC ];
nPrevC = static_cast< sal_uInt16 >( nC ? nC - 1 : 0 );
- bPrevHidden = bCurrHidden;
- bCurrHidden = pHidden[ nC ];
+ bPrevHidden = bCurrHidden;
+ bCurrHidden = pHidden[ nC ];
// open new levels
while( nWorkLevel > nCurrLevel )
@@ -217,9 +217,9 @@ void XclImpOutlineBuffer::MakeScOutline( void )
// close levels
while( nWorkLevel < nCurrLevel )
{
- BOOL bLastLevel = (nWorkLevel == (nCurrLevel - 1));
- BOOL bRealHidden = (bMakeHidden[ nCurrLevel ] && bPrevHidden );
- BOOL bRealVisible = (bMakeVisible[ nCurrLevel ] ||
+ BOOL bLastLevel = (nWorkLevel == (nCurrLevel - 1));
+ BOOL bRealHidden = (bMakeHidden[ nCurrLevel ] && bPrevHidden );
+ BOOL bRealVisible = (bMakeVisible[ nCurrLevel ] ||
(!bCurrHidden && bLastLevel));
pOutlineArray->Insert( nStart[ nCurrLevel ], nPrevC , bDummy,
@@ -242,10 +242,10 @@ void XclImpOutlineBuffer::SetLevelRange( SCSIZE nF, SCSIZE nL, BYTE nVal,
if( nL > nLast )
nLast = nL;
- BYTE* pLevelCount;
- BYTE* pLast;
- BOOL* pOutedCount;
- BOOL* pHiddenCount;
+ BYTE* pLevelCount;
+ BYTE* pLast;
+ BOOL* pOutedCount;
+ BOOL* pHiddenCount;
pLevelCount = &pLevel[ nF ];
pLast = &pLevel[ nL ];
@@ -293,15 +293,15 @@ void ExcScenarioCell::SetValue( const String& r )
-#define EXCSCAPPEND(EXCSCCELL) (List::Insert(EXCSCCELL,LIST_APPEND))
-#define EXCSCFIRST() ((ExcScenarioCell*)List::First())
-#define EXCSCNEXT() ((ExcScenarioCell*)List::Next())
+#define EXCSCAPPEND(EXCSCCELL) (List::Insert(EXCSCCELL,LIST_APPEND))
+#define EXCSCFIRST() ((ExcScenarioCell*)List::First())
+#define EXCSCNEXT() ((ExcScenarioCell*)List::Next())
ExcScenario::ExcScenario( XclImpStream& rIn, const RootData& rR ) : nTab( rR.pIR->GetCurrScTab() )
{
- UINT16 nCref;
- UINT8 nName, nComment;
+ UINT16 nCref;
+ UINT8 nName, nComment;
rIn >> nCref;
rIn >> nProtected;
@@ -324,8 +324,8 @@ ExcScenario::ExcScenario( XclImpStream& rIn, const RootData& rR ) : nTab( rR.pIR
else
pComment = new String;
- UINT16 n = nCref;
- UINT16 nC, nR;
+ UINT16 n = nCref;
+ UINT16 nC, nR;
while( n )
{
rIn >> nR >> nC;
@@ -336,7 +336,7 @@ ExcScenario::ExcScenario( XclImpStream& rIn, const RootData& rR ) : nTab( rR.pIR
}
n = nCref;
- ExcScenarioCell* p = EXCSCFIRST();
+ ExcScenarioCell* p = EXCSCFIRST();
while( p )
{
p->SetValue( rIn.ReadUniString() );
@@ -348,7 +348,7 @@ ExcScenario::ExcScenario( XclImpStream& rIn, const RootData& rR ) : nTab( rR.pIR
ExcScenario::~ExcScenario()
{
- ExcScenarioCell* p = EXCSCFIRST();
+ ExcScenarioCell* p = EXCSCFIRST();
while( p )
{
@@ -368,9 +368,9 @@ ExcScenario::~ExcScenario()
void ExcScenario::Apply( const XclImpRoot& rRoot, const BOOL bLast )
{
ScDocument& r = rRoot.GetDoc();
- ExcScenarioCell* p = EXCSCFIRST();
- String aSzenName( *pName );
- UINT16 nNewTab = nTab + 1;
+ ExcScenarioCell* p = EXCSCFIRST();
+ String aSzenName( *pName );
+ UINT16 nNewTab = nTab + 1;
if( !r.InsertTab( nNewTab, aSzenName ) )
return;
@@ -381,9 +381,9 @@ void ExcScenario::Apply( const XclImpRoot& rRoot, const BOOL bLast )
while( p )
{
- UINT16 nCol = p->nCol;
- UINT16 nRow = p->nRow;
- String aVal = p->GetValue();
+ UINT16 nCol = p->nCol;
+ UINT16 nRow = p->nRow;
+ String aVal = p->GetValue();
r.ApplyFlagsTab( nCol, nRow, nCol, nRow, nNewTab, SC_MF_SCENARIO );
@@ -408,7 +408,7 @@ void ExcScenario::Apply( const XclImpRoot& rRoot, const BOOL bLast )
ExcScenarioList::~ExcScenarioList()
{
- ExcScenario* p = _First();
+ ExcScenario* p = _First();
while( p )
{
@@ -420,8 +420,8 @@ ExcScenarioList::~ExcScenarioList()
void ExcScenarioList::Apply( const XclImpRoot& rRoot )
{
- ExcScenario* p = _Last();
- UINT16 n = ( UINT16 ) Count();
+ ExcScenario* p = _Last();
+ UINT16 n = ( UINT16 ) Count();
while( p )
{
diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx
index dbe70ae6a0ee..b0b87d2cfce6 100644
--- a/sc/source/filter/excel/expop2.cxx
+++ b/sc/source/filter/excel/expop2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +102,8 @@ FltError ExportBiff5::Write()
pDocShell->SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
}
- pExcDoc->ReadDoc(); // ScDoc -> ExcDoc
- pExcDoc->Write( aOut ); // wechstreamen
+ pExcDoc->ReadDoc(); // ScDoc -> ExcDoc
+ pExcDoc->Write( aOut ); // wechstreamen
if( pDocShell && xRootStrg.Is() )
{
diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx
index dca6723181ae..84b2f6c3ab3c 100644
--- a/sc/source/filter/excel/fontbuff.cxx
+++ b/sc/source/filter/excel/fontbuff.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "patattr.hxx"
#include "ftools.hxx"
-const UINT16 LotusFontBuffer::nSize = 8;
+const UINT16 LotusFontBuffer::nSize = 8;
void LotusFontBuffer::Fill( const UINT8 nIndex, SfxItemSet& rItemSet )
{
- UINT8 nIntIndex = nIndex & 0x07;
+ UINT8 nIntIndex = nIndex & 0x07;
- ENTRY* pAkt = pData + nIntIndex;
+ ENTRY* pAkt = pData + nIntIndex;
if( pAkt->pFont )
rItemSet.Put( *pAkt->pFont );
@@ -78,12 +78,12 @@ void LotusFontBuffer::Fill( const UINT8 nIndex, SfxItemSet& rItemSet )
}
FontUnderline eUnderline;
- switch( nIndex & 0x60 ) // Bit 5+6
+ switch( nIndex & 0x60 ) // Bit 5+6
{
case 0x60:
- case 0x20: eUnderline = UNDERLINE_SINGLE; break;
- case 0x40: eUnderline = UNDERLINE_DOUBLE; break;
- default: eUnderline = UNDERLINE_NONE;
+ case 0x20: eUnderline = UNDERLINE_SINGLE; break;
+ case 0x40: eUnderline = UNDERLINE_DOUBLE; break;
+ default: eUnderline = UNDERLINE_NONE;
}
if( eUnderline != UNDERLINE_NONE )
{
@@ -98,7 +98,7 @@ void LotusFontBuffer::SetName( const UINT16 nIndex, const String& rName )
DBG_ASSERT( nIndex < nSize, "*LotusFontBuffer::SetName(): Array zu klein!" );
if( nIndex < nSize )
{
- register ENTRY* pEntry = pData + nIndex;
+ register ENTRY* pEntry = pData + nIndex;
pEntry->TmpName( rName );
if( pEntry->nType >= 0 )
@@ -120,7 +120,7 @@ void LotusFontBuffer::SetType( const UINT16 nIndex, const UINT16 nType )
DBG_ASSERT( nIndex < nSize, "*LotusFontBuffer::SetType(): Array zu klein!" );
if( nIndex < nSize )
{
- register ENTRY* pEntry = pData + nIndex;
+ register ENTRY* pEntry = pData + nIndex;
pEntry->Type( nType );
if( pEntry->pTmpName )
@@ -131,24 +131,24 @@ void LotusFontBuffer::SetType( const UINT16 nIndex, const UINT16 nType )
void LotusFontBuffer::MakeFont( ENTRY* pEntry )
{
- FontFamily eFamily = FAMILY_DONTKNOW;
- FontPitch ePitch = PITCH_DONTKNOW;
- CharSet eCharSet = RTL_TEXTENCODING_DONTKNOW;
+ FontFamily eFamily = FAMILY_DONTKNOW;
+ FontPitch ePitch = PITCH_DONTKNOW;
+ CharSet eCharSet = RTL_TEXTENCODING_DONTKNOW;
switch( pEntry->nType )
{
- case 0x00: // Helvetica
+ case 0x00: // Helvetica
eFamily = FAMILY_SWISS;
- ePitch = PITCH_VARIABLE;
+ ePitch = PITCH_VARIABLE;
break;
- case 0x01: // Times Roman
+ case 0x01: // Times Roman
eFamily = FAMILY_ROMAN;
- ePitch = PITCH_VARIABLE;
+ ePitch = PITCH_VARIABLE;
break;
- case 0x02: // Courier
- ePitch = PITCH_FIXED;
+ case 0x02: // Courier
+ ePitch = PITCH_FIXED;
break;
- case 0x03: // Symbol
+ case 0x03: // Symbol
eCharSet = RTL_TEXTENCODING_SYMBOL;
break;
}
diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx
index 78883b4a5c76..3b165e599386 100644
--- a/sc/source/filter/excel/frmbase.cxx
+++ b/sc/source/filter/excel/frmbase.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
_ScRangeList::~_ScRangeList()
{
- ScRange* p = ( ScRange* ) First();
+ ScRange* p = ( ScRange* ) First();
while( p )
{
@@ -118,31 +118,31 @@ void _ScRangeListTabs::Append( ScComplexRefData a, const BOOL b )
if( a.Ref1.nTab != a.Ref2.nTab )
return;
- SCsTAB& rTab = a.Ref1.nTab;
+ SCsTAB& rTab = a.Ref1.nTab;
if( rTab > MAXTAB )
rTab = MAXTAB;
else if( rTab < 0 )
rTab = 0;
- SCsCOL& rCol1 = a.Ref1.nCol;
+ SCsCOL& rCol1 = a.Ref1.nCol;
if( rCol1 > MAXCOL )
rCol1 = MAXCOL;
else if( rCol1 < 0 )
rCol1 = 0;
- SCsROW& rRow1 = a.Ref1.nRow;
+ SCsROW& rRow1 = a.Ref1.nRow;
if( rRow1 > MAXROW )
rRow1 = MAXROW;
else if( rRow1 < 0 )
rRow1 = 0;
- SCsCOL& rCol2 = a.Ref2.nCol;
+ SCsCOL& rCol2 = a.Ref2.nCol;
if( rCol2 > MAXCOL )
rCol2 = MAXCOL;
else if( rCol2 < 0 )
rCol2 = 0;
- SCsROW& rRow2 = a.Ref2.nRow;
+ SCsROW& rRow2 = a.Ref2.nRow;
if( rRow2 > MAXROW )
rRow2 = MAXROW;
else if( rRow2 < 0 )
@@ -265,7 +265,7 @@ LotusConverterBase::~LotusConverterBase()
//UNUSED2008-05 nBytesLeft = nLen;
//UNUSED2008-05 aEingPos = rEingPos;
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 void LotusConverterBase::Reset( INT32 nLen )
//UNUSED2008-05 {
//UNUSED2008-05 ConverterBase::Reset();
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 209d24ac043d..cea2a9dd1f0e 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -127,14 +127,14 @@ ImportExcel::ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ):
{
mnLastRefIdx = 0;
nBdshtTab = 0;
- nIxfeIndex = 0; // zur Sicherheit auf 0
+ nIxfeIndex = 0; // zur Sicherheit auf 0
// Root-Daten fuellen - nach new's ohne Root als Parameter
pExcRoot = &GetOldRoot();
pExcRoot->pIR = this; // ExcRoot -> XclImpRoot
pExcRoot->eDateiTyp = BiffX;
- pExcRoot->pExtSheetBuff = new ExtSheetBuffer( pExcRoot ); //&aExtSheetBuff;
- pExcRoot->pShrfmlaBuff = new ShrfmlaBuffer( pExcRoot ); //&aShrfrmlaBuff;
+ pExcRoot->pExtSheetBuff = new ExtSheetBuffer( pExcRoot ); //&aExtSheetBuff;
+ pExcRoot->pShrfmlaBuff = new ShrfmlaBuffer( pExcRoot ); //&aShrfrmlaBuff;
pExcRoot->pExtNameBuff = new ExtNameBuff ( *this );
pExtNameBuff = new NameBuffer( pExcRoot ); //#94039# prevent empty rootdata
@@ -182,7 +182,7 @@ void ImportExcel::ReadFileSharing()
{
if( SfxItemSet* pItemSet = GetMedium().GetItemSet() )
pItemSet->Put( SfxBoolItem( SID_DOC_READONLY, TRUE ) );
-
+
if( SfxObjectShell* pShell = GetDocShell() )
{
if( nRecommendReadOnly != 0 )
@@ -382,14 +382,14 @@ void ImportExcel::Window1()
void ImportExcel::Row25( void )
{
- UINT16 nRow, nRowHeight;
+ UINT16 nRow, nRowHeight;
aIn >> nRow;
aIn.Ignore( 4 ); // Mic und Mac ueberspringen
if( ValidRow( nRow ) )
{
- aIn >> nRowHeight; // direkt in Twips angegeben
+ aIn >> nRowHeight; // direkt in Twips angegeben
aIn.Ignore( 2 );
if( GetBiff() == EXC_BIFF2 )
@@ -398,7 +398,7 @@ void ImportExcel::Row25( void )
}
else
{// -------------------- BIFF5
- UINT16 nGrbit;
+ UINT16 nGrbit;
aIn.Ignore( 2 ); // reserved
aIn >> nGrbit;
@@ -431,7 +431,7 @@ void ImportExcel::Bof2( void )
void ImportExcel::Eof( void )
{
- // POST: darf nur nach einer GUELTIGEN Tabelle gerufen werden!
+ // POST: darf nur nach einer GUELTIGEN Tabelle gerufen werden!
EndSheet();
IncCurrScTab();
}
@@ -467,8 +467,8 @@ void ImportExcel:: WinProtection( void )
void ImportExcel::Columndefault( void )
{// Default Cell Attributes
- UINT16 nColMic, nColMac;
- BYTE nOpt0;
+ UINT16 nColMic, nColMac;
+ BYTE nOpt0;
aIn >> nColMic >> nColMac;
@@ -485,7 +485,7 @@ void ImportExcel::Columndefault( void )
aIn >> nOpt0;
aIn.Ignore( 2 ); // nur 0. Attribut-Byte benutzt
- if( nOpt0 & 0x80 ) // Col hidden?
+ if( nOpt0 & 0x80 ) // Col hidden?
pColRowBuff->HideCol( nCol );
}
}
@@ -493,18 +493,18 @@ void ImportExcel::Columndefault( void )
void ImportExcel::Array25( void )
{
- UINT16 nFirstRow, nLastRow, nFormLen;
- BYTE nFirstCol, nLastCol;
+ UINT16 nFirstRow, nLastRow, nFormLen;
+ BYTE nFirstCol, nLastCol;
aIn >> nFirstRow >> nLastRow >> nFirstCol >> nLastCol;
if( GetBiff() == EXC_BIFF2 )
- {// BIFF2
+ {// BIFF2
aIn.Ignore( 1 );
nFormLen = aIn.ReaduInt8();
}
else
- {// BIFF5
+ {// BIFF5
aIn.Ignore( 6 );
aIn >> nFormLen;
}
@@ -512,7 +512,7 @@ void ImportExcel::Array25( void )
if( ValidColRow( nLastCol, nLastRow ) )
{
// jetzt steht Lesemarke auf Formel, Laenge in nFormLen
- const ScTokenArray* pErgebnis;
+ const ScTokenArray* pErgebnis;
pFormConv->Reset( ScAddress( static_cast<SCCOL>(nFirstCol),
static_cast<SCROW>(nFirstRow), GetCurrScTab() ) );
@@ -520,7 +520,7 @@ void ImportExcel::Array25( void )
DBG_ASSERT( pErgebnis, "*ImportExcel::Array25(): ScTokenArray ist NULL!" );
- ScMarkData aMarkData;
+ ScMarkData aMarkData;
aMarkData.SelectOneTable( GetCurrScTab() );
pD->InsertMatrixFormula( static_cast<SCCOL>(nFirstCol),
static_cast<SCROW>(nFirstRow), static_cast<SCCOL>(nLastCol),
@@ -532,7 +532,7 @@ void ImportExcel::Array25( void )
void ImportExcel::Rec1904( void )
{
- UINT16 n1904;
+ UINT16 n1904;
aIn >> n1904;
@@ -548,8 +548,8 @@ void ImportExcel::Rec1904( void )
void ImportExcel::Externname25( void )
{
- UINT32 nRes;
- UINT16 nOpt;
+ UINT32 nRes;
+ UINT16 nOpt;
aIn >> nOpt >> nRes;
@@ -573,8 +573,8 @@ void ImportExcel::Externname25( void )
void ImportExcel::Colwidth( void )
{// Column Width
- BYTE nColFirst, nColLast;
- UINT16 nColWidth;
+ BYTE nColFirst, nColLast;
+ UINT16 nColWidth;
aIn >> nColFirst >> nColLast >> nColWidth;
@@ -653,8 +653,8 @@ void ImportExcel::Builtinfmtcnt( void )
void ImportExcel::Colinfo( void )
{// Column Formatting Information
- UINT16 nColFirst, nColLast, nColWidth, nXF;
- UINT16 nOpt;
+ UINT16 nColFirst, nColLast, nColWidth, nXF;
+ UINT16 nOpt;
aIn >> nColFirst >> nColLast >> nColWidth >> nXF >> nOpt;
@@ -754,8 +754,8 @@ void ImportExcel::ReadUsesElfs()
void ImportExcel::Hideobj( void )
{
- UINT16 nHide;
- ScVObjMode eOle, eChart, eDraw;
+ UINT16 nHide;
+ ScVObjMode eOle, eChart, eDraw;
aIn >> nHide;
@@ -763,17 +763,17 @@ void ImportExcel::Hideobj( void )
switch( nHide )
{
- case 1: // Placeholders
- eOle = VOBJ_MODE_SHOW; // in Excel 97 werden nur Charts als Platzhalter angezeigt
- eChart = VOBJ_MODE_SHOW; //#i80528# VOBJ_MODE_DUMMY replaced by VOBJ_MODE_SHOW now
+ case 1: // Placeholders
+ eOle = VOBJ_MODE_SHOW; // in Excel 97 werden nur Charts als Platzhalter angezeigt
+ eChart = VOBJ_MODE_SHOW; //#i80528# VOBJ_MODE_DUMMY replaced by VOBJ_MODE_SHOW now
eDraw = VOBJ_MODE_SHOW;
break;
- case 2: // Hide all
+ case 2: // Hide all
eOle = VOBJ_MODE_HIDE;
eChart = VOBJ_MODE_HIDE;
eDraw = VOBJ_MODE_HIDE;
break;
- default: // Show all
+ default: // Show all
eOle = VOBJ_MODE_SHOW;
eChart = VOBJ_MODE_SHOW;
eDraw = VOBJ_MODE_SHOW;
@@ -802,8 +802,8 @@ void ImportExcel::Standardwidth( void )
void ImportExcel::Shrfmla( void )
{
- UINT16 nFirstRow, nLastRow, nLenExpr;
- BYTE nFirstCol, nLastCol;
+ UINT16 nFirstRow, nLastRow, nLenExpr;
+ BYTE nFirstCol, nLastCol;
aIn >> nFirstRow >> nLastRow >> nFirstCol >> nLastCol;
aIn.Ignore( 2 );
@@ -811,7 +811,7 @@ void ImportExcel::Shrfmla( void )
// jetzt steht Lesemarke an der Formel
- const ScTokenArray* pErgebnis;
+ const ScTokenArray* pErgebnis;
pFormConv->Reset();
pFormConv->Convert( pErgebnis, maStrm, nLenExpr, true, FT_SharedFormula );
@@ -927,7 +927,7 @@ void ImportExcel::Olesize( void )
void ImportExcel::Row34( void )
{
- UINT16 nRow, nRowHeight, nGrbit, nXF;
+ UINT16 nRow, nRowHeight, nGrbit, nXF;
aIn >> nRow;
aIn.Ignore( 4 ); // Mic und Mac ueberspringen
@@ -936,7 +936,7 @@ void ImportExcel::Row34( void )
if( ValidRow( nScRow ) )
{
- aIn >> nRowHeight; // direkt in Twips angegeben
+ aIn >> nRowHeight; // direkt in Twips angegeben
aIn.Ignore( 4 );
aIn >> nGrbit >> nXF;
@@ -974,8 +974,8 @@ void ImportExcel::Bof3( void )
void ImportExcel::Array34( void )
{
- UINT16 nFirstRow, nLastRow, nFormLen;
- BYTE nFirstCol, nLastCol;
+ UINT16 nFirstRow, nLastRow, nFormLen;
+ BYTE nFirstCol, nLastCol;
aIn >> nFirstRow >> nLastRow >> nFirstCol >> nLastCol;
aIn.Ignore( (GetBiff() >= EXC_BIFF5) ? 6 : 2 );
@@ -984,7 +984,7 @@ void ImportExcel::Array34( void )
if( ValidColRow( nLastCol, nLastRow ) )
{
// jetzt steht Lesemarke auf Formel, Laenge in nFormLen
- const ScTokenArray* pErgebnis;
+ const ScTokenArray* pErgebnis;
pFormConv->Reset( ScAddress( static_cast<SCCOL>(nFirstCol),
static_cast<SCROW>(nFirstRow), GetCurrScTab() ) );
@@ -992,7 +992,7 @@ void ImportExcel::Array34( void )
DBG_ASSERT( pErgebnis, "+ImportExcel::Array34(): ScTokenArray ist NULL!" );
- ScMarkData aMarkData;
+ ScMarkData aMarkData;
aMarkData.SelectOneTable( GetCurrScTab() );
pD->InsertMatrixFormula( static_cast<SCCOL>(nFirstCol),
static_cast<SCROW>(nFirstRow), static_cast<SCCOL>(nLastCol),
@@ -1036,7 +1036,7 @@ void ImportExcel::TableOp( void )
SCTAB nTab = GetCurrScTab();
switch( aTabOpParam.nMode )
{
- case 0: // COL
+ case 0: // COL
aTabOpParam.aRefFormulaCell.Set(
static_cast<SCCOL>(nFirstCol),
static_cast<SCROW>(nFirstRow - 1), nTab, FALSE,
@@ -1050,7 +1050,7 @@ void ImportExcel::TableOp( void )
FALSE );
nRow++;
break;
- case 1: // ROW
+ case 1: // ROW
aTabOpParam.aRefFormulaCell.Set(
static_cast<SCCOL>(nFirstCol - 1),
static_cast<SCROW>(nFirstRow), nTab, FALSE, FALSE,
@@ -1064,7 +1064,7 @@ void ImportExcel::TableOp( void )
FALSE );
nCol++;
break;
- case 2: // TWO-INPUT
+ case 2: // TWO-INPUT
aTabOpParam.aRefFormulaCell.Set(
static_cast<SCCOL>(nFirstCol - 1),
static_cast<SCROW>(nFirstRow - 1), nTab, FALSE,
@@ -1113,9 +1113,9 @@ void ImportExcel::Bof4( void )
void ImportExcel::Bof5( void )
{
- //POST: eDateiTyp = Typ der zu lesenden Datei
- UINT16 nSubType, nVers;
- BiffTyp eDatei;
+ //POST: eDateiTyp = Typ der zu lesenden Datei
+ UINT16 nSubType, nVers;
+ BiffTyp eDatei;
maStrm.DisableDecryption();
maStrm >> nVers >> nSubType;
@@ -1246,8 +1246,8 @@ void ImportExcel::PostDocLoad( void )
// root data owns the extended document options -> create a new object
GetDoc().SetExtDocOptions( new ScExtDocOptions( GetExtDocOptions() ) );
- const SCTAB nLast = pD->GetTableCount();
- const ScRange* p;
+ const SCTAB nLast = pD->GetTableCount();
+ const ScRange* p;
if( pExcRoot->pPrintRanges->HasRanges() )
{
@@ -1285,8 +1285,8 @@ void ImportExcel::PostDocLoad( void )
DBG_ASSERT( pExcRoot->pPrintTitles->GetActList(),
"-ImportExcel::PostDocLoad(): Imaginaere Tabelle gefunden!" );
- BOOL bRowVirgin = TRUE;
- BOOL bColVirgin = TRUE;
+ BOOL bRowVirgin = TRUE;
+ BOOL bColVirgin = TRUE;
while( p )
{
diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx
index 7db7d17ed307..81676152a36a 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +46,9 @@
UINT32 StringHashEntry::MakeHashCode( const String& r )
{
- register UINT32 n = 0;
- const sal_Unicode* pAkt = r.GetBuffer();
- register sal_Unicode cAkt = *pAkt;
+ register UINT32 n = 0;
+ const sal_Unicode* pAkt = r.GetBuffer();
+ register sal_Unicode cAkt = *pAkt;
while( cAkt )
{
@@ -66,7 +66,7 @@ UINT32 StringHashEntry::MakeHashCode( const String& r )
NameBuffer::~NameBuffer()
{
- register StringHashEntry* pDel = ( StringHashEntry* ) List::First();
+ register StringHashEntry* pDel = ( StringHashEntry* ) List::First();
while( pDel )
{
delete pDel;
@@ -86,7 +86,7 @@ void NameBuffer::operator <<( const String &rNewString )
#ifdef DBG_UTIL
-UINT16 nShrCnt;
+UINT16 nShrCnt;
#endif
@@ -119,7 +119,7 @@ void ShrfmlaBuffer::Clear()
void ShrfmlaBuffer::Store( const ScRange& rRange, const ScTokenArray& rToken )
{
- String aName( CreateName( rRange.aStart ) );
+ String aName( CreateName( rRange.aStart ) );
DBG_ASSERT( mnCurrIdx <= 0xFFFF, "*ShrfmlaBuffer::Store(): Gleich wird mir schlecht...!" );
@@ -150,11 +150,11 @@ USHORT ShrfmlaBuffer::Find( const ScAddress & aAddr ) const
}
-#define SHRFMLA_BASENAME "SHARED_FORMULA_"
+#define SHRFMLA_BASENAME "SHARED_FORMULA_"
String ShrfmlaBuffer::CreateName( const ScRange& r )
{
- String aName( RTL_CONSTASCII_USTRINGPARAM( SHRFMLA_BASENAME ) );
+ String aName( RTL_CONSTASCII_USTRINGPARAM( SHRFMLA_BASENAME ) );
aName += String::CreateFromInt32( r.aStart.Col() );
aName.Append( '_' );
aName += String::CreateFromInt32( r.aStart.Row() );
@@ -171,7 +171,7 @@ String ShrfmlaBuffer::CreateName( const ScRange& r )
ExtSheetBuffer::~ExtSheetBuffer()
{
- Cont *pAkt = ( Cont * ) List::First();
+ Cont *pAkt = ( Cont * ) List::First();
while( pAkt )
{
delete pAkt;
@@ -194,8 +194,8 @@ BOOL ExtSheetBuffer::GetScTabIndex( UINT16 nExcIndex, UINT16& rScIndex )
"*ExtSheetBuffer::GetScTabIndex(): Sheet-Index == 0!" );
nExcIndex--;
- Cont* pCur = ( Cont * ) List::GetObject( nExcIndex );
- UINT16& rTabNum = pCur->nTabNum;
+ Cont* pCur = ( Cont * ) List::GetObject( nExcIndex );
+ UINT16& rTabNum = pCur->nTabNum;
if( pCur )
{
@@ -207,7 +207,7 @@ BOOL ExtSheetBuffer::GetScTabIndex( UINT16 nExcIndex, UINT16& rScIndex )
if( rTabNum == 0xFFFF )
{// neue Tabelle erzeugen
- SCTAB nNewTabNum;
+ SCTAB nNewTabNum;
if( pCur->bSWB )
{// Tabelle ist im selben Workbook!
if( pExcRoot->pIR->GetDoc().GetTable( pCur->aTab, nNewTabNum ) )
@@ -222,16 +222,16 @@ BOOL ExtSheetBuffer::GetScTabIndex( UINT16 nExcIndex, UINT16& rScIndex )
{// Tabelle ist 'echt' extern
if( pExcRoot->pIR->GetExtDocOptions().GetDocSettings().mnLinkCnt == 0 )
{
- String aURL( ScGlobal::GetAbsDocName( pCur->aFile,
+ String aURL( ScGlobal::GetAbsDocName( pCur->aFile,
pExcRoot->pIR->GetDocShell() ) );
- String aTabName( ScGlobal::GetDocTabName( aURL, pCur->aTab ) );
+ String aTabName( ScGlobal::GetDocTabName( aURL, pCur->aTab ) );
if( pExcRoot->pIR->GetDoc().LinkExternalTab( nNewTabNum, aTabName, aURL, pCur->aTab ) )
{
rScIndex = rTabNum = static_cast<UINT16>(nNewTabNum);
return TRUE;
}
else
- rTabNum = 0xFFFE; // Tabelle einmal nicht angelegt -> wird
+ rTabNum = 0xFFFE; // Tabelle einmal nicht angelegt -> wird
// wohl auch nicht mehr gehen...
}
else
@@ -248,7 +248,7 @@ BOOL ExtSheetBuffer::GetScTabIndex( UINT16 nExcIndex, UINT16& rScIndex )
BOOL ExtSheetBuffer::IsLink( const UINT16 nExcIndex ) const
{
DBG_ASSERT( nExcIndex > 0, "*ExtSheetBuffer::IsLink(): Index muss >0 sein!" );
- Cont* pRet = ( Cont * ) List::GetObject( nExcIndex - 1 );
+ Cont* pRet = ( Cont * ) List::GetObject( nExcIndex - 1 );
if( pRet )
return pRet->bLink;
@@ -260,7 +260,7 @@ BOOL ExtSheetBuffer::IsLink( const UINT16 nExcIndex ) const
BOOL ExtSheetBuffer::GetLink( const UINT16 nExcIndex, String& rAppl, String& rDoc ) const
{
DBG_ASSERT( nExcIndex > 0, "*ExtSheetBuffer::GetLink(): Index muss >0 sein!" );
- Cont* pRet = ( Cont * ) List::GetObject( nExcIndex - 1 );
+ Cont* pRet = ( Cont * ) List::GetObject( nExcIndex - 1 );
if( pRet )
{
@@ -275,7 +275,7 @@ BOOL ExtSheetBuffer::GetLink( const UINT16 nExcIndex, String& rAppl, String& rDo
void ExtSheetBuffer::Reset( void )
{
- Cont *pAkt = ( Cont * ) List::First();
+ Cont *pAkt = ( Cont * ) List::First();
while( pAkt )
{
delete pAkt;
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index cfe5aedb867e..4b2834873de9 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,28 +68,28 @@ FltError ImportExcel::Read( void )
// call to GetCurrSheetDrawing() cannot be cached (changes in new sheets)
enum Zustand {
- Z_BiffNull, // Nicht in gueltigem Biff-Format
- Z_Biff2, // Biff2: nur eine Tabelle
+ Z_BiffNull, // Nicht in gueltigem Biff-Format
+ Z_Biff2, // Biff2: nur eine Tabelle
- Z_Biff3, // Biff3: nur eine Tabelle
+ Z_Biff3, // Biff3: nur eine Tabelle
- Z_Biff4, // Biff4: nur eine Tabelle
- Z_Biff4W, // Biff4 Workbook: Globals
- Z_Biff4T, // Biff4 Workbook: eine Tabelle selbst
- Z_Biff4E, // Biff4 Workbook: zwischen den Tabellen
+ Z_Biff4, // Biff4: nur eine Tabelle
+ Z_Biff4W, // Biff4 Workbook: Globals
+ Z_Biff4T, // Biff4 Workbook: eine Tabelle selbst
+ Z_Biff4E, // Biff4 Workbook: zwischen den Tabellen
Z_Biff5WPre,// Biff5: Prefetch Workbook
- Z_Biff5W, // Biff5: Globals
+ Z_Biff5W, // Biff5: Globals
Z_Biff5TPre,// Biff5: Prefetch fuer Shrfmla/Array Formula
- Z_Biff5T, // Biff5: eine Tabelle selbst
- Z_Biff5E, // Biff5: zwischen den Tabellen
- Z_Biffn0, // Alle Biffs: Tabelle bis naechstesss EOF ueberlesen
+ Z_Biff5T, // Biff5: eine Tabelle selbst
+ Z_Biff5E, // Biff5: zwischen den Tabellen
+ Z_Biffn0, // Alle Biffs: Tabelle bis naechstesss EOF ueberlesen
Z_Ende };
- Zustand eAkt = Z_BiffNull, ePrev = Z_BiffNull;
+ Zustand eAkt = Z_BiffNull, ePrev = Z_BiffNull;
- FltError eLastErr = eERR_OK;
- UINT16 nOpcode;
+ FltError eLastErr = eERR_OK;
+ UINT16 nOpcode;
UINT16 nBofLevel = 0;
BOOL bBiff4Workbook = FALSE;
@@ -151,7 +151,7 @@ FltError ImportExcel::Read( void )
switch( eAkt )
{
// ----------------------------------------------------------------
- case Z_BiffNull: // ------------------------------- Z_BiffNull -
+ case Z_BiffNull: // ------------------------------- Z_BiffNull -
{
switch( nOpcode )
{
@@ -220,7 +220,7 @@ FltError ImportExcel::Read( void )
}
break;
// ----------------------------------------------------------------
- case Z_Biff2: // ---------------------------------- Z_Biff2 -
+ case Z_Biff2: // ---------------------------------- Z_Biff2 -
{
switch( nOpcode )
{
@@ -237,32 +237,32 @@ FltError ImportExcel::Read( void )
case EXC_ID3_BOOLERR: ReadBoolErr(); break;
case EXC_ID_RK: ReadRk(); break;
- case 0x06: Formula25(); break; // FORMULA [ 2 5]
- case 0x08: Row25(); break; // ROW [ 2 5]
- case 0x0A: // EOF [ 2345]
+ case 0x06: Formula25(); break; // FORMULA [ 2 5]
+ case 0x08: Row25(); break; // ROW [ 2 5]
+ case 0x0A: // EOF [ 2345]
rNumFmtBfr.CreateScFormats();
Eof();
eAkt = Z_Ende;
break;
case 0x14:
case 0x15: rPageSett.ReadHeaderFooter( maStrm ); break;
- case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345]
+ case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345]
case 0x18: rNameMgr.ReadName( maStrm ); break;
case 0x1C: GetCurrSheetDrawing().ReadNote( maStrm );break;
case 0x1D: rTabViewSett.ReadSelection( maStrm ); break;
case 0x1E: rNumFmtBfr.ReadFormat( maStrm ); break;
- case 0x20: Columndefault(); break; // COLUMNDEFAULT[ 2 ]
- case 0x21: Array25(); break; // ARRAY [ 2 5]
- case 0x23: Externname25(); break; // EXTERNNAME [ 2 5]
- case 0x24: Colwidth(); break; // COLWIDTH [ 2 ]
- case 0x25: Defrowheight2(); break; // DEFAULTROWHEI[ 2 ]
+ case 0x20: Columndefault(); break; // COLUMNDEFAULT[ 2 ]
+ case 0x21: Array25(); break; // ARRAY [ 2 5]
+ case 0x23: Externname25(); break; // EXTERNNAME [ 2 5]
+ case 0x24: Colwidth(); break; // COLWIDTH [ 2 ]
+ case 0x25: Defrowheight2(); break; // DEFAULTROWHEI[ 2 ]
case 0x26:
case 0x27:
case 0x28:
case 0x29: rPageSett.ReadMargin( maStrm ); break;
case 0x2A: rPageSett.ReadPrintHeaders( maStrm ); break;
case 0x2B: rPageSett.ReadPrintGridLines( maStrm ); break;
- case 0x2F: // FILEPASS [ 2345]
+ case 0x2F: // FILEPASS [ 2345]
eLastErr = XclImpDecryptHelper::ReadFilepass( maStrm );
if( eLastErr != ERRCODE_NONE )
eAkt = Z_Ende;
@@ -271,14 +271,14 @@ FltError ImportExcel::Read( void )
case EXC_ID_EFONT: rFontBfr.ReadEfont( maStrm ); break;
case 0x3E: rTabViewSett.ReadWindow2( maStrm, false );break;
case 0x41: rTabViewSett.ReadPane( maStrm ); break;
- case 0x42: Codepage(); break; // CODEPAGE [ 2345]
+ case 0x42: Codepage(); break; // CODEPAGE [ 2345]
case 0x43: rXFBfr.ReadXF( maStrm ); break;
- case 0x44: Ixfe(); break; // IXFE [ 2 ]
+ case 0x44: Ixfe(); break; // IXFE [ 2 ]
}
}
break;
// ----------------------------------------------------------------
- case Z_Biff3: // ---------------------------------- Z_Biff3 -
+ case Z_Biff3: // ---------------------------------- Z_Biff3 -
{
switch( nOpcode )
{
@@ -301,44 +301,44 @@ FltError ImportExcel::Read( void )
case EXC_ID3_BOOLERR: ReadBoolErr(); break;
case EXC_ID_RK: ReadRk(); break;
- case 0x0A: // EOF [ 2345]
+ case 0x0A: // EOF [ 2345]
rNumFmtBfr.CreateScFormats();
Eof();
eAkt = Z_Ende;
break;
case 0x14:
case 0x15: rPageSett.ReadHeaderFooter( maStrm ); break;
- case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345]
+ case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345]
case 0x1A:
case 0x1B: rPageSett.ReadPageBreaks( maStrm ); break;
case 0x1C: GetCurrSheetDrawing().ReadNote( maStrm );break;
case 0x1D: rTabViewSett.ReadSelection( maStrm ); break;
case 0x1E: rNumFmtBfr.ReadFormat( maStrm ); break;
- case 0x22: Rec1904(); break; // 1904 [ 2345]
+ case 0x22: Rec1904(); break; // 1904 [ 2345]
case 0x26:
case 0x27:
case 0x28:
case 0x29: rPageSett.ReadMargin( maStrm ); break;
case 0x2A: rPageSett.ReadPrintHeaders( maStrm ); break;
case 0x2B: rPageSett.ReadPrintGridLines( maStrm ); break;
- case 0x2F: // FILEPASS [ 2345]
+ case 0x2F: // FILEPASS [ 2345]
eLastErr = XclImpDecryptHelper::ReadFilepass( maStrm );
if( eLastErr != ERRCODE_NONE )
eAkt = Z_Ende;
break;
case EXC_ID_FILESHARING: ReadFileSharing(); break;
case 0x41: rTabViewSett.ReadPane( maStrm ); break;
- case 0x42: Codepage(); break; // CODEPAGE [ 2345]
- case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ]
+ case 0x42: Codepage(); break; // CODEPAGE [ 2345]
+ case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ]
case 0x5D: GetCurrSheetDrawing().ReadObj( maStrm );break;
- case 0x7D: Colinfo(); break; // COLINFO [ 345]
- case 0x8C: Country(); break; // COUNTRY [ 345]
+ case 0x7D: Colinfo(); break; // COLINFO [ 345]
+ case 0x8C: Country(); break; // COUNTRY [ 345]
case 0x92: rPal.ReadPalette( maStrm ); break;
- case 0x0206: Formula3(); break; // FORMULA [ 3 ]
- case 0x0208: Row34(); break; // ROW [ 34 ]
+ case 0x0206: Formula3(); break; // FORMULA [ 3 ]
+ case 0x0208: Row34(); break; // ROW [ 34 ]
case 0x0218: rNameMgr.ReadName( maStrm ); break;
- case 0x0221: Array34(); break; // ARRAY [ 34 ]
- case 0x0223: Externname34(); break; // EXTERNNAME [ 34 ]
+ case 0x0221: Array34(); break; // ARRAY [ 34 ]
+ case 0x0223: Externname34(); break; // EXTERNNAME [ 34 ]
case 0x0225: Defrowheight345();break;//DEFAULTROWHEI[ 345]
case 0x0231: rFontBfr.ReadFont( maStrm ); break;
case 0x023E: rTabViewSett.ReadWindow2( maStrm, false );break;
@@ -348,7 +348,7 @@ FltError ImportExcel::Read( void )
}
break;
// ----------------------------------------------------------------
- case Z_Biff4: // ---------------------------------- Z_Biff4 -
+ case Z_Biff4: // ---------------------------------- Z_Biff4 -
{
switch( nOpcode )
{
@@ -371,7 +371,7 @@ FltError ImportExcel::Read( void )
case EXC_ID3_BOOLERR: ReadBoolErr(); break;
case EXC_ID_RK: ReadRk(); break;
- case 0x0A: // EOF [ 2345]
+ case 0x0A: // EOF [ 2345]
rNumFmtBfr.CreateScFormats();
Eof();
eAkt = Z_Ende;
@@ -379,42 +379,42 @@ FltError ImportExcel::Read( void )
case 0x12: SheetProtect(); break; // SHEET PROTECTION
case 0x14:
case 0x15: rPageSett.ReadHeaderFooter( maStrm ); break;
- case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345]
+ case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345]
case 0x1A:
case 0x1B: rPageSett.ReadPageBreaks( maStrm ); break;
case 0x1C: GetCurrSheetDrawing().ReadNote( maStrm );break;
case 0x1D: rTabViewSett.ReadSelection( maStrm ); break;
- case 0x22: Rec1904(); break; // 1904 [ 2345]
+ case 0x22: Rec1904(); break; // 1904 [ 2345]
case 0x26:
case 0x27:
case 0x28:
case 0x29: rPageSett.ReadMargin( maStrm ); break;
case 0x2A: rPageSett.ReadPrintHeaders( maStrm ); break;
case 0x2B: rPageSett.ReadPrintGridLines( maStrm ); break;
- case 0x2F: // FILEPASS [ 2345]
+ case 0x2F: // FILEPASS [ 2345]
eLastErr = XclImpDecryptHelper::ReadFilepass( maStrm );
if( eLastErr != ERRCODE_NONE )
eAkt = Z_Ende;
break;
case EXC_ID_FILESHARING: ReadFileSharing(); break;
case 0x41: rTabViewSett.ReadPane( maStrm ); break;
- case 0x42: Codepage(); break; // CODEPAGE [ 2345]
- case 0x55: DefColWidth(); break;
- case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ]
+ case 0x42: Codepage(); break; // CODEPAGE [ 2345]
+ case 0x55: DefColWidth(); break;
+ case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ]
case 0x5D: GetCurrSheetDrawing().ReadObj( maStrm );break;
- case 0x7D: Colinfo(); break; // COLINFO [ 345]
- case 0x8C: Country(); break; // COUNTRY [ 345]
+ case 0x7D: Colinfo(); break; // COLINFO [ 345]
+ case 0x8C: Country(); break; // COUNTRY [ 345]
case 0x92: rPal.ReadPalette( maStrm ); break;
- case 0x99: Standardwidth(); break; // STANDARDWIDTH[ 45]
+ case 0x99: Standardwidth(); break; // STANDARDWIDTH[ 45]
case 0xA1: rPageSett.ReadSetup( maStrm ); break;
- case 0x0208: Row34(); break; // ROW [ 34 ]
+ case 0x0208: Row34(); break; // ROW [ 34 ]
case 0x0218: rNameMgr.ReadName( maStrm ); break;
- case 0x0221: Array34(); break; // ARRAY [ 34 ]
- case 0x0223: Externname34(); break; // EXTERNNAME [ 34 ]
+ case 0x0221: Array34(); break; // ARRAY [ 34 ]
+ case 0x0223: Externname34(); break; // EXTERNNAME [ 34 ]
case 0x0225: Defrowheight345();break;//DEFAULTROWHEI[ 345]
case 0x0231: rFontBfr.ReadFont( maStrm ); break;
case 0x023E: rTabViewSett.ReadWindow2( maStrm, false );break;
- case 0x0406: Formula4(); break; // FORMULA [ 4 ]
+ case 0x0406: Formula4(); break; // FORMULA [ 4 ]
case 0x041E: rNumFmtBfr.ReadFormat( maStrm ); break;
case 0x0443: rXFBfr.ReadXF( maStrm ); break;
case 0x0293: rXFBfr.ReadStyle( maStrm ); break;
@@ -422,33 +422,33 @@ FltError ImportExcel::Read( void )
}
break;
// ----------------------------------------------------------------
- case Z_Biff4W: // --------------------------------- Z_Biff4W -
+ case Z_Biff4W: // --------------------------------- Z_Biff4W -
{
switch( nOpcode )
{
- case 0x0A: // EOF [ 2345]
+ case 0x0A: // EOF [ 2345]
eAkt = Z_Ende;
break;
- case 0x12: DocProtect(); break; // PROTECT [ 5]
- case 0x2F: // FILEPASS [ 2345]
+ case 0x12: DocProtect(); break; // PROTECT [ 5]
+ case 0x2F: // FILEPASS [ 2345]
eLastErr = XclImpDecryptHelper::ReadFilepass( maStrm );
if( eLastErr != ERRCODE_NONE )
eAkt = Z_Ende;
break;
case EXC_ID_FILESHARING: ReadFileSharing(); break;
case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345]
- case 0x42: Codepage(); break; // CODEPAGE [ 2345]
- case 0x55: DefColWidth(); break;
- case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ]
- case 0x8C: Country(); break; // COUNTRY [ 345]
- case 0x8F: Bundleheader(); break; // BUNDLEHEADER [ 4 ]
+ case 0x42: Codepage(); break; // CODEPAGE [ 2345]
+ case 0x55: DefColWidth(); break;
+ case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ]
+ case 0x8C: Country(); break; // COUNTRY [ 345]
+ case 0x8F: Bundleheader(); break; // BUNDLEHEADER [ 4 ]
case 0x92: rPal.ReadPalette( maStrm ); break;
- case 0x99: Standardwidth(); break; // STANDARDWIDTH[ 45]
+ case 0x99: Standardwidth(); break; // STANDARDWIDTH[ 45]
case 0x0218: rNameMgr.ReadName( maStrm ); break;
- case 0x0223: Externname34(); break; // EXTERNNAME [ 34 ]
+ case 0x0223: Externname34(); break; // EXTERNNAME [ 34 ]
case 0x0225: Defrowheight345();break;//DEFAULTROWHEI[ 345]
case 0x0231: rFontBfr.ReadFont( maStrm ); break;
- case 0x0409: // BOF [ 4 ]
+ case 0x0409: // BOF [ 4 ]
Bof4();
if( pExcRoot->eDateiTyp == Biff4 )
{
@@ -489,7 +489,7 @@ FltError ImportExcel::Read( void )
case EXC_ID3_BOOLERR: ReadBoolErr(); break;
case EXC_ID_RK: ReadRk(); break;
- case 0x0A: // EOF [ 2345]
+ case 0x0A: // EOF [ 2345]
Eof();
eAkt = Z_Biff4E;
break;
@@ -500,23 +500,23 @@ FltError ImportExcel::Read( void )
case 0x1B: rPageSett.ReadPageBreaks( maStrm ); break;
case 0x1C: GetCurrSheetDrawing().ReadNote( maStrm );break;
case 0x1D: rTabViewSett.ReadSelection( maStrm ); break;
- case 0x2F: // FILEPASS [ 2345]
+ case 0x2F: // FILEPASS [ 2345]
eLastErr = XclImpDecryptHelper::ReadFilepass( maStrm );
if( eLastErr != ERRCODE_NONE )
eAkt = Z_Ende;
break;
case 0x41: rTabViewSett.ReadPane( maStrm ); break;
- case 0x42: Codepage(); break; // CODEPAGE [ 2345]
- case 0x55: DefColWidth(); break;
- case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ]
+ case 0x42: Codepage(); break; // CODEPAGE [ 2345]
+ case 0x55: DefColWidth(); break;
+ case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ]
case 0x5D: GetCurrSheetDrawing().ReadObj( maStrm );break;
- case 0x7D: Colinfo(); break; // COLINFO [ 345]
- case 0x8C: Country(); break; // COUNTRY [ 345]
- case 0x8F: Bundleheader(); break; // BUNDLEHEADER [ 4 ]
+ case 0x7D: Colinfo(); break; // COLINFO [ 345]
+ case 0x8C: Country(); break; // COUNTRY [ 345]
+ case 0x8F: Bundleheader(); break; // BUNDLEHEADER [ 4 ]
case 0x92: rPal.ReadPalette( maStrm ); break;
- case 0x99: Standardwidth(); break; // STANDARDWIDTH[ 45]
+ case 0x99: Standardwidth(); break; // STANDARDWIDTH[ 45]
case 0xA1: rPageSett.ReadSetup( maStrm ); break;
- case 0x0208: Row34(); break; // ROW [ 34 ]
+ case 0x0208: Row34(); break; // ROW [ 34 ]
case 0x0218: rNameMgr.ReadName( maStrm ); break;
case 0x0221: Array34(); break;
case 0x0225: Defrowheight345();break;//DEFAULTROWHEI[ 345]
@@ -531,15 +531,15 @@ FltError ImportExcel::Read( void )
}
break;
// ----------------------------------------------------------------
- case Z_Biff4E: // --------------------------------- Z_Biff4E -
+ case Z_Biff4E: // --------------------------------- Z_Biff4E -
{
switch( nOpcode )
{
- case 0x0A: // EOF [ 2345]
+ case 0x0A: // EOF [ 2345]
eAkt = Z_Ende;
break;
- case 0x8F: break; // BUNDLEHEADER [ 4 ]
- case 0x0409: // BOF [ 4 ]
+ case 0x8F: break; // BUNDLEHEADER [ 4 ]
+ case 0x0409: // BOF [ 4 ]
Bof4();
NeueTabelle();
if( pExcRoot->eDateiTyp == Biff4 )
@@ -556,45 +556,45 @@ FltError ImportExcel::Read( void )
}
break;
- case Z_Biff5WPre: // ------------------------------ Z_Biff5WPre -
+ case Z_Biff5WPre: // ------------------------------ Z_Biff5WPre -
{
switch( nOpcode )
{
- case 0x0A: // EOF [ 2345]
+ case 0x0A: // EOF [ 2345]
eAkt = Z_Biff5W;
aIn.SeekGlobalPosition(); // und zurueck an alte Position
break;
- case 0x12: DocProtect(); break; // PROTECT [ 5]
- case 0x2F: // FILEPASS [ 2345]
+ case 0x12: DocProtect(); break; // PROTECT [ 5]
+ case 0x2F: // FILEPASS [ 2345]
eLastErr = XclImpDecryptHelper::ReadFilepass( maStrm );
if( eLastErr != ERRCODE_NONE )
eAkt = Z_Ende;
break;
case EXC_ID_FILESHARING: ReadFileSharing(); break;
case 0x3D: Window1(); break;
- case 0x42: Codepage(); break; // CODEPAGE [ 2345]
- case 0x85: Boundsheet(); break; // BOUNDSHEET [ 5]
+ case 0x42: Codepage(); break; // CODEPAGE [ 2345]
+ case 0x85: Boundsheet(); break; // BOUNDSHEET [ 5]
case 0x8C: Country(); break; // COUNTRY [ 345]
// PALETTE follows XFs, but already needed while reading the XFs
case 0x92: rPal.ReadPalette( maStrm ); break;
}
}
break;
- case Z_Biff5W: // --------------------------------- Z_Biff5W -
+ case Z_Biff5W: // --------------------------------- Z_Biff5W -
{
switch( nOpcode )
{
- case 0x0A: // EOF [ 2345]
+ case 0x0A: // EOF [ 2345]
rNumFmtBfr.CreateScFormats();
rXFBfr.CreateUserStyles();
eAkt = Z_Biff5E;
break;
case 0x18: rNameMgr.ReadName( maStrm ); break;
case 0x1E: rNumFmtBfr.ReadFormat( maStrm ); break;
- case 0x22: Rec1904(); break; // 1904 [ 2345]
+ case 0x22: Rec1904(); break; // 1904 [ 2345]
case 0x31: rFontBfr.ReadFont( maStrm ); break;
- case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ]
- case 0x8D: Hideobj(); break; // HIDEOBJ [ 345]
+ case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ]
+ case 0x8D: Hideobj(); break; // HIDEOBJ [ 345]
case 0xDE: Olesize(); break;
case 0xE0: rXFBfr.ReadXF( maStrm ); break;
case 0x0293: rXFBfr.ReadStyle( maStrm ); break;
@@ -667,10 +667,10 @@ FltError ImportExcel::Read( void )
case 0x0A: Eof(); eAkt = Z_Biff5E; break;
case 0x14:
case 0x15: rPageSett.ReadHeaderFooter( maStrm ); break;
- case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345]
+ case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345]
case 0x1C: GetCurrSheetDrawing().ReadNote( maStrm );break;
case 0x1D: rTabViewSett.ReadSelection( maStrm ); break;
- case 0x23: Externname25(); break; // EXTERNNAME [ 2 5]
+ case 0x23: Externname25(); break; // EXTERNNAME [ 2 5]
case 0x26:
case 0x27:
case 0x28:
@@ -692,7 +692,7 @@ FltError ImportExcel::Read( void )
case 0xD6: Rstring(); break; // RSTRING [ 5]
case 0x00E5: Cellmerging(); break; // #i62300#
case 0x0236: TableOp(); break; // TABLE [ 5]
- case 0x0809: // BOF [ 5]
+ case 0x0809: // BOF [ 5]
XclTools::SkipSubStream( maStrm );
break;
}
@@ -700,11 +700,11 @@ FltError ImportExcel::Read( void )
}
break;
// ----------------------------------------------------------------
- case Z_Biff5E: // --------------------------------- Z_Biff5E -
+ case Z_Biff5E: // --------------------------------- Z_Biff5E -
{
switch( nOpcode )
{
- case 0x0809: // BOF [ 5]
+ case 0x0809: // BOF [ 5]
Bof5();
NeueTabelle();
switch( pExcRoot->eDateiTyp )
@@ -734,11 +734,11 @@ FltError ImportExcel::Read( void )
}
break;
- case Z_Biffn0: // --------------------------------- Z_Biffn0 -
+ case Z_Biffn0: // --------------------------------- Z_Biffn0 -
{
switch( nOpcode )
{
- case 0x0A: // EOF [ 2345]
+ case 0x0A: // EOF [ 2345]
eAkt = ePrev;
IncCurrScTab();
break;
@@ -747,7 +747,7 @@ FltError ImportExcel::Read( void )
}
break;
// ----------------------------------------------------------------
- case Z_Ende: // ----------------------------------- Z_Ende -
+ case Z_Ende: // ----------------------------------- Z_Ende -
DBG_ERROR( "*ImportExcel::Read(): Not possible state!" );
break;
default: DBG_ERROR( "-ImportExcel::Read(): Zustand vergessen!" );
@@ -939,18 +939,18 @@ FltError ImportExcel8::Read( void )
aIn.SeekGlobalPosition();
}
break;
- case 0x12: DocProtect(); break; // PROTECT [ 5678]
+ case 0x12: DocProtect(); break; // PROTECT [ 5678]
case 0x13: DocPasssword(); break;
case 0x19: WinProtection(); break;
- case 0x2F: // FILEPASS [ 2345 ]
+ case 0x2F: // FILEPASS [ 2345 ]
eLastErr = XclImpDecryptHelper::ReadFilepass( maStrm );
if( eLastErr != ERRCODE_NONE )
eAkt = EXC_STATE_END;
break;
case EXC_ID_FILESHARING: ReadFileSharing(); break;
case 0x3D: Window1(); break;
- case 0x42: Codepage(); break; // CODEPAGE [ 2345 ]
- case 0x85: Boundsheet(); break; // BOUNDSHEET [ 5 ]
+ case 0x42: Codepage(); break; // CODEPAGE [ 2345 ]
+ case 0x85: Boundsheet(); break; // BOUNDSHEET [ 5 ]
case 0x8C: Country(); break; // COUNTRY [ 345 ]
// PALETTE follows XFs, but already needed while reading the XFs
@@ -983,10 +983,10 @@ FltError ImportExcel8::Read( void )
}
break;
case 0x0E: Precision(); break; // PRECISION
- case 0x22: Rec1904(); break; // 1904 [ 2345 ]
- case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ]
- case 0x8D: Hideobj(); break; // HIDEOBJ [ 345 ]
- case 0xD3: SetHasBasic(); break;
+ case 0x22: Rec1904(); break; // 1904 [ 2345 ]
+ case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ]
+ case 0x8D: Hideobj(); break; // HIDEOBJ [ 345 ]
+ case 0xD3: SetHasBasic(); break;
case 0xDE: Olesize(); break;
case EXC_ID_CODENAME: ReadCodeName( aIn, true ); break;
@@ -1232,7 +1232,7 @@ FltError ImportExcel8::Read( void )
else if( rAddrConv.IsColTruncated() )
eLastErr = SCWARN_IMPORT_COLUMN_OVERFLOW;
- if( GetBiff() == EXC_BIFF8 )
+ if( GetBiff() == EXC_BIFF8 )
GetPivotTableManager().MaybeRefreshPivotTables();
}
diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx
index b61a844d02a5..0f364ba538ed 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include <stdio.h> // printf
-const UINT16 TokenPool::nScTokenOff = 8192;
+const UINT16 TokenPool::nScTokenOff = 8192;
TokenStack::TokenStack( UINT16 nNewSize )
@@ -64,12 +64,12 @@ TokenStack::~TokenStack()
// !ACHTUNG!: nach Aussen hin beginnt die Nummerierung mit 1!
// !ACHTUNG!: SC-Token werden mit einem Offset nScTokenOff abgelegt
-// -> Unterscheidung von anderen Token
+// -> Unterscheidung von anderen Token
TokenPool::TokenPool( void )
{
- UINT16 nLauf = nScTokenOff;
+ UINT16 nLauf = nScTokenOff;
// Sammelstelle fuer Id-Folgen
nP_Id = 256;
@@ -122,7 +122,7 @@ TokenPool::TokenPool( void )
TokenPool::~TokenPool()
{
- UINT16 n;
+ UINT16 n;
delete[] pP_Id;
delete[] pElement;
@@ -172,10 +172,10 @@ TokenPool::~TokenPool()
void TokenPool::GrowString( void )
{
- UINT16 nP_StrNew = nP_Str * 2;
- UINT16 nL;
+ UINT16 nP_StrNew = nP_Str * 2;
+ UINT16 nL;
- String** ppP_StrNew = new String *[ nP_StrNew ];
+ String** ppP_StrNew = new String *[ nP_StrNew ];
for( nL = 0 ; nL < nP_Str ; nL++ )
ppP_StrNew[ nL ] = ppP_Str[ nL ];
@@ -184,16 +184,16 @@ void TokenPool::GrowString( void )
nP_Str = nP_StrNew;
- delete[] ppP_Str;
+ delete[] ppP_Str;
ppP_Str = ppP_StrNew;
}
void TokenPool::GrowDouble( void )
{
- UINT16 nP_DblNew = nP_Dbl * 2;
+ UINT16 nP_DblNew = nP_Dbl * 2;
- double* pP_DblNew = new double[ nP_DblNew ];
+ double* pP_DblNew = new double[ nP_DblNew ];
for( UINT16 nL = 0 ; nL < nP_Dbl ; nL++ )
pP_DblNew[ nL ] = pP_Dbl[ nL ];
@@ -208,14 +208,14 @@ void TokenPool::GrowDouble( void )
//UNUSED2009-05 void TokenPool::GrowError( void )
//UNUSED2009-05 {
//UNUSED2009-05 UINT16 nP_ErrNew = nP_Err * 2;
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 USHORT* pP_ErrNew = new USHORT[ nP_ErrNew ];
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 for( UINT16 nL = 0 ; nL < nP_Err ; nL++ )
//UNUSED2009-05 pP_ErrNew[ nL ] = pP_Err[ nL ];
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 nP_Err = nP_ErrNew;
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 delete[] pP_Err;
//UNUSED2009-05 pP_Err = pP_ErrNew;
//UNUSED2009-05 }
@@ -223,10 +223,10 @@ void TokenPool::GrowDouble( void )
void TokenPool::GrowTripel( void )
{
- UINT16 nP_RefTrNew = nP_RefTr * 2;
- UINT16 nL;
+ UINT16 nP_RefTrNew = nP_RefTr * 2;
+ UINT16 nL;
- ScSingleRefData** ppP_RefTrNew = new ScSingleRefData *[ nP_RefTrNew ];
+ ScSingleRefData** ppP_RefTrNew = new ScSingleRefData *[ nP_RefTrNew ];
for( nL = 0 ; nL < nP_RefTr ; nL++ )
ppP_RefTrNew[ nL ] = ppP_RefTr[ nL ];
@@ -242,9 +242,9 @@ void TokenPool::GrowTripel( void )
void TokenPool::GrowId( void )
{
- UINT16 nP_IdNew = nP_Id * 2;
+ UINT16 nP_IdNew = nP_Id * 2;
- UINT16* pP_IdNew = new UINT16[ nP_IdNew ];
+ UINT16* pP_IdNew = new UINT16[ nP_IdNew ];
for( UINT16 nL = 0 ; nL < nP_Id ; nL++ )
pP_IdNew[ nL ] = pP_Id[ nL ];
@@ -258,11 +258,11 @@ void TokenPool::GrowId( void )
void TokenPool::GrowElement( void )
{
- UINT16 nElementNew = nElement * 2;
+ UINT16 nElementNew = nElement * 2;
- UINT16* pElementNew = new UINT16[ nElementNew ];
- E_TYPE* pTypeNew = new E_TYPE[ nElementNew ];
- UINT16* pSizeNew = new UINT16[ nElementNew ];
+ UINT16* pElementNew = new UINT16[ nElementNew ];
+ E_TYPE* pTypeNew = new E_TYPE[ nElementNew ];
+ UINT16* pSizeNew = new UINT16[ nElementNew ];
for( UINT16 nL = 0 ; nL < nElement ; nL++ )
{
@@ -284,9 +284,9 @@ void TokenPool::GrowElement( void )
void TokenPool::GrowExt( void )
{
- UINT16 nNewSize = nP_Ext * 2;
+ UINT16 nNewSize = nP_Ext * 2;
- EXTCONT** ppNew = new EXTCONT*[ nNewSize ];
+ EXTCONT** ppNew = new EXTCONT*[ nNewSize ];
memset( ppNew, 0, sizeof( EXTCONT* ) * nNewSize );
memcpy( ppNew, ppP_Ext, sizeof( EXTCONT* ) * nP_Ext );
@@ -299,9 +299,9 @@ void TokenPool::GrowExt( void )
void TokenPool::GrowNlf( void )
{
- UINT16 nNewSize = nP_Nlf * 2;
+ UINT16 nNewSize = nP_Nlf * 2;
- NLFCONT** ppNew = new NLFCONT*[ nNewSize ];
+ NLFCONT** ppNew = new NLFCONT*[ nNewSize ];
memset( ppNew, 0, sizeof( NLFCONT* ) * nNewSize );
memcpy( ppNew, ppP_Nlf, sizeof( NLFCONT* ) * nP_Nlf );
@@ -357,7 +357,7 @@ void TokenPool::GetElement( const UINT16 nId )
break;
case T_RefA:
{
- ScComplexRefData aScComplexRefData;
+ ScComplexRefData aScComplexRefData;
aScComplexRefData.Ref1 = *ppP_RefTr[ pElement[ nId ] ];
aScComplexRefData.Ref2 = *ppP_RefTr[ pElement[ nId ] + 1 ];
pScToken->AddDoubleReference( aScComplexRefData );
@@ -368,8 +368,8 @@ void TokenPool::GetElement( const UINT16 nId )
break;
case T_Ext:
{
- UINT16 n = pElement[ nId ];
- EXTCONT* p = ( n < nP_Ext )? ppP_Ext[ n ] : NULL;
+ UINT16 n = pElement[ nId ];
+ EXTCONT* p = ( n < nP_Ext )? ppP_Ext[ n ] : NULL;
if( p )
{
@@ -382,8 +382,8 @@ void TokenPool::GetElement( const UINT16 nId )
break;
case T_Nlf:
{
- UINT16 n = pElement[ nId ];
- NLFCONT* p = ( n < nP_Nlf )? ppP_Nlf[ n ] : NULL;
+ UINT16 n = pElement[ nId ];
+ NLFCONT* p = ( n < nP_Nlf )? ppP_Nlf[ n ] : NULL;
if( p )
pScToken->AddColRowName( p->aRef );
@@ -445,8 +445,8 @@ void TokenPool::GetElementRek( const UINT16 nId )
DBG_ASSERT( pType[ nId ] == T_Id, "-TokenPool::GetElementRek(): nId nicht Id-Folge!" );
- UINT16 nAnz = pSize[ nId ];
- UINT16* pAkt = &pP_Id[ pElement[ nId ] ];
+ UINT16 nAnz = pSize[ nId ];
+ UINT16* pAkt = &pP_Id[ pElement[ nId ] ];
for( ; nAnz > 0 ; nAnz--, pAkt++ )
{
if( *pAkt < nScTokenOff )
@@ -472,7 +472,7 @@ void TokenPool::GetElementRek( const UINT16 nId )
break;
case T_RefA:
{
- ScComplexRefData aScComplexRefData;
+ ScComplexRefData aScComplexRefData;
aScComplexRefData.Ref1 = *ppP_RefTr[ pElement[ *pAkt ] ];
aScComplexRefData.Ref2 = *ppP_RefTr[ pElement[ *pAkt ] + 1 ];
pScToken->AddDoubleReference( aScComplexRefData );
@@ -483,8 +483,8 @@ void TokenPool::GetElementRek( const UINT16 nId )
break;
case T_Ext:
{
- UINT16 n = pElement[ *pAkt ];
- EXTCONT* p = ( n < nP_Ext )? ppP_Ext[ n ] : NULL;
+ UINT16 n = pElement[ *pAkt ];
+ EXTCONT* p = ( n < nP_Ext )? ppP_Ext[ n ] : NULL;
if( p )
pScToken->AddExternal( p->aText, p->eId );
@@ -492,8 +492,8 @@ void TokenPool::GetElementRek( const UINT16 nId )
break;
case T_Nlf:
{
- UINT16 n = pElement[ *pAkt ];
- NLFCONT* p = ( n < nP_Nlf )? ppP_Nlf[ n ] : NULL;
+ UINT16 n = pElement[ *pAkt ];
+ NLFCONT* p = ( n < nP_Nlf )? ppP_Nlf[ n ] : NULL;
if( p )
pScToken->AddColRowName( p->aRef );
@@ -540,7 +540,7 @@ void TokenPool::GetElementRek( const UINT16 nId )
DBG_ERROR("-TokenPool::GetElementRek(): Zustand undefiniert!?");
}
}
- else // elementarer SC_Token
+ else // elementarer SC_Token
pScToken->AddOpCode( ( DefTokenId ) ( *pAkt - nScTokenOff ) );
}
@@ -558,12 +558,12 @@ void TokenPool::operator >>( TokenId& rId )
if( nElementAkt >= nElement )
GrowElement();
- pElement[ nElementAkt ] = nP_IdLast; // Start der Token-Folge
- pType[ nElementAkt ] = T_Id; // Typinfo eintragen
+ pElement[ nElementAkt ] = nP_IdLast; // Start der Token-Folge
+ pType[ nElementAkt ] = T_Id; // Typinfo eintragen
pSize[ nElementAkt ] = nP_IdAkt - nP_IdLast;
// von nP_IdLast bis nP_IdAkt-1 geschrieben -> Laenge der Folge
- nElementAkt++; // Startwerte fuer naechste Folge
+ nElementAkt++; // Startwerte fuer naechste Folge
nP_IdLast = nP_IdAkt;
}
@@ -576,12 +576,12 @@ const TokenId TokenPool::Store( const double& rDouble )
if( nP_DblAkt >= nP_Dbl )
GrowDouble();
- pElement[ nElementAkt ] = nP_DblAkt; // Index in Double-Array
- pType[ nElementAkt ] = T_D; // Typinfo Double eintragen
+ pElement[ nElementAkt ] = nP_DblAkt; // Index in Double-Array
+ pType[ nElementAkt ] = T_D; // Typinfo Double eintragen
pP_Dbl[ nP_DblAkt ] = rDouble;
- pSize[ nElementAkt ] = 1; // eigentlich Banane
+ pSize[ nElementAkt ] = 1; // eigentlich Banane
nElementAkt++;
nP_DblAkt++;
@@ -595,11 +595,11 @@ const TokenId TokenPool::Store( const UINT16 nIndex )
if( nElementAkt >= nElement )
GrowElement();
- pElement[ nElementAkt ] = nIndex; // Daten direkt im Index!
- pType[ nElementAkt ] = T_RN; // Typinfo Range Name eintragen
+ pElement[ nElementAkt ] = nIndex; // Daten direkt im Index!
+ pType[ nElementAkt ] = T_RN; // Typinfo Range Name eintragen
nElementAkt++;
- return ( const TokenId ) nElementAkt; // Ausgabe von altem Wert + 1!
+ return ( const TokenId ) nElementAkt; // Ausgabe von altem Wert + 1!
}
@@ -613,8 +613,8 @@ const TokenId TokenPool::Store( const String& rString )
if( nP_StrAkt >= nP_Str )
GrowString();
- pElement[ nElementAkt ] = nP_StrAkt; // Index in String-Array
- pType[ nElementAkt ] = T_Str; // Typinfo String eintragen
+ pElement[ nElementAkt ] = nP_StrAkt; // Index in String-Array
+ pType[ nElementAkt ] = T_Str; // Typinfo String eintragen
// String anlegen
if( !ppP_Str[ nP_StrAkt ] )
@@ -644,7 +644,7 @@ const TokenId TokenPool::Store( const ScSingleRefData& rTr )
GrowTripel();
pElement[ nElementAkt ] = nP_RefTrAkt;
- pType[ nElementAkt ] = T_RefC; // Typinfo Cell-Reff eintragen
+ pType[ nElementAkt ] = T_RefC; // Typinfo Cell-Reff eintragen
if( !ppP_RefTr[ nP_RefTrAkt ] )
ppP_RefTr[ nP_RefTrAkt ] = new ScSingleRefData( rTr );
@@ -667,7 +667,7 @@ const TokenId TokenPool::Store( const ScComplexRefData& rTr )
GrowTripel();
pElement[ nElementAkt ] = nP_RefTrAkt;
- pType[ nElementAkt ] = T_RefA; // Typinfo Area-Reff eintragen
+ pType[ nElementAkt ] = T_RefA; // Typinfo Area-Reff eintragen
if( !ppP_RefTr[ nP_RefTrAkt ] )
ppP_RefTr[ nP_RefTrAkt ] = new ScSingleRefData( rTr.Ref1 );
@@ -696,7 +696,7 @@ const TokenId TokenPool::Store( const DefTokenId e, const String& r )
GrowExt();
pElement[ nElementAkt ] = nP_ExtAkt;
- pType[ nElementAkt ] = T_Ext; // Typinfo String eintragen
+ pType[ nElementAkt ] = T_Ext; // Typinfo String eintragen
if( ppP_Ext[ nP_ExtAkt ] )
{
@@ -767,7 +767,7 @@ const TokenId TokenPool::StoreExtName( sal_uInt16 nFileId, const String& rName )
pElement[nElementAkt] = static_cast<UINT16>(maExtNames.size());
pType[nElementAkt] = T_ExtName;
-
+
maExtNames.push_back(ExtName());
ExtName& r = maExtNames.back();
r.mnFileId = nFileId;
@@ -785,7 +785,7 @@ const TokenId TokenPool::StoreExtRef( sal_uInt16 nFileId, const String& rTabName
pElement[nElementAkt] = static_cast<UINT16>(maExtCellRefs.size());
pType[nElementAkt] = T_ExtRefC;
-
+
maExtCellRefs.push_back(ExtCellRef());
ExtCellRef& r = maExtCellRefs.back();
r.mnFileId = nFileId;
@@ -804,7 +804,7 @@ const TokenId TokenPool::StoreExtRef( sal_uInt16 nFileId, const String& rTabName
pElement[nElementAkt] = static_cast<UINT16>(maExtAreaRefs.size());
pType[nElementAkt] = T_ExtRefA;
-
+
maExtAreaRefs.push_back(ExtAreaRef());
ExtAreaRef& r = maExtAreaRefs.back();
r.mnFileId = nFileId;
@@ -835,10 +835,10 @@ BOOL TokenPool::IsSingleOp( const TokenId& rId, const DefTokenId eId ) const
{// Tokenfolge?
if( pSize[ nId ] == 1 )
{// GENAU 1 Token
- UINT16 nSecId = pP_Id[ pElement[ nId ] ];
+ UINT16 nSecId = pP_Id[ pElement[ nId ] ];
if( nSecId >= nScTokenOff )
{// Default-Token?
- return ( DefTokenId ) ( nSecId - nScTokenOff ) == eId; // Gesuchter?
+ return ( DefTokenId ) ( nSecId - nScTokenOff ) == eId; // Gesuchter?
}
}
}
@@ -873,7 +873,7 @@ const String* TokenPool::GetExternal( const TokenId& rId ) const
//UNUSED2008-05 if( pType[ n ] == T_Str )
//UNUSED2008-05 p = ppP_Str[ pElement[ n ] ];
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 return p;
//UNUSED2008-05 }
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index b6b136da4b1e..4295aca2163c 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 7bfd57be7290..82aced900a7a 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -261,7 +261,7 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm )
if( maStringList.empty() )
return;
- sax_fastparser::FSHelperPtr pSst = rStrm.CreateOutputStream(
+ sax_fastparser::FSHelperPtr pSst = rStrm.CreateOutputStream(
OUString::createFromAscii( "xl/sharedStrings.xml" ),
OUString::createFromAscii( "sharedStrings.xml" ),
rStrm.GetCurrentStream()->getOutputStream(),
@@ -270,7 +270,7 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm )
rStrm.PushStream( pSst );
pSst->startElement( XML_sst,
- XML_xmlns, "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
+ XML_xmlns, "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
XML_count, OString::valueOf( (sal_Int32) mnTotal ).getStr(),
XML_uniqueCount, OString::valueOf( (sal_Int32) mnSize ).getStr(),
FSEND );
@@ -534,8 +534,8 @@ void XclExpHyperlink::SaveXml( XclExpXmlStream& rStrm )
rStrm.GetCurrentStream()->singleElement( XML_hyperlink,
XML_ref, XclXmlUtils::ToOString( maScPos ).getStr(),
FSNS( XML_r, XML_id ), XclXmlUtils::ToOString( sId ).getStr(),
- XML_location, mxTextMark.get() != NULL
- ? XclXmlUtils::ToOString( *mxTextMark ).getStr()
+ XML_location, mxTextMark.get() != NULL
+ ? XclXmlUtils::ToOString( *mxTextMark ).getStr()
: NULL,
// OOXTODO: XML_tooltip, from record HLinkTooltip 800h wzTooltip
XML_display, XclXmlUtils::ToOString( *mxRepr ).getStr(),
@@ -861,7 +861,7 @@ void XclExpCondfmt::SaveXml( XclExpXmlStream& rStrm )
{
if( !IsValid() )
return;
-
+
sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream();
rWorksheet->startElement( XML_conditionalFormatting,
XML_sqref, XclXmlUtils::ToOString( msSeqRef ).getStr(),
@@ -1150,7 +1150,7 @@ void XclExpDV::SaveXml( XclExpXmlStream& rStrm )
rWorksheet->startElement( XML_dataValidation,
XML_allowBlank, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_DV_IGNOREBLANK ) ),
XML_error, XESTRING_TO_PSZ( maErrorText ),
- // OOXTODO: XML_errorStyle,
+ // OOXTODO: XML_errorStyle,
XML_errorTitle, XESTRING_TO_PSZ( maErrorTitle ),
// OOXTODO: XML_imeMode,
XML_operator, lcl_GetOperatorType( mnFlags ),
@@ -1224,7 +1224,7 @@ void XclExpDval::SaveXml( XclExpXmlStream& rStrm )
return;
sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream();
- rWorksheet->startElement( XML_dataValidations,
+ rWorksheet->startElement( XML_dataValidations,
XML_count, OString::valueOf( (sal_Int32) maDVList.GetSize() ).getStr(),
// OOXTODO: XML_disablePrompts,
// OOXTODO: XML_xWindow,
@@ -1307,7 +1307,7 @@ XclExpWebQuery::XclExpWebQuery(
ScGlobal::AddToken( aNewTables, aAppendTable, ',' );
}
- if( !bExitLoop ) // neither HTML_all nor HTML_tables found
+ if( !bExitLoop ) // neither HTML_all nor HTML_tables found
{
if( aNewTables.Len() )
mxQryTables.reset( new XclExpString( aNewTables ) );
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 0509f2afa5fa..3c771a2f4d19 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 34e48671a3bc..17124e8e63b8 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index bce037bd05c1..a8ef7eb6e954 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index fcf738527025..645abc25bfd3 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index af275bef7eef..2278fcbe8fa6 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx
index 6194a04c27f6..9a65c7ee38be 100644
--- a/sc/source/filter/excel/xepage.cxx
+++ b/sc/source/filter/excel/xepage.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ void XclExpPageBreaks::SaveXml( XclExpXmlStream& rStrm )
sal_Int32 nElement = GetRecId() == EXC_ID_HORPAGEBREAKS ? XML_rowBreaks : XML_colBreaks;
sax_fastparser::FSHelperPtr& pWorksheet = rStrm.GetCurrentStream();
OString sNumPageBreaks = OString::valueOf( (sal_Int32) mrPageBreaks.size() );
- pWorksheet->startElement( nElement,
+ pWorksheet->startElement( nElement,
XML_count, sNumPageBreaks.getStr(),
XML_manualBreakCount, sNumPageBreaks.getStr(),
FSEND );
@@ -313,7 +313,7 @@ XclExpPageSettings::XclExpPageSettings( const XclExpRoot& rRoot ) :
SCROW nRow = *itr;
if (nRow > nMaxRow)
break;
-
+
maData.maHorPageBreaks.push_back(nRow);
}
@@ -325,7 +325,7 @@ XclExpPageSettings::XclExpPageSettings( const XclExpRoot& rRoot ) :
static void lcl_WriteHeaderFooter( XclExpXmlStream& rStrm )
{
- // OOXTODO: we currently only emit oddHeader/oddFooter elements, and
+ // OOXTODO: we currently only emit oddHeader/oddFooter elements, and
// do not support the first/even/odd page distinction.
rStrm.WriteAttributes(
// OOXTODO: XML_alignWithMargins,
@@ -384,9 +384,9 @@ void XclExpPageSettings::SaveXml( XclExpXmlStream& rStrm )
XclExpHeaderFooter( EXC_ID_FOOTER, maData.maFooter ).SaveXml( rStrm );
XclExpXmlEndElementRecord( XML_headerFooter ).SaveXml( rStrm );
- XclExpPageBreaks( EXC_ID_HORPAGEBREAKS, maData.maHorPageBreaks,
+ XclExpPageBreaks( EXC_ID_HORPAGEBREAKS, maData.maHorPageBreaks,
static_cast< sal_uInt16 >( GetXclMaxPos().Col() ) ).SaveXml( rStrm );
- XclExpPageBreaks( EXC_ID_VERPAGEBREAKS, maData.maVerPageBreaks,
+ XclExpPageBreaks( EXC_ID_VERPAGEBREAKS, maData.maVerPageBreaks,
static_cast< sal_uInt16 >( GetXclMaxPos().Row() ) ).SaveXml( rStrm );
if( const Graphic* pGraphic = maData.mxBrushItem->GetGraphic() )
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index ddcdb3243167..3ee7c6bd20eb 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -749,7 +749,7 @@ void XclExpPivotCache::SaveXml( XclExpXmlStream& rStrm )
.appendAscii("rId")
.append( rStrm.GetUniqueIdOUString() )
.makeStringAndClear();
- rWorkbook->startElement( XML_pivotCache,
+ rWorkbook->startElement( XML_pivotCache,
XML_cacheId, OString::valueOf( (sal_Int32)maPCInfo.mnStrmId ).getStr(),
FSNS( XML_r, XML_id ), XclXmlUtils::ToOString( sId ).getStr(),
FSEND );
@@ -1040,9 +1040,9 @@ sal_uInt16 XclExpPTField::GetItemIndex( const String& rName, sal_uInt16 nDefault
// fill data --------------------------------------------------------------
-/**
- * Calc's subtotal names are escaped with backslashes ('\'), while Excel's
- * are not escaped at all.
+/**
+ * Calc's subtotal names are escaped with backslashes ('\'), while Excel's
+ * are not escaped at all.
*/
static OUString lcl_convertCalcSubtotalName(const OUString& rName)
{
@@ -1616,7 +1616,7 @@ void XclExpPivotTable::WriteQsiSxTag( XclExpStream& rStrm ) const
if (bOlapPTReport) nFlags |= 0x0004;
rStrm << nFlags;
- // Feature-specific options. The value differs depending on the table
+ // Feature-specific options. The value differs depending on the table
// type, but we assume the table type is always pivot table.
sal_uInt32 nOptions = 0x00000000;
bool bNoStencil = false;
diff --git a/sc/source/filter/excel/xerecord.cxx b/sc/source/filter/excel/xerecord.cxx
index fed58411aa5c..4daee33a604b 100644
--- a/sc/source/filter/excel/xerecord.cxx
+++ b/sc/source/filter/excel/xerecord.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index f828079c8735..51d6d3a1dbdd 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx
index cd0b083aa208..93126d51e7e8 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -131,7 +131,7 @@ XclExpString::XclExpString( const OUString& rString, XclStrFlags nFlags, sal_uIn
//UNUSED2008-05 {
//UNUSED2008-05 Assign( rString, rFormats, nFlags, nMaxLen );
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 XclExpString::XclExpString(
//UNUSED2008-05 const OUString& rString, const XclFormatRunVec& rFormats,
//UNUSED2008-05 XclStrFlags nFlags, sal_uInt16 nMaxLen )
@@ -204,7 +204,7 @@ void XclExpString::Append( const String& rString )
//UNUSED2008-05 {
//UNUSED2008-05 BuildAppend( rString.getStr(), rString.getLength() );
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 void XclExpString::Append( sal_Unicode cChar )
//UNUSED2008-05 {
//UNUSED2008-05 BuildAppend( &cChar, 1 );
@@ -493,7 +493,7 @@ static sal_uInt16 lcl_WriteRun( XclExpXmlStream& rStrm, const ScfUInt16Vec& rBuf
rStrm.WriteFontData( rFontData, XML_rFont );
rWorksheet->endElement( XML_rPr );
}
- rWorksheet->startElement( XML_t,
+ rWorksheet->startElement( XML_t,
FSNS( XML_xml, XML_space ), "preserve",
FSEND );
rWorksheet->writeEscaped( XclXmlUtils::ToOUString( rBuffer, nStart, nLength ) );
@@ -521,11 +521,11 @@ void XclExpString::WriteXml( XclExpXmlStream& rStrm ) const
const XclExpFont* pFont = NULL;
for ( ; aIt != aEnd; ++aIt )
{
- nStart = lcl_WriteRun( rStrm, GetUnicodeBuffer(),
+ nStart = lcl_WriteRun( rStrm, GetUnicodeBuffer(),
nStart, aIt->mnChar-nStart, pFont );
pFont = rFonts.GetFont( aIt->mnFontIdx );
}
- lcl_WriteRun( rStrm, GetUnicodeBuffer(),
+ lcl_WriteRun( rStrm, GetUnicodeBuffer(),
nStart, GetUnicodeBuffer().size() - nStart, pFont );
}
}
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index ccebe9a4280f..3800c2faaab3 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index b5ca318a91b4..964497622cc6 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -651,7 +651,7 @@ void XclExpBooleanCell::WriteContents( XclExpStream& rStrm )
// ----------------------------------------------------------------------------
//UNUSED2009-05 IMPL_FIXEDMEMPOOL_NEWDEL( XclExpErrorCell, 256, 256 )
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 XclExpErrorCell::XclExpErrorCell(
//UNUSED2009-05 const XclExpRoot rRoot, const XclAddress& rXclPos,
//UNUSED2009-05 const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId, sal_uInt8 nErrCode ) :
@@ -660,7 +660,7 @@ void XclExpBooleanCell::WriteContents( XclExpStream& rStrm )
//UNUSED2009-05 mnErrCode( nErrCode )
//UNUSED2009-05 {
//UNUSED2009-05 }
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 void XclExpErrorCell::SaveXml( XclExpXmlStream& rStrm )
//UNUSED2009-05 {
//UNUSED2009-05 sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream();
@@ -675,7 +675,7 @@ void XclExpBooleanCell::WriteContents( XclExpStream& rStrm )
//UNUSED2009-05 rWorksheet->endElement( XML_v );
//UNUSED2009-05 rWorksheet->endElement( XML_c );
//UNUSED2009-05 }
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 void XclExpErrorCell::WriteContents( XclExpStream& rStrm )
//UNUSED2009-05 {
//UNUSED2009-05 rStrm << mnErrCode << EXC_BOOLERR_ERROR;
@@ -928,7 +928,7 @@ static const char* lcl_GetErrorString( USHORT nScErrCode )
case EXC_ERR_REF: return "#REF!";
case EXC_ERR_NAME: return "#NAME?";
case EXC_ERR_NUM: return "#NUM!";
- case EXC_ERR_NA:
+ case EXC_ERR_NA:
default: return "#N/A";
}
}
@@ -1207,9 +1207,9 @@ void XclExpMultiCellBase::SaveXml( XclExpXmlStream& rStrm )
for( sal_uInt16 nIdx = 0; nIdx < aIt->mnCount; ++nIdx )
{
WriteXmlContents(
- rStrm,
- XclAddress( static_cast<sal_uInt16>(nBegXclCol + nRelCol), GetXclRow() ),
- aIt->mnXFIndex,
+ rStrm,
+ XclAddress( static_cast<sal_uInt16>(nBegXclCol + nRelCol), GetXclRow() ),
+ aIt->mnXFIndex,
nRelColIdx );
++nRelCol;
++nRelColIdx;
@@ -1662,7 +1662,7 @@ void XclExpColinfo::SaveXml( XclExpXmlStream& rStrm )
XML_hidden, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_COLINFO_HIDDEN ) ),
XML_max, OString::valueOf( (sal_Int32) (nLastXclCol+1) ).getStr(),
XML_min, OString::valueOf( (sal_Int32) (mnFirstXclCol+1) ).getStr(),
- // OOXTODO: XML_outlineLevel,
+ // OOXTODO: XML_outlineLevel,
// OOXTODO: XML_phonetic,
XML_style, lcl_GetStyleId( rStrm, maXFId.mnXFIndex ).getStr(),
XML_width, OString::valueOf( (double) (mnWidth / 255.0) ).getStr(),
@@ -2276,7 +2276,7 @@ void XclExpRowBuffer::SaveXml( XclExpXmlStream& rStrm )
}
}
-XclExpDimensions* XclExpRowBuffer::GetDimensions()
+XclExpDimensions* XclExpRowBuffer::GetDimensions()
{
return &maDimensions;
}
@@ -2544,7 +2544,7 @@ void XclExpCellTable::Finalize()
mxDefrowheight->SetDefaultData( aDefRowData );
}
-XclExpRecordRef XclExpCellTable::CreateRecord( sal_uInt16 nRecId ) const
+XclExpRecordRef XclExpCellTable::CreateRecord( sal_uInt16 nRecId ) const
{
XclExpRecordRef xRec;
switch( nRecId )
diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx
index 035afd0a5830..5120b6f4057a 100644
--- a/sc/source/filter/excel/xeview.cxx
+++ b/sc/source/filter/excel/xeview.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ void XclExpWindow1::SaveXml( XclExpXmlStream& rStrm )
XML_tabRatio, OString::valueOf( (sal_Int32)mnTabBarSize ).getStr(),
XML_firstSheet, OString::valueOf( (sal_Int32)rTabInfo.GetFirstVisXclTab() ).getStr(),
XML_activeTab, OString::valueOf( (sal_Int32)rTabInfo.GetDisplayedXclTab() ).getStr(),
- // OOXTODO: XML_autoFilterDateGrouping, // bool; AUTOFILTER12? 87Eh
+ // OOXTODO: XML_autoFilterDateGrouping, // bool; AUTOFILTER12? 87Eh
FSEND );
}
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 7cbd74a836d2..c4f44862c042 100755
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -1108,7 +1108,7 @@ Reference< XTitle > XclImpChText::CreateTitle() const
void XclImpChText::ConvertTitlePosition( const XclChTextKey& rTitleKey ) const
{
if( !mxFramePos ) return;
-
+
const XclChFramePos& rPosData = mxFramePos->GetFramePosData();
OSL_ENSURE( (rPosData.mnTLMode == EXC_CHFRAMEPOS_PARENT) && (rPosData.mnBRMode == EXC_CHFRAMEPOS_PARENT),
"XclImpChText::ConvertTitlePosition - unexpected frame position mode" );
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index fb1eb9a3bf44..1b3efb20a8a5 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -1215,7 +1215,7 @@ void XclImpSheetProtectBuffer::ReadOptions( XclImpStream& rStrm, SCTAB nTab )
{
rStrm.Ignore(12);
- // feature type can be either 2 or 4. If 2, this record stores flag for
+ // feature type can be either 2 or 4. If 2, this record stores flag for
// enhanced protection, whereas if 4 it stores flag for smart tag.
sal_uInt16 nFeatureType;
rStrm >> nFeatureType;
@@ -1225,7 +1225,7 @@ void XclImpSheetProtectBuffer::ReadOptions( XclImpStream& rStrm, SCTAB nTab )
rStrm.Ignore(1); // always 1
- // The flag size specifies the size of bytes that follows that stores
+ // The flag size specifies the size of bytes that follows that stores
// feature data. If -1 it depends on the feature type imported earlier.
// For enhanced protection data, the size is always 4. For the most xls
// documents out there this value is almost always -1.
@@ -1234,7 +1234,7 @@ void XclImpSheetProtectBuffer::ReadOptions( XclImpStream& rStrm, SCTAB nTab )
if (nFlagSize != -1)
return;
- // There are actually 4 bytes to read, but the upper 2 bytes currently
+ // There are actually 4 bytes to read, but the upper 2 bytes currently
// don't store any bits.
sal_uInt16 nOptions;
rStrm >> nOptions;
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 8d09cae60941..2106ac197ba7 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -1450,10 +1450,10 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject&
eWriteMode = csst::WritingMode_TB_RL;
switch( maTextData.maData.GetHorAlign() )
{
- case EXC_OBJ_HOR_LEFT: eVerAlign = SDRTEXTVERTADJUST_TOP; break;
+ case EXC_OBJ_HOR_LEFT: eVerAlign = SDRTEXTVERTADJUST_TOP; break;
case EXC_OBJ_HOR_CENTER: eVerAlign = SDRTEXTVERTADJUST_CENTER; break;
- case EXC_OBJ_HOR_RIGHT: eVerAlign = SDRTEXTVERTADJUST_BOTTOM; break;
- case EXC_OBJ_HOR_JUSTIFY: eVerAlign = SDRTEXTVERTADJUST_BLOCK; break;
+ case EXC_OBJ_HOR_RIGHT: eVerAlign = SDRTEXTVERTADJUST_BOTTOM; break;
+ case EXC_OBJ_HOR_JUSTIFY: eVerAlign = SDRTEXTVERTADJUST_BLOCK; break;
}
MSO_Anchor eTextAnchor = (MSO_Anchor)rDffConv.GetPropertyValue( DFF_Prop_anchorText, mso_anchorTop );
switch( eTextAnchor )
@@ -1465,14 +1465,14 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject&
eHorAlign = SVX_ADJUST_CENTER;
}
break;
-
+
default:
{
switch( maTextData.maData.GetVerAlign() )
{
- case EXC_OBJ_VER_TOP: eHorAlign = SVX_ADJUST_RIGHT; break;
- case EXC_OBJ_VER_CENTER: eHorAlign = SVX_ADJUST_CENTER; break;
- case EXC_OBJ_VER_BOTTOM: eHorAlign = SVX_ADJUST_LEFT; break;
+ case EXC_OBJ_VER_TOP: eHorAlign = SVX_ADJUST_RIGHT; break;
+ case EXC_OBJ_VER_CENTER: eHorAlign = SVX_ADJUST_CENTER; break;
+ case EXC_OBJ_VER_BOTTOM: eHorAlign = SVX_ADJUST_LEFT; break;
case EXC_OBJ_VER_JUSTIFY: eHorAlign = SVX_ADJUST_BLOCK; break;
}
}
@@ -1480,7 +1480,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject&
}
break;
- case EXC_OBJ_ORIENT_STACKED: // PASSTHROUGH INTENDED
+ case EXC_OBJ_ORIENT_STACKED: // PASSTHROUGH INTENDED
{
// sj: STACKED is not supported, maybe it can be optimized here a bit
}
@@ -1491,8 +1491,8 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject&
{
case EXC_OBJ_HOR_LEFT: eVerAlign = SDRTEXTVERTADJUST_BOTTOM; break;
case EXC_OBJ_HOR_CENTER: eVerAlign = SDRTEXTVERTADJUST_CENTER; break;
- case EXC_OBJ_HOR_RIGHT: eVerAlign = SDRTEXTVERTADJUST_TOP; break;
- case EXC_OBJ_HOR_JUSTIFY: eVerAlign = SDRTEXTVERTADJUST_BLOCK; break;
+ case EXC_OBJ_HOR_RIGHT: eVerAlign = SDRTEXTVERTADJUST_TOP; break;
+ case EXC_OBJ_HOR_JUSTIFY: eVerAlign = SDRTEXTVERTADJUST_BLOCK; break;
}
MSO_Anchor eTextAnchor = (MSO_Anchor)rDffConv.GetPropertyValue( DFF_Prop_anchorText, mso_anchorTop );
switch ( eTextAnchor )
@@ -1504,14 +1504,14 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject&
eHorAlign = SVX_ADJUST_CENTER;
}
break;
-
+
default:
{
switch( maTextData.maData.GetVerAlign() )
{
case EXC_OBJ_VER_TOP: eHorAlign = SVX_ADJUST_LEFT; break;
- case EXC_OBJ_VER_CENTER: eHorAlign = SVX_ADJUST_CENTER; break;
- case EXC_OBJ_VER_BOTTOM: eHorAlign = SVX_ADJUST_RIGHT; break;
+ case EXC_OBJ_VER_CENTER: eHorAlign = SVX_ADJUST_CENTER; break;
+ case EXC_OBJ_VER_BOTTOM: eHorAlign = SVX_ADJUST_RIGHT; break;
case EXC_OBJ_VER_JUSTIFY: eHorAlign = SVX_ADJUST_BLOCK; break;
}
}
diff --git a/sc/source/filter/excel/xiformula.cxx b/sc/source/filter/excel/xiformula.cxx
index 40c6ef9be374..d40fb7a351a3 100644
--- a/sc/source/filter/excel/xiformula.cxx
+++ b/sc/source/filter/excel/xiformula.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx
index dc2234570ea6..df7b2d241097 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx
index 5d21d91c9f53..5596d26f5115 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxx
index 38cebc2e6ca8..2803d009e533 100644
--- a/sc/source/filter/excel/xipage.cxx
+++ b/sc/source/filter/excel/xipage.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index 29e27a698a42..df39312babf4 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -1032,8 +1032,8 @@ void XclImpPTField::ConvertDataField( ScDPSaveData& rSaveData ) const
// private --------------------------------------------------------------------
-/**
- * Convert Excel-encoded subtotal name to a Calc-encoded one.
+/**
+ * Convert Excel-encoded subtotal name to a Calc-encoded one.
*/
static OUString lcl_convertExcelSubtotalName(const OUString& rName)
{
@@ -1446,7 +1446,7 @@ void XclImpPivotTable::ApplyMergeFlags(const ScRange& rOutRange, const ScDPSaveD
aGeometry.setPageFieldCount(maPTInfo.mnPageFields);
aGeometry.setDataFieldCount(maPTInfo.mnDataFields);
- // Excel includes data layout field in the row field count. We need to
+ // Excel includes data layout field in the row field count. We need to
// subtract it.
bool bDataLayout = maPTInfo.mnDataFields > 1;
aGeometry.setRowFieldCount(maPTInfo.mnRowFields - static_cast<sal_uInt32>(bDataLayout));
diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx
index 5f8bcbd481e5..29822a79001b 100644
--- a/sc/source/filter/excel/xiroot.cxx
+++ b/sc/source/filter/excel/xiroot.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx
index 98db9dcb4471..84f28383e96c 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xistring.cxx b/sc/source/filter/excel/xistring.cxx
index cb2645bec538..31673d55902c 100644
--- a/sc/source/filter/excel/xistring.cxx
+++ b/sc/source/filter/excel/xistring.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 1559ef5530f5..b1ce3a08e351 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xiview.cxx b/sc/source/filter/excel/xiview.cxx
index f75032ff461e..bd47a0222856 100644
--- a/sc/source/filter/excel/xiview.cxx
+++ b/sc/source/filter/excel/xiview.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xladdress.cxx b/sc/source/filter/excel/xladdress.cxx
index d0c1a925f8ab..059ef00a9437 100644
--- a/sc/source/filter/excel/xladdress.cxx
+++ b/sc/source/filter/excel/xladdress.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index 10a0657c7899..ead167999bfc 100755
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -1324,5 +1324,5 @@ Reference< XShape > XclChRootData::GetTitleShape( const XclChTextKey& rTitleKey
xTitleShape = (aIt->second)( xChart1Doc );
return xTitleShape;
}
-
+
// ============================================================================
diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx
index 153a5d5ed3cc..ec4828db5bfd 100644
--- a/sc/source/filter/excel/xlescher.cxx
+++ b/sc/source/filter/excel/xlescher.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index d613f1279242..b35ebd4e5577 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xlpage.cxx b/sc/source/filter/excel/xlpage.cxx
index a59c6f761667..5a570f4af857 100644
--- a/sc/source/filter/excel/xlpage.cxx
+++ b/sc/source/filter/excel/xlpage.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +41,7 @@
struct XclPaperSize
{
- Paper mePaper; /// SVX paper size identifier.
+ Paper mePaper; /// SVX paper size identifier.
long mnWidth; /// Paper width in twips.
long mnHeight; /// Paper height in twips.
};
@@ -67,14 +67,14 @@ static const XclPaperSize pPaperSizeTable[] =
//near DMPAPER_B4 in vcl
//i.e.
//http://msdn.microsoft.com/en-us/library/bb241398.aspx makes the claim:
- //xlPaperB4 12 B4 (250 mm x 354 mm)
- //xlPaperB5 13 A5 (148 mm x 210 mm)
+ //xlPaperB4 12 B4 (250 mm x 354 mm)
+ //xlPaperB5 13 A5 (148 mm x 210 mm)
//but, a paper enum called B5 is surely not actually "A5", and furthermore
//the XlPaperSize enumeration otherwise follows the DMPAPER values
//http://msdn.microsoft.com/en-us/library/ms776398(VS.85).aspx
//which has
- //DMPAPER_B4 12 B4 (JIS) 250 x 354
- //DMPAPER_B5 13 B5 (JIS) 182 x 257 mm
+ //DMPAPER_B4 12 B4 (JIS) 250 x 354
+ //DMPAPER_B5 13 B5 (JIS) 182 x 257 mm
//which claim them to be the JIS sizes. Though that document then gives
//"B4 (JIS)" an *ISO* B4 size in the text, but
//http://partners.adobe.com/public/developer/en/ps/5003.PPD_Spec_v4.3.pdf
diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx
index ed7aadd0a410..5c8cc579738a 100644
--- a/sc/source/filter/excel/xlpivot.cxx
+++ b/sc/source/filter/excel/xlpivot.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -1019,7 +1019,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclPTViewEx9Info& rInfo )
XclExpStream& operator<<( XclExpStream& rStrm, const XclPTViewEx9Info& rInfo )
{
- return rStrm
+ return rStrm
<< EXC_PT_AUTOFMT_HEADER
<< rInfo.mbReport
<< EXC_PT_AUTOFMT_ZERO
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index 2b2180db5e6a..7870b9fd4892 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx
index 4a48584da7fa..b820d39f48a0 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index 0dd988d67586..e2bb19dcec69 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/excel/xltracer.cxx b/sc/source/filter/excel/xltracer.cxx
index 7dadbde8198a..2c8f67953831 100644
--- a/sc/source/filter/excel/xltracer.cxx
+++ b/sc/source/filter/excel/xltracer.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using ::com::sun::star::beans::PropertyValue;
static const XclTracerDetails pTracerDetails[] =
{
{ eUnKnown, 0, "UNKNOWN", "UNKNOWN", "Unknown trace property." },
- { eRowLimitExceeded, 1000, "Limits", "Sheet", "Row limit exceeded." },
+ { eRowLimitExceeded, 1000, "Limits", "Sheet", "Row limit exceeded." },
{ eTabLimitExceeded, 1001, "Limits", "Sheet", "Sheet limit exceeded." },
{ ePassword, 2000, "Protection", "Password", "Document is password protected." },
{ ePrintRange, 3000, "Print", "Print Range", "Print Range present." },
diff --git a/sc/source/filter/excel/xlview.cxx b/sc/source/filter/excel/xlview.cxx
index 8e9df7e0ac1f..0fdb70f698b8 100644
--- a/sc/source/filter/excel/xlview.cxx
+++ b/sc/source/filter/excel/xlview.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx
index eeef52aed550..559c0b853f66 100644
--- a/sc/source/filter/ftools/fapihelper.cxx
+++ b/sc/source/filter/ftools/fapihelper.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx
index bcee6f690f48..643f3b1869f2 100644
--- a/sc/source/filter/ftools/fprogressbar.cxx
+++ b/sc/source/filter/ftools/fprogressbar.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx
index 72e5f115fed0..8f0d26f7e8af 100644
--- a/sc/source/filter/ftools/ftools.cxx
+++ b/sc/source/filter/ftools/ftools.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index b4d764dc74a7..d5f0d3cd15ce 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
// ohne sc.hrc: error C2679: binary '=' : no operator defined which takes a
// right-hand operand of type 'const class String (__stdcall *)(class ScResId)'
// bei
-// const String aStrTable( ScResId( SCSTR_TABLE ) ); aStrOut = aStrTable;
+// const String aStrTable( ScResId( SCSTR_TABLE ) ); aStrOut = aStrTable;
// ?!???
#include "sc.hrc"
#include "globstr.hrc"
@@ -103,10 +103,10 @@
//========================================================================
-const static sal_Char __FAR_DATA sMyBegComment[] = "<!-- ";
-const static sal_Char __FAR_DATA sMyEndComment[] = " -->";
-const static sal_Char __FAR_DATA sFontFamily[] = "font-family:";
-const static sal_Char __FAR_DATA sFontSize[] = "font-size:";
+const static sal_Char __FAR_DATA sMyBegComment[] = "<!-- ";
+const static sal_Char __FAR_DATA sMyEndComment[] = " -->";
+const static sal_Char __FAR_DATA sFontFamily[] = "font-family:";
+const static sal_Char __FAR_DATA sFontSize[] = "font-size:";
const USHORT __FAR_DATA ScHTMLExport::nDefaultFontSize[SC_HTML_FONTSIZES] =
{
@@ -128,25 +128,25 @@ const sal_Char __FAR_DATA ScHTMLExport::sIndentSource[nIndentMax+1] =
//========================================================================
// Makros fuer HTML-Export
//========================================================================
-#define OUT_PROLOGUE() (rStrm << sHTML30_Prologue << ScExportBase::sNewLine \
+#define OUT_PROLOGUE() (rStrm << sHTML30_Prologue << ScExportBase::sNewLine \
<< ScExportBase::sNewLine)
-#define TAG_ON( tag ) HTMLOutFuncs::Out_AsciiTag( rStrm, tag )
-#define TAG_OFF( tag ) HTMLOutFuncs::Out_AsciiTag( rStrm, tag, FALSE )
+#define TAG_ON( tag ) HTMLOutFuncs::Out_AsciiTag( rStrm, tag )
+#define TAG_OFF( tag ) HTMLOutFuncs::Out_AsciiTag( rStrm, tag, FALSE )
#define OUT_STR( str ) HTMLOutFuncs::Out_String( rStrm, str, eDestEnc, &aNonConvertibleChars )
#define OUT_STR_NO_CONV( str ) HTMLOutFuncs::Out_String( rStrm, str, eDestEnc )
-#define OUT_LF() rStrm << ScExportBase::sNewLine << GetIndentStr()
-#define lcl_OUT_LF() rStrm << ScExportBase::sNewLine
-#define TAG_ON_LF( tag ) (TAG_ON( tag ) << ScExportBase::sNewLine << GetIndentStr())
-#define TAG_OFF_LF( tag ) (TAG_OFF( tag ) << ScExportBase::sNewLine << GetIndentStr())
-#define OUT_HR() TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_horzrule )
-#define OUT_COMMENT( comment ) (rStrm << sMyBegComment, OUT_STR( comment ) \
+#define OUT_LF() rStrm << ScExportBase::sNewLine << GetIndentStr()
+#define lcl_OUT_LF() rStrm << ScExportBase::sNewLine
+#define TAG_ON_LF( tag ) (TAG_ON( tag ) << ScExportBase::sNewLine << GetIndentStr())
+#define TAG_OFF_LF( tag ) (TAG_OFF( tag ) << ScExportBase::sNewLine << GetIndentStr())
+#define OUT_HR() TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_horzrule )
+#define OUT_COMMENT( comment ) (rStrm << sMyBegComment, OUT_STR( comment ) \
<< sMyEndComment << ScExportBase::sNewLine \
<< GetIndentStr())
#define lcl_OUT_COMMENT( comment ) (rStrm << sMyBegComment, OUT_STR_NO_CONV( comment ) \
<< sMyEndComment << ScExportBase::sNewLine)
-#define OUT_SP_CSTR_ASS( s ) rStrm << ' ' << s << '='
-#define APPEND_SPACE( s ) s.AppendAscii(" ")
+#define OUT_SP_CSTR_ASS( s ) rStrm << ' ' << s << '='
+#define APPEND_SPACE( s ) s.AppendAscii(" ")
#define GLOBSTR(id) ScGlobal::GetRscString( id )
@@ -174,8 +174,8 @@ void lcl_AddStamp( String& rStr, const String& rName,
rDateTime.HundredthSeconds);
DateTime aDateTime(aD,aT);
- String aStrDate = rLoc.getDate( aDateTime );
- String aStrTime = rLoc.getTime( aDateTime );
+ String aStrDate = rLoc.getDate( aDateTime );
+ String aStrTime = rLoc.getTime( aDateTime );
rStr += GLOBSTR( STR_BY );
APPEND_SPACE( rStr );
@@ -201,8 +201,8 @@ void lcl_AddStamp( String& rStr, const String& rName,
void lcl_AppendHTMLColorTripel( ByteString& rStr, const Color& rColor )
{
// <font COLOR="#00FF40">hallo</font>
- sal_Char buf[64];
- sal_Char* p = buf;
+ sal_Char buf[64];
+ sal_Char* p = buf;
rStr += "\"#";
p += sprintf( p, "%02X", rColor.GetRed() ); // #100211# - checked
@@ -304,7 +304,7 @@ USHORT ScHTMLExport::GetFontSizeNumber( USHORT nHeight )
for ( USHORT j=SC_HTML_FONTSIZES-1; j>0; j-- )
{
if( nHeight > (nFontSize[j] + nFontSize[j-1]) / 2 )
- { // der naechstgelegene
+ { // der naechstgelegene
nSize = j+1;
break;
}
@@ -325,7 +325,7 @@ USHORT ScHTMLExport::ToPixel( USHORT nVal )
{
nVal = (USHORT)pAppWin->LogicToPixel(
Size( nVal, nVal ), MapMode( MAP_TWIP ) ).Width();
- if( !nVal ) // wo ein Twip ist sollte auch ein Pixel sein
+ if( !nVal ) // wo ein Twip ist sollte auch ein Pixel sein
nVal = 1;
}
return nVal;
@@ -409,7 +409,7 @@ void ScHTMLExport::WriteHeader()
rStrm << '\"';
}
else
- { // Fontliste, VCL: Semikolon als Separator,
+ { // Fontliste, VCL: Semikolon als Separator,
// CSS1: Komma als Separator und jeder einzelne Fontname quoted
const String& rList = aHTMLStyle.aFontFamilyName;
for ( xub_StrLen j = 0, nPos = 0; j < nFonts; j++ )
@@ -442,7 +442,7 @@ void ScHTMLExport::WriteOverview()
OUT_STR( ScGlobal::GetRscString( STR_OVERVIEW ) );
TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_head1 );
- String aStr;
+ String aStr;
const SCTAB nCount = pDoc->GetTableCount();
for ( SCTAB nTab = 0; nTab < nCount; nTab++ )
@@ -467,8 +467,8 @@ void ScHTMLExport::WriteOverview()
const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab )
{
- SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool();
- SfxStyleSheetBase* pStyleSheet = NULL;
+ SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool();
+ SfxStyleSheetBase* pStyleSheet = NULL;
DBG_ASSERT( pStylePool, "StylePool not found! :-(" );
// remember defaults for compare in WriteCell
@@ -563,7 +563,7 @@ void ScHTMLExport::WriteBody()
aGrfNm = aStreamPath;
USHORT nErr = XOutBitmap::WriteGraphic( *pGrf, aGrfNm,
CREATE_STRING( "JPG" ), XOUTBMP_USE_NATIVE_IF_POSSIBLE );
- if( !nErr ) // fehlerhaft, da ist nichts auszugeben
+ if( !nErr ) // fehlerhaft, da ist nichts auszugeben
{
aGrfNm = URIHelper::SmartRel2Abs(
INetURLObject(aBaseURL),
@@ -619,21 +619,21 @@ void ScHTMLExport::WriteBody()
void ScHTMLExport::WriteTables()
{
- const SCTAB nTabCount = pDoc->GetTableCount();
- const String aStrTable( ScResId( SCSTR_TABLE ) );
- String aStr;
- String aStrOut;
- SCCOL nStartCol;
- SCROW nStartRow;
- SCTAB nStartTab;
- SCCOL nEndCol;
- SCROW nEndRow;
- SCTAB nEndTab;
+ const SCTAB nTabCount = pDoc->GetTableCount();
+ const String aStrTable( ScResId( SCSTR_TABLE ) );
+ String aStr;
+ String aStrOut;
+ SCCOL nStartCol;
+ SCROW nStartRow;
+ SCTAB nStartTab;
+ SCCOL nEndCol;
+ SCROW nEndRow;
+ SCTAB nEndTab;
SCCOL nStartColFix = 0;
SCROW nStartRowFix = 0;
SCCOL nEndColFix = 0;
SCROW nEndRowFix = 0;
- ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
+ ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
if ( bAll )
{
nStartTab = 0;
@@ -652,12 +652,12 @@ void ScHTMLExport::WriteTables()
for ( SCTAB nTab=nStartTab; nTab<=nEndTab; nTab++ )
{
if ( !pDoc->IsVisible( nTab ) )
- continue; // for
+ continue; // for
if ( bAll )
{
if ( !GetDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow ) )
- continue; // for
+ continue; // for
if ( nUsedTables > 1 )
{
@@ -691,12 +691,12 @@ void ScHTMLExport::WriteTables()
nEndCol = nEndColFix;
nEndRow = nEndRowFix;
if ( !TrimDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow ) )
- continue; // for
+ continue; // for
}
// <TABLE ...>
- ByteString aByteStrOut = OOO_STRING_SVTOOLS_HTML_table;
-// aStrOut = OOO_STRING_SVTOOLS_HTML_table;
+ ByteString aByteStrOut = OOO_STRING_SVTOOLS_HTML_table;
+// aStrOut = OOO_STRING_SVTOOLS_HTML_table;
// FRAME=VOID, we do the styling of the cells in <TD>
(((aByteStrOut += ' ') += OOO_STRING_SVTOOLS_HTML_frame) += '=') += OOO_STRING_SVTOOLS_HTML_TF_void;
@@ -733,14 +733,14 @@ void ScHTMLExport::WriteTables()
// <COLGROUP>
TAG_ON( OOO_STRING_SVTOOLS_HTML_colgroup );
// <COL WIDTH=x> as pre-info for long tables
- ByteString aByteStr = OOO_STRING_SVTOOLS_HTML_col;
+ ByteString aByteStr = OOO_STRING_SVTOOLS_HTML_col;
aByteStr += ' ';
aByteStr += OOO_STRING_SVTOOLS_HTML_O_width;
aByteStr += '=';
for ( nCol=nStartCol; nCol<=nEndCol; nCol++ )
{
if ( pDoc->ColHidden(nCol, nTab) )
- continue; // for
+ continue; // for
aByteStrOut = aByteStr;
aByteStrOut += ByteString::CreateFromInt32(
@@ -761,7 +761,7 @@ void ScHTMLExport::WriteTables()
{
nRow = pDoc->FirstVisibleRow(nRow+1, nEndRow, nTab);
--nRow;
- continue; // for
+ continue; // for
}
IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_tablerow );
@@ -769,7 +769,7 @@ void ScHTMLExport::WriteTables()
for ( SCCOL nCol2=nStartCol; nCol2<=nEndCol; nCol2++ )
{
if ( pDoc->ColHidden(nCol2, nTab) )
- continue; // for
+ continue; // for
if ( nCol2 == nEndCol )
IncIndent(-1);
@@ -797,7 +797,7 @@ void ScHTMLExport::WriteTables()
}
aGraphList.Clear();
if ( bTabAlignedLeft )
- { // clear <TABLE ALIGN=LEFT> with <BR CLEAR=LEFT>
+ { // clear <TABLE ALIGN=LEFT> with <BR CLEAR=LEFT>
aByteStrOut = OOO_STRING_SVTOOLS_HTML_linebreak;
(((aByteStrOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_clear) += '=') += OOO_STRING_SVTOOLS_HTML_AL_left;
TAG_ON_LF( aByteStrOut.GetBuffer() );
@@ -823,7 +823,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
ScHTMLGraphEntry* pGraphEntry = NULL;
if ( bTabHasGraphics )
{
- for ( pGraphEntry = aGraphList.First(); pGraphEntry;
+ for ( pGraphEntry = aGraphList.First(); pGraphEntry;
pGraphEntry = aGraphList.Next() )
{
if ( pGraphEntry->bInCell && pGraphEntry->aRange.In( aPos ) )
@@ -831,7 +831,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
if ( pGraphEntry->aRange.aStart == aPos )
break; // for
else
- return ; // ist ein Col/RowSpan, Overlapped
+ return ; // ist ein Col/RowSpan, Overlapped
}
}
}
@@ -956,20 +956,20 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
Color aBgColor;
if ( rBrushItem.GetColor().GetTransparency() == 255 )
- aBgColor = aHTMLStyle.aBackgroundColor; // #55121# keine ungewollte Hintergrundfarbe
+ aBgColor = aHTMLStyle.aBackgroundColor; // #55121# keine ungewollte Hintergrundfarbe
else
aBgColor = rBrushItem.GetColor();
- BOOL bBold = ( WEIGHT_BOLD <= rWeightItem.GetWeight() );
- BOOL bItalic = ( ITALIC_NONE != rPostureItem.GetPosture() );
- BOOL bUnderline = ( UNDERLINE_NONE != rUnderlineItem.GetLineStyle() );
- BOOL bSetFontColor = ( COL_AUTO != rColorItem.GetValue().GetColor() ); // #97650# default is AUTO now
+ BOOL bBold = ( WEIGHT_BOLD <= rWeightItem.GetWeight() );
+ BOOL bItalic = ( ITALIC_NONE != rPostureItem.GetPosture() );
+ BOOL bUnderline = ( UNDERLINE_NONE != rUnderlineItem.GetLineStyle() );
+ BOOL bSetFontColor = ( COL_AUTO != rColorItem.GetValue().GetColor() ); // #97650# default is AUTO now
#if 0
// keine StyleSheet-Fontangaben: hart fuer jede Zelle
- BOOL bSetFontName = TRUE;
+ BOOL bSetFontName = TRUE;
USHORT nSetFontSizeNumber = GetFontSizeNumber( (USHORT)rFontHeightItem.GetHeight() );
#else
- BOOL bSetFontName = ( aHTMLStyle.aFontFamilyName != rFontItem.GetFamilyName() );
+ BOOL bSetFontName = ( aHTMLStyle.aFontFamilyName != rFontItem.GetFamilyName() );
USHORT nSetFontSizeNumber = 0;
UINT32 nFontHeight = rFontHeightItem.GetHeight();
if ( nFontHeight != aHTMLStyle.nFontHeight )
@@ -990,23 +990,23 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
case SVX_HOR_JUSTIFY_STANDARD:
pChar = (bValueData ? OOO_STRING_SVTOOLS_HTML_AL_right : OOO_STRING_SVTOOLS_HTML_AL_left);
break;
- case SVX_HOR_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_HTML_AL_center; break;
- case SVX_HOR_JUSTIFY_BLOCK: pChar = OOO_STRING_SVTOOLS_HTML_AL_justify; break;
- case SVX_HOR_JUSTIFY_RIGHT: pChar = OOO_STRING_SVTOOLS_HTML_AL_right; break;
+ case SVX_HOR_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_HTML_AL_center; break;
+ case SVX_HOR_JUSTIFY_BLOCK: pChar = OOO_STRING_SVTOOLS_HTML_AL_justify; break;
+ case SVX_HOR_JUSTIFY_RIGHT: pChar = OOO_STRING_SVTOOLS_HTML_AL_right; break;
case SVX_HOR_JUSTIFY_LEFT:
case SVX_HOR_JUSTIFY_REPEAT:
- default: pChar = OOO_STRING_SVTOOLS_HTML_AL_left; break;
+ default: pChar = OOO_STRING_SVTOOLS_HTML_AL_left; break;
}
(((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_align) += '=') += pChar;
switch( rVerJustifyItem.GetValue() )
{
- case SVX_VER_JUSTIFY_TOP: pChar = OOO_STRING_SVTOOLS_HTML_VA_top; break;
- case SVX_VER_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_HTML_VA_middle; break;
- case SVX_VER_JUSTIFY_BOTTOM: pChar = OOO_STRING_SVTOOLS_HTML_VA_bottom; break;
+ case SVX_VER_JUSTIFY_TOP: pChar = OOO_STRING_SVTOOLS_HTML_VA_top; break;
+ case SVX_VER_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_HTML_VA_middle; break;
+ case SVX_VER_JUSTIFY_BOTTOM: pChar = OOO_STRING_SVTOOLS_HTML_VA_bottom; break;
case SVX_VER_JUSTIFY_STANDARD:
- default: pChar = NULL;
+ default: pChar = NULL;
}
if ( pChar )
(((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_valign) += '=') += pChar;
@@ -1045,31 +1045,31 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
TAG_ON( aStrTD.GetBuffer() );
- if ( bBold ) TAG_ON( OOO_STRING_SVTOOLS_HTML_bold );
- if ( bItalic ) TAG_ON( OOO_STRING_SVTOOLS_HTML_italic );
- if ( bUnderline ) TAG_ON( OOO_STRING_SVTOOLS_HTML_underline );
+ if ( bBold ) TAG_ON( OOO_STRING_SVTOOLS_HTML_bold );
+ if ( bItalic ) TAG_ON( OOO_STRING_SVTOOLS_HTML_italic );
+ if ( bUnderline ) TAG_ON( OOO_STRING_SVTOOLS_HTML_underline );
if ( bSetFont )
{
- ByteString aStr = OOO_STRING_SVTOOLS_HTML_font;
+ ByteString aStr = OOO_STRING_SVTOOLS_HTML_font;
if ( bSetFontName )
{
((aStr += ' ') += OOO_STRING_SVTOOLS_HTML_O_face) += "=\"";
xub_StrLen nFonts = rFontItem.GetFamilyName().GetTokenCount( ';' );
if ( nFonts == 1 )
{
- ByteString aTmpStr;
+ ByteString aTmpStr;
HTMLOutFuncs::ConvertStringToHTML( rFontItem.GetFamilyName(),
aTmpStr, eDestEnc, &aNonConvertibleChars );
aStr += aTmpStr;
}
else
- { // Fontliste, VCL: Semikolon als Separator, HTML: Komma
+ { // Fontliste, VCL: Semikolon als Separator, HTML: Komma
const String& rList = rFontItem.GetFamilyName();
for ( xub_StrLen j = 0, nPos = 0; j < nFonts; j++ )
{
- ByteString aTmpStr;
+ ByteString aTmpStr;
HTMLOutFuncs::ConvertStringToHTML(
rList.GetToken( 0, ';', nPos ), aTmpStr, eDestEnc,
&aNonConvertibleChars );
@@ -1087,9 +1087,9 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
}
if ( bSetFontColor )
{
- Color aColor = rColorItem.GetValue();
+ Color aColor = rColorItem.GetValue();
- // always export automatic text color as black
+ // always export automatic text color as black
if ( aColor.GetColor() == COL_AUTO )
aColor.SetColor( COL_BLACK );
@@ -1102,7 +1102,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
String aStrOut;
BOOL bFieldText = FALSE;
if ( pCell )
- { // cell content
+ { // cell content
Color* pColor;
switch ( pCell->GetCellType() )
{
@@ -1122,7 +1122,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
{
if ( !aStrOut.Len() )
{
- TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak ); // #42573# keine komplett leere Zelle
+ TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak ); // #42573# keine komplett leere Zelle
}
else
{
@@ -1140,7 +1140,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
OUT_STR( aSingleLine );
TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak );
nStartPos = nPos + 1;
- }
+ }
while( ( nPos = aStrOut.Search( _LF, nStartPos ) ) != STRING_NOTFOUND );
String aSingleLine( aStrOut, nStartPos, aStrOut.Len() - nStartPos );
OUT_STR( aSingleLine );
@@ -1150,10 +1150,10 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
if ( pGraphEntry )
WriteGraphEntry( pGraphEntry );
- if ( bSetFont ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_font );
- if ( bUnderline ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_underline );
- if ( bItalic ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_italic );
- if ( bBold ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold );
+ if ( bSetFont ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_font );
+ if ( bUnderline ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_underline );
+ if ( bItalic ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_italic );
+ if ( bBold ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold );
TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_tabledata );
}
@@ -1179,7 +1179,7 @@ BOOL ScHTMLExport::WriteFieldText( const ScEditCell* pCell )
if ( bFields )
{
BOOL bOldUpdateMode = rEngine.GetUpdateMode();
- rEngine.SetUpdateMode( TRUE ); // no portions if not formatted
+ rEngine.SetUpdateMode( TRUE ); // no portions if not formatted
for ( USHORT nPar=0; nPar < nParas; nPar++ )
{
if ( nPar > 0 )
@@ -1204,8 +1204,8 @@ BOOL ScHTMLExport::WriteFieldText( const ScEditCell* pCell )
if ( pField && pField->ISA(SvxURLField) )
{
bUrl = TRUE;
- const SvxURLField* pURLField = (const SvxURLField*)pField;
-// String aFieldText = rEngine.GetText( aSel );
+ const SvxURLField* pURLField = (const SvxURLField*)pField;
+// String aFieldText = rEngine.GetText( aSel );
rStrm << '<' << OOO_STRING_SVTOOLS_HTML_anchor << ' ' << OOO_STRING_SVTOOLS_HTML_O_href << "=\"";
OUT_STR( pURLField->GetURL() );
rStrm << "\">";
@@ -1275,7 +1275,7 @@ BOOL ScHTMLExport::CopyLocalFileToINet( String& rFileNm,
FALSE );
// temp. File anlegen
- // aMedium.DownLoad();
+ // aMedium.DownLoad();
{
SvFileStream aCpy( aMedium.GetPhysicalName(), STREAM_WRITE );
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index 341f9afbc739..f1d661730369 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using namespace com::sun::star;
//------------------------------------------------------------------------
void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab,
- SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow )
+ SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow )
{
if ( pDrawLayer->HasObjectsInRows( nTab, nStartRow, nEndRow ) )
{
@@ -71,7 +71,7 @@ void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab,
pE = aGraphList.Next() )
{
if ( !pE->bInCell )
- { // nicht alle in Zellen: einige neben Tabelle
+ { // nicht alle in Zellen: einige neben Tabelle
bTabAlignedLeft = TRUE;
break;
}
@@ -82,9 +82,9 @@ void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab,
void ScHTMLExport::FillGraphList( const SdrPage* pPage, SCTAB nTab,
- SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow )
+ SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow )
{
- ULONG nObjCount = pPage->GetObjCount();
+ ULONG nObjCount = pPage->GetObjCount();
if ( nObjCount )
{
Rectangle aRect;
@@ -207,7 +207,7 @@ void ScHTMLExport::WriteImage( String& rLinkName, const Graphic& rGrf,
nXOutFlags |= XOUTBMP_USE_NATIVE_IF_POSSIBLE;
USHORT nErr = XOutBitmap::WriteGraphic( rGrf, aGrfNm,
CREATE_STRING( "JPG" ), nXOutFlags );
- if( !nErr ) // sonst fehlerhaft, da ist nichts auszugeben
+ if( !nErr ) // sonst fehlerhaft, da ist nichts auszugeben
{
rLinkName = URIHelper::SmartRel2Abs(
INetURLObject(aBaseURL),
@@ -233,7 +233,7 @@ void ScHTMLExport::WriteImage( String& rLinkName, const Graphic& rGrf,
URIHelper::GetMaybeFileHdl());
}
if( rLinkName.Len() )
- { // <IMG SRC="..."[ rImgOptions]>
+ { // <IMG SRC="..."[ rImgOptions]>
rStrm << '<' << OOO_STRING_SVTOOLS_HTML_image << ' ' << OOO_STRING_SVTOOLS_HTML_O_src << "=\"";
HTMLOutFuncs::Out_String( rStrm, URIHelper::simpleNormalizedMakeRelative(
aBaseURL,
diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx
index 1c0b9fc8ec33..83d0ea32b3c3 100644
--- a/sc/source/filter/html/htmlimp.cxx
+++ b/sc/source/filter/html/htmlimp.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ void ScHTMLImport::InsertRangeName( ScDocument* pDoc, const String& rName, const
delete pRangeData;
}
-void ScHTMLImport::WriteToDocument(
+void ScHTMLImport::WriteToDocument(
BOOL bSizeColsRows, double nOutputFactor, SvNumberFormatter* pFormatter, bool bConvertDate )
{
ScEEImport::WriteToDocument( bSizeColsRows, nOutputFactor, pFormatter, bConvertDate );
@@ -232,7 +232,7 @@ String ScHTMLImport::GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrig
{
String aToken( rOrigName.GetToken( 0, ';', nStringIx ) );
if( pRangeNames && ScfTools::IsHTMLTablesName( aToken ) )
- { // build list with all HTML tables
+ { // build list with all HTML tables
ULONG nIndex = 1;
USHORT nPos;
BOOL bLoop = TRUE;
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 85e77fc3124b..64733eb6994f 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx
index 01eb076f6b3d..24b723ef9a20 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +48,16 @@ class XclExpUserBView : public ExcRecord
{
private:
XclExpString sUsername;
- sal_uInt8 aGUID[ 16 ];
+ sal_uInt8 aGUID[ 16 ];
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
XclExpUserBView( const String& rUsername, const sal_uInt8* pGUID );
- inline const sal_uInt8* GetGUID() const { return aGUID; }
+ inline const sal_uInt8* GetGUID() const { return aGUID; }
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
};
@@ -67,17 +67,17 @@ public:
class XclExpUserBViewList : public ExcEmptyRec, private List
{
private:
- inline XclExpUserBView* _First() { return (XclExpUserBView*) List::First(); }
- inline XclExpUserBView* _Next() { return (XclExpUserBView*) List::Next(); }
+ inline XclExpUserBView* _First() { return (XclExpUserBView*) List::First(); }
+ inline XclExpUserBView* _Next() { return (XclExpUserBView*) List::Next(); }
public:
XclExpUserBViewList( const ScChangeTrack& rChangeTrack );
- virtual ~XclExpUserBViewList();
+ virtual ~XclExpUserBViewList();
- inline const XclExpUserBView* First() { return (const XclExpUserBView*) List::First(); }
- inline const XclExpUserBView* Next() { return (const XclExpUserBView*) List::Next(); }
+ inline const XclExpUserBView* First() { return (const XclExpUserBView*) List::First(); }
+ inline const XclExpUserBView* Next() { return (const XclExpUserBView*) List::Next(); }
- virtual void Save( XclExpStream& rStrm );
+ virtual void Save( XclExpStream& rStrm );
};
//___________________________________________________________________
@@ -86,14 +86,14 @@ public:
class XclExpUsersViewBegin : public ExcRecord
{
private:
- sal_uInt8 aGUID[ 16 ];
- sal_uInt32 nCurrTab;
+ sal_uInt8 aGUID[ 16 ];
+ sal_uInt32 nCurrTab;
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
XclExpUsersViewBegin( const sal_uInt8* pGUID, sal_uInt32 nTab );
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
};
@@ -103,10 +103,10 @@ public:
class XclExpUsersViewEnd : public ExcRecord
{
private:
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
};
@@ -116,10 +116,10 @@ public:
class XclExpChTr0x0191 : public ExcRecord
{
private:
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
};
@@ -129,10 +129,10 @@ public:
class XclExpChTr0x0198 : public ExcRecord
{
private:
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
};
@@ -142,10 +142,10 @@ public:
class XclExpChTr0x0192 : public ExcRecord
{
private:
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
};
@@ -155,10 +155,10 @@ public:
class XclExpChTr0x0197 : public ExcRecord
{
private:
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
};
@@ -168,13 +168,13 @@ public:
class XclExpChTrEmpty : public ExcRecord
{
private:
- UINT16 nRecNum;
+ UINT16 nRecNum;
public:
- inline XclExpChTrEmpty( UINT16 nNum ) : nRecNum( nNum ) {}
- virtual ~XclExpChTrEmpty();
+ inline XclExpChTrEmpty( UINT16 nNum ) : nRecNum( nNum ) {}
+ virtual ~XclExpChTrEmpty();
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
};
@@ -184,12 +184,12 @@ public:
class XclExpChTr0x0195 : public ExcRecord
{
private:
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
- virtual ~XclExpChTr0x0195();
+ virtual ~XclExpChTr0x0195();
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
};
@@ -200,15 +200,15 @@ class XclExpChTr0x0194 : public ExcRecord
{
private:
XclExpString sUsername;
- DateTime aDateTime;
+ DateTime aDateTime;
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
- inline XclExpChTr0x0194( const ScChangeTrack& rChangeTrack );
- virtual ~XclExpChTr0x0194();
+ inline XclExpChTr0x0194( const ScChangeTrack& rChangeTrack );
+ virtual ~XclExpChTr0x0194();
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
};
@@ -224,19 +224,19 @@ inline XclExpChTr0x0194::XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ) :
class XclExpChTrHeader : public ExcRecord
{
private:
- sal_uInt8 aGUID[ 16 ];
- sal_uInt32 nCount;
+ sal_uInt8 aGUID[ 16 ];
+ sal_uInt32 nCount;
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
- inline XclExpChTrHeader() : nCount( 0 ) {}
- virtual ~XclExpChTrHeader();
+ inline XclExpChTrHeader() : nCount( 0 ) {}
+ virtual ~XclExpChTrHeader();
- inline void SetGUID( const sal_uInt8* pGUID ) { memcpy( aGUID, pGUID, 16 ); }
- inline void SetCount( sal_uInt32 nNew ) { nCount = nNew; }
+ inline void SetGUID( const sal_uInt8* pGUID ) { memcpy( aGUID, pGUID, 16 ); }
+ inline void SetCount( sal_uInt32 nNew ) { nCount = nNew; }
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
};
@@ -247,19 +247,19 @@ class XclExpChTrInfo : public ExcRecord
{
private:
XclExpString sUsername;
- DateTime aDateTime;
- sal_uInt8 aGUID[ 16 ];
+ DateTime aDateTime;
+ sal_uInt8 aGUID[ 16 ];
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
- inline XclExpChTrInfo(
+ inline XclExpChTrInfo(
const String& rUsername,
const DateTime& rDateTime,
const sal_uInt8* pGUID );
- virtual ~XclExpChTrInfo();
+ virtual ~XclExpChTrInfo();
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
};
@@ -276,25 +276,25 @@ inline XclExpChTrInfo::XclExpChTrInfo( const String& rUsername, const DateTime&
class XclExpChTrTabIdBuffer
{
private:
- sal_uInt16* pBuffer;
- sal_uInt16* pLast;
- sal_uInt16 nBufSize;
- sal_uInt16 nLastId;
+ sal_uInt16* pBuffer;
+ sal_uInt16* pLast;
+ sal_uInt16 nBufSize;
+ sal_uInt16 nLastId;
public:
XclExpChTrTabIdBuffer( sal_uInt16 nCount );
XclExpChTrTabIdBuffer( const XclExpChTrTabIdBuffer& rCopy );
~XclExpChTrTabIdBuffer();
- void InitFill( sal_uInt16 nIndex );
- void InitFillup();
+ void InitFill( sal_uInt16 nIndex );
+ void InitFillup();
- sal_uInt16 GetId( sal_uInt16 nIndex ) const;
- void Remove();
+ sal_uInt16 GetId( sal_uInt16 nIndex ) const;
+ void Remove();
- inline sal_uInt16 GetBufferCount() const
+ inline sal_uInt16 GetBufferCount() const
{ return static_cast< sal_uInt16 >( (pLast - pBuffer) + 1 ); }
- inline void GetBufferCopy( sal_uInt16* pDest ) const
+ inline void GetBufferCopy( sal_uInt16* pDest ) const
{ memcpy( pDest, pBuffer, sizeof(sal_uInt16) * GetBufferCount() ); }
};
@@ -304,13 +304,13 @@ public:
class XclExpChTrTabIdBufferList : private List
{
private:
- inline XclExpChTrTabIdBuffer* First() { return (XclExpChTrTabIdBuffer*) List::First(); }
- inline XclExpChTrTabIdBuffer* Next() { return (XclExpChTrTabIdBuffer*) List::Next(); }
+ inline XclExpChTrTabIdBuffer* First() { return (XclExpChTrTabIdBuffer*) List::First(); }
+ inline XclExpChTrTabIdBuffer* Next() { return (XclExpChTrTabIdBuffer*) List::Next(); }
public:
- virtual ~XclExpChTrTabIdBufferList();
+ virtual ~XclExpChTrTabIdBufferList();
- inline void Append( XclExpChTrTabIdBuffer* pNew )
+ inline void Append( XclExpChTrTabIdBuffer* pNew )
{ List::Insert( pNew, LIST_APPEND ); }
};
@@ -320,22 +320,22 @@ public:
class XclExpChTrTabId : public ExcRecord
{
private:
- sal_uInt16* pBuffer;
- sal_uInt16 nTabCount;
+ sal_uInt16* pBuffer;
+ sal_uInt16 nTabCount;
- inline void Clear() { if( pBuffer ) delete[] pBuffer; pBuffer = NULL; }
+ inline void Clear() { if( pBuffer ) delete[] pBuffer; pBuffer = NULL; }
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
- inline XclExpChTrTabId( sal_uInt16 nCount ) :
+ inline XclExpChTrTabId( sal_uInt16 nCount ) :
pBuffer( NULL ), nTabCount( nCount ) {}
XclExpChTrTabId( const XclExpChTrTabIdBuffer& rBuffer );
- virtual ~XclExpChTrTabId();
+ virtual ~XclExpChTrTabId();
- void Copy( const XclExpChTrTabIdBuffer& rBuffer );
+ void Copy( const XclExpChTrTabIdBuffer& rBuffer );
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
};
@@ -345,44 +345,44 @@ public:
class XclExpChTrAction : public ExcRecord
{
private:
- String sUsername;
- DateTime aDateTime;
- sal_uInt32 nIndex; // action number
- XclExpChTrAction* pAddAction; // additional record for this action
- sal_Bool bAccepted;
+ String sUsername;
+ DateTime aDateTime;
+ sal_uInt32 nIndex; // action number
+ XclExpChTrAction* pAddAction; // additional record for this action
+ sal_Bool bAccepted;
protected:
const XclExpTabInfo& rTabInfo; // for table num export (sc num -> xcl num)
- const XclExpChTrTabIdBuffer& rIdBuffer; // for table num export (xcl num -> tab id)
- sal_uInt32 nLength; // this is not the record size
- sal_uInt16 nOpCode; // EXC_CHTR_OP_***
- sal_Bool bForceInfo;
+ const XclExpChTrTabIdBuffer& rIdBuffer; // for table num export (xcl num -> tab id)
+ sal_uInt32 nLength; // this is not the record size
+ sal_uInt16 nOpCode; // EXC_CHTR_OP_***
+ sal_Bool bForceInfo;
XclExpChTrAction( const XclExpChTrAction& rCopy );
- void SetAddAction( XclExpChTrAction* pAction );
- void AddDependentContents(
+ void SetAddAction( XclExpChTrAction* pAction );
+ void AddDependentContents(
const ScChangeAction& rAction,
const XclExpRoot& rRoot,
ScChangeTrack& rChangeTrack );
- inline void Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) const;
- inline void Write2DRange( XclExpStream& rStrm, const ScRange& rRange ) const;
- inline void WriteTabId( XclExpStream& rStrm, SCTAB nTabId ) const;
+ inline void Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) const;
+ inline void Write2DRange( XclExpStream& rStrm, const ScRange& rRange ) const;
+ inline void WriteTabId( XclExpStream& rStrm, SCTAB nTabId ) const;
// save header data, call SaveActionData()
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
inline sal_Size GetHeaderByteCount() const { return 12; }
// overload to save action data without header, called by SaveCont()
- virtual void SaveActionData( XclExpStream& rStrm ) const = 0;
+ virtual void SaveActionData( XclExpStream& rStrm ) const = 0;
// overload to get action size without header, called by GetLen()
virtual sal_Size GetActionByteCount() const = 0;
// do something before writing the record
- virtual void PrepareSaveAction( XclExpStream& rStrm ) const;
+ virtual void PrepareSaveAction( XclExpStream& rStrm ) const;
// do something after writing the record
- virtual void CompleteSaveAction( XclExpStream& rStrm ) const;
+ virtual void CompleteSaveAction( XclExpStream& rStrm ) const;
public:
XclExpChTrAction(
@@ -390,33 +390,33 @@ public:
const XclExpRoot& rRoot,
const XclExpChTrTabIdBuffer& rTabIdBuffer,
sal_uInt16 nNewOpCode = EXC_CHTR_OP_UNKNOWN );
- virtual ~XclExpChTrAction();
+ virtual ~XclExpChTrAction();
- inline const String& GetUsername() const { return sUsername; }
- inline const DateTime& GetDateTime() const { return aDateTime; }
- inline const XclExpChTrTabIdBuffer& GetTabIdBuffer() const { return rIdBuffer; }
- inline sal_Bool ForceInfoRecord() const { return bForceInfo; }
+ inline const String& GetUsername() const { return sUsername; }
+ inline const DateTime& GetDateTime() const { return aDateTime; }
+ inline const XclExpChTrTabIdBuffer& GetTabIdBuffer() const { return rIdBuffer; }
+ inline sal_Bool ForceInfoRecord() const { return bForceInfo; }
// set own index & return new index
// could be overloaded to use more indexes per action
- virtual void SetIndex( sal_uInt32& rIndex );
+ virtual void SetIndex( sal_uInt32& rIndex );
- virtual void Save( XclExpStream& rStrm );
+ virtual void Save( XclExpStream& rStrm );
virtual sal_Size GetLen() const;
};
inline void XclExpChTrAction::Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) const
{
- rStrm << (sal_uInt16) rAddress.Row()
- << (sal_uInt16) rAddress.Col();
+ rStrm << (sal_uInt16) rAddress.Row()
+ << (sal_uInt16) rAddress.Col();
}
inline void XclExpChTrAction::Write2DRange( XclExpStream& rStrm, const ScRange& rRange ) const
{
- rStrm << (sal_uInt16) rRange.aStart.Row()
- << (sal_uInt16) rRange.aEnd.Row()
- << (sal_uInt16) rRange.aStart.Col()
- << (sal_uInt16) rRange.aEnd.Col();
+ rStrm << (sal_uInt16) rRange.aStart.Row()
+ << (sal_uInt16) rRange.aEnd.Row()
+ << (sal_uInt16) rRange.aStart.Col()
+ << (sal_uInt16) rRange.aEnd.Col();
}
inline void XclExpChTrAction::WriteTabId( XclExpStream& rStrm, SCTAB nTab ) const
@@ -432,19 +432,19 @@ struct XclExpChTrData
XclExpString* pString;
XclTokenArrayRef mxTokArr;
XclExpRefLog maRefLog;
- double fValue;
- sal_Int32 nRKValue;
- sal_uInt16 nType;
+ double fValue;
+ sal_Int32 nRKValue;
+ sal_uInt16 nType;
sal_Size nSize;
XclExpChTrData();
~XclExpChTrData();
- void Clear();
+ void Clear();
- void WriteFormula(
+ void WriteFormula(
XclExpStream& rStrm,
const XclExpChTrTabIdBuffer& rTabIdBuffer );
- void Write(
+ void Write(
XclExpStream& rStrm,
const XclExpChTrTabIdBuffer& rTabIdBuffer );
};
@@ -455,31 +455,31 @@ struct XclExpChTrData
class XclExpChTrCellContent : public XclExpChTrAction, protected XclExpRoot
{
private:
- XclExpChTrData* pOldData;
- XclExpChTrData* pNewData;
- sal_uInt16 nOldLength; // this is not the record size
+ XclExpChTrData* pOldData;
+ XclExpChTrData* pNewData;
+ sal_uInt16 nOldLength; // this is not the record size
- void MakeEmptyChTrData( XclExpChTrData*& rpData );
+ void MakeEmptyChTrData( XclExpChTrData*& rpData );
protected:
- ScAddress aPosition;
+ ScAddress aPosition;
- void GetCellData(
+ void GetCellData(
const ScBaseCell* pScCell,
XclExpChTrData*& rpData,
sal_uInt32& rXclLength1,
sal_uInt16& rXclLength2 );
- virtual void SaveActionData( XclExpStream& rStrm ) const;
+ virtual void SaveActionData( XclExpStream& rStrm ) const;
public:
XclExpChTrCellContent(
const ScChangeActionContent& rAction,
const XclExpRoot& rRoot,
const XclExpChTrTabIdBuffer& rTabIdBuffer );
- virtual ~XclExpChTrCellContent();
+ virtual ~XclExpChTrCellContent();
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetActionByteCount() const;
};
@@ -489,14 +489,14 @@ public:
class XclExpChTrInsert : public XclExpChTrAction
{
protected:
- ScRange aRange;
+ ScRange aRange;
XclExpChTrInsert( const XclExpChTrInsert& rCopy ) :
XclExpChTrAction( rCopy ), aRange( rCopy.aRange ) {}
- virtual void SaveActionData( XclExpStream& rStrm ) const;
- virtual void PrepareSaveAction( XclExpStream& rStrm ) const;
- virtual void CompleteSaveAction( XclExpStream& rStrm ) const;
+ virtual void SaveActionData( XclExpStream& rStrm ) const;
+ virtual void PrepareSaveAction( XclExpStream& rStrm ) const;
+ virtual void CompleteSaveAction( XclExpStream& rStrm ) const;
public:
XclExpChTrInsert(
@@ -504,9 +504,9 @@ public:
const XclExpRoot& rRoot,
const XclExpChTrTabIdBuffer& rTabIdBuffer,
ScChangeTrack& rChangeTrack );
- virtual ~XclExpChTrInsert();
+ virtual ~XclExpChTrInsert();
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetActionByteCount() const;
};
@@ -516,19 +516,19 @@ public:
class XclExpChTrInsertTab : public XclExpChTrAction, protected XclExpRoot
{
private:
- SCTAB nTab;
+ SCTAB nTab;
protected:
- virtual void SaveActionData( XclExpStream& rStrm ) const;
+ virtual void SaveActionData( XclExpStream& rStrm ) const;
public:
XclExpChTrInsertTab(
const ScChangeAction& rAction,
const XclExpRoot& rRoot,
const XclExpChTrTabIdBuffer& rTabIdBuffer );
- virtual ~XclExpChTrInsertTab();
+ virtual ~XclExpChTrInsertTab();
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetActionByteCount() const;
};
@@ -538,12 +538,12 @@ public:
class XclExpChTrMoveRange : public XclExpChTrAction
{
protected:
- ScRange aSourceRange;
- ScRange aDestRange;
+ ScRange aSourceRange;
+ ScRange aDestRange;
- virtual void SaveActionData( XclExpStream& rStrm ) const;
- virtual void PrepareSaveAction( XclExpStream& rStrm ) const;
- virtual void CompleteSaveAction( XclExpStream& rStrm ) const;
+ virtual void SaveActionData( XclExpStream& rStrm ) const;
+ virtual void PrepareSaveAction( XclExpStream& rStrm ) const;
+ virtual void CompleteSaveAction( XclExpStream& rStrm ) const;
public:
XclExpChTrMoveRange(
@@ -551,9 +551,9 @@ public:
const XclExpRoot& rRoot,
const XclExpChTrTabIdBuffer& rTabIdBuffer,
ScChangeTrack& rChangeTrack );
- virtual ~XclExpChTrMoveRange();
+ virtual ~XclExpChTrMoveRange();
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetActionByteCount() const;
};
@@ -563,13 +563,13 @@ public:
class XclExpChTr0x014A : public XclExpChTrInsert
{
protected:
- virtual void SaveActionData( XclExpStream& rStrm ) const;
+ virtual void SaveActionData( XclExpStream& rStrm ) const;
public:
XclExpChTr0x014A( const XclExpChTrInsert& rAction );
- virtual ~XclExpChTr0x014A();
+ virtual ~XclExpChTr0x014A();
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetActionByteCount() const;
};
@@ -579,10 +579,10 @@ public:
class XclExpChTrActionStack : private Stack
{
public:
- virtual ~XclExpChTrActionStack();
+ virtual ~XclExpChTrActionStack();
- void Push( XclExpChTrAction* pNewRec );
- inline XclExpChTrAction* Pop() { return (XclExpChTrAction*) Stack::Pop(); }
+ void Push( XclExpChTrAction* pNewRec );
+ inline XclExpChTrAction* Pop() { return (XclExpChTrAction*) Stack::Pop(); }
private:
using Stack::Push;
@@ -594,15 +594,15 @@ private:
class XclExpChTrRecordList : private List
{
private:
- inline ExcRecord* First() { return (ExcRecord*) List::First(); }
- inline ExcRecord* Next() { return (ExcRecord*) List::Next(); }
+ inline ExcRecord* First() { return (ExcRecord*) List::First(); }
+ inline ExcRecord* Next() { return (ExcRecord*) List::Next(); }
public:
- virtual ~XclExpChTrRecordList();
+ virtual ~XclExpChTrRecordList();
using List::Count;
- void Append( ExcRecord* pNewRec );
- void Save( XclExpStream& rStrm );
+ void Append( ExcRecord* pNewRec );
+ void Save( XclExpStream& rStrm );
};
//___________________________________________________________________
@@ -611,28 +611,28 @@ public:
class XclExpChangeTrack : protected XclExpRoot
{
private:
- XclExpChTrRecordList aRecList;
- XclExpChTrActionStack aActionStack;
- XclExpChTrTabIdBufferList aTabIdBufferList;
- XclExpChTrTabIdBuffer* pTabIdBuffer;
+ XclExpChTrRecordList aRecList;
+ XclExpChTrActionStack aActionStack;
+ XclExpChTrTabIdBufferList aTabIdBufferList;
+ XclExpChTrTabIdBuffer* pTabIdBuffer;
- ScDocument* pTempDoc; // empty document
+ ScDocument* pTempDoc; // empty document
- sal_uInt32 nNewAction; // action number, 1-based
- XclExpChTrHeader* pHeader; // header record for last GUID
- sal_uInt8 aGUID[ 16 ]; // GUID for action info records
- sal_Bool bValidGUID;
+ sal_uInt32 nNewAction; // action number, 1-based
+ XclExpChTrHeader* pHeader; // header record for last GUID
+ sal_uInt8 aGUID[ 16 ]; // GUID for action info records
+ sal_Bool bValidGUID;
- ScChangeTrack* CreateTempChangeTrack();
- void PushActionRecord( const ScChangeAction& rAction );
+ ScChangeTrack* CreateTempChangeTrack();
+ void PushActionRecord( const ScChangeAction& rAction );
- sal_Bool WriteUserNamesStream();
+ sal_Bool WriteUserNamesStream();
public:
XclExpChangeTrack( const XclExpRoot& rRoot );
~XclExpChangeTrack();
- void Write();
+ void Write();
};
//___________________________________________________________________
diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx
index c850d6681235..32eae17063fe 100644
--- a/sc/source/filter/inc/XclImpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclImpChangeTrack.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +46,10 @@ class XclImpChTrFmlConverter;
struct XclImpChTrRecHeader
{
- sal_uInt32 nSize;
- sal_uInt32 nIndex;
- sal_uInt16 nOpCode;
- sal_uInt16 nAccept;
+ sal_uInt32 nSize;
+ sal_uInt32 nIndex;
+ sal_uInt16 nOpCode;
+ sal_uInt16 nAccept;
};
inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpChTrRecHeader& rRecHeader )
@@ -63,59 +63,59 @@ inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpChTrRecHeader& rRecH
class XclImpChangeTrack : protected XclImpRoot
{
private:
- XclImpChTrRecHeader aRecHeader;
- String sOldUsername;
+ XclImpChTrRecHeader aRecHeader;
+ String sOldUsername;
- ScChangeTrack* pChangeTrack;
+ ScChangeTrack* pChangeTrack;
SotStorageStreamRef xInStrm; // input stream
- XclImpStream* pStrm; // stream import class
- sal_uInt16 nTabIdCount;
- sal_Bool bGlobExit; // global exit loop
+ XclImpStream* pStrm; // stream import class
+ sal_uInt16 nTabIdCount;
+ sal_Bool bGlobExit; // global exit loop
enum { nmBase, nmFound, nmNested }
- eNestedMode; // action with nested content actions
+ eNestedMode; // action with nested content actions
- inline sal_Bool FoundNestedMode() { return eNestedMode == nmFound; }
+ inline sal_Bool FoundNestedMode() { return eNestedMode == nmFound; }
- void DoAcceptRejectAction( ScChangeAction* pAction );
- void DoAcceptRejectAction( sal_uInt32 nFirst, sal_uInt32 nLast );
+ void DoAcceptRejectAction( ScChangeAction* pAction );
+ void DoAcceptRejectAction( sal_uInt32 nFirst, sal_uInt32 nLast );
- void DoInsertRange( const ScRange& rRange );
- void DoDeleteRange( const ScRange& rRange );
+ void DoInsertRange( const ScRange& rRange );
+ void DoDeleteRange( const ScRange& rRange );
- inline sal_uInt8 LookAtuInt8();
- inline double ReadRK();
- inline sal_Bool ReadBool();
- inline void Read2DAddress( ScAddress& rAddress );
- inline void Read2DRange( ScRange& rRange );
+ inline sal_uInt8 LookAtuInt8();
+ inline double ReadRK();
+ inline sal_Bool ReadBool();
+ inline void Read2DAddress( ScAddress& rAddress );
+ inline void Read2DRange( ScRange& rRange );
SCTAB ReadTabNum();
- void ReadDateTime( DateTime& rDateTime );
+ void ReadDateTime( DateTime& rDateTime );
- inline void ReadString( String& rString );
- inline void IgnoreString();
+ inline void ReadString( String& rString );
+ inline void IgnoreString();
- sal_Bool CheckRecord( sal_uInt16 nOpCode );
+ sal_Bool CheckRecord( sal_uInt16 nOpCode );
- void ReadFormula(
+ void ReadFormula(
ScTokenArray*& rpTokenArray,
const ScAddress& rPosition );
- void ReadCell(
+ void ReadCell(
ScBaseCell*& rpCell,
sal_uInt32& rFormat,
sal_uInt16 nFlags,
const ScAddress& rPosition );
- void ReadChTrInsert(); // 0x0137
- void ReadChTrInfo(); // 0x0138
- void ReadChTrCellContent(); // 0x013B
- void ReadChTrTabId(); // 0x013D
- void ReadChTrMoveRange(); // 0x0140
- void ReadChTrInsertTab(); // 0x014D
- void InitNestedMode(); // 0x014E, 0x0150
- void ReadNestedRecords();
- sal_Bool EndNestedMode(); // 0x014F, 0x0151
+ void ReadChTrInsert(); // 0x0137
+ void ReadChTrInfo(); // 0x0138
+ void ReadChTrCellContent(); // 0x013B
+ void ReadChTrTabId(); // 0x013D
+ void ReadChTrMoveRange(); // 0x0140
+ void ReadChTrInsertTab(); // 0x014D
+ void InitNestedMode(); // 0x014E, 0x0150
+ void ReadNestedRecords();
+ sal_Bool EndNestedMode(); // 0x014F, 0x0151
- void ReadRecords();
+ void ReadRecords();
public:
XclImpChangeTrack( const XclImpRoot& rRoot, const XclImpStream& rBookStrm );
@@ -123,9 +123,9 @@ public:
// reads extended 3D ref info following the formulas, returns sc tab nums
// ( called by XclImpChTrFmlConverter::Read3DTabReference() )
- sal_Bool Read3DTabRefInfo( SCTAB& rFirstTab, SCTAB& rLastTab, ExcelToSc8::ExternalTabInfo& rExtInfo );
+ sal_Bool Read3DTabRefInfo( SCTAB& rFirstTab, SCTAB& rLastTab, ExcelToSc8::ExternalTabInfo& rExtInfo );
- void Apply();
+ void Apply();
};
inline sal_uInt8 XclImpChangeTrack::LookAtuInt8()
@@ -177,15 +177,15 @@ inline void XclImpChangeTrack::IgnoreString()
class XclImpChTrFmlConverter : public ExcelToSc8
{
private:
- XclImpChangeTrack& rChangeTrack;
+ XclImpChangeTrack& rChangeTrack;
virtual bool Read3DTabReference( UINT16 nIxti, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo );
public:
- inline XclImpChTrFmlConverter(
+ inline XclImpChTrFmlConverter(
const XclImpRoot& rRoot,
XclImpChangeTrack& rXclChTr );
- virtual ~XclImpChTrFmlConverter();
+ virtual ~XclImpChTrFmlConverter();
};
inline XclImpChTrFmlConverter::XclImpChTrFmlConverter(
diff --git a/sc/source/filter/inc/biff.hxx b/sc/source/filter/inc/biff.hxx
index 479dc0f577f5..e6d6f1b2d6a1 100644
--- a/sc/source/filter/inc/biff.hxx
+++ b/sc/source/filter/inc/biff.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +34,11 @@
#include "document.hxx"
#include "cell.hxx"
#include <tools/string.hxx>
-
+
#include <tools/color.hxx>
#include "flttypes.hxx"
#include "ftools.hxx"
-
+
// Stream wrapper class
class ScBiffReader
{
@@ -48,17 +48,17 @@ class ScBiffReader
sal_uInt32 mnOffset;
SvStream *mpStream;
bool mbEndOfFile;
-
+
public:
ScBiffReader( SfxMedium& rMedium );
~ScBiffReader();
bool recordsLeft() { return mpStream && !mpStream->IsEof(); }
bool IsEndOfFile() { return mbEndOfFile; }
- void SetEof( bool bValue ){ mbEndOfFile = bValue; }
+ void SetEof( bool bValue ){ mbEndOfFile = bValue; }
bool nextRecord();
sal_uInt16 getId() { return mnId; }
sal_uInt16 getLength() { return mnLength; }
- SvStream& getStream() { return *mpStream; }
+ SvStream& getStream() { return *mpStream; }
};
#endif
diff --git a/sc/source/filter/inc/colrowst.hxx b/sc/source/filter/inc/colrowst.hxx
index 325d380cc19c..768622cc9071 100644
--- a/sc/source/filter/inc/colrowst.hxx
+++ b/sc/source/filter/inc/colrowst.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/decl.h b/sc/source/filter/inc/decl.h
index e888b7dca5fe..91e251af08c4 100644
--- a/sc/source/filter/inc/decl.h
+++ b/sc/source/filter/inc/decl.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
diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx
index 20b2400cf5a2..f0efb122b317 100644
--- a/sc/source/filter/inc/dif.hxx
+++ b/sc/source/filter/inc/dif.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,74 +69,74 @@ enum DATASET { D_BOT, D_EOD, D_NUMERIC, D_STRING, D_UNKNOWN, D_SYNT_ERROR };
class DifParser
{
public:
- String aData;
- double fVal;
- UINT32 nVector;
- UINT32 nVal;
- UINT32 nNumFormat;
- CharSet eCharSet;
+ String aData;
+ double fVal;
+ UINT32 nVector;
+ UINT32 nVal;
+ UINT32 nNumFormat;
+ CharSet eCharSet;
private:
- SvNumberFormatter* pNumFormatter;
- SvStream& rIn;
- BOOL bPlain;
+ SvNumberFormatter* pNumFormatter;
+ SvStream& rIn;
+ BOOL bPlain;
String aLookAheadLine;
bool ReadNextLine( String& rStr );
bool LookAhead();
DATASET GetNumberDataset( const sal_Unicode* pPossibleNumericData );
- static inline BOOL IsBOT( const sal_Unicode* pRef );
- static inline BOOL IsEOD( const sal_Unicode* pRef );
- static inline BOOL Is1_0( const sal_Unicode* pRef );
+ static inline BOOL IsBOT( const sal_Unicode* pRef );
+ static inline BOOL IsEOD( const sal_Unicode* pRef );
+ static inline BOOL Is1_0( const sal_Unicode* pRef );
public:
DifParser( SvStream&, const UINT32 nOption, ScDocument&, CharSet );
- TOPIC GetNextTopic( void );
+ TOPIC GetNextTopic( void );
- DATASET GetNextDataset( void );
+ DATASET GetNextDataset( void );
const sal_Unicode* ScanIntVal( const sal_Unicode* pStart, UINT32& rRet );
- BOOL ScanFloatVal( const sal_Unicode* pStart );
+ BOOL ScanFloatVal( const sal_Unicode* pStart );
- inline BOOL IsNumber( const sal_Unicode cChar );
- inline BOOL IsNumberEnding( const sal_Unicode cChar );
+ inline BOOL IsNumber( const sal_Unicode cChar );
+ inline BOOL IsNumberEnding( const sal_Unicode cChar );
- static inline BOOL IsV( const sal_Unicode* pRef );
+ static inline BOOL IsV( const sal_Unicode* pRef );
- inline BOOL IsPlain( void ) const;
+ inline BOOL IsPlain( void ) const;
};
-inline BOOL DifParser::IsBOT( const sal_Unicode* pRef )
+inline BOOL DifParser::IsBOT( const sal_Unicode* pRef )
{
- return ( pRef[ 0 ] == pKeyBOT[0] &&
+ return ( pRef[ 0 ] == pKeyBOT[0] &&
pRef[ 1 ] == pKeyBOT[1] &&
pRef[ 2 ] == pKeyBOT[2] &&
- pRef[ 3 ] == pKeyBOT[3] );
+ pRef[ 3 ] == pKeyBOT[3] );
}
-inline BOOL DifParser::IsEOD( const sal_Unicode* pRef )
+inline BOOL DifParser::IsEOD( const sal_Unicode* pRef )
{
- return ( pRef[ 0 ] == pKeyEOD[0] &&
+ return ( pRef[ 0 ] == pKeyEOD[0] &&
pRef[ 1 ] == pKeyEOD[1] &&
pRef[ 2 ] == pKeyEOD[2] &&
- pRef[ 3 ] == pKeyEOD[3] );
+ pRef[ 3 ] == pKeyEOD[3] );
}
-inline BOOL DifParser::Is1_0( const sal_Unicode* pRef )
+inline BOOL DifParser::Is1_0( const sal_Unicode* pRef )
{
- return ( pRef[ 0 ] == pKey1_0[0] &&
+ return ( pRef[ 0 ] == pKey1_0[0] &&
pRef[ 1 ] == pKey1_0[1] &&
pRef[ 2 ] == pKey1_0[2] &&
- pRef[ 3 ] == pKey1_0[3] );
+ pRef[ 3 ] == pKey1_0[3] );
}
-inline BOOL DifParser::IsV( const sal_Unicode* pRef )
+inline BOOL DifParser::IsV( const sal_Unicode* pRef )
{
- return ( pRef[ 0 ] == pKeyV[0] &&
- pRef[ 1 ] == pKeyV[1] );
+ return ( pRef[ 0 ] == pKeyV[0] &&
+ pRef[ 1 ] == pKeyV[1] );
}
@@ -170,22 +170,22 @@ private:
friend class DifAttrCache;
struct ENTRY
{
- UINT32 nNumFormat;
+ UINT32 nNumFormat;
- SCROW nStart;
- SCROW nEnd;
+ SCROW nStart;
+ SCROW nEnd;
};
- ENTRY* pAkt;
+ ENTRY* pAkt;
- inline DifColumn( void );
+ inline DifColumn( void );
~DifColumn();
- void SetLogical( SCROW nRow );
- void SetNumFormat( SCROW nRow, const UINT32 nNumFormat );
- void NewEntry( const SCROW nPos, const UINT32 nNumFormat );
- void Apply( ScDocument&, const SCCOL nCol, const SCTAB nTab, const ScPatternAttr& );
- void Apply( ScDocument &rDoc, const SCCOL nCol, const SCTAB nTab );
-public: // geht niemanden etwas an...
+ void SetLogical( SCROW nRow );
+ void SetNumFormat( SCROW nRow, const UINT32 nNumFormat );
+ void NewEntry( const SCROW nPos, const UINT32 nNumFormat );
+ void Apply( ScDocument&, const SCCOL nCol, const SCTAB nTab, const ScPatternAttr& );
+ void Apply( ScDocument &rDoc, const SCCOL nCol, const SCTAB nTab );
+public: // geht niemanden etwas an...
};
@@ -200,14 +200,14 @@ inline DifColumn::DifColumn( void )
class DifAttrCache
{
private:
- DifColumn** ppCols;
- BOOL bPlain;
+ DifColumn** ppCols;
+ BOOL bPlain;
public:
DifAttrCache( const BOOL bPlain );
~DifAttrCache();
- inline void SetLogical( const SCCOL nCol, const SCROW nRow );
- void SetNumFormat( const SCCOL nCol, const SCROW nRow, const UINT32 nNumFormat );
- void Apply( ScDocument&, SCTAB nTab );
+ inline void SetLogical( const SCCOL nCol, const SCROW nRow );
+ void SetNumFormat( const SCCOL nCol, const SCROW nRow, const UINT32 nNumFormat );
+ void Apply( ScDocument&, SCTAB nTab );
};
diff --git a/sc/source/filter/inc/eeimport.hxx b/sc/source/filter/inc/eeimport.hxx
index 634dfd1b4a33..6e8817133485 100644
--- a/sc/source/filter/inc/eeimport.hxx
+++ b/sc/source/filter/inc/eeimport.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx
index afc8c959392b..2a06cbc31c71 100644
--- a/sc/source/filter/inc/eeparser.hxx
+++ b/sc/source/filter/inc/eeparser.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +42,12 @@ const sal_Char nHoriVerti = nHorizontal | nVertical;
struct ScHTMLImage
{
- String aURL;
- Size aSize;
- Point aSpace;
- String aFilterName;
- Graphic* pGraphic; // wird von WriteToDocument uebernommen
- sal_Char nDir; // 1==hori, 2==verti, 3==beides
+ String aURL;
+ Size aSize;
+ Point aSpace;
+ String aFilterName;
+ Graphic* pGraphic; // wird von WriteToDocument uebernommen
+ sal_Char nDir; // 1==hori, 2==verti, 3==beides
ScHTMLImage() :
aSize( 0, 0 ), aSpace( 0, 0 ), pGraphic( NULL ),
@@ -60,22 +60,22 @@ DECLARE_LIST( ScHTMLImageList, ScHTMLImage* )
struct ScEEParseEntry
{
- SfxItemSet aItemSet;
- ESelection aSel; // Selection in EditEngine
- String* pValStr; // HTML evtl. SDVAL String
- String* pNumStr; // HTML evtl. SDNUM String
- String* pName; // HTML evtl. Anchor/RangeName
- String aAltText; // HTML IMG ALT Text
- ScHTMLImageList* pImageList; // Grafiken in dieser Zelle
- SCCOL nCol; // relativ zum Beginn des Parse
- SCROW nRow;
- USHORT nTab; // HTML TableInTable
- USHORT nTwips; // RTF ColAdjust etc.
- SCCOL nColOverlap; // merged cells wenn >1
- SCROW nRowOverlap; // merged cells wenn >1
- USHORT nOffset; // HTML PixelOffset
- USHORT nWidth; // HTML PixelWidth
- BOOL bHasGraphic; // HTML any image loaded
+ SfxItemSet aItemSet;
+ ESelection aSel; // Selection in EditEngine
+ String* pValStr; // HTML evtl. SDVAL String
+ String* pNumStr; // HTML evtl. SDNUM String
+ String* pName; // HTML evtl. Anchor/RangeName
+ String aAltText; // HTML IMG ALT Text
+ ScHTMLImageList* pImageList; // Grafiken in dieser Zelle
+ SCCOL nCol; // relativ zum Beginn des Parse
+ SCROW nRow;
+ USHORT nTab; // HTML TableInTable
+ USHORT nTwips; // RTF ColAdjust etc.
+ SCCOL nColOverlap; // merged cells wenn >1
+ SCROW nRowOverlap; // merged cells wenn >1
+ USHORT nOffset; // HTML PixelOffset
+ USHORT nWidth; // HTML PixelWidth
+ BOOL bHasGraphic; // HTML any image loaded
bool bEntirePara; // TRUE = use entire paragraph, false = use selection
ScEEParseEntry( SfxItemPool* pPool ) :
@@ -119,32 +119,32 @@ class EditEngine;
class ScEEParser
{
protected:
- EditEngine* pEdit;
- SfxItemPool* pPool;
- SfxItemPool* pDocPool;
- ScEEParseList* pList;
- ScEEParseEntry* pActEntry;
- Table* pColWidths;
- int nLastToken;
- SCCOL nColCnt;
- SCROW nRowCnt;
- SCCOL nColMax;
- SCROW nRowMax;
-
- void NewActEntry( ScEEParseEntry* );
+ EditEngine* pEdit;
+ SfxItemPool* pPool;
+ SfxItemPool* pDocPool;
+ ScEEParseList* pList;
+ ScEEParseEntry* pActEntry;
+ Table* pColWidths;
+ int nLastToken;
+ SCCOL nColCnt;
+ SCROW nRowCnt;
+ SCCOL nColMax;
+ SCROW nRowMax;
+
+ void NewActEntry( ScEEParseEntry* );
public:
ScEEParser( EditEngine* );
- virtual ~ScEEParser();
+ virtual ~ScEEParser();
virtual ULONG Read( SvStream&, const String& rBaseURL ) = 0;
- void GetDimensions( SCCOL& nCols, SCROW& nRows ) const
+ void GetDimensions( SCCOL& nCols, SCROW& nRows ) const
{ nCols = nColMax; nRows = nRowMax; }
- ULONG Count() const { return pList->Count(); }
- ScEEParseEntry* First() const { return pList->First(); }
- ScEEParseEntry* Next() const { return pList->Next(); }
- Table* GetColWidths() const { return pColWidths; }
+ ULONG Count() const { return pList->Count(); }
+ ScEEParseEntry* First() const { return pList->First(); }
+ ScEEParseEntry* Next() const { return pList->Next(); }
+ Table* GetColWidths() const { return pColWidths; }
};
diff --git a/sc/source/filter/inc/excdefs.hxx b/sc/source/filter/inc/excdefs.hxx
index 2d489af7e427..3a1d7c52e012 100644
--- a/sc/source/filter/inc/excdefs.hxx
+++ b/sc/source/filter/inc/excdefs.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ const sal_uInt8 EXC_AFOPER_GREATEREQUAL = 0x06;
// (0x00AE, 0x00AF) SCENARIO, SCENMAN =========================================
-#define EXC_SCEN_MAXCELL 32
+#define EXC_SCEN_MAXCELL 32
// defines for change tracking ================================================
@@ -71,34 +71,34 @@ const sal_uInt8 EXC_AFOPER_GREATEREQUAL = 0x06;
#define EXC_STREAM_REVLOG CREATE_STRING( "Revision Log" )
// opcodes
-#define EXC_CHTR_OP_COLFLAG 0x0001
-#define EXC_CHTR_OP_DELFLAG 0x0002
-#define EXC_CHTR_OP_INSROW 0x0000
-#define EXC_CHTR_OP_INSCOL EXC_CHTR_OP_COLFLAG
-#define EXC_CHTR_OP_DELROW EXC_CHTR_OP_DELFLAG
-#define EXC_CHTR_OP_DELCOL (EXC_CHTR_OP_COLFLAG|EXC_CHTR_OP_DELFLAG)
-#define EXC_CHTR_OP_MOVE 0x0004
-#define EXC_CHTR_OP_INSTAB 0x0005
-#define EXC_CHTR_OP_CELL 0x0008
-#define EXC_CHTR_OP_RENAME 0x0009
-#define EXC_CHTR_OP_NAME 0x000A
-#define EXC_CHTR_OP_FORMAT 0x000B
-#define EXC_CHTR_OP_UNKNOWN 0xFFFF
+#define EXC_CHTR_OP_COLFLAG 0x0001
+#define EXC_CHTR_OP_DELFLAG 0x0002
+#define EXC_CHTR_OP_INSROW 0x0000
+#define EXC_CHTR_OP_INSCOL EXC_CHTR_OP_COLFLAG
+#define EXC_CHTR_OP_DELROW EXC_CHTR_OP_DELFLAG
+#define EXC_CHTR_OP_DELCOL (EXC_CHTR_OP_COLFLAG|EXC_CHTR_OP_DELFLAG)
+#define EXC_CHTR_OP_MOVE 0x0004
+#define EXC_CHTR_OP_INSTAB 0x0005
+#define EXC_CHTR_OP_CELL 0x0008
+#define EXC_CHTR_OP_RENAME 0x0009
+#define EXC_CHTR_OP_NAME 0x000A
+#define EXC_CHTR_OP_FORMAT 0x000B
+#define EXC_CHTR_OP_UNKNOWN 0xFFFF
// data types
-#define EXC_CHTR_TYPE_MASK 0x0007
-#define EXC_CHTR_TYPE_FORMATMASK 0xFF00
-#define EXC_CHTR_TYPE_EMPTY 0x0000
-#define EXC_CHTR_TYPE_RK 0x0001
-#define EXC_CHTR_TYPE_DOUBLE 0x0002
-#define EXC_CHTR_TYPE_STRING 0x0003
-#define EXC_CHTR_TYPE_BOOL 0x0004
-#define EXC_CHTR_TYPE_FORMULA 0x0005
+#define EXC_CHTR_TYPE_MASK 0x0007
+#define EXC_CHTR_TYPE_FORMATMASK 0xFF00
+#define EXC_CHTR_TYPE_EMPTY 0x0000
+#define EXC_CHTR_TYPE_RK 0x0001
+#define EXC_CHTR_TYPE_DOUBLE 0x0002
+#define EXC_CHTR_TYPE_STRING 0x0003
+#define EXC_CHTR_TYPE_BOOL 0x0004
+#define EXC_CHTR_TYPE_FORMULA 0x0005
// accept flags
-#define EXC_CHTR_NOTHING 0x0000
-#define EXC_CHTR_ACCEPT 0x0001
-#define EXC_CHTR_REJECT 0x0003
+#define EXC_CHTR_NOTHING 0x0000
+#define EXC_CHTR_ACCEPT 0x0001
+#define EXC_CHTR_REJECT 0x0003
// ============================================================================
diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx
index 5da6a5d38d83..a05305d808cd 100644
--- a/sc/source/filter/inc/excdoc.hxx
+++ b/sc/source/filter/inc/excdoc.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +60,9 @@ private:
XclExpCellTableRef mxCellTable;
SCTAB mnScTab; // table number SC document
- UINT16 nExcTab; // table number Excel document
- UINT16 nAktRow; // fuer'n Iterator
- UINT16 nAktCol;
+ UINT16 nExcTab; // table number Excel document
+ UINT16 nAktRow; // fuer'n Iterator
+ UINT16 nAktCol;
NameBuffer* pTabNames;
@@ -80,8 +80,8 @@ public:
void FillAsTable( SCTAB nCodeNameIdx );
void FillAsEmptyTable( SCTAB nCodeNameIdx );
- void Write( XclExpStream& );
- void WriteXml( XclExpXmlStream& );
+ void Write( XclExpStream& );
+ void WriteXml( XclExpXmlStream& );
};
@@ -97,20 +97,20 @@ private:
typedef XclExpRecordList< ExcBundlesheetBase > ExcBoundsheetList;
typedef ExcBoundsheetList::RecordRefType ExcBoundsheetRef;
- ExcTable aHeader;
+ ExcTable aHeader;
ExcTableList maTableList;
ExcBoundsheetList maBoundsheetList;
- XclExpChangeTrack* pExpChangeTrack;
+ XclExpChangeTrack* pExpChangeTrack;
public:
explicit ExcDocument( const XclExpRoot& rRoot );
virtual ~ExcDocument();
- void ReadDoc( void );
- void Write( SvStream& rSvStrm );
- void WriteXml( SvStream& rSvStrm );
+ void ReadDoc( void );
+ void Write( SvStream& rSvStrm );
+ void WriteXml( SvStream& rSvStrm );
};
diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx
index ed771637b704..ab96e6387871 100644
--- a/sc/source/filter/inc/excform.hxx
+++ b/sc/source/filter/inc/excform.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,21 +43,21 @@ protected:
enum ExtensionType { EXTENSION_ARRAY, EXTENSION_NLR, EXTENSION_MEMAREA };
typedef ::std::vector< ExtensionType > ExtensionTypeVec;
- BOOL bExternName; // wenn External Name gefunden wurde
- static const UINT16 nRowMask;
- static const UINT16 nLastInd; // letzter Index fuer Excel->SC-
+ BOOL bExternName; // wenn External Name gefunden wurde
+ static const UINT16 nRowMask;
+ static const UINT16 nLastInd; // letzter Index fuer Excel->SC-
// Token Umsetzung
XclFunctionProvider maFuncProv;
const XclBiff meBiff;
// ---------------------------------------------------------------
- void DoMulArgs( DefTokenId eId, sal_uInt8 nNumArgs, sal_uInt8 mnMinParamCount = 0 );
+ void DoMulArgs( DefTokenId eId, sal_uInt8 nNumArgs, sal_uInt8 mnMinParamCount = 0 );
- void ExcRelToScRel( UINT16 nRow, UINT8 nCol, ScSingleRefData&, const BOOL bName );
+ void ExcRelToScRel( UINT16 nRow, UINT8 nCol, ScSingleRefData&, const BOOL bName );
public:
ExcelToSc( const XclImpRoot& rRoot );
- virtual ~ExcelToSc();
+ virtual ~ExcelToSc();
virtual ConvErr Convert( const ScTokenArray*&, XclImpStream& rStrm, sal_Size nFormulaLen,
bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula );
@@ -68,21 +68,21 @@ public:
virtual BOOL GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen );
- void GetDummy( const ScTokenArray*& );
+ void GetDummy( const ScTokenArray*& );
const ScTokenArray* GetBoolErr( XclBoolError );
BOOL GetShrFmla( const ScTokenArray*&, XclImpStream& rStrm, sal_Size nFormulaLen );
#if 0
// return = TRUE -> String-Record folgt!
- static BOOL SetCurVal( ScFormulaCell& rCell, double& rCurVal );
+ static BOOL SetCurVal( ScFormulaCell& rCell, double& rCurVal );
#endif
- static void SetError( ScFormulaCell& rCell, const ConvErr eErr );
+ static void SetError( ScFormulaCell& rCell, const ConvErr eErr );
- static inline BOOL IsComplColRange( const UINT16 nCol1, const UINT16 nCol2 );
- static inline BOOL IsComplRowRange( const UINT16 nRow1, const UINT16 nRow2 );
+ static inline BOOL IsComplColRange( const UINT16 nCol1, const UINT16 nCol2 );
+ static inline BOOL IsComplRowRange( const UINT16 nRow1, const UINT16 nRow2 );
- void SetComplCol( ScComplexRefData& );
- void SetComplRow( ScComplexRefData& );
+ void SetComplCol( ScComplexRefData& );
+ void SetComplRow( ScComplexRefData& );
void ReadExtensions( const ExtensionTypeVec& rExtensions,
XclImpStream& aIn );
@@ -133,7 +133,7 @@ private:
public:
ExcelToSc8( const XclImpRoot& rRoot );
- virtual ~ExcelToSc8();
+ virtual ~ExcelToSc8();
virtual ConvErr Convert( const ScTokenArray*& rpTokArray, XclImpStream& rStrm, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula );
@@ -142,7 +142,7 @@ public:
virtual ConvErr ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen,
const String& rUrl, const ::std::vector<String>& rTabNames );
- static inline BOOL IsComplRowRange( const UINT16 nRow1, const UINT16 nRow2 );
+ static inline BOOL IsComplRowRange( const UINT16 nRow1, const UINT16 nRow2 );
virtual BOOL GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen );
};
diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx
index 7e4cca15dfe1..d3cca163d33f 100644
--- a/sc/source/filter/inc/excimp8.hxx
+++ b/sc/source/filter/inc/excimp8.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,32 +52,32 @@ class ImportExcel8 : public ImportExcel
{
public:
ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm );
- virtual ~ImportExcel8( void );
+ virtual ~ImportExcel8( void );
- virtual FltError Read( void );
+ virtual FltError Read( void );
protected:
ExcScenarioList aScenList;
- void Calccount( void ); // 0x0C
+ void Calccount( void ); // 0x0C
void Precision( void ); // 0x0E
- void Delta( void ); // 0x10
- void Iteration( void ); // 0x11
- void Boundsheet( void ); // 0x85
- void FilterMode( void ); // 0x9B
- void AutoFilterInfo( void ); // 0x9D
- void AutoFilter( void ); // 0x9E
- void Scenman( void ); // 0xAE
- void Scenario( void ); // 0xAF
- void ReadBasic( void ); // 0xD3
- void Labelsst( void ); // 0xFD
-
- void Hlink( void ); // 0x01B8
- void Codename( BOOL bWBGlobals ); // 0x01BA
+ void Delta( void ); // 0x10
+ void Iteration( void ); // 0x11
+ void Boundsheet( void ); // 0x85
+ void FilterMode( void ); // 0x9B
+ void AutoFilterInfo( void ); // 0x9D
+ void AutoFilter( void ); // 0x9E
+ void Scenman( void ); // 0xAE
+ void Scenario( void ); // 0xAF
+ void ReadBasic( void ); // 0xD3
+ void Labelsst( void ); // 0xFD
+
+ void Hlink( void ); // 0x01B8
+ void Codename( BOOL bWBGlobals ); // 0x01BA
void SheetProtection( void ); // 0x0867
virtual void EndSheet( void );
- virtual void PostDocLoad( void );
+ virtual void PostDocLoad( void );
private:
void LoadDocumentProperties();
@@ -91,20 +91,20 @@ private:
class XclImpAutoFilterData : private ExcRoot
{
private:
- ScDBData* pCurrDBData;
- ScQueryParam aParam;
- SCSIZE nFirstEmpty;
- BOOL bActive;
- BOOL bHasConflict;
+ ScDBData* pCurrDBData;
+ ScQueryParam aParam;
+ SCSIZE nFirstEmpty;
+ BOOL bActive;
+ BOOL bHasConflict;
BOOL bCriteria;
BOOL bAutoOrAdvanced;
ScRange aCriteriaRange;
String aFilterName;
- void CreateFromDouble( String& rStr, double fVal );
- void SetCellAttribs();
- void InsertQueryParam();
- void AmendAFName(const BOOL bUseUnNamed);
+ void CreateFromDouble( String& rStr, double fVal );
+ void SetCellAttribs();
+ void InsertQueryParam();
+ void AmendAFName(const BOOL bUseUnNamed);
protected:
public:
@@ -115,19 +115,19 @@ public:
inline bool IsActive() const { return bActive; }
inline bool IsFiltered() const { return bAutoOrAdvanced; }
- inline SCTAB Tab() const { return aParam.nTab; }
- inline SCCOL StartCol() const { return aParam.nCol1; }
- inline SCROW StartRow() const { return aParam.nRow1; }
- inline SCCOL EndCol() const { return aParam.nCol2; }
- inline SCROW EndRow() const { return aParam.nRow2; }
+ inline SCTAB Tab() const { return aParam.nTab; }
+ inline SCCOL StartCol() const { return aParam.nCol1; }
+ inline SCROW StartRow() const { return aParam.nRow1; }
+ inline SCCOL EndCol() const { return aParam.nCol2; }
+ inline SCROW EndRow() const { return aParam.nRow2; }
- void ReadAutoFilter( XclImpStream& rStrm );
+ void ReadAutoFilter( XclImpStream& rStrm );
- inline void Activate() { bActive = TRUE; }
+ inline void Activate() { bActive = TRUE; }
void SetAdvancedRange( const ScRange* pRange );
- void SetExtractPos( const ScAddress& rAddr );
+ void SetExtractPos( const ScAddress& rAddr );
inline void SetAutoOrAdvanced() { bAutoOrAdvanced = TRUE; }
- void Apply( const BOOL bUseUnNamed = FALSE );
+ void Apply( const BOOL bUseUnNamed = FALSE );
void CreateScDBData( const BOOL bUseUnNamed );
void EnableRemoveFilter();
};
@@ -140,23 +140,23 @@ private:
UINT16 nAFActiveCount;
- inline XclImpAutoFilterData* _First() { return (XclImpAutoFilterData*) List::First(); }
- inline XclImpAutoFilterData* _Next() { return (XclImpAutoFilterData*) List::Next(); }
+ inline XclImpAutoFilterData* _First() { return (XclImpAutoFilterData*) List::First(); }
+ inline XclImpAutoFilterData* _Next() { return (XclImpAutoFilterData*) List::Next(); }
- inline void Append( XclImpAutoFilterData* pData )
+ inline void Append( XclImpAutoFilterData* pData )
{ List::Insert( pData, LIST_APPEND ); }
protected:
public:
XclImpAutoFilterBuffer();
- virtual ~XclImpAutoFilterBuffer();
+ virtual ~XclImpAutoFilterBuffer();
- void Insert( RootData* pRoot, const ScRange& rRange,
+ void Insert( RootData* pRoot, const ScRange& rRange,
const String& rName );
- void AddAdvancedRange( const ScRange& rRange );
- void AddExtractPos( const ScRange& rRange );
- void Apply();
+ void AddAdvancedRange( const ScRange& rRange );
+ void AddExtractPos( const ScRange& rRange );
+ void Apply();
- XclImpAutoFilterData* GetByTab( SCTAB nTab );
+ XclImpAutoFilterData* GetByTab( SCTAB nTab );
inline void IncrementActiveAF() { nAFActiveCount++; }
inline BOOL UseUnNamed() { return nAFActiveCount == 1; }
};
diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx
index bc960f05b3a5..1f7acfd7829f 100644
--- a/sc/source/filter/inc/excrecds.hxx
+++ b/sc/source/filter/inc/excrecds.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +71,13 @@ class ExcTable;
class ExcRecord : public XclExpRecord
{
public:
- virtual void Save( XclExpStream& rStrm );
+ virtual void Save( XclExpStream& rStrm );
- virtual UINT16 GetNum() const = 0;
+ virtual UINT16 GetNum() const = 0;
virtual sal_Size GetLen() const = 0;
protected:
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
private:
/** Writes the body of the record. */
@@ -92,8 +92,8 @@ class ExcEmptyRec : public ExcRecord
private:
protected:
public:
- virtual void Save( XclExpStream& rStrm );
- virtual UINT16 GetNum() const;
+ virtual void Save( XclExpStream& rStrm );
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
};
@@ -105,17 +105,17 @@ class ExcRecordList : protected List, public ExcEmptyRec
private:
protected:
public:
- virtual ~ExcRecordList();
+ virtual ~ExcRecordList();
using List::Count;
- inline ExcRecord* First( void ) { return ( ExcRecord* ) List::First(); }
- inline ExcRecord* Next( void ) { return ( ExcRecord* ) List::Next(); }
+ inline ExcRecord* First( void ) { return ( ExcRecord* ) List::First(); }
+ inline ExcRecord* Next( void ) { return ( ExcRecord* ) List::Next(); }
- inline void Append( ExcRecord* pNew ) { if( pNew ) List::Insert( pNew, LIST_APPEND ); }
- inline const ExcRecord* Get( UINT32 nNum ) const { return ( ExcRecord* ) List::GetObject( nNum ); }
+ inline void Append( ExcRecord* pNew ) { if( pNew ) List::Insert( pNew, LIST_APPEND ); }
+ inline const ExcRecord* Get( UINT32 nNum ) const { return ( ExcRecord* ) List::GetObject( nNum ); }
- virtual void Save( XclExpStream& rStrm );
+ virtual void Save( XclExpStream& rStrm );
};
@@ -125,9 +125,9 @@ class ExcDummyRec : public ExcRecord
{
protected:
public:
- virtual void Save( XclExpStream& rStrm );
- virtual UINT16 GetNum() const;
- virtual const BYTE* GetData() const = 0; // byte data must contain header and body
+ virtual void Save( XclExpStream& rStrm );
+ virtual UINT16 GetNum() const;
+ virtual const BYTE* GetData() const = 0; // byte data must contain header and body
};
@@ -137,15 +137,15 @@ public:
class ExcBoolRecord : public ExcRecord
{
private:
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
protected:
- BOOL bVal;
+ BOOL bVal;
- inline ExcBoolRecord() : bVal( FALSE ) {}
+ inline ExcBoolRecord() : bVal( FALSE ) {}
public:
- inline ExcBoolRecord( const BOOL bDefault ) : bVal( bDefault ) {}
+ inline ExcBoolRecord( const BOOL bDefault ) : bVal( bDefault ) {}
virtual sal_Size GetLen( void ) const;
};
@@ -157,10 +157,10 @@ class ExcBof_Base : public ExcRecord
{
private:
protected:
- UINT16 nDocType;
- UINT16 nVers;
- UINT16 nRupBuild;
- UINT16 nRupYear;
+ UINT16 nDocType;
+ UINT16 nVers;
+ UINT16 nRupBuild;
+ UINT16 nRupYear;
public:
ExcBof_Base( void );
};
@@ -172,11 +172,11 @@ public:
class ExcBof : public ExcBof_Base
{
private:
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
ExcBof( void );
- virtual UINT16 GetNum( void ) const;
+ virtual UINT16 GetNum( void ) const;
virtual sal_Size GetLen( void ) const;
};
@@ -187,11 +187,11 @@ public:
class ExcBofW : public ExcBof_Base
{
private:
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
ExcBofW( void );
- virtual UINT16 GetNum( void ) const;
+ virtual UINT16 GetNum( void ) const;
virtual sal_Size GetLen( void ) const;
};
@@ -202,7 +202,7 @@ class ExcEof : public ExcRecord
{
private:
public:
- virtual UINT16 GetNum( void ) const;
+ virtual UINT16 GetNum( void ) const;
virtual sal_Size GetLen( void ) const;
};
@@ -213,15 +213,15 @@ public:
class ExcDummy_00 : public ExcDummyRec
{
private:
- static const BYTE pMyData[];
+ static const BYTE pMyData[];
static const sal_Size nMyLen;
public:
virtual sal_Size GetLen( void ) const;
- virtual const BYTE* GetData( void ) const;
+ virtual const BYTE* GetData( void ) const;
};
// EXC_ID_WINDOWPROTECTION
-class XclExpWindowProtection : public XclExpBoolRecord
+class XclExpWindowProtection : public XclExpBoolRecord
{
public:
XclExpWindowProtection(bool bValue);
@@ -230,7 +230,7 @@ class XclExpWindowProtection : public XclExpBoolRecord
};
// EXC_ID_PROTECT Document Protection
-class XclExpProtection : public XclExpBoolRecord
+class XclExpProtection : public XclExpBoolRecord
{
public:
XclExpProtection(bool bValue);
@@ -256,11 +256,11 @@ private:
class ExcDummy_040 : public ExcDummyRec
{
private:
- static const BYTE pMyData[];
+ static const BYTE pMyData[];
static const sal_Size nMyLen;
public:
virtual sal_Size GetLen( void ) const;
- virtual const BYTE* GetData( void ) const;
+ virtual const BYTE* GetData( void ) const;
};
@@ -268,11 +268,11 @@ public:
class ExcDummy_041 : public ExcDummyRec
{
private:
- static const BYTE pMyData[];
+ static const BYTE pMyData[];
static const sal_Size nMyLen;
public:
virtual sal_Size GetLen( void ) const;
- virtual const BYTE* GetData( void ) const;
+ virtual const BYTE* GetData( void ) const;
};
@@ -282,7 +282,7 @@ class Exc1904 : public ExcBoolRecord
{
public:
Exc1904( ScDocument& rDoc );
- virtual UINT16 GetNum( void ) const;
+ virtual UINT16 GetNum( void ) const;
virtual void SaveXml( XclExpXmlStream& rStrm );
};
@@ -295,7 +295,7 @@ class ExcBundlesheetBase : public ExcRecord
protected:
sal_Size nStrPos;
sal_Size nOwnPos; // Position NACH # und Len
- UINT16 nGrbit;
+ UINT16 nGrbit;
SCTAB nTab;
ExcBundlesheetBase();
@@ -304,9 +304,9 @@ public:
ExcBundlesheetBase( RootData& rRootData, SCTAB nTab );
inline void SetStreamPos( sal_Size nNewStrPos ) { nStrPos = nNewStrPos; }
- void UpdateStreamPos( XclExpStream& rStrm );
+ void UpdateStreamPos( XclExpStream& rStrm );
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
};
@@ -314,9 +314,9 @@ public:
class ExcBundlesheet : public ExcBundlesheetBase
{
private:
- ByteString aName;
+ ByteString aName;
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
ExcBundlesheet( RootData& rRootData, SCTAB nTab );
@@ -329,11 +329,11 @@ public:
class ExcDummy_02a : public ExcDummyRec
{
private:
- static const BYTE pMyData[];
+ static const BYTE pMyData[];
static const sal_Size nMyLen;
public:
virtual sal_Size GetLen( void ) const;
- virtual const BYTE* GetData( void ) const;
+ virtual const BYTE* GetData( void ) const;
};
@@ -395,9 +395,9 @@ private:
class ExcFilterCondition
{
private:
- UINT8 nType;
- UINT8 nOper;
- double fVal;
+ UINT8 nType;
+ UINT8 nOper;
+ double fVal;
XclExpString* pText;
protected:
@@ -405,15 +405,15 @@ public:
ExcFilterCondition();
~ExcFilterCondition();
- inline BOOL IsEmpty() const { return (nType == EXC_AFTYPE_NOTUSED); }
- inline BOOL HasEqual() const { return (nOper == EXC_AFOPER_EQUAL); }
- ULONG GetTextBytes() const;
+ inline BOOL IsEmpty() const { return (nType == EXC_AFTYPE_NOTUSED); }
+ inline BOOL HasEqual() const { return (nOper == EXC_AFOPER_EQUAL); }
+ ULONG GetTextBytes() const;
- void SetCondition( UINT8 nTp, UINT8 nOp, double fV, String* pT );
+ void SetCondition( UINT8 nTp, UINT8 nOp, double fV, String* pT );
- void Save( XclExpStream& rStrm );
- void SaveXml( XclExpXmlStream& rStrm );
- void SaveText( XclExpStream& rStrm );
+ void Save( XclExpStream& rStrm );
+ void SaveXml( XclExpXmlStream& rStrm );
+ void SaveText( XclExpStream& rStrm );
};
// ----------------------------------------------------------------------------
@@ -421,11 +421,11 @@ public:
class XclExpAutofilter : public XclExpRecord, protected XclExpRoot
{
private:
- UINT16 nCol;
- UINT16 nFlags;
- ExcFilterCondition aCond[ 2 ];
+ UINT16 nCol;
+ UINT16 nFlags;
+ ExcFilterCondition aCond[ 2 ];
- BOOL AddCondition( ScQueryConnect eConn, UINT8 nType,
+ BOOL AddCondition( ScQueryConnect eConn, UINT8 nType,
UINT8 nOp, double fVal, String* pText,
BOOL bSimple = FALSE );
@@ -435,8 +435,8 @@ protected:
public:
XclExpAutofilter( const XclExpRoot& rRoot, UINT16 nC );
- inline UINT16 GetCol() const { return nCol; }
- inline BOOL HasCondition() const { return !aCond[ 0 ].IsEmpty(); }
+ inline UINT16 GetCol() const { return nCol; }
+ inline BOOL HasCondition() const { return !aCond[ 0 ].IsEmpty(); }
inline BOOL HasTop10() const { return ::get_flag( nFlags, EXC_AFFLAG_TOP10 ); }
BOOL AddEntry( const ScQueryEntry& rEntry );
diff --git a/sc/source/filter/inc/excscen.hxx b/sc/source/filter/inc/excscen.hxx
index 125f74e9fa54..e90aa921d1f2 100644
--- a/sc/source/filter/inc/excscen.hxx
+++ b/sc/source/filter/inc/excscen.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ class ScDocument;
class ExcScenarioCell
{
private:
- String aValue;
+ String aValue;
public:
- const UINT16 nCol;
- const UINT16 nRow;
+ const UINT16 nCol;
+ const UINT16 nRow;
ExcScenarioCell( const UINT16 nC, const UINT16 nR );
- void SetValue( const String& rVal );
- inline const String& GetValue( void ) const;
+ void SetValue( const String& rVal );
+ inline const String& GetValue( void ) const;
};
@@ -61,17 +61,17 @@ class ExcScenario : protected List
private:
friend class ExcScenarioList;
protected:
- String* pName;
- String* pComment;
- String* pUserName;
- UINT8 nProtected;
+ String* pName;
+ String* pComment;
+ String* pUserName;
+ UINT8 nProtected;
- const UINT16 nTab;
+ const UINT16 nTab;
void Apply( const XclImpRoot& rRoot, const BOOL bLast = FALSE );
public:
ExcScenario( XclImpStream& rIn, const RootData& rRoot );
- virtual ~ExcScenario();
+ virtual ~ExcScenario();
};
@@ -80,22 +80,22 @@ public:
class ExcScenarioList : protected List
{
private:
- UINT16 nLastScenario;
- inline ExcScenario* _First( void ) { return ( ExcScenario* ) List::First(); }
- inline ExcScenario* _Next( void ) { return ( ExcScenario* ) List::Next(); }
- inline ExcScenario* _Last( void ) { return ( ExcScenario* ) List::Last(); }
- inline ExcScenario* _Prev( void ) { return ( ExcScenario* ) List::Prev(); }
+ UINT16 nLastScenario;
+ inline ExcScenario* _First( void ) { return ( ExcScenario* ) List::First(); }
+ inline ExcScenario* _Next( void ) { return ( ExcScenario* ) List::Next(); }
+ inline ExcScenario* _Last( void ) { return ( ExcScenario* ) List::Last(); }
+ inline ExcScenario* _Prev( void ) { return ( ExcScenario* ) List::Prev(); }
protected:
public:
ExcScenarioList( void );
- virtual ~ExcScenarioList();
+ virtual ~ExcScenarioList();
- inline void Append( ExcScenario* pNew );
+ inline void Append( ExcScenario* pNew );
- inline void SetLast( const UINT16 nIndex4Last );
+ inline void SetLast( const UINT16 nIndex4Last );
- inline const ExcScenario* First( void );
- inline const ExcScenario* Next( void );
+ inline const ExcScenario* First( void );
+ inline const ExcScenario* Next( void );
using List::Count;
diff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxx
index 79fff8675d84..a115c7b6e91e 100644
--- a/sc/source/filter/inc/exp_op.hxx
+++ b/sc/source/filter/inc/exp_op.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +43,9 @@ class SotStorage;
class ExportTyp
{
protected:
- SvStream& aOut; // Ausgabe-Stream
- ScDocument* pD; // Dokument
- CharSet eZielChar; // Ziel-Zeichensatz
+ SvStream& aOut; // Ausgabe-Stream
+ ScDocument* pD; // Dokument
+ CharSet eZielChar; // Ziel-Zeichensatz
public:
ExportTyp( SvStream& aStream, ScDocument* pDoc, CharSet eDest ):
aOut( aStream )
@@ -54,7 +54,7 @@ public:
pD = pDoc;
}
- virtual FltError Write() = 0;
+ virtual FltError Write() = 0;
};
@@ -63,40 +63,40 @@ public:
class ExportWK1 : public ExportTyp
{
private:
- BYTE GenFormByte( const ScPatternAttr& );
- void Bof();
- void Eof();
- void Calcmode();
- void Calcorder();
- void Split();
- void Sync();
- void Dimensions();
- void Window1();
- void Colw();
- void Blank( const UINT16 nC, const UINT16 nR, const ScPatternAttr& );
- void Number( const UINT16 nC, const UINT16 nR, const double f, const ScPatternAttr& );
- void Label( const UINT16 nC, const UINT16 nR, const String&, const ScPatternAttr& );
- void Formula( const UINT16 nC, const UINT16 nR, const ScFormulaCell*, const ScPatternAttr& );
- void Protect();
- void Footer();
- void Header();
- void Margins();
- void Labelfmt();
- void Calccount();
- void Cursorw12();
- void WKString( const UINT16 nC, const UINT16 nR, const ScFormulaCell*, const ScPatternAttr& );
- void Snrange();
- void Hidcol();
- void Cpi();
+ BYTE GenFormByte( const ScPatternAttr& );
+ void Bof();
+ void Eof();
+ void Calcmode();
+ void Calcorder();
+ void Split();
+ void Sync();
+ void Dimensions();
+ void Window1();
+ void Colw();
+ void Blank( const UINT16 nC, const UINT16 nR, const ScPatternAttr& );
+ void Number( const UINT16 nC, const UINT16 nR, const double f, const ScPatternAttr& );
+ void Label( const UINT16 nC, const UINT16 nR, const String&, const ScPatternAttr& );
+ void Formula( const UINT16 nC, const UINT16 nR, const ScFormulaCell*, const ScPatternAttr& );
+ void Protect();
+ void Footer();
+ void Header();
+ void Margins();
+ void Labelfmt();
+ void Calccount();
+ void Cursorw12();
+ void WKString( const UINT16 nC, const UINT16 nR, const ScFormulaCell*, const ScPatternAttr& );
+ void Snrange();
+ void Hidcol();
+ void Cpi();
public:
static const USHORT WK1MAXCOL;
static const USHORT WK1MAXROW;
- inline ExportWK1( SvStream& r, ScDocument* p, CharSet e ) :
+ inline ExportWK1( SvStream& r, ScDocument* p, CharSet e ) :
ExportTyp( r, p, e ) {};
- FltError Write();
+ FltError Write();
};
#endif
@@ -105,15 +105,15 @@ public:
class ExportBiff5 : public ExportTyp, protected XclExpRoot
{
private:
- ExcDocument* pExcDoc;
+ ExcDocument* pExcDoc;
protected:
RootData* pExcRoot;
public:
ExportBiff5( XclExpRootData& rExpData, SvStream& rStrm );
- virtual ~ExportBiff5();
- FltError Write();
+ virtual ~ExportBiff5();
+ FltError Write();
};
@@ -123,7 +123,7 @@ class ExportBiff8 : public ExportBiff5
{
public:
ExportBiff8( XclExpRootData& rExpData, SvStream& rStrm );
- virtual ~ExportBiff8();
+ virtual ~ExportBiff8();
};
@@ -137,8 +137,8 @@ protected:
public:
ExportXml2007( XclExpRootData& rExpData, SvStream& rStrm );
- virtual ~ExportXml2007();
- FltError Write();
+ virtual ~ExportXml2007();
+ FltError Write();
};
diff --git a/sc/source/filter/inc/expbase.hxx b/sc/source/filter/inc/expbase.hxx
index 3744bf497927..cd41a7619e26 100644
--- a/sc/source/filter/inc/expbase.hxx
+++ b/sc/source/filter/inc/expbase.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,36 +47,36 @@ public:
protected:
- SvStream& rStrm;
- ScRange aRange;
- ScDocument* pDoc;
- SvNumberFormatter* pFormatter;
- ScFieldEditEngine* pEditEngine;
+ SvStream& rStrm;
+ ScRange aRange;
+ ScDocument* pDoc;
+ SvNumberFormatter* pFormatter;
+ ScFieldEditEngine* pEditEngine;
public:
ScExportBase( SvStream&, ScDocument*, const ScRange& );
- virtual ~ScExportBase();
+ virtual ~ScExportBase();
// Hidden Cols/Rows an den Raendern trimmen,
// return: TRUE wenn Bereich vorhanden
// Start/End/Col/Row muessen gueltige Ausgangswerte sein
- BOOL TrimDataArea( SCTAB nTab, SCCOL& nStartCol,
+ BOOL TrimDataArea( SCTAB nTab, SCCOL& nStartCol,
SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const;
// Ausgabebereich einer Tabelle ermitteln,
// Hidden Cols/Rows an den Raendern beruecksichtigt,
// return: TRUE wenn Bereich vorhanden
- BOOL GetDataArea( SCTAB nTab, SCCOL& nStartCol,
+ BOOL GetDataArea( SCTAB nTab, SCCOL& nStartCol,
SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const;
// Tabelle nicht vorhanden oder leer
- BOOL IsEmptyTable( SCTAB nTab ) const;
+ BOOL IsEmptyTable( SCTAB nTab ) const;
- ScFieldEditEngine& GetEditEngine() const;
+ ScFieldEditEngine& GetEditEngine() const;
};
-#endif // SC_EXPBASE_HXX
+#endif // SC_EXPBASE_HXX
diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx
index 8c204f1cef35..c6c3483c6b7a 100644
--- a/sc/source/filter/inc/fapihelper.hxx
+++ b/sc/source/filter/inc/fapihelper.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxx
index 7ab2aadf1511..0f1c7543e05a 100644
--- a/sc/source/filter/inc/filt_pch.hxx
+++ b/sc/source/filter/inc/filt_pch.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
*
************************************************************************/
-// ItemID-Defines etc. muessen immer ganz vorne stehen
+// ItemID-Defines etc. muessen immer ganz vorne stehen
#include "scitems.hxx"
@@ -34,9 +34,9 @@
#define SC_PROGRESS_CXX
-// ab hier automatisch per makepch generiert
-// folgende duerfen nicht aufgenommen werden:
-// ...
+// ab hier automatisch per makepch generiert
+// folgende duerfen nicht aufgenommen werden:
+// ...
#include <tools/solar.h>
#include <tools/string.hxx>
diff --git a/sc/source/filter/inc/fkttab.h b/sc/source/filter/inc/fkttab.h
index 3d834c5cf04d..a8b1c832aa7c 100644
--- a/sc/source/filter/inc/fkttab.h
+++ b/sc/source/filter/inc/fkttab.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
diff --git a/sc/source/filter/inc/flttypes.hxx b/sc/source/filter/inc/flttypes.hxx
index 0a78889feb8c..e362b1dc0b54 100644
--- a/sc/source/filter/inc/flttypes.hxx
+++ b/sc/source/filter/inc/flttypes.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx
index 6c7d4288c372..53a08ec84d1b 100644
--- a/sc/source/filter/inc/formel.hxx
+++ b/sc/source/filter/inc/formel.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +53,10 @@ struct ScComplexRefData;
enum ConvErr
{
ConvOK = 0,
- ConvErrNi, // nicht implemntierter/unbekannter Opcode aufgetreten
- ConvErrNoMem, // Fehler beim Speicheranfordern
+ ConvErrNi, // nicht implemntierter/unbekannter Opcode aufgetreten
+ ConvErrNoMem, // Fehler beim Speicheranfordern
ConvErrExternal,// Add-Ins aus Excel werden nicht umgesetzt
- ConvErrCount // Nicht alle Bytes der Formel 'erwischt'
+ ConvErrCount // Nicht alle Bytes der Formel 'erwischt'
};
@@ -77,17 +77,17 @@ class _ScRangeList : protected List
private:
protected:
public:
- virtual ~_ScRangeList();
- inline void Append( const ScRange& rRange );
- inline void Append( ScRange* pRange );
- inline void Append( const ScSingleRefData& rSRD );
- inline void Append( const ScComplexRefData& rCRD );
+ virtual ~_ScRangeList();
+ inline void Append( const ScRange& rRange );
+ inline void Append( ScRange* pRange );
+ inline void Append( const ScSingleRefData& rSRD );
+ inline void Append( const ScComplexRefData& rCRD );
using List::Count;
- inline BOOL HasRanges( void ) const;
+ inline BOOL HasRanges( void ) const;
- inline const ScRange* First( void );
- inline const ScRange* Next( void );
+ inline const ScRange* First( void );
+ inline const ScRange* Next( void );
};
@@ -129,7 +129,7 @@ inline void _ScRangeList::Append( const ScSingleRefData& r )
inline void _ScRangeList::Append( const ScComplexRefData& r )
{
- List::Insert( new ScRange( r.Ref1.nCol, r.Ref1.nRow, r.Ref1.nTab,
+ List::Insert( new ScRange( r.Ref1.nCol, r.Ref1.nRow, r.Ref1.nTab,
r.Ref2.nCol, r.Ref2.nRow, r.Ref2.nTab ),
LIST_APPEND );
}
@@ -143,23 +143,23 @@ class _ScRangeListTabs
{
private:
protected:
- BOOL bHasRanges;
- _ScRangeList** ppTabLists;
- _ScRangeList* pAct;
- UINT16 nAct;
+ BOOL bHasRanges;
+ _ScRangeList** ppTabLists;
+ _ScRangeList* pAct;
+ UINT16 nAct;
public:
_ScRangeListTabs( void );
- virtual ~_ScRangeListTabs();
+ virtual ~_ScRangeListTabs();
- void Append( ScSingleRefData aSRD, const BOOL bLimit = TRUE );
- void Append( ScComplexRefData aCRD, const BOOL bLimit = TRUE );
+ void Append( ScSingleRefData aSRD, const BOOL bLimit = TRUE );
+ void Append( ScComplexRefData aCRD, const BOOL bLimit = TRUE );
- inline BOOL HasRanges( void ) const;
+ inline BOOL HasRanges( void ) const;
- const ScRange* First( const UINT16 nTab = 0 );
- const ScRange* Next( void );
-// const ScRange* NextContinue( void );
- inline const _ScRangeList* GetActList( void ) const;
+ const ScRange* First( const UINT16 nTab = 0 );
+ const ScRange* Next( void );
+// const ScRange* NextContinue( void );
+ inline const _ScRangeList* GetActList( void ) const;
};
@@ -180,23 +180,23 @@ inline const _ScRangeList* _ScRangeListTabs::GetActList( void ) const
class ConverterBase
{
protected:
- TokenPool aPool; // User Token + Predefined Token
- TokenStack aStack;
+ TokenPool aPool; // User Token + Predefined Token
+ TokenStack aStack;
ScAddress aEingPos;
ConvErr eStatus;
- sal_Char* pBuffer; // Universal-Puffer
- UINT16 nBufferSize; // ...und seine Groesse
+ sal_Char* pBuffer; // Universal-Puffer
+ UINT16 nBufferSize; // ...und seine Groesse
ConverterBase( UINT16 nNewBuffer );
- virtual ~ConverterBase();
+ virtual ~ConverterBase();
- void Reset();
+ void Reset();
public:
- inline SCCOL GetEingabeCol( void ) const { return aEingPos.Col(); }
- inline SCROW GetEingabeRow( void ) const { return aEingPos.Row(); }
- inline SCTAB GetEingabeTab( void ) const { return aEingPos.Tab(); }
- inline ScAddress GetEingPos( void ) const { return aEingPos; }
+ inline SCCOL GetEingabeCol( void ) const { return aEingPos.Col(); }
+ inline SCROW GetEingabeRow( void ) const { return aEingPos.Row(); }
+ inline SCTAB GetEingabeTab( void ) const { return aEingPos.Tab(); }
+ inline ScAddress GetEingPos( void ) const { return aEingPos; }
};
@@ -205,10 +205,10 @@ class ExcelConverterBase : public ConverterBase
{
protected:
ExcelConverterBase( UINT16 nNewBuffer );
- virtual ~ExcelConverterBase();
+ virtual ~ExcelConverterBase();
public:
- void Reset();
+ void Reset();
void Reset( const ScAddress& rEingPos );
virtual ConvErr Convert( const ScTokenArray*& rpErg, XclImpStream& rStrm, sal_Size nFormulaLen,
@@ -222,26 +222,26 @@ public:
class LotusConverterBase : public ConverterBase
{
protected:
- SvStream& aIn;
- INT32 nBytesLeft;
-
- inline void Ignore( const long nSeekRel );
- inline void Read( sal_Char& nByte );
- inline void Read( BYTE& nByte );
- inline void Read( UINT16& nUINT16 );
- inline void Read( INT16& nINT16 );
- inline void Read( double& fDouble );
+ SvStream& aIn;
+ INT32 nBytesLeft;
+
+ inline void Ignore( const long nSeekRel );
+ inline void Read( sal_Char& nByte );
+ inline void Read( BYTE& nByte );
+ inline void Read( UINT16& nUINT16 );
+ inline void Read( INT16& nINT16 );
+ inline void Read( double& fDouble );
inline void Read( UINT32& nUINT32 );
LotusConverterBase( SvStream& rStr, UINT16 nNewBuffer );
- virtual ~LotusConverterBase();
+ virtual ~LotusConverterBase();
public:
//UNUSED2008-05 void Reset( INT32 nLen );
//UNUSED2008-05 void Reset( INT32 nLen, const ScAddress& rEingPos );
void Reset( const ScAddress& rEingPos );
- virtual ConvErr Convert( const ScTokenArray*& rpErg, INT32& nRest,
+ virtual ConvErr Convert( const ScTokenArray*& rpErg, INT32& nRest,
const FORMULA_TYPE eFT = FT_CellFormula ) = 0;
protected:
diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx
index f399d7ea5064..56f0182f9333 100644
--- a/sc/source/filter/inc/fprogressbar.hxx
+++ b/sc/source/filter/inc/fprogressbar.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index c17aaa70445c..57050bbb0315 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -509,16 +509,16 @@ class ScFormatFilterPluginImpl : public ScFormatFilterPlugin {
virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, CharSet eSrc = RTL_TEXTENCODING_DONTKNOW );
virtual FltError ScImportQuattroPro( SfxMedium &rMedium, ScDocument *pDoc );
virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT );
- // 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* );
virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos,
const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, UINT32 nDifOption = SC_DIFOPT_EXCEL );
virtual FltError ScImportRTF( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange );
- virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange,
- double nOutputFactor = 1.0, BOOL bCalcWidthHeight = TRUE,
+ virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange,
+ double nOutputFactor = 1.0, BOOL bCalcWidthHeight = TRUE,
SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true );
virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange );
diff --git a/sc/source/filter/inc/funktion.h b/sc/source/filter/inc/funktion.h
index ef8ecabc256a..d04286335a4d 100644
--- a/sc/source/filter/inc/funktion.h
+++ b/sc/source/filter/inc/funktion.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
@@ -29,21 +29,21 @@
#define SC_FUNKTION_H
// Bearbeitungsfunktionen
-void P0( void ); // 0 Parameter
-void P1( void ); // 1 Parameter
-void P2( void ); // 2 Parameter
-void P3( void ); // 3 Parameter
-void P4( void ); // 4 Parameter
-void P5( void ); // 5 Parameter
-void Pn( void ); // n Parameter
-void NI( void ); // nicht implementiert
-void ConstFloat( void ); // 0
-void Variable( void ); // 1
-void LotusRange( void ); // 2
-void FormulaReturn( void ); // 3
-void Klammer( void ); // 4
-void ConstInt( void ); // 5
-void ConstString( void ); // 6
+void P0( void ); // 0 Parameter
+void P1( void ); // 1 Parameter
+void P2( void ); // 2 Parameter
+void P3( void ); // 3 Parameter
+void P4( void ); // 4 Parameter
+void P5( void ); // 5 Parameter
+void Pn( void ); // n Parameter
+void NI( void ); // nicht implementiert
+void ConstFloat( void ); // 0
+void Variable( void ); // 1
+void LotusRange( void ); // 2
+void FormulaReturn( void ); // 3
+void Klammer( void ); // 4
+void ConstInt( void ); // 5
+void ConstString( void ); // 6
// ACHTUNG: unbekannte Funktionen -> P0()
#endif
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index 4cdf71b8610d..444ce48ef4aa 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ class ScEditCell;
class SvxBorderLine;
struct ScHTMLStyle
-{ // Defaults aus StyleSheet
- Color aBackgroundColor;
- String aFontFamilyName;
- UINT32 nFontHeight; // Item-Value
+{ // Defaults aus StyleSheet
+ Color aBackgroundColor;
+ String aFontFamilyName;
+ UINT32 nFontHeight; // Item-Value
USHORT nFontSizeNumber; // HTML value 1-7
BYTE nDefaultScriptType; // Font values are valid for the default script type
BOOL bInitialized;
@@ -61,9 +61,9 @@ struct ScHTMLStyle
const ScHTMLStyle& operator=( const ScHTMLStyle& r )
{
- aBackgroundColor = r.aBackgroundColor;
- aFontFamilyName = r.aFontFamilyName;
- nFontHeight = r.nFontHeight;
+ aBackgroundColor = r.aBackgroundColor;
+ aFontFamilyName = r.aFontFamilyName;
+ nFontHeight = r.nFontHeight;
nFontSizeNumber = r.nFontSizeNumber;
nDefaultScriptType = r.nDefaultScriptType;
bInitialized = r.bInitialized;
@@ -73,15 +73,15 @@ struct ScHTMLStyle
struct ScHTMLGraphEntry
{
- ScRange aRange; // ueberlagerter Zellbereich
- Size aSize; // Groesse in Pixeln
- Size aSpace; // Spacing in Pixeln
- SdrObject* pObject;
- BOOL bInCell; // ob in Zelle ausgegeben wird
- BOOL bWritten;
+ ScRange aRange; // ueberlagerter Zellbereich
+ Size aSize; // Groesse in Pixeln
+ Size aSpace; // Spacing in Pixeln
+ SdrObject* pObject;
+ BOOL bInCell; // ob in Zelle ausgegeben wird
+ BOOL bWritten;
ScHTMLGraphEntry( SdrObject* pObj, const ScRange& rRange,
- const Size& rSize, BOOL bIn, const Size& rSpace ) :
+ const Size& rSize, BOOL bIn, const Size& rSpace ) :
aRange( rRange ), aSize( rSize ), aSpace( rSpace ),
pObject( pObj ), bInCell( bIn ), bWritten( FALSE ) {}
};
@@ -94,77 +94,77 @@ const short nIndentMax = 23;
class ScHTMLExport : public ScExportBase
{
// default HtmlFontSz[1-7]
- static const USHORT nDefaultFontSize[SC_HTML_FONTSIZES];
+ static const USHORT nDefaultFontSize[SC_HTML_FONTSIZES];
// HtmlFontSz[1-7] in s*3.ini [user]
- static USHORT nFontSize[SC_HTML_FONTSIZES];
- static const char* pFontSizeCss[SC_HTML_FONTSIZES];
- static const USHORT nCellSpacing;
+ static USHORT nFontSize[SC_HTML_FONTSIZES];
+ static const char* pFontSizeCss[SC_HTML_FONTSIZES];
+ static const USHORT nCellSpacing;
static const sal_Char __FAR_DATA sIndentSource[];
- ScHTMLGraphList aGraphList;
- ScHTMLStyle aHTMLStyle;
+ ScHTMLGraphList aGraphList;
+ ScHTMLStyle aHTMLStyle;
String aBaseURL;
- String aStreamPath;
- String aCId; // Content-Id fuer Mail-Export
- OutputDevice* pAppWin; // fuer Pixelei
- SvStringsSortDtor* pSrcArr; // fuer CopyLocalFileToINet
- SvStringsSortDtor* pDestArr;
+ String aStreamPath;
+ String aCId; // Content-Id fuer Mail-Export
+ OutputDevice* pAppWin; // fuer Pixelei
+ SvStringsSortDtor* pSrcArr; // fuer CopyLocalFileToINet
+ SvStringsSortDtor* pDestArr;
String aNonConvertibleChars; // collect nonconvertible characters
- rtl_TextEncoding eDestEnc;
- SCTAB nUsedTables;
- short nIndent;
- sal_Char sIndent[nIndentMax+1];
- BOOL bAll; // ganzes Dokument
- BOOL bTabHasGraphics;
- BOOL bTabAlignedLeft;
- BOOL bCalcAsShown;
- BOOL bCopyLocalFileToINet;
+ rtl_TextEncoding eDestEnc;
+ SCTAB nUsedTables;
+ short nIndent;
+ sal_Char sIndent[nIndentMax+1];
+ BOOL bAll; // ganzes Dokument
+ BOOL bTabHasGraphics;
+ BOOL bTabAlignedLeft;
+ BOOL bCalcAsShown;
+ BOOL bCopyLocalFileToINet;
BOOL bTableDataWidth;
BOOL bTableDataHeight;
- const SfxItemSet& PageDefaults( SCTAB nTab );
+ const SfxItemSet& PageDefaults( SCTAB nTab );
void WriteBody();
- void WriteHeader();
- void WriteOverview();
- void WriteTables();
- void WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab );
- void WriteGraphEntry( ScHTMLGraphEntry* );
+ void WriteHeader();
+ void WriteOverview();
+ void WriteTables();
+ void WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab );
+ void WriteGraphEntry( ScHTMLGraphEntry* );
void WriteImage( String& rLinkName,
const Graphic&, const ByteString& rImgOptions,
ULONG nXOutFlags = 0 );
// nXOutFlags fuer XOutBitmap::WriteGraphic
// write to stream if and only if URL fields in edit cell
- BOOL WriteFieldText( const ScEditCell* pCell );
+ BOOL WriteFieldText( const ScEditCell* pCell );
// kopiere ggfs. eine lokale Datei ins Internet
- BOOL CopyLocalFileToINet( String& rFileNm,
+ BOOL CopyLocalFileToINet( String& rFileNm,
const String& rTargetNm, BOOL bFileToFile = FALSE );
- BOOL HasCId() { return aCId.Len() > 0; }
- void MakeCIdURL( String& rURL );
+ BOOL HasCId() { return aCId.Len() > 0; }
+ void MakeCIdURL( String& rURL );
- void PrepareGraphics( ScDrawLayer*, SCTAB nTab,
+ void PrepareGraphics( ScDrawLayer*, SCTAB nTab,
SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow );
- void FillGraphList( const SdrPage*, SCTAB nTab,
+ void FillGraphList( const SdrPage*, SCTAB nTab,
SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow );
- void BorderToStyle( ByteString& rOut, const char* pBorderName,
+ void BorderToStyle( ByteString& rOut, const char* pBorderName,
const SvxBorderLine* pLine, bool& bInsertSemicolon );
- USHORT GetFontSizeNumber( USHORT nHeight );
- const char* GetFontSizeCss( USHORT nHeight );
- USHORT ToPixel( USHORT nTwips );
- Size MMToPixel( const Size& r100thMMSize );
- void IncIndent( short nVal );
- const sal_Char* GetIndentStr() { return sIndent; }
+ USHORT GetFontSizeNumber( USHORT nHeight );
+ const char* GetFontSizeCss( USHORT nHeight );
+ USHORT ToPixel( USHORT nTwips );
+ Size MMToPixel( const Size& r100thMMSize );
+ void IncIndent( short nVal );
+ const sal_Char* GetIndentStr() { return sIndent; }
public:
ScHTMLExport( SvStream&, const String&, ScDocument*, const ScRange&,
BOOL bAll, const String& aStreamPath );
- virtual ~ScHTMLExport();
+ virtual ~ScHTMLExport();
ULONG Write();
const String& GetNonConvertibleChars() const
{ return aNonConvertibleChars; }
diff --git a/sc/source/filter/inc/htmlimp.hxx b/sc/source/filter/inc/htmlimp.hxx
index 0376b3cd72f5..9625fff3d2bc 100644
--- a/sc/source/filter/inc/htmlimp.hxx
+++ b/sc/source/filter/inc/htmlimp.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,17 +35,17 @@ class ScHTMLParser;
class ScHTMLImport : public ScEEImport
{
private:
- static void InsertRangeName( ScDocument* pDoc, const String& rName, const ScRange& rRange );
+ static void InsertRangeName( ScDocument* pDoc, const String& rName, const ScRange& rRange );
public:
ScHTMLImport( ScDocument* pDoc, const String& rBaseURL, const ScRange& rRange, BOOL bCalcWidthHeight = TRUE );
virtual ~ScHTMLImport();
const ScHTMLParser* GetParser() const { return (ScHTMLParser*)mpParser; }
- 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 );
- static String GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrigName );
+ static String GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrigName );
};
diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx
index f053a1088ff1..20e84eedb806 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ public:
explicit ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc );
virtual ~ScHTMLParser();
- virtual ULONG Read( SvStream& rStrm, const String& rBaseURL ) = 0;
+ virtual ULONG Read( SvStream& rStrm, const String& rBaseURL ) = 0;
/** Returns the "global table" which contains the entire HTML document. */
virtual const ScHTMLTable* GetGlobalTable() const = 0;
@@ -74,19 +74,19 @@ SV_DECL_VARARR_SORT( ScHTMLColOffset, ULONG, 16, 4)
struct ScHTMLTableStackEntry
{
- ScRangeListRef xLockedList;
- ScEEParseEntry* pCellEntry;
- ScHTMLColOffset* pLocalColOffset;
- ULONG nFirstTableCell;
- SCCOL nColCnt;
- SCROW nRowCnt;
- SCCOL nColCntStart;
- SCCOL nMaxCol;
- USHORT nTable;
- USHORT nTableWidth;
- USHORT nColOffset;
- USHORT nColOffsetStart;
- BOOL bFirstRow;
+ ScRangeListRef xLockedList;
+ ScEEParseEntry* pCellEntry;
+ ScHTMLColOffset* pLocalColOffset;
+ ULONG nFirstTableCell;
+ SCCOL nColCnt;
+ SCROW nRowCnt;
+ SCCOL nColCntStart;
+ SCCOL nMaxCol;
+ USHORT nTable;
+ USHORT nTableWidth;
+ USHORT nColOffset;
+ USHORT nColOffsetStart;
+ BOOL bFirstRow;
ScHTMLTableStackEntry( ScEEParseEntry* pE,
const ScRangeListRef& rL, ScHTMLColOffset* pTO,
ULONG nFTC,
@@ -109,9 +109,9 @@ DECLARE_STACK( ScHTMLTableStack, ScHTMLTableStackEntry* )
struct ScHTMLAdjustStackEntry
{
- SCCOL nLastCol;
- SCROW nNextRow;
- SCROW nCurRow;
+ SCCOL nLastCol;
+ SCROW nNextRow;
+ SCROW nCurRow;
ScHTMLAdjustStackEntry( SCCOL nLCol, SCROW nNRow,
SCROW nCRow )
: nLastCol( nLCol ), nNextRow( nNRow ),
@@ -132,65 +132,65 @@ class ScHTMLLayoutParser : public ScHTMLParser
private:
Size aPageSize;
String aBaseURL;
- ScHTMLTableStack aTableStack;
- String aString;
- ScRangeListRef xLockedList; // je Table
- Table* pTables;
- ScHTMLColOffset* pColOffset;
- ScHTMLColOffset* pLocalColOffset; // je Table
- ULONG nFirstTableCell; // je Table
- short nTableLevel;
- USHORT nTable;
- USHORT nMaxTable;
- SCCOL nColCntStart; // erste Col je Table
- SCCOL nMaxCol; // je Table
- USHORT nTableWidth; // je Table
- USHORT nColOffset; // aktuell, Pixel
- USHORT nColOffsetStart; // Startwert je Table, in Pixel
- USHORT nMetaCnt; // fuer ParseMetaOptions
+ ScHTMLTableStack aTableStack;
+ String aString;
+ ScRangeListRef xLockedList; // je Table
+ Table* pTables;
+ ScHTMLColOffset* pColOffset;
+ ScHTMLColOffset* pLocalColOffset; // je Table
+ ULONG nFirstTableCell; // je Table
+ short nTableLevel;
+ USHORT nTable;
+ USHORT nMaxTable;
+ SCCOL nColCntStart; // erste Col je Table
+ SCCOL nMaxCol; // je Table
+ USHORT nTableWidth; // je Table
+ USHORT nColOffset; // aktuell, Pixel
+ USHORT nColOffsetStart; // Startwert je Table, in Pixel
+ USHORT nMetaCnt; // fuer ParseMetaOptions
USHORT nOffsetTolerance; // for use with SeekOffset and related
- BOOL bCalcWidthHeight; // TRUE: calculate real column width
+ BOOL bCalcWidthHeight; // TRUE: calculate real column width
// FALSE: 1 html-col = 1 sc-col
- BOOL bTabInTabCell;
- BOOL bFirstRow; // je Table, ob in erster Zeile
- BOOL bInCell;
- BOOL bInTitle;
+ BOOL bTabInTabCell;
+ BOOL bFirstRow; // je Table, ob in erster Zeile
+ BOOL bInCell;
+ BOOL bInTitle;
DECL_LINK( HTMLImportHdl, ImportInfo* );
- void NewActEntry( ScEEParseEntry* );
- void EntryEnd( ScEEParseEntry*, const ESelection& );
- void ProcToken( ImportInfo* );
- void CloseEntry( ImportInfo* );
- void NextRow( ImportInfo* );
- void SkipLocked( ScEEParseEntry*, BOOL bJoin = TRUE );
- static BOOL SeekOffset( ScHTMLColOffset*, USHORT nOffset,
+ void NewActEntry( ScEEParseEntry* );
+ void EntryEnd( ScEEParseEntry*, const ESelection& );
+ void ProcToken( ImportInfo* );
+ void CloseEntry( ImportInfo* );
+ void NextRow( ImportInfo* );
+ void SkipLocked( ScEEParseEntry*, BOOL bJoin = TRUE );
+ static BOOL SeekOffset( ScHTMLColOffset*, USHORT nOffset,
SCCOL* pCol, USHORT nOffsetTol );
- static void MakeCol( ScHTMLColOffset*, USHORT& nOffset,
+ static void MakeCol( ScHTMLColOffset*, USHORT& nOffset,
USHORT& nWidth, USHORT nOffsetTol,
USHORT nWidthTol );
- static void MakeColNoRef( ScHTMLColOffset*, USHORT nOffset,
+ static void MakeColNoRef( ScHTMLColOffset*, USHORT nOffset,
USHORT nWidth, USHORT nOffsetTol,
USHORT nWidthTol );
- static void ModifyOffset( ScHTMLColOffset*, USHORT& nOldOffset,
+ static void ModifyOffset( ScHTMLColOffset*, USHORT& nOldOffset,
USHORT& nNewOffset, USHORT nOffsetTol );
- void Colonize( ScEEParseEntry* );
- USHORT GetWidth( ScEEParseEntry* );
- void SetWidths();
- void Adjust();
+ void Colonize( ScEEParseEntry* );
+ USHORT GetWidth( ScEEParseEntry* );
+ void SetWidths();
+ void Adjust();
- USHORT GetWidthPixel( const HTMLOption* );
- BOOL IsAtBeginningOfText( ImportInfo* );
+ USHORT GetWidthPixel( const HTMLOption* );
+ BOOL IsAtBeginningOfText( ImportInfo* );
- void TableOn( ImportInfo* );
+ void TableOn( ImportInfo* );
void ColOn( ImportInfo* );
void TableRowOn( ImportInfo* );
void TableRowOff( ImportInfo* );
- void TableDataOn( ImportInfo* );
+ void TableDataOn( ImportInfo* );
void TableDataOff( ImportInfo* );
- void TableOff( ImportInfo* );
+ void TableOff( ImportInfo* );
void Image( ImportInfo* );
- void AnchorOn( ImportInfo* );
- void FontOn( ImportInfo* );
+ void AnchorOn( ImportInfo* );
+ void FontOn( ImportInfo* );
public:
ScHTMLLayoutParser( EditEngine*, const String& rBaseURL, const Size& aPageSize, ScDocument* );
diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx
index 2df58173a63a..3775d4ea0abc 100644
--- a/sc/source/filter/inc/imp_op.hxx
+++ b/sc/source/filter/inc/imp_op.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +55,14 @@ class ExcelToSc;
class ImportTyp
{
protected:
- CharSet eQuellChar; // Quell-Zeichensatz
- ScDocument* pD; // Dokument
+ CharSet eQuellChar; // Quell-Zeichensatz
+ ScDocument* pD; // Dokument
public:
ImportTyp( ScDocument*, CharSet eSrc );
- virtual ~ImportTyp();
+ virtual ~ImportTyp();
- virtual FltError Read( void );
+ virtual FltError Read( void );
};
class XclImpOutlineDataBuffer : protected XclImpRoot
@@ -89,7 +89,7 @@ private:
class ImportExcel : public ImportTyp, protected XclImpRoot
{
protected:
- static const double fExcToTwips; // Umrechnung 1/256 Zeichen -> Twips
+ static const double fExcToTwips; // Umrechnung 1/256 Zeichen -> Twips
RootData* pExcRoot;
@@ -100,7 +100,7 @@ protected:
ScRange maScOleSize; /// Visible range if embedded.
NameBuffer* pExtNameBuff; // ... externe Namen (Ind.-Basis=1)
- ExcelToSc* pFormConv; // Formel-Konverter
+ ExcelToSc* pFormConv; // Formel-Konverter
XclImpOutlineBuffer* pColOutlineBuff;
XclImpOutlineBuffer* pRowOutlineBuff;
@@ -110,13 +110,13 @@ protected:
XclImpOutlineListBuffer* pOutlineListBuffer;
sal_Int16 mnLastRefIdx;
- UINT16 nIxfeIndex; // merkt sich Angabe im IXFE-Record
- UINT16 nLastXF; // letzter XF in Formula-Record
- SCTAB nBdshtTab; // Counter fuer Boundsheet
- ScFormulaCell* pLastFormCell; // fuer String-Records
+ UINT16 nIxfeIndex; // merkt sich Angabe im IXFE-Record
+ UINT16 nLastXF; // letzter XF in Formula-Record
+ SCTAB nBdshtTab; // Counter fuer Boundsheet
+ ScFormulaCell* pLastFormCell; // fuer String-Records
- BOOL bTabTruncated; // wenn Bereichsueberschreitung zum
- // Abschneiden von Zellen fuehrt
+ BOOL bTabTruncated; // wenn Bereichsueberschreitung zum
+ // Abschneiden von Zellen fuehrt
// Record-Funktionen
void ReadFileSharing();
@@ -132,62 +132,62 @@ protected:
void ReadRk();
void Window1();
- void Formula25( void ); // 0x06 -> excform.cxx
- void Row25( void ); // 0x08
- void Bof2( void ); // 0x09
- void Eof( void ); // 0x0A
- void DocProtect( void ); // 0x12
+ void Formula25( void ); // 0x06 -> excform.cxx
+ void Row25( void ); // 0x08
+ void Bof2( void ); // 0x09
+ void Eof( void ); // 0x0A
+ void DocProtect( void ); // 0x12
void SheetProtect( void ); // 0x12 Sheet Protection
void DocPasssword( void ); // 0x13 document password
void SheetPassword( void ); // 0x13 sheet password
- void Externsheet( void ); // 0x17
+ void Externsheet( void ); // 0x17
void WinProtection( void ); // 0x19
- void Columndefault( void ); // 0x20
- void Array25( void ); // 0x21
- void Rec1904( void ); // 0x22
- void Externname25( void ); // 0x23
- void Colwidth( void ); // 0x24
- void Defrowheight2( void ); // 0x25
-// void Window1( void ); // 0x3D
- void Codepage( void ); // 0x42
- void Ixfe( void ); // 0x44
- void DefColWidth( void ); // 0x55
- void Builtinfmtcnt( void ); // 0x56
- void Colinfo( void ); // 0x7D
- void Wsbool( void ); // 0x81
- void Boundsheet( void ); // 0x85
- void Country( void ); // 0x8C
- void Hideobj( void ); // 0x8D
- void Bundleheader( void ); // 0x8F
- void Standardwidth( void ); // 0x99
- void Shrfmla( void ); // 0xBC
- void Mulrk( void ); // 0xBD
- void Mulblank( void ); // 0xBE
- void Rstring( void ); // 0xD6
+ void Columndefault( void ); // 0x20
+ void Array25( void ); // 0x21
+ void Rec1904( void ); // 0x22
+ void Externname25( void ); // 0x23
+ void Colwidth( void ); // 0x24
+ void Defrowheight2( void ); // 0x25
+// void Window1( void ); // 0x3D
+ void Codepage( void ); // 0x42
+ void Ixfe( void ); // 0x44
+ void DefColWidth( void ); // 0x55
+ void Builtinfmtcnt( void ); // 0x56
+ void Colinfo( void ); // 0x7D
+ void Wsbool( void ); // 0x81
+ void Boundsheet( void ); // 0x85
+ void Country( void ); // 0x8C
+ void Hideobj( void ); // 0x8D
+ void Bundleheader( void ); // 0x8F
+ void Standardwidth( void ); // 0x99
+ void Shrfmla( void ); // 0xBC
+ void Mulrk( void ); // 0xBD
+ void Mulblank( void ); // 0xBE
+ void Rstring( void ); // 0xD6
void Cellmerging( void ); // 0xE5
void Olesize( void ); // 0xDE
void ReadUsesElfs(); // 0x0160
- void Formula3( void ); // 0x0206 -> excform.cxx
+ void Formula3( void ); // 0x0206 -> excform.cxx
// 0x0207 -> 0x07
- void Row34( void ); // 0x0208
- void Bof3( void ); // 0x0209
- void Array34( void ); // 0x0221
- void Externname34( void ); // 0x0223
- void Defrowheight345( void ); // 0x0225
- void TableOp( void ); // 0x0236
- //void Rk( void ); // 0x027E -> 0x7E
- void Formula4( void ); // 0x0406 -> excform.cxx
- void Bof4( void ); // 0x0409
- void Bof5( void ); // 0x0809
+ void Row34( void ); // 0x0208
+ void Bof3( void ); // 0x0209
+ void Array34( void ); // 0x0221
+ void Externname34( void ); // 0x0223
+ void Defrowheight345( void ); // 0x0225
+ void TableOp( void ); // 0x0236
+ //void Rk( void ); // 0x027E -> 0x7E
+ void Formula4( void ); // 0x0406 -> excform.cxx
+ void Bof4( void ); // 0x0409
+ void Bof5( void ); // 0x0809
// ---------------------------------------------------------------
void Formula( const XclAddress& rXclPos,
UINT16 nXF, UINT16 nFormLen, double &rCurVal, BOOL bShrFmla );
- // -> excform.cxx
+ // -> excform.cxx
virtual void EndSheet( void );
- void NeueTabelle( void );
- const ScTokenArray* ErrorToFormula( BYTE bErrOrVal, BYTE nError,
+ void NeueTabelle( void );
+ const ScTokenArray* ErrorToFormula( BYTE bErrOrVal, BYTE nError,
double& rVal );
virtual void AdjustRowHeight();
@@ -196,9 +196,9 @@ protected:
public:
ImportExcel( XclImpRootData& rImpData, SvStream& rStrm );
- virtual ~ImportExcel( void );
+ virtual ~ImportExcel( void );
- virtual FltError Read( void );
+ virtual FltError Read( void );
};
#endif
diff --git a/sc/source/filter/inc/lotattr.hxx b/sc/source/filter/inc/lotattr.hxx
index 7015136f1be1..302decc30b47 100644
--- a/sc/source/filter/inc/lotattr.hxx
+++ b/sc/source/filter/inc/lotattr.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +46,13 @@ class LotAttrTable;
struct LotAttrWK3
{
- UINT8 nFont;
- UINT8 nLineStyle;
- UINT8 nFontCol;
- UINT8 nBack;
+ UINT8 nFont;
+ UINT8 nLineStyle;
+ UINT8 nFontCol;
+ UINT8 nBack;
- inline BOOL HasStyles( void );
- inline BOOL IsCentered( void );
+ inline BOOL HasStyles( void );
+ inline BOOL IsCentered( void );
};
@@ -76,41 +76,41 @@ private:
struct ENTRY
{
- ScPatternAttr* pPattAttr;
- UINT32 nHash0;
+ ScPatternAttr* pPattAttr;
+ UINT32 nHash0;
- inline ENTRY( const ScPatternAttr& r ) { pPattAttr = new ScPatternAttr( r ); }
+ inline ENTRY( const ScPatternAttr& r ) { pPattAttr = new ScPatternAttr( r ); }
- inline ENTRY( ScPatternAttr* p ) { pPattAttr = p; }
+ inline ENTRY( ScPatternAttr* p ) { pPattAttr = p; }
- inline ~ENTRY() { delete pPattAttr; }
+ inline ~ENTRY() { delete pPattAttr; }
- inline BOOL operator ==( const ENTRY& r ) const { return nHash0 == r.nHash0; }
+ inline BOOL operator ==( const ENTRY& r ) const { return nHash0 == r.nHash0; }
- inline BOOL operator ==( const UINT32& r ) const { return nHash0 == r; }
+ inline BOOL operator ==( const UINT32& r ) const { return nHash0 == r; }
};
- ScDocumentPool* pDocPool;
- SvxColorItem* ppColorItems[ 6 ]; // 0 und 7 fehlen!
- SvxColorItem* pBlack;
- SvxColorItem* pWhite;
- Color* pColTab;
+ ScDocumentPool* pDocPool;
+ SvxColorItem* ppColorItems[ 6 ]; // 0 und 7 fehlen!
+ SvxColorItem* pBlack;
+ SvxColorItem* pWhite;
+ Color* pColTab;
- inline static void MakeHash( const LotAttrWK3& rAttr, UINT32& rOut )
+ inline static void MakeHash( const LotAttrWK3& rAttr, UINT32& rOut )
{
( ( UINT8* ) &rOut )[ 0 ] = rAttr.nFont & 0x7F;
( ( UINT8* ) &rOut )[ 1 ] = rAttr.nLineStyle;
( ( UINT8* ) &rOut )[ 2 ] = rAttr.nFontCol;
( ( UINT8* ) &rOut )[ 3 ] = rAttr.nBack;
}
- static void LotusToScBorderLine( UINT8 nLine, SvxBorderLine& );
- const SvxColorItem& GetColorItem( const UINT8 nLotIndex ) const;
- const Color& GetColor( const UINT8 nLotIndex ) const;
+ static void LotusToScBorderLine( UINT8 nLine, SvxBorderLine& );
+ const SvxColorItem& GetColorItem( const UINT8 nLotIndex ) const;
+ const Color& GetColor( const UINT8 nLotIndex ) const;
public:
LotAttrCache( void );
~LotAttrCache();
- const ScPatternAttr& GetPattAttr( const LotAttrWK3& );
+ const ScPatternAttr& GetPattAttr( const LotAttrWK3& );
};
@@ -119,30 +119,30 @@ class LotAttrCol : private List
private:
struct ENTRY
{
- const ScPatternAttr* pPattAttr;
- SCROW nFirstRow;
- SCROW nLastRow;
+ const ScPatternAttr* pPattAttr;
+ SCROW nFirstRow;
+ SCROW nLastRow;
};
public:
~LotAttrCol( void );
- void SetAttr( const SCROW nRow, const ScPatternAttr& );
- void Apply( const SCCOL nCol, const SCTAB nTab, const BOOL bClear = TRUE );
- void Clear( void );
+ void SetAttr( const SCROW nRow, const ScPatternAttr& );
+ void Apply( const SCCOL nCol, const SCTAB nTab, const BOOL bClear = TRUE );
+ void Clear( void );
};
class LotAttrTable
{
private:
- LotAttrCol pCols[ MAXCOLCOUNT ];
- LotAttrCache aAttrCache;
+ LotAttrCol pCols[ MAXCOLCOUNT ];
+ LotAttrCache aAttrCache;
public:
LotAttrTable( void );
~LotAttrTable();
- void SetAttr( const SCCOL nColFirst, const SCCOL nColLast, const SCROW nRow, const LotAttrWK3& );
- void Apply( const SCTAB nTabNum );
+ void SetAttr( const SCCOL nColFirst, const SCCOL nColLast, const SCROW nRow, const LotAttrWK3& );
+ void Apply( const SCTAB nTabNum );
};
diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx
index 5c8771814206..8f9bd35724f2 100644
--- a/sc/source/filter/inc/lotfntbf.hxx
+++ b/sc/source/filter/inc/lotfntbf.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +44,12 @@ class LotusFontBuffer
private:
struct ENTRY
{
- String* pTmpName;
- SvxFontItem* pFont;
- SvxFontHeightItem* pHeight;
- SvxColorItem* pColor;
- INT32 nType; // < 0 -> undefiniert
- inline ENTRY( void )
+ String* pTmpName;
+ SvxFontItem* pFont;
+ SvxFontHeightItem* pHeight;
+ SvxColorItem* pColor;
+ INT32 nType; // < 0 -> undefiniert
+ inline ENTRY( void )
{
pTmpName = NULL;
pFont = NULL;
@@ -57,7 +57,7 @@ private:
pColor = NULL;
nType = -1;
}
- inline ~ENTRY()
+ inline ~ENTRY()
{
if( pTmpName )
delete pTmpName;
@@ -68,42 +68,42 @@ private:
if( pColor )
delete pColor;
}
- inline void TmpName( const String &rNew )
+ inline void TmpName( const String &rNew )
{
if( pTmpName )
*pTmpName = rNew;
else
pTmpName = new String( rNew );
}
- inline void Font( SvxFontItem& rNew )
+ inline void Font( SvxFontItem& rNew )
{
if( pFont )
delete pFont;
pFont = &rNew;
}
- inline void Height( SvxFontHeightItem& rNew )
+ inline void Height( SvxFontHeightItem& rNew )
{
if( pHeight )
delete pHeight;
pHeight = &rNew;
}
- inline void Color( SvxColorItem& rNew )
+ inline void Color( SvxColorItem& rNew )
{
if( pColor )
delete pColor;
pColor = &rNew;
}
- inline void Type( const UINT16 nNew ) { nType = nNew; }
+ inline void Type( const UINT16 nNew ) { nType = nNew; }
};
- ENTRY pData[ 8 ];
- const static UINT16 nSize;
- void MakeFont( ENTRY* pEntry );
+ ENTRY pData[ 8 ];
+ const static UINT16 nSize;
+ void MakeFont( ENTRY* pEntry );
public:
- void Fill( const UINT8 nIndex, SfxItemSet& rItemSet );
- void SetName( const UINT16 nIndex, const String& rName );
- void SetHeight( const UINT16 nIndex, const UINT16 nHeight );
- void SetType( const UINT16 nIndex, const UINT16 nType );
+ void Fill( const UINT8 nIndex, SfxItemSet& rItemSet );
+ void SetName( const UINT16 nIndex, const String& rName );
+ void SetHeight( const UINT16 nIndex, const UINT16 nHeight );
+ void SetType( const UINT16 nIndex, const UINT16 nType );
};
diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx
index 0a341e29ae51..198fe0a3f7ac 100644
--- a/sc/source/filter/inc/lotform.hxx
+++ b/sc/source/filter/inc/lotform.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,34 +36,34 @@
enum FUNC_TYPE
{
- FT_Return = 0, // End Formula
- FT_FuncFix0, // Funktion, 0 Parameter
- FT_FuncFix1, // Funktion, 0 Parameter
- FT_FuncFix2, // Funktion, 0 Parameter
- FT_FuncFix3, // Funktion, 0 Parameter
- FT_FuncFix4, // Funktion, 0 Parameter
- FT_FuncVar, // ~, var. P.
- FT_Neg, // Negierung
- FT_Op, // Operator
- FT_NotImpl, // nicht implementiert
- FT_ConstFloat, // Double (8-Byte)
- FT_Variable, // Single Ref
- FT_Range, // Double Ref
- FT_Braces, // Klammmern
- FT_ConstInt, // Integer
- FT_ConstString, // String
- FT_NOP, // nichts
+ FT_Return = 0, // End Formula
+ FT_FuncFix0, // Funktion, 0 Parameter
+ FT_FuncFix1, // Funktion, 0 Parameter
+ FT_FuncFix2, // Funktion, 0 Parameter
+ FT_FuncFix3, // Funktion, 0 Parameter
+ FT_FuncFix4, // Funktion, 0 Parameter
+ FT_FuncVar, // ~, var. P.
+ FT_Neg, // Negierung
+ FT_Op, // Operator
+ FT_NotImpl, // nicht implementiert
+ FT_ConstFloat, // Double (8-Byte)
+ FT_Variable, // Single Ref
+ FT_Range, // Double Ref
+ FT_Braces, // Klammmern
+ FT_ConstInt, // Integer
+ FT_ConstString, // String
+ FT_NOP, // nichts
// zusaetzlich ab WK3
- FT_Cref, // Cell Reference
- FT_Rref, // Range Reference
- FT_Nrref, // Named range reference
- FT_Absnref, // Absolut named range
- FT_Erref, // Err range reference
- FT_Ecref, // Err cell reference
- FT_Econstant, // Err constant
- FT_Splfunc, // SPLfunction
+ FT_Cref, // Cell Reference
+ FT_Rref, // Range Reference
+ FT_Nrref, // Named range reference
+ FT_Absnref, // Absolut named range
+ FT_Erref, // Err range reference
+ FT_Ecref, // Err cell reference
+ FT_Econstant, // Err constant
+ FT_Splfunc, // SPLfunction
FT_Const10Float,// Float (10-Byte)
- FT_Snum // Const Short Num
+ FT_Snum // Const Short Num
// fuer 'Problemfaelle' beim Import
};
@@ -73,38 +73,38 @@ enum FUNC_TYPE
class LotusToSc : public LotusConverterBase
{
private:
- CharSet eSrcChar;
- TokenId nAddToken; // ')+1.0'
- TokenId nSubToken; // ~
- TokenId n0Token; // '0.0';
+ CharSet eSrcChar;
+ TokenId nAddToken; // ')+1.0'
+ TokenId nSubToken; // ~
+ TokenId n0Token; // '0.0';
// ---------------------------------------------------------------
- static FUNC_TYPE IndexToType( BYTE );
- static DefTokenId IndexToToken( BYTE );
- static FUNC_TYPE IndexToTypeWK123( BYTE );
- static DefTokenId IndexToTokenWK123( BYTE );
- void DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtName );
- void LotusRelToScRel( UINT16 nCol, UINT16 nRow,
+ static FUNC_TYPE IndexToType( BYTE );
+ static DefTokenId IndexToToken( BYTE );
+ static FUNC_TYPE IndexToTypeWK123( BYTE );
+ static DefTokenId IndexToTokenWK123( BYTE );
+ void DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtName );
+ void LotusRelToScRel( UINT16 nCol, UINT16 nRow,
ScSingleRefData& rSRD );
- BOOL bWK3; // alternative Codeumsetzung statt fuer < WK1
+ BOOL bWK3; // alternative Codeumsetzung statt fuer < WK1
BOOL bWK123; // alternative for 123
// -------------------------------------------------------------------
- void ReadSRD( ScSingleRefData& rSRD, BYTE nFlags );
- inline void ReadCRD( ScComplexRefData& rCRD, BYTE nFlags );
- void IncToken( TokenId &rParam );
+ void ReadSRD( ScSingleRefData& rSRD, BYTE nFlags );
+ inline void ReadCRD( ScComplexRefData& rCRD, BYTE nFlags );
+ void IncToken( TokenId &rParam );
// ACHTUNG: hier wird die aktuelle Token-Kette im Pool
// mit '(<rParam>)+1' fortgeschrieben und mit
// Store() abgeschlossen!
- void DecToken( TokenId& rParam );
+ void DecToken( TokenId& rParam );
// ACHTUNG: ~
- void NegToken( TokenId& rParam );
+ void NegToken( TokenId& rParam );
// ACHTUNG: wie ~, nur wird '-(<rParam>)' gebildet
public:
LotusToSc( SvStream& aStr, CharSet eSrc, BOOL b );
- virtual ConvErr Convert( const ScTokenArray*& rpErg, INT32& nRest,
+ virtual ConvErr Convert( const ScTokenArray*& rpErg, INT32& nRest,
const FORMULA_TYPE eFT = FT_CellFormula );
void Reset( const ScAddress& rEingPos );
- inline void SetWK3( void );
+ inline void SetWK3( void );
private:
using LotusConverterBase::Reset;
diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx
index 15c0a2931dc4..01df311623d6 100644
--- a/sc/source/filter/inc/lotimpop.hxx
+++ b/sc/source/filter/inc/lotimpop.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,56 +44,56 @@ class SvxBorderLine;
class ImportLotus : public ImportTyp
{
private:
- SvStream* pIn; // benoetigt wegen multiplem Read()!
- LotusFontBuffer* pFontBuff;
- LotusToSc aConv;
+ SvStream* pIn; // benoetigt wegen multiplem Read()!
+ LotusFontBuffer* pFontBuff;
+ LotusToSc aConv;
UINT16 nTab; // z.Zt. bearbeitete Tabelle
- INT32 nExtTab;
+ INT32 nExtTab;
// -------------------------------------------------------------------
// in WK?-Datei
- void Bof( void ); // 0x0000 00
- BOOL BofFm3( void ); // 0x0000 00
- void Columnwidth( UINT16 nRecLen ); // 0x0007 07
- void Hiddencolumn( UINT16 nRecLen ); // 0x0008 08
- void Userrange( void ); // 0x0009 09
- void Errcell( void ); // 0x0014 20
- void Nacell( void ); // 0x0015 21
- void Labelcell( void ); // 0x0016 22
- void Numbercell( void ); // 0x0017 23
- void Smallnumcell( void ); // 0x0018 24
- ScFormulaCell* Formulacell( UINT16 nRecLen ); // 0x0019 25
- void Formulastring( ScFormulaCell& ); // 0x001a 26
- // 0x001b 27 special
- void NamedSheet( void ); // 14000
- void RowPresentation( UINT16 nRecLen ); // 2007
+ void Bof( void ); // 0x0000 00
+ BOOL BofFm3( void ); // 0x0000 00
+ void Columnwidth( UINT16 nRecLen ); // 0x0007 07
+ void Hiddencolumn( UINT16 nRecLen ); // 0x0008 08
+ void Userrange( void ); // 0x0009 09
+ void Errcell( void ); // 0x0014 20
+ void Nacell( void ); // 0x0015 21
+ void Labelcell( void ); // 0x0016 22
+ void Numbercell( void ); // 0x0017 23
+ void Smallnumcell( void ); // 0x0018 24
+ ScFormulaCell* Formulacell( UINT16 nRecLen ); // 0x0019 25
+ void Formulastring( ScFormulaCell& ); // 0x001a 26
+ // 0x001b 27 special
+ void NamedSheet( void ); // 14000
+ void RowPresentation( UINT16 nRecLen ); // 2007
// -------------------------------------------------------------------
// in FM?-Datei
- void Font_Face( void ); // 174
- void Font_Type( void ); // 176
- void Font_Ysize( void ); // 177
- void _Row( const UINT16 nRecLen ); // 197 ?
+ void Font_Face( void ); // 174
+ void Font_Type( void ); // 176
+ void Font_Ysize( void ); // 177
+ void _Row( const UINT16 nRecLen ); // 197 ?
// -------------------------------------------------------------------
- inline void Read( ScAddress& );
- inline void Read( ScRange& );
+ inline void Read( ScAddress& );
+ inline void Read( ScRange& );
// fuer Addresses/Ranges im Format Row(16)/Tab(8)/Col(8)
- inline void Read( sal_Char& );
- inline void Read( BYTE& );
- inline void Read( UINT16& );
- inline void Read( INT16& );
- inline void Read( UINT32& );
- inline void Read( double& ); // 10-Byte-IEEE lesen
- inline void Read( LotAttrWK3& );
- void Read( String& ); // 0-terminierten String einlesen
- inline void Skip( const UINT16 nNumBytes );
+ inline void Read( sal_Char& );
+ inline void Read( BYTE& );
+ inline void Read( UINT16& );
+ inline void Read( INT16& );
+ inline void Read( UINT32& );
+ inline void Read( double& ); // 10-Byte-IEEE lesen
+ inline void Read( LotAttrWK3& );
+ void Read( String& ); // 0-terminierten String einlesen
+ inline void Skip( const UINT16 nNumBytes );
// -------------------------------------------------------------------
public:
ImportLotus( SvStream&, ScDocument*, CharSet eSrc );
- virtual ~ImportLotus();
+ virtual ~ImportLotus();
- FltError Read();
- FltError Read( SvStream& ); // special for *.fm3-Dateien
+ FltError Read();
+ FltError Read( SvStream& ); // special for *.fm3-Dateien
};
diff --git a/sc/source/filter/inc/lotrange.hxx b/sc/source/filter/inc/lotrange.hxx
index ab9acf9f476e..a1515007ea85 100644
--- a/sc/source/filter/inc/lotrange.hxx
+++ b/sc/source/filter/inc/lotrange.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 LotusRangeList;
-typedef UINT16 LR_ID;
-#define ID_FAIL 0xFFFF
+typedef UINT16 LR_ID;
+#define ID_FAIL 0xFFFF
class LotusRange
{
friend class LotusRangeList;
private:
- UINT32 nHash;
- SCCOL nColStart;
- SCROW nRowStart;
- SCCOL nColEnd;
- SCROW nRowEnd;
- LR_ID nId;
- void MakeHash( void );
- inline void Copy( const LotusRange& );
- inline void SetId( LR_ID nId );
+ UINT32 nHash;
+ SCCOL nColStart;
+ SCROW nRowStart;
+ SCCOL nColEnd;
+ SCROW nRowEnd;
+ LR_ID nId;
+ void MakeHash( void );
+ inline void Copy( const LotusRange& );
+ inline void SetId( LR_ID nId );
public:
LotusRange( SCCOL nCol, SCROW nRow );
LotusRange( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE );
LotusRange( const LotusRange& );
- inline LotusRange &operator =( const LotusRange& );
- inline BOOL operator ==( const LotusRange& ) const;
- inline BOOL operator !=( const LotusRange& ) const;
- inline BOOL IsSingle( void ) const;
+ inline LotusRange &operator =( const LotusRange& );
+ inline BOOL operator ==( const LotusRange& ) const;
+ inline BOOL operator !=( const LotusRange& ) const;
+ inline BOOL IsSingle( void ) const;
};
@@ -112,20 +112,20 @@ inline BOOL LotusRange::IsSingle( void ) const
class LotusRangeList : private List
{
private:
- LR_ID nIdCnt;
- ScComplexRefData aComplRef;
- static SCCOL nEingCol;
- static SCROW nEingRow;
+ LR_ID nIdCnt;
+ ScComplexRefData aComplRef;
+ static SCCOL nEingCol;
+ static SCROW nEingRow;
public:
LotusRangeList( void );
~LotusRangeList( void );
- inline UINT16 GetIndex( SCCOL nCol, SCROW nRow );
- inline UINT16 GetIndex( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE );
- UINT16 GetIndex( const LotusRange& );
- inline void Append( SCCOL nCol, SCROW nRow, const String& );
- inline void Append( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE, const String& );
- void Append( LotusRange* pLR, const String& rName );
- inline static void SetEing( const SCCOL nCol, const SCROW nRow );
+ inline UINT16 GetIndex( SCCOL nCol, SCROW nRow );
+ inline UINT16 GetIndex( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE );
+ UINT16 GetIndex( const LotusRange& );
+ inline void Append( SCCOL nCol, SCROW nRow, const String& );
+ inline void Append( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE, const String& );
+ void Append( LotusRange* pLR, const String& rName );
+ inline static void SetEing( const SCCOL nCol, const SCROW nRow );
};
diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx
index c8182e8c0c17..ddf928ef5346 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ class StringHashEntry
{
private:
friend class NameBuffer;
- String aString;
- UINT32 nHash;
+ String aString;
+ UINT32 nHash;
- static UINT32 MakeHashCode( const String& );
+ static UINT32 MakeHashCode( const String& );
public:
- inline StringHashEntry( const String& );
- inline StringHashEntry( void );
- inline void operator =( const sal_Char* );
- inline void operator =( const String& );
- inline void operator =( const StringHashEntry& );
- inline BOOL operator ==( const StringHashEntry& ) const;
+ inline StringHashEntry( const String& );
+ inline StringHashEntry( void );
+ inline void operator =( const sal_Char* );
+ inline void operator =( const String& );
+ inline void operator =( const StringHashEntry& );
+ inline BOOL operator ==( const StringHashEntry& ) const;
};
@@ -105,17 +105,17 @@ inline BOOL StringHashEntry::operator ==( const StringHashEntry& r ) const
class NameBuffer : private List, public ExcRoot
{
private:
- UINT16 nBase; // Index-Basis
+ UINT16 nBase; // Index-Basis
public:
// inline NameBuffer( void ); //#94039# prevent empty rootdata
- inline NameBuffer( RootData* );
- inline NameBuffer( RootData*, UINT16 nNewBase );
-
- virtual ~NameBuffer();
- inline const String* Get( UINT16 nIndex );
- inline UINT16 GetLastIndex( void );
- inline void SetBase( UINT16 nNewBase = 0 );
- void operator <<( const String& rNewString );
+ inline NameBuffer( RootData* );
+ inline NameBuffer( RootData*, UINT16 nNewBase );
+
+ virtual ~NameBuffer();
+ inline const String* Get( UINT16 nIndex );
+ inline UINT16 GetLastIndex( void );
+ inline void SetBase( UINT16 nNewBase = 0 );
+ void operator <<( const String& rNewString );
};
//#94039# prevent empty rootdata
@@ -176,20 +176,20 @@ class ShrfmlaBuffer : public ExcRoot
size_t operator() (const ScAddress &addr) const;
};
typedef std::hash_map <ScAddress, USHORT, ScAddressHashFunc> ShrfmlaHash;
- typedef std::list <ScRange> ShrfmlaList;
+ typedef std::list <ScRange> ShrfmlaList;
- ShrfmlaHash index_hash;
- ShrfmlaList index_list;
+ ShrfmlaHash index_hash;
+ ShrfmlaList index_list;
size_t mnCurrIdx;
public:
ShrfmlaBuffer( RootData* pRD );
- virtual ~ShrfmlaBuffer();
+ virtual ~ShrfmlaBuffer();
void Clear();
- void Store( const ScRange& rRange, const ScTokenArray& );
+ void Store( const ScRange& rRange, const ScTokenArray& );
USHORT Find (const ScAddress & rAddress ) const;
- static String CreateName( const ScRange& );
+ static String CreateName( const ScRange& );
};
@@ -200,12 +200,12 @@ class RangeNameBufferWK3 : private List
private:
struct ENTRY
{
- StringHashEntry aStrHashEntry;
- ScComplexRefData aScComplexRefDataRel;
- String aScAbsName;
- UINT16 nAbsInd; // == 0 -> noch keine Abs-Name!
- UINT16 nRelInd;
- BOOL bSingleRef;
+ StringHashEntry aStrHashEntry;
+ ScComplexRefData aScComplexRefDataRel;
+ String aScAbsName;
+ UINT16 nAbsInd; // == 0 -> noch keine Abs-Name!
+ UINT16 nRelInd;
+ BOOL bSingleRef;
ENTRY( const String& rName, const String& rScName, const ScComplexRefData& rCRD ) :
aStrHashEntry( rName ),
aScComplexRefDataRel( rCRD ),
@@ -216,23 +216,23 @@ private:
}
};
- ScTokenArray* pScTokenArray;
- UINT16 nIntCount;
+ ScTokenArray* pScTokenArray;
+ UINT16 nIntCount;
public:
RangeNameBufferWK3( void );
- virtual ~RangeNameBufferWK3();
- void Add( const String& rName, const ScComplexRefData& rCRD );
- inline void Add( const String& rName, const ScRange& aScRange );
- BOOL FindRel( const String& rRef, UINT16& rIndex );
- BOOL FindAbs( const String& rRef, UINT16& rIndex );
+ virtual ~RangeNameBufferWK3();
+ void Add( const String& rName, const ScComplexRefData& rCRD );
+ inline void Add( const String& rName, const ScRange& aScRange );
+ BOOL FindRel( const String& rRef, UINT16& rIndex );
+ BOOL FindAbs( const String& rRef, UINT16& rIndex );
};
inline void RangeNameBufferWK3::Add( const String& rName, const ScRange& aScRange )
{
- ScComplexRefData aCRD;
- ScSingleRefData* pSRD;
- const ScAddress* pScAddr;
+ ScComplexRefData aCRD;
+ ScSingleRefData* pSRD;
+ const ScAddress* pScAddr;
pSRD = &aCRD.Ref1;
pScAddr = &aScRange.aStart;
@@ -269,18 +269,18 @@ class ExtSheetBuffer : private List, public ExcRoot
private:
struct Cont
{
- String aFile;
- String aTab;
- UINT16 nTabNum; // 0xFFFF -> noch nicht angelegt
+ String aFile;
+ String aTab;
+ UINT16 nTabNum; // 0xFFFF -> noch nicht angelegt
// 0xFFFE -> versucht anzulegen, ging aber schief
// 0xFFFD -> soll im selben Workbook sein, findet's aber nicht
- BOOL bSWB;
- BOOL bLink;
+ BOOL bSWB;
+ BOOL bLink;
Cont( const String& rFilePathAndName, const String& rTabName ) :
aFile( rFilePathAndName ),
aTab( rTabName )
{
- nTabNum = 0xFFFF; // -> Tabelle noch nicht erzeugt
+ nTabNum = 0xFFFF; // -> Tabelle noch nicht erzeugt
bSWB = bLink = FALSE;
}
Cont( const String& rFilePathAndName, const String& rTabName,
@@ -288,23 +288,23 @@ private:
aFile( rFilePathAndName ),
aTab( rTabName )
{
- nTabNum = 0xFFFF; // -> Tabelle noch nicht erzeugt
+ nTabNum = 0xFFFF; // -> Tabelle noch nicht erzeugt
bSWB = bSameWB;
bLink = FALSE;
}
};
public:
- inline ExtSheetBuffer( RootData* );
- virtual ~ExtSheetBuffer();
+ inline ExtSheetBuffer( RootData* );
+ virtual ~ExtSheetBuffer();
sal_Int16 Add( const String& rFilePathAndName,
const String& rTabName, const BOOL bSameWorkbook = FALSE );
- BOOL GetScTabIndex( UINT16 nExcSheetIndex, UINT16& rIn_LastTab_Out_ScIndex );
- BOOL IsLink( const UINT16 nExcSheetIndex ) const;
- BOOL GetLink( const UINT16 nExcSheetIndex, String &rAppl, String &rDoc ) const;
+ BOOL GetScTabIndex( UINT16 nExcSheetIndex, UINT16& rIn_LastTab_Out_ScIndex );
+ BOOL IsLink( const UINT16 nExcSheetIndex ) const;
+ BOOL GetLink( const UINT16 nExcSheetIndex, String &rAppl, String &rDoc ) const;
- void Reset( void );
+ void Reset( void );
};
@@ -317,13 +317,13 @@ inline ExtSheetBuffer::ExtSheetBuffer( RootData* p ) : ExcRoot( p )
struct ExtName
{
- String aName;
- UINT32 nStorageId;
- UINT16 nFlags;
+ String aName;
+ UINT32 nStorageId;
+ UINT16 nFlags;
inline ExtName( const String& r, sal_uInt16 n ) : aName( r ), nStorageId( 0 ), nFlags( n ) {}
- BOOL IsDDE( void ) const;
+ BOOL IsDDE( void ) const;
BOOL IsOLE( void ) const;
};
diff --git a/sc/source/filter/inc/op.h b/sc/source/filter/inc/op.h
index 2548bdfa34c3..8bcf8abd8e14 100644
--- a/sc/source/filter/inc/op.h
+++ b/sc/source/filter/inc/op.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
@@ -39,11 +39,11 @@ void OP_EOF( SvStream &aStream, USHORT nLaenge );
void OP_Integer( SvStream &aStream, USHORT nLaenge );
void OP_Number( SvStream &aStream, USHORT nLaenge );
void OP_Label( SvStream &aStream, USHORT nLaenge );
-//UNUSED2009-05 void OP_Text( SvStream &aStream, USHORT nLaenge ); // WK3
-void OP_Integer3( SvStream &aStream, USHORT nLaenge ); // WK3
-void OP_Number3( SvStream &aStream, USHORT nLaenge ); // WK3
+//UNUSED2009-05 void OP_Text( SvStream &aStream, USHORT nLaenge ); // WK3
+void OP_Integer3( SvStream &aStream, USHORT nLaenge ); // WK3
+void OP_Number3( SvStream &aStream, USHORT nLaenge ); // WK3
void OP_Formula( SvStream &aStream, USHORT nLaenge );
-void OP_Formula3( SvStream &aStream, USHORT nLaenge ); // WK3
+void OP_Formula3( SvStream &aStream, USHORT nLaenge ); // WK3
void OP_ColumnWidth( SvStream &aStream, USHORT nLaenge );
void OP_NamedRange( SvStream &aStream, USHORT nLaenge );
void OP_SymphNamedRange( SvStream &aStream, USHORT nLaenge );
diff --git a/sc/source/filter/inc/optab.h b/sc/source/filter/inc/optab.h
index d70eb1f29bb0..cb579b94e4b5 100644
--- a/sc/source/filter/inc/optab.h
+++ b/sc/source/filter/inc/optab.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
@@ -30,15 +30,15 @@
typedef void ( *OPCODE_FKT )( SvStream &aStream, USHORT nLaenge );
-#define FKT_LIMIT 101
+#define FKT_LIMIT 101
-#define FKT_LIMIT123 101
+#define FKT_LIMIT123 101
-#define LOTUS_EOF 0x01
+#define LOTUS_EOF 0x01
#define LOTUS_FILEPASSWD 0x4b
-#define LOTUS_PATTERN 0x284
+#define LOTUS_PATTERN 0x284
#define LOTUS_FORMAT_INDEX 0x800
diff --git a/sc/source/filter/inc/otlnbuff.hxx b/sc/source/filter/inc/otlnbuff.hxx
index 6ccca361345b..036a55f859ae 100644
--- a/sc/source/filter/inc/otlnbuff.hxx
+++ b/sc/source/filter/inc/otlnbuff.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,27 +36,27 @@ class XclImpOutlineBuffer
{
// -> exctools.cxx
private:
- BYTE* pLevel;
- BOOL* pOuted;
- BOOL* pHidden;
- SCSIZE nSize;
- SCSIZE nLast;
- BYTE nMaxLevel;
- ScOutlineArray* pOutlineArray;
- BOOL bButtonNormal; // TRUE -> right / under
+ BYTE* pLevel;
+ BOOL* pOuted;
+ BOOL* pHidden;
+ SCSIZE nSize;
+ SCSIZE nLast;
+ BYTE nMaxLevel;
+ ScOutlineArray* pOutlineArray;
+ BOOL bButtonNormal; // TRUE -> right / under
public:
XclImpOutlineBuffer( SCSIZE nNewSize );
~XclImpOutlineBuffer();
- void SetLevel( SCSIZE nIndex, BYTE nVal, BOOL bOuted, BOOL bHidden );
- void SetOutlineArray( ScOutlineArray* pOArray );
- void Reset( void );
- void MakeScOutline( void );
- void SetLevelRange( SCSIZE nF, SCSIZE nL, BYTE nVal,
+ void SetLevel( SCSIZE nIndex, BYTE nVal, BOOL bOuted, BOOL bHidden );
+ void SetOutlineArray( ScOutlineArray* pOArray );
+ void Reset( void );
+ void MakeScOutline( void );
+ void SetLevelRange( SCSIZE nF, SCSIZE nL, BYTE nVal,
BOOL bOuted, BOOL bHidden );
- inline BOOL HasOutline( void ) const;
+ inline BOOL HasOutline( void ) const;
- inline void SetButtonMode( const BOOL bRightOrUnder );
+ inline void SetButtonMode( const BOOL bRightOrUnder );
};
diff --git a/sc/source/filter/inc/qpro.hxx b/sc/source/filter/inc/qpro.hxx
index f631da120373..479e4a6c2ddd 100644
--- a/sc/source/filter/inc/qpro.hxx
+++ b/sc/source/filter/inc/qpro.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx
index 18327cd141df..85bdf8ae8443 100644
--- a/sc/source/filter/inc/qproform.hxx
+++ b/sc/source/filter/inc/qproform.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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.
*
************************************************************************/
-
+
#ifndef SC_QPROFORM_HXX
#define SC_QPROFORM_HXX
@@ -39,35 +39,35 @@ typedef OpCode DefTokenId;
enum FUNC_TYPE
{
- FT_Return,
+ FT_Return,
FT_FuncFix0,
- FT_FuncFix1,
- FT_FuncFix2,
- FT_FuncFix3,
- FT_FuncFix4,
+ FT_FuncFix1,
+ FT_FuncFix2,
+ FT_FuncFix3,
+ FT_FuncFix4,
FT_FuncFix5,
FT_FuncFix6,
- FT_FuncVar,
+ FT_FuncVar,
FT_DLL,
- FT_Neg,
- FT_Op,
- FT_NotImpl,
- FT_ConstFloat,
- FT_Range,
+ FT_Neg,
+ FT_Op,
+ FT_NotImpl,
+ FT_ConstFloat,
+ FT_Range,
FT_Braces,
- FT_ConstInt,
+ FT_ConstInt,
FT_ConstString,
- FT_NOP,
- FT_Cref
+ FT_NOP,
+ FT_Cref
};
-
+
class QProToSc : public ConverterBase
{
private:
- TokenId mnAddToken;
- TokenId mnSubToken;
- TokenId mn0Token;
- SvStream& maIn;
+ TokenId mnAddToken;
+ TokenId mnSubToken;
+ TokenId mn0Token;
+ SvStream& maIn;
public:
static const size_t nBufSize = 256;
@@ -76,7 +76,7 @@ class QProToSc : public ConverterBase
ConvErr Convert( const ScTokenArray*& pArray, sal_uInt16 nLen,
const FORMULA_TYPE eFT = FT_CellFormula );
void DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtString );
- void ReadSRD( ScSingleRefData& rR, sal_Int8 nPage, sal_Int8 nCol, sal_uInt16 rRel );
+ void ReadSRD( ScSingleRefData& rR, sal_Int8 nPage, sal_Int8 nCol, sal_uInt16 rRel );
void IncToken( TokenId &aParam );
DefTokenId IndexToToken( sal_uInt16 nToken );
FUNC_TYPE IndexToType( sal_uInt8 nToken );
diff --git a/sc/source/filter/inc/qprostyle.hxx b/sc/source/filter/inc/qprostyle.hxx
index ffce2630b310..37dd74d27791 100644
--- a/sc/source/filter/inc/qprostyle.hxx
+++ b/sc/source/filter/inc/qprostyle.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/root.hxx b/sc/source/filter/inc/root.hxx
index facc8b1b2fa0..0e1551c8c41d 100644
--- a/sc/source/filter/inc/root.hxx
+++ b/sc/source/filter/inc/root.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +57,12 @@ class XclExpRoot;
// ---------------------------------------------------------- Excel Imp~/Exp~ -
-struct RootData // -> Inkarnation jeweils im ImportExcel-Objekt!
+struct RootData // -> Inkarnation jeweils im ImportExcel-Objekt!
{
- BiffTyp eDateiTyp; // feine Differenzierung
- ExtSheetBuffer* pExtSheetBuff;
- ShrfmlaBuffer* pShrfmlaBuff;
- ExtNameBuff* pExtNameBuff;
+ BiffTyp eDateiTyp; // feine Differenzierung
+ ExtSheetBuffer* pExtSheetBuff;
+ ShrfmlaBuffer* pShrfmlaBuff;
+ ExtNameBuff* pExtNameBuff;
ExcelToSc* pFmlaConverter;
XclImpColRowSettings* pColRowBuff; // Col/Row-Einstellungen 1 Tabelle
@@ -78,14 +78,14 @@ struct RootData // -> Inkarnation jeweils im ImportExcel-Objekt!
XclImpRoot* pIR;
XclExpRoot* pER;
- RootData( void ); // -> exctools.cxx
- ~RootData(); // -> exctools.cxx
+ RootData( void ); // -> exctools.cxx
+ ~RootData(); // -> exctools.cxx
};
class ExcRoot
{
protected:
- RootData* pExcRoot;
+ RootData* pExcRoot;
inline ExcRoot( RootData* pNexExcRoot ) : pExcRoot( pNexExcRoot ) {}
inline ExcRoot( const ExcRoot& rCopy ) : pExcRoot( rCopy.pExcRoot ) {}
};
@@ -99,19 +99,19 @@ class LotAttrTable;
struct LOTUS_ROOT
{
- ScDocument* pDoc;
- LotusRangeList* pRangeNames;
- ScRangeName* pScRangeName;
- CharSet eCharsetQ;
- Lotus123Typ eFirstType;
- Lotus123Typ eActType;
- ScRange aActRange;
- RangeNameBufferWK3* pRngNmBffWK3;
- LotusFontBuffer* pFontBuff;
- LotAttrTable* pAttrTable;
+ ScDocument* pDoc;
+ LotusRangeList* pRangeNames;
+ ScRangeName* pScRangeName;
+ CharSet eCharsetQ;
+ Lotus123Typ eFirstType;
+ Lotus123Typ eActType;
+ ScRange aActRange;
+ RangeNameBufferWK3* pRngNmBffWK3;
+ LotusFontBuffer* pFontBuff;
+ LotAttrTable* pAttrTable;
};
-extern LOTUS_ROOT* pLotusRoot; // -> Inkarn. in filter.cxx
+extern LOTUS_ROOT* pLotusRoot; // -> Inkarn. in filter.cxx
// ----------------------------------------------------------------------------
diff --git a/sc/source/filter/inc/rtfexp.hxx b/sc/source/filter/inc/rtfexp.hxx
index 4733d243d1a5..562724ffbc78 100644
--- a/sc/source/filter/inc/rtfexp.hxx
+++ b/sc/source/filter/inc/rtfexp.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,20 +33,20 @@
class ScRTFExport : public ScExportBase
{
- ULONG* pCellX; // kumulierte Zellbreiten einer Tabelle
+ ULONG* pCellX; // kumulierte Zellbreiten einer Tabelle
- void WriteTab( SCTAB nTab );
- void WriteRow( SCTAB nTab, SCROW nRow );
- void WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol );
+ void WriteTab( SCTAB nTab );
+ void WriteRow( SCTAB nTab, SCROW nRow );
+ void WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol );
public:
ScRTFExport( SvStream&, ScDocument*, const ScRange& );
- virtual ~ScRTFExport();
+ virtual ~ScRTFExport();
- ULONG Write();
+ ULONG Write();
};
-#endif // SC_RTFEXP_HXX
+#endif // SC_RTFEXP_HXX
diff --git a/sc/source/filter/inc/rtfimp.hxx b/sc/source/filter/inc/rtfimp.hxx
index 13ade86b7cd5..01a5b8a1ec54 100644
--- a/sc/source/filter/inc/rtfimp.hxx
+++ b/sc/source/filter/inc/rtfimp.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx
index 135e11e572ae..6b8289e417d0 100644
--- a/sc/source/filter/inc/rtfparse.hxx
+++ b/sc/source/filter/inc/rtfparse.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +34,10 @@
struct ScRTFCellDefault
{
- SfxItemSet aItemSet;
- SCCOL nCol;
- USHORT nTwips; // rechter Rand der Zelle
- SCCOL nColOverlap; // MergeCell wenn >1, merged cells wenn 0
+ SfxItemSet aItemSet;
+ SCCOL nCol;
+ USHORT nTwips; // rechter Rand der Zelle
+ SCCOL nColOverlap; // MergeCell wenn >1, merged cells wenn 0
ScRTFCellDefault( SfxItemPool* pPool ) :
aItemSet( *pPool ), nColOverlap(1) {}
@@ -48,13 +48,13 @@ DECLARE_LIST( ScRTFDefaultList, ScRTFCellDefault* )
// deswegen ULONG, typedef bringt's auch nicht :-(
SV_DECL_VARARR_SORT( ScRTFColTwips, ULONG, 16, 4)
-#else // SC_RTFPARSE_CXX
+#else // SC_RTFPARSE_CXX
struct ScRTFCellDefault;
class ScRTFDefaultList;
class ScRTFColTwips;
-#endif // SC_RTFPARSE_CXX
+#endif // SC_RTFPARSE_CXX
class EditEngine;
@@ -62,26 +62,26 @@ class EditEngine;
class ScRTFParser : public ScEEParser
{
private:
- ScRTFDefaultList* pDefaultList;
- ScRTFColTwips* pColTwips;
- ScRTFCellDefault* pInsDefault;
- ScRTFCellDefault* pActDefault;
- ScRTFCellDefault* pDefMerge;
- ULONG nStartAdjust;
- USHORT nLastWidth;
- BOOL bNewDef;
+ ScRTFDefaultList* pDefaultList;
+ ScRTFColTwips* pColTwips;
+ ScRTFCellDefault* pInsDefault;
+ ScRTFCellDefault* pActDefault;
+ ScRTFCellDefault* pDefMerge;
+ ULONG nStartAdjust;
+ USHORT nLastWidth;
+ BOOL bNewDef;
DECL_LINK( RTFImportHdl, ImportInfo* );
- inline void NextRow();
- void EntryEnd( ScEEParseEntry*, const ESelection& );
- void ProcToken( ImportInfo* );
- void ColAdjust();
- BOOL SeekTwips( USHORT nTwips, SCCOL* pCol );
- void NewCellRow( ImportInfo* );
+ inline void NextRow();
+ void EntryEnd( ScEEParseEntry*, const ESelection& );
+ void ProcToken( ImportInfo* );
+ void ColAdjust();
+ BOOL SeekTwips( USHORT nTwips, SCCOL* pCol );
+ void NewCellRow( ImportInfo* );
public:
ScRTFParser( EditEngine* );
- virtual ~ScRTFParser();
+ virtual ~ScRTFParser();
virtual ULONG Read( SvStream&, const String& rBaseURL );
};
diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx
index 995de274b28b..5f72600ed4ee 100644
--- a/sc/source/filter/inc/scflt.hxx
+++ b/sc/source/filter/inc/scflt.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,192 +33,192 @@
#include <tools/solar.h>
// FehlerNummern
-#define errUnknownFormat 1
-#define errUnknownID 2
-#define errOutOfMemory 3
+#define errUnknownFormat 1
+#define errUnknownID 2
+#define errOutOfMemory 3
// Identifiers im FileFormat
-#define ColWidthID 1
-#define ColAttrID 2
-#define RowHeightID 3
-#define RowAttrID 4
-#define FontID 5
-#define NameID 6
-#define TableID 7
-#define ObjectID 8
-#define PatternID 9
-#define DataBaseID 10
+#define ColWidthID 1
+#define ColAttrID 2
+#define RowHeightID 3
+#define RowAttrID 4
+#define FontID 5
+#define NameID 6
+#define TableID 7
+#define ObjectID 8
+#define PatternID 9
+#define DataBaseID 10
// Zeilen/Spalten Flags
-#define crfSoftBreak 1
-#define crfHardBreak 2
-#define crfHidden 4
+#define crfSoftBreak 1
+#define crfHardBreak 2
+#define crfHidden 4
// Zelltypen
-#define ctValue 1
-#define ctString 2
-#define ctFormula 3
-#define ctNote 4
+#define ctValue 1
+#define ctString 2
+#define ctFormula 3
+#define ctNote 4
// FontStyles
-#define ffDontCare 0x00
-#define ffRoman 0x10
-#define ffSwiss 0x20
-#define ffModern 0x30
-#define ffScript 0x40
-#define ffDecorative 0x50
+#define ffDontCare 0x00
+#define ffRoman 0x10
+#define ffSwiss 0x20
+#define ffModern 0x30
+#define ffScript 0x40
+#define ffDecorative 0x50
// FontWeight
-#define fwNormal 400
+#define fwNormal 400
// FontAttribute
-#define atNone 0
-#define atBold 1
-#define atItalic 2
-#define atUnderline 4
-#define atStrikeOut 8
+#define atNone 0
+#define atBold 1
+#define atItalic 2
+#define atUnderline 4
+#define atStrikeOut 8
// Horizontale Ausrichtung
-#define hjNone 0
-#define hjLeft 1
-#define hjCenter 2
-#define hjRight 3
+#define hjNone 0
+#define hjLeft 1
+#define hjCenter 2
+#define hjRight 3
// Vertikale Ausrichtung
-#define vjNone 0
-#define vjTop 1
-#define vjCenter 2
-#define vjBottom 3
+#define vjNone 0
+#define vjTop 1
+#define vjCenter 2
+#define vjBottom 3
// AusrichtungsFlags
-#define ojWordBreak 0x01
-#define ojBottomTop 0x02
-#define ojTopBottom 0x04
+#define ojWordBreak 0x01
+#define ojBottomTop 0x02
+#define ojTopBottom 0x04
// ZellRaster
-#define raNone 0
-#define raGray12 1
-#define raGray25 2
-#define raGray50 3
-#define raGray75 4
-#define raGray100 5
+#define raNone 0
+#define raGray12 1
+#define raGray25 2
+#define raGray50 3
+#define raGray75 4
+#define raGray100 5
// Zellschutz
-#define paProtect 1
-#define paHideFormula 2
-#define paHideAll 4
-#define paHidePrint 8
+#define paProtect 1
+#define paHideFormula 2
+#define paHideAll 4
+#define paHidePrint 8
// ZahlenFormatFlags
-#define vfStandard 0
-#define vfMoney 1
-#define vfThousend 2
-#define vfPercent 3
-#define vfExponent 4
-#define vfZerro 5
-#define vfDate 6
-#define vfTime 7
-#define vfBoolean 8
-#define vfStandardRed 9
-#define vfMoneyRed 10
-#define vfThousendRed 11
-#define vfPercentRed 12
-#define vfExponentRed 13
-#define vfFormula 14
-#define vfString 15
-#define vfNone 16
+#define vfStandard 0
+#define vfMoney 1
+#define vfThousend 2
+#define vfPercent 3
+#define vfExponent 4
+#define vfZerro 5
+#define vfDate 6
+#define vfTime 7
+#define vfBoolean 8
+#define vfStandardRed 9
+#define vfMoneyRed 10
+#define vfThousendRed 11
+#define vfPercentRed 12
+#define vfExponentRed 13
+#define vfFormula 14
+#define vfString 15
+#define vfNone 16
// DatumsFormatFlags
-#define df_NDMY_Long 0
-#define df_DMY_Long 1
-#define df_MY_Long 2
-#define df_NDM_Long 3
-#define df_DM_Long 4
-#define df_M_Long 5
-#define df_NDMY_Short 6
-#define df_DMY_Short 7
-#define df_MY_Short 8
-#define df_NDM_Short 9
-#define df_DM_Short 10
-#define df_M_Short 11
-#define df_Q_Long 12
-#define df_Q_Short 13
+#define df_NDMY_Long 0
+#define df_DMY_Long 1
+#define df_MY_Long 2
+#define df_NDM_Long 3
+#define df_DM_Long 4
+#define df_M_Long 5
+#define df_NDMY_Short 6
+#define df_DMY_Short 7
+#define df_MY_Short 8
+#define df_NDM_Short 9
+#define df_DM_Short 10
+#define df_M_Short 11
+#define df_Q_Long 12
+#define df_Q_Short 13
// ZeitFormatFlags
-#define tf_HMS_Long 0
-#define tf_HM_Long 1
-#define tf_HMS_Short 2
-#define tf_HM_Short 3
+#define tf_HMS_Long 0
+#define tf_HM_Long 1
+#define tf_HMS_Short 2
+#define tf_HM_Short 3
// Attribute fuer FormatVorlage
-#define pfValue 0x01
-#define pfFont 0x02
-#define pfJustify 0x04
-#define pfFrame 0x08
-#define pfRaster 0x10
-#define pfProtection 0x20
+#define pfValue 0x01
+#define pfFont 0x02
+#define pfJustify 0x04
+#define pfFrame 0x08
+#define pfRaster 0x10
+#define pfProtection 0x20
// Displayflags fuer die Tabelle
-#define dfFormula 0x0001 // Formeln
-#define dfZerro 0x0002 // Nullwerte
-#define dfGrid 0x0004 // Gitternetz
-#define dfPageBreak 0x0008 // Seitenumbruch
+#define dfFormula 0x0001 // Formeln
+#define dfZerro 0x0002 // Nullwerte
+#define dfGrid 0x0004 // Gitternetz
+#define dfPageBreak 0x0008 // Seitenumbruch
#define dfColRowBar 0x0010 // Zeilen/Spalten Koepfe (Dummy)
-#define dfSyntax 0x0020 // Syntax Highlighting
-#define dfPrintPage 0x0040 // Druckbildansicht (Dummy)
-#define dfObjectAll 0x0080 // Objekte anzeigen
-#define dfObjectFrame 0x0100 // Objekte als Platzhalter
-#define dfObjectNone 0x0200 // Objekte nicht anzeigen
-#define dfNoteMark 0x0400 // Notizanzeiger
-#define dfProtectMark 0x0800 // Schutzanzeiger
+#define dfSyntax 0x0020 // Syntax Highlighting
+#define dfPrintPage 0x0040 // Druckbildansicht (Dummy)
+#define dfObjectAll 0x0080 // Objekte anzeigen
+#define dfObjectFrame 0x0100 // Objekte als Platzhalter
+#define dfObjectNone 0x0200 // Objekte nicht anzeigen
+#define dfNoteMark 0x0400 // Notizanzeiger
+#define dfProtectMark 0x0800 // Schutzanzeiger
// Objekt Typen
-#define otNone 0 // s.u.
-#define otOle 1
-#define otImage 2
-#define otChart 3
+#define otNone 0 // s.u.
+#define otOle 1
+#define otImage 2
+#define otChart 3
// Grafik Typen
-#define gtNone 0 // Kann nicht vorkommen
-#define gtOle 1 // Ole 1.0 Objekt
-#define gtImage 2 // Image (Bitmap oder Metafile)
-#define gtChart 3 // Chart
+#define gtNone 0 // Kann nicht vorkommen
+#define gtOle 1 // Ole 1.0 Objekt
+#define gtImage 2 // Image (Bitmap oder Metafile)
+#define gtChart 3 // Chart
// Datum/Uhrzeit
struct Sc10DateTime
{
- USHORT Year;
- USHORT Month;
- USHORT Day;
- USHORT Hour;
- USHORT Min;
- USHORT Sec;
+ USHORT Year;
+ USHORT Month;
+ USHORT Day;
+ USHORT Hour;
+ USHORT Min;
+ USHORT Sec;
};
// ZahlenFormate
struct Sc10ValueFormat
{
- BYTE Format; // Zahl, Waehrung, Prozent etc.
- BYTE Info; // Anzahl Nachkommastellen, Anzahl Stellen, bzw. Datums/Zeitformat
+ BYTE Format; // Zahl, Waehrung, Prozent etc.
+ BYTE Info; // Anzahl Nachkommastellen, Anzahl Stellen, bzw. Datums/Zeitformat
};
// Fontbeschreibung
struct Sc10LogFont
{
- INT16 lfHeight;
- INT16 lfWidth;
- INT16 lfEscapement;
- INT16 lfOrientation;
- INT16 lfWeight;
- BYTE lfItalic;
- BYTE lfUnderline;
- BYTE lfStrikeOut;
- BYTE lfCharSet;
- BYTE lfOutPrecision;
- BYTE lfClipPrecision;
- BYTE lfQuality;
- BYTE lfPitchAndFamily;
- sal_Char lfFaceName[32];
+ INT16 lfHeight;
+ INT16 lfWidth;
+ INT16 lfEscapement;
+ INT16 lfOrientation;
+ INT16 lfWeight;
+ BYTE lfItalic;
+ BYTE lfUnderline;
+ BYTE lfStrikeOut;
+ BYTE lfCharSet;
+ BYTE lfOutPrecision;
+ BYTE lfClipPrecision;
+ BYTE lfQuality;
+ BYTE lfPitchAndFamily;
+ sal_Char lfFaceName[32];
int operator==( const Sc10LogFont& rData ) const;
};
@@ -226,69 +226,69 @@ struct Sc10LogFont
// RGB-Frabwerte
struct Sc10Color
{
- BYTE Dummy;
- BYTE Blue;
- BYTE Green;
- BYTE Red;
+ BYTE Dummy;
+ BYTE Blue;
+ BYTE Green;
+ BYTE Red;
int operator==( const Sc10Color& rColor ) const;
};
// Blockbeschreibung
struct Sc10BlockRect
{
- INT16 x1;
- INT16 y1;
- INT16 x2;
- INT16 y2;
+ INT16 x1;
+ INT16 y1;
+ INT16 x2;
+ INT16 y2;
};
// Datenbank-Bereich
struct Sc10DataBaseRec
{
- sal_Char Name[32];
- INT16 Tab;
- Sc10BlockRect Block;
- BYTE RowHeader;
- INT16 SortField0;
- BYTE SortUpOrder0;
- INT16 SortField1;
- BYTE SortUpOrder1;
- INT16 SortField2;
- BYTE SortUpOrder2;
- BYTE IncludeFormat;
- INT16 QueryField0;
- INT16 QueryOp0;
- BYTE QueryByString0;
- sal_Char QueryString0[64];
- double QueryValue0;
- INT16 QueryConnect1;
- INT16 QueryField1;
- INT16 QueryOp1;
- BYTE QueryByString1;
- sal_Char QueryString1[64];
- double QueryValue1;
- INT16 QueryConnect2;
- INT16 QueryField2;
- INT16 QueryOp2;
- BYTE QueryByString2;
- sal_Char QueryString2[64];
- double QueryValue2;
+ sal_Char Name[32];
+ INT16 Tab;
+ Sc10BlockRect Block;
+ BYTE RowHeader;
+ INT16 SortField0;
+ BYTE SortUpOrder0;
+ INT16 SortField1;
+ BYTE SortUpOrder1;
+ INT16 SortField2;
+ BYTE SortUpOrder2;
+ BYTE IncludeFormat;
+ INT16 QueryField0;
+ INT16 QueryOp0;
+ BYTE QueryByString0;
+ sal_Char QueryString0[64];
+ double QueryValue0;
+ INT16 QueryConnect1;
+ INT16 QueryField1;
+ INT16 QueryOp1;
+ BYTE QueryByString1;
+ sal_Char QueryString1[64];
+ double QueryValue1;
+ INT16 QueryConnect2;
+ INT16 QueryField2;
+ INT16 QueryOp2;
+ BYTE QueryByString2;
+ sal_Char QueryString2[64];
+ double QueryValue2;
};
// Kopf/Fusszeilen-Beschreibung
struct Sc10HeadFootLine
{
- sal_Char Title[128];
- Sc10LogFont LogFont;
- BYTE HorJustify;
- BYTE VerJustify;
- USHORT Raster;
- USHORT Frame;
- Sc10Color TextColor;
- Sc10Color BackColor;
- Sc10Color RasterColor;
- USHORT FrameColor; // Nibble Codierte Farben link oben rechts unten
- USHORT Reserved;
+ sal_Char Title[128];
+ Sc10LogFont LogFont;
+ BYTE HorJustify;
+ BYTE VerJustify;
+ USHORT Raster;
+ USHORT Frame;
+ Sc10Color TextColor;
+ Sc10Color BackColor;
+ Sc10Color RasterColor;
+ USHORT FrameColor; // Nibble Codierte Farben link oben rechts unten
+ USHORT Reserved;
int operator==( const Sc10HeadFootLine& rData ) const;
};
@@ -296,34 +296,34 @@ struct Sc10HeadFootLine
// Seitenformat
struct Sc10PageFormat
{
- Sc10HeadFootLine HeadLine;
- Sc10HeadFootLine FootLine;
- INT16 Orientation;
- INT16 Width;
- INT16 Height;
- INT16 NonPrintableX;
- INT16 NonPrintableY;
- INT16 Left;
- INT16 Top;
- INT16 Right;
- INT16 Bottom;
- INT16 Head;
- INT16 Foot;
- BYTE HorCenter;
- BYTE VerCenter;
- BYTE PrintGrid;
- BYTE PrintColRow;
- BYTE PrintNote;
- BYTE TopBottomDir;
- sal_Char PrintAreaName[32];
- Sc10BlockRect PrintArea;
- sal_Char PrnZoom[6]; // Pascal 6 Byte Realzahl
- USHORT FirstPageNo;
- INT16 RowRepeatStart;
- INT16 RowRepeatEnd;
- INT16 ColRepeatStart;
- INT16 ColRepeatEnd;
- sal_Char Reserved[26];
+ Sc10HeadFootLine HeadLine;
+ Sc10HeadFootLine FootLine;
+ INT16 Orientation;
+ INT16 Width;
+ INT16 Height;
+ INT16 NonPrintableX;
+ INT16 NonPrintableY;
+ INT16 Left;
+ INT16 Top;
+ INT16 Right;
+ INT16 Bottom;
+ INT16 Head;
+ INT16 Foot;
+ BYTE HorCenter;
+ BYTE VerCenter;
+ BYTE PrintGrid;
+ BYTE PrintColRow;
+ BYTE PrintNote;
+ BYTE TopBottomDir;
+ sal_Char PrintAreaName[32];
+ Sc10BlockRect PrintArea;
+ sal_Char PrnZoom[6]; // Pascal 6 Byte Realzahl
+ USHORT FirstPageNo;
+ INT16 RowRepeatStart;
+ INT16 RowRepeatEnd;
+ INT16 ColRepeatStart;
+ INT16 ColRepeatEnd;
+ sal_Char Reserved[26];
int operator==( const Sc10PageFormat& rData ) const;
};
@@ -331,89 +331,89 @@ struct Sc10PageFormat
// Tabellenschutz
struct Sc10TableProtect
{
- sal_Char PassWord[16];
- USHORT Flags;
- BYTE Protect;
+ sal_Char PassWord[16];
+ USHORT Flags;
+ BYTE Protect;
};
// Documentschutz
struct Sc10SheetProtect
{
- sal_Char PassWord[16];
- USHORT Flags;
- BYTE Protect;
+ sal_Char PassWord[16];
+ USHORT Flags;
+ BYTE Protect;
};
// Dateikopf StarCalc 1.0 Datei
struct Sc10FileHeader
{
- sal_Char CopyRight[30];
- USHORT Version;
- sal_Char Reserved[32];
+ sal_Char CopyRight[30];
+ USHORT Version;
+ sal_Char Reserved[32];
};
// Benutzer-Definierte Datei-Beschreibung
struct Sc10FileInfo
{
- sal_Char Title[64];
- sal_Char Thema[64];
- sal_Char Keys[64];
- sal_Char Note[256];
- sal_Char InfoLabel0[16];
- sal_Char InfoLabel1[16];
- sal_Char InfoLabel2[16];
- sal_Char InfoLabel3[16];
- sal_Char Info0[32];
- sal_Char Info1[32];
- sal_Char Info2[32];
- sal_Char Info3[32];
- sal_Char CreateAuthor[64];
- sal_Char ChangeAuthor[64];
- sal_Char PrintAuthor[64];
- Sc10DateTime CreateDate;
- Sc10DateTime ChangeDate;
- Sc10DateTime PrintDate;
- sal_uInt32 PageCount;
- sal_uInt32 ChartCount;
- sal_uInt32 PictureCount;
- sal_uInt32 GraphCount;
- sal_uInt32 OleCount;
- sal_uInt32 NoteCount;
- sal_uInt32 TextCellCount;
- sal_uInt32 ValueCellCount;
- sal_uInt32 FormulaCellCount;
- sal_uInt32 CellCount;
- sal_Char Reserved[52];
+ sal_Char Title[64];
+ sal_Char Thema[64];
+ sal_Char Keys[64];
+ sal_Char Note[256];
+ sal_Char InfoLabel0[16];
+ sal_Char InfoLabel1[16];
+ sal_Char InfoLabel2[16];
+ sal_Char InfoLabel3[16];
+ sal_Char Info0[32];
+ sal_Char Info1[32];
+ sal_Char Info2[32];
+ sal_Char Info3[32];
+ sal_Char CreateAuthor[64];
+ sal_Char ChangeAuthor[64];
+ sal_Char PrintAuthor[64];
+ Sc10DateTime CreateDate;
+ Sc10DateTime ChangeDate;
+ Sc10DateTime PrintDate;
+ sal_uInt32 PageCount;
+ sal_uInt32 ChartCount;
+ sal_uInt32 PictureCount;
+ sal_uInt32 GraphCount;
+ sal_uInt32 OleCount;
+ sal_uInt32 NoteCount;
+ sal_uInt32 TextCellCount;
+ sal_uInt32 ValueCellCount;
+ sal_uInt32 FormulaCellCount;
+ sal_uInt32 CellCount;
+ sal_Char Reserved[52];
};
// Letze Cursorposition
struct Sc10EditStateInfo
{
// Cursor Position
- USHORT CarretX;
- USHORT CarretY;
- USHORT CarretZ;
+ USHORT CarretX;
+ USHORT CarretY;
+ USHORT CarretZ;
// Linke obere Ecke der Tabelle im Fenster
- USHORT DeltaX;
- USHORT DeltaY;
- USHORT DeltaZ;
+ USHORT DeltaX;
+ USHORT DeltaY;
+ USHORT DeltaZ;
// Ueberfluessig in StarCalc 3.0
- BYTE DataBaseMode;
- sal_Char Reserved[51];
+ BYTE DataBaseMode;
+ sal_Char Reserved[51];
};
// Attribut-Eintrag
struct Sc10ColData
{
- USHORT Row;
- USHORT Value;
+ USHORT Row;
+ USHORT Value;
};
// ZellAttribut-Beschreibung
struct Sc10ColAttr
{
- USHORT Count;
- Sc10ColData* pData;
+ USHORT Count;
+ Sc10ColData* pData;
Sc10ColAttr() : pData(NULL) {}
};
@@ -421,115 +421,115 @@ struct Sc10ColAttr
// GraphHeader
struct Sc10GraphHeader
{
- BYTE Typ; // Typ der Grafik (Ole-Objekt, Image (Bitmap oder MetaFile), Chart-Object)
- INT16 CarretX; // ZellPosition der Grafik
- INT16 CarretY;
- INT16 CarretZ;
- INT32 x; // x,y Abstand zum Zellrand in Pixel (Pixel weil ich Grafiken in Fenstern ablege)
- INT32 y;
- INT32 w; // w,h Breite und Hoehe in Pixel
- INT32 h;
- BYTE IsRelPos; // Ist die Position relativ zur Zelle oder absolute in der Tabelle
- BYTE DoPrint; // Soll die Grafik ausgedruckt werden
- USHORT FrameType; // Art der Umrandung um die Grafik (Keine, Einfach, Doppelt, Einfach Dick, Doppelt Dick)
- BYTE IsTransparent; // Soll der Hintergrund gezeichnet werden
- Sc10Color FrameColor; // Umrandungsfarbe als RGB-Wert
- Sc10Color BackColor; // Hintergrundfarbe als RGB-Wert
- sal_Char Reserved[32]; // Na was wohl
+ BYTE Typ; // Typ der Grafik (Ole-Objekt, Image (Bitmap oder MetaFile), Chart-Object)
+ INT16 CarretX; // ZellPosition der Grafik
+ INT16 CarretY;
+ INT16 CarretZ;
+ INT32 x; // x,y Abstand zum Zellrand in Pixel (Pixel weil ich Grafiken in Fenstern ablege)
+ INT32 y;
+ INT32 w; // w,h Breite und Hoehe in Pixel
+ INT32 h;
+ BYTE IsRelPos; // Ist die Position relativ zur Zelle oder absolute in der Tabelle
+ BYTE DoPrint; // Soll die Grafik ausgedruckt werden
+ USHORT FrameType; // Art der Umrandung um die Grafik (Keine, Einfach, Doppelt, Einfach Dick, Doppelt Dick)
+ BYTE IsTransparent; // Soll der Hintergrund gezeichnet werden
+ Sc10Color FrameColor; // Umrandungsfarbe als RGB-Wert
+ Sc10Color BackColor; // Hintergrundfarbe als RGB-Wert
+ sal_Char Reserved[32]; // Na was wohl
};
// ImageHeader
struct Sc10ImageHeader
{
sal_Char FileName[128]; // Dateiname des urspruenglich eingefuegten Bildes
- INT16 Typ; // Typ der Grafik (Bitmap oder Metafile)
- BYTE Linked; // Kann nicht vorkommen
- INT16 x1; // Urspruengliche Groesse der Grafik (nur fuer Metafiles)
- INT16 y1;
- INT16 x2;
- INT16 y2;
- sal_uInt32 Size; // Groesse der Grafik in BYTES
+ INT16 Typ; // Typ der Grafik (Bitmap oder Metafile)
+ BYTE Linked; // Kann nicht vorkommen
+ INT16 x1; // Urspruengliche Groesse der Grafik (nur fuer Metafiles)
+ INT16 y1;
+ INT16 x2;
+ INT16 y2;
+ sal_uInt32 Size; // Groesse der Grafik in BYTES
};
// ChartHeader
struct Sc10ChartHeader
{
- INT16 MM; // Meatfile Struktur MapMode, Breite, Hoehe
- INT16 xExt;
- INT16 yExt;
- sal_uInt32 Size; // Groesse der Grafik in BYTES
+ INT16 MM; // Meatfile Struktur MapMode, Breite, Hoehe
+ INT16 xExt;
+ INT16 yExt;
+ sal_uInt32 Size; // Groesse der Grafik in BYTES
};
// ChartSheetData
struct Sc10ChartSheetData
{
- BYTE HasTitle; // Hat das Chart Daten aus der Tabell fuer einen Titel
- INT16 TitleX; // Zellposition des Titels
- INT16 TitleY;
- BYTE HasSubTitle; // Hat das Chart Daten aus der Tabell fuer einen Untertitel
- INT16 SubTitleX; // Zellposition des Untertitels
- INT16 SubTitleY;
- BYTE HasLeftTitle; // Hat das Chart Daten aus der Tabelle fuer einen Linken-Titel
- INT16 LeftTitleX; // Zellposition des Linken-Titels
- INT16 LeftTitleY;
- BYTE HasLegend; // Hat das Chart Daten aus der Tabelle fuer eine Legende
- INT16 LegendX1; // Zellen der Legende
- INT16 LegendY1;
- INT16 LegendX2;
- INT16 LegendY2;
- BYTE HasLabel; // Hat das Chart Daten aus der Tabelle fuer die Achsbeschriftung
- INT16 LabelX1; // Zellen der Achsbeschriftung
- INT16 LabelY1;
- INT16 LabelX2;
- INT16 LabelY2;
- INT16 DataX1; // Zellen der Daten
- INT16 DataY1;
- INT16 DataX2;
- INT16 DataY2;
- sal_Char Reserved[64];
+ BYTE HasTitle; // Hat das Chart Daten aus der Tabell fuer einen Titel
+ INT16 TitleX; // Zellposition des Titels
+ INT16 TitleY;
+ BYTE HasSubTitle; // Hat das Chart Daten aus der Tabell fuer einen Untertitel
+ INT16 SubTitleX; // Zellposition des Untertitels
+ INT16 SubTitleY;
+ BYTE HasLeftTitle; // Hat das Chart Daten aus der Tabelle fuer einen Linken-Titel
+ INT16 LeftTitleX; // Zellposition des Linken-Titels
+ INT16 LeftTitleY;
+ BYTE HasLegend; // Hat das Chart Daten aus der Tabelle fuer eine Legende
+ INT16 LegendX1; // Zellen der Legende
+ INT16 LegendY1;
+ INT16 LegendX2;
+ INT16 LegendY2;
+ BYTE HasLabel; // Hat das Chart Daten aus der Tabelle fuer die Achsbeschriftung
+ INT16 LabelX1; // Zellen der Achsbeschriftung
+ INT16 LabelY1;
+ INT16 LabelX2;
+ INT16 LabelY2;
+ INT16 DataX1; // Zellen der Daten
+ INT16 DataY1;
+ INT16 DataX2;
+ INT16 DataY2;
+ sal_Char Reserved[64];
};
-#define AGPie2D 1 // Pie Chart 2D
-#define AGPie3D 2 // Pie Chart 3D
-#define AGBar2D 3 // Bar Chart 2D
-#define AGBar3D 4 // Bar Chart 3D
-#define AGGantt 5 // Gantt Diagramm
-#define AGLine 6 // Line Chart
-#define AGLogLine 7 // Logarythmic-Coordinate Chart
-#define AGArea 8 // Area Chart
-#define AGHLC 11 // High-Low-Close Chart
-#define AGPolar 10 // Polar-Coordinate Chart
+#define AGPie2D 1 // Pie Chart 2D
+#define AGPie3D 2 // Pie Chart 3D
+#define AGBar2D 3 // Bar Chart 2D
+#define AGBar3D 4 // Bar Chart 3D
+#define AGGantt 5 // Gantt Diagramm
+#define AGLine 6 // Line Chart
+#define AGLogLine 7 // Logarythmic-Coordinate Chart
+#define AGArea 8 // Area Chart
+#define AGHLC 11 // High-Low-Close Chart
+#define AGPolar 10 // Polar-Coordinate Chart
typedef sal_Char Sc10ChartText[30];
struct Sc10ChartTypeData
{
- INT16 NumSets;
- INT16 NumPoints;
- INT16 DrawMode;
- INT16 GraphType;
- INT16 GraphStyle;
- sal_Char GraphTitle[80];
- sal_Char BottomTitle[80];
- INT16 SymbolData[256];
- INT16 ColorData[256];
- INT16 ThickLines[256];
- INT16 PatternData[256];
- INT16 LinePatternData[256];
- INT16 NumGraphStyles[11];
- INT16 ShowLegend;
- Sc10ChartText LegendText[256];
- INT16 ExplodePie;
- INT16 FontUse;
- INT16 FontFamily[5];
- INT16 FontStyle[5];
- INT16 FontSize[5];
- INT16 GridStyle;
- INT16 Labels;
- INT16 LabelEvery;
- Sc10ChartText LabelText[50];
- sal_Char LeftTitle[80];
- sal_Char Reserved[4646];
+ INT16 NumSets;
+ INT16 NumPoints;
+ INT16 DrawMode;
+ INT16 GraphType;
+ INT16 GraphStyle;
+ sal_Char GraphTitle[80];
+ sal_Char BottomTitle[80];
+ INT16 SymbolData[256];
+ INT16 ColorData[256];
+ INT16 ThickLines[256];
+ INT16 PatternData[256];
+ INT16 LinePatternData[256];
+ INT16 NumGraphStyles[11];
+ INT16 ShowLegend;
+ Sc10ChartText LegendText[256];
+ INT16 ExplodePie;
+ INT16 FontUse;
+ INT16 FontFamily[5];
+ INT16 FontStyle[5];
+ INT16 FontSize[5];
+ INT16 GridStyle;
+ INT16 Labels;
+ INT16 LabelEvery;
+ Sc10ChartText LabelText[50];
+ sal_Char LeftTitle[80];
+ sal_Char Reserved[4646];
};
@@ -537,10 +537,10 @@ struct Sc10ChartTypeData
class Sc10FontData : public ScDataObject
{
public:
- INT16 Height;
- BYTE CharSet;
- BYTE PitchAndFamily;
- sal_Char FaceName[32];
+ INT16 Height;
+ BYTE CharSet;
+ BYTE PitchAndFamily;
+ sal_Char FaceName[32];
Sc10FontData( const Sc10FontData& rData ) :
ScDataObject( rData ),
@@ -552,7 +552,7 @@ public:
FaceName[sizeof(FaceName)-1] = 0;
}
Sc10FontData( SvStream& rStream );
- virtual ScDataObject* Clone() const { return new Sc10FontData(*this); }
+ virtual ScDataObject* Clone() const { return new Sc10FontData(*this); }
};
@@ -563,8 +563,8 @@ protected:
ULONG nError;
public:
Sc10FontCollection( SvStream& rStream );
- ULONG GetError() { return nError; }
- Sc10FontData* At(USHORT nIndex) { return (Sc10FontData*)ScCollection::At(nIndex); }
+ ULONG GetError() { return nError; }
+ Sc10FontData* At(USHORT nIndex) { return (Sc10FontData*)ScCollection::At(nIndex); }
private:
using ScCollection::At;
};
@@ -574,9 +574,9 @@ private:
class Sc10NameData : public ScDataObject
{
public :
- sal_Char Name[32];
- sal_Char Reference[64];
- sal_Char Reserved[12];
+ sal_Char Name[32];
+ sal_Char Reference[64];
+ sal_Char Reserved[12];
Sc10NameData(const Sc10NameData& rData) :
ScDataObject( rData )
@@ -588,7 +588,7 @@ public :
memcpy(Reserved, rData.Reserved, sizeof(Reserved));
}
Sc10NameData(SvStream& rStream);
- virtual ScDataObject* Clone() const { return new Sc10NameData(*this); }
+ virtual ScDataObject* Clone() const { return new Sc10NameData(*this); }
};
@@ -596,11 +596,11 @@ public :
class Sc10NameCollection : public ScCollection
{
protected:
- ULONG nError;
+ ULONG nError;
public:
Sc10NameCollection(SvStream& rStream);
-ULONG GetError() { return nError; }
-Sc10NameData* At(USHORT nIndex) { return (Sc10NameData*)ScCollection::At(nIndex); }
+ULONG GetError() { return nError; }
+Sc10NameData* At(USHORT nIndex) { return (Sc10NameData*)ScCollection::At(nIndex); }
private:
using ScCollection::At;
};
@@ -610,18 +610,18 @@ private:
class Sc10PatternData : public ScDataObject
{
public:
- sal_Char Name[32];
- Sc10ValueFormat ValueFormat;
- Sc10LogFont LogFont;
- USHORT Attr;
- USHORT Justify;
- USHORT Frame;
- USHORT Raster;
- USHORT nColor;
- USHORT FrameColor;
- USHORT Flags;
- USHORT FormatFlags;
- sal_Char Reserved[8];
+ sal_Char Name[32];
+ Sc10ValueFormat ValueFormat;
+ Sc10LogFont LogFont;
+ USHORT Attr;
+ USHORT Justify;
+ USHORT Frame;
+ USHORT Raster;
+ USHORT nColor;
+ USHORT FrameColor;
+ USHORT Flags;
+ USHORT FormatFlags;
+ sal_Char Reserved[8];
Sc10PatternData(const Sc10PatternData& rData) :
ScDataObject( rData )
@@ -641,7 +641,7 @@ public:
memcpy(Reserved, rData.Reserved, sizeof(Reserved));
}
Sc10PatternData(SvStream& rStream);
-virtual ScDataObject* Clone() const { return new Sc10PatternData(*this); }
+virtual ScDataObject* Clone() const { return new Sc10PatternData(*this); }
};
@@ -649,11 +649,11 @@ virtual ScDataObject* Clone() const { return new Sc10PatternData(*this); }
class Sc10PatternCollection : public ScCollection
{
protected:
- ULONG nError;
+ ULONG nError;
public:
Sc10PatternCollection(SvStream& rStream);
- ULONG GetError() { return nError; }
- Sc10PatternData* At(USHORT nIndex) { return (Sc10PatternData*)ScCollection::At(nIndex); }
+ ULONG GetError() { return nError; }
+ Sc10PatternData* At(USHORT nIndex) { return (Sc10PatternData*)ScCollection::At(nIndex); }
private:
using ScCollection::At;
};
@@ -663,7 +663,7 @@ private:
class Sc10DataBaseData : public ScDataObject
{
public:
- Sc10DataBaseRec DataBaseRec;
+ Sc10DataBaseRec DataBaseRec;
Sc10DataBaseData(const Sc10DataBaseData& rData) :
ScDataObject( rData )
@@ -671,7 +671,7 @@ public:
memcpy(&DataBaseRec, &rData.DataBaseRec, sizeof(DataBaseRec));
}
Sc10DataBaseData(SvStream& rStream);
-virtual ScDataObject* Clone() const { return new Sc10DataBaseData(*this); }
+virtual ScDataObject* Clone() const { return new Sc10DataBaseData(*this); }
};
@@ -679,12 +679,12 @@ virtual ScDataObject* Clone() const { return new Sc10DataBaseData(*this);
class Sc10DataBaseCollection : public ScCollection
{
protected:
- ULONG nError;
- sal_Char ActName[32];
+ ULONG nError;
+ sal_Char ActName[32];
public:
Sc10DataBaseCollection(SvStream& rStream);
- ULONG GetError() { return nError; }
- Sc10DataBaseData* At(USHORT nIndex) { return (Sc10DataBaseData*)ScCollection::At(nIndex); }
+ ULONG GetError() { return nError; }
+ Sc10DataBaseData* At(USHORT nIndex) { return (Sc10DataBaseData*)ScCollection::At(nIndex); }
private:
using ScCollection::At;
};
@@ -693,11 +693,11 @@ private:
class Sc10PageData : public ScDataObject
{
public:
- Sc10PageFormat aPageFormat;
+ Sc10PageFormat aPageFormat;
Sc10PageData( const Sc10PageFormat& rFormat ) : aPageFormat(rFormat) {}
- int operator==( const Sc10PageData& rData ) const
+ int operator==( const Sc10PageData& rData ) const
{ return aPageFormat == rData.aPageFormat; }
- virtual ScDataObject* Clone() const;
+ virtual ScDataObject* Clone() const;
};
// Seitenformat-Collection
@@ -705,9 +705,9 @@ class Sc10PageCollection : public ScCollection
{
public:
Sc10PageCollection() : ScCollection(1,1) {};
- Sc10PageData* At(USHORT nIndex) { return (Sc10PageData*)ScCollection::At(nIndex); }
+ Sc10PageData* At(USHORT nIndex) { return (Sc10PageData*)ScCollection::At(nIndex); }
USHORT InsertFormat( const Sc10PageFormat& rData );
- void PutToDoc( ScDocument* pDoc );
+ void PutToDoc( ScDocument* pDoc );
private:
using ScCollection::At;
};
@@ -718,46 +718,46 @@ class ScfStreamProgressBar;
// Import-Klasse
class Sc10Import
{
- SvStream& rStream;
- ScDocument* pDoc;
- Sc10Color TextPalette[16];
- Sc10Color BackPalette[16];
- Sc10Color RasterPalette[16];
- Sc10Color FramePalette[16];
- Sc10SheetProtect SheetProtect;
- Sc10FontCollection* pFontCollection;
- Sc10NameCollection* pNameCollection;
- Sc10PatternCollection* pPatternCollection;
- Sc10DataBaseCollection* pDataBaseCollection;
+ SvStream& rStream;
+ ScDocument* pDoc;
+ Sc10Color TextPalette[16];
+ Sc10Color BackPalette[16];
+ Sc10Color RasterPalette[16];
+ Sc10Color FramePalette[16];
+ Sc10SheetProtect SheetProtect;
+ Sc10FontCollection* pFontCollection;
+ Sc10NameCollection* pNameCollection;
+ Sc10PatternCollection* pPatternCollection;
+ Sc10DataBaseCollection* pDataBaseCollection;
ULONG nError;
- INT16 TabCount;
- SCTAB nShowTab;
- ScViewOptions aSc30ViewOpt;
+ INT16 TabCount;
+ SCTAB nShowTab;
+ ScViewOptions aSc30ViewOpt;
ScfStreamProgressBar* pPrgrsBar;
public:
Sc10Import( SvStream& rStr, ScDocument* pDocument );
~Sc10Import();
- ULONG Import();
- void LoadFileHeader();
- void LoadFileInfo();
- void LoadEditStateInfo();
- void LoadProtect();
- void LoadViewColRowBar();
- void LoadScrZoom();
- void LoadPalette();
- void LoadFontCollection();
- void LoadNameCollection();
- void ImportNameCollection();
- void LoadPatternCollection();
- void LoadDataBaseCollection();
- void LoadTables();
- void LoadCol(SCCOL Col, SCTAB Tab);
- void LoadColAttr(SCCOL Col, SCTAB Tab);
- void LoadAttr(Sc10ColAttr& rAttr);
- void ChangeFormat(USHORT nFormat, USHORT nInfo, ULONG& nKey);
- void LoadObjects();
+ ULONG Import();
+ void LoadFileHeader();
+ void LoadFileInfo();
+ void LoadEditStateInfo();
+ void LoadProtect();
+ void LoadViewColRowBar();
+ void LoadScrZoom();
+ void LoadPalette();
+ void LoadFontCollection();
+ void LoadNameCollection();
+ void ImportNameCollection();
+ void LoadPatternCollection();
+ void LoadDataBaseCollection();
+ void LoadTables();
+ void LoadCol(SCCOL Col, SCTAB Tab);
+ void LoadColAttr(SCCOL Col, SCTAB Tab);
+ void LoadAttr(Sc10ColAttr& rAttr);
+ void ChangeFormat(USHORT nFormat, USHORT nInfo, ULONG& nKey);
+ void LoadObjects();
};
#endif
diff --git a/sc/source/filter/inc/scfobj.hxx b/sc/source/filter/inc/scfobj.hxx
index 4ed1784f4354..4a1aad12efaf 100644
--- a/sc/source/filter/inc/scfobj.hxx
+++ b/sc/source/filter/inc/scfobj.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/scmem.h b/sc/source/filter/inc/scmem.h
index 03e30c1e9fc6..4b25ede595cc 100644
--- a/sc/source/filter/inc/scmem.h
+++ b/sc/source/filter/inc/scmem.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
diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx
index 06a37639be89..d0972786c3d2 100644
--- a/sc/source/filter/inc/tokstack.hxx
+++ b/sc/source/filter/inc/tokstack.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,21 +41,21 @@ typedef OpCode DefTokenId;
//typedef UINT16 TokenId;
struct TokenId
{
- UINT16 nId;
+ UINT16 nId;
TokenId() : nId( 0 ) {}
TokenId( UINT16 n ) : nId( n ) {}
TokenId( const TokenId& r ) : nId( r.nId ) {}
- inline TokenId& operator =( const TokenId& r ) { nId = r.nId; return *this; }
- inline TokenId& operator =( UINT16 n ) { nId = n; return *this; }
- inline operator UINT16&() { return nId; }
- inline operator const UINT16&() const { return nId; }
- inline BOOL operator <( UINT16 n ) const { return nId < n; }
- inline BOOL operator >( UINT16 n ) const { return nId > n; }
- inline BOOL operator <=( UINT16 n ) const { return nId <= n; }
- inline BOOL operator >=( UINT16 n ) const { return nId >= n; }
- inline BOOL operator ==( UINT16 n ) const { return nId == n; }
- inline BOOL operator !=( UINT16 n ) const { return nId != n; }
+ inline TokenId& operator =( const TokenId& r ) { nId = r.nId; return *this; }
+ inline TokenId& operator =( UINT16 n ) { nId = n; return *this; }
+ inline operator UINT16&() { return nId; }
+ inline operator const UINT16&() const { return nId; }
+ inline BOOL operator <( UINT16 n ) const { return nId < n; }
+ inline BOOL operator >( UINT16 n ) const { return nId > n; }
+ inline BOOL operator <=( UINT16 n ) const { return nId <= n; }
+ inline BOOL operator >=( UINT16 n ) const { return nId >= n; }
+ inline BOOL operator ==( UINT16 n ) const { return nId == n; }
+ inline BOOL operator !=( UINT16 n ) const { return nId != n; }
};
@@ -67,20 +67,20 @@ class ScToken;
enum E_TYPE
{
- T_Id, // Id-Folge
- T_Str, // String
- T_D, // Double
+ T_Id, // Id-Folge
+ T_Str, // String
+ T_D, // Double
T_Err, // Error code
- T_RefC, // Cell Reference
- T_RefA, // Area Reference
- T_RN, // Range Name
- T_Ext, // irgendwas Unbekanntes mit Funktionsnamen
- T_Nlf, // token for natural language formula
- T_Matrix, // token for inline arrays
+ T_RefC, // Cell Reference
+ T_RefA, // Area Reference
+ T_RN, // Range Name
+ T_Ext, // irgendwas Unbekanntes mit Funktionsnamen
+ T_Nlf, // token for natural language formula
+ T_Matrix, // token for inline arrays
T_ExtName, // token for external names
T_ExtRefC,
T_ExtRefA,
- T_Error // fuer Abfrage im Fehlerfall
+ T_Error // fuer Abfrage im Fehlerfall
};
@@ -91,50 +91,50 @@ class TokenPool
// !ACHTUNG!: externe Id-Basis ist 1, interne 0!
// Ausgabe Id = 0 -> Fehlerfall
private:
- String** ppP_Str; // Pool fuer Strings
- UINT16 nP_Str; // ...mit Groesse
- UINT16 nP_StrAkt; // ...und Schreibmarke
+ String** ppP_Str; // Pool fuer Strings
+ UINT16 nP_Str; // ...mit Groesse
+ UINT16 nP_StrAkt; // ...und Schreibmarke
- double* pP_Dbl; // Pool fuer Doubles
- UINT16 nP_Dbl;
- UINT16 nP_DblAkt;
+ double* pP_Dbl; // Pool fuer Doubles
+ UINT16 nP_Dbl;
+ UINT16 nP_DblAkt;
USHORT* pP_Err; // Pool for error codes
UINT16 nP_Err;
UINT16 nP_ErrAkt;
- ScSingleRefData** ppP_RefTr; // Pool fuer Referenzen
- UINT16 nP_RefTr;
- UINT16 nP_RefTrAkt;
+ ScSingleRefData** ppP_RefTr; // Pool fuer Referenzen
+ UINT16 nP_RefTr;
+ UINT16 nP_RefTrAkt;
- UINT16* pP_Id; // Pool fuer Id-Folgen
- UINT16 nP_Id;
- UINT16 nP_IdAkt;
- UINT16 nP_IdLast; // letzter Folgen-Beginn
+ UINT16* pP_Id; // Pool fuer Id-Folgen
+ UINT16 nP_Id;
+ UINT16 nP_IdAkt;
+ UINT16 nP_IdLast; // letzter Folgen-Beginn
- struct EXTCONT
+ struct EXTCONT
{
- DefTokenId eId;
- String aText;
+ DefTokenId eId;
+ String aText;
EXTCONT( const DefTokenId e, const String& r ) :
eId( e ), aText( r ){}
};
- EXTCONT** ppP_Ext;
- UINT16 nP_Ext;
- UINT16 nP_ExtAkt;
+ EXTCONT** ppP_Ext;
+ UINT16 nP_Ext;
+ UINT16 nP_ExtAkt;
- struct NLFCONT
+ struct NLFCONT
{
- ScSingleRefData aRef;
- NLFCONT( const ScSingleRefData& r ) : aRef( r ) {}
+ ScSingleRefData aRef;
+ NLFCONT( const ScSingleRefData& r ) : aRef( r ) {}
};
- NLFCONT** ppP_Nlf;
- UINT16 nP_Nlf;
- UINT16 nP_NlfAkt;
+ NLFCONT** ppP_Nlf;
+ UINT16 nP_Nlf;
+ UINT16 nP_NlfAkt;
- ScMatrix** ppP_Matrix; // Pool fuer Matricies
- UINT16 nP_Matrix;
- UINT16 nP_MatrixAkt;
+ ScMatrix** ppP_Matrix; // Pool fuer Matricies
+ UINT16 nP_Matrix;
+ UINT16 nP_MatrixAkt;
/** for storage of external names */
struct ExtName
@@ -148,7 +148,7 @@ class TokenPool
struct ExtCellRef
{
sal_uInt16 mnFileId;
- String maTabName;
+ String maTabName;
ScSingleRefData maRef;
};
::std::vector<ExtCellRef> maExtCellRefs;
@@ -157,69 +157,69 @@ class TokenPool
struct ExtAreaRef
{
sal_uInt16 mnFileId;
- String maTabName;
+ String maTabName;
ScComplexRefData maRef;
};
::std::vector<ExtAreaRef> maExtAreaRefs;
- UINT16* pElement; // Array mit Indizes fuer Elemente
- E_TYPE* pType; // ...mit Typ-Info
- UINT16* pSize; // ...mit Laengenangabe (Anz. UINT16)
- UINT16 nElement;
- UINT16 nElementAkt;
+ UINT16* pElement; // Array mit Indizes fuer Elemente
+ E_TYPE* pType; // ...mit Typ-Info
+ UINT16* pSize; // ...mit Laengenangabe (Anz. UINT16)
+ UINT16 nElement;
+ UINT16 nElementAkt;
- static const UINT16 nScTokenOff;// Offset fuer SC-Token
+ static const UINT16 nScTokenOff;// Offset fuer SC-Token
#ifdef DBG_UTIL
- UINT16 nRek; // Rekursionszaehler
+ UINT16 nRek; // Rekursionszaehler
#endif
- ScTokenArray* pScToken; // Tokenbastler
+ ScTokenArray* pScToken; // Tokenbastler
- void GrowString( void );
- void GrowDouble( void );
+ void GrowString( void );
+ void GrowDouble( void );
//UNUSED2009-05 void GrowError( void );
- void GrowTripel( void );
- void GrowId( void );
- void GrowElement( void );
- void GrowExt( void );
- void GrowNlf( void );
- void GrowMatrix( void );
- void GetElement( const UINT16 nId );
- void GetElementRek( const UINT16 nId );
+ void GrowTripel( void );
+ void GrowId( void );
+ void GrowElement( void );
+ void GrowExt( void );
+ void GrowNlf( void );
+ void GrowMatrix( void );
+ void GetElement( const UINT16 nId );
+ void GetElementRek( const UINT16 nId );
public:
TokenPool( void );
~TokenPool();
- inline TokenPool& operator <<( const TokenId nId );
- inline TokenPool& operator <<( const DefTokenId eId );
- inline TokenPool& operator <<( TokenStack& rStack );
- void operator >>( TokenId& rId );
- inline void operator >>( TokenStack& rStack );
- inline const TokenId Store( void );
- const TokenId Store( const double& rDouble );
+ inline TokenPool& operator <<( const TokenId nId );
+ inline TokenPool& operator <<( const DefTokenId eId );
+ inline TokenPool& operator <<( TokenStack& rStack );
+ void operator >>( TokenId& rId );
+ inline void operator >>( TokenStack& rStack );
+ inline const TokenId Store( void );
+ const TokenId Store( const double& rDouble );
//UNUSED2008-05 const TokenId StoreError( USHORT nError );
// nur fuer Range-Names
- const TokenId Store( const UINT16 nIndex );
- inline const TokenId Store( const INT16 nWert );
- const TokenId Store( const String& rString );
- const TokenId Store( const ScSingleRefData& rTr );
- const TokenId Store( const ScComplexRefData& rTr );
+ const TokenId Store( const UINT16 nIndex );
+ inline const TokenId Store( const INT16 nWert );
+ const TokenId Store( const String& rString );
+ const TokenId Store( const ScSingleRefData& rTr );
+ const TokenId Store( const ScComplexRefData& rTr );
- const TokenId Store( const DefTokenId eId, const String& rName );
+ const TokenId Store( const DefTokenId eId, const String& rName );
// 4 externals (e.g. AddIns, Makros...)
- const TokenId StoreNlf( const ScSingleRefData& rTr );
+ const TokenId StoreNlf( const ScSingleRefData& rTr );
const TokenId StoreMatrix();
const TokenId StoreExtName( sal_uInt16 nFileId, const String& rName );
const TokenId StoreExtRef( sal_uInt16 nFileId, const String& rTabName, const ScSingleRefData& rRef );
const TokenId StoreExtRef( sal_uInt16 nFileId, const String& rTabName, const ScComplexRefData& rRef );
- inline const TokenId LastId( void ) const;
- inline const ScTokenArray* operator []( const TokenId nId );
- void Reset( void );
- inline E_TYPE GetType( const TokenId& nId ) const;
- BOOL IsSingleOp( const TokenId& nId, const DefTokenId eId ) const;
+ inline const TokenId LastId( void ) const;
+ inline const ScTokenArray* operator []( const TokenId nId );
+ void Reset( void );
+ inline E_TYPE GetType( const TokenId& nId ) const;
+ BOOL IsSingleOp( const TokenId& nId, const DefTokenId eId ) const;
const String* GetExternal( const TokenId& nId ) const;
//UNUSED2008-05 const String* GetString( const TokenId& nId ) const;
- ScMatrix* GetMatrix( unsigned int n ) const;
+ ScMatrix* GetMatrix( unsigned int n ) const;
};
@@ -227,22 +227,22 @@ class TokenPool
class TokenStack
// Stack fuer Token-Ids: Id 0 sollte reserviert bleiben als
- // fehlerhafte Id, da z.B. Get() im Fehlerfall 0 liefert
+ // fehlerhafte Id, da z.B. Get() im Fehlerfall 0 liefert
{
private:
- TokenId* pStack; // Stack als Array
- UINT16 nPos; // Schreibmarke
- UINT16 nSize; // Erster Index ausserhalb des Stacks
+ TokenId* pStack; // Stack als Array
+ UINT16 nPos; // Schreibmarke
+ UINT16 nSize; // Erster Index ausserhalb des Stacks
public:
TokenStack( UINT16 nNewSize = 1024 );
~TokenStack();
- inline TokenStack& operator <<( const TokenId nNewId );
- inline void operator >>( TokenId &rId );
+ inline TokenStack& operator <<( const TokenId nNewId );
+ inline void operator >>( TokenId &rId );
- inline void Reset( void );
+ inline void Reset( void );
inline bool HasMoreTokens() const { return nPos > 0; }
- inline const TokenId Get( void );
+ inline const TokenId Get( void );
};
@@ -303,7 +303,7 @@ inline void TokenStack::Reset( void )
inline TokenPool& TokenPool::operator <<( const TokenId nId )
{
// POST: nId's werden hintereinander im Pool unter einer neuen Id
- // abgelegt. Vorgang wird mit >> oder Store() abgeschlossen
+ // abgelegt. Vorgang wird mit >> oder Store() abgeschlossen
// nId -> ( UINT16 ) nId - 1;
DBG_ASSERT( ( UINT16 ) nId < nScTokenOff,
"-TokenPool::operator <<: TokenId im DefToken-Bereich!" );
diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h
index 93cc074d89f6..d7055b51e17d 100644
--- a/sc/source/filter/inc/tool.h
+++ b/sc/source/filter/inc/tool.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
@@ -32,18 +32,18 @@
#include <document.hxx>
// Defaultwerte
-const BYTE nDezStd = 0; // Dezimalstellen fuer Standard-Zellen
-const BYTE nDezFloat = 2; // " " Float-Zellen
+const BYTE nDezStd = 0; // Dezimalstellen fuer Standard-Zellen
+const BYTE nDezFloat = 2; // " " Float-Zellen
-void PutFormString( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char *pString );
+void PutFormString( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char *pString );
-void SetFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, BYTE nFormat, BYTE nSt );
+void SetFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, BYTE nFormat, BYTE nSt );
-void InitPage( void );
+void InitPage( void );
-String DosToSystem( sal_Char *pSource );
+String DosToSystem( sal_Char *pSource );
-double SnumToDouble( INT16 nVal );
+double SnumToDouble( INT16 nVal );
double Snum32ToDouble( UINT32 nValue );
@@ -56,8 +56,8 @@ typedef UINT16 StampTyp;
class FormIdent
{
private:
- StampTyp nStamp; // Identifikations-Schluessel
- SfxUInt32Item* pAttr; // zugehoeriges Attribut
+ StampTyp nStamp; // Identifikations-Schluessel
+ SfxUInt32Item* pAttr; // zugehoeriges Attribut
public:
FormIdent( void )
{
@@ -77,27 +77,27 @@ public:
pAttr = NULL;
}
- BOOL operator ==( const FormIdent& rComp ) const
+ BOOL operator ==( const FormIdent& rComp ) const
{
return ( nStamp == rComp.nStamp );
}
- BOOL operator ==( const StampTyp& rStamp ) const
+ BOOL operator ==( const StampTyp& rStamp ) const
{
return ( nStamp == rStamp );
}
- StampTyp GetStamp( void ) const
+ StampTyp GetStamp( void ) const
{
return nStamp;
}
- SfxUInt32Item* GetAttr( void )
+ SfxUInt32Item* GetAttr( void )
{
return pAttr;
}
- void SetStamp( BYTE nFormat, BYTE nSt )
+ void SetStamp( BYTE nFormat, BYTE nSt )
{
nStamp = MAKE_STAMP( nFormat, nSt );
}
@@ -112,21 +112,21 @@ public:
class FormCache
{
private:
- FormIdent aIdents[ __nSize ]; //gepufferte Formate
- BOOL bValid[ __nSize ];
- FormIdent aCompareIdent; // zum Vergleichen
- BYTE nDefaultFormat; // Defaultformat der Datei
- SvNumberFormatter* pFormTable; // Value-Format-Table-Anker
- StampTyp nIndex;
- LanguageType eLanguage; // Systemsprache
-
- SfxUInt32Item* NewAttr( BYTE nFormat, BYTE nSt );
+ FormIdent aIdents[ __nSize ]; //gepufferte Formate
+ BOOL bValid[ __nSize ];
+ FormIdent aCompareIdent; // zum Vergleichen
+ BYTE nDefaultFormat; // Defaultformat der Datei
+ SvNumberFormatter* pFormTable; // Value-Format-Table-Anker
+ StampTyp nIndex;
+ LanguageType eLanguage; // Systemsprache
+
+ SfxUInt32Item* NewAttr( BYTE nFormat, BYTE nSt );
public:
FormCache( ScDocument*, BYTE nNewDefaultFormat = 0xFF );
~FormCache();
- inline const SfxUInt32Item* GetAttr( BYTE nFormat, BYTE nSt );
- void SetDefaultFormat( BYTE nD = 0xFF )
+ inline const SfxUInt32Item* GetAttr( BYTE nFormat, BYTE nSt );
+ void SetDefaultFormat( BYTE nD = 0xFF )
{
nDefaultFormat = nD;
}
@@ -135,11 +135,11 @@ public:
inline const SfxUInt32Item* FormCache::GetAttr( BYTE nFormat, BYTE nSt )
{
- // PREC: nFormat = Lotus-Format-Byte
- // nSt = Stellenzahl
- // POST: return = zu nFormat und nSt passendes SC-Format
- SfxUInt32Item* pAttr;
- SfxUInt32Item* pRet;
+ // PREC: nFormat = Lotus-Format-Byte
+ // nSt = Stellenzahl
+ // POST: return = zu nFormat und nSt passendes SC-Format
+ SfxUInt32Item* pAttr;
+ SfxUInt32Item* pRet;
aCompareIdent.SetStamp( nFormat, nSt );
nIndex = aCompareIdent.GetStamp();
diff --git a/sc/source/filter/inc/xcl97dum.hxx b/sc/source/filter/inc/xcl97dum.hxx
index a76a93321557..8f46b55a7c2c 100644
--- a/sc/source/filter/inc/xcl97dum.hxx
+++ b/sc/source/filter/inc/xcl97dum.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx
index fde03337cc0f..e40e3f1015a9 100644
--- a/sc/source/filter/inc/xcl97esc.hxx
+++ b/sc/source/filter/inc/xcl97esc.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -103,11 +103,11 @@ public:
virtual EscherExHostAppData* StartShape(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& rxShape,
const Rectangle* pChildAnchor );
- virtual void EndShape( UINT16 nShapeType, UINT32 nShapeID );
- virtual EscherExHostAppData* EnterAdditionalTextGroup();
+ virtual void EndShape( UINT16 nShapeType, UINT32 nShapeID );
+ virtual EscherExHostAppData* EnterAdditionalTextGroup();
/// Flush and merge PicStream into EscherStream
- void EndDocument();
+ void EndDocument();
#if EXC_EXP_OCX_CTRL
/** Creates an OCX form control OBJ record from the passed form control.
@@ -151,13 +151,13 @@ private:
class XclEscherHostAppData : public EscherExHostAppData
{
private:
- BOOL bStackedGroup;
+ BOOL bStackedGroup;
public:
XclEscherHostAppData() : bStackedGroup( FALSE )
{}
- inline void SetStackedGroup( BOOL b ) { bStackedGroup = b; }
- inline BOOL IsStackedGroup() const { return bStackedGroup; }
+ inline void SetStackedGroup( BOOL b ) { bStackedGroup = b; }
+ inline BOOL IsStackedGroup() const { return bStackedGroup; }
};
diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx
index 201562fa752c..82db77305dff 100644
--- a/sc/source/filter/inc/xcl97rec.hxx
+++ b/sc/source/filter/inc/xcl97rec.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +75,11 @@ protected:
XclEscherEx& mrEscherEx;
XclExpMsoDrawing* pMsodrawing;
XclExpMsoDrawing* pClientTextbox;
- XclTxo* pTxo;
+ XclTxo* pTxo;
sal_uInt16 mnObjType;
- UINT16 nObjId;
- UINT16 nGrbit;
- BOOL bFirstOnSheet;
+ UINT16 nObjId;
+ UINT16 nGrbit;
+ BOOL bFirstOnSheet;
bool mbOwnEscher; /// true = Escher part created on the fly.
@@ -92,26 +92,26 @@ protected:
// overwritten for writing MSODRAWING record
virtual void WriteBody( XclExpStream& rStrm );
virtual void WriteSubRecs( XclExpStream& rStrm );
- void SaveTextRecs( XclExpStream& rStrm );
+ void SaveTextRecs( XclExpStream& rStrm );
public:
- virtual ~XclObj();
+ virtual ~XclObj();
inline sal_uInt16 GetObjType() const { return mnObjType; }
- inline void SetId( UINT16 nId ) { nObjId = nId; }
+ inline void SetId( UINT16 nId ) { nObjId = nId; }
- inline void SetLocked( BOOL b )
+ inline void SetLocked( BOOL b )
{ b ? nGrbit |= 0x0001 : nGrbit &= ~0x0001; }
- inline void SetPrintable( BOOL b )
+ inline void SetPrintable( BOOL b )
{ b ? nGrbit |= 0x0010 : nGrbit &= ~0x0010; }
- inline void SetAutoFill( BOOL b )
+ inline void SetAutoFill( BOOL b )
{ b ? nGrbit |= 0x2000 : nGrbit &= ~0x2000; }
- inline void SetAutoLine( BOOL b )
+ inline void SetAutoLine( BOOL b )
{ b ? nGrbit |= 0x4000 : nGrbit &= ~0x4000; }
// set corresponding Excel object type in OBJ/ftCmo
- void SetEscherShapeType( UINT16 nType );
+ void SetEscherShapeType( UINT16 nType );
inline void SetEscherShapeTypeGroup() { mnObjType = EXC_OBJTYPE_GROUP; }
/** If set to true, this object has created its own escher data.
@@ -129,7 +129,7 @@ public:
//! actually writes ESCHER_ClientTextbox
void SetText( const XclExpRoot& rRoot, const SdrTextObj& rObj );
- virtual void Save( XclExpStream& rStrm );
+ virtual void Save( XclExpStream& rStrm );
};
// --- class XclObjComment -------------------------------------------
@@ -139,7 +139,7 @@ class XclObjComment : public XclObj
public:
XclObjComment( XclExpObjectManager& rObjMgr,
const Rectangle& rRect, const EditTextObject& rEditObj, SdrObject* pCaption, bool bVisible );
- virtual ~XclObjComment();
+ virtual ~XclObjComment();
/** c'tor process for formatted text objects above .
@descr used to construct the MSODRAWING Escher object properties. */
@@ -147,7 +147,7 @@ public:
const Rectangle& rRect, SdrObject* pCaption, bool bVisible );
- virtual void Save( XclExpStream& rStrm );
+ virtual void Save( XclExpStream& rStrm );
};
@@ -156,14 +156,14 @@ public:
class XclObjDropDown : public XclObj
{
private:
- BOOL bIsFiltered;
+ BOOL bIsFiltered;
virtual void WriteSubRecs( XclExpStream& rStrm );
protected:
public:
XclObjDropDown( XclExpObjectManager& rObjMgr, const ScAddress& rPos, BOOL bFilt );
- virtual ~XclObjDropDown();
+ virtual ~XclObjDropDown();
};
@@ -181,9 +181,9 @@ public:
inline void SetHorAlign( sal_uInt8 nHorAlign ) { mnHorAlign = nHorAlign; }
inline void SetVerAlign( sal_uInt8 nVerAlign ) { mnVerAlign = nVerAlign; }
- virtual void Save( XclExpStream& rStrm );
+ virtual void Save( XclExpStream& rStrm );
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
private:
@@ -203,16 +203,16 @@ class XclObjOle : public XclObj
{
private:
- const SdrObject& rOleObj;
+ const SdrObject& rOleObj;
SotStorage* pRootStorage;
virtual void WriteSubRecs( XclExpStream& rStrm );
public:
XclObjOle( XclExpObjectManager& rObjMgr, const SdrObject& rObj );
- virtual ~XclObjOle();
+ virtual ~XclObjOle();
- virtual void Save( XclExpStream& rStrm );
+ virtual void Save( XclExpStream& rStrm );
};
@@ -225,9 +225,9 @@ private:
public:
XclObjAny( XclExpObjectManager& rObjMgr );
- virtual ~XclObjAny();
+ virtual ~XclObjAny();
- virtual void Save( XclExpStream& rStrm );
+ virtual void Save( XclExpStream& rStrm );
};
@@ -236,15 +236,15 @@ public:
class ExcBof8_Base : public ExcBof_Base
{
protected:
- UINT32 nFileHistory; // bfh
- UINT32 nLowestBiffVer; // sfo
+ UINT32 nFileHistory; // bfh
+ UINT32 nLowestBiffVer; // sfo
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
ExcBof8_Base();
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
};
@@ -277,7 +277,7 @@ private:
String sUnicodeName;
XclExpString GetName() const;
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
ExcBundlesheet8( RootData& rRootData, SCTAB nTab );
@@ -294,7 +294,7 @@ public:
class XclObproj : public ExcRecord
{
public:
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
};
@@ -305,25 +305,25 @@ class XclCodename : public ExcRecord
{
private:
XclExpString aName;
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
XclCodename( const String& );
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
};
// ---- Scenarios ----------------------------------------------------
-// - ExcEScenarioCell a cell of a scenario range
-// - ExcEScenario all ranges of a scenario table
-// - ExcEScenarioManager list of scenario tables
+// - ExcEScenarioCell a cell of a scenario range
+// - ExcEScenario all ranges of a scenario table
+// - ExcEScenarioManager list of scenario tables
class ExcEScenarioCell
{
private:
- UINT16 nCol;
- UINT16 nRow;
+ UINT16 nCol;
+ UINT16 nRow;
XclExpString sText;
protected:
@@ -333,8 +333,8 @@ public:
inline sal_Size GetStringBytes()
{ return sText.GetSize(); }
- void WriteAddress( XclExpStream& rStrm );
- void WriteText( XclExpStream& rStrm );
+ void WriteAddress( XclExpStream& rStrm );
+ void WriteText( XclExpStream& rStrm );
void SaveXml( XclExpXmlStream& rStrm );
};
@@ -350,19 +350,19 @@ private:
XclExpString sUserName;
UINT8 nProtected;
- inline ExcEScenarioCell* _First() { return (ExcEScenarioCell*) List::First(); }
- inline ExcEScenarioCell* _Next() { return (ExcEScenarioCell*) List::Next(); }
+ inline ExcEScenarioCell* _First() { return (ExcEScenarioCell*) List::First(); }
+ inline ExcEScenarioCell* _Next() { return (ExcEScenarioCell*) List::Next(); }
- BOOL Append( UINT16 nCol, UINT16 nRow, const String& rTxt );
+ BOOL Append( UINT16 nCol, UINT16 nRow, const String& rTxt );
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
protected:
public:
ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab );
- virtual ~ExcEScenario();
+ virtual ~ExcEScenario();
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
virtual void SaveXml( XclExpXmlStream& rStrm );
@@ -373,25 +373,25 @@ public:
class ExcEScenarioManager : public ExcRecord, private List
{
private:
- UINT16 nActive;
+ UINT16 nActive;
- inline ExcEScenario* _First() { return (ExcEScenario*) List::First(); }
- inline ExcEScenario* _Next() { return (ExcEScenario*) List::Next(); }
+ inline ExcEScenario* _First() { return (ExcEScenario*) List::First(); }
+ inline ExcEScenario* _Next() { return (ExcEScenario*) List::Next(); }
- inline void Append( ExcEScenario* pScen )
+ inline void Append( ExcEScenario* pScen )
{ List::Insert( pScen, LIST_APPEND ); }
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
protected:
public:
ExcEScenarioManager( const XclExpRoot& rRoot, SCTAB nTab );
- virtual ~ExcEScenarioManager();
+ virtual ~ExcEScenarioManager();
- virtual void Save( XclExpStream& rStrm );
+ virtual void Save( XclExpStream& rStrm );
virtual void SaveXml( XclExpXmlStream& rStrm );
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
};
@@ -417,13 +417,13 @@ private:
class XclCalccount : public ExcRecord
{
private:
- UINT16 nCount;
+ UINT16 nCount;
protected:
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
XclCalccount( const ScDocument& );
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
virtual void SaveXml( XclExpXmlStream& rStrm );
@@ -435,13 +435,13 @@ public:
class XclIteration : public ExcRecord
{
private:
- UINT16 nIter;
+ UINT16 nIter;
protected:
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
XclIteration( const ScDocument& );
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
virtual void SaveXml( XclExpXmlStream& rStrm );
@@ -453,13 +453,13 @@ public:
class XclDelta : public ExcRecord
{
private:
- double fDelta;
+ double fDelta;
protected:
- virtual void SaveCont( XclExpStream& rStrm );
+ virtual void SaveCont( XclExpStream& rStrm );
public:
XclDelta( const ScDocument& );
- virtual UINT16 GetNum() const;
+ virtual UINT16 GetNum() const;
virtual sal_Size GetLen() const;
virtual void SaveXml( XclExpXmlStream& rStrm );
diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx
index 5bb75e029210..2bcdb996d7e9 100644
--- a/sc/source/filter/inc/xechart.hxx
+++ b/sc/source/filter/inc/xechart.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx
index 50c9466d2801..47838149f0dc 100644
--- a/sc/source/filter/inc/xecontent.hxx
+++ b/sc/source/filter/inc/xecontent.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx
index d227db184f1a..259ab9761b90 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xeformula.hxx b/sc/source/filter/inc/xeformula.hxx
index 258070f0791e..d48eb62cc29b 100644
--- a/sc/source/filter/inc/xeformula.hxx
+++ b/sc/source/filter/inc/xeformula.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx
index 606ce51c889b..8e4094ad6b80 100644
--- a/sc/source/filter/inc/xehelper.hxx
+++ b/sc/source/filter/inc/xehelper.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xename.hxx b/sc/source/filter/inc/xename.hxx
index f0740735ea28..d80b51faff01 100644
--- a/sc/source/filter/inc/xename.hxx
+++ b/sc/source/filter/inc/xename.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xepage.hxx b/sc/source/filter/inc/xepage.hxx
index b9454a3cdb3c..1e96c98419ca 100644
--- a/sc/source/filter/inc/xepage.hxx
+++ b/sc/source/filter/inc/xepage.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx
index 0c730952e69e..8841a71be495 100644
--- a/sc/source/filter/inc/xepivot.hxx
+++ b/sc/source/filter/inc/xepivot.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx
index a191cd9b1c20..6e1f7e7df350 100644
--- a/sc/source/filter/inc/xerecord.hxx
+++ b/sc/source/filter/inc/xerecord.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index 3308827441dd..a8fae8fdf26a 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx
index b468696cb3ff..c612f3d85e47 100644
--- a/sc/source/filter/inc/xestring.hxx
+++ b/sc/source/filter/inc/xestring.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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:
//UNUSED2008-05 const XclFormatRunVec& rFormats,
//UNUSED2008-05 XclStrFlags nFlags = EXC_STR_DEFAULT,
//UNUSED2008-05 sal_uInt16 nMaxLen = EXC_STR_MAXLEN );
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 /** Constructs a formatted BIFF8 Unicode string.
//UNUSED2008-05 @param rFormats The formatting runs.
//UNUSED2008-05 @param nFlags Modifiers for string export.
diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index fd7303509688..81caa30b10a0 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx
index 723f9dde09e0..dcb7823d3868 100644
--- a/sc/source/filter/inc/xetable.hxx
+++ b/sc/source/filter/inc/xetable.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -410,16 +410,16 @@ private:
//UNUSED2009-05 class XclExpErrorCell : public XclExpSingleCellBase
//UNUSED2009-05 {
//UNUSED2009-05 DECL_FIXEDMEMPOOL_NEWDEL( XclExpErrorCell )
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 public:
//UNUSED2009-05 explicit XclExpErrorCell( const XclExpRoot rRoot, const XclAddress& rXclPos,
//UNUSED2009-05 const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId,
//UNUSED2009-05 sal_uInt8 nErrCode );
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 virtual void SaveXml( XclExpXmlStream& rStrm );
//UNUSED2009-05 private:
//UNUSED2009-05 virtual void WriteContents( XclExpStream& rStrm );
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 private:
//UNUSED2009-05 sal_uInt8 mnErrCode; /// The error code.
//UNUSED2009-05 };
diff --git a/sc/source/filter/inc/xeview.hxx b/sc/source/filter/inc/xeview.hxx
index 61e349ab1e86..8373f8f7373c 100644
--- a/sc/source/filter/inc/xeview.hxx
+++ b/sc/source/filter/inc/xeview.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index d8289b3b671b..72e5d8c12b0c 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx
index 810c435d34bf..d8b1ec98ad74 100644
--- a/sc/source/filter/inc/xicontent.hxx
+++ b/sc/source/filter/inc/xicontent.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index 0167d160f297..b845207f3e79 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xiformula.hxx b/sc/source/filter/inc/xiformula.hxx
index 6151222746cd..105c96e571eb 100644
--- a/sc/source/filter/inc/xiformula.hxx
+++ b/sc/source/filter/inc/xiformula.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +49,11 @@ public:
ScRangeList& rScRanges, XclFormulaType eType,
const XclTokenArray& rXclTokArr, XclImpStream& rStrm );
- /**
- * Creates a formula token array from the Excel token array. Note that
- * the caller must create a copy of the token array instance returend by
- * this function if the caller needs to persistently store the array,
- * because the pointer points to an array instance on the stack.
+ /**
+ * Creates a formula token array from the Excel token array. Note that
+ * the caller must create a copy of the token array instance returend by
+ * this function if the caller needs to persistently store the array,
+ * because the pointer points to an array instance on the stack.
*/
const ScTokenArray* CreateFormula( XclFormulaType eType, const XclTokenArray& rXclTokArr );
diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxx
index dbbb4606114e..c84a03b53323 100644
--- a/sc/source/filter/inc/xilink.hxx
+++ b/sc/source/filter/inc/xilink.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx
index ccf1b88af947..174b46c69edc 100644
--- a/sc/source/filter/inc/xiname.hxx
+++ b/sc/source/filter/inc/xiname.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xipage.hxx b/sc/source/filter/inc/xipage.hxx
index 0571e10e7046..bb1e4003569c 100644
--- a/sc/source/filter/inc/xipage.hxx
+++ b/sc/source/filter/inc/xipage.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx
index edac8a0fd99f..ae0c78dd7d89 100644
--- a/sc/source/filter/inc/xipivot.hxx
+++ b/sc/source/filter/inc/xipivot.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx
index c5cf284d2d2e..4d811ae2445b 100644
--- a/sc/source/filter/inc/xiroot.hxx
+++ b/sc/source/filter/inc/xiroot.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx
index 9b27077d78e7..de4e86bf0745 100644
--- a/sc/source/filter/inc/xistream.hxx
+++ b/sc/source/filter/inc/xistream.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xistring.hxx b/sc/source/filter/inc/xistring.hxx
index a6f00d26d2e2..002e3a7be508 100644
--- a/sc/source/filter/inc/xistring.hxx
+++ b/sc/source/filter/inc/xistring.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx
index 104002542a17..1d3047eb5856 100644
--- a/sc/source/filter/inc/xistyle.hxx
+++ b/sc/source/filter/inc/xistyle.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xiview.hxx b/sc/source/filter/inc/xiview.hxx
index 2451d69ee01c..7a40d19a1a2c 100644
--- a/sc/source/filter/inc/xiview.hxx
+++ b/sc/source/filter/inc/xiview.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xladdress.hxx b/sc/source/filter/inc/xladdress.hxx
index 0ac5ca3031a4..b8705aeeabb0 100644
--- a/sc/source/filter/inc/xladdress.hxx
+++ b/sc/source/filter/inc/xladdress.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index 13eda8619cc0..f039c74ae945 100755
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -1474,7 +1474,7 @@ struct XclChRootData
const Rectangle& rChartRect );
/** Finishes the API chart document conversion. Must be called once before any API access. */
void FinishConversion();
-
+
/** Returns the drawing shape interface of the specified title object. */
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
GetTitleShape( const XclChTextKey& rTitleKey ) const;
diff --git a/sc/source/filter/inc/xlconst.hxx b/sc/source/filter/inc/xlconst.hxx
index 42160aae7529..510088246d2b 100644
--- a/sc/source/filter/inc/xlconst.hxx
+++ b/sc/source/filter/inc/xlconst.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xlcontent.hxx b/sc/source/filter/inc/xlcontent.hxx
index 41e916472e70..6fe86757e1a4 100644
--- a/sc/source/filter/inc/xlcontent.hxx
+++ b/sc/source/filter/inc/xlcontent.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx
index 921da6b8741b..ecc8ab9af927 100644
--- a/sc/source/filter/inc/xlescher.hxx
+++ b/sc/source/filter/inc/xlescher.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx
index 83bab2acd24a..df83df2abc4c 100644
--- a/sc/source/filter/inc/xlformula.hxx
+++ b/sc/source/filter/inc/xlformula.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xllink.hxx b/sc/source/filter/inc/xllink.hxx
index 3e41fb350acb..ac15ae71f9c5 100644
--- a/sc/source/filter/inc/xllink.hxx
+++ b/sc/source/filter/inc/xllink.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xlname.hxx b/sc/source/filter/inc/xlname.hxx
index 5bfcf9164892..9f96e6d3fd47 100644
--- a/sc/source/filter/inc/xlname.hxx
+++ b/sc/source/filter/inc/xlname.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xlpage.hxx b/sc/source/filter/inc/xlpage.hxx
index f6860595cd20..4878ba9eba26 100644
--- a/sc/source/filter/inc/xlpage.hxx
+++ b/sc/source/filter/inc/xlpage.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx
index ad48c05a93f4..b79218c94520 100644
--- a/sc/source/filter/inc/xlpivot.hxx
+++ b/sc/source/filter/inc/xlpivot.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -526,7 +526,7 @@ public:
/** Returns true, if this is a standard field build directly from source data. */
bool IsStandardField() const;
-
+
//UNUSED2008-05 /** Returns true, if the items of the field are calculated from a formula. */
//UNUSED2008-05 bool IsCalculatedField() const;
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index 2f029c74baa9..846a102de623 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xlstream.hxx b/sc/source/filter/inc/xlstream.hxx
index 0a9074371c33..a797f9d9502f 100644
--- a/sc/source/filter/inc/xlstream.hxx
+++ b/sc/source/filter/inc/xlstream.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xlstring.hxx b/sc/source/filter/inc/xlstring.hxx
index 5ee505e25024..f207aefbdcf9 100644
--- a/sc/source/filter/inc/xlstring.hxx
+++ b/sc/source/filter/inc/xlstring.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx
index 604b53a1f8ff..b7d08570e726 100644
--- a/sc/source/filter/inc/xlstyle.hxx
+++ b/sc/source/filter/inc/xlstyle.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xltable.hxx b/sc/source/filter/inc/xltable.hxx
index 6b8f650568a9..b25a7dd00f88 100644
--- a/sc/source/filter/inc/xltable.hxx
+++ b/sc/source/filter/inc/xltable.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx
index efe20a583104..72bb876a70ee 100644
--- a/sc/source/filter/inc/xltools.hxx
+++ b/sc/source/filter/inc/xltools.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -232,7 +232,7 @@ public:
static void SkipSubStream( XclImpStream& rStrm );
// Basic macro names ------------------------------------------------------
-
+
/** Returns the full StarBasic macro URL from an Excel macro name. */
static ::rtl::OUString GetSbMacroUrl( const String& rMacroName, SfxObjectShell* pDocShell = 0 );
/** Returns the full StarBasic macro URL from an Excel module and macro name. */
diff --git a/sc/source/filter/inc/xltracer.hxx b/sc/source/filter/inc/xltracer.hxx
index 73ed3d0502c3..ef88d1535a9b 100644
--- a/sc/source/filter/inc/xltracer.hxx
+++ b/sc/source/filter/inc/xltracer.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/inc/xlview.hxx b/sc/source/filter/inc/xlview.hxx
index c0c9d4b3d6e1..8961bb4ade09 100644
--- a/sc/source/filter/inc/xlview.hxx
+++ b/sc/source/filter/inc/xlview.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +88,8 @@ const sal_uInt16 EXC_ID_SCL = 0x00A0;
// (0x0862) SHEETEXT ----------------------------------------------------------
-const sal_uInt16 EXC_ID_SHEETEXT = 0x0862; /// header id for sheetext
-const sal_uInt8 EXC_SHEETEXT_TABCOLOR = 0x7F; /// mask for tab color
+const sal_uInt16 EXC_ID_SHEETEXT = 0x0862; /// header id for sheetext
+const sal_uInt8 EXC_SHEETEXT_TABCOLOR = 0x7F; /// mask for tab color
const sal_uInt16 EXC_COLOR_NOTABBG = 0x7F; /// Excel ignores Tab color when set to this value...
// Structs ====================================================================
diff --git a/sc/source/filter/lotus/expop.cxx b/sc/source/filter/lotus/expop.cxx
index 7ecc9127b49d..88d61793c137 100644
--- a/sc/source/filter/lotus/expop.cxx
+++ b/sc/source/filter/lotus/expop.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,47 +51,47 @@ BYTE ExportWK1::GenFormByte( const ScPatternAttr& /*aAttr*/ )
inline void ExportWK1::Bof()
-{ // (0x00)
+{ // (0x00)
aOut << ( USHORT ) 0x00 << ( USHORT ) 2 << ( USHORT ) 0x0406; // Version 1-2-3/2, Symhony/1.1
}
inline void ExportWK1::Eof()
-{ // (0x01)
+{ // (0x01)
aOut << ( USHORT ) 0x01 << ( USHORT ) 0;
}
inline void ExportWK1::Calcmode()
-{ // (0x02)
+{ // (0x02)
// Calculationmode = automatic
aOut << ( USHORT ) 0x02 << ( USHORT ) 1 << ( BYTE ) 0xFF;
}
inline void ExportWK1::Calcorder()
-{ // (0x03)
+{ // (0x03)
// order = natural
aOut << ( USHORT ) 0x03 << ( USHORT ) 1 << ( BYTE ) 0x00;
}
inline void ExportWK1::Split()
-{ // (0x04)
+{ // (0x04)
// not split
aOut << ( USHORT ) 0x04 << ( USHORT ) 1 << ( BYTE ) 0x00;
}
inline void ExportWK1::Sync()
-{ // (0x05)
+{ // (0x05)
// not synchronized
aOut << ( USHORT ) 0x05 << ( USHORT ) 1 << ( BYTE ) 0x00;
}
inline void ExportWK1::Dimensions()
-{ // (0x06)
+{ // (0x06)
SCCOL nEndCol;
SCROW nEndRow;
aOut << ( USHORT ) 0x06 << ( USHORT ) 8 << ( USHORT ) 0 << ( USHORT ) 0; // Starting Col/Row
@@ -108,7 +108,7 @@ inline void ExportWK1::Dimensions()
inline void ExportWK1::Window1()
-{ // (0x07)
+{ // (0x07)
aOut << ( USHORT ) 0x07 << ( USHORT ) 32
<< ( USHORT ) 0 << ( USHORT ) 0 // Cursor Col/Row
<< ( BYTE ) 0xFF // Format: protected, special, default
@@ -126,10 +126,10 @@ inline void ExportWK1::Window1()
inline void ExportWK1::Colw()
-{ // (0x08)
+{ // (0x08)
// ACHTUNG: muss nach Window1 und vor hidden cols record kommen!
- USHORT nWidth;
- BYTE nWidthSpaces;
+ USHORT nWidth;
+ BYTE nWidthSpaces;
for( USHORT nCol = 0 ; nCol < 256 ; nCol++ )
{
nWidth = pD->GetColWidth( static_cast<SCCOL>(nCol), 0 );
@@ -140,7 +140,7 @@ inline void ExportWK1::Colw()
void ExportWK1::Blank( const USHORT nCol, const USHORT nRow, const ScPatternAttr& aAttr )
-{ // (0x0C)
+{ // (0x0C)
// PREC: nCol <= WK1MAXCOL, nRow <= WK1MAXROW
DBG_ASSERT( nCol <= WK1MAXCOL, "ExportWK1::Blank(): Col > WK1MAXCOL" );
DBG_ASSERT( nRow <= WK1MAXROW, "ExportWK1::Blank(): Row > WK1MAXROW" );
@@ -150,7 +150,7 @@ void ExportWK1::Blank( const USHORT nCol, const USHORT nRow, const ScPatternAttr
void ExportWK1::Number( const USHORT nCol, const USHORT nRow, const double fWert, const ScPatternAttr &aAttr )
-{ // (0x0E)
+{ // (0x0E)
// PREC: nCol <= WK1MAXCOL, nRow <= WK1MAXROW
DBG_ASSERT( nCol <= WK1MAXCOL, "ExportWK1::Number(): Col > WK1MAXCOL" );
DBG_ASSERT( nRow <= WK1MAXROW, "ExportWK1::Number(): Row > WK1MAXROW" );
@@ -160,16 +160,16 @@ void ExportWK1::Number( const USHORT nCol, const USHORT nRow, const double fWert
void ExportWK1::Label( const USHORT nCol, const USHORT nRow, const String& rStr, const ScPatternAttr& aAttr )
-{ // (0x0F)
+{ // (0x0F)
// PREC: nCol <= WK1MAXCOL, nRow <= WK1MAXROW
DBG_ASSERT( nCol <= WK1MAXCOL, "ExportWK1::Label(): Col > WK1MAXCOL" );
DBG_ASSERT( nRow <= WK1MAXROW, "ExportWK1::Label(): Row > WK1MAXROW" );
- ByteString aStr( rStr, eZielChar );
+ ByteString aStr( rStr, eZielChar );
- USHORT nLaenge = 7; // Anzahl Bytes vor String+Nullbyte am Ende + Alignment-Char
+ USHORT nLaenge = 7; // Anzahl Bytes vor String+Nullbyte am Ende + Alignment-Char
- xub_StrLen nAnz = aStr.Len();
+ xub_StrLen nAnz = aStr.Len();
if( nAnz > 240 ) // max. 240 Zeichen im String
@@ -187,13 +187,13 @@ void ExportWK1::Label( const USHORT nCol, const USHORT nRow, const String& rStr,
void ExportWK1::Formula( const USHORT nCol, const USHORT nRow, const ScFormulaCell* pFC, const ScPatternAttr& aAttr )
-{ // (0x10)
+{ // (0x10)
// PREC: nCol <= WK1MAXCOL, nRow <= WK1MAXROW
DBG_ASSERT( nCol <= WK1MAXCOL, "ExportWK1::Formula(): Col > WK1MAXCOL" );
DBG_ASSERT( nRow <= WK1MAXROW, "ExportWK1::Formula(): Row > WK1MAXROW" );
- USHORT nLaenge = 15; // Bytes bis Formel
- double fErgebnis;
+ USHORT nLaenge = 15; // Bytes bis Formel
+ double fErgebnis;
// zunaechst nur Dummy-Angaben (Formel := Ergebnis der Berechnung )
nLaenge += 9+1;
@@ -211,14 +211,14 @@ void ExportWK1::Formula( const USHORT nCol, const USHORT nRow, const ScFormulaCe
inline void ExportWK1::Protect()
-{ // (0x24)
+{ // (0x24)
//Global protection off
aOut << ( USHORT ) 0x24 << ( USHORT ) 1 << ( BYTE ) 0x00;
}
inline void ExportWK1::Footer()
-{ // (0x25)
+{ // (0x25)
// zunaechst nur leerer C-String
aOut << ( USHORT ) 0x25 << ( USHORT ) 242 << ( sal_Char ) '\''; // linksbuendiger leerer String
for( short nLauf = 0 ; nLauf < 241 ; nLauf++ )
@@ -227,7 +227,7 @@ inline void ExportWK1::Footer()
inline void ExportWK1::Header()
-{ // (0x26)
+{ // (0x26)
// zunaechst nur leerer C-String
aOut << ( USHORT ) 0x26 << ( USHORT ) 242 << ( sal_Char ) '\''; // linksbuendiger leerer String
for( short nLauf = 0 ; nLauf < 241 ; nLauf++ )
@@ -236,7 +236,7 @@ inline void ExportWK1::Header()
inline void ExportWK1::Margins()
-{ // (0x28)
+{ // (0x28)
aOut << ( USHORT ) 0x28 << ( USHORT ) 10
<< ( USHORT ) 4 << ( USHORT ) 76 // Left/right margin
<< ( USHORT ) 66 // Page length
@@ -245,28 +245,28 @@ inline void ExportWK1::Margins()
inline void ExportWK1::Labelfmt()
-{ // (0x29)
+{ // (0x29)
// Global label alignment = left
aOut << ( USHORT ) 0x29 << ( USHORT ) 1 << ( BYTE ) 0x27;
}
inline void ExportWK1::Calccount()
-{ // (0x2F)
+{ // (0x2F)
// Iteration count = 16 (oder so aehnlich)
aOut << ( USHORT ) 0x2F << ( USHORT ) 1 << ( BYTE ) 16;
}
inline void ExportWK1::Cursorw12()
-{ // (0x31)
+{ // (0x31)
// Cursor location in window 1
aOut << ( USHORT ) 0x31 << ( USHORT ) 1 << ( BYTE ) 1;
}
void ExportWK1::WKString( const USHORT /*nCol*/, const USHORT /*nRow*/, const ScFormulaCell* /*pFC*/, const ScPatternAttr& /*aAttr*/ )
-{ // (0x33)
+{ // (0x33)
// PREC: nCol <= WK1MAXCOL, nRow <= WK1MAXROW
/* DBG_ASSERT( nCol <= WK1MAXCOL, "ExportWK1::Label(): Col > WK1MAXCOL" );
DBG_ASSERT( nRow <= WK1MAXROW, "ExportWK1::Label(): Row > WK1MAXROW" );
@@ -296,7 +296,7 @@ void ExportWK1::WKString( const USHORT /*nCol*/, const USHORT /*nRow*/, const Sc
inline void ExportWK1::Snrange()
-{ // (0x47)
+{ // (0x47)
//aOut << ( USHORT ) 0x47 << ( USHORT ) x
/* ScRangeName *pRanges = pD->GetRangeName();
ScRangeData *pData;
@@ -314,7 +314,7 @@ inline void ExportWK1::Snrange()
inline void ExportWK1::Hidcol()
-{ // (0x64)
+{ // (0x64)
sal_uInt32 nHide = 0x00000000; // ...niemand ist versteckt
aOut << ( USHORT ) 0x64 << ( USHORT ) 32;
@@ -325,7 +325,7 @@ inline void ExportWK1::Hidcol()
inline void ExportWK1::Cpi()
-{ // (0x96)
+{ // (0x96)
//aOut << ( USHORT ) 0x96 << ( USHORT ) x;
}
@@ -352,15 +352,15 @@ FltError ExportWK1::Write()
//Labelfmt();
// Zellen-Bemachung
- ScDocumentIterator aIter( pD, 0, 0 );
- ScBaseCell* pCell;
- USHORT nCol, nRow;
- SCTAB nTab;
- const ScPatternAttr* pPatAttr;
+ ScDocumentIterator aIter( pD, 0, 0 );
+ ScBaseCell* pCell;
+ USHORT nCol, nRow;
+ SCTAB nTab;
+ const ScPatternAttr* pPatAttr;
if( aIter.GetFirst() )
do
- { // ueber alle Zellen der ersten Tabelle iterieren
+ { // ueber alle Zellen der ersten Tabelle iterieren
pPatAttr = aIter.GetPattern();
pCell = aIter.GetCell();
SCCOL nScCol;
@@ -376,14 +376,14 @@ FltError ExportWK1::Write()
{
case CELLTYPE_VALUE:
{
- double fVal;
+ double fVal;
fVal = ( ( ScValueCell * ) pCell)->GetValue();
Number( nCol, nRow, fVal, *pPatAttr );
}
break;
case CELLTYPE_STRING:
{
- String aStr;
+ String aStr;
( ( ScStringCell * ) pCell)->GetString( aStr );
Label( nCol, nRow, aStr, *pPatAttr );
}
diff --git a/sc/source/filter/lotus/export.cxx b/sc/source/filter/lotus/export.cxx
index a9be45e24f23..721419df9dbf 100644
--- a/sc/source/filter/lotus/export.cxx
+++ b/sc/source/filter/lotus/export.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxx
index 3a6e39b7d818..7a5a633ace8f 100644
--- a/sc/source/filter/lotus/filter.cxx
+++ b/sc/source/filter/lotus/filter.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,38 +53,38 @@
#include "op.h"
// Konstanten ------------------------------------------------------------
-const UINT16 nBOF = 0x0000;
+const UINT16 nBOF = 0x0000;
// externe Variablen -----------------------------------------------------
-extern WKTYP eTyp; // Typ der gerade in bearbeitung befindlichen Datei
-WKTYP eTyp;
+extern WKTYP eTyp; // Typ der gerade in bearbeitung befindlichen Datei
+WKTYP eTyp;
-extern BOOL bEOF; // zeigt Ende der Datei
-BOOL bEOF;
+extern BOOL bEOF; // zeigt Ende der Datei
+BOOL bEOF;
-extern CharSet eCharNach; // Zeichenkonvertierung von->nach
-CharSet eCharNach;
+extern CharSet eCharNach; // Zeichenkonvertierung von->nach
+CharSet eCharNach;
-extern CharSet eCharVon;
-CharSet eCharVon;
+extern CharSet eCharVon;
+CharSet eCharVon;
-extern ScDocument* pDoc; // Aufhaenger zum Dokumentzugriff
-ScDocument* pDoc;
+extern ScDocument* pDoc; // Aufhaenger zum Dokumentzugriff
+ScDocument* pDoc;
-extern sal_Char* pPuffer; // -> memory.cxx
-extern sal_Char* pDummy1; // -> memory.cxx
+extern sal_Char* pPuffer; // -> memory.cxx
+extern sal_Char* pDummy1; // -> memory.cxx
-extern OPCODE_FKT pOpFkt[ FKT_LIMIT ];
+extern OPCODE_FKT pOpFkt[ FKT_LIMIT ];
// -> optab.cxx, Tabelle moeglicher Opcodes
-extern OPCODE_FKT pOpFkt123[ FKT_LIMIT123 ];
+extern OPCODE_FKT pOpFkt123[ FKT_LIMIT123 ];
// -> optab.cxx, Table of possible Opcodes
-extern long nDateiLaenge; // -> datei.cpp, ...der gerade offenen Datei
+extern long nDateiLaenge; // -> datei.cpp, ...der gerade offenen Datei
-LOTUS_ROOT* pLotusRoot = NULL;
+LOTUS_ROOT* pLotusRoot = NULL;
std::map<UINT16, ScPatternAttr> aLotusPatternPool;
@@ -107,9 +107,9 @@ generate_Opcodes( SvStream& aStream, ScDocument& rDoc,
pOps = pOpFkt123;
nOps = FKT_LIMIT123;
break;
- case eWK3: return eERR_NI;
- case eWK_Error: return eERR_FORMAT;
- default: return eERR_UNKN_WK;
+ case eWK3: return eERR_NI;
+ case eWK_Error: return eERR_FORMAT;
+ default: return eERR_UNKN_WK;
}
// #i76299# seems that SvStream::IsEof() does not work correctly
@@ -167,7 +167,7 @@ WKTYP ScanVersion( SvStream& aStream )
{
// PREC: pWKDatei: Zeiger auf offene Datei
// POST: return: Typ der Datei
- UINT16 nOpcode, nVersNr, nRecLen;
+ UINT16 nOpcode, nVersNr, nRecLen;
// erstes Byte muss wegen BOF zwingend 0 sein!
aStream >> nOpcode;
@@ -197,7 +197,7 @@ WKTYP ScanVersion( SvStream& aStream )
aStream >> nVersNr;
if( aStream.IsEof() ) return eWK_Error;
if( nVersNr == 0x0004 && nRecLen == 26 )
- { // 4 Bytes von 26 gelesen->22 ueberlesen
+ { // 4 Bytes von 26 gelesen->22 ueberlesen
aStream.Read( pDummy1, 22 );
return eWK3;
}
diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx
index 6a05585cf326..2253e513d799 100644
--- a/sc/source/filter/lotus/lotattr.cxx
+++ b/sc/source/filter/lotus/lotattr.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ LotAttrCache::LotAttrCache( void )
LotAttrCache::~LotAttrCache()
{
- ENTRY* pAkt = ( ENTRY* ) List::First();
+ ENTRY* pAkt = ( ENTRY* ) List::First();
while( pAkt )
{
@@ -134,8 +134,8 @@ LotAttrCache::~LotAttrCache()
const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr )
{
- UINT32 nRefHash;
- ENTRY* pAkt = ( ENTRY* ) List::First();
+ UINT32 nRefHash;
+ ENTRY* pAkt = ( ENTRY* ) List::First();
MakeHash( rAttr, nRefHash );
@@ -148,8 +148,8 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr )
}
// neues PatternAttribute erzeugen
- ScPatternAttr* pNewPatt = new ScPatternAttr( pDocPool );
- SfxItemSet& rItemSet = pNewPatt->GetItemSet();
+ ScPatternAttr* pNewPatt = new ScPatternAttr( pDocPool );
+ SfxItemSet& rItemSet = pNewPatt->GetItemSet();
pAkt = new ENTRY( pNewPatt );
pAkt->nHash0 = nRefHash;
@@ -159,8 +159,8 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr )
UINT8 nLine = rAttr.nLineStyle;
if( nLine )
{
- SvxBoxItem aBox( ATTR_BORDER );
- SvxBorderLine aTop, aLeft, aBottom, aRight;
+ SvxBoxItem aBox( ATTR_BORDER );
+ SvxBorderLine aTop, aLeft, aBottom, aRight;
LotusToScBorderLine( nLine, aLeft );
nLine >>= 2;
@@ -178,7 +178,7 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr )
rItemSet.Put( aBox );
}
- UINT8 nFontCol = rAttr.nFontCol & 0x07;
+ UINT8 nFontCol = rAttr.nFontCol & 0x07;
if( nFontCol )
{
// nFontCol > 0
@@ -214,7 +214,7 @@ void LotAttrCol::SetAttr( const SCROW nRow, const ScPatternAttr& rAttr )
{
DBG_ASSERT( ValidRow(nRow), "*LotAttrCol::SetAttr(): ... und rums?!" );
- ENTRY* pAkt = ( ENTRY* ) List::Last();
+ ENTRY* pAkt = ( ENTRY* ) List::Last();
if( pAkt )
{
@@ -230,7 +230,7 @@ void LotAttrCol::SetAttr( const SCROW nRow, const ScPatternAttr& rAttr )
}
}
else
- { // erster Eintrag
+ { // erster Eintrag
pAkt = new ENTRY;
pAkt->pPattAttr = &rAttr;
pAkt->nFirstRow = pAkt->nLastRow = nRow;
@@ -241,8 +241,8 @@ void LotAttrCol::SetAttr( const SCROW nRow, const ScPatternAttr& rAttr )
void LotAttrCol::Apply( const SCCOL nColNum, const SCTAB nTabNum, const BOOL /*bClear*/ )
{
- ScDocument* pDoc = pLotusRoot->pDoc;
- ENTRY* pAkt = ( ENTRY* ) List::First();
+ ScDocument* pDoc = pLotusRoot->pDoc;
+ ENTRY* pAkt = ( ENTRY* ) List::First();
while( pAkt )
{
@@ -256,7 +256,7 @@ void LotAttrCol::Apply( const SCCOL nColNum, const SCTAB nTabNum, const BOOL /*b
void LotAttrCol::Clear( void )
{
- ENTRY* pAkt = ( ENTRY* ) List::First();
+ ENTRY* pAkt = ( ENTRY* ) List::First();
while( pAkt )
{
@@ -279,8 +279,8 @@ LotAttrTable::~LotAttrTable()
void LotAttrTable::SetAttr( const SCCOL nColFirst, const SCCOL nColLast, const SCROW nRow,
const LotAttrWK3& rAttr )
{
- const ScPatternAttr& rPattAttr = aAttrCache.GetPattAttr( rAttr );
- SCCOL nColCnt;
+ const ScPatternAttr& rPattAttr = aAttrCache.GetPattAttr( rAttr );
+ SCCOL nColCnt;
for( nColCnt = nColFirst ; nColCnt <= nColLast ; nColCnt++ )
pCols[ nColCnt ].SetAttr( nRow, rPattAttr );
@@ -289,9 +289,9 @@ void LotAttrTable::SetAttr( const SCCOL nColFirst, const SCCOL nColLast, const S
void LotAttrTable::Apply( const SCTAB nTabNum )
{
- SCCOL nColCnt;
+ SCCOL nColCnt;
for( nColCnt = 0 ; nColCnt <= MAXCOL ; nColCnt++ )
- pCols[ nColCnt ].Apply( nColCnt, nTabNum ); // macht auch gleich ein Clear() am Ende
+ pCols[ nColCnt ].Apply( nColCnt, nTabNum ); // macht auch gleich ein Clear() am Ende
}
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index e39891568e33..4320d080574c 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,36 +43,36 @@
#include <math.h>
-extern WKTYP eTyp;
+extern WKTYP eTyp;
-static const sal_Char* GetAddInName( const UINT8 nIndex );
+static const sal_Char* GetAddInName( const UINT8 nIndex );
-static DefTokenId lcl_KnownAddIn( const ByteString& sTest );
+static DefTokenId lcl_KnownAddIn( const ByteString& sTest );
//extern double decipher_Number123( UINT32 nValue );
void LotusToSc::DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtString )
{
- TokenId eParam[ 256 ];
- INT32 nLauf;
- TokenId nMerk0, nMerk1;
+ TokenId eParam[ 256 ];
+ INT32 nLauf;
+ TokenId nMerk0, nMerk1;
- BOOL bAddIn = FALSE;
- BOOL bNeg = FALSE;
+ BOOL bAddIn = FALSE;
+ BOOL bNeg = FALSE;
DBG_ASSERT( nAnz < 128, "-LotusToSc::DoFunc(): Neee! -so viel kann ich nicht!" );
if( eOc == ocNoName )
{
- ByteString t;
+ ByteString t;
if( pExtString )
{
- const ByteString s( "@<<@123>>" );
+ const ByteString s( "@<<@123>>" );
t = pExtString;
- xub_StrLen n = t.Search( s );
+ xub_StrLen n = t.Search( s );
if( n != STRING_NOTFOUND )
t.Erase( 0, n + s.Len() );
@@ -147,10 +147,10 @@ void LotusToSc::DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtString )
DBG_ASSERT( nAnz == 3,
"*LotusToSc::DoFunc(): ZINS() hat 3 Parameter!" );
nAnz = 4;
- eParam[ 3 ] = eParam[ 0 ]; // 3. -> 1.
- eParam[ 0 ] = eParam[ 2 ]; // 1. -> 4.
- NegToken( eParam[ 1 ] ); // 2. -> -2. (+ 2. -> 3.)
- eParam[ 2 ] = n0Token; // -> 2. als Default
+ eParam[ 3 ] = eParam[ 0 ]; // 3. -> 1.
+ eParam[ 0 ] = eParam[ 2 ]; // 1. -> 4.
+ NegToken( eParam[ 1 ] ); // 2. -> -2. (+ 2. -> 3.)
+ eParam[ 2 ] = n0Token; // -> 2. als Default
}
break;
default:;
@@ -165,13 +165,13 @@ void LotusToSc::DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtString )
if( nAnz > 0 )
{
- INT16 nNull = -1; // gibt einen auszulassenden Parameter an
+ INT16 nNull = -1; // gibt einen auszulassenden Parameter an
// ACHTUNG: 0 ist der letzte Parameter, nAnz-1 der erste
INT16 nLast = nAnz - 1;
if( eOc == ocRMZ )
- { // Extrawurst ocRMZ letzter Parameter negiert!
+ { // Extrawurst ocRMZ letzter Parameter negiert!
// zusaetzlich: 1. -> 3., 3. -> 2., 2. -> 1.
DBG_ASSERT( nAnz == 3,
"+LotusToSc::DoFunc(): ocRMZ hat genau 3 Parameter!" );
@@ -179,7 +179,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtString )
<< ocNegSub << eParam[ 2 ];
}
else
- { // Normalfall
+ { // Normalfall
// [Parameter{;Parameter}]
aPool << eParam[ nLast ];
@@ -303,8 +303,8 @@ void LotusToSc::LotusRelToScRel( UINT16 nCol, UINT16 nRow, ScSingleRefData& rSRD
void LotusToSc::ReadSRD( ScSingleRefData& rSRD, BYTE nRelBit )
{
- BYTE nTab, nCol;
- UINT16 nRow;
+ BYTE nTab, nCol;
+ UINT16 nRow;
Read( nRow );
Read( nTab );
@@ -380,31 +380,31 @@ typedef DefTokenId ( FuncType2 ) ( BYTE );
ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
const FORMULA_TYPE /*eFT*/ )
{
- BYTE nOc;
- BYTE nAnz;
- BYTE nRelBits;
- UINT16 nStrLen;
- UINT16 nRngIndex;
- FUNC_TYPE eType = FT_NOP;
- TokenId nMerk0;
- DefTokenId eOc;
+ BYTE nOc;
+ BYTE nAnz;
+ BYTE nRelBits;
+ UINT16 nStrLen;
+ UINT16 nRngIndex;
+ FUNC_TYPE eType = FT_NOP;
+ TokenId nMerk0;
+ DefTokenId eOc;
const sal_Char* pExtName = 0;
- RangeNameBufferWK3& rRangeNameBufferWK3 = *pLotusRoot->pRngNmBffWK3;
+ RangeNameBufferWK3& rRangeNameBufferWK3 = *pLotusRoot->pRngNmBffWK3;
- ScComplexRefData aCRD;
+ ScComplexRefData aCRD;
aCRD.InitFlags();
- ScSingleRefData& rR = aCRD.Ref1;
+ ScSingleRefData& rR = aCRD.Ref1;
- LR_ID nId;
- TokenId nNewId;
+ LR_ID nId;
+ TokenId nNewId;
- LotusRangeList& rRangeList = *pLotusRoot->pRangeNames;
+ LotusRangeList& rRangeList = *pLotusRoot->pRangeNames;
- FuncType1* pIndexToType;
- FuncType2* pIndexToToken;
+ FuncType1* pIndexToType;
+ FuncType2* pIndexToToken;
if( bWK3 )
- { // for > WK3
+ { // for > WK3
pIndexToType = IndexToTypeWK123;
pIndexToToken = IndexToTokenWK123;
}
@@ -428,7 +428,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
nBytesLeft = rRest;
- while( eType ) // != FT_Return (==0)
+ while( eType ) // != FT_Return (==0)
{
Read( nOc );
@@ -447,16 +447,16 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
{
case FT_Return:
if( bWK3 || bWK123 )
- nBytesLeft = 0; // wird ab WK3 nicht benutzt
+ nBytesLeft = 0; // wird ab WK3 nicht benutzt
rRest = nBytesLeft;
break;
case FT_NotImpl:
- case FT_FuncFix0: DoFunc( eOc, 0, pExtName ); break;
- case FT_FuncFix1: DoFunc( eOc, 1, pExtName ); break;
- case FT_FuncFix2: DoFunc( eOc, 2, pExtName ); break;
- case FT_FuncFix3: DoFunc( eOc, 3, pExtName ); break;
- case FT_FuncFix4: DoFunc( eOc, 4, pExtName ); break;
+ case FT_FuncFix0: DoFunc( eOc, 0, pExtName ); break;
+ case FT_FuncFix1: DoFunc( eOc, 1, pExtName ); break;
+ case FT_FuncFix2: DoFunc( eOc, 2, pExtName ); break;
+ case FT_FuncFix3: DoFunc( eOc, 3, pExtName ); break;
+ case FT_FuncFix4: DoFunc( eOc, 4, pExtName ); break;
case FT_FuncVar:
Read( nAnz );
DoFunc( eOc, nAnz, pExtName );
@@ -472,14 +472,14 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
break;
case FT_ConstFloat:
{
- double fDouble;
+ double fDouble;
Read( fDouble );
aStack << aPool.Store( fDouble );
}
break;
case FT_Variable:
{
- UINT16 nCol, nRow;
+ UINT16 nCol, nRow;
Read( nCol );
Read( nRow );
@@ -503,7 +503,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
break;
case FT_Range:
{
- UINT16 nColS, nRowS, nColE, nRowE;
+ UINT16 nColS, nRowS, nColE, nRowE;
Read( nColS );
Read( nRowS );
Read( nColE );
@@ -535,7 +535,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
break;
case FT_ConstInt:
{
- INT16 nVal;
+ INT16 nVal;
Read( nVal );
aStack << aPool.Store( ( double ) nVal );
}
@@ -567,7 +567,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
aStack << aPool.Store( nRngIndex );
else
{
- String aText( RTL_CONSTASCII_USTRINGPARAM( "NRREF " ) );
+ String aText( RTL_CONSTASCII_USTRINGPARAM( "NRREF " ) );
aText += aTmp;
aStack << aPool.Store( aText );
}
@@ -580,7 +580,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
aStack << aPool.Store( nRngIndex );
else
{
- String aText( RTL_CONSTASCII_USTRINGPARAM( "ABSNREF " ) );
+ String aText( RTL_CONSTASCII_USTRINGPARAM( "ABSNREF " ) );
aText += aTmp;
aStack << aPool.Store( aText );
}
@@ -608,8 +608,8 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
if( nStrLen )
{
-// String t( ReadString( aIn, nStrLen, eSrcChar ) );
- sal_Char* p = new sal_Char[ nStrLen + 1 ];
+// String t( ReadString( aIn, nStrLen, eSrcChar ) );
+ sal_Char* p = new sal_Char[ nStrLen + 1 ];
aIn.Read( p, nStrLen );
p[ nStrLen ] = 0x00;
@@ -657,7 +657,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
DBG_ASSERT( nBytesLeft <= 0, "*LotusToSc::Convert(): wat is mit'm Rest?" );
if( rRest )
- aIn.SeekRel( nBytesLeft ); // eventuellen Rest/Ueberlauf korrigieren
+ aIn.SeekRel( nBytesLeft ); // eventuellen Rest/Ueberlauf korrigieren
rRest = 0;
@@ -668,263 +668,263 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest,
FUNC_TYPE LotusToSc::IndexToType( BYTE nIndex )
{
static const FUNC_TYPE pType[ 256 ] =
- { // Code Bezeichnung
- FT_ConstFloat, // 0 8-Byte-IEEE-Float
- FT_Variable, // 1 Variable
- FT_Range, // 2 Bereich
- FT_Return, // 3 return
- FT_Braces, // 4 Klammer
- FT_ConstInt, // 5 2-Byte-Integer
- FT_ConstString, // 6 ASCII-String
- FT_NOP, // 7 NOP
- FT_Neg, // 8 Negation
- FT_Op, // 9 Addition
- FT_Op, // 10 Subtraktion
- FT_Op, // 11 Multiplikation
- FT_Op, // 12 Division
- FT_Op, // 13 Potenzierung
- FT_Op, // 14 Gleichheit
- FT_Op, // 15 Ungleich
- FT_Op, // 16 Kleiner-gleich
- FT_Op, // 17 Groesser-gleich
- FT_Op, // 18 Kleiner
- FT_Op, // 19 Groesser
- FT_Op, // 20 And (logisch)
- FT_Op, // 21 Or (logisch)
- FT_FuncFix1, // 22 Not (logisch)
- FT_NOP, // 23 unaeres Plus
- FT_NotImpl, // 24
- FT_NotImpl, // 25
- FT_NotImpl, // 26
- FT_NotImpl, // 27
- FT_NotImpl, // 28
- FT_NotImpl, // 29
- FT_NotImpl, // 30
- FT_FuncFix0, // 31 Not applicable
- FT_FuncFix0, // 32 Error
- FT_FuncFix1, // 33 Betrag ABS()
- FT_FuncFix1, // 34 Ganzzahl INT()
- FT_FuncFix1, // 35 Quadratwurzel
- FT_FuncFix1, // 36 Zehnerlogarithmus
- FT_FuncFix1, // 37 Natuerlicher Logarithmus
- FT_FuncFix0, // 38 PI
- FT_FuncFix1, // 39 Sinus
- FT_FuncFix1, // 40 Cosinus
- FT_FuncFix1, // 41 Tangens
- FT_FuncFix2, // 42 Arcus-Tangens 2 (4.Quadrant) <----- richtig? -
- FT_FuncFix1, // 43 Arcus-Tangens (2.Quadrant)
- FT_FuncFix1, // 44 Arcus-Sinus
- FT_FuncFix1, // 45 Arcus-Cosinus
- FT_FuncFix1, // 46 Exponentialfunktion
- FT_FuncFix2, // 47 Modulo
- FT_FuncVar, // 48 Auswahl
- FT_FuncFix1, // 49 Is not applicable?
- FT_FuncFix1, // 50 Is Error?
- FT_FuncFix0, // 51 FALSE
- FT_FuncFix0, // 52 TRUE
- FT_FuncFix0, // 53 Zufallszahl
- FT_FuncFix3, // 54 Datum
- FT_FuncFix0, // 55 Heute
- FT_FuncFix3, // 56 Payment
- FT_FuncFix3, // 57 Present Value
- FT_FuncFix3, // 58 Future Value
- FT_FuncFix3, // 59 If ... then ... else ...
- FT_FuncFix1, // 60 Tag des Monats
- FT_FuncFix1, // 61 Monat
- FT_FuncFix1, // 62 Jahr
- FT_FuncFix2, // 63 Runden
- FT_FuncFix3, // 64 Zeit
- FT_FuncFix1, // 65 Stunde
- FT_FuncFix1, // 66 Minute
- FT_FuncFix1, // 67 Sekunde
- FT_FuncFix1, // 68 Ist Zahl?
- FT_FuncFix1, // 69 Ist Text?
- FT_FuncFix1, // 70 Len()
- FT_FuncFix1, // 71 Val()
- FT_FuncFix2, // 72 String()
- FT_FuncFix3, // 73 Mid()
- FT_FuncFix1, // 74 Char()
- FT_FuncFix1, // 75 Ascii()
- FT_FuncFix3, // 76 Find()
- FT_FuncFix1, // 77 Datevalue
- FT_FuncFix1, // 78 Timevalue
- FT_FuncFix1, // 79 Cellpointer
- FT_FuncVar, // 80 Sum()
- FT_FuncVar, // 81 Avg()
- FT_FuncVar, // 82 Cnt()
- FT_FuncVar, // 83 Min()
- FT_FuncVar, // 84 Max()
- FT_FuncFix3, // 85 Vlookup()
- FT_FuncFix2, // 86 Npv()
- FT_FuncVar, // 87 Var()
- FT_FuncVar, // 88 Std()
- FT_FuncFix2, // 89 Irr()
- FT_FuncFix3, // 90 Hlookup()
- FT_FuncFix3, // 91 ?
- FT_FuncFix3, // 92 ?
- FT_FuncFix3, // 93 ?
- FT_FuncFix3, // 94 ?
- FT_FuncFix3, // 95 ?
- FT_FuncFix3, // 96 ?
- FT_FuncFix3, // 97 ?
- FT_FuncFix3, // 98 Index() <- richtig? -
- FT_FuncFix1, // 99 Cols()
- FT_FuncFix1, // 100 Rows()
- FT_FuncFix2, // 101 Repeat()
- FT_FuncFix1, // 102 Upper()
- FT_FuncFix1, // 103 Lower()
- FT_FuncFix2, // 104 Left()
- FT_FuncFix2, // 105 Right()
- FT_FuncFix4, // 106 Replace()
- FT_FuncFix1, // 107 Proper()
- FT_FuncFix2, // 108 Cell()
- FT_FuncFix1, // 109 Trim()
- FT_FuncFix1, // 110 Clean()
- FT_FuncFix1, // 111 F()
- FT_FuncFix1, // 112 Wert() (oder W()?)
- FT_FuncFix2, // 113 Exact()
- FT_NotImpl, // 114 Call()
- FT_FuncFix1, // 115 @@()
- FT_FuncFix3, // 116 Rate()
- FT_FuncFix1, // 117 Term()
- FT_FuncFix1, // 118 Cterm()
- FT_FuncFix3, // 119 Sln()
- FT_FuncFix4, // 120 Syd(), Soy()
- FT_FuncFix4, // 121 Ddb()
- FT_NotImpl, // 122
- FT_NotImpl, // 123
- FT_NotImpl, // 124
- FT_NotImpl, // 125
- FT_NotImpl, // 126
- FT_NotImpl, // 127
- FT_NotImpl, // 128
- FT_NotImpl, // 129
- FT_NotImpl, // 130
- FT_NotImpl, // 131
- FT_NotImpl, // 132
- FT_NotImpl, // 133
- FT_NotImpl, // 134
- FT_NotImpl, // 135
- FT_NotImpl, // 136
- FT_NotImpl, // 137
- FT_NotImpl, // 138
- FT_NotImpl, // 139
- FT_NotImpl, // 140
- FT_NotImpl, // 141
- FT_NotImpl, // 142
- FT_NotImpl, // 143
- FT_NotImpl, // 144
- FT_NotImpl, // 145
- FT_NotImpl, // 146
- FT_NotImpl, // 147
- FT_NotImpl, // 148
- FT_NotImpl, // 149
- FT_NotImpl, // 150
- FT_NotImpl, // 151
- FT_NotImpl, // 152
- FT_NotImpl, // 153
- FT_NotImpl, // 154
- FT_NotImpl, // 155
- FT_FuncVar, // 156 ?
- FT_NotImpl, // 157
- FT_NotImpl, // 158
- FT_NotImpl, // 159
- FT_NotImpl, // 160
- FT_NotImpl, // 161
- FT_NotImpl, // 162
- FT_NotImpl, // 163
- FT_NotImpl, // 164
- FT_NotImpl, // 165
- FT_NotImpl, // 166
- FT_NotImpl, // 167
- FT_NotImpl, // 168
- FT_NotImpl, // 169
- FT_NotImpl, // 170
- FT_NotImpl, // 171
- FT_NotImpl, // 172
- FT_NotImpl, // 173
- FT_NotImpl, // 174
- FT_NotImpl, // 175
- FT_NotImpl, // 176
- FT_NotImpl, // 177
- FT_NotImpl, // 178
- FT_NotImpl, // 179
- FT_NotImpl, // 180
- FT_NotImpl, // 181
- FT_NotImpl, // 182
- FT_NotImpl, // 183
- FT_NotImpl, // 184
- FT_NotImpl, // 185
- FT_NotImpl, // 186
- FT_NotImpl, // 187
- FT_NotImpl, // 188
- FT_NotImpl, // 189
- FT_NotImpl, // 190
- FT_NotImpl, // 191
- FT_NotImpl, // 192
- FT_NotImpl, // 193
- FT_NotImpl, // 194
- FT_NotImpl, // 195
- FT_NotImpl, // 196
- FT_NotImpl, // 197
- FT_NotImpl, // 198
- FT_NotImpl, // 199
- FT_NotImpl, // 200
- FT_NotImpl, // 201
- FT_NotImpl, // 202
- FT_NotImpl, // 203
- FT_NotImpl, // 204
- FT_NotImpl, // 205
- FT_FuncVar, // 206 ?
- FT_NotImpl, // 207
- FT_NotImpl, // 208
- FT_NotImpl, // 209
- FT_NotImpl, // 210
- FT_NotImpl, // 211
- FT_NotImpl, // 212
- FT_NotImpl, // 213
- FT_NotImpl, // 214
- FT_NotImpl, // 215
- FT_NotImpl, // 216
- FT_NotImpl, // 217
- FT_NotImpl, // 218
- FT_NotImpl, // 219
- FT_NotImpl, // 220
- FT_NotImpl, // 221
- FT_NotImpl, // 222
- FT_NotImpl, // 223
- FT_NotImpl, // 224
- FT_NotImpl, // 225
- FT_NotImpl, // 226
- FT_NotImpl, // 227
- FT_NotImpl, // 228
- FT_NotImpl, // 229
- FT_NotImpl, // 230
- FT_NotImpl, // 231
- FT_NotImpl, // 232
- FT_NotImpl, // 233
- FT_NotImpl, // 234
- FT_NotImpl, // 235
- FT_NotImpl, // 236
- FT_NotImpl, // 237
- FT_NotImpl, // 238
- FT_NotImpl, // 239
- FT_NotImpl, // 240
- FT_NotImpl, // 241
- FT_NotImpl, // 242
- FT_NotImpl, // 243
- FT_NotImpl, // 244
- FT_NotImpl, // 245
- FT_NotImpl, // 246
- FT_NotImpl, // 247
- FT_NotImpl, // 248
- FT_NotImpl, // 249
- FT_NotImpl, // 250
- FT_NotImpl, // 251
- FT_NotImpl, // 252
- FT_NotImpl, // 253
- FT_NotImpl, // 254
- FT_FuncVar, // 255 ?
+ { // Code Bezeichnung
+ FT_ConstFloat, // 0 8-Byte-IEEE-Float
+ FT_Variable, // 1 Variable
+ FT_Range, // 2 Bereich
+ FT_Return, // 3 return
+ FT_Braces, // 4 Klammer
+ FT_ConstInt, // 5 2-Byte-Integer
+ FT_ConstString, // 6 ASCII-String
+ FT_NOP, // 7 NOP
+ FT_Neg, // 8 Negation
+ FT_Op, // 9 Addition
+ FT_Op, // 10 Subtraktion
+ FT_Op, // 11 Multiplikation
+ FT_Op, // 12 Division
+ FT_Op, // 13 Potenzierung
+ FT_Op, // 14 Gleichheit
+ FT_Op, // 15 Ungleich
+ FT_Op, // 16 Kleiner-gleich
+ FT_Op, // 17 Groesser-gleich
+ FT_Op, // 18 Kleiner
+ FT_Op, // 19 Groesser
+ FT_Op, // 20 And (logisch)
+ FT_Op, // 21 Or (logisch)
+ FT_FuncFix1, // 22 Not (logisch)
+ FT_NOP, // 23 unaeres Plus
+ FT_NotImpl, // 24
+ FT_NotImpl, // 25
+ FT_NotImpl, // 26
+ FT_NotImpl, // 27
+ FT_NotImpl, // 28
+ FT_NotImpl, // 29
+ FT_NotImpl, // 30
+ FT_FuncFix0, // 31 Not applicable
+ FT_FuncFix0, // 32 Error
+ FT_FuncFix1, // 33 Betrag ABS()
+ FT_FuncFix1, // 34 Ganzzahl INT()
+ FT_FuncFix1, // 35 Quadratwurzel
+ FT_FuncFix1, // 36 Zehnerlogarithmus
+ FT_FuncFix1, // 37 Natuerlicher Logarithmus
+ FT_FuncFix0, // 38 PI
+ FT_FuncFix1, // 39 Sinus
+ FT_FuncFix1, // 40 Cosinus
+ FT_FuncFix1, // 41 Tangens
+ FT_FuncFix2, // 42 Arcus-Tangens 2 (4.Quadrant) <----- richtig? -
+ FT_FuncFix1, // 43 Arcus-Tangens (2.Quadrant)
+ FT_FuncFix1, // 44 Arcus-Sinus
+ FT_FuncFix1, // 45 Arcus-Cosinus
+ FT_FuncFix1, // 46 Exponentialfunktion
+ FT_FuncFix2, // 47 Modulo
+ FT_FuncVar, // 48 Auswahl
+ FT_FuncFix1, // 49 Is not applicable?
+ FT_FuncFix1, // 50 Is Error?
+ FT_FuncFix0, // 51 FALSE
+ FT_FuncFix0, // 52 TRUE
+ FT_FuncFix0, // 53 Zufallszahl
+ FT_FuncFix3, // 54 Datum
+ FT_FuncFix0, // 55 Heute
+ FT_FuncFix3, // 56 Payment
+ FT_FuncFix3, // 57 Present Value
+ FT_FuncFix3, // 58 Future Value
+ FT_FuncFix3, // 59 If ... then ... else ...
+ FT_FuncFix1, // 60 Tag des Monats
+ FT_FuncFix1, // 61 Monat
+ FT_FuncFix1, // 62 Jahr
+ FT_FuncFix2, // 63 Runden
+ FT_FuncFix3, // 64 Zeit
+ FT_FuncFix1, // 65 Stunde
+ FT_FuncFix1, // 66 Minute
+ FT_FuncFix1, // 67 Sekunde
+ FT_FuncFix1, // 68 Ist Zahl?
+ FT_FuncFix1, // 69 Ist Text?
+ FT_FuncFix1, // 70 Len()
+ FT_FuncFix1, // 71 Val()
+ FT_FuncFix2, // 72 String()
+ FT_FuncFix3, // 73 Mid()
+ FT_FuncFix1, // 74 Char()
+ FT_FuncFix1, // 75 Ascii()
+ FT_FuncFix3, // 76 Find()
+ FT_FuncFix1, // 77 Datevalue
+ FT_FuncFix1, // 78 Timevalue
+ FT_FuncFix1, // 79 Cellpointer
+ FT_FuncVar, // 80 Sum()
+ FT_FuncVar, // 81 Avg()
+ FT_FuncVar, // 82 Cnt()
+ FT_FuncVar, // 83 Min()
+ FT_FuncVar, // 84 Max()
+ FT_FuncFix3, // 85 Vlookup()
+ FT_FuncFix2, // 86 Npv()
+ FT_FuncVar, // 87 Var()
+ FT_FuncVar, // 88 Std()
+ FT_FuncFix2, // 89 Irr()
+ FT_FuncFix3, // 90 Hlookup()
+ FT_FuncFix3, // 91 ?
+ FT_FuncFix3, // 92 ?
+ FT_FuncFix3, // 93 ?
+ FT_FuncFix3, // 94 ?
+ FT_FuncFix3, // 95 ?
+ FT_FuncFix3, // 96 ?
+ FT_FuncFix3, // 97 ?
+ FT_FuncFix3, // 98 Index() <- richtig? -
+ FT_FuncFix1, // 99 Cols()
+ FT_FuncFix1, // 100 Rows()
+ FT_FuncFix2, // 101 Repeat()
+ FT_FuncFix1, // 102 Upper()
+ FT_FuncFix1, // 103 Lower()
+ FT_FuncFix2, // 104 Left()
+ FT_FuncFix2, // 105 Right()
+ FT_FuncFix4, // 106 Replace()
+ FT_FuncFix1, // 107 Proper()
+ FT_FuncFix2, // 108 Cell()
+ FT_FuncFix1, // 109 Trim()
+ FT_FuncFix1, // 110 Clean()
+ FT_FuncFix1, // 111 F()
+ FT_FuncFix1, // 112 Wert() (oder W()?)
+ FT_FuncFix2, // 113 Exact()
+ FT_NotImpl, // 114 Call()
+ FT_FuncFix1, // 115 @@()
+ FT_FuncFix3, // 116 Rate()
+ FT_FuncFix1, // 117 Term()
+ FT_FuncFix1, // 118 Cterm()
+ FT_FuncFix3, // 119 Sln()
+ FT_FuncFix4, // 120 Syd(), Soy()
+ FT_FuncFix4, // 121 Ddb()
+ FT_NotImpl, // 122
+ FT_NotImpl, // 123
+ FT_NotImpl, // 124
+ FT_NotImpl, // 125
+ FT_NotImpl, // 126
+ FT_NotImpl, // 127
+ FT_NotImpl, // 128
+ FT_NotImpl, // 129
+ FT_NotImpl, // 130
+ FT_NotImpl, // 131
+ FT_NotImpl, // 132
+ FT_NotImpl, // 133
+ FT_NotImpl, // 134
+ FT_NotImpl, // 135
+ FT_NotImpl, // 136
+ FT_NotImpl, // 137
+ FT_NotImpl, // 138
+ FT_NotImpl, // 139
+ FT_NotImpl, // 140
+ FT_NotImpl, // 141
+ FT_NotImpl, // 142
+ FT_NotImpl, // 143
+ FT_NotImpl, // 144
+ FT_NotImpl, // 145
+ FT_NotImpl, // 146
+ FT_NotImpl, // 147
+ FT_NotImpl, // 148
+ FT_NotImpl, // 149
+ FT_NotImpl, // 150
+ FT_NotImpl, // 151
+ FT_NotImpl, // 152
+ FT_NotImpl, // 153
+ FT_NotImpl, // 154
+ FT_NotImpl, // 155
+ FT_FuncVar, // 156 ?
+ FT_NotImpl, // 157
+ FT_NotImpl, // 158
+ FT_NotImpl, // 159
+ FT_NotImpl, // 160
+ FT_NotImpl, // 161
+ FT_NotImpl, // 162
+ FT_NotImpl, // 163
+ FT_NotImpl, // 164
+ FT_NotImpl, // 165
+ FT_NotImpl, // 166
+ FT_NotImpl, // 167
+ FT_NotImpl, // 168
+ FT_NotImpl, // 169
+ FT_NotImpl, // 170
+ FT_NotImpl, // 171
+ FT_NotImpl, // 172
+ FT_NotImpl, // 173
+ FT_NotImpl, // 174
+ FT_NotImpl, // 175
+ FT_NotImpl, // 176
+ FT_NotImpl, // 177
+ FT_NotImpl, // 178
+ FT_NotImpl, // 179
+ FT_NotImpl, // 180
+ FT_NotImpl, // 181
+ FT_NotImpl, // 182
+ FT_NotImpl, // 183
+ FT_NotImpl, // 184
+ FT_NotImpl, // 185
+ FT_NotImpl, // 186
+ FT_NotImpl, // 187
+ FT_NotImpl, // 188
+ FT_NotImpl, // 189
+ FT_NotImpl, // 190
+ FT_NotImpl, // 191
+ FT_NotImpl, // 192
+ FT_NotImpl, // 193
+ FT_NotImpl, // 194
+ FT_NotImpl, // 195
+ FT_NotImpl, // 196
+ FT_NotImpl, // 197
+ FT_NotImpl, // 198
+ FT_NotImpl, // 199
+ FT_NotImpl, // 200
+ FT_NotImpl, // 201
+ FT_NotImpl, // 202
+ FT_NotImpl, // 203
+ FT_NotImpl, // 204
+ FT_NotImpl, // 205
+ FT_FuncVar, // 206 ?
+ FT_NotImpl, // 207
+ FT_NotImpl, // 208
+ FT_NotImpl, // 209
+ FT_NotImpl, // 210
+ FT_NotImpl, // 211
+ FT_NotImpl, // 212
+ FT_NotImpl, // 213
+ FT_NotImpl, // 214
+ FT_NotImpl, // 215
+ FT_NotImpl, // 216
+ FT_NotImpl, // 217
+ FT_NotImpl, // 218
+ FT_NotImpl, // 219
+ FT_NotImpl, // 220
+ FT_NotImpl, // 221
+ FT_NotImpl, // 222
+ FT_NotImpl, // 223
+ FT_NotImpl, // 224
+ FT_NotImpl, // 225
+ FT_NotImpl, // 226
+ FT_NotImpl, // 227
+ FT_NotImpl, // 228
+ FT_NotImpl, // 229
+ FT_NotImpl, // 230
+ FT_NotImpl, // 231
+ FT_NotImpl, // 232
+ FT_NotImpl, // 233
+ FT_NotImpl, // 234
+ FT_NotImpl, // 235
+ FT_NotImpl, // 236
+ FT_NotImpl, // 237
+ FT_NotImpl, // 238
+ FT_NotImpl, // 239
+ FT_NotImpl, // 240
+ FT_NotImpl, // 241
+ FT_NotImpl, // 242
+ FT_NotImpl, // 243
+ FT_NotImpl, // 244
+ FT_NotImpl, // 245
+ FT_NotImpl, // 246
+ FT_NotImpl, // 247
+ FT_NotImpl, // 248
+ FT_NotImpl, // 249
+ FT_NotImpl, // 250
+ FT_NotImpl, // 251
+ FT_NotImpl, // 252
+ FT_NotImpl, // 253
+ FT_NotImpl, // 254
+ FT_FuncVar, // 255 ?
};
return pType[ nIndex ];
}
@@ -933,263 +933,263 @@ FUNC_TYPE LotusToSc::IndexToType( BYTE nIndex )
DefTokenId LotusToSc::IndexToToken( BYTE nIndex )
{
static const DefTokenId pToken[ 256 ] =
- { // Code Bezeichnung
- ocPush, // 0 8-Byte-IEEE-Float
- ocPush, // 1 Variable
- ocPush, // 2 Bereich
- ocPush, // 3 return
- ocPush, // 4 Klammer
- ocPush, // 5 2-Byte-Integer
- ocPush, // 6 ASCII-String
- ocPush, // 7 NOP
- ocNegSub, // 8 Negation
- ocAdd, // 9 Addition
- ocSub, // 10 Subtraktion
- ocMul, // 11 Multiplikation
- ocDiv, // 12 Division
- ocPow, // 13 Potenzierung
- ocEqual, // 14 Gleichheit
- ocNotEqual, // 15 Ungleich
- ocLessEqual, // 16 Kleiner-gleich
- ocGreaterEqual, // 17 Groesser-gleich
- ocLess, // 18 Kleiner
- ocGreater, // 19 Groesser
- ocAnd, // 20 And (logisch)
- ocOr, // 21 Or (logisch)
- ocNot, // 22 Not (logisch)
- ocPush, // 23 unaeres Plus
- ocNoName, // 24
- ocNoName, // 25
- ocNoName, // 26
- ocNoName, // 27
- ocNoName, // 28
- ocNoName, // 29
- ocNoName, // 30
- ocNotAvail, // 31 Not available
- ocNoName, // 32 Error
- ocAbs, // 33 Betrag ABS()
- ocInt, // 34 Ganzzahl INT()
- ocSqrt, // 35 Quadratwurzel
- ocLog10, // 36 Zehnerlogarithmus
- ocLn, // 37 Natuerlicher Logarithmus
- ocPi, // 38 PI
- ocSin, // 39 Sinus
- ocCos, // 40 Cosinus
- ocTan, // 41 Tangens
- ocArcTan2, // 42 Arcus-Tangens 2 (4.Quadrant)
- ocArcTan, // 43 Arcus-Tangens (2.Quadrant)
- ocArcSin, // 44 Arcus-Sinus
- ocArcCos, // 45 Arcus-Cosinus
- ocExp, // 46 Exponentialfunktion
- ocMod, // 47 Modulo
- ocChose, // 48 Auswahl
- ocIsNA, // 49 Is not available?
- ocIsError, // 50 Is Error?
- ocFalse, // 51 FALSE
- ocTrue, // 52 TRUE
- ocRandom, // 53 Zufallszahl
- ocGetDate, // 54 Datum
- ocGetActDate, // 55 Heute
- ocRMZ, // 56 Payment
- ocBW, // 57 Present Value
- ocZW, // 58 Future Value
- ocIf, // 59 If ... then ... else ...
- ocGetDay, // 60 Tag des Monats
- ocGetMonth, // 61 Monat
- ocGetYear, // 62 Jahr
- ocRound, // 63 Runden
- ocGetTime, // 64 Zeit
- ocGetHour, // 65 Stunde
- ocGetMin, // 66 Minute
- ocGetSec, // 67 Sekunde
- ocIsValue, // 68 Ist Zahl?
- ocIsString, // 69 Ist Text?
- ocLen, // 70 Len()
- ocValue, // 71 Val()
- ocFixed, // 72 String() ocFixed ersatzweise + Spezialfall
- ocMid, // 73 Mid()
- ocChar, // 74 Char()
- ocCode, // 75 Ascii()
- ocFind, // 76 Find()
- ocGetDateValue, // 77 Datevalue
- ocGetTimeValue, // 78 Timevalue
- ocNoName, // 79 Cellpointer
- ocSum, // 80 Sum()
- ocAverage, // 81 Avg()
- ocCount, // 82 Cnt()
- ocMin, // 83 Min()
- ocMax, // 84 Max()
- ocVLookup, // 85 Vlookup()
- ocNPV, // 86 Npv()
- ocVar, // 87 Var()
- ocNormDist, // 88 Std()
- ocIRR, // 89 Irr()
- ocHLookup, // 90 Hlookup()
- ocDBSum, // 91 XlfDsum
- ocDBAverage, // 92 XlfDaverage
- ocDBCount, // 93 XlfDcount
- ocDBMin, // 94 XlfDmin
- ocDBMax, // 95 XlfDmax
- ocDBVar, // 96 XlfDvar
- ocDBStdDev, // 97 XlfDstdev
- ocIndex, // 98 Index()
- ocColumns, // 99 Cols()
- ocRows, // 100 Rows()
- ocRept, // 101 Repeat()
- ocUpper, // 102 Upper()
- ocLower, // 103 Lower()
- ocLeft, // 104 Left()
- ocRight, // 105 Right()
- ocReplace, // 106 Replace()
- ocPropper, // 107 Proper()
- ocNoName, // 108 Cell()
- ocTrim, // 109 Trim()
- ocClean, // 110 Clean()
- ocFalse, // 111 F()
- ocTrue, // 112 W()
- ocExact, // 113 Exact()
- ocNoName, // 114 Call()
- ocIndirect, // 115 @@()
- ocZins, // 116 Rate()
- ocNoName, // 117 Term()
- ocNoName, // 118 Cterm()
- ocLIA, // 119 Sln()
- ocDIA, // 120 Syd(), Soy()
- ocGDA, // 121 Ddb()
- ocNoName, // 122
- ocNoName, // 123
- ocNoName, // 124
- ocNoName, // 125
- ocNoName, // 126
- ocNoName, // 127
- ocNoName, // 128
- ocNoName, // 129
- ocNoName, // 130
- ocNoName, // 131
- ocNoName, // 132
- ocNoName, // 133
- ocNoName, // 134
- ocNoName, // 135
- ocNoName, // 136
- ocNoName, // 137
- ocNoName, // 138
- ocNoName, // 139
- ocNoName, // 140
- ocNoName, // 141
- ocNoName, // 142
- ocNoName, // 143
- ocNoName, // 144
- ocNoName, // 145
- ocNoName, // 146
- ocNoName, // 147
- ocNoName, // 148
- ocNoName, // 149
- ocNoName, // 150
- ocNoName, // 151
- ocNoName, // 152
- ocNoName, // 153
- ocNoName, // 154
- ocNoName, // 155
- ocNoName, // 156 ?
- ocNoName, // 157
- ocNoName, // 158
- ocNoName, // 159
- ocNoName, // 160
- ocNoName, // 161
- ocNoName, // 162
- ocNoName, // 163
- ocNoName, // 164
- ocNoName, // 165
- ocNoName, // 166
- ocNoName, // 167
- ocNoName, // 168
- ocNoName, // 169
- ocNoName, // 170
- ocNoName, // 171
- ocNoName, // 172
- ocNoName, // 173
- ocNoName, // 174
- ocNoName, // 175
- ocNoName, // 176
- ocNoName, // 177
- ocNoName, // 178
- ocNoName, // 179
- ocNoName, // 180
- ocNoName, // 181
- ocNoName, // 182
- ocNoName, // 183
- ocNoName, // 184
- ocNoName, // 185
- ocNoName, // 186
- ocNoName, // 187
- ocNoName, // 188
- ocNoName, // 189
- ocNoName, // 190
- ocNoName, // 191
- ocNoName, // 192
- ocNoName, // 193
- ocNoName, // 194
- ocNoName, // 195
- ocNoName, // 196
- ocNoName, // 197
- ocNoName, // 198
- ocNoName, // 199
- ocNoName, // 200
- ocNoName, // 201
- ocNoName, // 202
- ocNoName, // 203
- ocNoName, // 204
- ocNoName, // 205
- ocNoName, // 206 ?
- ocNoName, // 207
- ocNoName, // 208
- ocNoName, // 209
- ocNoName, // 210
- ocNoName, // 211
- ocNoName, // 212
- ocNoName, // 213
- ocNoName, // 214
- ocNoName, // 215
- ocNoName, // 216
- ocNoName, // 217
- ocNoName, // 218
- ocNoName, // 219
- ocNoName, // 220
- ocNoName, // 221
- ocNoName, // 222
- ocNoName, // 223
- ocNoName, // 224
- ocNoName, // 225
- ocNoName, // 226
- ocNoName, // 227
- ocNoName, // 228
- ocNoName, // 229
- ocNoName, // 230
- ocNoName, // 231
- ocNoName, // 232
- ocNoName, // 233
- ocNoName, // 234
- ocNoName, // 235
- ocNoName, // 236
- ocNoName, // 237
- ocNoName, // 238
- ocNoName, // 239
- ocNoName, // 240
- ocNoName, // 241
- ocNoName, // 242
- ocNoName, // 243
- ocNoName, // 244
- ocNoName, // 245
- ocNoName, // 246
- ocNoName, // 247
- ocNoName, // 248
- ocNoName, // 249
- ocNoName, // 250
- ocNoName, // 251
- ocNoName, // 252
- ocNoName, // 253
- ocNoName, // 254
- ocNoName // 255 ?
+ { // Code Bezeichnung
+ ocPush, // 0 8-Byte-IEEE-Float
+ ocPush, // 1 Variable
+ ocPush, // 2 Bereich
+ ocPush, // 3 return
+ ocPush, // 4 Klammer
+ ocPush, // 5 2-Byte-Integer
+ ocPush, // 6 ASCII-String
+ ocPush, // 7 NOP
+ ocNegSub, // 8 Negation
+ ocAdd, // 9 Addition
+ ocSub, // 10 Subtraktion
+ ocMul, // 11 Multiplikation
+ ocDiv, // 12 Division
+ ocPow, // 13 Potenzierung
+ ocEqual, // 14 Gleichheit
+ ocNotEqual, // 15 Ungleich
+ ocLessEqual, // 16 Kleiner-gleich
+ ocGreaterEqual, // 17 Groesser-gleich
+ ocLess, // 18 Kleiner
+ ocGreater, // 19 Groesser
+ ocAnd, // 20 And (logisch)
+ ocOr, // 21 Or (logisch)
+ ocNot, // 22 Not (logisch)
+ ocPush, // 23 unaeres Plus
+ ocNoName, // 24
+ ocNoName, // 25
+ ocNoName, // 26
+ ocNoName, // 27
+ ocNoName, // 28
+ ocNoName, // 29
+ ocNoName, // 30
+ ocNotAvail, // 31 Not available
+ ocNoName, // 32 Error
+ ocAbs, // 33 Betrag ABS()
+ ocInt, // 34 Ganzzahl INT()
+ ocSqrt, // 35 Quadratwurzel
+ ocLog10, // 36 Zehnerlogarithmus
+ ocLn, // 37 Natuerlicher Logarithmus
+ ocPi, // 38 PI
+ ocSin, // 39 Sinus
+ ocCos, // 40 Cosinus
+ ocTan, // 41 Tangens
+ ocArcTan2, // 42 Arcus-Tangens 2 (4.Quadrant)
+ ocArcTan, // 43 Arcus-Tangens (2.Quadrant)
+ ocArcSin, // 44 Arcus-Sinus
+ ocArcCos, // 45 Arcus-Cosinus
+ ocExp, // 46 Exponentialfunktion
+ ocMod, // 47 Modulo
+ ocChose, // 48 Auswahl
+ ocIsNA, // 49 Is not available?
+ ocIsError, // 50 Is Error?
+ ocFalse, // 51 FALSE
+ ocTrue, // 52 TRUE
+ ocRandom, // 53 Zufallszahl
+ ocGetDate, // 54 Datum
+ ocGetActDate, // 55 Heute
+ ocRMZ, // 56 Payment
+ ocBW, // 57 Present Value
+ ocZW, // 58 Future Value
+ ocIf, // 59 If ... then ... else ...
+ ocGetDay, // 60 Tag des Monats
+ ocGetMonth, // 61 Monat
+ ocGetYear, // 62 Jahr
+ ocRound, // 63 Runden
+ ocGetTime, // 64 Zeit
+ ocGetHour, // 65 Stunde
+ ocGetMin, // 66 Minute
+ ocGetSec, // 67 Sekunde
+ ocIsValue, // 68 Ist Zahl?
+ ocIsString, // 69 Ist Text?
+ ocLen, // 70 Len()
+ ocValue, // 71 Val()
+ ocFixed, // 72 String() ocFixed ersatzweise + Spezialfall
+ ocMid, // 73 Mid()
+ ocChar, // 74 Char()
+ ocCode, // 75 Ascii()
+ ocFind, // 76 Find()
+ ocGetDateValue, // 77 Datevalue
+ ocGetTimeValue, // 78 Timevalue
+ ocNoName, // 79 Cellpointer
+ ocSum, // 80 Sum()
+ ocAverage, // 81 Avg()
+ ocCount, // 82 Cnt()
+ ocMin, // 83 Min()
+ ocMax, // 84 Max()
+ ocVLookup, // 85 Vlookup()
+ ocNPV, // 86 Npv()
+ ocVar, // 87 Var()
+ ocNormDist, // 88 Std()
+ ocIRR, // 89 Irr()
+ ocHLookup, // 90 Hlookup()
+ ocDBSum, // 91 XlfDsum
+ ocDBAverage, // 92 XlfDaverage
+ ocDBCount, // 93 XlfDcount
+ ocDBMin, // 94 XlfDmin
+ ocDBMax, // 95 XlfDmax
+ ocDBVar, // 96 XlfDvar
+ ocDBStdDev, // 97 XlfDstdev
+ ocIndex, // 98 Index()
+ ocColumns, // 99 Cols()
+ ocRows, // 100 Rows()
+ ocRept, // 101 Repeat()
+ ocUpper, // 102 Upper()
+ ocLower, // 103 Lower()
+ ocLeft, // 104 Left()
+ ocRight, // 105 Right()
+ ocReplace, // 106 Replace()
+ ocPropper, // 107 Proper()
+ ocNoName, // 108 Cell()
+ ocTrim, // 109 Trim()
+ ocClean, // 110 Clean()
+ ocFalse, // 111 F()
+ ocTrue, // 112 W()
+ ocExact, // 113 Exact()
+ ocNoName, // 114 Call()
+ ocIndirect, // 115 @@()
+ ocZins, // 116 Rate()
+ ocNoName, // 117 Term()
+ ocNoName, // 118 Cterm()
+ ocLIA, // 119 Sln()
+ ocDIA, // 120 Syd(), Soy()
+ ocGDA, // 121 Ddb()
+ ocNoName, // 122
+ ocNoName, // 123
+ ocNoName, // 124
+ ocNoName, // 125
+ ocNoName, // 126
+ ocNoName, // 127
+ ocNoName, // 128
+ ocNoName, // 129
+ ocNoName, // 130
+ ocNoName, // 131
+ ocNoName, // 132
+ ocNoName, // 133
+ ocNoName, // 134
+ ocNoName, // 135
+ ocNoName, // 136
+ ocNoName, // 137
+ ocNoName, // 138
+ ocNoName, // 139
+ ocNoName, // 140
+ ocNoName, // 141
+ ocNoName, // 142
+ ocNoName, // 143
+ ocNoName, // 144
+ ocNoName, // 145
+ ocNoName, // 146
+ ocNoName, // 147
+ ocNoName, // 148
+ ocNoName, // 149
+ ocNoName, // 150
+ ocNoName, // 151
+ ocNoName, // 152
+ ocNoName, // 153
+ ocNoName, // 154
+ ocNoName, // 155
+ ocNoName, // 156 ?
+ ocNoName, // 157
+ ocNoName, // 158
+ ocNoName, // 159
+ ocNoName, // 160
+ ocNoName, // 161
+ ocNoName, // 162
+ ocNoName, // 163
+ ocNoName, // 164
+ ocNoName, // 165
+ ocNoName, // 166
+ ocNoName, // 167
+ ocNoName, // 168
+ ocNoName, // 169
+ ocNoName, // 170
+ ocNoName, // 171
+ ocNoName, // 172
+ ocNoName, // 173
+ ocNoName, // 174
+ ocNoName, // 175
+ ocNoName, // 176
+ ocNoName, // 177
+ ocNoName, // 178
+ ocNoName, // 179
+ ocNoName, // 180
+ ocNoName, // 181
+ ocNoName, // 182
+ ocNoName, // 183
+ ocNoName, // 184
+ ocNoName, // 185
+ ocNoName, // 186
+ ocNoName, // 187
+ ocNoName, // 188
+ ocNoName, // 189
+ ocNoName, // 190
+ ocNoName, // 191
+ ocNoName, // 192
+ ocNoName, // 193
+ ocNoName, // 194
+ ocNoName, // 195
+ ocNoName, // 196
+ ocNoName, // 197
+ ocNoName, // 198
+ ocNoName, // 199
+ ocNoName, // 200
+ ocNoName, // 201
+ ocNoName, // 202
+ ocNoName, // 203
+ ocNoName, // 204
+ ocNoName, // 205
+ ocNoName, // 206 ?
+ ocNoName, // 207
+ ocNoName, // 208
+ ocNoName, // 209
+ ocNoName, // 210
+ ocNoName, // 211
+ ocNoName, // 212
+ ocNoName, // 213
+ ocNoName, // 214
+ ocNoName, // 215
+ ocNoName, // 216
+ ocNoName, // 217
+ ocNoName, // 218
+ ocNoName, // 219
+ ocNoName, // 220
+ ocNoName, // 221
+ ocNoName, // 222
+ ocNoName, // 223
+ ocNoName, // 224
+ ocNoName, // 225
+ ocNoName, // 226
+ ocNoName, // 227
+ ocNoName, // 228
+ ocNoName, // 229
+ ocNoName, // 230
+ ocNoName, // 231
+ ocNoName, // 232
+ ocNoName, // 233
+ ocNoName, // 234
+ ocNoName, // 235
+ ocNoName, // 236
+ ocNoName, // 237
+ ocNoName, // 238
+ ocNoName, // 239
+ ocNoName, // 240
+ ocNoName, // 241
+ ocNoName, // 242
+ ocNoName, // 243
+ ocNoName, // 244
+ ocNoName, // 245
+ ocNoName, // 246
+ ocNoName, // 247
+ ocNoName, // 248
+ ocNoName, // 249
+ ocNoName, // 250
+ ocNoName, // 251
+ ocNoName, // 252
+ ocNoName, // 253
+ ocNoName, // 254
+ ocNoName // 255 ?
};
return pToken[ nIndex ];
@@ -1199,263 +1199,263 @@ DefTokenId LotusToSc::IndexToToken( BYTE nIndex )
FUNC_TYPE LotusToSc::IndexToTypeWK123( BYTE nIndex )
{
static const FUNC_TYPE pType[ 256 ] =
- { // Code Bezeichnung
- FT_Const10Float, // 0 8-Byte-IEEE-Long-Number
- FT_Cref, // 1 Cell Reference
- FT_Rref, // 2 Area Reference
- FT_Return, // 3 return
- FT_Braces, // 4 Klammer
- FT_Snum, // 5 Short-Number
- FT_ConstString, // 6 ASCII-String
- FT_Nrref, // 7 Named range reference
- FT_Absnref, // 8 Absolut named range
- FT_Erref, // 9 Err range reference
- FT_Ecref, // 10 Err cell reference
- FT_Econstant, // 11 Err constant
- FT_NotImpl, // 12
- FT_NotImpl, // 13
- FT_Neg, // 14 Negation
- FT_Op, // 15 Addition
- FT_Op, // 16 Subtraktion
- FT_Op, // 17 Multiplikation
- FT_Op, // 18 Division
- FT_Op, // 19 Potenzierung
- FT_Op, // 20 Gleichheit
- FT_Op, // 21 Ungleich
- FT_Op, // 22 Kleiner-gleich
- FT_Op, // 23 Groesser-gleich
- FT_Op, // 24 Kleiner
- FT_Op, // 25 Groesser
- FT_Op, // 26 And (logisch)
- FT_Op, // 27 Or (logisch)
- FT_FuncFix1, // 28 Not (logisch)
- FT_NOP, // 29 unaeres Plus
- FT_Op, // 30 Concatenation
- FT_FuncFix0, // 31 Not applicable
- FT_FuncFix0, // 32 Error
- FT_FuncFix1, // 33 Betrag ABS()
- FT_FuncFix1, // 34 Ganzzahl INT()
- FT_FuncFix1, // 35 Quadratwurzel
- FT_FuncFix1, // 36 Zehnerlogarithmus
- FT_FuncFix1, // 37 Natuerlicher Logarithmus
- FT_FuncFix0, // 38 PI
- FT_FuncFix1, // 39 Sinus
- FT_FuncFix1, // 40 Cosinus
- FT_FuncFix1, // 41 Tangens
- FT_FuncFix2, // 42 Arcus-Tangens 2 (4.Quadrant)
- FT_FuncFix1, // 43 Arcus-Tangens (2.Quadrant)
- FT_FuncFix1, // 44 Arcus-Sinus
- FT_FuncFix1, // 45 Arcus-Cosinus
- FT_FuncFix1, // 46 Exponentialfunktion
- FT_FuncFix2, // 47 Modulo
- FT_FuncVar, // 48 Auswahl
- FT_FuncFix1, // 49 Is not applicable?
- FT_FuncFix1, // 50 Is Error?
- FT_FuncFix0, // 51 FALSE
- FT_FuncFix0, // 52 TRUE
- FT_FuncFix0, // 53 Zufallszahl
- FT_FuncFix3, // 54 Datum
- FT_FuncFix0, // 55 Heute
- FT_FuncFix3, // 56 Payment
- FT_FuncFix3, // 57 Present Value
- FT_FuncFix3, // 58 Future Value
- FT_FuncFix3, // 59 If ... then ... else ...
- FT_FuncFix1, // 60 Tag des Monats
- FT_FuncFix1, // 61 Monat
- FT_FuncFix1, // 62 Jahr
- FT_FuncFix2, // 63 Runden
- FT_FuncFix3, // 64 Zeit
- FT_FuncFix1, // 65 Stunde
- FT_FuncFix1, // 66 Minute
- FT_FuncFix1, // 67 Sekunde
- FT_FuncFix1, // 68 Ist Zahl?
- FT_FuncFix1, // 69 Ist Text?
- FT_FuncFix1, // 70 Len()
- FT_FuncFix1, // 71 Val()
- FT_FuncFix2, // 72 String()
- FT_FuncFix3, // 73 Mid()
- FT_FuncFix1, // 74 Char()
- FT_FuncFix1, // 75 Ascii()
- FT_FuncFix3, // 76 Find()
- FT_FuncFix1, // 77 Datevalue
- FT_FuncFix1, // 78 Timevalue
- FT_FuncFix1, // 79 Cellpointer
- FT_FuncVar, // 80 Sum()
- FT_FuncVar, // 81 Avg()
- FT_FuncVar, // 82 Cnt()
- FT_FuncVar, // 83 Min()
- FT_FuncVar, // 84 Max()
- FT_FuncFix3, // 85 Vlookup()
- FT_FuncFix2, // 86 Npv()
- FT_FuncVar, // 87 Var()
- FT_FuncVar, // 88 Std()
- FT_FuncFix2, // 89 Irr()
- FT_FuncFix3, // 90 Hlookup()
- FT_FuncVar, // 91 Dsum <-------- neu! -
- FT_FuncVar, // 92 Davg <-------- neu! -
- FT_FuncVar, // 93 Dcnt <-------- neu! -
- FT_FuncVar, // 94 Dmin <-------- neu! -
- FT_FuncVar, // 95 Dmax <-------- neu! -
- FT_FuncVar, // 96 Dvar <-------- neu! -
- FT_FuncVar, // 97 Dstd <-------- neu! -
- FT_FuncVar, // 98 Index() <-------- change! -
- FT_FuncFix1, // 99 Cols() <-------- neu! -
- FT_FuncFix1, // 100 Rows() <-------- neu! -
- FT_FuncFix2, // 101 Repeat() <-------- neu! -
- FT_FuncFix1, // 102 Upper() <-------- neu! -
- FT_FuncFix1, // 103 Lower() <-------- neu! -
- FT_FuncFix2, // 104 Left() <-------- neu! -
- FT_FuncFix2, // 105 Right() <-------- neu! -
- FT_FuncFix4, // 106 Replace() <-------- neu! -
- FT_FuncFix1, // 107 Proper() <-------- neu! -
- FT_FuncFix2, // 108 Cell() <-------- neu! -
- FT_FuncFix1, // 109 Trim() <-------- neu! -
- FT_FuncFix1, // 110 Clean() <-------- neu! -
- FT_FuncFix1, // 111 S() <--------- change in Bez. -
- FT_FuncFix1, // 112 N() <--------- change in Bez. -
- FT_FuncFix2, // 113 Exact() <-------- neu! -
- FT_NotImpl, // 114 App <--------- change in Bez. -
- FT_FuncFix1, // 115 @@() <-------- neu! -
- FT_FuncFix3, // 116 Rate() <-------- neu! -
- FT_FuncFix3, // 117 Term() <--------- change in Anz.
- FT_FuncFix3, // 118 Cterm() <--------- change in Anz.
- FT_FuncFix3, // 119 Sln() <-------- neu! -
- FT_FuncFix4, // 120 Syd() <-------- neu! -
- FT_FuncFix4, // 121 Ddb() <-------- neu! -
- FT_Splfunc, // 122 Splfunc <-------- neu! -
- FT_FuncFix1, // 123 Sheets <-------- neu! -
- FT_FuncFix1, // 124 Info <-------- neu! -
- FT_FuncVar, // 125 Sumproduct <-------- neu! -
- FT_FuncFix1, // 126 Isrange <-------- neu! -
- FT_FuncVar, // 127 Dget <-------- neu! -
- FT_FuncVar, // 128 Dquery <-------- neu! -
- FT_FuncFix4, // 129 Coord <-------- neu! -
- FT_NOP, // 130 Reserved (internal) <-------- neu! -
- FT_FuncFix0, // 131 Today <-------- neu! -
- FT_FuncVar, // 132 Vdb <-------- neu! -
- FT_FuncVar, // 133 Dvars <-------- neu! -
- FT_FuncVar, // 134 Dstds <-------- neu! -
- FT_FuncVar, // 135 Vars <-------- neu! -
- FT_FuncVar, // 136 Stds <-------- neu! -
- FT_FuncFix2, // 137 D360 <-------- neu! -
- FT_NOP, // 138 Reserved (internal) <-------- neu! -
- FT_FuncFix0, // 139 Isapp <-------- neu! - Anzahl ? -
- FT_FuncVar, // 140 Isaaf <-------- neu! - Anzahl ? -
- FT_FuncFix1, // 141 Weekday <-------- neu! -
- FT_FuncFix3, // 142 Datedif <-------- neu! -
- FT_FuncVar, // 143 Rank <-------- neu! -
- FT_FuncFix2, // 144 Numberstring <-------- neu! -
- FT_FuncFix1, // 145 Datestring <-------- neu! -
- FT_FuncFix1, // 146 Decimal <-------- neu! -
- FT_FuncFix1, // 147 Hex <-------- neu! -
- FT_FuncFix4, // 148 Db <-------- neu! -
- FT_FuncFix4, // 149 Pmti <-------- neu! -
- FT_FuncFix4, // 150 Spi <-------- neu! -
- FT_FuncFix1, // 151 Fullp <-------- neu! -
- FT_FuncFix1, // 152 Halfp <-------- neu! -
- FT_FuncVar, // 153 Pureavg <-------- neu! -
- FT_FuncVar, // 154 Purecount <-------- neu! -
- FT_FuncVar, // 155 Puremax <-------- neu! -
- FT_FuncVar, // 156 Puremin <-------- neu! -
- FT_FuncVar, // 157 Purestd <-------- neu! -
- FT_FuncVar, // 158 Purevar <-------- neu! -
- FT_FuncVar, // 159 Purestds <-------- neu! -
- FT_FuncVar, // 160 Purevars <-------- neu! -
- FT_FuncFix3, // 161 Pmt2 <-------- neu! -
- FT_FuncFix3, // 162 Pv2 <-------- neu! -
- FT_FuncFix3, // 163 Fv2 <-------- neu! -
- FT_FuncFix3, // 164 Term2 <-------- neu! -
- FT_NotImpl, // 165 --- <-------- neu! - Anzahl ? -
- FT_FuncFix2, // 166 D360 (US-Version)
- FT_NotImpl, // 167
- FT_NotImpl, // 168
- FT_NotImpl, // 169
- FT_NotImpl, // 170
- FT_NotImpl, // 171
- FT_NotImpl, // 172
- FT_NotImpl, // 173
- FT_NotImpl, // 174
- FT_NotImpl, // 175
- FT_NotImpl, // 176
- FT_NotImpl, // 177
- FT_NotImpl, // 178
- FT_NotImpl, // 179
- FT_NotImpl, // 180
- FT_NotImpl, // 181
- FT_NotImpl, // 182
- FT_NotImpl, // 183
- FT_NotImpl, // 184
- FT_NotImpl, // 185
- FT_FuncVar, // 186 Solver <-------- neu! -
- FT_NotImpl, // 187
- FT_NotImpl, // 188
- FT_NotImpl, // 189
- FT_NotImpl, // 190
- FT_NotImpl, // 191
- FT_NotImpl, // 192
- FT_NotImpl, // 193
- FT_NotImpl, // 194
- FT_NotImpl, // 195
- FT_NotImpl, // 196
- FT_NotImpl, // 197
- FT_NotImpl, // 198
- FT_NotImpl, // 199
- FT_NotImpl, // 200
- FT_NotImpl, // 201
- FT_NotImpl, // 202
- FT_NotImpl, // 203
- FT_NotImpl, // 204
- FT_NotImpl, // 205
- FT_NotImpl, // 206
- FT_NotImpl, // 207
- FT_NotImpl, // 208
- FT_NotImpl, // 209
- FT_NotImpl, // 210
- FT_NotImpl, // 211
- FT_NotImpl, // 212
- FT_NotImpl, // 213
- FT_NotImpl, // 214
- FT_NotImpl, // 215
- FT_NotImpl, // 216
- FT_NotImpl, // 217
- FT_NotImpl, // 218
- FT_NotImpl, // 219
- FT_NotImpl, // 220
- FT_NotImpl, // 221
- FT_NotImpl, // 222
- FT_NotImpl, // 223
- FT_NotImpl, // 224
- FT_NotImpl, // 225
- FT_NotImpl, // 226
- FT_NotImpl, // 227
- FT_NotImpl, // 228
- FT_NotImpl, // 229
- FT_NotImpl, // 230
- FT_NotImpl, // 231
- FT_NotImpl, // 232
- FT_NotImpl, // 233
- FT_NotImpl, // 234
- FT_NotImpl, // 235
- FT_NotImpl, // 236
- FT_NotImpl, // 237
- FT_NotImpl, // 238
- FT_NotImpl, // 239
- FT_NotImpl, // 240
- FT_NotImpl, // 241
- FT_NotImpl, // 242
- FT_NotImpl, // 243
- FT_NotImpl, // 244
- FT_NotImpl, // 245
- FT_NotImpl, // 246
- FT_NotImpl, // 247
- FT_NotImpl, // 248
- FT_NotImpl, // 249
- FT_NotImpl, // 250
- FT_NotImpl, // 251
- FT_NotImpl, // 252
- FT_NotImpl, // 253
- FT_NotImpl, // 254
- FT_NotImpl, // 255
+ { // Code Bezeichnung
+ FT_Const10Float, // 0 8-Byte-IEEE-Long-Number
+ FT_Cref, // 1 Cell Reference
+ FT_Rref, // 2 Area Reference
+ FT_Return, // 3 return
+ FT_Braces, // 4 Klammer
+ FT_Snum, // 5 Short-Number
+ FT_ConstString, // 6 ASCII-String
+ FT_Nrref, // 7 Named range reference
+ FT_Absnref, // 8 Absolut named range
+ FT_Erref, // 9 Err range reference
+ FT_Ecref, // 10 Err cell reference
+ FT_Econstant, // 11 Err constant
+ FT_NotImpl, // 12
+ FT_NotImpl, // 13
+ FT_Neg, // 14 Negation
+ FT_Op, // 15 Addition
+ FT_Op, // 16 Subtraktion
+ FT_Op, // 17 Multiplikation
+ FT_Op, // 18 Division
+ FT_Op, // 19 Potenzierung
+ FT_Op, // 20 Gleichheit
+ FT_Op, // 21 Ungleich
+ FT_Op, // 22 Kleiner-gleich
+ FT_Op, // 23 Groesser-gleich
+ FT_Op, // 24 Kleiner
+ FT_Op, // 25 Groesser
+ FT_Op, // 26 And (logisch)
+ FT_Op, // 27 Or (logisch)
+ FT_FuncFix1, // 28 Not (logisch)
+ FT_NOP, // 29 unaeres Plus
+ FT_Op, // 30 Concatenation
+ FT_FuncFix0, // 31 Not applicable
+ FT_FuncFix0, // 32 Error
+ FT_FuncFix1, // 33 Betrag ABS()
+ FT_FuncFix1, // 34 Ganzzahl INT()
+ FT_FuncFix1, // 35 Quadratwurzel
+ FT_FuncFix1, // 36 Zehnerlogarithmus
+ FT_FuncFix1, // 37 Natuerlicher Logarithmus
+ FT_FuncFix0, // 38 PI
+ FT_FuncFix1, // 39 Sinus
+ FT_FuncFix1, // 40 Cosinus
+ FT_FuncFix1, // 41 Tangens
+ FT_FuncFix2, // 42 Arcus-Tangens 2 (4.Quadrant)
+ FT_FuncFix1, // 43 Arcus-Tangens (2.Quadrant)
+ FT_FuncFix1, // 44 Arcus-Sinus
+ FT_FuncFix1, // 45 Arcus-Cosinus
+ FT_FuncFix1, // 46 Exponentialfunktion
+ FT_FuncFix2, // 47 Modulo
+ FT_FuncVar, // 48 Auswahl
+ FT_FuncFix1, // 49 Is not applicable?
+ FT_FuncFix1, // 50 Is Error?
+ FT_FuncFix0, // 51 FALSE
+ FT_FuncFix0, // 52 TRUE
+ FT_FuncFix0, // 53 Zufallszahl
+ FT_FuncFix3, // 54 Datum
+ FT_FuncFix0, // 55 Heute
+ FT_FuncFix3, // 56 Payment
+ FT_FuncFix3, // 57 Present Value
+ FT_FuncFix3, // 58 Future Value
+ FT_FuncFix3, // 59 If ... then ... else ...
+ FT_FuncFix1, // 60 Tag des Monats
+ FT_FuncFix1, // 61 Monat
+ FT_FuncFix1, // 62 Jahr
+ FT_FuncFix2, // 63 Runden
+ FT_FuncFix3, // 64 Zeit
+ FT_FuncFix1, // 65 Stunde
+ FT_FuncFix1, // 66 Minute
+ FT_FuncFix1, // 67 Sekunde
+ FT_FuncFix1, // 68 Ist Zahl?
+ FT_FuncFix1, // 69 Ist Text?
+ FT_FuncFix1, // 70 Len()
+ FT_FuncFix1, // 71 Val()
+ FT_FuncFix2, // 72 String()
+ FT_FuncFix3, // 73 Mid()
+ FT_FuncFix1, // 74 Char()
+ FT_FuncFix1, // 75 Ascii()
+ FT_FuncFix3, // 76 Find()
+ FT_FuncFix1, // 77 Datevalue
+ FT_FuncFix1, // 78 Timevalue
+ FT_FuncFix1, // 79 Cellpointer
+ FT_FuncVar, // 80 Sum()
+ FT_FuncVar, // 81 Avg()
+ FT_FuncVar, // 82 Cnt()
+ FT_FuncVar, // 83 Min()
+ FT_FuncVar, // 84 Max()
+ FT_FuncFix3, // 85 Vlookup()
+ FT_FuncFix2, // 86 Npv()
+ FT_FuncVar, // 87 Var()
+ FT_FuncVar, // 88 Std()
+ FT_FuncFix2, // 89 Irr()
+ FT_FuncFix3, // 90 Hlookup()
+ FT_FuncVar, // 91 Dsum <-------- neu! -
+ FT_FuncVar, // 92 Davg <-------- neu! -
+ FT_FuncVar, // 93 Dcnt <-------- neu! -
+ FT_FuncVar, // 94 Dmin <-------- neu! -
+ FT_FuncVar, // 95 Dmax <-------- neu! -
+ FT_FuncVar, // 96 Dvar <-------- neu! -
+ FT_FuncVar, // 97 Dstd <-------- neu! -
+ FT_FuncVar, // 98 Index() <-------- change! -
+ FT_FuncFix1, // 99 Cols() <-------- neu! -
+ FT_FuncFix1, // 100 Rows() <-------- neu! -
+ FT_FuncFix2, // 101 Repeat() <-------- neu! -
+ FT_FuncFix1, // 102 Upper() <-------- neu! -
+ FT_FuncFix1, // 103 Lower() <-------- neu! -
+ FT_FuncFix2, // 104 Left() <-------- neu! -
+ FT_FuncFix2, // 105 Right() <-------- neu! -
+ FT_FuncFix4, // 106 Replace() <-------- neu! -
+ FT_FuncFix1, // 107 Proper() <-------- neu! -
+ FT_FuncFix2, // 108 Cell() <-------- neu! -
+ FT_FuncFix1, // 109 Trim() <-------- neu! -
+ FT_FuncFix1, // 110 Clean() <-------- neu! -
+ FT_FuncFix1, // 111 S() <--------- change in Bez. -
+ FT_FuncFix1, // 112 N() <--------- change in Bez. -
+ FT_FuncFix2, // 113 Exact() <-------- neu! -
+ FT_NotImpl, // 114 App <--------- change in Bez. -
+ FT_FuncFix1, // 115 @@() <-------- neu! -
+ FT_FuncFix3, // 116 Rate() <-------- neu! -
+ FT_FuncFix3, // 117 Term() <--------- change in Anz.
+ FT_FuncFix3, // 118 Cterm() <--------- change in Anz.
+ FT_FuncFix3, // 119 Sln() <-------- neu! -
+ FT_FuncFix4, // 120 Syd() <-------- neu! -
+ FT_FuncFix4, // 121 Ddb() <-------- neu! -
+ FT_Splfunc, // 122 Splfunc <-------- neu! -
+ FT_FuncFix1, // 123 Sheets <-------- neu! -
+ FT_FuncFix1, // 124 Info <-------- neu! -
+ FT_FuncVar, // 125 Sumproduct <-------- neu! -
+ FT_FuncFix1, // 126 Isrange <-------- neu! -
+ FT_FuncVar, // 127 Dget <-------- neu! -
+ FT_FuncVar, // 128 Dquery <-------- neu! -
+ FT_FuncFix4, // 129 Coord <-------- neu! -
+ FT_NOP, // 130 Reserved (internal) <-------- neu! -
+ FT_FuncFix0, // 131 Today <-------- neu! -
+ FT_FuncVar, // 132 Vdb <-------- neu! -
+ FT_FuncVar, // 133 Dvars <-------- neu! -
+ FT_FuncVar, // 134 Dstds <-------- neu! -
+ FT_FuncVar, // 135 Vars <-------- neu! -
+ FT_FuncVar, // 136 Stds <-------- neu! -
+ FT_FuncFix2, // 137 D360 <-------- neu! -
+ FT_NOP, // 138 Reserved (internal) <-------- neu! -
+ FT_FuncFix0, // 139 Isapp <-------- neu! - Anzahl ? -
+ FT_FuncVar, // 140 Isaaf <-------- neu! - Anzahl ? -
+ FT_FuncFix1, // 141 Weekday <-------- neu! -
+ FT_FuncFix3, // 142 Datedif <-------- neu! -
+ FT_FuncVar, // 143 Rank <-------- neu! -
+ FT_FuncFix2, // 144 Numberstring <-------- neu! -
+ FT_FuncFix1, // 145 Datestring <-------- neu! -
+ FT_FuncFix1, // 146 Decimal <-------- neu! -
+ FT_FuncFix1, // 147 Hex <-------- neu! -
+ FT_FuncFix4, // 148 Db <-------- neu! -
+ FT_FuncFix4, // 149 Pmti <-------- neu! -
+ FT_FuncFix4, // 150 Spi <-------- neu! -
+ FT_FuncFix1, // 151 Fullp <-------- neu! -
+ FT_FuncFix1, // 152 Halfp <-------- neu! -
+ FT_FuncVar, // 153 Pureavg <-------- neu! -
+ FT_FuncVar, // 154 Purecount <-------- neu! -
+ FT_FuncVar, // 155 Puremax <-------- neu! -
+ FT_FuncVar, // 156 Puremin <-------- neu! -
+ FT_FuncVar, // 157 Purestd <-------- neu! -
+ FT_FuncVar, // 158 Purevar <-------- neu! -
+ FT_FuncVar, // 159 Purestds <-------- neu! -
+ FT_FuncVar, // 160 Purevars <-------- neu! -
+ FT_FuncFix3, // 161 Pmt2 <-------- neu! -
+ FT_FuncFix3, // 162 Pv2 <-------- neu! -
+ FT_FuncFix3, // 163 Fv2 <-------- neu! -
+ FT_FuncFix3, // 164 Term2 <-------- neu! -
+ FT_NotImpl, // 165 --- <-------- neu! - Anzahl ? -
+ FT_FuncFix2, // 166 D360 (US-Version)
+ FT_NotImpl, // 167
+ FT_NotImpl, // 168
+ FT_NotImpl, // 169
+ FT_NotImpl, // 170
+ FT_NotImpl, // 171
+ FT_NotImpl, // 172
+ FT_NotImpl, // 173
+ FT_NotImpl, // 174
+ FT_NotImpl, // 175
+ FT_NotImpl, // 176
+ FT_NotImpl, // 177
+ FT_NotImpl, // 178
+ FT_NotImpl, // 179
+ FT_NotImpl, // 180
+ FT_NotImpl, // 181
+ FT_NotImpl, // 182
+ FT_NotImpl, // 183
+ FT_NotImpl, // 184
+ FT_NotImpl, // 185
+ FT_FuncVar, // 186 Solver <-------- neu! -
+ FT_NotImpl, // 187
+ FT_NotImpl, // 188
+ FT_NotImpl, // 189
+ FT_NotImpl, // 190
+ FT_NotImpl, // 191
+ FT_NotImpl, // 192
+ FT_NotImpl, // 193
+ FT_NotImpl, // 194
+ FT_NotImpl, // 195
+ FT_NotImpl, // 196
+ FT_NotImpl, // 197
+ FT_NotImpl, // 198
+ FT_NotImpl, // 199
+ FT_NotImpl, // 200
+ FT_NotImpl, // 201
+ FT_NotImpl, // 202
+ FT_NotImpl, // 203
+ FT_NotImpl, // 204
+ FT_NotImpl, // 205
+ FT_NotImpl, // 206
+ FT_NotImpl, // 207
+ FT_NotImpl, // 208
+ FT_NotImpl, // 209
+ FT_NotImpl, // 210
+ FT_NotImpl, // 211
+ FT_NotImpl, // 212
+ FT_NotImpl, // 213
+ FT_NotImpl, // 214
+ FT_NotImpl, // 215
+ FT_NotImpl, // 216
+ FT_NotImpl, // 217
+ FT_NotImpl, // 218
+ FT_NotImpl, // 219
+ FT_NotImpl, // 220
+ FT_NotImpl, // 221
+ FT_NotImpl, // 222
+ FT_NotImpl, // 223
+ FT_NotImpl, // 224
+ FT_NotImpl, // 225
+ FT_NotImpl, // 226
+ FT_NotImpl, // 227
+ FT_NotImpl, // 228
+ FT_NotImpl, // 229
+ FT_NotImpl, // 230
+ FT_NotImpl, // 231
+ FT_NotImpl, // 232
+ FT_NotImpl, // 233
+ FT_NotImpl, // 234
+ FT_NotImpl, // 235
+ FT_NotImpl, // 236
+ FT_NotImpl, // 237
+ FT_NotImpl, // 238
+ FT_NotImpl, // 239
+ FT_NotImpl, // 240
+ FT_NotImpl, // 241
+ FT_NotImpl, // 242
+ FT_NotImpl, // 243
+ FT_NotImpl, // 244
+ FT_NotImpl, // 245
+ FT_NotImpl, // 246
+ FT_NotImpl, // 247
+ FT_NotImpl, // 248
+ FT_NotImpl, // 249
+ FT_NotImpl, // 250
+ FT_NotImpl, // 251
+ FT_NotImpl, // 252
+ FT_NotImpl, // 253
+ FT_NotImpl, // 254
+ FT_NotImpl, // 255
};
return pType[ nIndex ];
}
@@ -1464,263 +1464,263 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( BYTE nIndex )
DefTokenId LotusToSc::IndexToTokenWK123( BYTE nIndex )
{
static const DefTokenId pToken[ 256 ] =
- { // Code Bezeichnung
- ocPush, // 0 8-Byte-IEEE-Long-Numbers
- ocPush, // 1 Variable
- ocPush, // 2 Bereich
- ocPush, // 3 return
- ocPush, // 4 Klammer
- ocPush, // 5 Numbers
- ocPush, // 6 ASCII-String
- ocPush, // 7 Named range reference
- ocPush, // 8 Absolut named range
- ocPush, // 9 Err range reference
- ocPush, // 10 Err cell reference
- ocPush, // 11 Err constant
- ocPush, // 12
- ocPush, // 13
- ocNegSub, // 14 Negation
- ocAdd, // 15 Addition
- ocSub, // 16 Subtraktion
- ocMul, // 17 Multiplikation
- ocDiv, // 18 Division
- ocPow, // 19 Potenzierung
- ocEqual, // 20 Gleichheit
- ocNotEqual, // 21 Ungleich
- ocLessEqual, // 22 Kleiner-gleich
- ocGreaterEqual, // 23 Groesser-gleich
- ocLess, // 24 Kleiner
- ocGreater, // 25 Groesser
- ocAnd, // 26 And (logisch)
- ocOr, // 27 Or (logisch)
- ocNot, // 28 Not (logisch)
- ocPush, // 29 unaeres Plus
- ocAmpersand, // 30 Concatenation
- ocNotAvail, // 31 Not available
- ocNoName, // 32 Error
- ocAbs, // 33 Betrag ABS()
- ocInt, // 34 Ganzzahl INT()
- ocSqrt, // 35 Quadratwurzel
- ocLog10, // 36 Zehnerlogarithmus
- ocLn, // 37 Natuerlicher Logarithmus
- ocPi, // 38 PI
- ocSin, // 39 Sinus
- ocCos, // 40 Cosinus
- ocTan, // 41 Tangens
- ocArcTan2, // 42 Arcus-Tangens 2 (4.Quadrant)
- ocArcTan, // 43 Arcus-Tangens (2.Quadrant)
- ocArcSin, // 44 Arcus-Sinus
- ocArcCos, // 45 Arcus-Cosinus
- ocExp, // 46 Exponentialfunktion
- ocMod, // 47 Modulo
- ocChose, // 48 Auswahl
- ocIsNA, // 49 Is not available?
- ocIsError, // 50 Is Error?
- ocFalse, // 51 FALSE
- ocTrue, // 52 TRUE
- ocRandom, // 53 Zufallszahl
- ocGetDate, // 54 Datum
- ocGetActDate, // 55 Heute
- ocRMZ, // 56 Payment
- ocBW, // 57 Present Value
- ocZW, // 58 Future Value
- ocIf, // 59 If ... then ... else ...
- ocGetDay, // 60 Tag des Monats
- ocGetMonth, // 61 Monat
- ocGetYear, // 62 Jahr
- ocRound, // 63 Runden
- ocGetTime, // 64 Zeit
- ocGetHour, // 65 Stunde
- ocGetMin, // 66 Minute
- ocGetSec, // 67 Sekunde
- ocIsValue, // 68 Ist Zahl?
- ocIsString, // 69 Ist Text?
- ocLen, // 70 Len()
- ocValue, // 71 Val()
- ocFixed, // 72 String() ocFixed ersatzweise + Spezialfall
- ocMid, // 73 Mid()
- ocChar, // 74 Char()
- ocCode, // 75 Ascii()
- ocFind, // 76 Find()
- ocGetDateValue, // 77 Datevalue
- ocGetTimeValue, // 78 Timevalue
- ocNoName, // 79 Cellpointer
- ocSum, // 80 Sum()
- ocAverage, // 81 Avg()
- ocCount, // 82 Cnt()
- ocMin, // 83 Min()
- ocMax, // 84 Max()
- ocVLookup, // 85 Vlookup()
- ocNPV, // 86 Npv()
- ocVar, // 87 Var()
- ocStDev, // 88 Std()
- ocIRR, // 89 Irr()
- ocHLookup, // 90 Hlookup()
- ocDBSum, // 91 XlfDsum
- ocDBAverage, // 92 XlfDaverage
- ocDBCount, // 93 XlfDcount
- ocDBMin, // 94 XlfDmin
- ocDBMax, // 95 XlfDmax
- ocDBVar, // 96 XlfDvar
- ocDBStdDev, // 97 XlfDstdev
- ocIndex, // 98 Index()
- ocColumns, // 99 Cols()
- ocRows, // 100 Rows()
- ocRept, // 101 Repeat()
- ocUpper, // 102 Upper()
- ocLower, // 103 Lower()
- ocLeft, // 104 Left()
- ocRight, // 105 Right()
- ocReplace, // 106 Replace()
- ocPropper, // 107 Proper()
- ocNoName, // 108 Cell()
- ocTrim, // 109 Trim()
- ocClean, // 110 Clean()
- ocNoName, // 111 F() (Excel: T()?)
- ocNoName, // 112 W()
- ocExact, // 113 Exact()
- ocNoName, // 114 Call()
- ocIndirect, // 115 @@()
- ocZins, // 116 Rate()
- ocNoName, // 117 Term()
- ocNoName, // 118 Cterm()
- ocLIA, // 119 Sln()
- ocDIA, // 120 Syd(), Soy()
- ocGDA, // 121 Ddb()
- ocNoName, // 122 Splfunc
- ocNoName, // 123 Sheets
- ocNoName, // 124 Info
- ocSumProduct, // 125 Sumproduct
- ocNoName, // 126 Isrange
- ocDBGet, // 127 Dget
- ocNoName, // 128 Dquery
- ocNoName, // 129 Coord
- ocNoName, // 130 Reserved (internal)
- ocGetActDate, // 131 Today
- ocNoName, // 132 Vdb
- ocDBVarP, // 133 Dvars
- ocDBStdDevP, // 134 Dstds
- ocVarP, // 135 Vars
- ocStDevP, // 136 Stds
- ocGetDiffDate360, // 137 D360
- ocNoName, // 138 Reserved (internal)
- ocNoName, // 139 Isapp
- ocNoName, // 140 Isaaf
- ocGetDayOfWeek, // 141 Weekday
- ocGetDiffDate, // 142 Datedif
- ocRank, // 143 Rank
- ocNoName, // 144 Numberstring
- ocNoName, // 145 Datestring
- ocNoName, // 146 Decimal
- ocNoName, // 147 Hex
- ocNoName, // 148 Db
- ocNoName, // 149 Pmti
- ocNoName, // 150 Spi
- ocNoName, // 151 Fullp
- ocNoName, // 152 Halfp
- ocNoName, // 153 Pureavg
- ocCount2, // 154 Purecount
- ocNoName, // 155 Puremax
- ocNoName, // 156 Puremin
- ocNoName, // 157 Purestd
- ocNoName, // 158 Purevar
- ocNoName, // 159 Purestds
- ocNoName, // 160 Purevars
- ocNoName, // 161 Pmt2
- ocNoName, // 162 Pv2
- ocNoName, // 163 Fv2
- ocNoName, // 164 Term2
- ocNoName, // 165 --- <-------- neu! - Anzahl ? -
- ocGetDiffDate360, // 166 D360 (US-Version, ersatzweise wie ander D360-Funktion)
- ocNoName, // 167
- ocNoName, // 168
- ocNoName, // 169
- ocNoName, // 170
- ocNoName, // 171
- ocNoName, // 172
- ocNoName, // 173
- ocNoName, // 174
- ocNoName, // 175
- ocNoName, // 176
- ocNoName, // 177
- ocNoName, // 178
- ocNoName, // 179
- ocNoName, // 180
- ocNoName, // 181
- ocNoName, // 182
- ocNoName, // 183
- ocNoName, // 184
- ocNoName, // 185
- ocNoName, // 186
- ocNoName, // 187
- ocNoName, // 188
- ocNoName, // 189
- ocNoName, // 190
- ocNoName, // 191
- ocNoName, // 192
- ocNoName, // 193
- ocNoName, // 194
- ocNoName, // 195
- ocNoName, // 196
- ocNoName, // 197
- ocNoName, // 198
- ocNoName, // 199
- ocNoName, // 200
- ocNoName, // 201
- ocNoName, // 202
- ocNoName, // 203
- ocNoName, // 204
- ocNoName, // 205
- ocNoName, // 206 ?
- ocNoName, // 207
- ocNoName, // 208
- ocNoName, // 209
- ocNoName, // 210
- ocNoName, // 211
- ocNoName, // 212
- ocNoName, // 213
- ocNoName, // 214
- ocNoName, // 215
- ocNoName, // 216
- ocNoName, // 217
- ocNoName, // 218
- ocNoName, // 219
- ocNoName, // 220
- ocNoName, // 221
- ocNoName, // 222
- ocNoName, // 223
- ocNoName, // 224
- ocNoName, // 225
- ocNoName, // 226
- ocNoName, // 227
- ocNoName, // 228
- ocNoName, // 229
- ocNoName, // 230
- ocNoName, // 231
- ocNoName, // 232
- ocNoName, // 233
- ocNoName, // 234
- ocNoName, // 235
- ocNoName, // 236
- ocNoName, // 237
- ocNoName, // 238
- ocNoName, // 239
- ocNoName, // 240
- ocNoName, // 241
- ocNoName, // 242
- ocNoName, // 243
- ocNoName, // 244
- ocNoName, // 245
- ocNoName, // 246
- ocNoName, // 247
- ocNoName, // 248
- ocNoName, // 249
- ocNoName, // 250
- ocNoName, // 251
- ocNoName, // 252
- ocNoName, // 253
- ocNoName, // 254
- ocNoName // 255 ?
+ { // Code Bezeichnung
+ ocPush, // 0 8-Byte-IEEE-Long-Numbers
+ ocPush, // 1 Variable
+ ocPush, // 2 Bereich
+ ocPush, // 3 return
+ ocPush, // 4 Klammer
+ ocPush, // 5 Numbers
+ ocPush, // 6 ASCII-String
+ ocPush, // 7 Named range reference
+ ocPush, // 8 Absolut named range
+ ocPush, // 9 Err range reference
+ ocPush, // 10 Err cell reference
+ ocPush, // 11 Err constant
+ ocPush, // 12
+ ocPush, // 13
+ ocNegSub, // 14 Negation
+ ocAdd, // 15 Addition
+ ocSub, // 16 Subtraktion
+ ocMul, // 17 Multiplikation
+ ocDiv, // 18 Division
+ ocPow, // 19 Potenzierung
+ ocEqual, // 20 Gleichheit
+ ocNotEqual, // 21 Ungleich
+ ocLessEqual, // 22 Kleiner-gleich
+ ocGreaterEqual, // 23 Groesser-gleich
+ ocLess, // 24 Kleiner
+ ocGreater, // 25 Groesser
+ ocAnd, // 26 And (logisch)
+ ocOr, // 27 Or (logisch)
+ ocNot, // 28 Not (logisch)
+ ocPush, // 29 unaeres Plus
+ ocAmpersand, // 30 Concatenation
+ ocNotAvail, // 31 Not available
+ ocNoName, // 32 Error
+ ocAbs, // 33 Betrag ABS()
+ ocInt, // 34 Ganzzahl INT()
+ ocSqrt, // 35 Quadratwurzel
+ ocLog10, // 36 Zehnerlogarithmus
+ ocLn, // 37 Natuerlicher Logarithmus
+ ocPi, // 38 PI
+ ocSin, // 39 Sinus
+ ocCos, // 40 Cosinus
+ ocTan, // 41 Tangens
+ ocArcTan2, // 42 Arcus-Tangens 2 (4.Quadrant)
+ ocArcTan, // 43 Arcus-Tangens (2.Quadrant)
+ ocArcSin, // 44 Arcus-Sinus
+ ocArcCos, // 45 Arcus-Cosinus
+ ocExp, // 46 Exponentialfunktion
+ ocMod, // 47 Modulo
+ ocChose, // 48 Auswahl
+ ocIsNA, // 49 Is not available?
+ ocIsError, // 50 Is Error?
+ ocFalse, // 51 FALSE
+ ocTrue, // 52 TRUE
+ ocRandom, // 53 Zufallszahl
+ ocGetDate, // 54 Datum
+ ocGetActDate, // 55 Heute
+ ocRMZ, // 56 Payment
+ ocBW, // 57 Present Value
+ ocZW, // 58 Future Value
+ ocIf, // 59 If ... then ... else ...
+ ocGetDay, // 60 Tag des Monats
+ ocGetMonth, // 61 Monat
+ ocGetYear, // 62 Jahr
+ ocRound, // 63 Runden
+ ocGetTime, // 64 Zeit
+ ocGetHour, // 65 Stunde
+ ocGetMin, // 66 Minute
+ ocGetSec, // 67 Sekunde
+ ocIsValue, // 68 Ist Zahl?
+ ocIsString, // 69 Ist Text?
+ ocLen, // 70 Len()
+ ocValue, // 71 Val()
+ ocFixed, // 72 String() ocFixed ersatzweise + Spezialfall
+ ocMid, // 73 Mid()
+ ocChar, // 74 Char()
+ ocCode, // 75 Ascii()
+ ocFind, // 76 Find()
+ ocGetDateValue, // 77 Datevalue
+ ocGetTimeValue, // 78 Timevalue
+ ocNoName, // 79 Cellpointer
+ ocSum, // 80 Sum()
+ ocAverage, // 81 Avg()
+ ocCount, // 82 Cnt()
+ ocMin, // 83 Min()
+ ocMax, // 84 Max()
+ ocVLookup, // 85 Vlookup()
+ ocNPV, // 86 Npv()
+ ocVar, // 87 Var()
+ ocStDev, // 88 Std()
+ ocIRR, // 89 Irr()
+ ocHLookup, // 90 Hlookup()
+ ocDBSum, // 91 XlfDsum
+ ocDBAverage, // 92 XlfDaverage
+ ocDBCount, // 93 XlfDcount
+ ocDBMin, // 94 XlfDmin
+ ocDBMax, // 95 XlfDmax
+ ocDBVar, // 96 XlfDvar
+ ocDBStdDev, // 97 XlfDstdev
+ ocIndex, // 98 Index()
+ ocColumns, // 99 Cols()
+ ocRows, // 100 Rows()
+ ocRept, // 101 Repeat()
+ ocUpper, // 102 Upper()
+ ocLower, // 103 Lower()
+ ocLeft, // 104 Left()
+ ocRight, // 105 Right()
+ ocReplace, // 106 Replace()
+ ocPropper, // 107 Proper()
+ ocNoName, // 108 Cell()
+ ocTrim, // 109 Trim()
+ ocClean, // 110 Clean()
+ ocNoName, // 111 F() (Excel: T()?)
+ ocNoName, // 112 W()
+ ocExact, // 113 Exact()
+ ocNoName, // 114 Call()
+ ocIndirect, // 115 @@()
+ ocZins, // 116 Rate()
+ ocNoName, // 117 Term()
+ ocNoName, // 118 Cterm()
+ ocLIA, // 119 Sln()
+ ocDIA, // 120 Syd(), Soy()
+ ocGDA, // 121 Ddb()
+ ocNoName, // 122 Splfunc
+ ocNoName, // 123 Sheets
+ ocNoName, // 124 Info
+ ocSumProduct, // 125 Sumproduct
+ ocNoName, // 126 Isrange
+ ocDBGet, // 127 Dget
+ ocNoName, // 128 Dquery
+ ocNoName, // 129 Coord
+ ocNoName, // 130 Reserved (internal)
+ ocGetActDate, // 131 Today
+ ocNoName, // 132 Vdb
+ ocDBVarP, // 133 Dvars
+ ocDBStdDevP, // 134 Dstds
+ ocVarP, // 135 Vars
+ ocStDevP, // 136 Stds
+ ocGetDiffDate360, // 137 D360
+ ocNoName, // 138 Reserved (internal)
+ ocNoName, // 139 Isapp
+ ocNoName, // 140 Isaaf
+ ocGetDayOfWeek, // 141 Weekday
+ ocGetDiffDate, // 142 Datedif
+ ocRank, // 143 Rank
+ ocNoName, // 144 Numberstring
+ ocNoName, // 145 Datestring
+ ocNoName, // 146 Decimal
+ ocNoName, // 147 Hex
+ ocNoName, // 148 Db
+ ocNoName, // 149 Pmti
+ ocNoName, // 150 Spi
+ ocNoName, // 151 Fullp
+ ocNoName, // 152 Halfp
+ ocNoName, // 153 Pureavg
+ ocCount2, // 154 Purecount
+ ocNoName, // 155 Puremax
+ ocNoName, // 156 Puremin
+ ocNoName, // 157 Purestd
+ ocNoName, // 158 Purevar
+ ocNoName, // 159 Purestds
+ ocNoName, // 160 Purevars
+ ocNoName, // 161 Pmt2
+ ocNoName, // 162 Pv2
+ ocNoName, // 163 Fv2
+ ocNoName, // 164 Term2
+ ocNoName, // 165 --- <-------- neu! - Anzahl ? -
+ ocGetDiffDate360, // 166 D360 (US-Version, ersatzweise wie ander D360-Funktion)
+ ocNoName, // 167
+ ocNoName, // 168
+ ocNoName, // 169
+ ocNoName, // 170
+ ocNoName, // 171
+ ocNoName, // 172
+ ocNoName, // 173
+ ocNoName, // 174
+ ocNoName, // 175
+ ocNoName, // 176
+ ocNoName, // 177
+ ocNoName, // 178
+ ocNoName, // 179
+ ocNoName, // 180
+ ocNoName, // 181
+ ocNoName, // 182
+ ocNoName, // 183
+ ocNoName, // 184
+ ocNoName, // 185
+ ocNoName, // 186
+ ocNoName, // 187
+ ocNoName, // 188
+ ocNoName, // 189
+ ocNoName, // 190
+ ocNoName, // 191
+ ocNoName, // 192
+ ocNoName, // 193
+ ocNoName, // 194
+ ocNoName, // 195
+ ocNoName, // 196
+ ocNoName, // 197
+ ocNoName, // 198
+ ocNoName, // 199
+ ocNoName, // 200
+ ocNoName, // 201
+ ocNoName, // 202
+ ocNoName, // 203
+ ocNoName, // 204
+ ocNoName, // 205
+ ocNoName, // 206 ?
+ ocNoName, // 207
+ ocNoName, // 208
+ ocNoName, // 209
+ ocNoName, // 210
+ ocNoName, // 211
+ ocNoName, // 212
+ ocNoName, // 213
+ ocNoName, // 214
+ ocNoName, // 215
+ ocNoName, // 216
+ ocNoName, // 217
+ ocNoName, // 218
+ ocNoName, // 219
+ ocNoName, // 220
+ ocNoName, // 221
+ ocNoName, // 222
+ ocNoName, // 223
+ ocNoName, // 224
+ ocNoName, // 225
+ ocNoName, // 226
+ ocNoName, // 227
+ ocNoName, // 228
+ ocNoName, // 229
+ ocNoName, // 230
+ ocNoName, // 231
+ ocNoName, // 232
+ ocNoName, // 233
+ ocNoName, // 234
+ ocNoName, // 235
+ ocNoName, // 236
+ ocNoName, // 237
+ ocNoName, // 238
+ ocNoName, // 239
+ ocNoName, // 240
+ ocNoName, // 241
+ ocNoName, // 242
+ ocNoName, // 243
+ ocNoName, // 244
+ ocNoName, // 245
+ ocNoName, // 246
+ ocNoName, // 247
+ ocNoName, // 248
+ ocNoName, // 249
+ ocNoName, // 250
+ ocNoName, // 251
+ ocNoName, // 252
+ ocNoName, // 253
+ ocNoName, // 254
+ ocNoName // 255 ?
};
return pToken[ nIndex ];
@@ -1731,264 +1731,264 @@ DefTokenId LotusToSc::IndexToTokenWK123( BYTE nIndex )
const sal_Char* GetAddInName( const UINT8 n )
{
- static const sal_Char* pNames[ 256 ] =
+ static const sal_Char* pNames[ 256 ] =
{
- NULL, // 0 8-Byte-IEEE-Float
- NULL, // 1 Variable
- NULL, // 2 Bereich
- NULL, // 3 return
- NULL, // 4 Klammer
- NULL, // 5 2-Byte-Integer
- NULL, // 6 ASCII-String
- NULL, // 7 Named range reference
- NULL, // 8 Absolut named range
- NULL, // 9 Err range reference
- NULL, // 10 Err cell reference
- NULL, // 11 Err constant
- NULL, // 12
- NULL, // 13
- NULL, // 14 Negation
- NULL, // 15 Addition
- NULL, // 16 Subtraktion
- NULL, // 17 Multiplikation
- NULL, // 18 Division
- NULL, // 19 Potenzierung
- NULL, // 20 Gleichheit
- NULL, // 21 Ungleich
- NULL, // 22 Kleiner-gleich
- NULL, // 23 Groesser-gleich
- NULL, // 24 Kleiner
- NULL, // 25 Groesser
- NULL, // 26 And (logisch)
- NULL, // 27 Or (logisch)
- NULL, // 28 Not (logisch)
- NULL, // 29 unaeres Plus
- NULL, // 30 Concatenation
- NULL, // 31 Not applicable
- NULL, // 32 Error
- NULL, // 33 Betrag ABS()
- NULL, // 34 Ganzzahl INT()
- NULL, // 35 Quadratwurzel
- NULL, // 36 Zehnerlogarithmus
- NULL, // 37 Natuerlicher Logarithmus
- NULL, // 38 PI
- NULL, // 39 Sinus
- NULL, // 40 Cosinus
- NULL, // 41 Tangens
- NULL, // 42 Arcus-Tangens 2 (4.Quadrant)
- NULL, // 43 Arcus-Tangens (2.Quadrant)
- NULL, // 44 Arcus-Sinus
- NULL, // 45 Arcus-Cosinus
- NULL, // 46 Exponentialfunktion
- NULL, // 47 Modulo
- NULL, // 48 Auswahl
- NULL, // 49 Is not applicable?
- NULL, // 50 Is Error?
- NULL, // 51 FALSE
- NULL, // 52 TRUE
- NULL, // 53 Zufallszahl
- NULL, // 54 Datum
- NULL, // 55 Heute
- NULL, // 56 Payment
- NULL, // 57 Present Value
- NULL, // 58 Future Value
- NULL, // 59 If ... then ... else ...
- NULL, // 60 Tag des Monats
- NULL, // 61 Monat
- NULL, // 62 Jahr
- NULL, // 63 Runden
- NULL, // 64 Zeit
- NULL, // 65 Stunde
- NULL, // 66 Minute
- NULL, // 67 Sekunde
- NULL, // 68 Ist Zahl?
- NULL, // 69 Ist Text?
- NULL, // 70 Len()
- NULL, // 71 Val()
- NULL, // 72 String() ocFixed ersatzweise + Spezialfall
- NULL, // 73 Mid()
- NULL, // 74 Char()
- NULL, // 75 Ascii()
- NULL, // 76 Find()
- NULL, // 77 Datevalue
- NULL, // 78 Timevalue
- "ZELLZEIGER", // 79 Cellpointer
- NULL, // 80 Sum()
- NULL, // 81 Avg()
- NULL, // 82 Cnt()
- NULL, // 83 Min()
- NULL, // 84 Max()
- NULL, // 85 Vlookup()
- NULL, // 86 Npv()
- NULL, // 87 Var()
- NULL, // 88 Std()
- NULL, // 89 Irr()
- NULL, // 90 Hlookup()
- NULL, // 91 XlfDsum
- NULL, // 92 XlfDaverage
- NULL, // 93 XlfDcount
- NULL, // 94 XlfDmin
- NULL, // 95 XlfDmax
- NULL, // 96 XlfDvar
- NULL, // 97 XlfDstdev
- NULL, // 98 Index()
- NULL, // 99 Cols()
- NULL, // 100 Rows()
- NULL, // 101 Repeat()
- NULL, // 102 Upper()
- NULL, // 103 Lower()
- NULL, // 104 Left()
- NULL, // 105 Right()
- NULL, // 106 Replace()
- NULL, // 107 Proper()
- "ZELLE", // 108 Cell()
- NULL, // 109 Trim()
- NULL, // 110 Clean()
- "F", // 111 F() (Excel: T()?)
- "W", // 112 W()
- NULL, // 113 Exact()
- NULL, // 114 Call()
- NULL, // 115 @@()
- NULL, // 116 Rate()
- "ANN", // 117 Term()
- NULL, // 118 Cterm()
- NULL, // 119 Sln()
- NULL, // 120 Syd(), Soy()
- NULL, // 121 Ddb()
- "SplFunc", // 122 Splfunc
- "BLAETTER", // 123 Sheets
- "INFO", // 124 Info
- NULL, // 125 Sumproduct
- "ISTBEREICH", // 126 Isrange
- NULL, // 127 Dget
- "DABFRAGE", // 128 Dquery
- "KOORD", // 129 Coord
- NULL, // 130 Reserved (internal)
- NULL, // 131 Today
- NULL, // 132 Vdb
- NULL, // 133 Dvars
- NULL, // 134 Dstds
- NULL, // 135 Vars
- NULL, // 136 Stds
- NULL, // 137 D360
- NULL, // 138 Reserved (internal)
- NULL, // 139 Isapp
- "ISTDEFZUS", // 140 Isaaf
- NULL, // 141 Weekday
- NULL, // 142 Datedif
- NULL, // 143 Rank
- NULL, // 144 Numberstring
- "DATUMFOLGE", // 145 Datestring
- "DEZIMAL", // 146 Decimal
- "HEX", // 147 Hex
- NULL, // 148 Db
- NULL, // 149 Pmti
- NULL, // 150 Spi
- NULL, // 151 Fullp
- NULL, // 152 Halfp
- "PURMITTELWERT", // 153 Pureavg
- "PURANZAHL", // 154 Purecount
- "PURMAX", // 155 Puremax
- "PURMIN", // 156 Puremin
- "PURSTDABW", // 157 Purestd
- "PURVAR", // 158 Purevar
- "PURSTDABWP", // 159 Purestds
- "PURVARP", // 160 Purevars
- NULL, // 161 Pmt2
- NULL, // 162 Pv2
- NULL, // 163 Fv2
- NULL, // 164 Term2
- NULL, // 165 --- <-------- neu! - Anzahl ? -
- NULL, // 166 D360 (US-Version, ersatzweise wie ander D360-Funktion)
- NULL, // 167
- NULL, // 168
- NULL, // 169
- NULL, // 170
- NULL, // 171
- NULL, // 172
- NULL, // 173
- NULL, // 174
- NULL, // 175
- NULL, // 176
- NULL, // 177
- NULL, // 178
- NULL, // 179
- NULL, // 180
- NULL, // 181
- NULL, // 182
- NULL, // 183
- NULL, // 184
- NULL, // 185
- NULL, // 186
- NULL, // 187
- NULL, // 188
- NULL, // 189
- NULL, // 190
- NULL, // 191
- NULL, // 192
- NULL, // 193
- NULL, // 194
- NULL, // 195
- NULL, // 196
- NULL, // 197
- NULL, // 198
- NULL, // 199
- NULL, // 200
- NULL, // 201
- NULL, // 202
- NULL, // 203
- NULL, // 204
- NULL, // 205
- NULL, // 206 ?
- NULL, // 207
- NULL, // 208
- NULL, // 209
- NULL, // 210
- NULL, // 211
- NULL, // 212
- NULL, // 213
- NULL, // 214
- NULL, // 215
- NULL, // 216
- NULL, // 217
- NULL, // 218
- NULL, // 219
- NULL, // 220
- NULL, // 221
- NULL, // 222
- NULL, // 223
- NULL, // 224
- NULL, // 225
- NULL, // 226
- NULL, // 227
- NULL, // 228
- NULL, // 229
- NULL, // 230
- NULL, // 231
- NULL, // 232
- NULL, // 233
- NULL, // 234
- NULL, // 235
- NULL, // 236
- NULL, // 237
- NULL, // 238
- NULL, // 239
- NULL, // 240
- NULL, // 241
- NULL, // 242
- NULL, // 243
- NULL, // 244
- NULL, // 245
- NULL, // 246
- NULL, // 247
- NULL, // 248
- NULL, // 249
- NULL, // 250
- NULL, // 251
- NULL, // 252
- NULL, // 253
- NULL, // 254
- NULL // 255 ?
+ NULL, // 0 8-Byte-IEEE-Float
+ NULL, // 1 Variable
+ NULL, // 2 Bereich
+ NULL, // 3 return
+ NULL, // 4 Klammer
+ NULL, // 5 2-Byte-Integer
+ NULL, // 6 ASCII-String
+ NULL, // 7 Named range reference
+ NULL, // 8 Absolut named range
+ NULL, // 9 Err range reference
+ NULL, // 10 Err cell reference
+ NULL, // 11 Err constant
+ NULL, // 12
+ NULL, // 13
+ NULL, // 14 Negation
+ NULL, // 15 Addition
+ NULL, // 16 Subtraktion
+ NULL, // 17 Multiplikation
+ NULL, // 18 Division
+ NULL, // 19 Potenzierung
+ NULL, // 20 Gleichheit
+ NULL, // 21 Ungleich
+ NULL, // 22 Kleiner-gleich
+ NULL, // 23 Groesser-gleich
+ NULL, // 24 Kleiner
+ NULL, // 25 Groesser
+ NULL, // 26 And (logisch)
+ NULL, // 27 Or (logisch)
+ NULL, // 28 Not (logisch)
+ NULL, // 29 unaeres Plus
+ NULL, // 30 Concatenation
+ NULL, // 31 Not applicable
+ NULL, // 32 Error
+ NULL, // 33 Betrag ABS()
+ NULL, // 34 Ganzzahl INT()
+ NULL, // 35 Quadratwurzel
+ NULL, // 36 Zehnerlogarithmus
+ NULL, // 37 Natuerlicher Logarithmus
+ NULL, // 38 PI
+ NULL, // 39 Sinus
+ NULL, // 40 Cosinus
+ NULL, // 41 Tangens
+ NULL, // 42 Arcus-Tangens 2 (4.Quadrant)
+ NULL, // 43 Arcus-Tangens (2.Quadrant)
+ NULL, // 44 Arcus-Sinus
+ NULL, // 45 Arcus-Cosinus
+ NULL, // 46 Exponentialfunktion
+ NULL, // 47 Modulo
+ NULL, // 48 Auswahl
+ NULL, // 49 Is not applicable?
+ NULL, // 50 Is Error?
+ NULL, // 51 FALSE
+ NULL, // 52 TRUE
+ NULL, // 53 Zufallszahl
+ NULL, // 54 Datum
+ NULL, // 55 Heute
+ NULL, // 56 Payment
+ NULL, // 57 Present Value
+ NULL, // 58 Future Value
+ NULL, // 59 If ... then ... else ...
+ NULL, // 60 Tag des Monats
+ NULL, // 61 Monat
+ NULL, // 62 Jahr
+ NULL, // 63 Runden
+ NULL, // 64 Zeit
+ NULL, // 65 Stunde
+ NULL, // 66 Minute
+ NULL, // 67 Sekunde
+ NULL, // 68 Ist Zahl?
+ NULL, // 69 Ist Text?
+ NULL, // 70 Len()
+ NULL, // 71 Val()
+ NULL, // 72 String() ocFixed ersatzweise + Spezialfall
+ NULL, // 73 Mid()
+ NULL, // 74 Char()
+ NULL, // 75 Ascii()
+ NULL, // 76 Find()
+ NULL, // 77 Datevalue
+ NULL, // 78 Timevalue
+ "ZELLZEIGER", // 79 Cellpointer
+ NULL, // 80 Sum()
+ NULL, // 81 Avg()
+ NULL, // 82 Cnt()
+ NULL, // 83 Min()
+ NULL, // 84 Max()
+ NULL, // 85 Vlookup()
+ NULL, // 86 Npv()
+ NULL, // 87 Var()
+ NULL, // 88 Std()
+ NULL, // 89 Irr()
+ NULL, // 90 Hlookup()
+ NULL, // 91 XlfDsum
+ NULL, // 92 XlfDaverage
+ NULL, // 93 XlfDcount
+ NULL, // 94 XlfDmin
+ NULL, // 95 XlfDmax
+ NULL, // 96 XlfDvar
+ NULL, // 97 XlfDstdev
+ NULL, // 98 Index()
+ NULL, // 99 Cols()
+ NULL, // 100 Rows()
+ NULL, // 101 Repeat()
+ NULL, // 102 Upper()
+ NULL, // 103 Lower()
+ NULL, // 104 Left()
+ NULL, // 105 Right()
+ NULL, // 106 Replace()
+ NULL, // 107 Proper()
+ "ZELLE", // 108 Cell()
+ NULL, // 109 Trim()
+ NULL, // 110 Clean()
+ "F", // 111 F() (Excel: T()?)
+ "W", // 112 W()
+ NULL, // 113 Exact()
+ NULL, // 114 Call()
+ NULL, // 115 @@()
+ NULL, // 116 Rate()
+ "ANN", // 117 Term()
+ NULL, // 118 Cterm()
+ NULL, // 119 Sln()
+ NULL, // 120 Syd(), Soy()
+ NULL, // 121 Ddb()
+ "SplFunc", // 122 Splfunc
+ "BLAETTER", // 123 Sheets
+ "INFO", // 124 Info
+ NULL, // 125 Sumproduct
+ "ISTBEREICH", // 126 Isrange
+ NULL, // 127 Dget
+ "DABFRAGE", // 128 Dquery
+ "KOORD", // 129 Coord
+ NULL, // 130 Reserved (internal)
+ NULL, // 131 Today
+ NULL, // 132 Vdb
+ NULL, // 133 Dvars
+ NULL, // 134 Dstds
+ NULL, // 135 Vars
+ NULL, // 136 Stds
+ NULL, // 137 D360
+ NULL, // 138 Reserved (internal)
+ NULL, // 139 Isapp
+ "ISTDEFZUS", // 140 Isaaf
+ NULL, // 141 Weekday
+ NULL, // 142 Datedif
+ NULL, // 143 Rank
+ NULL, // 144 Numberstring
+ "DATUMFOLGE", // 145 Datestring
+ "DEZIMAL", // 146 Decimal
+ "HEX", // 147 Hex
+ NULL, // 148 Db
+ NULL, // 149 Pmti
+ NULL, // 150 Spi
+ NULL, // 151 Fullp
+ NULL, // 152 Halfp
+ "PURMITTELWERT", // 153 Pureavg
+ "PURANZAHL", // 154 Purecount
+ "PURMAX", // 155 Puremax
+ "PURMIN", // 156 Puremin
+ "PURSTDABW", // 157 Purestd
+ "PURVAR", // 158 Purevar
+ "PURSTDABWP", // 159 Purestds
+ "PURVARP", // 160 Purevars
+ NULL, // 161 Pmt2
+ NULL, // 162 Pv2
+ NULL, // 163 Fv2
+ NULL, // 164 Term2
+ NULL, // 165 --- <-------- neu! - Anzahl ? -
+ NULL, // 166 D360 (US-Version, ersatzweise wie ander D360-Funktion)
+ NULL, // 167
+ NULL, // 168
+ NULL, // 169
+ NULL, // 170
+ NULL, // 171
+ NULL, // 172
+ NULL, // 173
+ NULL, // 174
+ NULL, // 175
+ NULL, // 176
+ NULL, // 177
+ NULL, // 178
+ NULL, // 179
+ NULL, // 180
+ NULL, // 181
+ NULL, // 182
+ NULL, // 183
+ NULL, // 184
+ NULL, // 185
+ NULL, // 186
+ NULL, // 187
+ NULL, // 188
+ NULL, // 189
+ NULL, // 190
+ NULL, // 191
+ NULL, // 192
+ NULL, // 193
+ NULL, // 194
+ NULL, // 195
+ NULL, // 196
+ NULL, // 197
+ NULL, // 198
+ NULL, // 199
+ NULL, // 200
+ NULL, // 201
+ NULL, // 202
+ NULL, // 203
+ NULL, // 204
+ NULL, // 205
+ NULL, // 206 ?
+ NULL, // 207
+ NULL, // 208
+ NULL, // 209
+ NULL, // 210
+ NULL, // 211
+ NULL, // 212
+ NULL, // 213
+ NULL, // 214
+ NULL, // 215
+ NULL, // 216
+ NULL, // 217
+ NULL, // 218
+ NULL, // 219
+ NULL, // 220
+ NULL, // 221
+ NULL, // 222
+ NULL, // 223
+ NULL, // 224
+ NULL, // 225
+ NULL, // 226
+ NULL, // 227
+ NULL, // 228
+ NULL, // 229
+ NULL, // 230
+ NULL, // 231
+ NULL, // 232
+ NULL, // 233
+ NULL, // 234
+ NULL, // 235
+ NULL, // 236
+ NULL, // 237
+ NULL, // 238
+ NULL, // 239
+ NULL, // 240
+ NULL, // 241
+ NULL, // 242
+ NULL, // 243
+ NULL, // 244
+ NULL, // 245
+ NULL, // 246
+ NULL, // 247
+ NULL, // 248
+ NULL, // 249
+ NULL, // 250
+ NULL, // 251
+ NULL, // 252
+ NULL, // 253
+ NULL, // 254
+ NULL // 255 ?
};
return pNames[ n ];
@@ -1997,7 +1997,7 @@ const sal_Char* GetAddInName( const UINT8 n )
DefTokenId lcl_KnownAddIn( const ByteString& sTest )
{
- DefTokenId eId = ocNoName;
+ DefTokenId eId = ocNoName;
if( sTest == "FACT" )
eId = ocFact;
diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx
index 2f6f81b7279c..1b8b9d96438a 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "lotattr.hxx"
-static NAMESPACE_VOS( OMutex ) aLotImpSemaphore;
+static NAMESPACE_VOS( OMutex ) aLotImpSemaphore;
ImportLotus::ImportLotus( SvStream& aStream, ScDocument* pDoc, CharSet eQ ) :
@@ -91,8 +91,8 @@ ImportLotus::~ImportLotus()
void ImportLotus::Bof( void )
{
- UINT16 nFileCode, nFileSub, nSaveCnt;
- BYTE nMajorId, nMinorId, nFlags;
+ UINT16 nFileCode, nFileSub, nSaveCnt;
+ BYTE nMajorId, nMinorId, nFlags;
Read( nFileCode );
Read( nFileSub );
@@ -119,7 +119,7 @@ void ImportLotus::Bof( void )
BOOL ImportLotus::BofFm3( void )
{
- UINT16 nFileCode, nFileSub;
+ UINT16 nFileCode, nFileSub;
Read( nFileCode );
Read( nFileSub );
@@ -133,7 +133,7 @@ void ImportLotus::Columnwidth( UINT16 nRecLen )
DBG_ASSERT( nRecLen >= 4, "*ImportLotus::Columnwidth(): Record zu kurz!" );
BYTE nLTab, nWindow2;
- UINT16 nCnt = ( nRecLen - 4 ) / 2;
+ UINT16 nCnt = ( nRecLen - 4 ) / 2;
Read( nLTab );
Read( nWindow2 );
@@ -145,7 +145,7 @@ void ImportLotus::Columnwidth( UINT16 nRecLen )
{
Skip( 2 );
- BYTE nCol, nSpaces;
+ BYTE nCol, nSpaces;
while( nCnt )
{
@@ -165,7 +165,7 @@ void ImportLotus::Hiddencolumn( UINT16 nRecLen )
DBG_ASSERT( nRecLen >= 4, "*ImportLotus::Hiddencolumn(): Record zu kurz!" );
BYTE nLTab, nWindow2;
- UINT16 nCnt = ( nRecLen - 4 ) / 2;
+ UINT16 nCnt = ( nRecLen - 4 ) / 2;
Read( nLTab );
Read( nWindow2 );
@@ -174,7 +174,7 @@ void ImportLotus::Hiddencolumn( UINT16 nRecLen )
{
Skip( 2 );
- BYTE nCol;
+ BYTE nCol;
while( nCnt )
{
@@ -189,15 +189,15 @@ void ImportLotus::Hiddencolumn( UINT16 nRecLen )
void ImportLotus::Userrange( void )
{
- UINT16 nRangeType;
- ScRange aScRange;
- sal_Char* pBuffer = new sal_Char[ 32 ];
+ UINT16 nRangeType;
+ ScRange aScRange;
+ sal_Char* pBuffer = new sal_Char[ 32 ];
Read( nRangeType );
pIn->Read( pBuffer, 16 );
- pBuffer[ 16 ] = ( sal_Char ) 0x00; // zur Sicherheit...
- String aName( pBuffer, eQuellChar );
+ pBuffer[ 16 ] = ( sal_Char ) 0x00; // zur Sicherheit...
+ String aName( pBuffer, eQuellChar );
Read( aScRange );
@@ -208,7 +208,7 @@ void ImportLotus::Userrange( void )
void ImportLotus::Errcell( void )
{
- ScAddress aA;
+ ScAddress aA;
Read( aA );
@@ -218,7 +218,7 @@ void ImportLotus::Errcell( void )
void ImportLotus::Nacell( void )
{
- ScAddress aA;
+ ScAddress aA;
Read( aA );
@@ -228,15 +228,15 @@ void ImportLotus::Nacell( void )
void ImportLotus::Labelcell( void )
{
- ScAddress aA;
- String aLabel;
- sal_Char cAlign;
+ ScAddress aA;
+ String aLabel;
+ sal_Char cAlign;
Read( aA );
Read( cAlign );
Read( aLabel );
-// aLabel.Convert( pLotusRoot->eCharsetQ );
+// aLabel.Convert( pLotusRoot->eCharsetQ );
pD->PutCell( aA.Col(), aA.Row(), aA.Tab(), new ScStringCell( aLabel ), (BOOL)TRUE );
}
@@ -244,8 +244,8 @@ void ImportLotus::Labelcell( void )
void ImportLotus::Numbercell( void )
{
- ScAddress aAddr;
- double fVal;
+ ScAddress aAddr;
+ double fVal;
Read( aAddr );
Read( fVal );
@@ -257,8 +257,8 @@ void ImportLotus::Numbercell( void )
void ImportLotus::Smallnumcell( void )
{
- ScAddress aAddr;
- INT16 nVal;
+ ScAddress aAddr;
+ INT16 nVal;
Read( aAddr );
Read( nVal );
@@ -272,21 +272,21 @@ ScFormulaCell *ImportLotus::Formulacell( UINT16 n )
{
DBG_ASSERT( pIn, "-ImportLotus::Formulacell(): Null-Stream -> Rums!" );
- ScAddress aAddr;
+ ScAddress aAddr;
Read( aAddr );
Skip( 10 );
n -= 14;
- const ScTokenArray* pErg;
- INT32 nRest = n;
+ const ScTokenArray* pErg;
+ INT32 nRest = n;
aConv.Reset( aAddr );
aConv.SetWK3();
aConv.Convert( pErg, nRest );
- ScFormulaCell* pZelle = new ScFormulaCell( pD, aAddr, pErg );
+ ScFormulaCell* pZelle = new ScFormulaCell( pD, aAddr, pErg );
pZelle->AddRecalcMode( RECALCMODE_ONLOAD_ONCE );
@@ -307,8 +307,8 @@ void ImportLotus::RowPresentation( UINT16 nRecLen )
DBG_ASSERT( nRecLen > 4, "*ImportLotus::RowPresentation(): Record zu kurz!" );
BYTE nLTab, nFlags;
- UINT16 nRow, nHeight;
- UINT16 nCnt = ( nRecLen - 4 ) / 8;
+ UINT16 nRow, nHeight;
+ UINT16 nCnt = ( nRecLen - 4 ) / 8;
Read( nLTab );
Skip( 1 );
@@ -321,11 +321,11 @@ void ImportLotus::RowPresentation( UINT16 nRecLen )
Read( nFlags );
Skip( 1 );
- if( nFlags & 0x02 ) // Fixed / Strech to fit fonts
- { // fixed
+ if( nFlags & 0x02 ) // Fixed / Strech to fit fonts
+ { // fixed
// Height in Lotus in 1/32 Points
- nHeight *= 20; // -> 32 * TWIPS
- nHeight /= 32; // -> TWIPS
+ nHeight *= 20; // -> 32 * TWIPS
+ nHeight /= 32; // -> TWIPS
pD->SetRowFlags( static_cast<SCROW> (nRow), static_cast<SCTAB> (nLTab), pD->GetRowFlags( static_cast<SCROW> (nRow), static_cast<SCTAB> (nLTab) ) | CR_MANUALSIZE );
@@ -340,7 +340,7 @@ void ImportLotus::RowPresentation( UINT16 nRecLen )
void ImportLotus::NamedSheet( void )
{
UINT16 nLTab;
- String aName;
+ String aName;
Read( nLTab );
Read( aName );
@@ -354,8 +354,8 @@ void ImportLotus::NamedSheet( void )
void ImportLotus::Font_Face( void )
{
- BYTE nNum;
- String aName;
+ BYTE nNum;
+ String aName;
Read( nNum );
@@ -373,8 +373,8 @@ void ImportLotus::Font_Face( void )
void ImportLotus::Font_Type( void )
{
static const UINT16 nAnz = 8;
- UINT16 nCnt;
- UINT16 nType;
+ UINT16 nCnt;
+ UINT16 nType;
for( nCnt = 0 ; nCnt < nAnz ; nCnt++ )
{
@@ -386,9 +386,9 @@ void ImportLotus::Font_Type( void )
void ImportLotus::Font_Ysize( void )
{
- static const UINT16 nAnz = 8;
- UINT16 nCnt;
- UINT16 nSize;
+ static const UINT16 nAnz = 8;
+ UINT16 nCnt;
+ UINT16 nSize;
for( nCnt = 0 ; nCnt < nAnz ; nCnt++ )
{
@@ -402,14 +402,14 @@ void ImportLotus::_Row( const UINT16 nRecLen )
{
DBG_ASSERT( nExtTab >= 0, "*ImportLotus::_Row(): Kann hier nicht sein!" );
- UINT16 nRow;
- UINT16 nHeight;
- UINT16 nCntDwn = ( nRecLen - 4 ) / 5;
- SCCOL nColCnt = 0;
- UINT8 nRepeats;
- LotAttrWK3 aAttr;
+ UINT16 nRow;
+ UINT16 nHeight;
+ UINT16 nCntDwn = ( nRecLen - 4 ) / 5;
+ SCCOL nColCnt = 0;
+ UINT8 nRepeats;
+ LotAttrWK3 aAttr;
- BOOL bCenter = FALSE;
+ BOOL bCenter = FALSE;
SCCOL nCenterStart = 0, nCenterEnd = 0;
Read( nRow );
diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx
index 917337fa91d5..cfbc530a96c3 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,22 +48,22 @@ FltError ImportLotus::Read()
{
enum STATE
{
- S_START, // analyse first BOF
- S_WK1, // in WK1-Stream
- S_WK3, // in WK3-Section
- S_WK4, // ...
- S_FM3, // ...
- S_END // Import finished
+ S_START, // analyse first BOF
+ S_WK1, // in WK1-Stream
+ S_WK3, // in WK3-Section
+ S_WK4, // ...
+ S_FM3, // ...
+ S_END // Import finished
};
- UINT16 nOp;
- UINT16 nSubType;
- UINT16 nRecLen;
- UINT32 nNextRec = 0UL;
- FltError eRet = eERR_OK;
-// ScFormulaCell *pLastFormCell;
+ UINT16 nOp;
+ UINT16 nSubType;
+ UINT16 nRecLen;
+ UINT32 nNextRec = 0UL;
+ FltError eRet = eERR_OK;
+// ScFormulaCell *pLastFormCell;
- STATE eAkt = S_START;
+ STATE eAkt = S_START;
nTab = 0;
nExtTab = -2;
@@ -85,7 +85,7 @@ FltError ImportLotus::Read()
switch( eAkt )
{
// -----------------------------------------------------------
- case S_START: // S_START
+ case S_START: // S_START
if( nOp )
{
eRet = SCERR_IMPORT_UNKNOWN_WK;
@@ -98,9 +98,9 @@ FltError ImportLotus::Read()
Bof();
switch( pLotusRoot->eFirstType )
{
- case Lotus_WK1: eAkt = S_WK1; break;
- case Lotus_WK3: eAkt = S_WK3; break;
- case Lotus_WK4: eAkt = S_WK4; break;
+ case Lotus_WK1: eAkt = S_WK1; break;
+ case Lotus_WK3: eAkt = S_WK3; break;
+ case Lotus_WK4: eAkt = S_WK4; break;
case Lotus_FM3: eAkt = S_FM3; break;
default:
eRet = SCERR_IMPORT_UNKNOWN_WK;
@@ -109,78 +109,78 @@ FltError ImportLotus::Read()
}
else
{
- eAkt = S_END; // hier kommt wat fuer <= WK1 hinne!
+ eAkt = S_END; // hier kommt wat fuer <= WK1 hinne!
eRet = 0xFFFFFFFF;
}
}
break;
// -----------------------------------------------------------
- case S_WK1: // S_WK1
+ case S_WK1: // S_WK1
break;
// -----------------------------------------------------------
- case S_WK3: // S_WK3
- case S_WK4: // S_WK4
+ case S_WK3: // S_WK3
+ case S_WK4: // S_WK4
switch( nOp )
{
- case 0x0001: // EOF
+ case 0x0001: // EOF
eAkt = S_FM3;
nTab++;
break;
- case 0x0002: // PASSWORD
+ case 0x0002: // PASSWORD
eRet = eERR_FILEPASSWD;
eAkt = S_END;
break;
- case 0x0007: // COLUMNWIDTH
+ case 0x0007: // COLUMNWIDTH
Columnwidth( nRecLen );
break;
- case 0x0008: // HIDDENCOLUMN
+ case 0x0008: // HIDDENCOLUMN
Hiddencolumn( nRecLen );
break;
- case 0x0009: // USERRANGE
+ case 0x0009: // USERRANGE
Userrange();
break;
- case 0x0013: // FORMAT
+ case 0x0013: // FORMAT
break;
- case 0x0014: // ERRCELL
+ case 0x0014: // ERRCELL
Errcell();
break;
- case 0x0015: // NACELL
+ case 0x0015: // NACELL
Nacell();
break;
- case 0x0016: // LABELCELL
+ case 0x0016: // LABELCELL
Labelcell();
break;
- case 0x0017: // NUMBERCELL
+ case 0x0017: // NUMBERCELL
Numbercell();
break;
- case 0x0018: // SMALLNUMCELL
+ case 0x0018: // SMALLNUMCELL
Smallnumcell();
break;
- case 0x0019: // FORMULACELL
+ case 0x0019: // FORMULACELL
Formulacell( nRecLen );
break;
- case 0x001b: // extended attributes
+ case 0x001b: // extended attributes
Read( nSubType );
nRecLen -= 2;
switch( nSubType )
{
- case 2007: // ROW PRESENTATION
+ case 2007: // ROW PRESENTATION
RowPresentation( nRecLen );
break;
- case 14000: // NAMED SHEET
+ case 14000: // NAMED SHEET
NamedSheet();
break;
}
@@ -188,10 +188,10 @@ FltError ImportLotus::Read()
break;
// -----------------------------------------------------------
- case S_FM3: // S_FM3
+ case S_FM3: // S_FM3
break;
// -----------------------------------------------------------
- case S_END: // S_END
+ case S_END: // S_END
break;
// -----------------------------------------------------------
#ifdef DBG_UTIL
@@ -209,11 +209,11 @@ FltError ImportLotus::Read()
}
// duemmliche Namen eliminieren
- SCTAB nTabs = pD->GetTableCount();
- SCTAB nCnt;
- String aTabName;
- String aBaseName;
- String aRef( RTL_CONSTASCII_USTRINGPARAM( "temp" ) );
+ SCTAB nTabs = pD->GetTableCount();
+ SCTAB nCnt;
+ String aTabName;
+ String aBaseName;
+ String aRef( RTL_CONSTASCII_USTRINGPARAM( "temp" ) );
if( nTabs != 0 )
{
if( nTabs > 1 )
@@ -245,11 +245,11 @@ FltError ImportLotus::Read( SvStream& rIn )
{
pIn = &rIn;
- BOOL bRead = TRUE;
- UINT16 nOp;
- UINT16 nRecLen;
- UINT32 nNextRec = 0UL;
- FltError eRet = eERR_OK;
+ BOOL bRead = TRUE;
+ UINT16 nOp;
+ UINT16 nRecLen;
+ UINT32 nNextRec = 0UL;
+ FltError eRet = eERR_OK;
nTab = 0;
nExtTab = -1;
@@ -271,7 +271,7 @@ FltError ImportLotus::Read( SvStream& rIn )
switch( nOp )
{
- case 0x0000: // BOF
+ case 0x0000: // BOF
if( nRecLen != 26 || !BofFm3() )
{
bRead = FALSE;
@@ -279,22 +279,22 @@ FltError ImportLotus::Read( SvStream& rIn )
}
break;
- case 0x0001: // EOF
+ case 0x0001: // EOF
bRead = FALSE;
DBG_ASSERT( nTab == 0,
"-ImportLotus::Read( SvStream& ): Zweimal EOF nicht erlaubt" );
nTab++;
break;
- case 174: // FONT_FACE
+ case 174: // FONT_FACE
Font_Face();
break;
- case 176: // FONT_TYPE
+ case 176: // FONT_TYPE
Font_Type();
break;
- case 177: // FONT_YSIZE
+ case 177: // FONT_YSIZE
Font_Ysize();
break;
diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx
index a1a428c5dbeb..2e7b5c9caf45 100644
--- a/sc/source/filter/lotus/lotus.cxx
+++ b/sc/source/filter/lotus/lotus.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,23 +47,23 @@ FltError ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium, ScDocum
ScFilterOptions aFilterOpt;
BOOL bWithWK3 = aFilterOpt.GetWK3Flag();
- SvStream* pStream = rMedium.GetInStream();
+ SvStream* pStream = rMedium.GetInStream();
if( !pStream )
return eERR_OPEN;
- FltError eRet;
+ FltError eRet;
pStream->Seek( 0UL );
pStream->SetBufferSize( 32768 );
- ImportLotus aLotusImport( *pStream, pDocument, eSrc );
+ ImportLotus aLotusImport( *pStream, pDocument, eSrc );
if( bWithWK3 )
eRet = aLotusImport.Read();
else
- eRet = 0xFFFFFFFF; // WK1 /WKS erzwingen
+ eRet = 0xFFFFFFFF; // WK1 /WKS erzwingen
// ACHTUNG: QUICK-HACK fuer WK1 / WKS <-> WK3 / WK4
if( eRet == 0xFFFFFFFF )
diff --git a/sc/source/filter/lotus/memory.cxx b/sc/source/filter/lotus/memory.cxx
index 1ac1fa5c470f..f158d845cf23 100644
--- a/sc/source/filter/lotus/memory.cxx
+++ b/sc/source/filter/lotus/memory.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,41 +41,41 @@
#include "decl.h"
#include "tool.h"
-extern const long nStackSize;
-extern const int nAnzNRange;
+extern const long nStackSize;
+extern const int nAnzNRange;
-extern ScDocument* pDoc;
+extern ScDocument* pDoc;
-const long nStackSize = 8L * 1024; // -> form_xxx.cpp
-const int nAnzNRange = 2048; // -> tool_xxx.cpp, max. 2048 Named Ranges
+const long nStackSize = 8L * 1024; // -> form_xxx.cpp
+const int nAnzNRange = 2048; // -> tool_xxx.cpp, max. 2048 Named Ranges
-sal_Char* pPuffer; // -> flt_xxx.cxx
-sal_Char* pDummy1; // -> flt_xxx.cxx, ScanVersion()
-sal_Char* pDummy2; // -> tool.cxx, CreateTable()
+sal_Char* pPuffer; // -> flt_xxx.cxx
+sal_Char* pDummy1; // -> flt_xxx.cxx, ScanVersion()
+sal_Char* pDummy2; // -> tool.cxx, CreateTable()
-extern BYTE* pFormelBuffer; // -> tool.cxx, fuer OP_Formula()
-BYTE* pFormelBuffer;
+extern BYTE* pFormelBuffer; // -> tool.cxx, fuer OP_Formula()
+BYTE* pFormelBuffer;
-extern FormCache* pValueFormCache; // -> tool.cxx
+extern FormCache* pValueFormCache; // -> tool.cxx
-sal_Char* pStack; // -> formel.cxx
-sal_Char* pPuffer0; // -> formel.cxx
-sal_Char* pPuffer1; // -> formel.cxx
-extern const int nMaxPar;
-const int nMaxPar = 128; // max. 128 Parameter werden unterstuetzt
-sal_Char** pPar; // -> formel.cxx, Pn()
+sal_Char* pStack; // -> formel.cxx
+sal_Char* pPuffer0; // -> formel.cxx
+sal_Char* pPuffer1; // -> formel.cxx
+extern const int nMaxPar;
+const int nMaxPar = 128; // max. 128 Parameter werden unterstuetzt
+sal_Char** pPar; // -> formel.cxx, Pn()
-#ifndef _DOS // -> op.cxx
-sal_Char* pAnsi;
+#ifndef _DOS // -> op.cxx
+sal_Char* pAnsi;
#endif
-sal_Char* pErgebnis; // -> op.cxx
+sal_Char* pErgebnis; // -> op.cxx
-extern BOOL bFormInit; // -> tool.cxx, fuer GetFormHandle()
-BOOL bFormInit;
+extern BOOL bFormInit; // -> tool.cxx, fuer GetFormHandle()
+BOOL bFormInit;
-extern SvxHorJustifyItem *pAttrRight, *pAttrLeft, *pAttrCenter,
- *pAttrRepeat, *pAttrStandard; // -> tool.cxx, fuer GetFormAttr()
-extern ScProtectionAttr* pAttrUnprot; // -> tool.cxx, fuer PutFormString()
+extern SvxHorJustifyItem *pAttrRight, *pAttrLeft, *pAttrCenter,
+ *pAttrRepeat, *pAttrStandard; // -> tool.cxx, fuer GetFormAttr()
+extern ScProtectionAttr* pAttrUnprot; // -> tool.cxx, fuer PutFormString()
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index 4ab0c8bb3b14..b51774f8045d 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,18 +77,18 @@
#include <stdlib.h>
#endif
-extern sal_Char* pAnsi; // -> memory.cxx, Puffer zum Umwandeln von OEM->ANSI
-extern sal_Char* pErgebnis; // -> memory.cxx, Ergebnispuffer
-extern WKTYP eTyp; // -> filter.cxx, aktueller Dateityp
-extern BOOL bEOF; // -> filter.cxx, zeigt Dateiende an
-extern sal_Char* pPuffer0; // -> memory.cxx
-extern sal_Char* pPuffer1;
-extern BYTE nDefaultFormat; // -> tool.cxx, Default-Zellenformat
-extern ScDocument* pDoc; // -> filter.cxx, Aufhaenger zum Dokumentzugriff
-extern BYTE* pFormelBuffer; // -> memory.cxx, fuer
-extern CharSet eCharVon; // -> filter.cxx, character set specified
+extern sal_Char* pAnsi; // -> memory.cxx, Puffer zum Umwandeln von OEM->ANSI
+extern sal_Char* pErgebnis; // -> memory.cxx, Ergebnispuffer
+extern WKTYP eTyp; // -> filter.cxx, aktueller Dateityp
+extern BOOL bEOF; // -> filter.cxx, zeigt Dateiende an
+extern sal_Char* pPuffer0; // -> memory.cxx
+extern sal_Char* pPuffer1;
+extern BYTE nDefaultFormat; // -> tool.cxx, Default-Zellenformat
+extern ScDocument* pDoc; // -> filter.cxx, Aufhaenger zum Dokumentzugriff
+extern BYTE* pFormelBuffer; // -> memory.cxx, fuer
+extern CharSet eCharVon; // -> filter.cxx, character set specified
-static UINT16 nDefWidth = ( UINT16 ) ( TWIPS_PER_CHAR * 10 );
+static UINT16 nDefWidth = ( UINT16 ) ( TWIPS_PER_CHAR * 10 );
extern std::map<UINT16, ScPatternAttr> aLotusPatternPool;
@@ -112,14 +112,14 @@ void OP_EOF( SvStream& /*r*/, UINT16 /*n*/ )
void OP_Integer( SvStream& r, UINT16 /*n*/ )
{
- BYTE nFormat;
- UINT16 nCol, nRow;
- SCTAB nTab = 0;
- INT16 nValue;
+ BYTE nFormat;
+ UINT16 nCol, nRow;
+ SCTAB nTab = 0;
+ INT16 nValue;
r >> nFormat >> nCol >> nRow >> nValue;
- ScValueCell* pZelle = new ScValueCell( ( double ) nValue );
+ ScValueCell* pZelle = new ScValueCell( ( double ) nValue );
pDoc->PutCell( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab, pZelle, ( BOOL ) TRUE );
// 0 Stellen nach'm Komma!
@@ -129,15 +129,15 @@ void OP_Integer( SvStream& r, UINT16 /*n*/ )
void OP_Number( SvStream& r, UINT16 /*n*/ )
{
- BYTE nFormat;
- UINT16 nCol, nRow;
- SCTAB nTab = 0;
- double fValue;
+ BYTE nFormat;
+ UINT16 nCol, nRow;
+ SCTAB nTab = 0;
+ double fValue;
r >> nFormat >> nCol >> nRow >> fValue;
fValue = ::rtl::math::round( fValue, 15 );
- ScValueCell* pZelle = new ScValueCell( fValue );
+ ScValueCell* pZelle = new ScValueCell( fValue );
pDoc->PutCell( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab, pZelle, ( BOOL ) TRUE );
SetFormat( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab, nFormat, nDezFloat );
@@ -146,9 +146,9 @@ void OP_Number( SvStream& r, UINT16 /*n*/ )
void OP_Label( SvStream& r, UINT16 n )
{
- BYTE nFormat;
- UINT16 nCol, nRow;
- SCTAB nTab = 0;
+ BYTE nFormat;
+ UINT16 nCol, nRow;
+ SCTAB nTab = 0;
r >> nFormat >> nCol >> nRow;
n -= 5;
@@ -173,36 +173,36 @@ void OP_Label( SvStream& r, UINT16 n )
//UNUSED2009-05 UINT16 nRow;
//UNUSED2009-05 BYTE nCol, nTab;
//UNUSED2009-05 sal_Char pText[ 256 ];
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 r >> nRow >> nTab >> nCol;
//UNUSED2009-05 n -= 4;
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 r.Read( pText, n );
//UNUSED2009-05 pText[ n ] = 0; // zur Sicherheit Nullterminator anhaengen
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 PutFormString( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), static_cast<SCTAB> (nTab), pText );
//UNUSED2009-05 }
void OP_Formula( SvStream& r, UINT16 /*n*/ )
{
- BYTE nFormat;
- UINT16 nCol, nRow, nFormulaSize;
- SCTAB nTab = 0;
+ BYTE nFormat;
+ UINT16 nCol, nRow, nFormulaSize;
+ SCTAB nTab = 0;
r >> nFormat >> nCol >> nRow;
r.SeekRel( 8 ); // Ergebnis ueberspringen
r >> nFormulaSize;
- const ScTokenArray* pErg;
- INT32 nBytesLeft = nFormulaSize;
- ScAddress aAddress( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab );
+ const ScTokenArray* pErg;
+ INT32 nBytesLeft = nFormulaSize;
+ ScAddress aAddress( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab );
- LotusToSc aConv( r, pLotusRoot->eCharsetQ, FALSE );
+ LotusToSc aConv( r, pLotusRoot->eCharsetQ, FALSE );
aConv.Reset( aAddress );
aConv.Convert( pErg, nBytesLeft );
- ScFormulaCell* pZelle = new ScFormulaCell( pLotusRoot->pDoc, aAddress, pErg );
+ ScFormulaCell* pZelle = new ScFormulaCell( pLotusRoot->pDoc, aAddress, pErg );
pZelle->AddRecalcMode( RECALCMODE_ONLOAD_ONCE );
@@ -215,9 +215,9 @@ void OP_Formula( SvStream& r, UINT16 /*n*/ )
void OP_ColumnWidth( SvStream& r, UINT16 /*n*/ )
{
- UINT16 nCol, nBreite;
- BYTE nWidthSpaces;
- SCTAB nTab = 0;
+ UINT16 nCol, nBreite;
+ BYTE nWidthSpaces;
+ SCTAB nTab = 0;
r >> nCol >> nWidthSpaces;
@@ -237,14 +237,14 @@ void OP_ColumnWidth( SvStream& r, UINT16 /*n*/ )
void OP_NamedRange( SvStream& r, UINT16 /*n*/ )
{
// POST: waren Koordinaten ungueltig, wird nicht gespeichert
- UINT16 nColSt, nRowSt, nColEnd, nRowEnd;
- sal_Char cPuffer[ 32 ];
+ UINT16 nColSt, nRowSt, nColEnd, nRowEnd;
+ sal_Char cPuffer[ 32 ];
r.Read( cPuffer, 16 );
r >> nColSt >> nRowSt >> nColEnd >> nRowEnd;
- LotusRange* pRange;
+ LotusRange* pRange;
if( nColSt == nColEnd && nRowSt == nRowEnd )
pRange = new LotusRange( static_cast<SCCOL> (nColSt), static_cast<SCROW> (nRowSt) );
@@ -252,14 +252,14 @@ void OP_NamedRange( SvStream& r, UINT16 /*n*/ )
pRange = new LotusRange( static_cast<SCCOL> (nColSt), static_cast<SCROW> (nRowSt), static_cast<SCCOL> (nColEnd), static_cast<SCROW> (nRowEnd) );
if( isdigit( *cPuffer ) )
- { // erstes Zeichen im Namen eine Zahl -> 'A' vor Namen setzen
+ { // erstes Zeichen im Namen eine Zahl -> 'A' vor Namen setzen
*pAnsi = 'A';
strcpy( pAnsi + 1, cPuffer ); // #100211# - checked
}
else
strcpy( pAnsi, cPuffer ); // #100211# - checked
- String aTmp( pAnsi, pLotusRoot->eCharsetQ );
+ String aTmp( pAnsi, pLotusRoot->eCharsetQ );
ScfTools::ConvertToScDefinedName( aTmp );
@@ -270,10 +270,10 @@ void OP_NamedRange( SvStream& r, UINT16 /*n*/ )
void OP_SymphNamedRange( SvStream& r, UINT16 /*n*/ )
{
// POST: waren Koordinaten ungueltig, wird nicht gespeichert
- UINT16 nColSt, nRowSt, nColEnd, nRowEnd;
- BYTE nType;
- sal_Char* pName;
- sal_Char cPuffer[ 32 ];
+ UINT16 nColSt, nRowSt, nColEnd, nRowEnd;
+ BYTE nType;
+ sal_Char* pName;
+ sal_Char cPuffer[ 32 ];
r.Read( cPuffer, 16 );
cPuffer[ 16 ] = 0;
@@ -281,7 +281,7 @@ void OP_SymphNamedRange( SvStream& r, UINT16 /*n*/ )
r >> nColSt >> nRowSt >> nColEnd >> nRowEnd >> nType;
- LotusRange* pRange;
+ LotusRange* pRange;
if( nType )
pRange = new LotusRange( static_cast<SCCOL> (nColSt), static_cast<SCROW> (nRowSt) );
@@ -289,14 +289,14 @@ void OP_SymphNamedRange( SvStream& r, UINT16 /*n*/ )
pRange = new LotusRange( static_cast<SCCOL> (nColSt), static_cast<SCROW> (nRowSt), static_cast<SCCOL> (nColEnd), static_cast<SCROW> (nRowEnd) );
if( isdigit( *cPuffer ) )
- { // erstes Zeichen im Namen eine Zahl -> 'A' vor Namen setzen
+ { // erstes Zeichen im Namen eine Zahl -> 'A' vor Namen setzen
*pAnsi = 'A';
strcpy( pAnsi + 1, cPuffer ); // #100211# - checked
}
else
strcpy( pAnsi, cPuffer ); // #100211# - checked
- String aTmp( pAnsi, pLotusRoot->eCharsetQ );
+ String aTmp( pAnsi, pLotusRoot->eCharsetQ );
ScfTools::ConvertToScDefinedName( aTmp );
pLotusRoot->pRangeNames->Append( pRange, aTmp );
@@ -323,9 +323,9 @@ void OP_Margins( SvStream& r, UINT16 n )
void OP_HiddenCols( SvStream& r, UINT16 /*n*/ )
{
- UINT16 nByte, nBit;
- SCCOL nCount;
- BYTE nAkt;
+ UINT16 nByte, nBit;
+ SCCOL nCount;
+ BYTE nAkt;
nCount = 0;
for( nByte = 0 ; nByte < 32 ; nByte++ ) // 32 Bytes mit ...
@@ -366,8 +366,8 @@ void OP_Window1( SvStream& r, UINT16 n )
void OP_Blank( SvStream& r, UINT16 /*n*/ )
{
- UINT16 nCol, nRow;
- BYTE nFormat;
+ UINT16 nCol, nRow;
+ BYTE nFormat;
r >> nFormat >> nCol >> nRow;
SetFormat( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), 0, nFormat, nDezFloat );
@@ -421,15 +421,15 @@ void OP_Formula123( SvStream& r, UINT16 n )
r >> nRow >> nTab >> nCol;
r.SeekRel( 8 ); // Result- jump over
- const ScTokenArray* pErg;
- INT32 nBytesLeft = n - 12;
- ScAddress aAddress( nCol, nRow, nTab );
+ const ScTokenArray* pErg;
+ INT32 nBytesLeft = n - 12;
+ ScAddress aAddress( nCol, nRow, nTab );
- LotusToSc aConv( r, pLotusRoot->eCharsetQ, TRUE );
+ LotusToSc aConv( r, pLotusRoot->eCharsetQ, TRUE );
aConv.Reset( aAddress );
aConv.Convert( pErg, nBytesLeft );
- ScFormulaCell* pCell = new ScFormulaCell( pLotusRoot->pDoc, aAddress, pErg );
+ ScFormulaCell* pCell = new ScFormulaCell( pLotusRoot->pDoc, aAddress, pErg );
pCell->AddRecalcMode( RECALCMODE_ONLOAD_ONCE );
diff --git a/sc/source/filter/lotus/optab.cxx b/sc/source/filter/lotus/optab.cxx
index 503d271a5b74..76cd4618d12f 100644
--- a/sc/source/filter/lotus/optab.cxx
+++ b/sc/source/filter/lotus/optab.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,213 +36,213 @@
// Bearbeitungsfunktion sal_Char *X( sal_Char * )
OPCODE_FKT pOpFkt[ FKT_LIMIT ] =
-{ // Code
- OP_BOF, // 0
- OP_EOF, // 1
- NI, // 2
- NI, // 3
- NI, // 4
- NI, // 5
- NI, // 6
- OP_Window1, // 7
- OP_ColumnWidth, // 8
- NI, // 9
- NI, // 10
- OP_NamedRange, // 11
- OP_Blank, // 12
- OP_Integer, // 13
- OP_Number, // 14
- OP_Label, // 15
- OP_Formula, // 16
- NI, // 17
- NI, // 18
- NI, // 19
- NI, // 20
- NI, // 21
- NI, // 22
- NI, // 23
- NI, // 24
- NI, // 25
- NI, // 26
- NI, // 27
- NI, // 28
- NI, // 29
- NI, // 30
- NI, // 31
- NI, // 32
- NI, // 33
- NI, // 34
- NI, // 35
- NI, // 36
- OP_Footer, // 37
- OP_Header, // 38
- NI, // 39
- OP_Margins, // 40
- NI, // 41
- NI, // 42
- NI, // 43
- NI, // 44
- NI, // 45
- NI, // 46
- NI, // 47
- NI, // 48
- NI, // 49
- NI, // 50
- NI, // 51
- NI, // 52
- NI, // 53
- NI, // 54
- NI, // 55
- NI, // 56
- NI, // 57
- NI, // 58
- NI, // 59
- NI, // 60
- NI, // 61
- NI, // 62
- NI, // 63
- NI, // 64
- NI, // 65
- NI, // 66
- NI, // 67
- NI, // 68
- NI, // 69
- NI, // 70
- OP_SymphNamedRange, // 71
- NI, // 72
- NI, // 73
- NI, // 74
- NI, // 75
- NI, // 76
- NI, // 77
- NI, // 78
- NI, // 79
- NI, // 80
- NI, // 81
- NI, // 82
- NI, // 83
- NI, // 84
- NI, // 85
- NI, // 86
- NI, // 87
- NI, // 88
- NI, // 89
- NI, // 90
- NI, // 91
- NI, // 92
- NI, // 93
- NI, // 94
- NI, // 95
- NI, // 96
- NI, // 97
- NI, // 98
- NI, // 99
- OP_HiddenCols, // 100
+{ // Code
+ OP_BOF, // 0
+ OP_EOF, // 1
+ NI, // 2
+ NI, // 3
+ NI, // 4
+ NI, // 5
+ NI, // 6
+ OP_Window1, // 7
+ OP_ColumnWidth, // 8
+ NI, // 9
+ NI, // 10
+ OP_NamedRange, // 11
+ OP_Blank, // 12
+ OP_Integer, // 13
+ OP_Number, // 14
+ OP_Label, // 15
+ OP_Formula, // 16
+ NI, // 17
+ NI, // 18
+ NI, // 19
+ NI, // 20
+ NI, // 21
+ NI, // 22
+ NI, // 23
+ NI, // 24
+ NI, // 25
+ NI, // 26
+ NI, // 27
+ NI, // 28
+ NI, // 29
+ NI, // 30
+ NI, // 31
+ NI, // 32
+ NI, // 33
+ NI, // 34
+ NI, // 35
+ NI, // 36
+ OP_Footer, // 37
+ OP_Header, // 38
+ NI, // 39
+ OP_Margins, // 40
+ NI, // 41
+ NI, // 42
+ NI, // 43
+ NI, // 44
+ NI, // 45
+ NI, // 46
+ NI, // 47
+ NI, // 48
+ NI, // 49
+ NI, // 50
+ NI, // 51
+ NI, // 52
+ NI, // 53
+ NI, // 54
+ NI, // 55
+ NI, // 56
+ NI, // 57
+ NI, // 58
+ NI, // 59
+ NI, // 60
+ NI, // 61
+ NI, // 62
+ NI, // 63
+ NI, // 64
+ NI, // 65
+ NI, // 66
+ NI, // 67
+ NI, // 68
+ NI, // 69
+ NI, // 70
+ OP_SymphNamedRange, // 71
+ NI, // 72
+ NI, // 73
+ NI, // 74
+ NI, // 75
+ NI, // 76
+ NI, // 77
+ NI, // 78
+ NI, // 79
+ NI, // 80
+ NI, // 81
+ NI, // 82
+ NI, // 83
+ NI, // 84
+ NI, // 85
+ NI, // 86
+ NI, // 87
+ NI, // 88
+ NI, // 89
+ NI, // 90
+ NI, // 91
+ NI, // 92
+ NI, // 93
+ NI, // 94
+ NI, // 95
+ NI, // 96
+ NI, // 97
+ NI, // 98
+ NI, // 99
+ OP_HiddenCols, // 100
};
OPCODE_FKT pOpFkt123[ FKT_LIMIT123 ] =
-{ // Code
- OP_BOF123, // 0
- OP_EOF123, // 1
- NI, // 2
- NI, // 3
- NI, // 4
- NI, // 5
- NI, // 6
- NI, // 7
- NI, // 8
- NI, // 9
- NI, // 10
- NI, // 11
- NI, // 12
- NI, // 13
- NI, // 14
- NI, // 15
- NI, // 16
- NI, // 17
- NI, // 18
- NI, // 19
- NI, // 20
- NI, // 21
- OP_Label123, // 22
- NI, // 23
- NI, // 24
- NI, // 25
- NI, // 26
- OP_CreatePattern123, // 27
- NI, // 28
- NI, // 29
- NI, // 30
- NI, // 31
- NI, // 32
- NI, // 33
- NI, // 34
+{ // Code
+ OP_BOF123, // 0
+ OP_EOF123, // 1
+ NI, // 2
+ NI, // 3
+ NI, // 4
+ NI, // 5
+ NI, // 6
+ NI, // 7
+ NI, // 8
+ NI, // 9
+ NI, // 10
+ NI, // 11
+ NI, // 12
+ NI, // 13
+ NI, // 14
+ NI, // 15
+ NI, // 16
+ NI, // 17
+ NI, // 18
+ NI, // 19
+ NI, // 20
+ NI, // 21
+ OP_Label123, // 22
+ NI, // 23
+ NI, // 24
+ NI, // 25
+ NI, // 26
+ OP_CreatePattern123, // 27
+ NI, // 28
+ NI, // 29
+ NI, // 30
+ NI, // 31
+ NI, // 32
+ NI, // 33
+ NI, // 34
OP_SheetName123, // 35
- NI, // 36
- OP_Number123, // 37
- OP_Note123, // 38
- OP_IEEENumber123, // 39
- OP_Formula123, // 40
- NI, // 41
- NI, // 42
- NI, // 43
- NI, // 44
- NI, // 45
- NI, // 46
- NI, // 47
- NI, // 48
- NI, // 49
- NI, // 50
- NI, // 51
- NI, // 52
- NI, // 53
- NI, // 54
- NI, // 55
- NI, // 56
- NI, // 57
- NI, // 58
- NI, // 59
- NI, // 60
- NI, // 61
- NI, // 62
- NI, // 63
- NI, // 64
- NI, // 65
- NI, // 66
- NI, // 67
- NI, // 68
- NI, // 69
- NI, // 70
- NI, // 71
- NI, // 72
- NI, // 73
- NI, // 74
- NI, // 75
- NI, // 76
- NI, // 77
- NI, // 78
- NI, // 79
- NI, // 80
- NI, // 81
- NI, // 82
- NI, // 83
- NI, // 84
- NI, // 85
- NI, // 86
- NI, // 87
- NI, // 88
- NI, // 89
- NI, // 90
- NI, // 91
- NI, // 92
- NI, // 93
- NI, // 94
- NI, // 95
- NI, // 96
- NI, // 97
- NI, // 98
- NI, // 99
- NI // 100
+ NI, // 36
+ OP_Number123, // 37
+ OP_Note123, // 38
+ OP_IEEENumber123, // 39
+ OP_Formula123, // 40
+ NI, // 41
+ NI, // 42
+ NI, // 43
+ NI, // 44
+ NI, // 45
+ NI, // 46
+ NI, // 47
+ NI, // 48
+ NI, // 49
+ NI, // 50
+ NI, // 51
+ NI, // 52
+ NI, // 53
+ NI, // 54
+ NI, // 55
+ NI, // 56
+ NI, // 57
+ NI, // 58
+ NI, // 59
+ NI, // 60
+ NI, // 61
+ NI, // 62
+ NI, // 63
+ NI, // 64
+ NI, // 65
+ NI, // 66
+ NI, // 67
+ NI, // 68
+ NI, // 69
+ NI, // 70
+ NI, // 71
+ NI, // 72
+ NI, // 73
+ NI, // 74
+ NI, // 75
+ NI, // 76
+ NI, // 77
+ NI, // 78
+ NI, // 79
+ NI, // 80
+ NI, // 81
+ NI, // 82
+ NI, // 83
+ NI, // 84
+ NI, // 85
+ NI, // 86
+ NI, // 87
+ NI, // 88
+ NI, // 89
+ NI, // 90
+ NI, // 91
+ NI, // 92
+ NI, // 93
+ NI, // 94
+ NI, // 95
+ NI, // 96
+ NI, // 97
+ NI, // 98
+ NI, // 99
+ NI // 100
};
-
+
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index 0e99b1140c2a..5951523169a9 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,29 +55,29 @@
#endif
//--------------------------------------------------------- EXTERNE VARIABLEN -
-extern WKTYP eTyp; // -> filter.cxx, aktueller Dateityp
-extern sal_Char* pDummy2; // -> memory.cxx
-extern ScDocument* pDoc; // -> filter.cxx, Aufhaenger zum Dokumentzugriff
-extern CharSet eCharNach; // -> filter.cxx, Zeichenkonvertierung von->nach
+extern WKTYP eTyp; // -> filter.cxx, aktueller Dateityp
+extern sal_Char* pDummy2; // -> memory.cxx
+extern ScDocument* pDoc; // -> filter.cxx, Aufhaenger zum Dokumentzugriff
+extern CharSet eCharNach; // -> filter.cxx, Zeichenkonvertierung von->nach
-extern BOOL bFormInit; // -> memory.cxx, fuer GetFormHandle()
+extern BOOL bFormInit; // -> memory.cxx, fuer GetFormHandle()
//--------------------------------------------------------- GLOBALE VARIABLEN -
-BYTE nDefaultFormat; // -> op.cpp, Standard-Zellenformat
+BYTE nDefaultFormat; // -> op.cpp, Standard-Zellenformat
-extern SvxHorJustifyItem *pAttrRight, *pAttrLeft, *pAttrCenter, *pAttrRepeat, *pAttrStandard;
-extern ScProtectionAttr* pAttrUnprot;
-extern SfxUInt32Item** pAttrValForms;
+extern SvxHorJustifyItem *pAttrRight, *pAttrLeft, *pAttrCenter, *pAttrRepeat, *pAttrStandard;
+extern ScProtectionAttr* pAttrUnprot;
+extern SfxUInt32Item** pAttrValForms;
-SvxHorJustifyItem *pAttrRight, *pAttrLeft, *pAttrCenter, *pAttrRepeat, *pAttrStandard;
+SvxHorJustifyItem *pAttrRight, *pAttrLeft, *pAttrCenter, *pAttrRepeat, *pAttrStandard;
// -> in memory.cxx initialisiert
-ScProtectionAttr* pAttrUnprot; // -> " memory.cxx "
+ScProtectionAttr* pAttrUnprot; // -> " memory.cxx "
-extern FormCache* pValueFormCache; // -> in memory.cxx initialisiert
-FormCache* pValueFormCache;
+extern FormCache* pValueFormCache; // -> in memory.cxx initialisiert
+FormCache* pValueFormCache;
-SCCOL LotusRangeList::nEingCol;
-SCROW LotusRangeList::nEingRow;
+SCCOL LotusRangeList::nEingCol;
+SCROW LotusRangeList::nEingRow;
@@ -87,8 +87,8 @@ void PutFormString( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char* pString )
// Label-Format-Auswertung
DBG_ASSERT( pString != NULL, "PutFormString(): pString == NULL" );
- sal_Char cForm;
- SvxHorJustifyItem* pJustify = NULL;
+ sal_Char cForm;
+ SvxHorJustifyItem* pJustify = NULL;
cForm = *pString;
@@ -120,7 +120,7 @@ void PutFormString( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char* pString )
if( pString )
{
pDoc->ApplyAttr( nCol, nRow, nTab, *pJustify );
- ScStringCell* pZelle = new ScStringCell( String( pString, pLotusRoot->eCharsetQ ) );
+ ScStringCell* pZelle = new ScStringCell( String( pString, pLotusRoot->eCharsetQ ) );
pDoc->PutCell( nCol, nRow, nTab, pZelle, ( BOOL ) TRUE );
}
}
@@ -141,7 +141,7 @@ void SetFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, BYTE nFormat, BYTE nSt )
}
void InitPage( void )
-{ // Seitenformat initialisieren, d.h. Default-Werte von SC holen
+{ // Seitenformat initialisieren, d.h. Default-Werte von SC holen
//scGetPageFormat( 0, &aPage );
}
@@ -158,7 +158,7 @@ double SnumToDouble( INT16 nVal )
0.0625,
0.015625 };
- double fVal;
+ double fVal;
if( nVal & 0x0001 )
{
@@ -192,7 +192,7 @@ double Snum32ToDouble( UINT32 nValue )
FormCache::FormCache( ScDocument* pDoc1, BYTE nNewDefaultFormat )
-{ // Default-Format ist 'Default'
+{ // Default-Format ist 'Default'
nDefaultFormat = nNewDefaultFormat;
pFormTable = pDoc1->GetFormatTable();
for( UINT16 nC = 0 ; nC < __nSize ; nC++ )
@@ -211,14 +211,14 @@ FormCache::~FormCache()
SfxUInt32Item* FormCache::NewAttr( BYTE nFormat, BYTE nSt )
{
// neues Format erzeugen
- BYTE nL, nH; // Low-/High-Nibble
- BYTE nForm = nFormat;
- String aFormString;
+ BYTE nL, nH; // Low-/High-Nibble
+ BYTE nForm = nFormat;
+ String aFormString;
const sal_Char* pFormString = 0;
- INT16 eType = NUMBERFORMAT_ALL;
+ INT16 eType = NUMBERFORMAT_ALL;
UINT32 nIndex1;
- UINT32 nHandle;
- BOOL bDefault = FALSE;
+ UINT32 nHandle;
+ BOOL bDefault = FALSE;
//void GenerateFormat( aFormString, eType, COUNTRY_SYSTEM, LANGUAGE_SYSTEM,
// BOOL bThousand, BOOL IsRed, UINT16 nPrecision, UINT16 nAnzLeading );
@@ -382,7 +382,7 @@ SfxUInt32Item* FormCache::NewAttr( BYTE nFormat, BYTE nSt )
if( pFormString )
aFormString.AssignAscii( pFormString );
- xub_StrLen nDummy;
+ xub_StrLen nDummy;
pFormTable->PutEntry( aFormString, nDummy, eType, nHandle, eLanguage );
}
@@ -440,7 +440,7 @@ LotusRangeList::LotusRangeList( void )
{
aComplRef.InitFlags();
- ScSingleRefData* pSingRef;
+ ScSingleRefData* pSingRef;
nIdCnt = 1;
pSingRef = &aComplRef.Ref1;
@@ -473,7 +473,7 @@ LotusRangeList::~LotusRangeList( void )
LR_ID LotusRangeList::GetIndex( const LotusRange &rRef )
{
- LotusRange* pComp = ( LotusRange* ) List::First();
+ LotusRange* pComp = ( LotusRange* ) List::First();
while( pComp )
{
@@ -491,9 +491,9 @@ void LotusRangeList::Append( LotusRange* pLR, const String& rName )
DBG_ASSERT( pLR, "*LotusRangeList::Append(): das wird nichts!" );
List::Insert( pLR, CONTAINER_APPEND );
- ScTokenArray aTokArray;
+ ScTokenArray aTokArray;
- ScSingleRefData* pSingRef = &aComplRef.Ref1;
+ ScSingleRefData* pSingRef = &aComplRef.Ref1;
pSingRef->nCol = pLR->nColStart;
pSingRef->nRow = pLR->nRowStart;
@@ -508,7 +508,7 @@ void LotusRangeList::Append( LotusRange* pLR, const String& rName )
aTokArray.AddDoubleReference( aComplRef );
}
- ScRangeData* pData = new ScRangeData(
+ ScRangeData* pData = new ScRangeData(
pLotusRoot->pDoc, rName, aTokArray );
pLotusRoot->pScRangeName->Insert( pData );
@@ -530,7 +530,7 @@ RangeNameBufferWK3::RangeNameBufferWK3( void )
RangeNameBufferWK3::~RangeNameBufferWK3()
{
- ENTRY* pDel = ( ENTRY* ) List::First();
+ ENTRY* pDel = ( ENTRY* ) List::First();
while( pDel )
{
@@ -544,17 +544,17 @@ RangeNameBufferWK3::~RangeNameBufferWK3()
void RangeNameBufferWK3::Add( const String& rOrgName, const ScComplexRefData& rCRD )
{
- String aScName( rOrgName );
+ String aScName( rOrgName );
ScfTools::ConvertToScDefinedName( aScName );
- register ENTRY* pInsert = new ENTRY( rOrgName, aScName, rCRD );
+ register ENTRY* pInsert = new ENTRY( rOrgName, aScName, rCRD );
List::Insert( pInsert, CONTAINER_APPEND );
pScTokenArray->Clear();
- register const ScSingleRefData& rRef1 = rCRD.Ref1;
- register const ScSingleRefData& rRef2 = rCRD.Ref2;
+ register const ScSingleRefData& rRef1 = rCRD.Ref1;
+ register const ScSingleRefData& rRef2 = rCRD.Ref2;
if( rRef1.nCol == rRef2.nCol && rRef1.nRow == rRef2.nRow && rRef1.nTab == rRef2.nTab )
{
@@ -567,7 +567,7 @@ void RangeNameBufferWK3::Add( const String& rOrgName, const ScComplexRefData& rC
pInsert->bSingleRef = FALSE;
}
- ScRangeData* pData = new ScRangeData( pLotusRoot->pDoc, aScName, *pScTokenArray );
+ ScRangeData* pData = new ScRangeData( pLotusRoot->pDoc, aScName, *pScTokenArray );
pInsert->nRelInd = nIntCount;
pData->SetIndex( nIntCount );
@@ -579,9 +579,9 @@ void RangeNameBufferWK3::Add( const String& rOrgName, const ScComplexRefData& rC
BOOL RangeNameBufferWK3::FindRel( const String& rRef, UINT16& rIndex )
{
- StringHashEntry aRef( rRef );
+ StringHashEntry aRef( rRef );
- ENTRY* pFind = ( ENTRY* ) List::First();
+ ENTRY* pFind = ( ENTRY* ) List::First();
while( pFind )
{
@@ -599,10 +599,10 @@ BOOL RangeNameBufferWK3::FindRel( const String& rRef, UINT16& rIndex )
BOOL RangeNameBufferWK3::FindAbs( const String& rRef, UINT16& rIndex )
{
- String aTmp( rRef );
- StringHashEntry aRef( aTmp.Erase( 0, 1 ) ); // ohne '$' suchen!
+ String aTmp( rRef );
+ StringHashEntry aRef( aTmp.Erase( 0, 1 ) ); // ohne '$' suchen!
- ENTRY* pFind = ( ENTRY* ) List::First();
+ ENTRY* pFind = ( ENTRY* ) List::First();
while( pFind )
{
@@ -613,7 +613,7 @@ BOOL RangeNameBufferWK3::FindAbs( const String& rRef, UINT16& rIndex )
rIndex = pFind->nAbsInd;
else
{
- ScSingleRefData* pRef = &pFind->aScComplexRefDataRel.Ref1;
+ ScSingleRefData* pRef = &pFind->aScComplexRefDataRel.Ref1;
pScTokenArray->Clear();
pRef->SetColRel( FALSE );
@@ -631,7 +631,7 @@ BOOL RangeNameBufferWK3::FindAbs( const String& rRef, UINT16& rIndex )
pScTokenArray->AddDoubleReference( pFind->aScComplexRefDataRel );
}
- ScRangeData* pData = new ScRangeData( pLotusRoot->pDoc, pFind->aScAbsName, *pScTokenArray );
+ ScRangeData* pData = new ScRangeData( pLotusRoot->pDoc, pFind->aScAbsName, *pScTokenArray );
rIndex = pFind->nAbsInd = nIntCount;
pData->SetIndex( rIndex );
diff --git a/sc/source/filter/qpro/biff.cxx b/sc/source/filter/qpro/biff.cxx
index 1d490358d315..eaf85529f767 100644
--- a/sc/source/filter/qpro/biff.cxx
+++ b/sc/source/filter/qpro/biff.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx
index 084aab135f70..07576e63f702 100644
--- a/sc/source/filter/qpro/qpro.cxx
+++ b/sc/source/filter/qpro/qpro.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx
index 9cb4a2d7b245..0d5d0624c992 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -415,7 +415,7 @@ static const struct
{ ocAnd, FT_Op },
{ ocOr, FT_Op },
{ ocNot, FT_FuncFix1 },
- { ocPush, FT_NOP }, // Unary plus
+ { ocPush, FT_NOP }, // Unary plus
{ ocAddress, FT_FuncFix4 }, // Address of
{ ocNoName, FT_NotImpl }, // Halt function
{ ocNoName, FT_DLL }, // DLL function
@@ -536,7 +536,7 @@ static const struct
{ ocNoName, FT_NotImpl },
{ ocGetActDate, FT_FuncFix0 },
{ ocNPV, FT_FuncFix2 },
- { ocNoName, FT_NotImpl }, // 0x90
+ { ocNoName, FT_NotImpl }, // 0x90
{ ocNoName, FT_NotImpl },
{ ocNoName, FT_NOP },
{ ocNoName, FT_NOP }, // 147
diff --git a/sc/source/filter/qpro/qprostyle.cxx b/sc/source/filter/qpro/qprostyle.cxx
index 6213cbb4ebf2..8e1b13bbf184 100644
--- a/sc/source/filter/qpro/qprostyle.cxx
+++ b/sc/source/filter/qpro/qprostyle.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index 7fb3d16c6c8d..0bc43ca66c02 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
bSimple = FALSE;
else if (eState == SFX_ITEM_SET)
{
- if ( nId == EE_CHAR_ESCAPEMENT ) // Hoch-/Tiefstellen immer ueber EE
+ if ( nId == EE_CHAR_ESCAPEMENT ) // Hoch-/Tiefstellen immer ueber EE
{
if ( (SvxEscapement)((const SvxEscapementItem*)pItem)->GetEnumValue()
!= SVX_ESCAPEMENT_OFF )
@@ -208,7 +208,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
}
}
if ( bSimple )
- { // Feldbefehle enthalten?
+ { // Feldbefehle enthalten?
SfxItemState eFieldState = aSet.GetItemState( EE_FEATURE_FIELD, FALSE );
if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET )
bSimple = FALSE;
@@ -220,7 +220,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
sal_uInt32 nNumForm = 0;
LanguageType eNumLang = LANGUAGE_NONE;
if ( pE->pNumStr )
- { // SDNUM muss sein wenn SDVAL
+ { // SDNUM muss sein wenn SDVAL
aNumStr = *pE->pNumStr;
if ( pE->pValStr )
aValStr = *pE->pValStr;
@@ -298,7 +298,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
}
}
if ( pE->nColOverlap > 1 || pE->nRowOverlap > 1 )
- { // merged cells, mit SfxItemSet Put schneller als mit
+ { // merged cells, mit SfxItemSet Put schneller als mit
// nachtraeglichem ScDocument DoMerge
ScMergeAttr aMerge( pE->nColOverlap, pE->nRowOverlap );
rSet.Put( aMerge );
@@ -371,8 +371,8 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
pFormatter->ChangeIntl( LANGUAGE_SYSTEM);
}
- // #105460#, #i4180# String cells can't contain tabs or linebreaks
- // -> replace with spaces
+ // #105460#, #i4180# String cells can't contain tabs or linebreaks
+ // -> replace with spaces
aStr.SearchAndReplaceAll( (sal_Unicode)'\t', (sal_Unicode)' ' );
aStr.SearchAndReplaceAll( (sal_Unicode)'\n', (sal_Unicode)' ' );
@@ -392,7 +392,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
if ( pE->pImageList )
bHasGraphics |= GraphicSize( nCol, nRow, nTab, pE );
if ( pE->pName )
- { // Anchor Name => RangeName
+ { // Anchor Name => RangeName
USHORT nIndex;
if ( !pRangeNames->SearchName( *pE->pName, nIndex ) )
{
@@ -420,11 +420,11 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
pProgress->SetState( ++nProgress );
}
}
- DELETEZ( pProgress ); // SetOptimalHeight hat seinen eigenen ProgressBar
+ DELETEZ( pProgress ); // SetOptimalHeight hat seinen eigenen ProgressBar
// Zeilenhoehen anpassen, Basis 100% Zoom
Fraction aZoom( 1, 1 );
double nPPTX = ScGlobal::nScreenPPTX * (double) aZoom
- / nOutputFactor; // Faktor ist Drucker zu Bildschirm
+ / nOutputFactor; // Faktor ist Drucker zu Bildschirm
double nPPTY = ScGlobal::nScreenPPTY * (double) aZoom;
VirtualDevice aVirtDev;
mpDoc->SetOptimalHeight( 0, nEndRow, 0,
@@ -441,7 +441,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
}
}
if ( bHasGraphics )
- { // Grafiken einfuegen
+ { // Grafiken einfuegen
for ( pE = mpParser->First(); pE; pE = mpParser->Next() )
{
if ( pE->pImageList )
@@ -497,7 +497,7 @@ BOOL ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, SCTAB /*nTab*/,
nColWidths += (long) pColWidths->Get( nC );
}
if ( nWidth > nColWidths )
- { // Differenz nur in der ersten Spalte eintragen
+ { // Differenz nur in der ersten Spalte eintragen
if ( nThisWidth )
pColWidths->Replace( nCol, (void*)(nWidth - nColWidths + nThisWidth) );
else
@@ -507,7 +507,7 @@ BOOL ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, SCTAB /*nTab*/,
SCROW nRowSpan = pE->nRowOverlap;
nHeight /= nRowSpan;
if ( nHeight == 0 )
- nHeight = 1; // fuer eindeutigen Vergleich
+ nHeight = 1; // fuer eindeutigen Vergleich
for ( SCROW nR = nRow; nR < nRow + nRowSpan; nR++ )
{
long nRowHeight = (long) mpRowHeights->Get( nR );
@@ -549,13 +549,13 @@ void ScEEImport::InsertGraphic( SCCOL nCol, SCROW nRow, SCTAB nTab,
for ( ScHTMLImage* pI = pIL->First(); pI; pI = pIL->Next() )
{
if ( nDir & nHorizontal )
- { // horizontal
+ { // horizontal
aInsertPos.X() += aLogicSize.Width();
aInsertPos.X() += aSpace.X();
aInsertPos.Y() = aCellInsertPos.Y();
}
else
- { // vertikal
+ { // vertikal
aInsertPos.X() = aCellInsertPos.X();
aInsertPos.Y() += aLogicSize.Height();
aInsertPos.Y() += aSpace.Y();
@@ -566,7 +566,7 @@ void ScEEImport::InsertGraphic( SCCOL nCol, SCROW nRow, SCTAB nTab,
Size aSizePix = pI->aSize;
aLogicSize = pDefaultDev->PixelToLogic( aSizePix, MapMode( MAP_100TH_MM ) );
- // Groesse begrenzen
+ // Groesse begrenzen
::ScLimitSizeOnDrawPage( aLogicSize, aInsertPos, pPage->GetSize() );
if ( pI->pGraphic )
@@ -583,7 +583,7 @@ void ScEEImport::InsertGraphic( SCCOL nCol, SCROW nRow, SCTAB nTab,
// See #i37444#.
pObj->SetGraphicLink( pI->aURL, pI->aFilterName );
- pObj->SetLogicRect( aRect ); // erst nach InsertObject !!!
+ pObj->SetLogicRect( aRect ); // erst nach InsertObject !!!
}
nDir = pI->nDir;
}
@@ -625,7 +625,7 @@ ScEEParser::~ScEEParser()
void ScEEParser::NewActEntry( ScEEParseEntry* pE )
-{ // neuer freifliegender pActEntry
+{ // neuer freifliegender pActEntry
pActEntry = new ScEEParseEntry( pPool );
pActEntry->aSel.nStartPara = (pE ? pE->aSel.nEndPara + 1 : 0);
pActEntry->aSel.nStartPos = 0;
diff --git a/sc/source/filter/rtf/expbase.cxx b/sc/source/filter/rtf/expbase.cxx
index cd3f30ef9c9f..a849fb96291a 100644
--- a/sc/source/filter/rtf/expbase.cxx
+++ b/sc/source/filter/rtf/expbase.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index c817fc2844eb..7b8ba5c269fc 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +87,8 @@ ULONG ScRTFExport::Write()
#if 0
// das ist noch nicht ausgegoren
/*
- SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool();
- SfxStyleSheetBase* pStyleSheet = NULL;
+ SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool();
+ SfxStyleSheetBase* pStyleSheet = NULL;
DBG_ASSERT( pStylePool, "StylePool not found! :-(" );
pStylePool->SetSearchMask( SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL );
pStyleSheet = pStylePool->Find( STRING_STANDARD, SFX_STYLE_FAMILY_PARA );
@@ -160,7 +160,7 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ )
{
const ScPatternAttr* pAttr = pDoc->GetPattern( nCol, nRow, nTab );
- const ScMergeAttr& rMergeAttr = (const ScMergeAttr&) pAttr->GetItem( ATTR_MERGE );
+ const ScMergeAttr& rMergeAttr = (const ScMergeAttr&) pAttr->GetItem( ATTR_MERGE );
const SvxVerJustifyItem& rVerJustifyItem= (const SvxVerJustifyItem&)pAttr->GetItem( ATTR_VER_JUSTIFY );
const sal_Char* pChar;
@@ -176,18 +176,18 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
switch( rVerJustifyItem.GetValue() )
{
- case SVX_VER_JUSTIFY_TOP: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALT; break;
- case SVX_VER_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALC; break;
- case SVX_VER_JUSTIFY_BOTTOM: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALB; break;
- case SVX_VER_JUSTIFY_STANDARD: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALB; break; //! Bottom
- default: pChar = NULL; break;
+ case SVX_VER_JUSTIFY_TOP: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALT; break;
+ case SVX_VER_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALC; break;
+ case SVX_VER_JUSTIFY_BOTTOM: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALB; break;
+ case SVX_VER_JUSTIFY_STANDARD: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALB; break; //! Bottom
+ default: pChar = NULL; break;
}
if ( pChar )
rStrm << pChar;
rStrm << OOO_STRING_SVTOOLS_RTF_CELLX << ByteString::CreateFromInt32( pCellX[nCol+1] ).GetBuffer();
if ( (nCol & 0x0F) == 0x0F )
- rStrm << sNewLine; // Zeilen nicht zu lang werden lassen
+ rStrm << sNewLine; // Zeilen nicht zu lang werden lassen
}
rStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << OOO_STRING_SVTOOLS_RTF_INTBL << sNewLine;
@@ -196,7 +196,7 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
{
WriteCell( nTab, nRow, nCol );
if ( rStrm.Tell() - nStrmPos > 255 )
- { // Zeilen nicht zu lang werden lassen
+ { // Zeilen nicht zu lang werden lassen
rStrm << sNewLine;
nStrmPos = rStrm.Tell();
}
@@ -226,7 +226,7 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
{
case CELLTYPE_NOTE :
bValueData = FALSE;
- break; // nix
+ break; // nix
case CELLTYPE_EDIT :
{
bValueData = FALSE;
@@ -236,7 +236,7 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
if ( pObj )
{
rEngine.SetText( *pObj );
- aContent = rEngine.GetText( LINEEND_LF ); // LineFeed zwischen Absaetzen!
+ aContent = rEngine.GetText( LINEEND_LF ); // LineFeed zwischen Absaetzen!
}
}
break;
@@ -255,10 +255,10 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
BOOL bResetPar, bResetAttr;
bResetPar = bResetAttr = FALSE;
- const SvxHorJustifyItem& rHorJustifyItem = (const SvxHorJustifyItem&)pAttr->GetItem( ATTR_HOR_JUSTIFY );
- const SvxWeightItem& rWeightItem = (const SvxWeightItem&) pAttr->GetItem( ATTR_FONT_WEIGHT );
- const SvxPostureItem& rPostureItem = (const SvxPostureItem&) pAttr->GetItem( ATTR_FONT_POSTURE );
- const SvxUnderlineItem& rUnderlineItem = (const SvxUnderlineItem&) pAttr->GetItem( ATTR_FONT_UNDERLINE );
+ const SvxHorJustifyItem& rHorJustifyItem = (const SvxHorJustifyItem&)pAttr->GetItem( ATTR_HOR_JUSTIFY );
+ const SvxWeightItem& rWeightItem = (const SvxWeightItem&) pAttr->GetItem( ATTR_FONT_WEIGHT );
+ const SvxPostureItem& rPostureItem = (const SvxPostureItem&) pAttr->GetItem( ATTR_FONT_POSTURE );
+ const SvxUnderlineItem& rUnderlineItem = (const SvxUnderlineItem&) pAttr->GetItem( ATTR_FONT_UNDERLINE );
const sal_Char* pChar;
@@ -267,27 +267,27 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
case SVX_HOR_JUSTIFY_STANDARD:
pChar = (bValueData ? OOO_STRING_SVTOOLS_RTF_QR : OOO_STRING_SVTOOLS_RTF_QL);
break;
- case SVX_HOR_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_RTF_QC; break;
- case SVX_HOR_JUSTIFY_BLOCK: pChar = OOO_STRING_SVTOOLS_RTF_QJ; break;
- case SVX_HOR_JUSTIFY_RIGHT: pChar = OOO_STRING_SVTOOLS_RTF_QR; break;
+ case SVX_HOR_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_RTF_QC; break;
+ case SVX_HOR_JUSTIFY_BLOCK: pChar = OOO_STRING_SVTOOLS_RTF_QJ; break;
+ case SVX_HOR_JUSTIFY_RIGHT: pChar = OOO_STRING_SVTOOLS_RTF_QR; break;
case SVX_HOR_JUSTIFY_LEFT:
case SVX_HOR_JUSTIFY_REPEAT:
- default: pChar = OOO_STRING_SVTOOLS_RTF_QL; break;
+ default: pChar = OOO_STRING_SVTOOLS_RTF_QL; break;
}
rStrm << pChar;
if ( rWeightItem.GetWeight() >= WEIGHT_BOLD )
- { // bold
+ { // bold
bResetAttr = TRUE;
rStrm << OOO_STRING_SVTOOLS_RTF_B;
}
if ( rPostureItem.GetPosture() != ITALIC_NONE )
- { // italic
+ { // italic
bResetAttr = TRUE;
rStrm << OOO_STRING_SVTOOLS_RTF_I;
}
if ( rUnderlineItem.GetLineStyle() != UNDERLINE_NONE )
- { // underline
+ { // underline
bResetAttr = TRUE;
rStrm << OOO_STRING_SVTOOLS_RTF_UL;
}
diff --git a/sc/source/filter/rtf/rtfimp.cxx b/sc/source/filter/rtf/rtfimp.cxx
index 83b48b1fa2b1..d37f997bb653 100644
--- a/sc/source/filter/rtf/rtfimp.cxx
+++ b/sc/source/filter/rtf/rtfimp.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx
index b3373bbf4596..f6e6603489dd 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "document.hxx"
#include "docpool.hxx"
-#define SC_RTFTWIPTOL 10 // 10 Twips Toleranz bei Spaltenbestimmung
+#define SC_RTFTWIPTOL 10 // 10 Twips Toleranz bei Spaltenbestimmung
@@ -100,7 +100,7 @@ ULONG ScRTFParser::Read( SvStream& rStream, const String& rBaseURL )
|| ( pE->aSel.nStartPara + 1 == pE->aSel.nEndPara
&& pE->aSel.nStartPos == pEdit->GetTextLen( pE->aSel.nStartPara )
&& pE->aSel.nEndPos == 0 )) )
- { // den letzten leeren Absatz nicht uebernehmen
+ { // den letzten leeren Absatz nicht uebernehmen
pList->Remove();
delete pE;
}
@@ -169,8 +169,8 @@ void ScRTFParser::ColAdjust()
{
SeekTwips( pE->nTwips, &nCol );
if ( ++nCol <= pE->nCol )
- nCol = pE->nCol + 1; // verschobene Zell-X
- pE->nColOverlap = nCol - pE->nCol; // merged cells ohne \clmrg
+ nCol = pE->nCol + 1; // verschobene Zell-X
+ pE->nColOverlap = nCol - pE->nCol; // merged cells ohne \clmrg
}
if ( nCol > nColMax )
nColMax = nCol;
@@ -204,7 +204,7 @@ IMPL_LINK( ScRTFParser, RTFImportHdl, ImportInfo*, pInfo )
break;
case RTFIMP_END:
if ( pInfo->aSelection.nEndPos )
- { // falls noch Text: letzten Absatz erzeugen
+ { // falls noch Text: letzten Absatz erzeugen
pActDefault = NULL;
pInfo->nToken = RTF_PAR;
// EditEngine hat keinen leeren Paragraph mehr angehaengt
@@ -290,7 +290,7 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo )
ScEEParseEntry* pE;
switch ( pInfo->nToken )
{
- case RTF_TROWD: // denotes table row defauls, before RTF_CELLX
+ case RTF_TROWD: // denotes table row defauls, before RTF_CELLX
{
if ( (pD = pDefaultList->Last()) != 0 )
nLastWidth = pD->nTwips;
@@ -302,28 +302,28 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo )
nLastToken = pInfo->nToken;
}
break;
- case RTF_CLMGF: // The first cell of cells to be merged
+ case RTF_CLMGF: // The first cell of cells to be merged
{
pDefMerge = pInsDefault;
nLastToken = pInfo->nToken;
}
break;
- case RTF_CLMRG: // A cell to be merged with the preceding cell
+ case RTF_CLMRG: // A cell to be merged with the preceding cell
{
if ( !pDefMerge )
pDefMerge = pDefaultList->Last();
DBG_ASSERT( pDefMerge, "RTF_CLMRG: pDefMerge==0" );
- if ( pDefMerge ) // sonst rottes RTF
- pDefMerge->nColOverlap++; // mehrere nacheinander moeglich
- pInsDefault->nColOverlap = 0; // Flag: ignoriere diese
+ if ( pDefMerge ) // sonst rottes RTF
+ pDefMerge->nColOverlap++; // mehrere nacheinander moeglich
+ pInsDefault->nColOverlap = 0; // Flag: ignoriere diese
nLastToken = pInfo->nToken;
}
break;
- case RTF_CELLX: // closes cell default
+ case RTF_CELLX: // closes cell default
{
bNewDef = TRUE;
pInsDefault->nCol = nColCnt;
- pInsDefault->nTwips = pInfo->nTokenValue; // rechter Zellenrand
+ pInsDefault->nTwips = pInfo->nTokenValue; // rechter Zellenrand
pDefaultList->Insert( pInsDefault, LIST_APPEND );
// neuer freifliegender pInsDefault
pInsDefault = new ScRTFCellDefault( pPool );
@@ -332,7 +332,7 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo )
nLastToken = pInfo->nToken;
}
break;
- case RTF_INTBL: // before the first RTF_CELL
+ case RTF_INTBL: // before the first RTF_CELL
{
// einmal ueber NextToken und einmal ueber UnknownAttrToken
// oder z.B. \intbl ... \cell \pard \intbl ... \cell
@@ -343,16 +343,16 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo )
}
}
break;
- case RTF_CELL: // denotes the end of a cell.
+ case RTF_CELL: // denotes the end of a cell.
{
DBG_ASSERT( pActDefault, "RTF_CELL: pActDefault==0" );
if ( bNewDef || !pActDefault )
- NewCellRow( pInfo ); // davor war kein \intbl, bad behavior
+ NewCellRow( pInfo ); // davor war kein \intbl, bad behavior
// rottes RTF? retten was zu retten ist
if ( !pActDefault )
pActDefault = pInsDefault;
if ( pActDefault->nColOverlap > 0 )
- { // nicht merged mit vorheriger
+ { // nicht merged mit vorheriger
pActEntry->nCol = pActDefault->nCol;
pActEntry->nColOverlap = pActDefault->nColOverlap;
pActEntry->nTwips = pActDefault->nTwips;
@@ -363,10 +363,10 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo )
if ( nStartAdjust == (ULONG)~0 )
nStartAdjust = pList->Count();
pList->Insert( pActEntry, LIST_APPEND );
- NewActEntry( pActEntry ); // neuer freifliegender pActEntry
+ NewActEntry( pActEntry ); // neuer freifliegender pActEntry
}
else
- { // aktuelle Twips der MergeCell zuweisen
+ { // aktuelle Twips der MergeCell zuweisen
if ( (pE = pList->Last()) != 0 )
pE->nTwips = pActDefault->nTwips;
// Selection des freifliegenden pActEntry anpassen
@@ -377,29 +377,29 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo )
nLastToken = pInfo->nToken;
}
break;
- case RTF_ROW: // means the end of a row
+ case RTF_ROW: // means the end of a row
{
NextRow();
nLastToken = pInfo->nToken;
}
break;
- case RTF_PAR: // Paragraph
+ case RTF_PAR: // Paragraph
{
if ( !pActDefault )
- { // text not in table
- ColAdjust(); // close the processing table
+ { // text not in table
+ ColAdjust(); // close the processing table
pActEntry->nCol = 0;
pActEntry->nRow = nRowCnt;
EntryEnd( pActEntry, pInfo->aSelection );
pList->Insert( pActEntry, LIST_APPEND );
- NewActEntry( pActEntry ); // new pActEntry
+ NewActEntry( pActEntry ); // new pActEntry
NextRow();
}
nLastToken = pInfo->nToken;
}
break;
default:
- { // do not set nLastToken
+ { // do not set nLastToken
switch ( pInfo->nToken & ~(0xff | RTF_TABLEDEF) )
{
case RTF_SHADINGDEF:
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index c9bf2a90a7a5..d4a1f3d52277 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -84,9 +84,9 @@
using namespace com::sun::star;
-#define DEFCHARSET RTL_TEXTENCODING_MS_1252
+#define DEFCHARSET RTL_TEXTENCODING_MS_1252
-#define SC10TOSTRING(p) String(p,DEFCHARSET)
+#define SC10TOSTRING(p) String(p,DEFCHARSET)
const SCCOL SC10MAXCOL = 255; // #i85906# don't try to load more columns than there are in the file
@@ -372,22 +372,22 @@ void lcl_ChangeColor( USHORT nIndex, Color& rColor )
switch( nIndex )
{
- case 1: aCol = COL_RED; break;
- case 2: aCol = COL_GREEN; break;
- case 3: aCol = COL_BROWN; break;
- case 4: aCol = COL_BLUE; break;
- case 5: aCol = COL_MAGENTA; break;
- case 6: aCol = COL_CYAN; break;
- case 7: aCol = COL_GRAY; break;
- case 8: aCol = COL_LIGHTGRAY; break;
- case 9: aCol = COL_LIGHTRED; break;
- case 10: aCol = COL_LIGHTGREEN; break;
- case 11: aCol = COL_YELLOW; break;
- case 12: aCol = COL_LIGHTBLUE; break;
- case 13: aCol = COL_LIGHTMAGENTA; break;
- case 14: aCol = COL_LIGHTCYAN; break;
- case 15: aCol = COL_WHITE; break;
- default: aCol = COL_BLACK;
+ case 1: aCol = COL_RED; break;
+ case 2: aCol = COL_GREEN; break;
+ case 3: aCol = COL_BROWN; break;
+ case 4: aCol = COL_BLUE; break;
+ case 5: aCol = COL_MAGENTA; break;
+ case 6: aCol = COL_CYAN; break;
+ case 7: aCol = COL_GRAY; break;
+ case 8: aCol = COL_LIGHTGRAY; break;
+ case 9: aCol = COL_LIGHTRED; break;
+ case 10: aCol = COL_LIGHTGREEN; break;
+ case 11: aCol = COL_YELLOW; break;
+ case 12: aCol = COL_LIGHTBLUE; break;
+ case 13: aCol = COL_LIGHTMAGENTA; break;
+ case 14: aCol = COL_LIGHTCYAN; break;
+ case 15: aCol = COL_WHITE; break;
+ default: aCol = COL_BLACK;
}
rColor.SetColor( aCol );
@@ -395,7 +395,7 @@ void lcl_ChangeColor( USHORT nIndex, Color& rColor )
String lcl_MakeOldPageStyleFormatName( USHORT i )
{
- String aName = ScGlobal::GetRscString( STR_PAGESTYLE );
+ String aName = ScGlobal::GetRscString( STR_PAGESTYLE );
aName.AppendAscii( " " );
aName += String::CreateFromInt32( i + 1 );
@@ -687,7 +687,7 @@ USHORT Sc10PageCollection::InsertFormat( const Sc10PageFormat& rData )
static inline UINT8 GetMixedCol( const UINT8 nB, const UINT8 nF, const UINT16 nFak )
{
- INT32 nT = nB - nF;
+ INT32 nT = nB - nF;
nT *= ( INT32 ) nFak;
nT /= 0xFFFF;
nT += nF;
@@ -695,7 +695,7 @@ static inline UINT8 GetMixedCol( const UINT8 nB, const UINT8 nF, const UINT16 nF
}
static inline Color GetMixedColor( const Color& rFore, const Color& rBack, UINT16 nFact )
{
- return Color( GetMixedCol( rBack.GetRed(), rFore.GetRed(), nFact ),
+ return Color( GetMixedCol( rBack.GetRed(), rFore.GetRed(), nFact ),
GetMixedCol( rBack.GetGreen(), rFore.GetGreen(), nFact ),
GetMixedCol( rBack.GetBlue(), rFore.GetBlue(), nFact ) );
}
@@ -738,15 +738,15 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc )
FontFamily eFam = FAMILY_DONTKNOW;
switch (pPage->HeadLine.LogFont.lfPitchAndFamily & 0xF0)
{
- case ffDontCare: eFam = FAMILY_DONTKNOW; break;
- case ffRoman: eFam = FAMILY_ROMAN; break;
- case ffSwiss: eFam = FAMILY_SWISS; break;
- case ffModern: eFam = FAMILY_MODERN; break;
- case ffScript: eFam = FAMILY_SCRIPT; break;
- case ffDecorative: eFam = FAMILY_DECORATIVE; break;
- default: eFam = FAMILY_DONTKNOW; break;
+ case ffDontCare: eFam = FAMILY_DONTKNOW; break;
+ case ffRoman: eFam = FAMILY_ROMAN; break;
+ case ffSwiss: eFam = FAMILY_SWISS; break;
+ case ffModern: eFam = FAMILY_MODERN; break;
+ case ffScript: eFam = FAMILY_SCRIPT; break;
+ case ffDecorative: eFam = FAMILY_DECORATIVE; break;
+ default: eFam = FAMILY_DONTKNOW; break;
}
- aEditAttribs.Put( SvxFontItem(
+ aEditAttribs.Put( SvxFontItem(
eFam,
SC10TOSTRING( pHeadFootLine->LogFont.lfFaceName ), EMPTY_STRING,
PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, EE_CHAR_FONTINFO ),
@@ -806,15 +806,15 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc )
Color aRColor( nColor.Red, nColor.Green, nColor.Blue );
UINT16 nFact;
- BOOL bSwapCol = FALSE;
+ BOOL bSwapCol = FALSE;
switch (pHeadFootLine->Raster)
{
- case raNone: nFact = 0xffff; bSwapCol = TRUE; break;
- case raGray12: nFact = (0xffff / 100) * 12; break;
- case raGray25: nFact = (0xffff / 100) * 25; break;
- case raGray50: nFact = (0xffff / 100) * 50; break;
- case raGray75: nFact = (0xffff / 100) * 75; break;
- default: nFact = 0xffff;
+ case raNone: nFact = 0xffff; bSwapCol = TRUE; break;
+ case raGray12: nFact = (0xffff / 100) * 12; break;
+ case raGray25: nFact = (0xffff / 100) * 25; break;
+ case raGray50: nFact = (0xffff / 100) * 50; break;
+ case raGray75: nFact = (0xffff / 100) * 75; break;
+ default: nFact = 0xffff;
}
if( bSwapCol )
aSetItemItemSet.Put( SvxBrushItem( GetMixedColor( aBColor, aRColor, nFact ), ATTR_BACKGROUND ) );
@@ -973,7 +973,7 @@ Sc10Import::Sc10Import(SvStream& rStr, ScDocument* pDocument ) :
pPatternCollection (NULL),
pDataBaseCollection (NULL),
nError (0),
- nShowTab (0)
+ nShowTab (0)
{
pPrgrsBar = NULL;
}
@@ -1000,7 +1000,7 @@ ULONG Sc10Import::Import()
ScDocOptions aOpt = pDoc->GetDocOptions();
aOpt.SetDate( 1, 1, 1900 );
- aOpt.SetYear2000( 18 + 1901 ); // ab SO51 src513e vierstellig
+ aOpt.SetYear2000( 18 + 1901 ); // ab SO51 src513e vierstellig
pDoc->SetDocOptions( aOpt );
pDoc->GetFormatTable()->ChangeNullDate( 1, 1, 1900 );
@@ -1140,12 +1140,12 @@ void Sc10Import::LoadNameCollection()
void Sc10Import::ImportNameCollection()
{
- ScRangeName* pRN = pDoc->GetRangeName();
+ ScRangeName* pRN = pDoc->GetRangeName();
for (USHORT i = 0; i < pNameCollection->GetCount(); i++)
{
- Sc10NameData* pName = pNameCollection->At( i );
- pRN->Insert( new ScRangeData( pDoc,
+ Sc10NameData* pName = pNameCollection->At( i );
+ pRN->Insert( new ScRangeData( pDoc,
SC10TOSTRING( pName->Name ),
SC10TOSTRING( pName->Reference ) ) );
}
@@ -1180,13 +1180,13 @@ void Sc10Import::LoadPatternCollection()
FontFamily eFam = FAMILY_DONTKNOW;
switch( pPattern->LogFont.lfPitchAndFamily & 0xF0 )
{
- case ffDontCare : eFam = FAMILY_DONTKNOW; break;
- case ffRoman : eFam = FAMILY_ROMAN; break;
- case ffSwiss : eFam = FAMILY_SWISS; break;
- case ffModern : eFam = FAMILY_MODERN; break;
- case ffScript : eFam = FAMILY_SCRIPT; break;
- case ffDecorative : eFam = FAMILY_DECORATIVE; break;
- default: eFam = FAMILY_DONTKNOW; break;
+ case ffDontCare : eFam = FAMILY_DONTKNOW; break;
+ case ffRoman : eFam = FAMILY_ROMAN; break;
+ case ffSwiss : eFam = FAMILY_SWISS; break;
+ case ffModern : eFam = FAMILY_MODERN; break;
+ case ffScript : eFam = FAMILY_SCRIPT; break;
+ case ffDecorative : eFam = FAMILY_DECORATIVE; break;
+ default: eFam = FAMILY_DONTKNOW; break;
}
rItemSet.Put( SvxFontItem( eFam, SC10TOSTRING( pPattern->LogFont.lfFaceName ), EMPTY_STRING,
PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, ATTR_FONT ) );
@@ -1246,8 +1246,8 @@ void Sc10Import::LoadPatternCollection()
rItemSet.Put( SfxInt32Item( ATTR_ROTATE_VALUE, 27000 ) );
INT16 Margin = Max( ( USHORT ) 20, ( USHORT ) ( EJustify * 20 ) );
-// if( ( ( OJustify & ojBottomTop ) == ojBottomTop ) ||
-// ( ( OJustify & ojBottomTop ) == ojBottomTop ) )
+// if( ( ( OJustify & ojBottomTop ) == ojBottomTop ) ||
+// ( ( OJustify & ojBottomTop ) == ojBottomTop ) )
// vielleicht so?
if( ( ( OJustify & ojBottomTop ) == ojBottomTop ) )
rItemSet.Put( SvxMarginItem( 20, Margin, 20, Margin, ATTR_MARGIN ) );
@@ -1260,14 +1260,14 @@ void Sc10Import::LoadPatternCollection()
{
if( pPattern->Frame != 0 )
{
- USHORT nLeft = 0;
- USHORT nTop = 0;
- USHORT nRight = 0;
- USHORT nBottom = 0;
- USHORT fLeft = ( pPattern->Frame & 0x000F );
- USHORT fTop = ( pPattern->Frame & 0x00F0 ) / 0x0010;
- USHORT fRight = ( pPattern->Frame & 0x0F00 ) / 0x0100;
- USHORT fBottom = ( pPattern->Frame & 0xF000 ) / 0x1000;
+ USHORT nLeft = 0;
+ USHORT nTop = 0;
+ USHORT nRight = 0;
+ USHORT nBottom = 0;
+ USHORT fLeft = ( pPattern->Frame & 0x000F );
+ USHORT fTop = ( pPattern->Frame & 0x00F0 ) / 0x0010;
+ USHORT fRight = ( pPattern->Frame & 0x0F00 ) / 0x0100;
+ USHORT fBottom = ( pPattern->Frame & 0xF000 ) / 0x1000;
if( fLeft > 1 )
nLeft = 50;
@@ -1289,22 +1289,22 @@ void Sc10Import::LoadPatternCollection()
else if( fBottom > 0 )
nBottom = 20;
- Color ColorLeft( COL_BLACK );
- Color ColorTop( COL_BLACK );
- Color ColorRight( COL_BLACK );
- Color ColorBottom( COL_BLACK );
+ Color ColorLeft( COL_BLACK );
+ Color ColorTop( COL_BLACK );
+ Color ColorRight( COL_BLACK );
+ Color ColorBottom( COL_BLACK );
- USHORT cLeft = ( pPattern->FrameColor & 0x000F );
- USHORT cTop = ( pPattern->FrameColor & 0x00F0 ) >> 4;
- USHORT cRight = ( pPattern->FrameColor & 0x0F00 ) >> 8;
- USHORT cBottom = ( pPattern->FrameColor & 0xF000 ) >> 12;
+ USHORT cLeft = ( pPattern->FrameColor & 0x000F );
+ USHORT cTop = ( pPattern->FrameColor & 0x00F0 ) >> 4;
+ USHORT cRight = ( pPattern->FrameColor & 0x0F00 ) >> 8;
+ USHORT cBottom = ( pPattern->FrameColor & 0xF000 ) >> 12;
lcl_ChangeColor( cLeft, ColorLeft );
lcl_ChangeColor( cTop, ColorTop );
lcl_ChangeColor( cRight, ColorRight );
lcl_ChangeColor( cBottom, ColorBottom );
- SvxBorderLine aLine;
+ SvxBorderLine aLine;
SvxBoxItem aBox( ATTR_BORDER );
aLine.SetOutWidth( nLeft );
@@ -1341,16 +1341,16 @@ void Sc10Import::LoadPatternCollection()
Color aRColor( COL_BLACK );
lcl_ChangeColor( nRColor, aRColor );
UINT16 nFact;
- BOOL bSwapCol = FALSE;
- BOOL bSetItem = TRUE;
+ BOOL bSwapCol = FALSE;
+ BOOL bSetItem = TRUE;
switch (pPattern->Raster)
{
- case raNone: nFact = 0xffff; bSwapCol = TRUE; bSetItem = (nBColor > 0); break;
- case raGray12: nFact = (0xffff / 100) * 12; break;
- case raGray25: nFact = (0xffff / 100) * 25; break;
- case raGray50: nFact = (0xffff / 100) * 50; break;
- case raGray75: nFact = (0xffff / 100) * 75; break;
- default: nFact = 0xffff; bSetItem = (nRColor < 15);
+ case raNone: nFact = 0xffff; bSwapCol = TRUE; bSetItem = (nBColor > 0); break;
+ case raGray12: nFact = (0xffff / 100) * 12; break;
+ case raGray25: nFact = (0xffff / 100) * 25; break;
+ case raGray50: nFact = (0xffff / 100) * 50; break;
+ case raGray75: nFact = (0xffff / 100) * 75; break;
+ default: nFact = 0xffff; bSetItem = (nRColor < 15);
}
if ( bSetItem )
{
@@ -1426,7 +1426,7 @@ void Sc10Import::LoadTables()
USHORT DataValue;
USHORT Count;
USHORT i;
- String aStr; // Universal-Konvertierungs-String
+ String aStr; // Universal-Konvertierungs-String
//rStream.Read(&PageFormat, sizeof(PageFormat));
@@ -1459,33 +1459,33 @@ void Sc10Import::LoadTables()
if ( Tab == (INT16)nShowTab )
{
- ScVObjMode eObjMode = VOBJ_MODE_SHOW;
-
- aSc30ViewOpt.SetOption( VOPT_FORMULAS, IS_SET(dfFormula,Display) );
- aSc30ViewOpt.SetOption( VOPT_NULLVALS, IS_SET(dfZerro,Display) );
- aSc30ViewOpt.SetOption( VOPT_SYNTAX, IS_SET(dfSyntax,Display) );
- aSc30ViewOpt.SetOption( VOPT_NOTES, IS_SET(dfNoteMark,Display) );
- aSc30ViewOpt.SetOption( VOPT_VSCROLL, TRUE );
- aSc30ViewOpt.SetOption( VOPT_HSCROLL, TRUE );
+ ScVObjMode eObjMode = VOBJ_MODE_SHOW;
+
+ aSc30ViewOpt.SetOption( VOPT_FORMULAS, IS_SET(dfFormula,Display) );
+ aSc30ViewOpt.SetOption( VOPT_NULLVALS, IS_SET(dfZerro,Display) );
+ aSc30ViewOpt.SetOption( VOPT_SYNTAX, IS_SET(dfSyntax,Display) );
+ aSc30ViewOpt.SetOption( VOPT_NOTES, IS_SET(dfNoteMark,Display) );
+ aSc30ViewOpt.SetOption( VOPT_VSCROLL, TRUE );
+ aSc30ViewOpt.SetOption( VOPT_HSCROLL, TRUE );
aSc30ViewOpt.SetOption( VOPT_TABCONTROLS, TRUE );
- aSc30ViewOpt.SetOption( VOPT_OUTLINER, TRUE );
- aSc30ViewOpt.SetOption( VOPT_GRID, IS_SET(dfGrid,Display) );
+ aSc30ViewOpt.SetOption( VOPT_OUTLINER, TRUE );
+ aSc30ViewOpt.SetOption( VOPT_GRID, IS_SET(dfGrid,Display) );
// VOPT_HEADER wird in LoadViewColRowBar() gesetzt
- if ( IS_SET(dfObjectAll,Display) ) // Objekte anzeigen
+ if ( IS_SET(dfObjectAll,Display) ) // Objekte anzeigen
eObjMode = VOBJ_MODE_SHOW;
- else if ( IS_SET(dfObjectFrame,Display) ) // Objekte als Platzhalter
+ else if ( IS_SET(dfObjectFrame,Display) ) // Objekte als Platzhalter
eObjMode = VOBJ_MODE_SHOW;
- else if ( IS_SET(dfObjectNone,Display) ) // Objekte nicht anzeigen
+ else if ( IS_SET(dfObjectNone,Display) ) // Objekte nicht anzeigen
eObjMode = VOBJ_MODE_HIDE;
- aSc30ViewOpt.SetObjMode( VOBJ_TYPE_OLE, eObjMode );
+ aSc30ViewOpt.SetObjMode( VOBJ_TYPE_OLE, eObjMode );
aSc30ViewOpt.SetObjMode( VOBJ_TYPE_CHART, eObjMode );
aSc30ViewOpt.SetObjMode( VOBJ_TYPE_DRAW, eObjMode );
}
- /* wofuer wird das benoetigt? Da in SC 1.0 die Anzeigeflags pro Tabelle gelten und nicht pro View
+ /* wofuer wird das benoetigt? Da in SC 1.0 die Anzeigeflags pro Tabelle gelten und nicht pro View
Dieses Flag in die ViewOptions eintragen bei Gelegenheit, Sollte der Stephan Olk machen
USHORT nDisplayMask = 0xFFFF;
USHORT nDisplayValue = 0;
@@ -1551,7 +1551,7 @@ void Sc10Import::LoadTables()
bool bPageBreak = ((DataValue & crfSoftBreak) == crfSoftBreak);
bool bManualBreak = ((DataValue & crfHardBreak) == crfHardBreak);
bool bHidden = ((DataValue & crfHidden) == crfHidden);
- for (SCCOL k = static_cast<SCCOL>(DataStart); k <= static_cast<SCCOL>(DataEnd); k++)
+ for (SCCOL k = static_cast<SCCOL>(DataStart); k <= static_cast<SCCOL>(DataEnd); k++)
{
pDoc->SetColHidden(k, k, static_cast<SCTAB>(TabNo), bHidden);
pDoc->SetColBreak(k, static_cast<SCTAB> (TabNo), bPageBreak, bManualBreak);
@@ -1601,8 +1601,8 @@ void Sc10Import::LoadTables()
bool bPageBreak = ((DataValue & crfSoftBreak) == crfSoftBreak);
bool bManualBreak = ((DataValue & crfHardBreak) == crfHardBreak);
bool bHidden = ((DataValue & crfHidden) == crfHidden);
- for (SCROW l = static_cast<SCROW>(DataStart); l <= static_cast<SCROW>(DataEnd); l++)
- {
+ for (SCROW l = static_cast<SCROW>(DataStart); l <= static_cast<SCROW>(DataEnd); l++)
+ {
pDoc->SetRowHidden(l, l, static_cast<SCTAB> (TabNo), bHidden);
pDoc->SetRowBreak(l, static_cast<SCTAB> (TabNo), bPageBreak, bManualBreak);
}
@@ -1769,13 +1769,13 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
Sc10FontData* pFont = pFontCollection->At(pColData->Value);
switch (pFont->PitchAndFamily & 0xF0)
{
- case ffDontCare : eFam = FAMILY_DONTKNOW; break;
- case ffRoman : eFam = FAMILY_ROMAN; break;
- case ffSwiss : eFam = FAMILY_SWISS; break;
- case ffModern : eFam = FAMILY_MODERN; break;
- case ffScript : eFam = FAMILY_SCRIPT; break;
- case ffDecorative : eFam = FAMILY_DECORATIVE; break;
- default: eFam = FAMILY_DONTKNOW; break;
+ case ffDontCare : eFam = FAMILY_DONTKNOW; break;
+ case ffRoman : eFam = FAMILY_ROMAN; break;
+ case ffSwiss : eFam = FAMILY_SWISS; break;
+ case ffModern : eFam = FAMILY_MODERN; break;
+ case ffScript : eFam = FAMILY_SCRIPT; break;
+ case ffDecorative : eFam = FAMILY_DECORATIVE; break;
+ default: eFam = FAMILY_DONTKNOW; break;
}
ScPatternAttr aScPattern(pDoc->GetPool());
aScPattern.GetItemSet().Put(SvxFontItem(eFam, SC10TOSTRING( pFont->FaceName ), EMPTY_STRING,
@@ -1892,15 +1892,15 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
nStart = nEnd + 1;
}
// Umrandung
- BOOL bEnd = FALSE;
- USHORT nColorIndex = 0;
- USHORT nFrameIndex = 0;
+ BOOL bEnd = FALSE;
+ USHORT nColorIndex = 0;
+ USHORT nFrameIndex = 0;
// Special Fix...
- const UINT32 nHelpMeStart = 100;
- UINT32 nHelpMe = nHelpMeStart;
- USHORT nColorIndexOld = nColorIndex;
- USHORT nFrameIndexOld = nColorIndex;
+ const UINT32 nHelpMeStart = 100;
+ UINT32 nHelpMe = nHelpMeStart;
+ USHORT nColorIndexOld = nColorIndex;
+ USHORT nFrameIndexOld = nColorIndex;
nEnd = 0;
nStart = 0;
@@ -1908,15 +1908,15 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
{
pColData = &aFrame.pData[ nFrameIndex ];
- USHORT nValue = pColData->Value;
- USHORT nLeft = 0;
- USHORT nTop = 0;
- USHORT nRight = 0;
- USHORT nBottom = 0;
- USHORT fLeft = ( nValue & 0x000F );
- USHORT fTop = ( nValue & 0x00F0 ) >> 4;
- USHORT fRight = ( nValue & 0x0F00 ) >> 8;
- USHORT fBottom = ( nValue & 0xF000 ) >> 12;
+ USHORT nValue = pColData->Value;
+ USHORT nLeft = 0;
+ USHORT nTop = 0;
+ USHORT nRight = 0;
+ USHORT nBottom = 0;
+ USHORT fLeft = ( nValue & 0x000F );
+ USHORT fTop = ( nValue & 0x00F0 ) >> 4;
+ USHORT fRight = ( nValue & 0x0F00 ) >> 8;
+ USHORT fBottom = ( nValue & 0xF000 ) >> 12;
if( fLeft > 1 )
nLeft = 50;
@@ -1938,16 +1938,16 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
else if( fBottom > 0 )
nBottom = 20;
- Color ColorLeft( COL_BLACK );
- Color ColorTop( COL_BLACK );
- Color ColorRight( COL_BLACK );
- Color ColorBottom( COL_BLACK );
- USHORT nFrmColVal = aFrameColor.pData[ nColorIndex ].Value;
- SCROW nFrmColRow = static_cast<SCROW>(aFrameColor.pData[ nColorIndex ].Row);
- USHORT cLeft = ( nFrmColVal & 0x000F );
- USHORT cTop = ( nFrmColVal & 0x00F0 ) >> 4;
- USHORT cRight = ( nFrmColVal & 0x0F00 ) >> 8;
- USHORT cBottom = ( nFrmColVal & 0xF000 ) >> 12;
+ Color ColorLeft( COL_BLACK );
+ Color ColorTop( COL_BLACK );
+ Color ColorRight( COL_BLACK );
+ Color ColorBottom( COL_BLACK );
+ USHORT nFrmColVal = aFrameColor.pData[ nColorIndex ].Value;
+ SCROW nFrmColRow = static_cast<SCROW>(aFrameColor.pData[ nColorIndex ].Row);
+ USHORT cLeft = ( nFrmColVal & 0x000F );
+ USHORT cTop = ( nFrmColVal & 0x00F0 ) >> 4;
+ USHORT cRight = ( nFrmColVal & 0x0F00 ) >> 8;
+ USHORT cBottom = ( nFrmColVal & 0xF000 ) >> 12;
lcl_ChangeColor( cLeft, ColorLeft );
lcl_ChangeColor( cTop, ColorTop );
@@ -1977,7 +1977,7 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
if( ( nStart <= nEnd ) && ( nValue != 0 ) )
{
ScPatternAttr aScPattern(pDoc->GetPool());
- SvxBorderLine aLine;
+ SvxBorderLine aLine;
SvxBoxItem aBox( ATTR_BORDER );
aLine.SetOutWidth( nLeft );
@@ -2018,21 +2018,21 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
// ACHTUNG: Code bis hier ueberarbeitet ... jetzt hab' ich keinen Bock mehr! (GT)
// Hintergrund (Farbe, Raster)
- USHORT nRasterIndex = 0;
- bEnd = FALSE;
- nColorIndex = 0;
- nEnd = 0;
- nStart = 0;
+ USHORT nRasterIndex = 0;
+ bEnd = FALSE;
+ nColorIndex = 0;
+ nEnd = 0;
+ nStart = 0;
// Special Fix...
- nHelpMe = nHelpMeStart;
- USHORT nRasterIndexOld = nRasterIndex;
+ nHelpMe = nHelpMeStart;
+ USHORT nRasterIndexOld = nRasterIndex;
while( !bEnd && nHelpMe )
{
- USHORT nBColor = ( aColor.pData[ nColorIndex ].Value & 0x00F0 ) >> 4;
- USHORT nRColor = ( aColor.pData[ nColorIndex ].Value & 0x0F00 ) >> 8;
- Color aBColor( COL_BLACK );
+ USHORT nBColor = ( aColor.pData[ nColorIndex ].Value & 0x00F0 ) >> 4;
+ USHORT nRColor = ( aColor.pData[ nColorIndex ].Value & 0x0F00 ) >> 8;
+ Color aBColor( COL_BLACK );
lcl_ChangeColor( nBColor, aBColor );
@@ -2041,23 +2041,23 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
else if( nBColor == 15 )
aBColor.SetColor( COL_BLACK );
- Color aRColor( COL_BLACK );
+ Color aRColor( COL_BLACK );
lcl_ChangeColor( nRColor, aRColor );
ScPatternAttr aScPattern( pDoc->GetPool() );
UINT16 nFact;
- BOOL bSwapCol = FALSE;
- BOOL bSetItem = TRUE;
+ BOOL bSwapCol = FALSE;
+ BOOL bSetItem = TRUE;
switch ( aRaster.pData[ nRasterIndex ].Value )
{
- case raNone: nFact = 0xffff; bSwapCol = TRUE; bSetItem = (nBColor > 0); break;
- case raGray12: nFact = (0xffff / 100) * 12; break;
- case raGray25: nFact = (0xffff / 100) * 25; break;
- case raGray50: nFact = (0xffff / 100) * 50; break;
- case raGray75: nFact = (0xffff / 100) * 75; break;
- default: nFact = 0xffff; bSetItem = (nRColor < 15);
+ case raNone: nFact = 0xffff; bSwapCol = TRUE; bSetItem = (nBColor > 0); break;
+ case raGray12: nFact = (0xffff / 100) * 12; break;
+ case raGray25: nFact = (0xffff / 100) * 25; break;
+ case raGray50: nFact = (0xffff / 100) * 50; break;
+ case raGray75: nFact = (0xffff / 100) * 75; break;
+ default: nFact = 0xffff; bSetItem = (nRColor < 15);
}
if ( bSetItem )
{
@@ -2462,7 +2462,7 @@ void Sc10Import::LoadObjects()
//rStream.Read(&ChartHeader, sizeof(ChartHeader));
lcl_ReadChartHeader(rStream, ChartHeader);
- //! altes Metafile verwenden ??
+ //! altes Metafile verwenden ??
rStream.SeekRel(ChartHeader.Size);
//rStream.Read(&ChartSheetData, sizeof(ChartSheetData));
@@ -2503,7 +2503,7 @@ void Sc10Import::LoadObjects()
FltError ScFormatFilterPluginImpl::ScImportStarCalc10( SvStream& rStream, ScDocument* pDocument )
{
rStream.Seek( 0UL );
- Sc10Import aImport( rStream, pDocument );
+ Sc10Import aImport( rStream, pDocument );
return ( FltError ) aImport.Import();
}
diff --git a/sc/source/filter/starcalc/scfobj.cxx b/sc/source/filter/starcalc/scfobj.cxx
index c0f575313459..5f8fc3fc877e 100644
--- a/sc/source/filter/starcalc/scfobj.cxx
+++ b/sc/source/filter/starcalc/scfobj.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using namespace com::sun::star;
void Sc10InsertObject::InsertChart( ScDocument* pDoc, SCTAB nDestTab, const Rectangle& rRect,
SCTAB nSrcTab, USHORT nX1, USHORT nY1, USHORT nX2, USHORT nY2 )
{
- // wenn Chart nicht installiert ist, darf nicht auf SCH_MOD zugegriffen werden!
+ // wenn Chart nicht installiert ist, darf nicht auf SCH_MOD zugegriffen werden!
if ( !SvtModuleOptions().IsChart() )
return;
@@ -84,7 +84,7 @@ void Sc10InsertObject::InsertChart( ScDocument* pDoc, SCTAB nDestTab, const Rect
DBG_ASSERT(pPage,"Page ?");
pPage->InsertObject(pSdrOle2Obj);
- pSdrOle2Obj->SetLogicRect(rRect); // erst nach InsertObject !!!
+ pSdrOle2Obj->SetLogicRect(rRect); // erst nach InsertObject !!!
awt::Size aSz;
aSz.Width = rRect.GetSize().Width();
aSz.Height = rRect.GetSize().Height();
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 42cb37250c5c..6ec372cd173f 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
void lcl_WriteDateTime( XclExpStream& rStrm, const DateTime& rDateTime )
{
rStrm.SetSliceSize( 7 );
- rStrm << (sal_uInt16) rDateTime.GetYear()
- << (sal_uInt8) rDateTime.GetMonth()
- << (sal_uInt8) rDateTime.GetDay()
- << (sal_uInt8) rDateTime.GetHour()
- << (sal_uInt8) rDateTime.GetMin()
- << (sal_uInt8) rDateTime.GetSec();
+ rStrm << (sal_uInt16) rDateTime.GetYear()
+ << (sal_uInt8) rDateTime.GetMonth()
+ << (sal_uInt8) rDateTime.GetDay()
+ << (sal_uInt8) rDateTime.GetHour()
+ << (sal_uInt8) rDateTime.GetMin()
+ << (sal_uInt8) rDateTime.GetSec();
rStrm.SetSliceSize( 0 );
}
@@ -88,17 +88,17 @@ XclExpUserBView::XclExpUserBView( const String& rUsername, const sal_uInt8* pGUI
void XclExpUserBView::SaveCont( XclExpStream& rStrm )
{
- rStrm << (sal_uInt32) 0xFF078014
- << (sal_uInt32) 0x00000001;
+ rStrm << (sal_uInt32) 0xFF078014
+ << (sal_uInt32) 0x00000001;
lcl_WriteGUID( rStrm, aGUID );
rStrm.WriteZeroBytes( 8 );
rStrm << (sal_uInt32) 1200
- << (sal_uInt32) 1000
- << (sal_uInt16) 1000
- << (sal_uInt16) 0x0CF7
- << (sal_uInt16) 0x0000
- << (sal_uInt16) 0x0001
- << (sal_uInt16) 0x0000;
+ << (sal_uInt32) 1000
+ << (sal_uInt16) 1000
+ << (sal_uInt16) 0x0CF7
+ << (sal_uInt16) 0x0000
+ << (sal_uInt16) 0x0001
+ << (sal_uInt16) 0x0000;
if( sUsername.Len() > 0 )
rStrm << sUsername;
}
@@ -152,19 +152,19 @@ XclExpUsersViewBegin::XclExpUsersViewBegin( const sal_uInt8* pGUID, sal_uInt32 n
void XclExpUsersViewBegin::SaveCont( XclExpStream& rStrm )
{
lcl_WriteGUID( rStrm, aGUID );
- rStrm << nCurrTab
- << (sal_uInt32) 100
- << (sal_uInt32) 64
- << (sal_uInt32) 3
- << (sal_uInt32) 0x0000003C
- << (sal_uInt16) 0
- << (sal_uInt16) 3
- << (sal_uInt16) 0
- << (sal_uInt16) 3
- << (double) 0
- << (double) 0
- << (sal_Int16) -1
- << (sal_Int16) -1;
+ rStrm << nCurrTab
+ << (sal_uInt32) 100
+ << (sal_uInt32) 64
+ << (sal_uInt32) 3
+ << (sal_uInt32) 0x0000003C
+ << (sal_uInt16) 0
+ << (sal_uInt16) 3
+ << (sal_uInt16) 0
+ << (sal_uInt16) 3
+ << (double) 0
+ << (double) 0
+ << (sal_Int16) -1
+ << (sal_Int16) -1;
}
UINT16 XclExpUsersViewBegin::GetNum() const
@@ -215,7 +215,7 @@ sal_Size XclExpChTr0x0191::GetLen() const
void XclExpChTr0x0198::SaveCont( XclExpStream& rStrm )
{
- rStrm << (sal_uInt16) 0x0006
+ rStrm << (sal_uInt16) 0x0006
<< (sal_uInt16) 0x0000;
}
@@ -333,12 +333,12 @@ XclExpChTrHeader::~XclExpChTrHeader()
void XclExpChTrHeader::SaveCont( XclExpStream& rStrm )
{
- rStrm << (sal_uInt16) 0x0006
+ rStrm << (sal_uInt16) 0x0006
<< (sal_uInt16) 0x0000
<< (sal_uInt16) 0x000D;
lcl_WriteGUID( rStrm, aGUID );
lcl_WriteGUID( rStrm, aGUID );
- rStrm << nCount
+ rStrm << nCount
<< (sal_uInt16) 0x0001
<< (sal_uInt32) 0x00000000
<< (sal_uInt16) 0x001E;
@@ -362,16 +362,16 @@ XclExpChTrInfo::~XclExpChTrInfo()
void XclExpChTrInfo::SaveCont( XclExpStream& rStrm )
{
- rStrm << (sal_uInt32) 0xFFFFFFFF
- << (sal_uInt32) 0x00000000
- << (sal_uInt32) 0x00000020
- << (sal_uInt16) 0xFFFF;
+ rStrm << (sal_uInt32) 0xFFFFFFFF
+ << (sal_uInt32) 0x00000000
+ << (sal_uInt32) 0x00000020
+ << (sal_uInt16) 0xFFFF;
lcl_WriteGUID( rStrm, aGUID );
- rStrm << (sal_uInt16) 0x04B0;
+ rStrm << (sal_uInt16) 0x04B0;
lcl_WriteFixedString( rStrm, sUsername, 113 );
lcl_WriteDateTime( rStrm, aDateTime );
- rStrm << (sal_uInt8) 0x0000
- << (sal_uInt16) 0x0002;
+ rStrm << (sal_uInt8) 0x0000
+ << (sal_uInt16) 0x0002;
}
UINT16 XclExpChTrInfo::GetNum() const
@@ -580,7 +580,7 @@ void XclExpChTrAction::SetIndex( sal_uInt32& rIndex )
void XclExpChTrAction::SaveCont( XclExpStream& rStrm )
{
DBG_ASSERT( nOpCode != EXC_CHTR_OP_UNKNOWN, "XclExpChTrAction::SaveCont - unknown action" );
- rStrm << nLength
+ rStrm << nLength
<< nIndex
<< nOpCode
<< (sal_uInt16)(bAccepted ? EXC_CHTR_ACCEPT : EXC_CHTR_NOTHING);
@@ -802,10 +802,10 @@ void XclExpChTrCellContent::GetCellData(
void XclExpChTrCellContent::SaveActionData( XclExpStream& rStrm ) const
{
WriteTabId( rStrm, aPosition.Tab() );
- rStrm << (sal_uInt16)((pOldData ? (pOldData->nType << 3) : 0x0000) | (pNewData ? pNewData->nType : 0x0000))
+ rStrm << (sal_uInt16)((pOldData ? (pOldData->nType << 3) : 0x0000) | (pNewData ? pNewData->nType : 0x0000))
<< (sal_uInt16) 0x0000;
Write2DAddress( rStrm, aPosition );
- rStrm << nOldLength
+ rStrm << nOldLength
<< (sal_uInt32) 0x00000000;
if( pOldData )
pOldData->Write( rStrm, rIdBuffer );
@@ -841,10 +841,10 @@ XclExpChTrInsert::XclExpChTrInsert(
nLength = 0x00000030;
switch( rAction.GetType() )
{
- case SC_CAT_INSERT_COLS: nOpCode = EXC_CHTR_OP_INSCOL; break;
- case SC_CAT_INSERT_ROWS: nOpCode = EXC_CHTR_OP_INSROW; break;
- case SC_CAT_DELETE_COLS: nOpCode = EXC_CHTR_OP_DELCOL; break;
- case SC_CAT_DELETE_ROWS: nOpCode = EXC_CHTR_OP_DELROW; break;
+ case SC_CAT_INSERT_COLS: nOpCode = EXC_CHTR_OP_INSCOL; break;
+ case SC_CAT_INSERT_ROWS: nOpCode = EXC_CHTR_OP_INSROW; break;
+ case SC_CAT_DELETE_COLS: nOpCode = EXC_CHTR_OP_DELCOL; break;
+ case SC_CAT_DELETE_ROWS: nOpCode = EXC_CHTR_OP_DELROW; break;
default:
DBG_ERROR( "XclExpChTrInsert::XclExpChTrInsert - unknown action" );
}
@@ -874,9 +874,9 @@ XclExpChTrInsert::~XclExpChTrInsert()
void XclExpChTrInsert::SaveActionData( XclExpStream& rStrm ) const
{
WriteTabId( rStrm, aRange.aStart.Tab() );
- rStrm << (sal_uInt16) 0x0000;
+ rStrm << (sal_uInt16) 0x0000;
Write2DRange( rStrm, aRange );
- rStrm << (sal_uInt32) 0x00000000;
+ rStrm << (sal_uInt32) 0x00000000;
}
void XclExpChTrInsert::PrepareSaveAction( XclExpStream& rStrm ) const
@@ -1010,7 +1010,7 @@ XclExpChTr0x014A::~XclExpChTr0x014A()
void XclExpChTr0x014A::SaveActionData( XclExpStream& rStrm ) const
{
WriteTabId( rStrm, aRange.aStart.Tab() );
- rStrm << (sal_uInt16) 0x0003
+ rStrm << (sal_uInt16) 0x0003
<< (sal_uInt16) 0x0001;
Write2DRange( rStrm, aRange );
}
@@ -1119,7 +1119,7 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) :
sal_uInt32 nIndex = 1;
while( XclExpChTrAction* pAction = aActionStack.Pop() )
{
- if( (nIndex == 1) || pAction->ForceInfoRecord() ||
+ if( (nIndex == 1) || pAction->ForceInfoRecord() ||
(pAction->GetUsername() != sLastUsername) ||
(pAction->GetDateTime() != aLastDateTime) )
{
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index 96a301e1bef5..d9f6150c36af 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -207,7 +207,7 @@ void XclImpChangeTrack::ReadFormula( ScTokenArray*& rpTokenArray, const ScAddres
// read the formula, 3D tab refs from extended data
const ScTokenArray* pArray = NULL;
aFmlConv.Reset( rPosition );
- BOOL bOK = (aFmlConv.Convert( pArray, aFmlaStrm, nFmlSize, false, FT_CellFormula) == ConvOK); // JEG : Check This
+ BOOL bOK = (aFmlConv.Convert( pArray, aFmlaStrm, nFmlSize, false, FT_CellFormula) == ConvOK); // JEG : Check This
rpTokenArray = (bOK && pArray) ? new ScTokenArray( *pArray ) : NULL;
pStrm->Ignore( 1 );
}
@@ -347,10 +347,10 @@ void XclImpChangeTrack::ReadChTrCellContent()
pStrm->Ignore( 4 );
switch( nValueType & EXC_CHTR_TYPE_FORMATMASK )
{
- case 0x0000: break;
+ case 0x0000: break;
case 0x1100: pStrm->Ignore( 16 ); break;
case 0x1300: pStrm->Ignore( 8 ); break;
- default: DBG_ERROR( "XclImpChangeTrack::ReadChTrCellContent - unknown format info" );
+ default: DBG_ERROR( "XclImpChangeTrack::ReadChTrCellContent - unknown format info" );
}
ScBaseCell* pOldCell;
@@ -455,17 +455,17 @@ void XclImpChangeTrack::ReadRecords()
{
switch( pStrm->GetRecId() )
{
- case 0x000A: bGlobExit = sal_True; break;
- case 0x0137: ReadChTrInsert(); break;
- case 0x0138: ReadChTrInfo(); break;
- case 0x013B: ReadChTrCellContent(); break;
- case 0x013D: ReadChTrTabId(); break;
- case 0x0140: ReadChTrMoveRange(); break;
- case 0x014D: ReadChTrInsertTab(); break;
+ case 0x000A: bGlobExit = sal_True; break;
+ case 0x0137: ReadChTrInsert(); break;
+ case 0x0138: ReadChTrInfo(); break;
+ case 0x013B: ReadChTrCellContent(); break;
+ case 0x013D: ReadChTrTabId(); break;
+ case 0x0140: ReadChTrMoveRange(); break;
+ case 0x014D: ReadChTrInsertTab(); break;
case 0x014E:
- case 0x0150: InitNestedMode(); break;
+ case 0x0150: InitNestedMode(); break;
case 0x014F:
- case 0x0151: bExitLoop = EndNestedMode(); break;
+ case 0x0151: bExitLoop = EndNestedMode(); break;
}
}
}
@@ -494,7 +494,7 @@ XclImpChTrFmlConverter::~XclImpChTrFmlConverter()
}
// virtual, called from ExcToSc8::Convert()
-bool XclImpChTrFmlConverter::Read3DTabReference( UINT16 /*nIxti*/, SCTAB& rFirstTab, SCTAB& rLastTab,
+bool XclImpChTrFmlConverter::Read3DTabReference( UINT16 /*nIxti*/, SCTAB& rFirstTab, SCTAB& rLastTab,
ExternalTabInfo& rExtInfo )
{
return rChangeTrack.Read3DTabRefInfo( rFirstTab, rLastTab, rExtInfo );
diff --git a/sc/source/filter/xcl97/xcl97dum.cxx b/sc/source/filter/xcl97/xcl97dum.cxx
index 1550fa97ed40..015d7a0036f6 100644
--- a/sc/source/filter/xcl97/xcl97dum.cxx
+++ b/sc/source/filter/xcl97/xcl97dum.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +39,10 @@
// ... (8+) := neu in Biff8, ... (8*) := anders in Biff8
const BYTE ExcDummy8_00a::pMyData[] = {
- 0xe1, 0x00, 0x02, 0x00, 0xb0, 0x04, // INTERFACEHDR
- 0xc1, 0x00, 0x02, 0x00, 0x00, 0x00, // MMS
- 0xe2, 0x00, 0x00, 0x00, // INTERFACEEND
- 0x5c, 0x00, 0x70, 0x00, // WRITEACCESS (8*)
+ 0xe1, 0x00, 0x02, 0x00, 0xb0, 0x04, // INTERFACEHDR
+ 0xc1, 0x00, 0x02, 0x00, 0x00, 0x00, // MMS
+ 0xe2, 0x00, 0x00, 0x00, // INTERFACEEND
+ 0x5c, 0x00, 0x70, 0x00, // WRITEACCESS (8*)
0x04, 0x00, 0x00, 'C', 'a', 'l', 'c', 0x20, // "Calc"
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
@@ -57,34 +57,34 @@ const BYTE ExcDummy8_00a::pMyData[] = {
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- 0x42, 0x00, 0x02, 0x00, 0xb0, 0x04, // CODEPAGE
- 0x61, 0x01, 0x02, 0x00, 0x00, 0x00 // DSF (8+)
+ 0x42, 0x00, 0x02, 0x00, 0xb0, 0x04, // CODEPAGE
+ 0x61, 0x01, 0x02, 0x00, 0x00, 0x00 // DSF (8+)
};
const sal_Size ExcDummy8_00a::nMyLen = sizeof(ExcDummy8_00a::pMyData);
// TABID (8+): ExcTabid
const BYTE ExcDummy8_00b::pMyData[] = {
- 0x9c, 0x00, 0x02, 0x00, 0x0e, 0x00 // FNGROUPCOUNT
+ 0x9c, 0x00, 0x02, 0x00, 0x0e, 0x00 // FNGROUPCOUNT
};
const sal_Size ExcDummy8_00b::nMyLen = sizeof(ExcDummy8_00b::pMyData);
const BYTE ExcDummy8_040::pMyData[] = {
- 0xaf, 0x01, 0x02, 0x00, 0x00, 0x00, // PROT4REV (8+)
- 0xbc, 0x01, 0x02, 0x00, 0x00, 0x00, // PROT4REVPASS (8+)
-// 0x3d, 0x00, 0x12, 0x00, 0xe0, 0x01, 0x5a, 0x00, 0xcf, // WINDOW1
-// 0x3f, 0x4e, 0x2a, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00,
-// 0x01, 0x00, 0x58, 0x02,
- 0x40, 0x00, 0x02, 0x00, 0x00, 0x00, // BACKUP
- 0x8d, 0x00, 0x02, 0x00, 0x00, 0x00 // HIDEOBJ
+ 0xaf, 0x01, 0x02, 0x00, 0x00, 0x00, // PROT4REV (8+)
+ 0xbc, 0x01, 0x02, 0x00, 0x00, 0x00, // PROT4REVPASS (8+)
+// 0x3d, 0x00, 0x12, 0x00, 0xe0, 0x01, 0x5a, 0x00, 0xcf, // WINDOW1
+// 0x3f, 0x4e, 0x2a, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00,
+// 0x01, 0x00, 0x58, 0x02,
+ 0x40, 0x00, 0x02, 0x00, 0x00, 0x00, // BACKUP
+ 0x8d, 0x00, 0x02, 0x00, 0x00, 0x00 // HIDEOBJ
};
const sal_Size ExcDummy8_040::nMyLen = sizeof(ExcDummy8_040::pMyData);
const BYTE ExcDummy8_041::pMyData[] = {
- 0xb7, 0x01, 0x02, 0x00, 0x00, 0x00, // REFRESHALL (8+)
- 0xda, 0x00, 0x02, 0x00, 0x00, 0x00 // BOOKBOOL
+ 0xb7, 0x01, 0x02, 0x00, 0x00, 0x00, // REFRESHALL (8+)
+ 0xda, 0x00, 0x02, 0x00, 0x00, 0x00 // BOOKBOOL
};
const sal_Size ExcDummy8_041::nMyLen = sizeof(ExcDummy8_041::pMyData);
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index a7c6dee67dc5..b7e5de8554a2 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -198,7 +198,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape
nAdditionalText++;
BOOL bInGroup = ( pCurrXclObj != NULL );
if ( bInGroup )
- { // stacked recursive group object
+ { // stacked recursive group object
if ( !pCurrAppData->IsStackedGroup() )
{ //! UpdateDffFragmentEnd only once
pCurrAppData->SetStackedGroup( TRUE );
@@ -262,7 +262,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape
if ( pCurrXclObj )
{
if ( !mrObjMgr.AddObj( pCurrXclObj ) )
- { // maximum count reached, object got deleted
+ { // maximum count reached, object got deleted
pCurrXclObj = NULL;
}
else
@@ -487,7 +487,7 @@ void XclEscherEx::DeleteCurrAppData()
// --- class XclEscherClientData -------------------------------------
void XclEscherClientData::WriteData( EscherEx& rEx ) const
-{ // actual data is in the following OBJ record
+{ // actual data is in the following OBJ record
rEx.AddAtom( 0, ESCHER_ClientData );
}
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index df6bdcbbe671..cc0939990c28 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +309,12 @@ void XclObjComment::ProcessEscherObj( const XclExpRoot& rRoot, const Rectangle&
{
aPropOpt.CreateFillProperties( aXPropSet, sal_True);
- aPropOpt.AddOpt( ESCHER_Prop_lTxid, 0 ); // undocumented
- aPropOpt.AddOpt( 0x0158, 0x00000000 ); // undocumented
+ aPropOpt.AddOpt( ESCHER_Prop_lTxid, 0 ); // undocumented
+ aPropOpt.AddOpt( 0x0158, 0x00000000 ); // undocumented
sal_uInt32 nValue = 0;
if(!aPropOpt.GetOpt( ESCHER_Prop_FitTextToShape, nValue ))
- aPropOpt.AddOpt( ESCHER_Prop_FitTextToShape, 0x00080008 ); // bool field
+ aPropOpt.AddOpt( ESCHER_Prop_FitTextToShape, 0x00080008 ); // bool field
if(aPropOpt.GetOpt( ESCHER_Prop_fillColor, nValue ))
{
@@ -335,15 +335,15 @@ void XclObjComment::ProcessEscherObj( const XclExpRoot& rRoot, const Rectangle&
if(!aPropOpt.GetOpt( ESCHER_Prop_fillBackColor, nValue ))
aPropOpt.AddOpt( ESCHER_Prop_fillBackColor, 0x08000050 );
if(!aPropOpt.GetOpt( ESCHER_Prop_fNoFillHitTest, nValue ))
- aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x00110010 ); // bool field
+ aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x00110010 ); // bool field
if(!aPropOpt.GetOpt( ESCHER_Prop_shadowColor, nValue ))
aPropOpt.AddOpt( ESCHER_Prop_shadowColor, 0x00000000 );
- if(!aPropOpt.GetOpt( ESCHER_Prop_fshadowObscured, nValue )) // bool field
- aPropOpt.AddOpt( ESCHER_Prop_fshadowObscured, 0x00030003 ); // bool field
+ if(!aPropOpt.GetOpt( ESCHER_Prop_fshadowObscured, nValue )) // bool field
+ aPropOpt.AddOpt( ESCHER_Prop_fshadowObscured, 0x00030003 ); // bool field
}
}
- nGrbit = 0; // all off: AutoLine, AutoFill, Printable, Locked
+ nGrbit = 0; // all off: AutoLine, AutoFill, Printable, Locked
mrEscherEx.OpenContainer( ESCHER_SpContainer );
mrEscherEx.AddShape( ESCHER_ShpInst_TextBox, SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_HAVESPT );
sal_uInt32 nFlags = 0x000A0000;
@@ -384,15 +384,15 @@ XclObjDropDown::XclObjDropDown( XclExpObjectManager& rObjMgr, const ScAddress& r
SetPrintable( FALSE );
SetAutoFill( TRUE );
SetAutoLine( FALSE );
- nGrbit |= 0x0100; // undocumented
+ nGrbit |= 0x0100; // undocumented
mrEscherEx.OpenContainer( ESCHER_SpContainer );
mrEscherEx.AddShape( ESCHER_ShpInst_HostControl, SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_HAVESPT );
EscherPropertyContainer aPropOpt;
- aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x01040104 ); // bool field
- aPropOpt.AddOpt( ESCHER_Prop_FitTextToShape, 0x00080008 ); // bool field
- aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x00010000 ); // bool field
- aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x00080000 ); // bool field
- aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x000A0000 ); // bool field
+ aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x01040104 ); // bool field
+ aPropOpt.AddOpt( ESCHER_Prop_FitTextToShape, 0x00080008 ); // bool field
+ aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x00010000 ); // bool field
+ aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x00080000 ); // bool field
+ aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x000A0000 ); // bool field
aPropOpt.Commit( mrEscherEx.GetStream() );
XclExpDffDropDownAnchor( rObjMgr.GetRoot(), rPos ).WriteDffData( mrEscherEx );
@@ -598,10 +598,10 @@ XclObjOle::~XclObjOle()
void XclObjOle::WriteSubRecs( XclExpStream& rStrm )
{
// write only as embedded, not linked
- String aStorageName( RTL_CONSTASCII_USTRINGPARAM( "MBD" ) );
- sal_Char aBuf[ sizeof(UINT32) * 2 + 1 ];
+ String aStorageName( RTL_CONSTASCII_USTRINGPARAM( "MBD" ) );
+ sal_Char aBuf[ sizeof(UINT32) * 2 + 1 ];
// FIXME Eeek! Is this just a way to get a unique id?
- UINT32 nPictureId = UINT32(sal_uIntPtr(this) >> 2);
+ UINT32 nPictureId = UINT32(sal_uIntPtr(this) >> 2);
sprintf( aBuf, "%08X", static_cast< unsigned int >( nPictureId ) ); // #100211# - checked
aStorageName.AppendAscii( aBuf );
SotStorageRef xOleStg = pRootStorage->OpenSotStorage( aStorageName,
@@ -613,8 +613,8 @@ void XclObjOle::WriteSubRecs( XclExpStream& rStrm )
{
// set version to "old" version, because it must be
// saved in MS notation.
- UINT32 nFl = 0;
- SvtFilterOptions* pFltOpts = SvtFilterOptions::Get();
+ UINT32 nFl = 0;
+ SvtFilterOptions* pFltOpts = SvtFilterOptions::Get();
if( pFltOpts )
{
if( pFltOpts->IsMath2MathType() )
@@ -630,7 +630,7 @@ void XclObjOle::WriteSubRecs( XclExpStream& rStrm )
nFl |= OLE_STARIMPRESS_2_POWERPOINT;
}
- SvxMSExportOLEObjects aOLEExpFilt( nFl );
+ SvxMSExportOLEObjects aOLEExpFilt( nFl );
aOLEExpFilt.ExportOLEObject( xObj, *xOleStg );
// OBJCF subrecord, undocumented as usual
@@ -702,19 +702,19 @@ void XclObjAny::Save( XclExpStream& rStrm )
ExcBof8_Base::ExcBof8_Base()
{
- nVers = 0x0600;
- nRupBuild = 0x0dbb;
- nRupYear = 0x07cc;
-// nFileHistory = 0x00000001; // last edited by Microsoft Excel for Windows
- nFileHistory = 0x00000000;
- nLowestBiffVer = 0x00000006; // Biff8
+ nVers = 0x0600;
+ nRupBuild = 0x0dbb;
+ nRupYear = 0x07cc;
+// nFileHistory = 0x00000001; // last edited by Microsoft Excel for Windows
+ nFileHistory = 0x00000000;
+ nLowestBiffVer = 0x00000006; // Biff8
}
void ExcBof8_Base::SaveCont( XclExpStream& rStrm )
{
rStrm.DisableEncryption();
- rStrm << nVers << nDocType << nRupBuild << nRupYear
+ rStrm << nVers << nDocType << nRupBuild << nRupYear
<< nFileHistory << nLowestBiffVer;
}
@@ -781,7 +781,7 @@ void ExcBundlesheet8::SaveCont( XclExpStream& rStrm )
sal_Size ExcBundlesheet8::GetLen() const
-{ // Text max 255 chars
+{ // Text max 255 chars
return 8 + GetName().GetBufferSize();
}
@@ -882,10 +882,10 @@ void ExcEScenarioCell::SaveXml( XclExpXmlStream& rStrm )
ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab )
{
- String sTmpName;
- String sTmpComm;
- Color aDummyCol;
- USHORT nFlags;
+ String sTmpName;
+ String sTmpComm;
+ Color aDummyCol;
+ USHORT nFlags;
ScDocument& rDoc = rRoot.GetDoc();
rDoc.GetName( nTab, sTmpName );
@@ -905,11 +905,11 @@ ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab )
if( !pRList )
return;
- BOOL bContLoop = TRUE;
- SCROW nRow;
- SCCOL nCol;
- String sText;
- double fVal;
+ BOOL bContLoop = TRUE;
+ SCROW nRow;
+ SCCOL nCol;
+ String sText;
+ double fVal;
for( UINT32 nRange = 0; (nRange < pRList->Count()) && bContLoop; nRange++ )
{
@@ -953,9 +953,9 @@ BOOL ExcEScenario::Append( UINT16 nCol, UINT16 nRow, const String& rTxt )
void ExcEScenario::SaveCont( XclExpStream& rStrm )
{
- rStrm << (UINT16) List::Count() // number of cells
- << nProtected // fProtection
- << (UINT8) 0 // fHidden
+ rStrm << (UINT16) List::Count() // number of cells
+ << nProtected // fProtection
+ << (UINT8) 0 // fHidden
<< (UINT8) sName.Len() // length of scen name
<< (UINT8) sComment.Len() // length of comment
<< (UINT8) sUserName.Len(); // length of user name
@@ -969,9 +969,9 @@ void ExcEScenario::SaveCont( XclExpStream& rStrm )
ExcEScenarioCell* pCell;
for( pCell = _First(); pCell; pCell = _Next() )
- pCell->WriteAddress( rStrm ); // pos of cell
+ pCell->WriteAddress( rStrm ); // pos of cell
for( pCell = _First(); pCell; pCell = _Next() )
- pCell->WriteText( rStrm ); // string content
+ pCell->WriteText( rStrm ); // string content
rStrm.SetSliceSize( 2 );
rStrm.WriteZeroBytes( 2 * List::Count() ); // date format
}
@@ -1014,8 +1014,8 @@ ExcEScenarioManager::ExcEScenarioManager( const XclExpRoot& rRoot, SCTAB nTab )
if( rDoc.IsScenario( nTab ) )
return;
- SCTAB nFirstTab = nTab + 1;
- SCTAB nNewTab = nFirstTab;
+ SCTAB nFirstTab = nTab + 1;
+ SCTAB nNewTab = nFirstTab;
while( rDoc.IsScenario( nNewTab ) )
{
@@ -1035,10 +1035,10 @@ ExcEScenarioManager::~ExcEScenarioManager()
void ExcEScenarioManager::SaveCont( XclExpStream& rStrm )
{
- rStrm << (UINT16) List::Count() // number of scenarios
- << nActive // active scen
- << nActive // last displayed
- << (UINT16) 0; // reference areas
+ rStrm << (UINT16) List::Count() // number of scenarios
+ << nActive // active scen
+ << nActive // last displayed
+ << (UINT16) 0; // reference areas
}
void ExcEScenarioManager::Save( XclExpStream& rStrm )
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
index b124e77ac745..de4213b5c2e7 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx
index 8fe5a7f1db1c..6f59f42a080c 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
index 9826e8385075..9df815a66bf3 100644
--- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
+++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +62,15 @@ ScXMLCellRangeSourceContext::ScXMLCellRangeSourceContext(
{
if( !xAttrList.is() ) return;
- sal_Int16 nAttrCount = xAttrList->getLength();
- const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableCellRangeSourceAttrTokenMap();
+ sal_Int16 nAttrCount = xAttrList->getLength();
+ const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableCellRangeSourceAttrTokenMap();
for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex )
{
const rtl::OUString& sAttrName(xAttrList->getNameByIndex( nIndex ));
const OUString& sValue(xAttrList->getValueByIndex( nIndex ));
OUString aLocalName;
- USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
{
diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx
index fde1b5534134..46ef4b9072a7 100644
--- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx
+++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +37,13 @@ class ScXMLImport;
struct ScMyImpCellRangeSource
{
- ::rtl::OUString sSourceStr;
- ::rtl::OUString sFilterName;
- ::rtl::OUString sFilterOptions;
- ::rtl::OUString sURL;
- sal_Int32 nColumns;
- sal_Int32 nRows;
- sal_Int32 nRefresh;
+ ::rtl::OUString sSourceStr;
+ ::rtl::OUString sFilterName;
+ ::rtl::OUString sFilterOptions;
+ ::rtl::OUString sURL;
+ sal_Int32 nColumns;
+ sal_Int32 nRows;
+ sal_Int32 nRefresh;
ScMyImpCellRangeSource();
};
@@ -54,8 +54,8 @@ struct ScMyImpCellRangeSource
class ScXMLCellRangeSourceContext : public SvXMLImportContext
{
private:
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
- ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
+ const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
+ ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
ScXMLCellRangeSourceContext(
@@ -65,14 +65,14 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
ScMyImpCellRangeSource* pCellRangeSource
);
- virtual ~ScXMLCellRangeSourceContext();
+ virtual ~ScXMLCellRangeSourceContext();
- virtual SvXMLImportContext* CreateChildContext(
+ virtual SvXMLImportContext* CreateChildContext(
USHORT nPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList
);
- virtual void EndElement();
+ virtual void EndElement();
};
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
index 5cd97e0714a9..96c4645ac869 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -126,7 +126,7 @@ void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction* pAction
{
SvXMLElementExport aCreatorElem( rExport, XML_NAMESPACE_DC,
- XML_CREATOR, sal_True,
+ XML_CREATOR, sal_True,
sal_False );
rtl::OUString sAuthor(pAction->GetUser());
rExport.Characters(sAuthor);
@@ -136,10 +136,10 @@ void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction* pAction
rtl::OUStringBuffer sDate;
ScXMLConverter::ConvertDateTimeToString(pAction->GetDateTimeUTC(), sDate);
SvXMLElementExport aDateElem( rExport, XML_NAMESPACE_DC,
- XML_DATE, sal_True,
+ XML_DATE, sal_True,
sal_False );
rExport.Characters(sDate.makeStringAndClear());
- }
+ }
rtl::OUString sComment(pAction->GetComment());
if (sComment.getLength())
@@ -333,7 +333,7 @@ void ScChangeTrackingExportHelper::WriteValueCell(const ScBaseCell* pCell, const
{
SetValueAttributes(pValueCell->GetValue(), sValue);
SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, sal_True, sal_True);
-/* if (sValue.Len())
+/* if (sValue.Len())
{
SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False);
sal_Bool bPrevCharWasSpace(sal_True);
@@ -419,12 +419,12 @@ void ScChangeTrackingExportHelper::WriteFormulaCell(const ScBaseCell* pCell, con
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_MATRIX_COVERED, XML_TRUE);
}
rtl::OUString sMatrixFormula = sOUFormula.copy(1, sOUFormula.getLength() - 2);
- rtl::OUString sQValue = rExport.GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sMatrixFormula, sal_False );
+ rtl::OUString sQValue = rExport.GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sMatrixFormula, sal_False );
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FORMULA, sQValue);
}
else
{
- rtl::OUString sQValue = rExport.GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sFormula, sal_False );
+ rtl::OUString sQValue = rExport.GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sFormula, sal_False );
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FORMULA, sQValue);
}
if (pFormulaCell->IsValue())
@@ -792,7 +792,7 @@ void ScChangeTrackingExportHelper::CollectAndWriteChanges()
{
if (pChangeTrack)
{
-/* if (pChangeTrack->IsProtected())
+/* if (pChangeTrack->IsProtected())
{
rtl::OUStringBuffer aBuffer;
SvXMLUnitConverter::encodeBase64(aBuffer, pChangeTrack->GetProtection());
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
index f07f0ed905a0..0074a2f2f0ed 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ typedef std::list<ScChangeActionDel*> ScMyDeletionsList;
class ScChangeTrackingExportHelper
{
- ScXMLExport& rExport;
+ ScXMLExport& rExport;
- ScChangeTrack* pChangeTrack;
+ ScChangeTrack* pChangeTrack;
ScEditEngineTextObj* pEditTextObj;
ScChangeActionTable* pDependings;
- rtl::OUString sChangeIDPrefix;
- com::sun::star::uno::Reference<com::sun::star::text::XText> xText;
+ rtl::OUString sChangeIDPrefix;
+ com::sun::star::uno::Reference<com::sun::star::text::XText> xText;
rtl::OUString GetChangeID(const sal_uInt32 nActionNumber);
void GetAcceptanceState(const ScChangeAction* pAction);
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index d928444dd8ce..5e10ad9c7cf0 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -480,7 +480,7 @@ void ScXMLChangeTrackingImportHelper::ConvertInfo(const ScMyActionInfo& aInfo, S
rUser = aInfo.sUser; // shouldn't happen
}
-ScChangeAction* ScXMLChangeTrackingImportHelper::CreateInsertAction(ScMyInsAction* pAction)
+ScChangeAction* ScXMLChangeTrackingImportHelper::CreateInsertAction(ScMyInsAction* pAction)
{
DateTime aDateTime( Date(0), Time(0) );
String aUser;
@@ -493,7 +493,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateInsertAction(ScMyInsActio
return pNewAction;
}
-ScChangeAction* ScXMLChangeTrackingImportHelper::CreateDeleteAction(ScMyDelAction* pAction)
+ScChangeAction* ScXMLChangeTrackingImportHelper::CreateDeleteAction(ScMyDelAction* pAction)
{
DateTime aDateTime( Date(0), Time(0) );
String aUser;
@@ -506,7 +506,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateDeleteAction(ScMyDelActio
return pNewAction;
}
-ScChangeAction* ScXMLChangeTrackingImportHelper::CreateMoveAction(ScMyMoveAction* pAction)
+ScChangeAction* ScXMLChangeTrackingImportHelper::CreateMoveAction(ScMyMoveAction* pAction)
{
DBG_ASSERT(pAction->pMoveRanges, "no move ranges");
if (pAction->pMoveRanges)
@@ -524,7 +524,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateMoveAction(ScMyMoveAction
return NULL;
}
-ScChangeAction* ScXMLChangeTrackingImportHelper::CreateRejectionAction(ScMyRejAction* pAction)
+ScChangeAction* ScXMLChangeTrackingImportHelper::CreateRejectionAction(ScMyRejAction* pAction)
{
DateTime aDateTime( Date(0), Time(0) );
String aUser;
@@ -537,7 +537,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateRejectionAction(ScMyRejAc
return pNewAction;
}
-ScChangeAction* ScXMLChangeTrackingImportHelper::CreateContentAction(ScMyContentAction* pAction)
+ScChangeAction* ScXMLChangeTrackingImportHelper::CreateContentAction(ScMyContentAction* pAction)
{
ScBaseCell* pCell = NULL;
if (pAction->pCellInfo)
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
index 9857683b13ac..f9b6982a3b6f 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +81,9 @@ typedef std::list<ScMyDeleted*> ScMyDeletedList;
struct ScMyGenerated
{
- ScBigRange aBigRange;
- sal_uInt32 nID;
- ScMyCellInfo* pCellInfo;
+ ScBigRange aBigRange;
+ sal_uInt32 nID;
+ ScMyCellInfo* pCellInfo;
ScMyGenerated(ScMyCellInfo* pCellInfo, const ScBigRange& aBigRange);
~ScMyGenerated();
@@ -167,7 +167,7 @@ struct ScMyMoveAction : public ScMyBaseAction
struct ScMyContentAction : public ScMyBaseAction
{
- ScMyCellInfo* pCellInfo;
+ ScMyCellInfo* pCellInfo;
ScMyContentAction();
~ScMyContentAction();
@@ -185,25 +185,25 @@ class ScChangeViewSettings;
class ScXMLChangeTrackingImportHelper
{
- ScStrCollection aUsers;
- ScMyActions aActions;
- com::sun::star::uno::Sequence<sal_Int8> aProtect;
- ScDocument* pDoc;
- ScChangeTrack* pTrack;
- ScMyBaseAction* pCurrentAction;
- rtl::OUString sIDPrefix;
- sal_uInt32 nPrefixLength;
- sal_Int16 nMultiSpanned;
- sal_Int16 nMultiSpannedSlaveCount;
- sal_Bool bChangeTrack;
+ ScStrCollection aUsers;
+ ScMyActions aActions;
+ com::sun::star::uno::Sequence<sal_Int8> aProtect;
+ ScDocument* pDoc;
+ ScChangeTrack* pTrack;
+ ScMyBaseAction* pCurrentAction;
+ rtl::OUString sIDPrefix;
+ sal_uInt32 nPrefixLength;
+ sal_Int16 nMultiSpanned;
+ sal_Int16 nMultiSpannedSlaveCount;
+ sal_Bool bChangeTrack;
private:
void ConvertInfo(const ScMyActionInfo& aInfo, String& rUser, DateTime& aDateTime);
- ScChangeAction* CreateInsertAction(ScMyInsAction* pAction);
- ScChangeAction* CreateDeleteAction(ScMyDelAction* pAction);
- ScChangeAction* CreateMoveAction(ScMyMoveAction* pAction);
- ScChangeAction* CreateRejectionAction(ScMyRejAction* pAction);
- ScChangeAction* CreateContentAction(ScMyContentAction* pAction);
+ ScChangeAction* CreateInsertAction(ScMyInsAction* pAction);
+ ScChangeAction* CreateDeleteAction(ScMyDelAction* pAction);
+ ScChangeAction* CreateMoveAction(ScMyMoveAction* pAction);
+ ScChangeAction* CreateRejectionAction(ScMyRejAction* pAction);
+ ScChangeAction* CreateContentAction(ScMyContentAction* pAction);
void CreateGeneratedActions(ScMyGeneratedList& rList);
diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx
index ca4bac7eb511..d65800c49a64 100755
--- a/sc/source/filter/xml/XMLCodeNameProvider.cxx
+++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,18 +61,18 @@ sal_Bool XMLCodeNameProvider::_getCodeName( const uno::Any& aAny, String& rCodeN
}
-XMLCodeNameProvider::XMLCodeNameProvider( ScDocument* pDoc ) :
- mpDoc( pDoc ),
+XMLCodeNameProvider::XMLCodeNameProvider( ScDocument* pDoc ) :
+ mpDoc( pDoc ),
msDocName( RTL_CONSTASCII_USTRINGPARAM("*doc*") ),
msCodeNameProp( RTL_CONSTASCII_USTRINGPARAM("CodeName") )
{
}
-XMLCodeNameProvider::~XMLCodeNameProvider()
+XMLCodeNameProvider::~XMLCodeNameProvider()
{
}
-::sal_Bool SAL_CALL XMLCodeNameProvider::hasByName( const OUString& aName )
+::sal_Bool SAL_CALL XMLCodeNameProvider::hasByName( const OUString& aName )
throw (uno::RuntimeException )
{
if( aName == msDocName )
@@ -94,7 +94,7 @@ XMLCodeNameProvider::~XMLCodeNameProvider()
}
uno::Any SAL_CALL XMLCodeNameProvider::getByName( const OUString& aName )
- throw (container::NoSuchElementException,
+ throw (container::NoSuchElementException,
lang::WrappedTargetException, uno::RuntimeException)
{
uno::Any aRet;
@@ -130,7 +130,7 @@ uno::Sequence< OUString > SAL_CALL XMLCodeNameProvider::getElementNames( )
throw (uno::RuntimeException)
{
SCTAB nCount = mpDoc->GetTableCount() + 1;
- uno::Sequence< rtl::OUString > aNames( nCount );
+ uno::Sequence< rtl::OUString > aNames( nCount );
sal_Int32 nRealCount = 0;
if( mpDoc->GetCodeName().Len() )
@@ -193,7 +193,7 @@ void XMLCodeNameProvider::set( const uno::Reference< container::XNameAccess>& xN
String sSheetName;
for( SCTAB i = 0; i < nCount; i++ )
{
- if( pDoc->GetName( i, sSheetName ) &&
+ if( pDoc->GetName( i, sSheetName ) &&
xNameAccess->hasByName( sSheetName ) )
{
aAny = xNameAccess->getByName( sSheetName );
diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx b/sc/source/filter/xml/XMLCodeNameProvider.hxx
index 39d84409c555..b90acddd6d83 100755
--- a/sc/source/filter/xml/XMLCodeNameProvider.hxx
+++ b/sc/source/filter/xml/XMLCodeNameProvider.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 XMLCodeNameProvider : public ::cppu::WeakImplHelper1< ::com::sun::star::co
::rtl::OUString msDocName;
::rtl::OUString msCodeNameProp;
- static sal_Bool _getCodeName( const ::com::sun::star::uno::Any& aAny,
+ static sal_Bool _getCodeName( const ::com::sun::star::uno::Any& aAny,
String& rCodeName );
public:
XMLCodeNameProvider( ScDocument* pDoc );
virtual ~XMLCodeNameProvider();
- virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName )
+ virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName )
throw (::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName )
- throw (::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
+ 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( )
diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx b/sc/source/filter/xml/XMLColumnRowGroupExport.cxx
index 4c2929de02e3..6c179692c5d9 100644
--- a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx
+++ b/sc/source/filter/xml/XMLColumnRowGroupExport.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +89,9 @@ sal_Bool ScMyOpenCloseColumnRowGroup::IsGroupStart(const sal_Int32 nField)
sal_Int32 nItrField = aItr->nField;
if ( nItrField < nField )
{
- // #103327# when used to find repeated rows at the beginning of a group,
- // aTableStart may contain entries before nField. They must be skipped here
- // (they will be used for OpenGroups later in the right order).
+ // #103327# when used to find repeated rows at the beginning of a group,
+ // aTableStart may contain entries before nField. They must be skipped here
+ // (they will be used for OpenGroups later in the right order).
ScMyColumnRowGroupVec::iterator aEnd(aTableStart.end());
while ( aItr != aEnd && nItrField < nField )
diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx
index 51a93445ccfb..56dff063cabf 100644
--- a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx
+++ b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +34,9 @@
struct ScMyColumnRowGroup
{
- sal_Int32 nField;
- sal_Int16 nLevel;
- sal_Bool bDisplay;
+ sal_Int32 nField;
+ sal_Int16 nLevel;
+ sal_Bool bDisplay;
ScMyColumnRowGroup();
sal_Bool operator< (const ScMyColumnRowGroup& rGroup) const;
@@ -48,10 +48,10 @@ typedef std::list <sal_Int32> ScMyFieldGroupVec;
class ScXMLExport;
class ScMyOpenCloseColumnRowGroup
{
- ScXMLExport& rExport;
- const rtl::OUString rName;
- ScMyColumnRowGroupVec aTableStart;
- ScMyFieldGroupVec aTableEnd;
+ ScXMLExport& rExport;
+ const rtl::OUString rName;
+ ScMyColumnRowGroupVec aTableStart;
+ ScMyFieldGroupVec aTableEnd;
void OpenGroup(const ScMyColumnRowGroup& rGroup);
void CloseGroup();
diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx
index 0ca5fc360533..0cd0dc5b9ee2 100644
--- a/sc/source/filter/xml/XMLConsolidationContext.cxx
+++ b/sc/source/filter/xml/XMLConsolidationContext.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +59,15 @@ ScXMLConsolidationContext::ScXMLConsolidationContext(
rImport.LockSolarMutex();
if( !xAttrList.is() ) return;
- sal_Int16 nAttrCount = xAttrList->getLength();
- const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetConsolidationAttrTokenMap();
+ sal_Int16 nAttrCount = xAttrList->getLength();
+ const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetConsolidationAttrTokenMap();
for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex )
{
- const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex ));
- const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex ));
+ const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex ));
+ const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex ));
OUString aLocalName;
- USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
{
@@ -129,7 +129,7 @@ void ScXMLConsolidationContext::EndElement()
if ( !ScRangeStringConverter::GetAreaFromString(
*ppAreas[ nIndex ], sSourceList, GetScImport().GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffset ) )
{
- bError = sal_True; //! handle error
+ bError = sal_True; //! handle error
}
}
diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx
index 52061c715ae7..619951cef441 100644
--- a/sc/source/filter/xml/XMLConsolidationContext.hxx
+++ b/sc/source/filter/xml/XMLConsolidationContext.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +40,16 @@ class ScXMLImport;
class ScXMLConsolidationContext : public SvXMLImportContext
{
private:
- ::rtl::OUString sSourceList;
- ::rtl::OUString sUseLabel;
- ScAddress aTargetAddr;
- ScSubTotalFunc eFunction;
- sal_Bool bLinkToSource;
- sal_Bool bTargetAddr;
+ ::rtl::OUString sSourceList;
+ ::rtl::OUString sUseLabel;
+ ScAddress aTargetAddr;
+ ScSubTotalFunc eFunction;
+ sal_Bool bLinkToSource;
+ sal_Bool bTargetAddr;
protected:
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
- ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
+ const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
+ ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
ScXMLConsolidationContext(
@@ -58,14 +58,14 @@ public:
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList
);
- virtual ~ScXMLConsolidationContext();
+ virtual ~ScXMLConsolidationContext();
- virtual SvXMLImportContext* CreateChildContext(
+ virtual SvXMLImportContext* CreateChildContext(
USHORT nPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList
);
- virtual void EndElement();
+ virtual void EndElement();
};
diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx
index 4de6246f4f28..ee14e3bb5f3d 100644
--- a/sc/source/filter/xml/XMLConverter.cxx
+++ b/sc/source/filter/xml/XMLConverter.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using namespace xmloff::token;
//___________________________________________________________________
-ScDocument* ScXMLConverter::GetScDocument( uno::Reference< frame::XModel > xModel )
+ScDocument* ScXMLConverter::GetScDocument( uno::Reference< frame::XModel > xModel )
{
if (xModel.is())
{
@@ -127,19 +127,19 @@ void ScXMLConverter::GetStringFromFunction(
OUString sFuncStr;
switch( eFunction )
{
- case sheet::GeneralFunction_AUTO: sFuncStr = GetXMLToken( XML_AUTO ); break;
- case sheet::GeneralFunction_AVERAGE: sFuncStr = GetXMLToken( XML_AVERAGE ); break;
- case sheet::GeneralFunction_COUNT: sFuncStr = GetXMLToken( XML_COUNT ); break;
- case sheet::GeneralFunction_COUNTNUMS: sFuncStr = GetXMLToken( XML_COUNTNUMS ); break;
- case sheet::GeneralFunction_MAX: sFuncStr = GetXMLToken( XML_MAX ); break;
- case sheet::GeneralFunction_MIN: sFuncStr = GetXMLToken( XML_MIN ); break;
- case sheet::GeneralFunction_NONE: sFuncStr = GetXMLToken( XML_NONE ); break;
- case sheet::GeneralFunction_PRODUCT: sFuncStr = GetXMLToken( XML_PRODUCT ); break;
- case sheet::GeneralFunction_STDEV: sFuncStr = GetXMLToken( XML_STDEV ); break;
- case sheet::GeneralFunction_STDEVP: sFuncStr = GetXMLToken( XML_STDEVP ); break;
- case sheet::GeneralFunction_SUM: sFuncStr = GetXMLToken( XML_SUM ); break;
- case sheet::GeneralFunction_VAR: sFuncStr = GetXMLToken( XML_VAR ); break;
- case sheet::GeneralFunction_VARP: sFuncStr = GetXMLToken( XML_VARP ); break;
+ case sheet::GeneralFunction_AUTO: sFuncStr = GetXMLToken( XML_AUTO ); break;
+ case sheet::GeneralFunction_AVERAGE: sFuncStr = GetXMLToken( XML_AVERAGE ); break;
+ case sheet::GeneralFunction_COUNT: sFuncStr = GetXMLToken( XML_COUNT ); break;
+ case sheet::GeneralFunction_COUNTNUMS: sFuncStr = GetXMLToken( XML_COUNTNUMS ); break;
+ case sheet::GeneralFunction_MAX: sFuncStr = GetXMLToken( XML_MAX ); break;
+ case sheet::GeneralFunction_MIN: sFuncStr = GetXMLToken( XML_MIN ); break;
+ case sheet::GeneralFunction_NONE: sFuncStr = GetXMLToken( XML_NONE ); break;
+ case sheet::GeneralFunction_PRODUCT: sFuncStr = GetXMLToken( XML_PRODUCT ); break;
+ case sheet::GeneralFunction_STDEV: sFuncStr = GetXMLToken( XML_STDEV ); break;
+ case sheet::GeneralFunction_STDEVP: sFuncStr = GetXMLToken( XML_STDEVP ); break;
+ case sheet::GeneralFunction_SUM: sFuncStr = GetXMLToken( XML_SUM ); break;
+ case sheet::GeneralFunction_VAR: sFuncStr = GetXMLToken( XML_VAR ); break;
+ case sheet::GeneralFunction_VARP: sFuncStr = GetXMLToken( XML_VARP ); break;
default:
{
// added to avoid warnings
@@ -156,18 +156,18 @@ void ScXMLConverter::GetStringFromFunction(
OUString sFuncStr;
switch( eFunction )
{
- case SUBTOTAL_FUNC_AVE: sFuncStr = GetXMLToken( XML_AVERAGE ); break;
- case SUBTOTAL_FUNC_CNT: sFuncStr = GetXMLToken( XML_COUNT ); break;
- case SUBTOTAL_FUNC_CNT2: sFuncStr = GetXMLToken( XML_COUNTNUMS ); break;
- case SUBTOTAL_FUNC_MAX: sFuncStr = GetXMLToken( XML_MAX ); break;
- case SUBTOTAL_FUNC_MIN: sFuncStr = GetXMLToken( XML_MIN ); break;
- case SUBTOTAL_FUNC_NONE: sFuncStr = GetXMLToken( XML_NONE ); break;
- case SUBTOTAL_FUNC_PROD: sFuncStr = GetXMLToken( XML_PRODUCT ); break;
- case SUBTOTAL_FUNC_STD: sFuncStr = GetXMLToken( XML_STDEV ); break;
- case SUBTOTAL_FUNC_STDP: sFuncStr = GetXMLToken( XML_STDEVP ); break;
- case SUBTOTAL_FUNC_SUM: sFuncStr = GetXMLToken( XML_SUM ); break;
- case SUBTOTAL_FUNC_VAR: sFuncStr = GetXMLToken( XML_VAR ); break;
- case SUBTOTAL_FUNC_VARP: sFuncStr = GetXMLToken( XML_VARP ); break;
+ case SUBTOTAL_FUNC_AVE: sFuncStr = GetXMLToken( XML_AVERAGE ); break;
+ case SUBTOTAL_FUNC_CNT: sFuncStr = GetXMLToken( XML_COUNT ); break;
+ case SUBTOTAL_FUNC_CNT2: sFuncStr = GetXMLToken( XML_COUNTNUMS ); break;
+ case SUBTOTAL_FUNC_MAX: sFuncStr = GetXMLToken( XML_MAX ); break;
+ case SUBTOTAL_FUNC_MIN: sFuncStr = GetXMLToken( XML_MIN ); break;
+ case SUBTOTAL_FUNC_NONE: sFuncStr = GetXMLToken( XML_NONE ); break;
+ case SUBTOTAL_FUNC_PROD: sFuncStr = GetXMLToken( XML_PRODUCT ); break;
+ case SUBTOTAL_FUNC_STD: sFuncStr = GetXMLToken( XML_STDEV ); break;
+ case SUBTOTAL_FUNC_STDP: sFuncStr = GetXMLToken( XML_STDEVP ); break;
+ case SUBTOTAL_FUNC_SUM: sFuncStr = GetXMLToken( XML_SUM ); break;
+ case SUBTOTAL_FUNC_VAR: sFuncStr = GetXMLToken( XML_VAR ); break;
+ case SUBTOTAL_FUNC_VARP: sFuncStr = GetXMLToken( XML_VARP ); break;
}
ScRangeStringConverter::AssignString( rString, sFuncStr, bAppendStr );
}
@@ -332,7 +332,7 @@ void ScXMLConverter::ParseFormula(OUString& sFormula, const sal_Bool bIsFormula)
++nCountBraces;
else if (sFormula[i] == ']')
nCountBraces--;
- else if ((sFormula[i] != '.') ||
+ else if ((sFormula[i] != '.') ||
((nCountBraces == 0) && bIsFormula) ||
!((chPrevious == '[') || (chPrevious == ':') || (chPrevious == ' ') || (chPrevious == '=')))
sBuffer.append(sFormula[i]);
diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx
index 94766ebe08ff..3cbb0859fec8 100644
--- a/sc/source/filter/xml/XMLConverter.hxx
+++ b/sc/source/filter/xml/XMLConverter.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +49,11 @@ class SvXMLUnitConverter;
class ScXMLConverter
{
public:
- inline ScXMLConverter() {}
- inline ~ScXMLConverter() {}
+ inline ScXMLConverter() {}
+ inline ~ScXMLConverter() {}
// helper methods
- static ScDocument* GetScDocument(
+ static ScDocument* GetScDocument(
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel );
// IMPORT: GeneralFunction / ScSubTotalFunc
@@ -64,11 +64,11 @@ public:
const ::rtl::OUString& rString );
// EXPORT: GeneralFunction / ScSubTotalFunc
- static void GetStringFromFunction(
+ static void GetStringFromFunction(
::rtl::OUString& rString,
const ::com::sun::star::sheet::GeneralFunction eFunction,
sal_Bool bAppendStr = sal_False );
- static void GetStringFromFunction(
+ static void GetStringFromFunction(
::rtl::OUString& rString,
const ScSubTotalFunc eFunction,
sal_Bool bAppendStr = sal_False );
@@ -79,7 +79,7 @@ public:
const ::rtl::OUString& rString );
// EXPORT: DataPilotFieldOrientation
- static void GetStringFromOrientation(
+ static void GetStringFromOrientation(
::rtl::OUString& rString,
const ::com::sun::star::sheet::DataPilotFieldOrientation eOrientation,
sal_Bool bAppendStr = sal_False );
@@ -88,30 +88,30 @@ public:
static ScDetectiveObjType
GetDetObjTypeFromString(
const ::rtl::OUString& rString );
- static sal_Bool GetDetOpTypeFromString(
+ static sal_Bool GetDetOpTypeFromString(
ScDetOpType& rDetOpType,
const ::rtl::OUString& rString );
// EXPORT: Detective
- static void GetStringFromDetObjType(
+ static void GetStringFromDetObjType(
::rtl::OUString& rString,
const ScDetectiveObjType eObjType,
sal_Bool bAppendStr = sal_False );
- static void GetStringFromDetOpType(
+ static void GetStringFromDetOpType(
::rtl::OUString& rString,
const ScDetOpType eOpType,
sal_Bool bAppendStr = sal_False );
// IMPORT: Formulas
- static void ParseFormula(
+ static void ParseFormula(
::rtl::OUString& sFormula,
const sal_Bool bIsFormula = sal_True);
// EXPORT: Core Date Time
- static void ConvertDateTimeToString(const DateTime& aDateTime, rtl::OUStringBuffer& sDate);
+ static void ConvertDateTimeToString(const DateTime& aDateTime, rtl::OUStringBuffer& sDate);
//UNUSED2008-05 // IMPORT: Core Date Time
//UNUSED2008-05 static void ConvertStringToDateTime(const rtl::OUString& sDate, DateTime& aDateTime, SvXMLUnitConverter* pUnitConverter);
- static void ConvertCoreToAPIDateTime(const DateTime& aDateTime, com::sun::star::util::DateTime& rDateTime);
+ static void ConvertCoreToAPIDateTime(const DateTime& aDateTime, com::sun::star::util::DateTime& rDateTime);
static void ConvertAPIToCoreDateTime(const com::sun::star::util::DateTime& aDateTime, DateTime& rDateTime);
};
diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx
index d7fafe1d9423..51fe5bb2526a 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.cxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -162,10 +162,10 @@ void ScXMLDDELinkContext::EndElement()
{
bool bSizeMatch = (static_cast<size_t>(nColumns * nRows) == aDDELinkTable.size());
DBG_ASSERT( bSizeMatch, "ScXMLDDELinkContext::EndElement: matrix dimension doesn't match cells count");
- // Excel writes bad ODF in that it does not write the
+ // Excel writes bad ODF in that it does not write the
// table:number-columns-repeated attribute of the
- // <table:table-column> element, but apparently uses the number of
- // <table:table-cell> elements within a <table:table-row> element to
+ // <table:table-column> element, but apparently uses the number of
+ // <table:table-cell> elements within a <table:table-row> element to
// determine the column count instead. Be lenient ...
if (!bSizeMatch && nColumns == 1)
{
@@ -217,14 +217,14 @@ ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rImport,
{
if( !xAttrList.is() ) return;
- sal_Int16 nAttrCount = xAttrList->getLength();
+ sal_Int16 nAttrCount = xAttrList->getLength();
for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex )
{
- const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex ));
- const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex ));
+ const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex ));
+ const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex ));
OUString aLocalName;
- USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
if (nPrefix == XML_NAMESPACE_OFFICE)
{
@@ -319,14 +319,14 @@ ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport,
if( !xAttrList.is() ) return;
sal_Int32 nCols(1);
- sal_Int16 nAttrCount = xAttrList->getLength();
+ sal_Int16 nAttrCount = xAttrList->getLength();
for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex )
{
- const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex ));
- const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex ));
+ const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex ));
+ const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex ));
OUString aLocalName;
- USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
if (nPrefix == XML_NAMESPACE_TABLE)
if (IsXMLToken(aLocalName, XML_NUMBER_COLUMNS_REPEATED))
@@ -365,14 +365,14 @@ ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport,
{
if( !xAttrList.is() ) return;
- sal_Int16 nAttrCount = xAttrList->getLength();
+ sal_Int16 nAttrCount = xAttrList->getLength();
for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex )
{
- const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex ));
- const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex ));
+ const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex ));
+ const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex ));
OUString aLocalName;
- USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
if (nPrefix == XML_NAMESPACE_TABLE)
if (IsXMLToken(aLocalName, XML_NUMBER_ROWS_REPEATED))
@@ -424,14 +424,14 @@ ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport,
{
if( !xAttrList.is() ) return;
- sal_Int16 nAttrCount = xAttrList->getLength();
+ sal_Int16 nAttrCount = xAttrList->getLength();
for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex )
{
- const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex ));
- const rtl::OUString& sTempValue (xAttrList->getValueByIndex( nIndex ));
+ const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex ));
+ const rtl::OUString& sTempValue (xAttrList->getValueByIndex( nIndex ));
OUString aLocalName;
- USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
if (nPrefix == XML_NAMESPACE_OFFICE)
{
diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx
index e9c1db58548f..57ddb4812368 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.hxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +66,15 @@ typedef std::list<ScDDELinkCell> ScDDELinkCells;
class ScXMLDDELinkContext : public SvXMLImportContext
{
- ScDDELinkCells aDDELinkTable;
- ScDDELinkCells aDDELinkRow;
- rtl::OUString sApplication;
- rtl::OUString sTopic;
- rtl::OUString sItem;
- sal_Int32 nPosition;
- sal_Int32 nColumns;
- sal_Int32 nRows;
- sal_uInt8 nMode;
+ ScDDELinkCells aDDELinkTable;
+ ScDDELinkCells aDDELinkRow;
+ rtl::OUString sApplication;
+ rtl::OUString sTopic;
+ rtl::OUString sItem;
+ sal_Int32 nPosition;
+ sal_Int32 nColumns;
+ sal_Int32 nRows;
+ sal_uInt8 nMode;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -175,8 +175,8 @@ public:
class ScXMLDDERowContext : public SvXMLImportContext
{
- ScXMLDDELinkContext* pDDELink;
- sal_Int32 nRows;
+ ScXMLDDELinkContext* pDDELink;
+ sal_Int32 nRows;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -199,12 +199,12 @@ public:
class ScXMLDDECellContext : public SvXMLImportContext
{
- rtl::OUString sValue;
- double fValue;
- sal_Int32 nCells;
- sal_Bool bString;
- sal_Bool bString2;
- sal_Bool bEmpty;
+ rtl::OUString sValue;
+ double fValue;
+ sal_Int32 nCells;
+ sal_Bool bString;
+ sal_Bool bString2;
+ sal_Bool bEmpty;
ScXMLDDELinkContext* pDDELink;
diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxx
index c127ca518266..d834606b1d1c 100644
--- a/sc/source/filter/xml/XMLDetectiveContext.cxx
+++ b/sc/source/filter/xml/XMLDetectiveContext.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +100,8 @@ SvXMLImportContext *ScXMLDetectiveContext::CreateChildContext(
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList )
{
- SvXMLImportContext* pContext = NULL;
- const SvXMLTokenMap& rTokenMap = GetScImport().GetDetectiveElemTokenMap();
+ SvXMLImportContext* pContext = NULL;
+ const SvXMLTokenMap& rTokenMap = GetScImport().GetDetectiveElemTokenMap();
switch( rTokenMap.Get( nPrefix, rLName ) )
{
@@ -138,15 +138,15 @@ ScXMLDetectiveHighlightedContext::ScXMLDetectiveHighlightedContext(
{
if( !xAttrList.is() ) return;
- sal_Int16 nAttrCount = xAttrList->getLength();
- const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDetectiveHighlightedAttrTokenMap();
+ sal_Int16 nAttrCount = xAttrList->getLength();
+ const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDetectiveHighlightedAttrTokenMap();
for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex )
{
- const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex ));
- const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex ));
+ const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex ));
+ const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex ));
OUString aLocalName;
- USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
{
@@ -218,15 +218,15 @@ ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext(
{
if( !xAttrList.is() ) return;
- sal_Int16 nAttrCount = xAttrList->getLength();
- const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDetectiveOperationAttrTokenMap();
+ sal_Int16 nAttrCount = xAttrList->getLength();
+ const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDetectiveOperationAttrTokenMap();
for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex )
{
- const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex ));
- const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex ));
+ const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex ));
+ const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex ));
OUString aLocalName;
- USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
+ USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
{
diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx
index 30a8bc600bb0..0d499178426b 100644
--- a/sc/source/filter/xml/XMLDetectiveContext.hxx
+++ b/sc/source/filter/xml/XMLDetectiveContext.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +42,9 @@ class ScXMLImport;
struct ScMyImpDetectiveObj
{
- ScRange aSourceRange;
- ScDetectiveObjType eObjType;
- sal_Bool bHasError;
+ ScRange aSourceRange;
+ ScDetectiveObjType eObjType;
+ sal_Bool bHasError;
ScMyImpDetectiveObj();
};
@@ -56,12 +56,12 @@ typedef ::std::vector< ScMyImpDetectiveObj > ScMyImpDetectiveObjVec;
struct ScMyImpDetectiveOp
{
- ScAddress aPosition;
- ScDetOpType eOpType;
- sal_Int32 nIndex;
+ ScAddress aPosition;
+ ScDetOpType eOpType;
+ sal_Int32 nIndex;
- inline ScMyImpDetectiveOp() : nIndex( -1 ) {}
- sal_Bool operator<(const ScMyImpDetectiveOp& rDetOp) const;
+ inline ScMyImpDetectiveOp() : nIndex( -1 ) {}
+ sal_Bool operator<(const ScMyImpDetectiveOp& rDetOp) const;
};
typedef ::std::list< ScMyImpDetectiveOp > ScMyImpDetectiveOpList;
@@ -69,17 +69,17 @@ typedef ::std::list< ScMyImpDetectiveOp > ScMyImpDetectiveOpList;
class ScMyImpDetectiveOpArray
{
private:
- ScMyImpDetectiveOpList aDetectiveOpList;
+ ScMyImpDetectiveOpList aDetectiveOpList;
public:
- inline ScMyImpDetectiveOpArray() :
- aDetectiveOpList() {}
+ inline ScMyImpDetectiveOpArray() :
+ aDetectiveOpList() {}
- inline void AddDetectiveOp( const ScMyImpDetectiveOp& rDetOp )
+ inline void AddDetectiveOp( const ScMyImpDetectiveOp& rDetOp )
{ aDetectiveOpList.push_back( rDetOp ); }
- void Sort();
- sal_Bool GetFirstOp( ScMyImpDetectiveOp& rDetOp );
+ void Sort();
+ sal_Bool GetFirstOp( ScMyImpDetectiveOp& rDetOp );
};
@@ -88,10 +88,10 @@ public:
class ScXMLDetectiveContext : public SvXMLImportContext
{
private:
- ScMyImpDetectiveObjVec* pDetectiveObjVec;
+ ScMyImpDetectiveObjVec* pDetectiveObjVec;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
- ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
+ const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
+ ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
ScXMLDetectiveContext(
@@ -100,14 +100,14 @@ public:
const ::rtl::OUString& rLName,
ScMyImpDetectiveObjVec* pNewDetectiveObjVec
);
- virtual ~ScXMLDetectiveContext();
+ virtual ~ScXMLDetectiveContext();
- virtual SvXMLImportContext* CreateChildContext(
+ virtual SvXMLImportContext* CreateChildContext(
USHORT nPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList
);
- virtual void EndElement();
+ virtual void EndElement();
};
@@ -116,12 +116,12 @@ public:
class ScXMLDetectiveHighlightedContext : public SvXMLImportContext
{
private:
- ScMyImpDetectiveObjVec* pDetectiveObjVec;
- ScMyImpDetectiveObj aDetectiveObj;
- sal_Bool bValid;
+ ScMyImpDetectiveObjVec* pDetectiveObjVec;
+ ScMyImpDetectiveObj aDetectiveObj;
+ sal_Bool bValid;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
- ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
+ const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
+ ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
ScXMLDetectiveHighlightedContext(
@@ -131,14 +131,14 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
ScMyImpDetectiveObjVec* pNewDetectiveObjVec
);
- virtual ~ScXMLDetectiveHighlightedContext();
+ virtual ~ScXMLDetectiveHighlightedContext();
- virtual SvXMLImportContext* CreateChildContext(
+ virtual SvXMLImportContext* CreateChildContext(
USHORT nPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList
);
- virtual void EndElement();
+ virtual void EndElement();
};
@@ -147,11 +147,11 @@ public:
class ScXMLDetectiveOperationContext : public SvXMLImportContext
{
private:
- ScMyImpDetectiveOp aDetectiveOp;
- sal_Bool bHasType;
+ ScMyImpDetectiveOp aDetectiveOp;
+ sal_Bool bHasType;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
- ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
+ const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
+ ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
ScXMLDetectiveOperationContext(
@@ -160,14 +160,14 @@ public:
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList
);
- virtual ~ScXMLDetectiveOperationContext();
+ virtual ~ScXMLDetectiveOperationContext();
- virtual SvXMLImportContext* CreateChildContext(
+ virtual SvXMLImportContext* CreateChildContext(
USHORT nPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList
);
- virtual void EndElement();
+ virtual void EndElement();
};
diff --git a/sc/source/filter/xml/XMLEmptyContext.cxx b/sc/source/filter/xml/XMLEmptyContext.cxx
index dbba2732ecee..57033a66e15b 100644
--- a/sc/source/filter/xml/XMLEmptyContext.cxx
+++ b/sc/source/filter/xml/XMLEmptyContext.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx
index ab8b69ad8403..e2c994731256 100644
--- a/sc/source/filter/xml/XMLEmptyContext.hxx
+++ b/sc/source/filter/xml/XMLEmptyContext.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ class ScXMLImport;
class ScXMLEmptyContext : public SvXMLImportContext
{
- rtl::OUString sPrintRanges;
- sal_Bool bStartFormPage;
+ rtl::OUString sPrintRanges;
+ sal_Bool bStartFormPage;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
diff --git a/sc/source/filter/xml/XMLExportDDELinks.cxx b/sc/source/filter/xml/XMLExportDDELinks.cxx
index a29394bf850b..ef8457825d6e 100644
--- a/sc/source/filter/xml/XMLExportDDELinks.cxx
+++ b/sc/source/filter/xml/XMLExportDDELinks.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/XMLExportDDELinks.hxx b/sc/source/filter/xml/XMLExportDDELinks.hxx
index 245a95934449..72caf1ae1923 100644
--- a/sc/source/filter/xml/XMLExportDDELinks.hxx
+++ b/sc/source/filter/xml/XMLExportDDELinks.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +35,12 @@ class ScXMLExport;
class ScXMLExportDDELinks
{
- ScXMLExport& rExport;
+ ScXMLExport& rExport;
- sal_Bool CellsEqual(const sal_Bool bPrevEmpty, const sal_Bool bPrevString, const String& sPrevValue, const double& fPrevValue,
+ sal_Bool CellsEqual(const sal_Bool bPrevEmpty, const sal_Bool bPrevString, const String& sPrevValue, const double& fPrevValue,
const sal_Bool bEmpty, const sal_Bool bString, const String& sValue, const double& fValue);
- void WriteCell(const sal_Bool bEmpty, const sal_Bool bString, const String& sValue, const double& fValue, const sal_Int32 nRepeat);
- void WriteTable(const sal_Int32 nPos);
+ void WriteCell(const sal_Bool bEmpty, const sal_Bool bString, const String& sValue, const double& fValue, const sal_Int32 nRepeat);
+ void WriteTable(const sal_Int32 nPos);
public:
ScXMLExportDDELinks(ScXMLExport& rExport);
~ScXMLExportDDELinks();
diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
index e43ff21a114d..5aa770bc691a 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -180,7 +180,7 @@ void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam)
if (nQueryEntryCount)
{
// There is never a target range in a data pilot.
-/* if (!aQueryParam.bInplace)
+/* if (!aQueryParam.bInplace)
{
ScAddress aTargetAddress(aQueryParam.nDestCol, aQueryParam.nDestRow, aQueryParam.nDestTab);
rtl::OUString sAddress;
diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxx
index 600d96aa1d73..260e3e3d14fe 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.hxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +45,8 @@ struct ScQueryParam;
class ScXMLExportDataPilot
{
- ScXMLExport& rExport;
- ScDocument* pDoc;
+ ScXMLExport& rExport;
+ ScDocument* pDoc;
rtl::OUString getDPOperatorXML(const ScQueryOp aFilterOperator, const sal_Bool bUseRegularExpressions,
const sal_Bool bIsString, const double dVal, const String& sVal) const;
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index 3c7ee76c41e8..0792e4890d43 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -422,7 +422,7 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans::
else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_COPYOUT) == 0)
bCopyOutputData = ::cppu::any2bool(aSortProperties[i].Value);
// no longer supported
-/* else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_ISCASE) == 0)
+/* else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_ISCASE) == 0)
bIsCaseSensitive = ::cppu::any2bool(aSortProperties[i].Value);*/
else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_ISULIST) == 0)
bIsUserListEnabled = ::cppu::any2bool(aSortProperties[i].Value);
@@ -433,7 +433,7 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans::
else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_SORTFLD) == 0)
aSortProperties[i].Value >>= aSortFields;
// no longer supported
-/* else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_COLLLOC) == 0)
+/* else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_COLLLOC) == 0)
aSortProperties[i].Value >>= aCollatorLocale;
else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_COLLALG) == 0)
aSortProperties[i].Value >>= sCollatorAlgorithm;*/
@@ -450,8 +450,8 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans::
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, sOUCellAddress);
}
// no longer supported
-// if (bIsCaseSensitive)
-// rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE);
+// if (bIsCaseSensitive)
+// rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE);
if (aSortFields[0].IsCaseSensitive)
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE);
@@ -463,7 +463,7 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans::
}
#endif
// no longer supported
-/* if (aCollatorLocale.Language.getLength())
+/* if (aCollatorLocale.Language.getLength())
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_LANGUAGE, aCollatorLocale.Language);
if (aCollatorLocale.Country.getLength())
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_COUNTRY, aCollatorLocale.Country);
@@ -529,9 +529,9 @@ void ScXMLExportDatabaseRanges::WriteSubTotalDescriptor(const com::sun::star::un
if (nSubTotalFields > 0)
{
uno::Reference <beans::XPropertySet> xPropertySet (xSubTotalDescriptor, uno::UNO_QUERY);
-// sal_Bool bEnableUserSortList = sal_False;
-// sal_Bool bSortAscending = sal_True;
-// sal_Int32 nUserSortListIndex = 0;
+// sal_Bool bEnableUserSortList = sal_False;
+// sal_Bool bSortAscending = sal_True;
+// sal_Int32 nUserSortListIndex = 0;
if (xPropertySet.is())
{
if (!::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_BINDFMT)))))
@@ -540,9 +540,9 @@ void ScXMLExportDatabaseRanges::WriteSubTotalDescriptor(const com::sun::star::un
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_PAGE_BREAKS_ON_GROUP_CHANGE, XML_TRUE);
if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE)))))
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE);
-// bSortAscending = ::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SORTASCENDING))));
-// if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ENABLEUSERSORTLIST)))))
-// xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_USERSORTLISTINDEX))) >>= nUserSortListIndex;
+// bSortAscending = ::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SORTASCENDING))));
+// if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ENABLEUSERSORTLIST)))))
+// xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_USERSORTLISTINDEX))) >>= nUserSortListIndex;
}
SvXMLElementExport aElemSTRs(rExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULES, sal_True, sal_True);
rExport.CheckAttrList();
@@ -641,7 +641,7 @@ void ScXMLExportDatabaseRanges::WriteDatabaseRanges(const com::sun::star::uno::R
if (::cppu::any2bool(xPropertySetDatabaseRange->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_STRIPDAT)))))
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_HAS_PERSISTENT_DATA, XML_FALSE);
}
-
+
uno::Reference< sheet::XSheetFilterDescriptor2 > xSheetFilterDescriptor(
xDatabaseRange->getFilterDescriptor(), uno::UNO_QUERY );
uno::Sequence <beans::PropertyValue> aSortProperties(xDatabaseRange->getSortDescriptor());
@@ -654,7 +654,7 @@ void ScXMLExportDatabaseRanges::WriteDatabaseRanges(const com::sun::star::uno::R
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CONTAINS_HEADER, XML_FALSE);
// #98317#; there is no orientation on the filter
-/* table::TableOrientation eFilterOrient(table::TableOrientation_ROWS);
+/* table::TableOrientation eFilterOrient(table::TableOrientation_ROWS);
if (::cppu::any2bool(xFilterProperties->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ORIENT)))))
eFilterOrient = table::TableOrientation_ROWS;*/
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
index a581eb1271f1..85c4ed7dde6e 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 ScMyEmptyDatabaseRangesContainer;
class ScXMLExportDatabaseRanges
{
- ScXMLExport& rExport;
- ScDocument* pDoc;
+ ScXMLExport& rExport;
+ ScDocument* pDoc;
void WriteImportDescriptor(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aImportDescriptor);
rtl::OUString getOperatorXML(const long aFilterOperator, const sal_Bool bUseRegularExpressions) const;
diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx
index 154fdebed95e..10fda216d980 100644
--- a/sc/source/filter/xml/XMLExportIterator.cxx
+++ b/sc/source/filter/xml/XMLExportIterator.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -296,7 +296,7 @@ void ScMyMergedRangesContainer::Sort()
sal_Bool ScMyAreaLink::Compare( const ScMyAreaLink& rAreaLink ) const
{
- return (GetRowCount() == rAreaLink.GetRowCount()) &&
+ return (GetRowCount() == rAreaLink.GetRowCount()) &&
(sFilter == rAreaLink.sFilter) &&
(sFilterOptions == rAreaLink.sFilterOptions) &&
(sURL == rAreaLink.sURL) &&
@@ -732,7 +732,7 @@ void ScMyNotEmptyCellsIterator::SetMatrixCellData( ScMyCell& rMyCell )
rMyCell.nType = table::CellContentType_FORMULA;
break;
default:
- rMyCell.nType = table::CellContentType_EMPTY;
+ rMyCell.nType = table::CellContentType_EMPTY;
}
if (rMyCell.nType == table::CellContentType_FORMULA)
@@ -766,7 +766,7 @@ void ScMyNotEmptyCellsIterator::HasAnnotation(ScMyCell& aCell)
// test - bypass the API
// if (xCellRange.is())
- // aCell.xCell.set(xCellRange->getCellByPosition(aCell.aCellAddress.Column, aCell.aCellAddress.Row));
+ // aCell.xCell.set(xCellRange->getCellByPosition(aCell.aCellAddress.Column, aCell.aCellAddress.Row));
}
void ScMyNotEmptyCellsIterator::SetCurrentTable(const SCTAB nTable,
@@ -816,7 +816,7 @@ void ScMyNotEmptyCellsIterator::SkipTable(SCTAB nSkip)
{
// Skip entries for a sheet that is copied instead of saving normally.
// Cells (including aAnnotations) are handled separately in SetCurrentTable.
-
+
if( pShapes )
pShapes->SkipTable(nSkip);
if( pNoteShapes )
@@ -835,7 +835,7 @@ void ScMyNotEmptyCellsIterator::SkipTable(SCTAB nSkip)
sal_Bool ScMyNotEmptyCellsIterator::GetNext(ScMyCell& aCell, ScFormatRangeStyles* pCellStyles)
{
- table::CellAddress aAddress( nCurrentTable, MAXCOL + 1, MAXROW + 1 );
+ table::CellAddress aAddress( nCurrentTable, MAXCOL + 1, MAXROW + 1 );
UpdateAddress( aAddress );
if( pShapes )
diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx
index dfd3a4d59ac1..1a72075a4a55 100644
--- a/sc/source/filter/xml/XMLExportIterator.hxx
+++ b/sc/source/filter/xml/XMLExportIterator.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +41,10 @@
#include "detfunc.hxx"
#include "detdata.hxx"
-class ScHorizontalCellIterator;
-struct ScMyCell;
-class ScXMLExport;
-class ScFormatRangeStyles;
+class ScHorizontalCellIterator;
+struct ScMyCell;
+class ScXMLExport;
+class ScFormatRangeStyles;
class ScBaseCell;
//==============================================================================
@@ -52,47 +52,47 @@ class ScBaseCell;
class ScMyIteratorBase
{
protected:
- virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) = 0;
+ virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) = 0;
public:
ScMyIteratorBase();
- virtual ~ScMyIteratorBase();
+ virtual ~ScMyIteratorBase();
- virtual void SetCellData( ScMyCell& rMyCell ) = 0;
- virtual void Sort() = 0;
+ virtual void SetCellData( ScMyCell& rMyCell ) = 0;
+ virtual void Sort() = 0;
- virtual void UpdateAddress( ::com::sun::star::table::CellAddress& rCellAddress );
+ virtual void UpdateAddress( ::com::sun::star::table::CellAddress& rCellAddress );
};
//==============================================================================
struct ScMyShape
{
- ScAddress aAddress;
- ScAddress aEndAddress;
+ ScAddress aAddress;
+ ScAddress aEndAddress;
com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape;
sal_Bool operator<(const ScMyShape& aShape) const;
};
-typedef std::list<ScMyShape> ScMyShapeList;
+typedef std::list<ScMyShape> ScMyShapeList;
class ScMyShapesContainer : ScMyIteratorBase
{
private:
- ScMyShapeList aShapeList;
+ ScMyShapeList aShapeList;
protected:
- virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress );
+ virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress );
public:
ScMyShapesContainer();
- virtual ~ScMyShapesContainer();
+ virtual ~ScMyShapesContainer();
using ScMyIteratorBase::UpdateAddress;
- void AddNewShape(const ScMyShape& aShape);
- sal_Bool HasShapes() { return !aShapeList.empty(); }
- const ScMyShapeList* GetShapes() { return &aShapeList; }
- virtual void SetCellData( ScMyCell& rMyCell );
- virtual void Sort();
+ void AddNewShape(const ScMyShape& aShape);
+ sal_Bool HasShapes() { return !aShapeList.empty(); }
+ const ScMyShapeList* GetShapes() { return &aShapeList; }
+ virtual void SetCellData( ScMyCell& rMyCell );
+ virtual void Sort();
void SkipTable(SCTAB nSkip);
};
@@ -104,24 +104,24 @@ struct ScMyNoteShape
sal_Bool operator<(const ScMyNoteShape& aNote) const;
};
-typedef std::list<ScMyNoteShape> ScMyNoteShapeList;
+typedef std::list<ScMyNoteShape> ScMyNoteShapeList;
class ScMyNoteShapesContainer : ScMyIteratorBase
{
private:
- ScMyNoteShapeList aNoteShapeList;
+ ScMyNoteShapeList aNoteShapeList;
protected:
- virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress );
+ virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress );
public:
ScMyNoteShapesContainer();
- virtual ~ScMyNoteShapesContainer();
+ virtual ~ScMyNoteShapesContainer();
using ScMyIteratorBase::UpdateAddress;
- void AddNewNote(const ScMyNoteShape& aNote);
- sal_Bool HasNotes() { return !aNoteShapeList.empty(); }
- const ScMyNoteShapeList* GetNotes() { return &aNoteShapeList; }
- virtual void SetCellData( ScMyCell& rMyCell );
- virtual void Sort();
+ void AddNewNote(const ScMyNoteShape& aNote);
+ sal_Bool HasNotes() { return !aNoteShapeList.empty(); }
+ const ScMyNoteShapeList* GetNotes() { return &aNoteShapeList; }
+ virtual void SetCellData( ScMyCell& rMyCell );
+ virtual void Sort();
void SkipTable(SCTAB nSkip);
};
@@ -130,27 +130,27 @@ public:
struct ScMyMergedRange
{
com::sun::star::table::CellRangeAddress aCellRange;
- sal_Int32 nRows;
- sal_Bool bIsFirst;
- sal_Bool operator<(const ScMyMergedRange& aRange) const;
+ sal_Int32 nRows;
+ sal_Bool bIsFirst;
+ sal_Bool operator<(const ScMyMergedRange& aRange) const;
};
-typedef std::list<ScMyMergedRange> ScMyMergedRangeList;
+typedef std::list<ScMyMergedRange> ScMyMergedRangeList;
class ScMyMergedRangesContainer : ScMyIteratorBase
{
private:
- ScMyMergedRangeList aRangeList;
+ ScMyMergedRangeList aRangeList;
protected:
- virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress );
+ virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress );
public:
ScMyMergedRangesContainer();
- virtual ~ScMyMergedRangesContainer();
- void AddRange(const com::sun::star::table::CellRangeAddress aMergedRange);
+ virtual ~ScMyMergedRangesContainer();
+ void AddRange(const com::sun::star::table::CellRangeAddress aMergedRange);
using ScMyIteratorBase::UpdateAddress;
- virtual void SetCellData( ScMyCell& rMyCell );
- virtual void Sort(); // + remove doublets
+ virtual void SetCellData( ScMyCell& rMyCell );
+ virtual void Sort(); // + remove doublets
void SkipTable(SCTAB nSkip);
};
@@ -158,20 +158,20 @@ public:
struct ScMyAreaLink
{
- ::rtl::OUString sFilter;
- ::rtl::OUString sFilterOptions;
- ::rtl::OUString sURL;
- ::rtl::OUString sSourceStr;
+ ::rtl::OUString sFilter;
+ ::rtl::OUString sFilterOptions;
+ ::rtl::OUString sURL;
+ ::rtl::OUString sSourceStr;
::com::sun::star::table::CellRangeAddress aDestRange;
- sal_Int32 nRefresh;
+ sal_Int32 nRefresh;
- inline ScMyAreaLink() : nRefresh( 0 ) {}
+ inline ScMyAreaLink() : nRefresh( 0 ) {}
- inline sal_Int32 GetColCount() const { return aDestRange.EndColumn - aDestRange.StartColumn + 1; }
- inline sal_Int32 GetRowCount() const { return aDestRange.EndRow - aDestRange.StartRow + 1; }
+ inline sal_Int32 GetColCount() const { return aDestRange.EndColumn - aDestRange.StartColumn + 1; }
+ inline sal_Int32 GetRowCount() const { return aDestRange.EndRow - aDestRange.StartRow + 1; }
- sal_Bool Compare( const ScMyAreaLink& rAreaLink ) const;
- sal_Bool operator<(const ScMyAreaLink& rAreaLink ) const;
+ sal_Bool Compare( const ScMyAreaLink& rAreaLink ) const;
+ sal_Bool operator<(const ScMyAreaLink& rAreaLink ) const;
};
typedef ::std::list< ScMyAreaLink > ScMyAreaLinkList;
@@ -179,19 +179,19 @@ typedef ::std::list< ScMyAreaLink > ScMyAreaLinkList;
class ScMyAreaLinksContainer : ScMyIteratorBase
{
private:
- ScMyAreaLinkList aAreaLinkList;
+ ScMyAreaLinkList aAreaLinkList;
protected:
- virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress );
+ virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress );
public:
ScMyAreaLinksContainer();
- virtual ~ScMyAreaLinksContainer();
+ virtual ~ScMyAreaLinksContainer();
- inline void AddNewAreaLink( const ScMyAreaLink& rAreaLink )
+ inline void AddNewAreaLink( const ScMyAreaLink& rAreaLink )
{ aAreaLinkList.push_back( rAreaLink ); }
using ScMyIteratorBase::UpdateAddress;
- virtual void SetCellData( ScMyCell& rMyCell );
- virtual void Sort();
+ virtual void SetCellData( ScMyCell& rMyCell );
+ virtual void Sort();
void SkipTable(SCTAB nSkip);
};
@@ -200,7 +200,7 @@ public:
struct ScMyCellRangeAddress : com::sun::star::table::CellRangeAddress
{
ScMyCellRangeAddress(const com::sun::star::table::CellRangeAddress& rRange);
- sal_Bool operator<(const ScMyCellRangeAddress& rCellRangeAddress ) const;
+ sal_Bool operator<(const ScMyCellRangeAddress& rCellRangeAddress ) const;
};
typedef std::list<ScMyCellRangeAddress> ScMyEmptyDatabaseRangeList;
@@ -208,17 +208,17 @@ typedef std::list<ScMyCellRangeAddress> ScMyEmptyDatabaseRangeList;
class ScMyEmptyDatabaseRangesContainer : ScMyIteratorBase
{
private:
- ScMyEmptyDatabaseRangeList aDatabaseList;
+ ScMyEmptyDatabaseRangeList aDatabaseList;
protected:
- virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress );
+ virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress );
public:
ScMyEmptyDatabaseRangesContainer();
- virtual ~ScMyEmptyDatabaseRangesContainer();
- void AddNewEmptyDatabaseRange(const com::sun::star::table::CellRangeAddress& aCellRangeAddress);
+ virtual ~ScMyEmptyDatabaseRangesContainer();
+ void AddNewEmptyDatabaseRange(const com::sun::star::table::CellRangeAddress& aCellRangeAddress);
using ScMyIteratorBase::UpdateAddress;
- virtual void SetCellData( ScMyCell& rMyCell );
- virtual void Sort();
+ virtual void SetCellData( ScMyCell& rMyCell );
+ virtual void Sort();
void SkipTable(SCTAB nSkip);
};
@@ -226,10 +226,10 @@ public:
struct ScMyDetectiveObj
{
- ::com::sun::star::table::CellAddress aPosition;
- ::com::sun::star::table::CellRangeAddress aSourceRange;
- ScDetectiveObjType eObjType;
- sal_Bool bHasError;
+ ::com::sun::star::table::CellAddress aPosition;
+ ::com::sun::star::table::CellRangeAddress aSourceRange;
+ ScDetectiveObjType eObjType;
+ sal_Bool bHasError;
sal_Bool operator<(const ScMyDetectiveObj& rDetObj) const;
};
@@ -239,14 +239,14 @@ typedef ::std::vector< ScMyDetectiveObj > ScMyDetectiveObjVec;
class ScMyDetectiveObjContainer : ScMyIteratorBase
{
private:
- ScMyDetectiveObjList aDetectiveObjList;
+ ScMyDetectiveObjList aDetectiveObjList;
protected:
- virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress );
+ virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress );
public:
ScMyDetectiveObjContainer();
- virtual ~ScMyDetectiveObjContainer();
+ virtual ~ScMyDetectiveObjContainer();
- void AddObject(
+ void AddObject(
ScDetectiveObjType eObjType,
const SCTAB nSheet,
const ScAddress& rPosition,
@@ -254,8 +254,8 @@ public:
sal_Bool bHasError );
using ScMyIteratorBase::UpdateAddress;
- virtual void SetCellData( ScMyCell& rMyCell );
- virtual void Sort();
+ virtual void SetCellData( ScMyCell& rMyCell );
+ virtual void Sort();
void SkipTable(SCTAB nSkip);
};
@@ -263,9 +263,9 @@ public:
struct ScMyDetectiveOp
{
- ::com::sun::star::table::CellAddress aPosition;
- ScDetOpType eOpType;
- sal_Int32 nIndex;
+ ::com::sun::star::table::CellAddress aPosition;
+ ScDetOpType eOpType;
+ sal_Int32 nIndex;
sal_Bool operator<(const ScMyDetectiveOp& rDetOp) const;
};
@@ -275,18 +275,18 @@ typedef ::std::vector< ScMyDetectiveOp > ScMyDetectiveOpVec;
class ScMyDetectiveOpContainer : ScMyIteratorBase
{
private:
- ScMyDetectiveOpList aDetectiveOpList;
+ ScMyDetectiveOpList aDetectiveOpList;
protected:
- virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress );
+ virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress );
public:
ScMyDetectiveOpContainer();
- virtual ~ScMyDetectiveOpContainer();
+ virtual ~ScMyDetectiveOpContainer();
- void AddOperation( ScDetOpType eOpType, const ScAddress& rPosition, sal_uInt32 nIndex );
+ void AddOperation( ScDetOpType eOpType, const ScAddress& rPosition, sal_uInt32 nIndex );
using ScMyIteratorBase::UpdateAddress;
- virtual void SetCellData( ScMyCell& rMyCell );
- virtual void Sort();
+ virtual void SetCellData( ScMyCell& rMyCell );
+ virtual void Sort();
void SkipTable(SCTAB nSkip);
};
@@ -295,49 +295,49 @@ public:
// contains data to export for the current cell position
struct ScMyCell
{
-// com::sun::star::uno::Reference<com::sun::star::table::XCell> xCell;
-// com::sun::star::uno::Reference<com::sun::star::text::XText> xText;
+// com::sun::star::uno::Reference<com::sun::star::table::XCell> xCell;
+// com::sun::star::uno::Reference<com::sun::star::text::XText> xText;
com::sun::star::uno::Reference<com::sun::star::sheet::XSheetAnnotation> xAnnotation;
com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xNoteShape;
- com::sun::star::table::CellAddress aCellAddress;
- com::sun::star::table::CellRangeAddress aMergeRange;
- com::sun::star::table::CellRangeAddress aMatrixRange;
+ com::sun::star::table::CellAddress aCellAddress;
+ com::sun::star::table::CellRangeAddress aMergeRange;
+ com::sun::star::table::CellRangeAddress aMatrixRange;
- rtl::OUString sStringValue;
- rtl::OUString sAnnotationText;
+ rtl::OUString sStringValue;
+ rtl::OUString sAnnotationText;
- ScMyAreaLink aAreaLink;
- ScMyShapeList aShapeList;
- ScMyDetectiveObjVec aDetectiveObjVec;
- ScMyDetectiveOpVec aDetectiveOpVec;
+ ScMyAreaLink aAreaLink;
+ ScMyShapeList aShapeList;
+ ScMyDetectiveObjVec aDetectiveObjVec;
+ ScMyDetectiveOpVec aDetectiveOpVec;
- double fValue;
- sal_Int32 nValidationIndex;
- sal_Int32 nStyleIndex;
- sal_Int32 nNumberFormat;
- com::sun::star::table::CellContentType nType;
+ double fValue;
+ sal_Int32 nValidationIndex;
+ sal_Int32 nStyleIndex;
+ sal_Int32 nNumberFormat;
+ com::sun::star::table::CellContentType nType;
ScBaseCell* pBaseCell;
- sal_Bool bIsAutoStyle;
+ sal_Bool bIsAutoStyle;
- sal_Bool bHasShape;
- sal_Bool bIsMergedBase;
- sal_Bool bIsCovered;
- sal_Bool bHasAreaLink;
- sal_Bool bHasEmptyDatabase;
- sal_Bool bHasDetectiveObj;
- sal_Bool bHasDetectiveOp;
+ sal_Bool bHasShape;
+ sal_Bool bIsMergedBase;
+ sal_Bool bIsCovered;
+ sal_Bool bHasAreaLink;
+ sal_Bool bHasEmptyDatabase;
+ sal_Bool bHasDetectiveObj;
+ sal_Bool bHasDetectiveOp;
- sal_Bool bIsEditCell;
- sal_Bool bKnowWhetherIsEditCell;
- sal_Bool bHasStringValue;
- sal_Bool bHasDoubleValue;
- sal_Bool bHasXText;
+ sal_Bool bIsEditCell;
+ sal_Bool bKnowWhetherIsEditCell;
+ sal_Bool bHasStringValue;
+ sal_Bool bHasDoubleValue;
+ sal_Bool bHasXText;
- sal_Bool bIsMatrixBase;
- sal_Bool bIsMatrixCovered;
- sal_Bool bHasAnnotation;
+ sal_Bool bIsMatrixBase;
+ sal_Bool bIsMatrixCovered;
+ sal_Bool bHasAnnotation;
ScMyCell();
~ScMyCell();
@@ -348,7 +348,7 @@ struct ScMyCell
struct ScMyExportAnnotation
{
com::sun::star::uno::Reference<com::sun::star::sheet::XSheetAnnotation> xAnnotation;
- com::sun::star::table::CellAddress aCellAddress;
+ com::sun::star::table::CellAddress aCellAddress;
sal_Bool operator<(const ScMyExportAnnotation& rAnno) const;
};
@@ -358,55 +358,55 @@ class ScMyNotEmptyCellsIterator
{
com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet> xTable;
com::sun::star::uno::Reference<com::sun::star::table::XCellRange> xCellRange;
- com::sun::star::table::CellAddress aLastAddress;
- ScMyExportAnnotationList aAnnotations;
+ com::sun::star::table::CellAddress aLastAddress;
+ ScMyExportAnnotationList aAnnotations;
- ScMyShapesContainer* pShapes;
- ScMyNoteShapesContainer* pNoteShapes;
- ScMyEmptyDatabaseRangesContainer* pEmptyDatabaseRanges;
- ScMyMergedRangesContainer* pMergedRanges;
- ScMyAreaLinksContainer* pAreaLinks;
- ScMyDetectiveObjContainer* pDetectiveObj;
- ScMyDetectiveOpContainer* pDetectiveOp;
+ ScMyShapesContainer* pShapes;
+ ScMyNoteShapesContainer* pNoteShapes;
+ ScMyEmptyDatabaseRangesContainer* pEmptyDatabaseRanges;
+ ScMyMergedRangesContainer* pMergedRanges;
+ ScMyAreaLinksContainer* pAreaLinks;
+ ScMyDetectiveObjContainer* pDetectiveObj;
+ ScMyDetectiveOpContainer* pDetectiveOp;
- ScXMLExport& rExport;
- ScHorizontalCellIterator* pCellItr;
+ ScXMLExport& rExport;
+ ScHorizontalCellIterator* pCellItr;
- SCCOL nCellCol;
- SCROW nCellRow;
- SCTAB nCurrentTable;
+ SCCOL nCellCol;
+ SCROW nCellRow;
+ SCTAB nCurrentTable;
- void UpdateAddress( ::com::sun::star::table::CellAddress& rAddress );
- void SetCellData( ScMyCell& rMyCell, ::com::sun::star::table::CellAddress& rAddress );
+ void UpdateAddress( ::com::sun::star::table::CellAddress& rAddress );
+ void SetCellData( ScMyCell& rMyCell, ::com::sun::star::table::CellAddress& rAddress );
- void SetMatrixCellData( ScMyCell& rMyCell );
- void HasAnnotation( ScMyCell& aCell );
+ void SetMatrixCellData( ScMyCell& rMyCell );
+ void HasAnnotation( ScMyCell& aCell );
public:
ScMyNotEmptyCellsIterator(ScXMLExport& rExport);
~ScMyNotEmptyCellsIterator();
- void Clear();
+ void Clear();
- inline void SetShapes(ScMyShapesContainer* pNewShapes)
+ inline void SetShapes(ScMyShapesContainer* pNewShapes)
{ pShapes = pNewShapes; }
- inline void SetNoteShapes(ScMyNoteShapesContainer* pNewNoteShapes)
+ inline void SetNoteShapes(ScMyNoteShapesContainer* pNewNoteShapes)
{ pNoteShapes = pNewNoteShapes; }
- inline void SetEmptyDatabaseRanges(ScMyEmptyDatabaseRangesContainer* pNewEmptyDatabaseRanges)
+ inline void SetEmptyDatabaseRanges(ScMyEmptyDatabaseRangesContainer* pNewEmptyDatabaseRanges)
{ pEmptyDatabaseRanges = pNewEmptyDatabaseRanges; }
- inline void SetMergedRanges(ScMyMergedRangesContainer* pNewMergedRanges)
+ inline void SetMergedRanges(ScMyMergedRangesContainer* pNewMergedRanges)
{ pMergedRanges = pNewMergedRanges; }
- inline void SetAreaLinks(ScMyAreaLinksContainer* pNewAreaLinks)
+ inline void SetAreaLinks(ScMyAreaLinksContainer* pNewAreaLinks)
{ pAreaLinks = pNewAreaLinks; }
- inline void SetDetectiveObj(ScMyDetectiveObjContainer* pNewDetectiveObj)
+ inline void SetDetectiveObj(ScMyDetectiveObjContainer* pNewDetectiveObj)
{ pDetectiveObj = pNewDetectiveObj; }
- inline void SetDetectiveOp(ScMyDetectiveOpContainer* pNewDetectiveOp)
+ inline void SetDetectiveOp(ScMyDetectiveOpContainer* pNewDetectiveOp)
{ pDetectiveOp = pNewDetectiveOp; }
- void SetCurrentTable(const SCTAB nTable,
+ void SetCurrentTable(const SCTAB nTable,
com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet>& rxTable);
void SkipTable(SCTAB nSkip);
- sal_Bool GetNext(ScMyCell& aCell, ScFormatRangeStyles* pCellStyles);
+ sal_Bool GetNext(ScMyCell& aCell, ScFormatRangeStyles* pCellStyles);
};
#endif
diff --git a/sc/source/filter/xml/XMLExportSharedData.cxx b/sc/source/filter/xml/XMLExportSharedData.cxx
index eede3aa73499..73944f333914 100644
--- a/sc/source/filter/xml/XMLExportSharedData.cxx
+++ b/sc/source/filter/xml/XMLExportSharedData.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/XMLExportSharedData.hxx b/sc/source/filter/xml/XMLExportSharedData.hxx
index e808101805fd..339c3ae00fa1 100644
--- a/sc/source/filter/xml/XMLExportSharedData.hxx
+++ b/sc/source/filter/xml/XMLExportSharedData.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +53,14 @@ class ScMyNoteShapesContainer;
class ScMySharedData
{
- std::vector<sal_Int32> nLastColumns;
- std::vector<sal_Int32> nLastRows;
- ScMyTableShapes* pTableShapes;
- ScMyDrawPages* pDrawPages;
- ScMyShapesContainer* pShapesContainer;
- ScMyDetectiveObjContainer* pDetectiveObjContainer;
+ std::vector<sal_Int32> nLastColumns;
+ std::vector<sal_Int32> nLastRows;
+ ScMyTableShapes* pTableShapes;
+ ScMyDrawPages* pDrawPages;
+ ScMyShapesContainer* pShapesContainer;
+ ScMyDetectiveObjContainer* pDetectiveObjContainer;
ScMyNoteShapesContainer* pNoteShapes;
- sal_Int32 nTableCount;
+ sal_Int32 nTableCount;
public:
ScMySharedData(const sal_Int32 nTableCount);
~ScMySharedData();
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 66f3ea613a3a..d880819ca38e 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +191,9 @@ sal_Bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny,
rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation)
{
- /* ATTENTION! Should the condition to not write sheet::ValidationType_ANY
- * ever be changed, adapt the conditional call of
- * MarkUsedExternalReferences() in
+ /* ATTENTION! Should the condition to not write sheet::ValidationType_ANY
+ * ever be changed, adapt the conditional call of
+ * MarkUsedExternalReferences() in
* ScTableValidationObj::ScTableValidationObj() accordingly! */
rtl::OUString sCondition;
if (aValidation.aValidationType != sheet::ValidationType_ANY)
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx
index 79b19b7ce9ab..028aee6eda57 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,73 +42,73 @@ class ScXMLExport;
struct ScMyValidation
{
- rtl::OUString sName;
- rtl::OUString sErrorMessage;
- rtl::OUString sErrorTitle;
- rtl::OUString sImputMessage;
- rtl::OUString sImputTitle;
- rtl::OUString sFormula1;
- rtl::OUString sFormula2;
- com::sun::star::table::CellAddress aBaseCell;
- com::sun::star::sheet::ValidationAlertStyle aAlertStyle;
- com::sun::star::sheet::ValidationType aValidationType;
- com::sun::star::sheet::ConditionOperator aOperator;
+ rtl::OUString sName;
+ rtl::OUString sErrorMessage;
+ rtl::OUString sErrorTitle;
+ rtl::OUString sImputMessage;
+ rtl::OUString sImputTitle;
+ rtl::OUString sFormula1;
+ rtl::OUString sFormula2;
+ com::sun::star::table::CellAddress aBaseCell;
+ com::sun::star::sheet::ValidationAlertStyle aAlertStyle;
+ com::sun::star::sheet::ValidationType aValidationType;
+ com::sun::star::sheet::ConditionOperator aOperator;
sal_Int16 nShowList;
- sal_Bool bShowErrorMessage;
- sal_Bool bShowImputMessage;
- sal_Bool bIgnoreBlanks;
+ sal_Bool bShowErrorMessage;
+ sal_Bool bShowImputMessage;
+ sal_Bool bIgnoreBlanks;
ScMyValidation();
~ScMyValidation();
- sal_Bool IsEqual(const ScMyValidation& aVal) const;
+ sal_Bool IsEqual(const ScMyValidation& aVal) const;
};
-typedef std::vector<ScMyValidation> ScMyValidationVec;
+typedef std::vector<ScMyValidation> ScMyValidationVec;
class ScMyValidationsContainer
{
private:
- ScMyValidationVec aValidationVec;
- const rtl::OUString sEmptyString;
- const rtl::OUString sERRALSTY;
- const rtl::OUString sIGNOREBL;
+ ScMyValidationVec aValidationVec;
+ const rtl::OUString sEmptyString;
+ const rtl::OUString sERRALSTY;
+ const rtl::OUString sIGNOREBL;
const rtl::OUString sSHOWLIST;
- const rtl::OUString sTYPE;
- const rtl::OUString sSHOWINP;
- const rtl::OUString sSHOWERR;
- const rtl::OUString sINPTITLE;
- const rtl::OUString sINPMESS;
- const rtl::OUString sERRTITLE;
- const rtl::OUString sERRMESS;
- const rtl::OUString sOnError;
- const rtl::OUString sEventType;
- const rtl::OUString sStarBasic;
- const rtl::OUString sScript;
- const rtl::OUString sLibrary;
- const rtl::OUString sMacroName;
+ const rtl::OUString sTYPE;
+ const rtl::OUString sSHOWINP;
+ const rtl::OUString sSHOWERR;
+ const rtl::OUString sINPTITLE;
+ const rtl::OUString sINPMESS;
+ const rtl::OUString sERRTITLE;
+ const rtl::OUString sERRMESS;
+ const rtl::OUString sOnError;
+ const rtl::OUString sEventType;
+ const rtl::OUString sStarBasic;
+ const rtl::OUString sScript;
+ const rtl::OUString sLibrary;
+ const rtl::OUString sMacroName;
public:
ScMyValidationsContainer();
~ScMyValidationsContainer();
- sal_Bool AddValidation(const com::sun::star::uno::Any& aAny,
+ sal_Bool AddValidation(const com::sun::star::uno::Any& aAny,
sal_Int32& nValidationIndex);
- rtl::OUString GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation);
- rtl::OUString GetBaseCellAddress(ScDocument* pDoc, const com::sun::star::table::CellAddress& aCell);
- void WriteMessage(ScXMLExport& rExport,
+ rtl::OUString GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation);
+ rtl::OUString GetBaseCellAddress(ScDocument* pDoc, const com::sun::star::table::CellAddress& aCell);
+ void WriteMessage(ScXMLExport& rExport,
const rtl::OUString& sTitle, const rtl::OUString& sMessage,
const sal_Bool bShowMessage, const sal_Bool bIsHelpMessage);
- void WriteValidations(ScXMLExport& rExport);
- const rtl::OUString& GetValidationName(const sal_Int32 nIndex);
+ void WriteValidations(ScXMLExport& rExport);
+ const rtl::OUString& GetValidationName(const sal_Int32 nIndex);
};
//==============================================================================
struct ScMyDefaultStyle
{
- sal_Int32 nIndex;
- sal_Int32 nRepeat;
- sal_Bool bIsAutoStyle;
+ sal_Int32 nIndex;
+ sal_Int32 nRepeat;
+ sal_Bool bIsAutoStyle;
ScMyDefaultStyle() : nIndex(-1), nRepeat(1),
bIsAutoStyle(sal_True) {}
@@ -144,12 +144,12 @@ public:
struct ScMyRowFormatRange
{
- sal_Int32 nStartColumn;
- sal_Int32 nRepeatColumns;
- sal_Int32 nRepeatRows;
- sal_Int32 nIndex;
- sal_Int32 nValidationIndex;
- sal_Bool bIsAutoStyle;
+ sal_Int32 nStartColumn;
+ sal_Int32 nRepeatColumns;
+ sal_Int32 nRepeatRows;
+ sal_Int32 nIndex;
+ sal_Int32 nValidationIndex;
+ sal_Bool bIsAutoStyle;
ScMyRowFormatRange();
sal_Bool operator<(const ScMyRowFormatRange& rRange) const;
@@ -159,10 +159,10 @@ typedef std::list<ScMyRowFormatRange> ScMyRowFormatRangesList;
class ScRowFormatRanges
{
- ScMyRowFormatRangesList aRowFormatRanges;
- const ScMyDefaultStyleList* pRowDefaults;
- const ScMyDefaultStyleList* pColDefaults;
- sal_uInt32 nSize;
+ ScMyRowFormatRangesList aRowFormatRanges;
+ const ScMyDefaultStyleList* pRowDefaults;
+ const ScMyDefaultStyleList* pColDefaults;
+ sal_uInt32 nSize;
void AddRange(const sal_Int32 nPrevStartCol, const sal_Int32 nRepeat, const sal_Int32 nPrevIndex,
const sal_Bool bPrevAutoStyle, const ScMyRowFormatRange& rFormatRange);
@@ -182,30 +182,30 @@ public:
void Sort();
};
-typedef std::vector<rtl::OUString*> ScMyOUStringVec;
+typedef std::vector<rtl::OUString*> ScMyOUStringVec;
struct ScMyFormatRange
{
com::sun::star::table::CellRangeAddress aRangeAddress;
- sal_Int32 nStyleNameIndex;
- sal_Int32 nValidationIndex;
- sal_Int32 nNumberFormat;
- sal_Bool bIsAutoStyle;
+ sal_Int32 nStyleNameIndex;
+ sal_Int32 nValidationIndex;
+ sal_Int32 nNumberFormat;
+ sal_Bool bIsAutoStyle;
ScMyFormatRange();
sal_Bool operator< (const ScMyFormatRange& rRange) const;
};
-typedef std::list<ScMyFormatRange> ScMyFormatRangeAddresses;
-typedef std::vector<ScMyFormatRangeAddresses*> ScMyFormatRangeListVec;
+typedef std::list<ScMyFormatRange> ScMyFormatRangeAddresses;
+typedef std::vector<ScMyFormatRangeAddresses*> ScMyFormatRangeListVec;
class ScFormatRangeStyles
{
- ScMyFormatRangeListVec aTables;
- ScMyOUStringVec aStyleNames;
- ScMyOUStringVec aAutoStyleNames;
- const ScMyDefaultStyleList* pRowDefaults;
- const ScMyDefaultStyleList* pColDefaults;
+ ScMyFormatRangeListVec aTables;
+ ScMyOUStringVec aStyleNames;
+ ScMyOUStringVec aAutoStyleNames;
+ const ScMyDefaultStyleList* pRowDefaults;
+ const ScMyDefaultStyleList* pColDefaults;
public:
ScFormatRangeStyles();
@@ -232,7 +232,7 @@ public:
class ScColumnRowStylesBase
{
- ScMyOUStringVec aStyleNames;
+ ScMyOUStringVec aStyleNames;
public:
ScColumnRowStylesBase();
@@ -247,19 +247,19 @@ public:
struct ScColumnStyle
{
- sal_Int32 nIndex;
- sal_Bool bIsVisible;
+ sal_Int32 nIndex;
+ sal_Bool bIsVisible;
ScColumnStyle() : nIndex(-1), bIsVisible(sal_True) {}
};
-typedef std::vector<ScColumnStyle> ScMyColumnStyleVec;
-typedef std::vector<ScMyColumnStyleVec> ScMyColumnVectorVec;
+typedef std::vector<ScColumnStyle> ScMyColumnStyleVec;
+typedef std::vector<ScMyColumnStyleVec> ScMyColumnVectorVec;
class ScColumnStyles : public ScColumnRowStylesBase
{
- ScMyColumnVectorVec aTables;
+ ScMyColumnVectorVec aTables;
public:
ScColumnStyles();
@@ -272,12 +272,12 @@ public:
virtual rtl::OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField);
};
-typedef std::vector<sal_Int32> ScMysalInt32Vec;
-typedef std::vector<ScMysalInt32Vec> ScMyRowVectorVec;
+typedef std::vector<sal_Int32> ScMysalInt32Vec;
+typedef std::vector<ScMysalInt32Vec> ScMyRowVectorVec;
class ScRowStyles : public ScColumnRowStylesBase
{
- ScMyRowVectorVec aTables;
+ ScMyRowVectorVec aTables;
public:
ScRowStyles();
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx
index 492c7a63ee30..976d2040cd23 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx
index 3a15dbeff52a..a0c20266df46 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +40,8 @@ class ScXMLImport;
struct ScMyStyleNumberFormat
{
- rtl::OUString sStyleName;
- sal_Int32 nNumberFormat;
+ rtl::OUString sStyleName;
+ sal_Int32 nNumberFormat;
ScMyStyleNumberFormat() : nNumberFormat(-1) {}
ScMyStyleNumberFormat(const rtl::OUString& rStyleName) :
@@ -58,11 +58,11 @@ struct LessStyleNumberFormat
}
};
-typedef std::set< ScMyStyleNumberFormat, LessStyleNumberFormat > ScMyStyleNumberFormatSet;
+typedef std::set< ScMyStyleNumberFormat, LessStyleNumberFormat > ScMyStyleNumberFormatSet;
class ScMyStyleNumberFormats
{
- ScMyStyleNumberFormatSet aSet;
+ ScMyStyleNumberFormatSet aSet;
public:
void AddStyleNumberFormat(const rtl::OUString& rStyleName, const sal_Int32 nNumberFormat);
@@ -71,8 +71,8 @@ public:
struct ScMyCurrencyStyle
{
- rtl::OUString sCurrency;
- ScRangeListRef xRanges;
+ rtl::OUString sCurrency;
+ ScRangeListRef xRanges;
ScMyCurrencyStyle() : xRanges(new ScRangeList()) {}
~ScMyCurrencyStyle() {}
@@ -86,18 +86,18 @@ struct LessCurrencyStyle
}
};
-typedef std::set<ScMyCurrencyStyle, LessCurrencyStyle> ScMyCurrencyStylesSet;
+typedef std::set<ScMyCurrencyStyle, LessCurrencyStyle> ScMyCurrencyStylesSet;
class ScMyStyleRanges : public SvRefBase
{
- ScRangeList* pTextList;
- ScRangeList* pNumberList;
- ScRangeList* pTimeList;
- ScRangeList* pDateTimeList;
- ScRangeList* pPercentList;
- ScRangeList* pLogicalList;
- ScRangeList* pUndefinedList;
- ScMyCurrencyStylesSet* pCurrencyList;
+ ScRangeList* pTextList;
+ ScRangeList* pNumberList;
+ ScRangeList* pTimeList;
+ ScRangeList* pDateTimeList;
+ ScRangeList* pPercentList;
+ ScRangeList* pLogicalList;
+ ScRangeList* pUndefinedList;
+ ScMyCurrencyStylesSet* pCurrencyList;
void AddRange(const ScRange& rRange, ScRangeList* pList,
const rtl::OUString* pStyleName, const sal_Int16 nType,
@@ -130,8 +130,8 @@ SV_DECL_IMPL_REF( ScMyStyleRanges );
struct ScMyStyle
{
- rtl::OUString sStyleName;
- ScMyStyleRangesRef xRanges;
+ rtl::OUString sStyleName;
+ ScMyStyleRangesRef xRanges;
ScMyStyle() : xRanges(new ScMyStyleRanges()) {}
~ScMyStyle() {}
@@ -145,24 +145,24 @@ struct LessStyle
}
};
-typedef std::set<ScMyStyle, LessStyle> ScMyStylesSet;
+typedef std::set<ScMyStyle, LessStyle> ScMyStylesSet;
typedef std::vector<ScMyStylesSet::iterator> ScMyStyles;
class ScMyStylesImportHelper
{
- ScMyStylesSet aCellStyles;
- ScMyStyles aColDefaultStyles;
- ScMyStylesSet::iterator aRowDefaultStyle;
- ScXMLImport& rImport;
- rtl::OUString* pStyleName;
- rtl::OUString* pPrevStyleName;
- rtl::OUString* pCurrency;
- rtl::OUString* pPrevCurrency;
- ScRange aPrevRange;
- sal_uInt32 nMaxRanges;
- sal_Int16 nCellType;
- sal_Int16 nPrevCellType;
- sal_Bool bPrevRangeAdded;
+ ScMyStylesSet aCellStyles;
+ ScMyStyles aColDefaultStyles;
+ ScMyStylesSet::iterator aRowDefaultStyle;
+ ScXMLImport& rImport;
+ rtl::OUString* pStyleName;
+ rtl::OUString* pPrevStyleName;
+ rtl::OUString* pCurrency;
+ rtl::OUString* pPrevCurrency;
+ ScRange aPrevRange;
+ sal_uInt32 nMaxRanges;
+ sal_Int16 nCellType;
+ sal_Int16 nPrevCellType;
+ sal_Bool bPrevRangeAdded;
void ResetAttributes();
ScMyStylesSet::iterator GetIterator(const rtl::OUString* pStyleName);
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
index fb0b1235007e..6c4b544395bf 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
index a3ce9c4c970d..c545bb6c79ee 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,19 +48,19 @@ class XMLTableHeaderFooterContext: public SvXMLImportContext
::com::sun::star::uno::Reference <
::com::sun::star::sheet::XHeaderFooterContent > xHeaderFooterContent;
- const ::rtl::OUString sOn;
- const ::rtl::OUString sShareContent;
- const ::rtl::OUString sContent;
- const ::rtl::OUString sContentLeft;
- const ::rtl::OUString sEmpty;
- rtl::OUString sCont;
-
- sal_Bool bDisplay;
- sal_Bool bInsertContent;
- sal_Bool bLeft;
- sal_Bool bContainsLeft;
- sal_Bool bContainsRight;
- sal_Bool bContainsCenter;
+ const ::rtl::OUString sOn;
+ const ::rtl::OUString sShareContent;
+ const ::rtl::OUString sContent;
+ const ::rtl::OUString sContentLeft;
+ const ::rtl::OUString sEmpty;
+ rtl::OUString sCont;
+
+ sal_Bool bDisplay;
+ sal_Bool bInsertContent;
+ sal_Bool bLeft;
+ sal_Bool bContainsLeft;
+ sal_Bool bContainsRight;
+ sal_Bool bContainsCenter;
public:
TYPEINFO();
diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.cxx b/sc/source/filter/xml/XMLTableMasterPageExport.cxx
index 91f27ab646a7..5881618b7554 100644
--- a/sc/source/filter/xml/XMLTableMasterPageExport.cxx
+++ b/sc/source/filter/xml/XMLTableMasterPageExport.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/XMLTableMasterPageExport.hxx b/sc/source/filter/xml/XMLTableMasterPageExport.hxx
index 0a277bec0bb9..3755cd5854b8 100644
--- a/sc/source/filter/xml/XMLTableMasterPageExport.hxx
+++ b/sc/source/filter/xml/XMLTableMasterPageExport.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,5 +62,5 @@ public:
};
-#endif // _XMLOFF_XMLTABLEMASTERPAGEEXPORT_HXX
+#endif // _XMLOFF_XMLTABLEMASTERPAGEEXPORT_HXX
diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
index cc425e0f4d65..6bf0709d62c9 100644
--- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
+++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx
index 94a64312c8ed..5d976f37d5e0 100644
--- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx
+++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx
index 415057c219f2..20f0792d4001 100644
--- a/sc/source/filter/xml/XMLTableShapeResizer.cxx
+++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -246,7 +246,7 @@ void ScMyShapeResizer::ResizeShapes()
uno::Reference<beans::XPropertySet> xShapeProps (aItr->xShape, uno::UNO_QUERY);
if(xShapeProps.is())
{
- uno::Reference<drawing::XShape> xStartShape(xShapeProps->getPropertyValue( sStartShape ), uno::UNO_QUERY);
+ uno::Reference<drawing::XShape> xStartShape(xShapeProps->getPropertyValue( sStartShape ), uno::UNO_QUERY);
uno::Reference<drawing::XShape> xEndShape(xShapeProps->getPropertyValue( sEndShape ), uno::UNO_QUERY);
if (!xStartShape.is() && !xEndShape.is())
{
@@ -377,8 +377,8 @@ void ScMyShapeResizer::ResizeShapes()
aItr = aShapes.erase(aItr);
}
rImport.UnlockSolarMutex();
-// if (pCollection)
-// pDoc->SetChartListenerCollection(pCollection);
+// if (pCollection)
+// pDoc->SetChartListenerCollection(pCollection);
}
}
}
diff --git a/sc/source/filter/xml/XMLTableShapeResizer.hxx b/sc/source/filter/xml/XMLTableShapeResizer.hxx
index 9ece92995101..3ec56b996cee 100644
--- a/sc/source/filter/xml/XMLTableShapeResizer.hxx
+++ b/sc/source/filter/xml/XMLTableShapeResizer.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ struct ScMyToResizeShape
{
com::sun::star::uno::Reference <com::sun::star::drawing::XShape> xShape;
rtl::OUString* pRangeList;
- com::sun::star::table::CellAddress aEndCell;
- com::sun::star::table::CellAddress aStartCell;
+ com::sun::star::table::CellAddress aEndCell;
+ com::sun::star::table::CellAddress aStartCell;
sal_Int32 nEndX;
sal_Int32 nEndY;
@@ -54,9 +54,9 @@ typedef std::list<ScMyToResizeShape> ScMyToResizeShapes;
class ScMyShapeResizer
{
- ScXMLImport& rImport;
- ScMyToResizeShapes aShapes;
- ScChartListenerCollection* pCollection;
+ ScXMLImport& rImport;
+ ScMyToResizeShapes aShapes;
+ ScChartListenerCollection* pCollection;
sal_Bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape) const;
void CreateChartListener(ScDocument* pDoc,
@@ -70,12 +70,12 @@ public:
ScMyShapeResizer(ScXMLImport& rImport);
~ScMyShapeResizer();
- void AddShape(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape,
+ void AddShape(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape,
rtl::OUString* pRangeList,
com::sun::star::table::CellAddress& rStartAddress,
com::sun::star::table::CellAddress& rEndAddress,
sal_Int32 nEndX, sal_Int32 nEndY);
- void ResizeShapes();
+ void ResizeShapes();
};
#endif
diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx
index d841e1c4c748..06bc7a423d39 100644
--- a/sc/source/filter/xml/XMLTableShapesContext.cxx
+++ b/sc/source/filter/xml/XMLTableShapesContext.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx
index f12cb56d30da..f11e8c1863a8 100644
--- a/sc/source/filter/xml/XMLTableShapesContext.hxx
+++ b/sc/source/filter/xml/XMLTableShapesContext.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx
index 00f5c9184a53..1f589b451ca8 100644
--- a/sc/source/filter/xml/XMLTableSourceContext.cxx
+++ b/sc/source/filter/xml/XMLTableSourceContext.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx
index 2d72a4a3364c..43a21d88d8bb 100644
--- a/sc/source/filter/xml/XMLTableSourceContext.hxx
+++ b/sc/source/filter/xml/XMLTableSourceContext.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +35,12 @@ class ScXMLImport;
class ScXMLTableSourceContext : public SvXMLImportContext
{
- rtl::OUString sLink;
- rtl::OUString sTableName;
- rtl::OUString sFilterName;
- rtl::OUString sFilterOptions;
- sal_Int32 nRefresh;
- com::sun::star::sheet::SheetLinkMode nMode;
+ rtl::OUString sLink;
+ rtl::OUString sTableName;
+ rtl::OUString sFilterName;
+ rtl::OUString sFilterOptions;
+ sal_Int32 nRefresh;
+ com::sun::star::sheet::SheetLinkMode nMode;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
diff --git a/sc/source/filter/xml/XMLTextPContext.cxx b/sc/source/filter/xml/XMLTextPContext.cxx
index d6d02567b9bd..08498ee9ec7b 100644
--- a/sc/source/filter/xml/XMLTextPContext.cxx
+++ b/sc/source/filter/xml/XMLTextPContext.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ SvXMLImportContext *ScXMLTextPContext::CreateChildContext( USHORT nTempPrefix,
sSetString = sSimpleContent;
sal_Unicode cNonSpace(0);
-
+
sal_Int32 nLength = sSetString.getLength();
if ( nLength > 0 )
{
diff --git a/sc/source/filter/xml/XMLTextPContext.hxx b/sc/source/filter/xml/XMLTextPContext.hxx
index a920e13f84a3..4936f7b63f4a 100644
--- a/sc/source/filter/xml/XMLTextPContext.hxx
+++ b/sc/source/filter/xml/XMLTextPContext.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +37,13 @@ class ScXMLTableRowCellContext;
class ScXMLTextPContext : public SvXMLImportContext
{
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> xAttrList;
- SvXMLImportContext* pTextPContext;
- ScXMLTableRowCellContext* pCellContext;
- rtl::OUString sLName;
+ SvXMLImportContext* pTextPContext;
+ ScXMLTableRowCellContext* pCellContext;
+ rtl::OUString sLName;
rtl::OUString sSimpleContent; // copy of the first Character call's argument
rtl::OUStringBuffer* pContentBuffer; // used if there's more than one string
- USHORT nPrefix;
- sal_Bool bIsOwn;
+ USHORT nPrefix;
+ sal_Bool bIsOwn;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index cf415142213a..d94d9571ec89 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +51,12 @@ using namespace xmloff::token;
class ScXMLChangeInfoContext : public SvXMLImportContext
{
- ScMyActionInfo aInfo;
+ ScMyActionInfo aInfo;
::rtl::OUStringBuffer sAuthorBuffer;
::rtl::OUStringBuffer sDateTimeBuffer;
::rtl::OUStringBuffer sCommentBuffer;
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- sal_uInt32 nParagraphCount;
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
+ sal_uInt32 nParagraphCount;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -80,7 +80,7 @@ public:
class ScXMLBigRangeContext : public SvXMLImportContext
{
- ScBigRange& rBigRange;
+ ScBigRange& rBigRange;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -104,22 +104,22 @@ public:
class ScXMLCellContentDeletionContext : public SvXMLImportContext
{
- rtl::OUString sFormulaAddress;
- rtl::OUString sFormula;
+ rtl::OUString sFormulaAddress;
+ rtl::OUString sFormula;
rtl::OUString sFormulaNmsp;
rtl::OUString sInputString;
- ScBigRange aBigRange;
- double fValue;
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- ScBaseCell* pCell;
- sal_uInt32 nID;
- sal_Int32 nMatrixCols;
- sal_Int32 nMatrixRows;
+ ScBigRange aBigRange;
+ double fValue;
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
+ ScBaseCell* pCell;
+ sal_uInt32 nID;
+ sal_Int32 nMatrixCols;
+ sal_Int32 nMatrixRows;
formula::FormulaGrammar::Grammar eGrammar;
- sal_uInt16 nType;
- sal_uInt8 nMatrixFlag;
- sal_Bool bBigRange;
- sal_Bool bContainsCell;
+ sal_uInt16 nType;
+ sal_uInt8 nMatrixFlag;
+ sal_Bool bBigRange;
+ sal_Bool bContainsCell;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -143,7 +143,7 @@ public:
class ScXMLDependenceContext : public SvXMLImportContext
{
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -167,7 +167,7 @@ public:
class ScXMLDependingsContext : public SvXMLImportContext
{
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -191,7 +191,7 @@ public:
class ScXMLChangeDeletionContext : public SvXMLImportContext
{
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -215,7 +215,7 @@ public:
class ScXMLDeletionsContext : public SvXMLImportContext
{
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -242,11 +242,11 @@ class ScXMLChangeCellContext;
class ScXMLChangeTextPContext : public SvXMLImportContext
{
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> xAttrList;
- rtl::OUString sLName;
- rtl::OUStringBuffer sText;
- ScXMLChangeCellContext* pChangeCellContext;
- SvXMLImportContext* pTextPContext;
- USHORT nPrefix;
+ rtl::OUString sLName;
+ rtl::OUStringBuffer sText;
+ ScXMLChangeCellContext* pChangeCellContext;
+ SvXMLImportContext* pTextPContext;
+ USHORT nPrefix;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -275,19 +275,19 @@ public:
class ScXMLChangeCellContext : public SvXMLImportContext
{
- rtl::OUString sText;
+ rtl::OUString sText;
rtl::OUString& rInputString;
- ScBaseCell*& rOldCell;
- ScEditEngineTextObj* pEditTextObj;
- double& rDateTimeValue;
- double fValue;
- sal_uInt16& rType;
+ ScBaseCell*& rOldCell;
+ ScEditEngineTextObj* pEditTextObj;
+ double& rDateTimeValue;
+ double fValue;
+ sal_uInt16& rType;
// sal_Bool bIsMatrix;
// sal_Bool bIsCoveredMatrix;
- sal_Bool bEmpty;
- sal_Bool bFirstParagraph;
- sal_Bool bString;
- sal_Bool bFormula;
+ sal_Bool bEmpty;
+ sal_Bool bFirstParagraph;
+ sal_Bool bString;
+ sal_Bool bFormula;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -319,19 +319,19 @@ public:
class ScXMLPreviousContext : public SvXMLImportContext
{
- rtl::OUString sFormulaAddress;
- rtl::OUString sFormula;
+ rtl::OUString sFormulaAddress;
+ rtl::OUString sFormula;
rtl::OUString sFormulaNmsp;
rtl::OUString sInputString;
- double fValue;
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- ScBaseCell* pOldCell;
- sal_uInt32 nID;
- sal_Int32 nMatrixCols;
- sal_Int32 nMatrixRows;
+ double fValue;
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
+ ScBaseCell* pOldCell;
+ sal_uInt32 nID;
+ sal_Int32 nMatrixCols;
+ sal_Int32 nMatrixRows;
formula::FormulaGrammar::Grammar eGrammar;
- sal_uInt16 nType;
- sal_uInt8 nMatrixFlag;
+ sal_uInt16 nType;
+ sal_uInt8 nMatrixFlag;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -355,8 +355,8 @@ public:
class ScXMLContentChangeContext : public SvXMLImportContext
{
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- ScBigRange aBigRange;
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
+ ScBigRange aBigRange;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -379,7 +379,7 @@ public:
class ScXMLInsertionContext : public SvXMLImportContext
{
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -402,7 +402,7 @@ public:
class ScXMLInsertionCutOffContext : public SvXMLImportContext
{
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -425,7 +425,7 @@ public:
class ScXMLMovementCutOffContext : public SvXMLImportContext
{
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -448,7 +448,7 @@ public:
class ScXMLCutOffsContext : public SvXMLImportContext
{
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -471,7 +471,7 @@ public:
class ScXMLDeletionContext : public SvXMLImportContext
{
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -494,9 +494,9 @@ public:
class ScXMLMovementContext : public SvXMLImportContext
{
- ScBigRange aSourceRange;
- ScBigRange aTargetRange;
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
+ ScBigRange aSourceRange;
+ ScBigRange aTargetRange;
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -519,7 +519,7 @@ public:
class ScXMLRejectionContext : public SvXMLImportContext
{
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx
index ec66fe7f22e7..5e8b6f94d236 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +39,7 @@ class ScEditEngineTextObj;
class ScXMLTrackedChangesContext : public SvXMLImportContext
{
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx
index 947c1370fa4b..e7d3a682b2f8 100644
--- a/sc/source/filter/xml/sheetdata.cxx
+++ b/sc/source/filter/xml/sheetdata.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx
index 14fc34954564..80c4edb0a3d1 100644
--- a/sc/source/filter/xml/xmlannoi.cxx
+++ b/sc/source/filter/xml/xmlannoi.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( USHORT nPrefix,
pContext = new ScXMLContentContext(GetScImport(), nPrefix,
rLName, xAttrList, maCreateDateStringBuffer);
}
-/* else if ((nPrefix == XML_NAMESPACE_TEXT) && IsXMLToken(rLName, XML_P) )
+/* else if ((nPrefix == XML_NAMESPACE_TEXT) && IsXMLToken(rLName, XML_P) )
{
if (!bHasTextP)
{
diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx
index ad2eed21b23a..ea6cfad805b5 100644
--- a/sc/source/filter/xml/xmlannoi.hxx
+++ b/sc/source/filter/xml/xmlannoi.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx
index 00c87cd661d7..29775dedd966 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -150,18 +150,18 @@ SvXMLImportContext *ScXMLBodyContext::CreateChildContext( USHORT nPrefix,
// sal_Bool bHeading = sal_False;
switch( rTokenMap.Get( nPrefix, rLocalName ) )
{
-// case XML_TOK_TEXT_H:
-// bHeading = TRUE;
-// case XML_TOK_TEXT_P:
-// pContext = new SwXMLParaContext( GetSwImport(),nPrefix, rLocalName,
-// xAttrList, bHeading );
-// break;
-// case XML_TOK_TEXT_ORDERED_LIST:
-// bOrdered = TRUE;
-// case XML_TOK_TEXT_UNORDERED_LIST:
-// pContext = new SwXMLListBlockContext( GetSwImport(),nPrefix, rLocalName,
-// xAttrList, bOrdered );
-// break;
+// case XML_TOK_TEXT_H:
+// bHeading = TRUE;
+// case XML_TOK_TEXT_P:
+// pContext = new SwXMLParaContext( GetSwImport(),nPrefix, rLocalName,
+// xAttrList, bHeading );
+// break;
+// case XML_TOK_TEXT_ORDERED_LIST:
+// bOrdered = TRUE;
+// case XML_TOK_TEXT_UNORDERED_LIST:
+// pContext = new SwXMLListBlockContext( GetSwImport(),nPrefix, rLocalName,
+// xAttrList, bOrdered );
+// break;
case XML_TOK_BODY_TRACKED_CHANGES :
{
pChangeTrackingImportHelper = GetScImport().GetChangeTrackingImportHelper();
@@ -262,9 +262,9 @@ void ScXMLBodyContext::EndElement()
pContext->EndElement();
}
GetScImport().LockSolarMutex();
- ScMyImpDetectiveOpArray* pDetOpArray = GetScImport().GetDetectiveOpArray();
- ScDocument* pDoc = GetScImport().GetDocument();
- ScMyImpDetectiveOp aDetOp;
+ ScMyImpDetectiveOpArray* pDetOpArray = GetScImport().GetDetectiveOpArray();
+ ScDocument* pDoc = GetScImport().GetDocument();
+ ScMyImpDetectiveOp aDetOp;
if (pDoc && GetScImport().GetModel().is())
{
diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx
index e61e413ff79b..e279431f8163 100644
--- a/sc/source/filter/xml/xmlbodyi.hxx
+++ b/sc/source/filter/xml/xmlbodyi.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +36,11 @@ class ScXMLChangeTrackingImportHelper;
class ScXMLBodyContext : public SvXMLImportContext
{
- rtl::OUString sPassword;
- sal_Bool bProtected;
+ rtl::OUString sPassword;
+ sal_Bool bProtected;
sal_Bool bHadCalculationSettings;
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index ae5a7bcebe66..a443a2ccb5bb 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include <i18npool/lang.h>
#include <comphelper/extract.hxx>
-#define SC_CURRENCYSYMBOL "CurrencySymbol"
+#define SC_CURRENCYSYMBOL "CurrencySymbol"
using namespace com::sun::star;
using namespace xmloff::token;
@@ -709,7 +709,7 @@ void ScXMLTableRowCellContext::SetDetectiveObj( const table::CellAddress& rPosit
if( CellExists(rPosition) && pDetectiveObjVec && pDetectiveObjVec->size() )
{
LockSolarMutex();
- ScDetectiveFunc aDetFunc( rXMLImport.GetDocument(), rPosition.Sheet );
+ ScDetectiveFunc aDetFunc( rXMLImport.GetDocument(), rPosition.Sheet );
uno::Reference<container::XIndexAccess> xShapesIndex (rXMLImport.GetTables().GetCurrentXShapes(), uno::UNO_QUERY); // make draw page
ScMyImpDetectiveObjVec::iterator aItr(pDetectiveObjVec->begin());
ScMyImpDetectiveObjVec::iterator aEndItr(pDetectiveObjVec->end());
@@ -824,7 +824,7 @@ void ScXMLTableRowCellContext::EndElement()
bIsEmpty = sal_True;
}
sal_Bool bWasEmpty = bIsEmpty;
-// uno::Reference <table::XCell> xCell;
+// uno::Reference <table::XCell> xCell;
table::CellAddress aCurrentPos( aCellPos );
if ((pContentValidationName && pContentValidationName->getLength()) ||
mxAnnotationData.get() || pDetectiveObjVec || pCellRangeSource)
@@ -855,7 +855,7 @@ void ScXMLTableRowCellContext::EndElement()
// {
// try
// {
- // xCell.set(xCellRange->getCellByPosition(aCurrentPos.Column, aCurrentPos.Row));
+ // xCell.set(xCellRange->getCellByPosition(aCurrentPos.Column, aCurrentPos.Row));
// }
// catch (lang::IndexOutOfBoundsException&)
// {
diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx
index 6a63e785f959..7e2a40fce3ac 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,25 +57,25 @@ class ScXMLTableRowCellContext : public SvXMLImportContext
::boost::optional< FormulaWithNamespace > pOUFormula;
rtl::OUString* pContentValidationName;
::std::auto_ptr< ScXMLAnnotationData > mxAnnotationData;
- ScMyImpDetectiveObjVec* pDetectiveObjVec;
- ScMyImpCellRangeSource* pCellRangeSource;
- double fValue;
- sal_Int32 nMergedRows, nMergedCols;
- sal_Int32 nMatrixRows, nMatrixCols;
- sal_Int32 nRepeatedRows;
- sal_Int32 nCellsRepeated;
+ ScMyImpDetectiveObjVec* pDetectiveObjVec;
+ ScMyImpCellRangeSource* pCellRangeSource;
+ double fValue;
+ sal_Int32 nMergedRows, nMergedCols;
+ sal_Int32 nMatrixRows, nMatrixCols;
+ sal_Int32 nRepeatedRows;
+ sal_Int32 nCellsRepeated;
ScXMLImport& rXMLImport;
formula::FormulaGrammar::Grammar eGrammar;
- sal_Int16 nCellType;
- sal_Bool bIsMerged;
- sal_Bool bIsMatrix;
- sal_Bool bHasSubTable;
- sal_Bool bIsCovered;
- sal_Bool bIsEmpty;
- sal_Bool bHasTextImport;
- sal_Bool bIsFirstTextImport;
- sal_Bool bSolarMutexLocked;
- sal_Bool bFormulaTextResult;
+ sal_Int16 nCellType;
+ sal_Bool bIsMerged;
+ sal_Bool bIsMatrix;
+ sal_Bool bHasSubTable;
+ sal_Bool bIsCovered;
+ sal_Bool bIsEmpty;
+ sal_Bool bHasTextImport;
+ sal_Bool bIsFirstTextImport;
+ sal_Bool bSolarMutexLocked;
+ sal_Bool bFormulaTextResult;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx
index 6ea5b0192ab2..3a43a42aaa69 100644
--- a/sc/source/filter/xml/xmlcoli.cxx
+++ b/sc/source/filter/xml/xmlcoli.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -119,14 +119,14 @@ SvXMLImportContext *ScXMLTableColContext::CreateChildContext( USHORT nPrefix,
switch( rTokenMap.Get( nPrefix, rLName ) )
{
case XML_TOK_TABLE_ROW_CELL:
-// if( IsInsertCellPossible() )
+// if( IsInsertCellPossible() )
pContext = new ScXMLTableRowCellContext( GetScImport(), nPrefix,
rLName, xAttrList//,
//this
);
break;
case XML_TOK_TABLE_ROW_COVERED_CELL:
-// if( IsInsertCellPossible() )
+// if( IsInsertCellPossible() )
pContext = new ScXMLTableRowCellContext( GetScImport(), nPrefix,
rLName, xAttrList//,
//this
diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx
index 2edb496b4b28..97decb94dbc6 100644
--- a/sc/source/filter/xml/xmlcoli.hxx
+++ b/sc/source/filter/xml/xmlcoli.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +34,10 @@ class ScXMLImport;
class ScXMLTableColContext : public SvXMLImportContext
{
- sal_Int32 nColCount;
- rtl::OUString sStyleName;
- rtl::OUString sVisibility;
- rtl::OUString sCellStyleName;
+ sal_Int32 nColCount;
+ rtl::OUString sStyleName;
+ rtl::OUString sVisibility;
+ rtl::OUString sCellStyleName;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -61,13 +61,13 @@ public:
class ScXMLTableColsContext : public SvXMLImportContext
{
- sal_Int32 nHeaderStartCol;
- sal_Int32 nHeaderEndCol;
- sal_Int32 nGroupStartCol;
- sal_Int32 nGroupEndCol;
- sal_Bool bHeader;
- sal_Bool bGroup;
- sal_Bool bGroupDisplay;
+ sal_Int32 nHeaderStartCol;
+ sal_Int32 nHeaderEndCol;
+ sal_Int32 nGroupStartCol;
+ sal_Int32 nGroupEndCol;
+ sal_Bool bHeader;
+ sal_Bool bGroup;
+ sal_Bool bGroupDisplay;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx
index 3a0f5ef3126e..2f424ef52a5c 100644
--- a/sc/source/filter/xml/xmlconti.cxx
+++ b/sc/source/filter/xml/xmlconti.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx
index 83151a934d48..ae1aa404fa89 100644
--- a/sc/source/filter/xml/xmlconti.hxx
+++ b/sc/source/filter/xml/xmlconti.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx
index 451b085afe9e..6b9179b8c40a 100644
--- a/sc/source/filter/xml/xmlcvali.cxx
+++ b/sc/source/filter/xml/xmlcvali.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ class ScXMLContentValidationContext : public SvXMLImportContext
sal_Bool bDisplayHelp;
sal_Bool bDisplayError;
- SvXMLImportContextRef xEventContext;
+ SvXMLImportContextRef xEventContext;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -99,10 +99,10 @@ public:
class ScXMLHelpMessageContext : public SvXMLImportContext
{
- rtl::OUString sTitle;
- rtl::OUStringBuffer sMessage;
- sal_Int32 nParagraphCount;
- sal_Bool bDisplay;
+ rtl::OUString sTitle;
+ rtl::OUStringBuffer sMessage;
+ sal_Int32 nParagraphCount;
+ sal_Bool bDisplay;
ScXMLContentValidationContext* pValidationContext;
@@ -129,11 +129,11 @@ public:
class ScXMLErrorMessageContext : public SvXMLImportContext
{
- rtl::OUString sTitle;
- rtl::OUStringBuffer sMessage;
- rtl::OUString sMessageType;
- sal_Int32 nParagraphCount;
- sal_Bool bDisplay;
+ rtl::OUString sTitle;
+ rtl::OUStringBuffer sMessage;
+ rtl::OUString sMessageType;
+ sal_Int32 nParagraphCount;
+ sal_Bool bDisplay;
ScXMLContentValidationContext* pValidationContext;
@@ -160,10 +160,10 @@ public:
class ScXMLErrorMacroContext : public SvXMLImportContext
{
- rtl::OUString sName;
- sal_Bool bExecute;
+ rtl::OUString sName;
+ sal_Bool bExecute;
- ScXMLContentValidationContext* pValidationContext;
+ ScXMLContentValidationContext* pValidationContext;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
diff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxx
index 226d2e2d91b5..443efc9ccfd8 100644
--- a/sc/source/filter/xml/xmlcvali.hxx
+++ b/sc/source/filter/xml/xmlcvali.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx
index ba107347b46a..d9b1f6b4ec7b 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -167,17 +167,17 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport,
{
sGrandTotal = sValue;
if (IsXMLToken(sValue, XML_BOTH))
- {
+ {
maRowGrandTotal.mbVisible = true;
maColGrandTotal.mbVisible = true;
}
else if (IsXMLToken(sValue, XML_ROW))
- {
+ {
maRowGrandTotal.mbVisible = true;
maColGrandTotal.mbVisible = false;
}
else if (IsXMLToken(sValue, XML_COLUMN))
- {
+ {
maRowGrandTotal.mbVisible = false;
maColGrandTotal.mbVisible = true;
}
@@ -288,7 +288,7 @@ SvXMLImportContext *ScXMLDataPilotTableContext::CreateChildContext( USHORT nPref
}
void ScXMLDataPilotTableContext::SetButtons()
-{
+{
ScDPOutputGeometry aGeometry(aTargetRangeAddress, bShowFilter, ScDPOutputGeometry::ODF);
aGeometry.setColumnFieldCount(mnColFieldCount);
aGeometry.setRowFieldCount(mnRowFieldCount);
@@ -312,7 +312,7 @@ void ScXMLDataPilotTableContext::SetButtons()
if (eType == ScDPOutputGeometry::Column || eType == ScDPOutputGeometry::Row)
nMFlag |= SC_MF_BUTTON_POPUP;
- // Use the cell's string value to see if this field contains a
+ // Use the cell's string value to see if this field contains a
// hidden member. Isn't there a better way? GetString() is
// quite expensive...
String aCellStr;
@@ -333,8 +333,8 @@ void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim, bool bHas
{
if (pDPSave)
{
- // #91045# if a dimension with that name has already been inserted,
- // mark the new one as duplicate
+ // #91045# if a dimension with that name has already been inserted,
+ // mark the new one as duplicate
if ( !pDim->IsDataLayout() &&
pDPSave->GetExistingDimensionByName(pDim->GetName()) )
pDim->SetDupFlag( TRUE );
@@ -362,7 +362,7 @@ void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim, bool bHas
if (bHasHiddenMember)
{
- // the layout name takes priority over the original name,
+ // the layout name takes priority over the original name,
// since this data is used against cell values.
const OUString* pLayoutName = pDim->GetLayoutName();
if (pLayoutName)
@@ -449,7 +449,7 @@ void ScXMLDataPilotTableContext::EndElement()
pDPSave->SetRowGrand(maRowGrandTotal.mbVisible);
pDPSave->SetColumnGrand(maColGrandTotal.mbVisible);
if (maRowGrandTotal.maDisplayName.getLength())
- // TODO: Right now, we only support one grand total name for both
+ // TODO: Right now, we only support one grand total name for both
// column and row totals. Take the value from the row total for
// now.
pDPSave->SetGrandTotalName(maRowGrandTotal.maDisplayName);
@@ -793,7 +793,7 @@ ScXMLDataPilotGrandTotalContext::~ScXMLDataPilotGrandTotalContext()
{
}
-SvXMLImportContext* ScXMLDataPilotGrandTotalContext::CreateChildContext(
+SvXMLImportContext* ScXMLDataPilotGrandTotalContext::CreateChildContext(
USHORT /*nPrefix*/, const ::rtl::OUString& /*rLocalName*/, const Reference<XAttributeList>& /*xAttrList*/ )
{
return NULL;
@@ -958,7 +958,7 @@ ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport,
}
}
if (bHasName)
- {
+ {
pDim = new ScDPSaveDimension(String(sName), bDataLayout);
if (aDisplayName.getLength())
pDim->SetLayoutName(aDisplayName);
@@ -1034,7 +1034,7 @@ void ScXMLDataPilotFieldContext::EndElement()
}
pDataPilotTable->AddDimension(pDim, mbHasHiddenMember);
if (bIsGroupField)
- {
+ {
ScDPNumGroupInfo aInfo;
aInfo.Enable = sal_True;
aInfo.DateValues = bDateValue;
@@ -1748,7 +1748,7 @@ ScXMLDataPilotGroupContext::ScXMLDataPilotGroupContext( ScXMLImport& rImport,
USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
sAttrName, &aLocalName );
rtl::OUString sValue = xAttrList->getValueByIndex( i );
-
+
if (nPrefix == XML_NAMESPACE_TABLE)
{
if (IsXMLToken(aLocalName, XML_NAME))
diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx
index 32300138bc3b..e136fb2d04ee 100644
--- a/sc/source/filter/xml/xmldpimp.hxx
+++ b/sc/source/filter/xml/xmldpimp.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,42 +88,42 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext
bool mbVisible;
GrandTotalItem();
};
- ScDocument* pDoc;
- ScDPObject* pDPObject;
- ScDPSaveData* pDPSave;
+ ScDocument* pDoc;
+ ScDPObject* pDPObject;
+ ScDPSaveData* pDPSave;
ScDPDimensionSaveData* pDPDimSaveData;
GrandTotalItem maRowGrandTotal;
GrandTotalItem maColGrandTotal;
- rtl::OUString sDataPilotTableName;
- rtl::OUString sApplicationData;
- rtl::OUString sGrandTotal;
- rtl::OUString sDatabaseName;
- rtl::OUString sSourceObject;
- rtl::OUString sServiceName;
- rtl::OUString sServiceSourceName;
- rtl::OUString sServiceSourceObject;
- rtl::OUString sServiceUsername;
- rtl::OUString sServicePassword;
- rtl::OUString sButtons;
- ScRange aSourceCellRangeAddress;
- ScRange aTargetRangeAddress;
- ScRange aFilterSourceRange;
- ScAddress aFilterOutputPosition;
- ScQueryParam aSourceQueryParam;
- ScMySourceType nSourceType;
+ rtl::OUString sDataPilotTableName;
+ rtl::OUString sApplicationData;
+ rtl::OUString sGrandTotal;
+ rtl::OUString sDatabaseName;
+ rtl::OUString sSourceObject;
+ rtl::OUString sServiceName;
+ rtl::OUString sServiceSourceName;
+ rtl::OUString sServiceSourceObject;
+ rtl::OUString sServiceUsername;
+ rtl::OUString sServicePassword;
+ rtl::OUString sButtons;
+ ScRange aSourceCellRangeAddress;
+ ScRange aTargetRangeAddress;
+ ScRange aFilterSourceRange;
+ ScAddress aFilterOutputPosition;
+ ScQueryParam aSourceQueryParam;
+ ScMySourceType nSourceType;
sal_uInt32 mnRowFieldCount;
sal_uInt32 mnColFieldCount;
sal_uInt32 mnPageFieldCount;
sal_uInt32 mnDataFieldCount;
- sal_Bool bIsNative;
- sal_Bool bIgnoreEmptyRows;
- sal_Bool bIdentifyCategories;
- sal_Bool bUseRegularExpression;
- sal_Bool bIsCaseSensitive;
- sal_Bool bSkipDuplicates;
- sal_Bool bFilterCopyOutputData;
- sal_Bool bTargetRangeAddress;
- sal_Bool bSourceCellRange;
+ sal_Bool bIsNative;
+ sal_Bool bIgnoreEmptyRows;
+ sal_Bool bIdentifyCategories;
+ sal_Bool bUseRegularExpression;
+ sal_Bool bIsCaseSensitive;
+ sal_Bool bSkipDuplicates;
+ sal_Bool bFilterCopyOutputData;
+ sal_Bool bTargetRangeAddress;
+ sal_Bool bSourceCellRange;
sal_Bool bShowFilter;
sal_Bool bDrillDown;
@@ -157,12 +157,12 @@ public:
void SetServicePassword(const rtl::OUString& sValue) { sServicePassword = sValue; }
void SetSourceCellRangeAddress(const ScRange& aValue) { aSourceCellRangeAddress = aValue; bSourceCellRange = sal_True; }
void SetSourceQueryParam(const ScQueryParam& aValue) { aSourceQueryParam = aValue; }
-// void SetFilterUseRegularExpressions(const sal_Bool bValue) { aSourceQueryParam.bRegExp = bValue; }
+// void SetFilterUseRegularExpressions(const sal_Bool bValue) { aSourceQueryParam.bRegExp = bValue; }
void SetFilterOutputPosition(const ScAddress& aValue) { aFilterOutputPosition = aValue; }
void SetFilterCopyOutputData(const sal_Bool bValue) { bFilterCopyOutputData = bValue; }
void SetFilterSourceRange(const ScRange& aValue) { aFilterSourceRange = aValue; }
-// void SetFilterIsCaseSensitive(const sal_Bool bValue) { aSourceQueryParam.bCaseSens = bValue; }
-// void SetFilterSkipDuplicates(const sal_Bool bValue) { aSourceQueryParam.bDuplicate = !bValue; }
+// void SetFilterIsCaseSensitive(const sal_Bool bValue) { aSourceQueryParam.bCaseSens = bValue; }
+// void SetFilterSkipDuplicates(const sal_Bool bValue) { aSourceQueryParam.bDuplicate = !bValue; }
void AddDimension(ScDPSaveDimension* pDim, bool bHasHiddenMember);
void AddGroupDim(const ScDPSaveNumGroupDimension& aNumGroupDim);
void AddGroupDim(const ScDPSaveGroupDimension& aGroupDim);
@@ -171,7 +171,7 @@ public:
class ScXMLDPSourceSQLContext : public SvXMLImportContext
{
- ScXMLDataPilotTableContext* pDataPilotTable;
+ ScXMLDataPilotTableContext* pDataPilotTable;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -196,7 +196,7 @@ public:
class ScXMLDPSourceTableContext : public SvXMLImportContext
{
- ScXMLDataPilotTableContext* pDataPilotTable;
+ ScXMLDataPilotTableContext* pDataPilotTable;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -221,7 +221,7 @@ public:
class ScXMLDPSourceQueryContext : public SvXMLImportContext
{
- ScXMLDataPilotTableContext* pDataPilotTable;
+ ScXMLDataPilotTableContext* pDataPilotTable;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -246,7 +246,7 @@ public:
class ScXMLSourceServiceContext : public SvXMLImportContext
{
- ScXMLDataPilotTableContext* pDataPilotTable;
+ ScXMLDataPilotTableContext* pDataPilotTable;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -279,11 +279,11 @@ class ScXMLDataPilotGrandTotalContext : public SvXMLImportContext
::rtl::OUString maDisplayName;
Orientation meOrientation;
bool mbVisible;
-
+
public:
- ScXMLDataPilotGrandTotalContext(
+ ScXMLDataPilotGrandTotalContext(
ScXMLImport& rImport, USHORT nPrefix, const ::rtl::OUString& rLName,
- const ::com::sun::star::uno::Reference<
+ const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList,
ScXMLDataPilotTableContext* pTableContext );
@@ -299,7 +299,7 @@ public:
class ScXMLSourceCellRangeContext : public SvXMLImportContext
{
- ScXMLDataPilotTableContext* pDataPilotTable;
+ ScXMLDataPilotTableContext* pDataPilotTable;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -330,8 +330,8 @@ struct ScXMLDataPilotGroup
class ScXMLDataPilotFieldContext : public SvXMLImportContext
{
- ScXMLDataPilotTableContext* pDataPilotTable;
- ScDPSaveDimension* pDim;
+ ScXMLDataPilotTableContext* pDataPilotTable;
+ ScDPSaveDimension* pDim;
::std::vector<ScXMLDataPilotGroup> aGroups;
rtl::OUString sGroupSource;
@@ -340,11 +340,11 @@ class ScXMLDataPilotFieldContext : public SvXMLImportContext
double fStart;
double fEnd;
double fStep;
- sal_Int32 nUsedHierarchy;
+ sal_Int32 nUsedHierarchy;
sal_Int32 nGroupPart;
- sal_Int16 nFunction;
- sal_Int16 nOrientation;
- sal_Bool bShowEmpty:1;
+ sal_Int16 nFunction;
+ sal_Int16 nOrientation;
+ sal_Bool bShowEmpty:1;
sal_Bool bSelectedPage:1;
sal_Bool bIsGroupField:1;
sal_Bool bDateValue:1;
@@ -380,7 +380,7 @@ public:
void SetAutoShowInfo(const com::sun::star::sheet::DataPilotFieldAutoShowInfo& aInfo) { if (pDim) pDim->SetAutoShowInfo(&aInfo); }
void SetSortInfo(const com::sun::star::sheet::DataPilotFieldSortInfo& aInfo) { if (pDim) pDim->SetSortInfo(&aInfo); }
void SetLayoutInfo(const com::sun::star::sheet::DataPilotFieldLayoutInfo& aInfo) { if (pDim) pDim->SetLayoutInfo(&aInfo); }
- void SetGrouping(const rtl::OUString& rGroupSource, const double& rStart, const double& rEnd, const double& rStep,
+ void SetGrouping(const rtl::OUString& rGroupSource, const double& rStart, const double& rEnd, const double& rStep,
sal_Int32 nPart, sal_Bool bDate, sal_Bool bAutoSt, sal_Bool bAutoE)
{
bIsGroupField = sal_True;
@@ -416,7 +416,7 @@ public:
class ScXMLDataPilotLevelContext : public SvXMLImportContext
{
- ScXMLDataPilotFieldContext* pDataPilotField;
+ ScXMLDataPilotFieldContext* pDataPilotField;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -497,8 +497,8 @@ class ScXMLDataPilotSubTotalsContext : public SvXMLImportContext
{
ScXMLDataPilotFieldContext* pDataPilotField;
- sal_Int16 nFunctionCount;
- sal_uInt16* pFunctions;
+ sal_Int16 nFunctionCount;
+ sal_uInt16* pFunctions;
::rtl::OUString maDisplayName;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
@@ -528,7 +528,7 @@ public:
class ScXMLDataPilotSubTotalContext : public SvXMLImportContext
{
- ScXMLDataPilotSubTotalsContext* pDataPilotSubTotals;
+ ScXMLDataPilotSubTotalsContext* pDataPilotSubTotals;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -578,12 +578,12 @@ public:
class ScXMLDataPilotMemberContext : public SvXMLImportContext
{
- ScXMLDataPilotFieldContext* pDataPilotField;
+ ScXMLDataPilotFieldContext* pDataPilotField;
rtl::OUString sName;
rtl::OUString maDisplayName;
- sal_Bool bDisplay;
- sal_Bool bDisplayDetails;
+ sal_Bool bDisplay;
+ sal_Bool bDisplayDetails;
sal_Bool bHasName;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
@@ -609,7 +609,7 @@ public:
class ScXMLDataPilotGroupsContext : public SvXMLImportContext
{
- ScXMLDataPilotFieldContext* pDataPilotField;
+ ScXMLDataPilotFieldContext* pDataPilotField;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -634,7 +634,7 @@ public:
class ScXMLDataPilotGroupContext : public SvXMLImportContext
{
- ScXMLDataPilotFieldContext* pDataPilotField;
+ ScXMLDataPilotFieldContext* pDataPilotField;
rtl::OUString sName;
::std::vector<rtl::OUString> aMembers;
@@ -664,7 +664,7 @@ public:
class ScXMLDataPilotGroupMemberContext : public SvXMLImportContext
{
- ScXMLDataPilotGroupContext* pDataPilotGroup;
+ ScXMLDataPilotGroupContext* pDataPilotGroup;
rtl::OUString sName;
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx
index c5731dfc28fb..035a08927ad6 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +61,9 @@
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/xml/sax/XLocator.hpp>
-#define SC_ENABLEUSERSORTLIST "EnableUserSortList"
-#define SC_USERSORTLISTINDEX "UserSortListIndex"
-#define SC_USERLIST "UserList"
+#define SC_ENABLEUSERSORTLIST "EnableUserSortList"
+#define SC_USERSORTLISTINDEX "UserSortListIndex"
+#define SC_USERLIST "UserList"
using namespace com::sun::star;
using namespace xmloff::token;
diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx
index e170c9eb84c0..703ea3160e9d 100644
--- a/sc/source/filter/xml/xmldrani.hxx
+++ b/sc/source/filter/xml/xmldrani.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +70,11 @@ struct ScSubTotalRule
class ScXMLDatabaseRangeContext : public SvXMLImportContext
{
- rtl::OUString sDatabaseRangeName;
+ rtl::OUString sDatabaseRangeName;
rtl::OUString sConnectionRessource;
- rtl::OUString sRangeAddress;
- rtl::OUString sDatabaseName;
- rtl::OUString sSourceObject;
+ rtl::OUString sRangeAddress;
+ rtl::OUString sDatabaseName;
+ rtl::OUString sSourceObject;
com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aSortSequence;
com::sun::star::uno::Sequence <com::sun::star::sheet::TableFilterField2> aFilterFields;
std::vector < ScSubTotalRule > aSubTotalRules;
@@ -82,29 +82,29 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext
com::sun::star::table::CellRangeAddress aFilterConditionSourceRangeAddress;
com::sun::star::sheet::DataImportMode nSourceType;
com::sun::star::table::TableOrientation eOrientation;
- sal_Int32 nRefresh;
- sal_Int16 nSubTotalsUserListIndex;
- sal_Int16 nSubTotalRuleGroupFieldNumber;
- sal_Bool bContainsSort;
- sal_Bool bContainsSubTotal;
- sal_Bool bNative;
- sal_Bool bIsSelection;
- sal_Bool bKeepFormats;
- sal_Bool bMoveCells;
- sal_Bool bStripData;
- sal_Bool bContainsHeader;
- sal_Bool bAutoFilter;
- sal_Bool bSubTotalsBindFormatsToContent;
- sal_Bool bSubTotalsIsCaseSensitive;
- sal_Bool bSubTotalsInsertPageBreaks;
- sal_Bool bSubTotalsSortGroups;
- sal_Bool bSubTotalsEnabledUserList;
- sal_Bool bSubTotalsAscending;
- sal_Bool bFilterCopyOutputData;
- sal_Bool bFilterIsCaseSensitive;
- sal_Bool bFilterSkipDuplicates;
- sal_Bool bFilterUseRegularExpressions;
- sal_Bool bFilterConditionSourceRange;
+ sal_Int32 nRefresh;
+ sal_Int16 nSubTotalsUserListIndex;
+ sal_Int16 nSubTotalRuleGroupFieldNumber;
+ sal_Bool bContainsSort;
+ sal_Bool bContainsSubTotal;
+ sal_Bool bNative;
+ sal_Bool bIsSelection;
+ sal_Bool bKeepFormats;
+ sal_Bool bMoveCells;
+ sal_Bool bStripData;
+ sal_Bool bContainsHeader;
+ sal_Bool bAutoFilter;
+ sal_Bool bSubTotalsBindFormatsToContent;
+ sal_Bool bSubTotalsIsCaseSensitive;
+ sal_Bool bSubTotalsInsertPageBreaks;
+ sal_Bool bSubTotalsSortGroups;
+ sal_Bool bSubTotalsEnabledUserList;
+ sal_Bool bSubTotalsAscending;
+ sal_Bool bFilterCopyOutputData;
+ sal_Bool bFilterIsCaseSensitive;
+ sal_Bool bFilterSkipDuplicates;
+ sal_Bool bFilterUseRegularExpressions;
+ sal_Bool bFilterConditionSourceRange;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index ca5403e3b18d..91f5ff45ce9a 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -145,21 +145,21 @@
#define SC_STANDARDFORMAT "StandardFormat"
#define SC_LAYERID "LayerID"
-#define SC_DEFAULT_TABLE_COUNT 3
-#define SC_VIEWCHANGES_COUNT 13
-#define SC_SHOW_CHANGES 0
-#define SC_SHOW_ACCEPTED_CHANGES 1
-#define SC_SHOW_REJECTED_CHANGES 2
-#define SC_SHOW_CHANGES_BY_DATETIME 3
-#define SC_SHOW_CHANGES_BY_DATETIME_MODE 4
-#define SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME 5
-#define SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME 6
-#define SC_SHOW_CHANGES_BY_AUTHOR 7
-#define SC_SHOW_CHANGES_BY_AUTHOR_NAME 8
-#define SC_SHOW_CHANGES_BY_COMMENT 9
-#define SC_SHOW_CHANGES_BY_COMMENT_TEXT 10
-#define SC_SHOW_CHANGES_BY_RANGES 11
-#define SC_SHOW_CHANGES_BY_RANGES_LIST 12
+#define SC_DEFAULT_TABLE_COUNT 3
+#define SC_VIEWCHANGES_COUNT 13
+#define SC_SHOW_CHANGES 0
+#define SC_SHOW_ACCEPTED_CHANGES 1
+#define SC_SHOW_REJECTED_CHANGES 2
+#define SC_SHOW_CHANGES_BY_DATETIME 3
+#define SC_SHOW_CHANGES_BY_DATETIME_MODE 4
+#define SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME 5
+#define SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME 6
+#define SC_SHOW_CHANGES_BY_AUTHOR 7
+#define SC_SHOW_CHANGES_BY_AUTHOR_NAME 8
+#define SC_SHOW_CHANGES_BY_COMMENT 9
+#define SC_SHOW_CHANGES_BY_COMMENT_TEXT 10
+#define SC_SHOW_CHANGES_BY_RANGES 11
+#define SC_SHOW_CHANGES_BY_RANGES_LIST 12
using namespace rtl;
using namespace formula;
@@ -216,7 +216,7 @@ OUString lcl_GetRawString( ScDocument* pDoc, const ScAddress& rPos )
}
}
}
- }
+ }
return aVal;
}
} // anonymous namespace
@@ -458,7 +458,7 @@ sal_Int16 ScXMLExport::GetFieldUnit()
ScXMLExport::ScXMLExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
const sal_uInt16 nExportFlag)
-: SvXMLExport( xServiceFactory, SvXMLUnitConverter::GetMapUnit(GetFieldUnit()), XML_SPREADSHEET, nExportFlag ),
+: SvXMLExport( xServiceFactory, SvXMLUnitConverter::GetMapUnit(GetFieldUnit()), XML_SPREADSHEET, nExportFlag ),
pDoc(NULL),
nSourceStreamPos(0),
pNumberFormatAttributesExportHelper(NULL),
@@ -847,7 +847,7 @@ void ScXMLExport::_ExportMeta()
void ScXMLExport::_ExportFontDecls()
{
- GetFontAutoStylePool(); // make sure the pool is created
+ GetFontAutoStylePool(); // make sure the pool is created
SvXMLExport::_ExportFontDecls();
}
@@ -1882,7 +1882,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed )
if (pSharedData->HasShapes())
{
GetShapeExport()->ExportGraphicDefaults();
-/* xInterface = xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults")));
+/* xInterface = xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults")));
uno::Reference <beans::XPropertySet> xDrawProperties(xInterface, uno::UNO_QUERY);
if (xDrawProperties.is())
aStylesExp.exportDefaultStyle(xDrawProperties, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), GetShapeExport()->CreateShapePropMapper(*this));*/
@@ -2690,10 +2690,10 @@ void ScXMLExport::CollectInternalShape( uno::Reference< drawing::XShape > xShape
// other objects from internal layer only (detective)
else if( pObject->GetLayer() == SC_LAYER_INTERN )
{
- ScDetectiveFunc aDetFunc( pDoc, static_cast<SCTAB>(nCurrentTable) );
- ScAddress aPosition;
- ScRange aSourceRange;
- sal_Bool bRedLine;
+ ScDetectiveFunc aDetFunc( pDoc, static_cast<SCTAB>(nCurrentTable) );
+ ScAddress aPosition;
+ ScRange aSourceRange;
+ sal_Bool bRedLine;
ScDetectiveObjType eObjType = aDetFunc.GetDetectiveObjectType(
pObject, nCurrentTable, aPosition, aSourceRange, bRedLine );
pSharedData->GetDetectiveObjContainer()->AddObject( eObjType, static_cast<SCTAB>(nCurrentTable), aPosition, aSourceRange, bRedLine );
@@ -2839,7 +2839,7 @@ sal_Bool ScXMLExport::IsMatrix (const ScAddress& aCell,
return sal_False;
-/* uno::Reference <sheet::XArrayFormulaRange> xArrayFormulaRange (xCell, uno::UNO_QUERY);
+/* uno::Reference <sheet::XArrayFormulaRange> xArrayFormulaRange (xCell, uno::UNO_QUERY);
if (xArrayFormulaRange.is())
{
rtl::OUString sArrayFormula(xArrayFormulaRange->getArrayFormula());
@@ -2884,17 +2884,17 @@ sal_Bool ScXMLExport::GetCellText (ScMyCell& rMyCell, const ScAddress& aPos) con
return sal_True;
else
{
-/* if (!rMyCell.bHasXText)
+/* if (!rMyCell.bHasXText)
{
rMyCell.xText.set(xCurrentTableCellRange->getCellByPosition(rMyCell.aCellAddress.Column, rMyCell.aCellAddress.Row), uno::UNO_QUERY);
rMyCell.bHasXText = sal_True;
}*/
-// if (rMyCell.xText.is())
-// {
+// if (rMyCell.xText.is())
+// {
rMyCell.sStringValue = ScCellObj::GetOutputString_Impl(pDoc, aPos);
rMyCell.bHasStringValue = sal_True;
return sal_True;
-// }
+// }
}
}
@@ -3032,7 +3032,7 @@ void ScXMLExport::WriteCell (ScMyCell& aCell)
if (!bIsEmpty)
{
- if ((aCell.nType == table::CellContentType_TEXT && IsEditCell(aCell)) ||
+ if ((aCell.nType == table::CellContentType_TEXT && IsEditCell(aCell)) ||
(aCell.nType == table::CellContentType_FORMULA && IsMultiLineFormulaCell(aCell)))
{
bEditCell = sal_True;
@@ -3056,7 +3056,7 @@ void ScXMLExport::WriteCell (ScMyCell& aCell)
void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, awt::Point* pPoint)
{
uno::Reference < beans::XPropertySet > xShapeProps ( xShape, uno::UNO_QUERY );
-//BM sal_Bool bMemChart(sal_False); // das muss man jetzt umbenennen :-)
+//BM sal_Bool bMemChart(sal_False); // das muss man jetzt umbenennen :-)
bool bIsChart( false );
rtl::OUString sPropCLSID (RTL_CONSTASCII_USTRINGPARAM("CLSID"));
rtl::OUString sPropModel (RTL_CONSTASCII_USTRINGPARAM("Model"));
@@ -3145,50 +3145,50 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape,
}
}
-//BM rtl::OUString sOUName;
-//BM xShapeProps->getPropertyValue(sPersistName) >>= sOUName;
-//BM String sName(sOUName);
-//BM if (!pChartListener)
-//BM {
-//BM String aEmptyString;
-//BM ScRange aRange;
-//BM pChartListener = new ScChartListener ( aEmptyString, GetDocument(), aRange );
-//BM }
-//BM if(pChartListener)
-//BM {
-//BM USHORT nIndex(0);
-//BM pChartListener->SetString( sName );
-//BM if ( GetDocument() && GetDocument()->GetChartListenerCollection()->Search( pChartListener, nIndex ) )
-//BM {
-//BM const ScRangeListRef& rRangeListRef(((ScChartListener*)
-//BM (GetDocument()->GetChartListenerCollection()->
-//BM At( nIndex )))->GetRangeList());
-//BM if (rRangeListRef.Is())
-//BM {
-//BM bMemChart = sal_True;
-//BM rtl::OUString sRanges;
-//BM ScRangeStringConverter::GetStringFromRangeList(sRanges, rRangeListRef, GetDocument());
+//BM rtl::OUString sOUName;
+//BM xShapeProps->getPropertyValue(sPersistName) >>= sOUName;
+//BM String sName(sOUName);
+//BM if (!pChartListener)
+//BM {
+//BM String aEmptyString;
+//BM ScRange aRange;
+//BM pChartListener = new ScChartListener ( aEmptyString, GetDocument(), aRange );
+//BM }
+//BM if(pChartListener)
+//BM {
+//BM USHORT nIndex(0);
+//BM pChartListener->SetString( sName );
+//BM if ( GetDocument() && GetDocument()->GetChartListenerCollection()->Search( pChartListener, nIndex ) )
+//BM {
+//BM const ScRangeListRef& rRangeListRef(((ScChartListener*)
+//BM (GetDocument()->GetChartListenerCollection()->
+//BM At( nIndex )))->GetRangeList());
+//BM if (rRangeListRef.Is())
+//BM {
+//BM bMemChart = sal_True;
+//BM rtl::OUString sRanges;
+//BM ScRangeStringConverter::GetStringFromRangeList(sRanges, rRangeListRef, GetDocument());
//BM SvXMLAttributeList* pAttrList = NULL;
-//BM if (sRanges.getLength())
+//BM if (sRanges.getLength())
//BM {
//BM pAttrList = new SvXMLAttributeList();
//BM pAttrList->AddAttribute(
//BM GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_DRAW, GetXMLToken(XML_NOTIFY_ON_UPDATE_OF_RANGES) ), sRanges );
//BM }
-//BM GetShapeExport()->exportShape(xShape, SEF_EXPORT_NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList);
-//BM }
-//BM }
-//BM else
-//BM {
-//BM bMemChart = sal_True;
+//BM GetShapeExport()->exportShape(xShape, SEF_EXPORT_NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList);
+//BM }
+//BM }
+//BM else
+//BM {
+//BM bMemChart = sal_True;
//BM SvXMLAttributeList* pAttrList = new SvXMLAttributeList();
//BM pAttrList->AddAttribute(
//BM GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_DRAW, GetXMLToken(XML_NOTIFY_ON_UPDATE_OF_RANGES) ), rtl::OUString() );
-//BM GetShapeExport()->exportShape(xShape, SEF_EXPORT_NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList);
-//BM }
-//BM }
+//BM GetShapeExport()->exportShape(xShape, SEF_EXPORT_NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList);
+//BM }
+//BM }
-/* SchMemChart* pMemChart = pDoc->FindChartData(sName);
+/* SchMemChart* pMemChart = pDoc->FindChartData(sName);
if (pMemChart && pMemChart->GetSeriesAddresses().getLength())
{
bMemChart = sal_True;
@@ -3365,7 +3365,7 @@ void ScXMLExport::WriteAnnotation(ScMyCell& rMyCell)
{
if( rMyCell.bHasAnnotation && rMyCell.xAnnotation.is())
{
-/* rtl::OUString sAuthor(rMyCell.xAnnotation->getAuthor());
+/* rtl::OUString sAuthor(rMyCell.xAnnotation->getAuthor());
if (sAuthor.getLength())
{
SvXMLElementExport aCreatorElem( *this, XML_NAMESPACE_DC,
@@ -3530,7 +3530,7 @@ sal_Bool ScXMLExport::IsMultiLineFormulaCell(ScMyCell& rCell) const
return static_cast<ScFormulaCell*>(rCell.pBaseCell)->IsMultilineResult();
}
- ScAddress aAddr(static_cast<SCCOL>(rCell.aCellAddress.Column),
+ ScAddress aAddr(static_cast<SCCOL>(rCell.aCellAddress.Column),
static_cast<SCROW>(rCell.aCellAddress.Row),
static_cast<SCTAB>(rCell.aCellAddress.Sheet));
ScBaseCell* pBaseCell = pDoc ? pDoc->GetCell(aAddr) : NULL;
@@ -3549,7 +3549,7 @@ sal_Bool ScXMLExport::IsMultiLineFormulaCell(ScMyCell& rCell) const
//UNUSED2008-05 {
//UNUSED2008-05 // no longer compareable, because the position and size and other attributes can also differ
//UNUSED2008-05
-//UNUSED2008-05 /* uno::Reference<sheet::XSheetAnnotationAnchor> xSheetAnnotationAnchor1(xCell1, uno::UNO_QUERY);
+//UNUSED2008-05 /* uno::Reference<sheet::XSheetAnnotationAnchor> xSheetAnnotationAnchor1(xCell1, uno::UNO_QUERY);
//UNUSED2008-05 uno::Reference<sheet::XSheetAnnotationAnchor> xSheetAnnotationAnchor2(xCell2, uno::UNO_QUERY);
//UNUSED2008-05 if (xSheetAnnotationAnchor1.is() && xSheetAnnotationAnchor2.is())
//UNUSED2008-05 {
@@ -3811,9 +3811,9 @@ void ScXMLExport::WriteScenario()
{
if (pDoc && pDoc->IsScenario(static_cast<SCTAB>(nCurrentTable)))
{
- String sComment;
- Color aColor;
- sal_uInt16 nFlags;
+ String sComment;
+ Color aColor;
+ sal_uInt16 nFlags;
pDoc->GetScenarioData(static_cast<SCTAB>(nCurrentTable), sComment, aColor, nFlags);
if (!(nFlags & SC_SCENARIO_SHOWFRAME))
AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_BORDER, XML_FALSE);
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index e024fc6a0de0..f8003c419b85 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,44 +69,44 @@ typedef std::vector< com::sun::star::uno::Reference < com::sun::star::drawing::X
class ScXMLExport : public SvXMLExport
{
- ScDocument* pDoc;
+ ScDocument* pDoc;
com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheet> xCurrentTable;
com::sun::star::uno::Reference <com::sun::star::table::XCellRange> xCurrentTableCellRange;
com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xSourceStream;
sal_Int32 nSourceStreamPos;
- UniReference < XMLPropertyHandlerFactory > xScPropHdlFactory;
- UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper;
- UniReference < XMLPropertySetMapper > xColumnStylesPropertySetMapper;
- UniReference < XMLPropertySetMapper > xRowStylesPropertySetMapper;
- UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper;
- UniReference < SvXMLExportPropertyMapper > xCellStylesExportPropertySetMapper;
- UniReference < SvXMLExportPropertyMapper > xColumnStylesExportPropertySetMapper;
- UniReference < SvXMLExportPropertyMapper > xRowStylesExportPropertySetMapper;
- UniReference < SvXMLExportPropertyMapper > xTableStylesExportPropertySetMapper;
+ UniReference < XMLPropertyHandlerFactory > xScPropHdlFactory;
+ UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper;
+ UniReference < XMLPropertySetMapper > xColumnStylesPropertySetMapper;
+ UniReference < XMLPropertySetMapper > xRowStylesPropertySetMapper;
+ UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper;
+ UniReference < SvXMLExportPropertyMapper > xCellStylesExportPropertySetMapper;
+ UniReference < SvXMLExportPropertyMapper > xColumnStylesExportPropertySetMapper;
+ UniReference < SvXMLExportPropertyMapper > xRowStylesExportPropertySetMapper;
+ UniReference < SvXMLExportPropertyMapper > xTableStylesExportPropertySetMapper;
XMLNumberFormatAttributesExportHelper* pNumberFormatAttributesExportHelper;
typedef ::std::hash_map<sal_Int32, sal_Int32> NumberFormatIndexMap;
NumberFormatIndexMap aNumFmtIndexMap;
- ScMySharedData* pSharedData;
- ScColumnStyles* pColumnStyles;
- ScRowStyles* pRowStyles;
- ScFormatRangeStyles* pCellStyles;
- ScRowFormatRanges* pRowFormatRanges;
- std::vector<rtl::OUString> aTableStyles;
- com::sun::star::table::CellRangeAddress aRowHeaderRange;
- ScMyOpenCloseColumnRowGroup* pGroupColumns;
- ScMyOpenCloseColumnRowGroup* pGroupRows;
- ScMyDefaultStyles* pDefaults;
- ScChartListener* pChartListener;
+ ScMySharedData* pSharedData;
+ ScColumnStyles* pColumnStyles;
+ ScRowStyles* pRowStyles;
+ ScFormatRangeStyles* pCellStyles;
+ ScRowFormatRanges* pRowFormatRanges;
+ std::vector<rtl::OUString> aTableStyles;
+ com::sun::star::table::CellRangeAddress aRowHeaderRange;
+ ScMyOpenCloseColumnRowGroup* pGroupColumns;
+ ScMyOpenCloseColumnRowGroup* pGroupRows;
+ ScMyDefaultStyles* pDefaults;
+ ScChartListener* pChartListener;
const ScMyCell* pCurrentCell;
- ScMyMergedRangesContainer* pMergedRangesContainer;
- ScMyValidationsContainer* pValidationsContainer;
- ScMyNotEmptyCellsIterator* pCellsItr;
- ScChangeTrackingExportHelper* pChangeTrackingExportHelper;
- const rtl::OUString sLayerID;
- const rtl::OUString sCaptionShape;
+ ScMyMergedRangesContainer* pMergedRangesContainer;
+ ScMyValidationsContainer* pValidationsContainer;
+ ScMyNotEmptyCellsIterator* pCellsItr;
+ ScChangeTrackingExportHelper* pChangeTrackingExportHelper;
+ const rtl::OUString sLayerID;
+ const rtl::OUString sCaptionShape;
rtl::OUString sExternalRefTabStyleName;
rtl::OUString sAttrName;
rtl::OUString sAttrStyleName;
@@ -120,19 +120,19 @@ class ScXMLExport : public SvXMLExport
rtl::OUString sElemRow;
rtl::OUString sElemTab;
rtl::OUString sElemP;
- sal_Int32 nOpenRow;
+ sal_Int32 nOpenRow;
sal_Int32 nProgressCount;
- sal_uInt16 nCurrentTable;
- sal_Bool bHasRowHeader;
- sal_Bool bRowHeaderOpen;
- sal_Bool mbShowProgress;
+ sal_uInt16 nCurrentTable;
+ sal_Bool bHasRowHeader;
+ sal_Bool bRowHeaderOpen;
+ sal_Bool mbShowProgress;
sal_Int32 GetNumberFormatStyleIndex(sal_Int32 nNumFmt) const;
- sal_Bool HasDrawPages(com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xDoc);
- void CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCount, const sal_Int32 nCellCount);
- void CollectShapesAutoStyles(const sal_Int32 nTableCount);
- void WriteTablesView(const com::sun::star::uno::Any& aTableView);
- void WriteView(const com::sun::star::uno::Any& aView);
+ sal_Bool HasDrawPages(com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xDoc);
+ void CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCount, const sal_Int32 nCellCount);
+ void CollectShapesAutoStyles(const sal_Int32 nTableCount);
+ void WriteTablesView(const com::sun::star::uno::Any& aTableView);
+ void WriteView(const com::sun::star::uno::Any& aView);
virtual void _ExportFontDecls();
virtual void _ExportStyles( sal_Bool bUsed );
virtual void _ExportAutoStyles();
@@ -145,7 +145,7 @@ class ScXMLExport : public SvXMLExport
com::sun::star::table::CellRangeAddress GetEndAddress(const com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet>& xTable,
const sal_Int32 nTable);
-// ScMyEmptyDatabaseRangesContainer GetEmptyDatabaseRanges();
+// ScMyEmptyDatabaseRangesContainer GetEmptyDatabaseRanges();
void GetAreaLinks( com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc, ScMyAreaLinksContainer& rAreaLinks );
void GetDetectiveOpList( ScMyDetectiveOpContainer& rDetOp );
void WriteSingleColumn(const sal_Int32 nRepeatColumns, const sal_Int32 nStyleIndex,
@@ -202,12 +202,12 @@ class ScXMLExport : public SvXMLExport
void WriteCalculationSettings(const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc);
void WriteTableSource();
- void WriteScenario(); // core implementation
+ void WriteScenario(); // core implementation
void WriteTheLabelRanges(const com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheetDocument >& xSpreadDoc);
void WriteLabelRanges( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xRangesIAccess, sal_Bool bColumn );
void WriteNamedExpressions(const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc);
void WriteExternalRefCaches();
- void WriteConsolidation(); // core implementation
+ void WriteConsolidation(); // core implementation
void CollectUserDefinedNamespaces(const SfxItemPool* pPool, sal_uInt16 nAttrib);
@@ -240,8 +240,8 @@ public:
virtual ~ScXMLExport();
static sal_Int16 GetFieldUnit();
- inline ScDocument* GetDocument() { return pDoc; }
- inline const ScDocument* GetDocument() const { return pDoc; }
+ inline ScDocument* GetDocument() { return pDoc; }
+ inline const ScDocument* GetDocument() const { return pDoc; }
//UNUSED2008-05 sal_Bool IsMatrix (const com::sun::star::uno::Reference <com::sun::star::table::XCellRange>& xCellRange,
//UNUSED2008-05 const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheet>& xTable,
//UNUSED2008-05 const sal_Int32 nCol, const sal_Int32 nRow,
diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxx
index 083a73d81872..e91f021859b9 100644
--- a/sc/source/filter/xml/xmlexternaltabi.cxx
+++ b/sc/source/filter/xml/xmlexternaltabi.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +97,12 @@ SvXMLImportContext* ScXMLExternalRefTabSourceContext::CreateChildContext(
return new SvXMLImportContext(GetImport(), nPrefix, rLocalName);
}
-/**
- * Make sure the URL is a valid relative URL, mainly to avoid storing
- * absolute URL as relative URL by accident. For now, we only check the first
- * three characters which are assumed to be always '../', because the relative
- * URL for an external document is always in reference to the content.xml
- * fragment of the original document.
+/**
+ * Make sure the URL is a valid relative URL, mainly to avoid storing
+ * absolute URL as relative URL by accident. For now, we only check the first
+ * three characters which are assumed to be always '../', because the relative
+ * URL for an external document is always in reference to the content.xml
+ * fragment of the original document.
*/
static bool lcl_isValidRelativeURL(const OUString& rUrl)
{
@@ -231,7 +231,7 @@ void ScXMLExternalRefRowContext::EndElement()
for (sal_Int32 i = 1; i < mnRepeatRowCount; ++i)
{
- // Performance: duplicates of a non-existent row will still not exist.
+ // Performance: duplicates of a non-existent row will still not exist.
// Don't find that out for every cell.
// External references often are a sparse matrix.
if (i == 1 && !pTab->hasRow( mrExternalRefInfo.mnRow))
diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx
index 6aaff181315e..6e17c1d92e5a 100644
--- a/sc/source/filter/xml/xmlexternaltabi.hxx
+++ b/sc/source/filter/xml/xmlexternaltabi.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx
index 55670d97637d..a58d9c96a80c 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
+++ b/sc/source/filter/xml/xmlfilti.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -518,7 +518,7 @@ void ScXMLDPFilterContext::EndElement()
aFilterFields.bRegExp = bUseRegularExpressions;
aFilterFields.bCaseSens = bIsCaseSensitive;
aFilterFields.bDuplicate = !bSkipDuplicates;
-// pDataPilotTable->SetFilterUseRegularExpressions(bUseRegularExpressions);
+// pDataPilotTable->SetFilterUseRegularExpressions(bUseRegularExpressions);
if (bCopyOutputData)
{
pDataPilotTable->SetFilterOutputPosition(aOutputPosition);
@@ -526,8 +526,8 @@ void ScXMLDPFilterContext::EndElement()
}
else
pDataPilotTable->SetFilterCopyOutputData(sal_False);
-// pDataPilotTable->SetFilterIsCaseSensitive(bIsCaseSensitive);
-// pDataPilotTable->SetFilterSkipDuplicates(bSkipDuplicates);
+// pDataPilotTable->SetFilterIsCaseSensitive(bIsCaseSensitive);
+// pDataPilotTable->SetFilterSkipDuplicates(bSkipDuplicates);
pDataPilotTable->SetSourceQueryParam(aFilterFields);
if (bConditionSourceRange)
pDataPilotTable->SetFilterSourceRange(aConditionSourceRangeAddress);
diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx
index df222eeb23c2..b9626675a4a7 100644
--- a/sc/source/filter/xml/xmlfilti.hxx
+++ b/sc/source/filter/xml/xmlfilti.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +49,16 @@ class ScXMLFilterContext : public SvXMLImportContext
com::sun::star::uno::Sequence <com::sun::star::sheet::TableFilterField2> aFilterFields;
com::sun::star::table::CellAddress aOutputPosition;
com::sun::star::table::CellRangeAddress aConditionSourceRangeAddress;
- sal_Int16 nUserListIndex;
- sal_Bool bSkipDuplicates;
- sal_Bool bCopyOutputData;
- sal_Bool bUseRegularExpressions;
- sal_Bool bIsCaseSensitive;
- sal_Bool bEnabledUserList;
- sal_Bool bConnectionOr;
- sal_Bool bNextConnectionOr;
- sal_Bool bConditionSourceRange;
- Stack aConnectionOrStack;
+ sal_Int16 nUserListIndex;
+ sal_Bool bSkipDuplicates;
+ sal_Bool bCopyOutputData;
+ sal_Bool bUseRegularExpressions;
+ sal_Bool bIsCaseSensitive;
+ sal_Bool bEnabledUserList;
+ sal_Bool bConnectionOr;
+ sal_Bool bNextConnectionOr;
+ sal_Bool bConditionSourceRange;
+ Stack aConnectionOrStack;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -148,8 +148,8 @@ class ScXMLConditionContext : public SvXMLImportContext
rtl::OUString sDataType;
rtl::OUString sConditionValue;
rtl::OUString sOperator;
- sal_Int32 nField;
- sal_Bool bIsCaseSensitive;
+ sal_Int32 nField;
+ sal_Bool bIsCaseSensitive;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -177,22 +177,22 @@ public:
class ScXMLDPFilterContext : public SvXMLImportContext
{
- ScXMLDataPilotTableContext* pDataPilotTable;
-
- ScQueryParam aFilterFields;
- ScAddress aOutputPosition;
- ScRange aConditionSourceRangeAddress;
- sal_uInt8 nFilterFieldCount;
- sal_Int16 nUserListIndex;
- sal_Bool bSkipDuplicates;
- sal_Bool bCopyOutputData;
- sal_Bool bUseRegularExpressions;
- sal_Bool bIsCaseSensitive;
- sal_Bool bEnabledUserList;
- sal_Bool bConnectionOr;
- sal_Bool bNextConnectionOr;
- sal_Bool bConditionSourceRange;
- Stack aConnectionOrStack;
+ ScXMLDataPilotTableContext* pDataPilotTable;
+
+ ScQueryParam aFilterFields;
+ ScAddress aOutputPosition;
+ ScRange aConditionSourceRangeAddress;
+ sal_uInt8 nFilterFieldCount;
+ sal_Int16 nUserListIndex;
+ sal_Bool bSkipDuplicates;
+ sal_Bool bCopyOutputData;
+ sal_Bool bUseRegularExpressions;
+ sal_Bool bIsCaseSensitive;
+ sal_Bool bEnabledUserList;
+ sal_Bool bConnectionOr;
+ sal_Bool bNextConnectionOr;
+ sal_Bool bConditionSourceRange;
+ Stack aConnectionOrStack;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -281,8 +281,8 @@ class ScXMLDPConditionContext : public SvXMLImportContext
rtl::OUString sDataType;
rtl::OUString sConditionValue;
rtl::OUString sOperator;
- sal_Int32 nField;
- sal_Bool bIsCaseSensitive;
+ sal_Int32 nField;
+ sal_Bool bIsCaseSensitive;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
diff --git a/sc/source/filter/xml/xmlfonte.cxx b/sc/source/filter/xml/xmlfonte.cxx
index 5cbb2604581f..b082cd74e27a 100644
--- a/sc/source/filter/xml/xmlfonte.cxx
+++ b/sc/source/filter/xml/xmlfonte.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 269e1dd9a7e4..51ee66cfc2ab 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +93,9 @@
#include <com/sun/star/sheet/XLabelRanges.hpp>
#include <com/sun/star/io/XSeekable.hpp>
-#define SC_LOCALE "Locale"
-#define SC_STANDARDFORMAT "StandardFormat"
-#define SC_CURRENCYSYMBOL "CurrencySymbol"
+#define SC_LOCALE "Locale"
+#define SC_STANDARDFORMAT "StandardFormat"
+#define SC_CURRENCYSYMBOL "CurrencySymbol"
#define SC_NAMEDRANGES "NamedRanges"
#define SC_REPEAT_COLUMN "repeat-column"
#define SC_REPEAT_ROW "repeat-row"
@@ -425,14 +425,14 @@ const SvXMLTokenMap& ScXMLImport::GetDocElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDocTokenMap[] =
{
- { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS },
- { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES },
- { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES },
- { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES },
- { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META },
- { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPTS },
- { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY },
- { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS },
+ { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS },
+ { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES },
+ { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES },
+ { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES },
+ { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META },
+ { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPTS },
+ { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY },
+ { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS },
XML_TOKEN_MAP_END
};
@@ -450,17 +450,17 @@ const SvXMLTokenMap& ScXMLImport::GetBodyElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aBodyTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_TRACKED_CHANGES, XML_TOK_BODY_TRACKED_CHANGES },
- { XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, XML_TOK_BODY_CALCULATION_SETTINGS },
- { XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATIONS, XML_TOK_BODY_CONTENT_VALIDATIONS },
- { XML_NAMESPACE_TABLE, XML_LABEL_RANGES, XML_TOK_BODY_LABEL_RANGES },
- { XML_NAMESPACE_TABLE, XML_TABLE, XML_TOK_BODY_TABLE },
- { XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSIONS, XML_TOK_BODY_NAMED_EXPRESSIONS },
- { XML_NAMESPACE_TABLE, XML_DATABASE_RANGES, XML_TOK_BODY_DATABASE_RANGES },
- { XML_NAMESPACE_TABLE, XML_DATABASE_RANGE, XML_TOK_BODY_DATABASE_RANGE },
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLES, XML_TOK_BODY_DATA_PILOT_TABLES },
- { XML_NAMESPACE_TABLE, XML_CONSOLIDATION, XML_TOK_BODY_CONSOLIDATION },
- { XML_NAMESPACE_TABLE, XML_DDE_LINKS, XML_TOK_BODY_DDE_LINKS },
+ { XML_NAMESPACE_TABLE, XML_TRACKED_CHANGES, XML_TOK_BODY_TRACKED_CHANGES },
+ { XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, XML_TOK_BODY_CALCULATION_SETTINGS },
+ { XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATIONS, XML_TOK_BODY_CONTENT_VALIDATIONS },
+ { XML_NAMESPACE_TABLE, XML_LABEL_RANGES, XML_TOK_BODY_LABEL_RANGES },
+ { XML_NAMESPACE_TABLE, XML_TABLE, XML_TOK_BODY_TABLE },
+ { XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSIONS, XML_TOK_BODY_NAMED_EXPRESSIONS },
+ { XML_NAMESPACE_TABLE, XML_DATABASE_RANGES, XML_TOK_BODY_DATABASE_RANGES },
+ { XML_NAMESPACE_TABLE, XML_DATABASE_RANGE, XML_TOK_BODY_DATABASE_RANGE },
+ { XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLES, XML_TOK_BODY_DATA_PILOT_TABLES },
+ { XML_NAMESPACE_TABLE, XML_CONSOLIDATION, XML_TOK_BODY_CONSOLIDATION },
+ { XML_NAMESPACE_TABLE, XML_DDE_LINKS, XML_TOK_BODY_DDE_LINKS },
XML_TOKEN_MAP_END
};
@@ -476,7 +476,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationsElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aContentValidationsElemTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, XML_TOK_CONTENT_VALIDATION },
+ { XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, XML_TOK_CONTENT_VALIDATION },
XML_TOKEN_MAP_END
};
@@ -511,11 +511,11 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aContentValidationAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_CONTENT_VALIDATION_NAME },
- { XML_NAMESPACE_TABLE, XML_CONDITION, XML_TOK_CONTENT_VALIDATION_CONDITION },
- { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, XML_TOK_CONTENT_VALIDATION_BASE_CELL_ADDRESS },
- { XML_NAMESPACE_TABLE, XML_ALLOW_EMPTY_CELL, XML_TOK_CONTENT_VALIDATION_ALLOW_EMPTY_CELL },
- { XML_NAMESPACE_TABLE, XML_DISPLAY_LIST, XML_TOK_CONTENT_VALIDATION_DISPLAY_LIST },
+ { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_CONTENT_VALIDATION_NAME },
+ { XML_NAMESPACE_TABLE, XML_CONDITION, XML_TOK_CONTENT_VALIDATION_CONDITION },
+ { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, XML_TOK_CONTENT_VALIDATION_BASE_CELL_ADDRESS },
+ { XML_NAMESPACE_TABLE, XML_ALLOW_EMPTY_CELL, XML_TOK_CONTENT_VALIDATION_ALLOW_EMPTY_CELL },
+ { XML_NAMESPACE_TABLE, XML_DISPLAY_LIST, XML_TOK_CONTENT_VALIDATION_DISPLAY_LIST },
XML_TOKEN_MAP_END
};
@@ -531,7 +531,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationMessageElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aContentValidationMessageElemTokenMap[] =
{
- { XML_NAMESPACE_TEXT, XML_P, XML_TOK_P },
+ { XML_NAMESPACE_TEXT, XML_P, XML_TOK_P },
XML_TOKEN_MAP_END
};
@@ -547,8 +547,8 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationHelpMessageAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aContentValidationHelpMessageAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_TITLE, XML_TOK_HELP_MESSAGE_ATTR_TITLE },
- { XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_HELP_MESSAGE_ATTR_DISPLAY },
+ { XML_NAMESPACE_TABLE, XML_TITLE, XML_TOK_HELP_MESSAGE_ATTR_TITLE },
+ { XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_HELP_MESSAGE_ATTR_DISPLAY },
XML_TOKEN_MAP_END
};
@@ -564,9 +564,9 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationErrorMessageAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aContentValidationErrorMessageAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_TITLE, XML_TOK_ERROR_MESSAGE_ATTR_TITLE },
- { XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_ERROR_MESSAGE_ATTR_DISPLAY },
- { XML_NAMESPACE_TABLE, XML_MESSAGE_TYPE, XML_TOK_ERROR_MESSAGE_ATTR_MESSAGE_TYPE },
+ { XML_NAMESPACE_TABLE, XML_TITLE, XML_TOK_ERROR_MESSAGE_ATTR_TITLE },
+ { XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_ERROR_MESSAGE_ATTR_DISPLAY },
+ { XML_NAMESPACE_TABLE, XML_MESSAGE_TYPE, XML_TOK_ERROR_MESSAGE_ATTR_MESSAGE_TYPE },
XML_TOKEN_MAP_END
};
@@ -582,8 +582,8 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationErrorMacroAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aContentValidationErrorMacroAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_ERROR_MACRO_ATTR_NAME },
- { XML_NAMESPACE_TABLE, XML_EXECUTE, XML_TOK_ERROR_MACRO_ATTR_EXECUTE },
+ { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_ERROR_MACRO_ATTR_NAME },
+ { XML_NAMESPACE_TABLE, XML_EXECUTE, XML_TOK_ERROR_MACRO_ATTR_EXECUTE },
XML_TOKEN_MAP_END
};
@@ -599,7 +599,7 @@ const SvXMLTokenMap& ScXMLImport::GetLabelRangesElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aLabelRangesElemTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_LABEL_RANGE, XML_TOK_LABEL_RANGE_ELEM },
+ { XML_NAMESPACE_TABLE, XML_LABEL_RANGE, XML_TOK_LABEL_RANGE_ELEM },
XML_TOKEN_MAP_END
};
@@ -615,9 +615,9 @@ const SvXMLTokenMap& ScXMLImport::GetLabelRangeAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aLabelRangeAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_LABEL_CELL_RANGE_ADDRESS, XML_TOK_LABEL_RANGE_ATTR_LABEL_RANGE },
- { XML_NAMESPACE_TABLE, XML_DATA_CELL_RANGE_ADDRESS, XML_TOK_LABEL_RANGE_ATTR_DATA_RANGE },
- { XML_NAMESPACE_TABLE, XML_ORIENTATION, XML_TOK_LABEL_RANGE_ATTR_ORIENTATION },
+ { XML_NAMESPACE_TABLE, XML_LABEL_CELL_RANGE_ADDRESS, XML_TOK_LABEL_RANGE_ATTR_LABEL_RANGE },
+ { XML_NAMESPACE_TABLE, XML_DATA_CELL_RANGE_ADDRESS, XML_TOK_LABEL_RANGE_ATTR_DATA_RANGE },
+ { XML_NAMESPACE_TABLE, XML_ORIENTATION, XML_TOK_LABEL_RANGE_ATTR_ORIENTATION },
XML_TOKEN_MAP_END
};
@@ -633,18 +633,18 @@ const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aTableTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COL_GROUP },
- { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS },
- { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS },
- { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL },
- { XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROW_GROUP },
- { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_HEADER_ROWS },
- { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS },
- { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW },
- { XML_NAMESPACE_TABLE, XML_TABLE_SOURCE, XML_TOK_TABLE_SOURCE },
- { XML_NAMESPACE_TABLE, XML_SCENARIO, XML_TOK_TABLE_SCENARIO },
- { XML_NAMESPACE_TABLE, XML_SHAPES, XML_TOK_TABLE_SHAPES },
- { XML_NAMESPACE_OFFICE, XML_FORMS, XML_TOK_TABLE_FORMS },
+ { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COL_GROUP },
+ { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS },
+ { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS },
+ { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL },
+ { XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROW_GROUP },
+ { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_HEADER_ROWS },
+ { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS },
+ { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW },
+ { XML_NAMESPACE_TABLE, XML_TABLE_SOURCE, XML_TOK_TABLE_SOURCE },
+ { XML_NAMESPACE_TABLE, XML_SCENARIO, XML_TOK_TABLE_SCENARIO },
+ { XML_NAMESPACE_TABLE, XML_SHAPES, XML_TOK_TABLE_SHAPES },
+ { XML_NAMESPACE_OFFICE, XML_FORMS, XML_TOK_TABLE_FORMS },
{ XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, XML_TOK_TABLE_EVENT_LISTENERS },
{ XML_NAMESPACE_OFFICE_EXT, XML_EVENT_LISTENERS, XML_TOK_TABLE_EVENT_LISTENERS_EXT },
XML_TOKEN_MAP_END
@@ -662,10 +662,10 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowsElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aTableRowsElemTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROWS_ROW_GROUP },
- { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_ROWS_HEADER_ROWS },
- { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS_ROWS },
- { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROWS_ROW },
+ { XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROWS_ROW_GROUP },
+ { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_ROWS_HEADER_ROWS },
+ { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS_ROWS },
+ { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROWS_ROW },
XML_TOKEN_MAP_END
};
@@ -681,10 +681,10 @@ const SvXMLTokenMap& ScXMLImport::GetTableColsElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aTableColsElemTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COLS_COL_GROUP },
- { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_COLS_HEADER_COLS },
- { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS_COLS },
- { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COLS_COL },
+ { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COLS_COL_GROUP },
+ { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_COLS_HEADER_COLS },
+ { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS_COLS },
+ { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COLS_COL },
XML_TOKEN_MAP_END
};
@@ -721,14 +721,14 @@ const SvXMLTokenMap& ScXMLImport::GetTableScenarioAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aTableScenarioAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_DISPLAY_BORDER, XML_TOK_TABLE_SCENARIO_ATTR_DISPLAY_BORDER },
- { XML_NAMESPACE_TABLE, XML_BORDER_COLOR, XML_TOK_TABLE_SCENARIO_ATTR_BORDER_COLOR },
- { XML_NAMESPACE_TABLE, XML_COPY_BACK, XML_TOK_TABLE_SCENARIO_ATTR_COPY_BACK },
- { XML_NAMESPACE_TABLE, XML_COPY_STYLES, XML_TOK_TABLE_SCENARIO_ATTR_COPY_STYLES },
- { XML_NAMESPACE_TABLE, XML_COPY_FORMULAS, XML_TOK_TABLE_SCENARIO_ATTR_COPY_FORMULAS },
- { XML_NAMESPACE_TABLE, XML_IS_ACTIVE, XML_TOK_TABLE_SCENARIO_ATTR_IS_ACTIVE },
- { XML_NAMESPACE_TABLE, XML_SCENARIO_RANGES, XML_TOK_TABLE_SCENARIO_ATTR_SCENARIO_RANGES },
- { XML_NAMESPACE_TABLE, XML_COMMENT, XML_TOK_TABLE_SCENARIO_ATTR_COMMENT },
+ { XML_NAMESPACE_TABLE, XML_DISPLAY_BORDER, XML_TOK_TABLE_SCENARIO_ATTR_DISPLAY_BORDER },
+ { XML_NAMESPACE_TABLE, XML_BORDER_COLOR, XML_TOK_TABLE_SCENARIO_ATTR_BORDER_COLOR },
+ { XML_NAMESPACE_TABLE, XML_COPY_BACK, XML_TOK_TABLE_SCENARIO_ATTR_COPY_BACK },
+ { XML_NAMESPACE_TABLE, XML_COPY_STYLES, XML_TOK_TABLE_SCENARIO_ATTR_COPY_STYLES },
+ { XML_NAMESPACE_TABLE, XML_COPY_FORMULAS, XML_TOK_TABLE_SCENARIO_ATTR_COPY_FORMULAS },
+ { XML_NAMESPACE_TABLE, XML_IS_ACTIVE, XML_TOK_TABLE_SCENARIO_ATTR_IS_ACTIVE },
+ { XML_NAMESPACE_TABLE, XML_SCENARIO_RANGES, XML_TOK_TABLE_SCENARIO_ATTR_SCENARIO_RANGES },
+ { XML_NAMESPACE_TABLE, XML_COMMENT, XML_TOK_TABLE_SCENARIO_ATTR_COMMENT },
{ XML_NAMESPACE_TABLE, XML_PROTECTED, XML_TOK_TABLE_SCENARIO_ATTR_PROTECTED },
XML_TOKEN_MAP_END
};
@@ -745,9 +745,9 @@ const SvXMLTokenMap& ScXMLImport::GetTableColAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aTableColAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_COL_ATTR_STYLE_NAME },
- { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, XML_TOK_TABLE_COL_ATTR_REPEATED },
- { XML_NAMESPACE_TABLE, XML_VISIBILITY, XML_TOK_TABLE_COL_ATTR_VISIBILITY },
+ { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_COL_ATTR_STYLE_NAME },
+ { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, XML_TOK_TABLE_COL_ATTR_REPEATED },
+ { XML_NAMESPACE_TABLE, XML_VISIBILITY, XML_TOK_TABLE_COL_ATTR_VISIBILITY },
{ XML_NAMESPACE_TABLE, XML_DEFAULT_CELL_STYLE_NAME, XML_TOK_TABLE_COL_ATTR_DEFAULT_CELL_STYLE_NAME },
XML_TOKEN_MAP_END
};
@@ -764,8 +764,8 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aTableRowTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_TABLE_CELL, XML_TOK_TABLE_ROW_CELL },
- { XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL, XML_TOK_TABLE_ROW_COVERED_CELL },
+ { XML_NAMESPACE_TABLE, XML_TABLE_CELL, XML_TOK_TABLE_ROW_CELL },
+ { XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL, XML_TOK_TABLE_ROW_COVERED_CELL },
XML_TOKEN_MAP_END
};
@@ -781,11 +781,11 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aTableRowAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_ROW_ATTR_STYLE_NAME },
- { XML_NAMESPACE_TABLE, XML_VISIBILITY, XML_TOK_TABLE_ROW_ATTR_VISIBILITY },
- { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_REPEATED, XML_TOK_TABLE_ROW_ATTR_REPEATED },
- { XML_NAMESPACE_TABLE, XML_DEFAULT_CELL_STYLE_NAME, XML_TOK_TABLE_ROW_ATTR_DEFAULT_CELL_STYLE_NAME },
- // { XML_NAMESPACE_TABLE, XML_USE_OPTIMAL_HEIGHT, XML_TOK_TABLE_ROW_ATTR_USE_OPTIMAL_HEIGHT },
+ { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_ROW_ATTR_STYLE_NAME },
+ { XML_NAMESPACE_TABLE, XML_VISIBILITY, XML_TOK_TABLE_ROW_ATTR_VISIBILITY },
+ { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_REPEATED, XML_TOK_TABLE_ROW_ATTR_REPEATED },
+ { XML_NAMESPACE_TABLE, XML_DEFAULT_CELL_STYLE_NAME, XML_TOK_TABLE_ROW_ATTR_DEFAULT_CELL_STYLE_NAME },
+ // { XML_NAMESPACE_TABLE, XML_USE_OPTIMAL_HEIGHT, XML_TOK_TABLE_ROW_ATTR_USE_OPTIMAL_HEIGHT },
XML_TOKEN_MAP_END
};
@@ -801,11 +801,11 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aTableRowCellTokenMap[] =
{
- { XML_NAMESPACE_TEXT, XML_P, XML_TOK_TABLE_ROW_CELL_P },
- { XML_NAMESPACE_TABLE, XML_SUB_TABLE, XML_TOK_TABLE_ROW_CELL_TABLE },
- { XML_NAMESPACE_OFFICE, XML_ANNOTATION, XML_TOK_TABLE_ROW_CELL_ANNOTATION },
- { XML_NAMESPACE_TABLE, XML_DETECTIVE, XML_TOK_TABLE_ROW_CELL_DETECTIVE },
- { XML_NAMESPACE_TABLE, XML_CELL_RANGE_SOURCE, XML_TOK_TABLE_ROW_CELL_CELL_RANGE_SOURCE },
+ { XML_NAMESPACE_TEXT, XML_P, XML_TOK_TABLE_ROW_CELL_P },
+ { XML_NAMESPACE_TABLE, XML_SUB_TABLE, XML_TOK_TABLE_ROW_CELL_TABLE },
+ { XML_NAMESPACE_OFFICE, XML_ANNOTATION, XML_TOK_TABLE_ROW_CELL_ANNOTATION },
+ { XML_NAMESPACE_TABLE, XML_DETECTIVE, XML_TOK_TABLE_ROW_CELL_DETECTIVE },
+ { XML_NAMESPACE_TABLE, XML_CELL_RANGE_SOURCE, XML_TOK_TABLE_ROW_CELL_CELL_RANGE_SOURCE },
XML_TOKEN_MAP_END
};
@@ -821,10 +821,10 @@ const SvXMLTokenMap& ScXMLImport::GetTableAnnotationAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aTableAnnotationAttrTokenMap[] =
{
- { XML_NAMESPACE_OFFICE, XML_AUTHOR, XML_TOK_TABLE_ANNOTATION_ATTR_AUTHOR },
- { XML_NAMESPACE_OFFICE, XML_CREATE_DATE, XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE },
- { XML_NAMESPACE_OFFICE, XML_CREATE_DATE_STRING, XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE_STRING },
- { XML_NAMESPACE_OFFICE, XML_DISPLAY, XML_TOK_TABLE_ANNOTATION_ATTR_DISPLAY },
+ { XML_NAMESPACE_OFFICE, XML_AUTHOR, XML_TOK_TABLE_ANNOTATION_ATTR_AUTHOR },
+ { XML_NAMESPACE_OFFICE, XML_CREATE_DATE, XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE },
+ { XML_NAMESPACE_OFFICE, XML_CREATE_DATE_STRING, XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE_STRING },
+ { XML_NAMESPACE_OFFICE, XML_DISPLAY, XML_TOK_TABLE_ANNOTATION_ATTR_DISPLAY },
{ XML_NAMESPACE_SVG, XML_X, XML_TOK_TABLE_ANNOTATION_ATTR_X },
{ XML_NAMESPACE_SVG, XML_Y, XML_TOK_TABLE_ANNOTATION_ATTR_Y },
XML_TOKEN_MAP_END
@@ -842,8 +842,8 @@ const SvXMLTokenMap& ScXMLImport::GetDetectiveElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDetectiveElemTokenMap[]=
{
- { XML_NAMESPACE_TABLE, XML_HIGHLIGHTED_RANGE, XML_TOK_DETECTIVE_ELEM_HIGHLIGHTED },
- { XML_NAMESPACE_TABLE, XML_OPERATION, XML_TOK_DETECTIVE_ELEM_OPERATION },
+ { XML_NAMESPACE_TABLE, XML_HIGHLIGHTED_RANGE, XML_TOK_DETECTIVE_ELEM_HIGHLIGHTED },
+ { XML_NAMESPACE_TABLE, XML_OPERATION, XML_TOK_DETECTIVE_ELEM_OPERATION },
XML_TOKEN_MAP_END
};
@@ -859,10 +859,10 @@ const SvXMLTokenMap& ScXMLImport::GetDetectiveHighlightedAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDetectiveHighlightedAttrTokenMap[]=
{
- { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CELL_RANGE },
- { XML_NAMESPACE_TABLE, XML_DIRECTION, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_DIRECTION },
- { XML_NAMESPACE_TABLE, XML_CONTAINS_ERROR, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CONTAINS_ERROR },
- { XML_NAMESPACE_TABLE, XML_MARKED_INVALID, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_MARKED_INVALID },
+ { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CELL_RANGE },
+ { XML_NAMESPACE_TABLE, XML_DIRECTION, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_DIRECTION },
+ { XML_NAMESPACE_TABLE, XML_CONTAINS_ERROR, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CONTAINS_ERROR },
+ { XML_NAMESPACE_TABLE, XML_MARKED_INVALID, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_MARKED_INVALID },
XML_TOKEN_MAP_END
};
@@ -878,8 +878,8 @@ const SvXMLTokenMap& ScXMLImport::GetDetectiveOperationAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDetectiveOperationAttrTokenMap[]=
{
- { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DETECTIVE_OPERATION_ATTR_NAME },
- { XML_NAMESPACE_TABLE, XML_INDEX, XML_TOK_DETECTIVE_OPERATION_ATTR_INDEX },
+ { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DETECTIVE_OPERATION_ATTR_NAME },
+ { XML_NAMESPACE_TABLE, XML_INDEX, XML_TOK_DETECTIVE_OPERATION_ATTR_INDEX },
XML_TOKEN_MAP_END
};
@@ -895,13 +895,13 @@ const SvXMLTokenMap& ScXMLImport::GetTableCellRangeSourceAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aTableCellRangeSourceAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_NAME },
- { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_HREF },
- { XML_NAMESPACE_TABLE, XML_FILTER_NAME, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_FILTER_NAME },
- { XML_NAMESPACE_TABLE, XML_FILTER_OPTIONS, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_FILTER_OPTIONS },
- { XML_NAMESPACE_TABLE, XML_LAST_COLUMN_SPANNED, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_LAST_COLUMN },
- { XML_NAMESPACE_TABLE, XML_LAST_ROW_SPANNED, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_LAST_ROW },
- { XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_REFRESH_DELAY },
+ { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_NAME },
+ { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_HREF },
+ { XML_NAMESPACE_TABLE, XML_FILTER_NAME, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_FILTER_NAME },
+ { XML_NAMESPACE_TABLE, XML_FILTER_OPTIONS, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_FILTER_OPTIONS },
+ { XML_NAMESPACE_TABLE, XML_LAST_COLUMN_SPANNED, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_LAST_COLUMN },
+ { XML_NAMESPACE_TABLE, XML_LAST_ROW_SPANNED, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_LAST_ROW },
+ { XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_REFRESH_DELAY },
XML_TOKEN_MAP_END
};
@@ -917,8 +917,8 @@ const SvXMLTokenMap& ScXMLImport::GetNamedExpressionsElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aNamedExpressionsTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_NAMED_RANGE, XML_TOK_NAMED_EXPRESSIONS_NAMED_RANGE },
- { XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSION, XML_TOK_NAMED_EXPRESSIONS_NAMED_EXPRESSION },
+ { XML_NAMESPACE_TABLE, XML_NAMED_RANGE, XML_TOK_NAMED_EXPRESSIONS_NAMED_RANGE },
+ { XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSION, XML_TOK_NAMED_EXPRESSIONS_NAMED_EXPRESSION },
XML_TOKEN_MAP_END
};
@@ -934,10 +934,10 @@ const SvXMLTokenMap& ScXMLImport::GetNamedRangeAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aNamedRangeAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_NAMED_RANGE_ATTR_NAME },
- { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_NAMED_RANGE_ATTR_CELL_RANGE_ADDRESS },
- { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, XML_TOK_NAMED_RANGE_ATTR_BASE_CELL_ADDRESS },
- { XML_NAMESPACE_TABLE, XML_RANGE_USABLE_AS, XML_TOK_NAMED_RANGE_ATTR_RANGE_USABLE_AS },
+ { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_NAMED_RANGE_ATTR_NAME },
+ { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_NAMED_RANGE_ATTR_CELL_RANGE_ADDRESS },
+ { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, XML_TOK_NAMED_RANGE_ATTR_BASE_CELL_ADDRESS },
+ { XML_NAMESPACE_TABLE, XML_RANGE_USABLE_AS, XML_TOK_NAMED_RANGE_ATTR_RANGE_USABLE_AS },
XML_TOKEN_MAP_END
};
@@ -953,9 +953,9 @@ const SvXMLTokenMap& ScXMLImport::GetNamedExpressionAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aNamedExpressionAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_NAMED_EXPRESSION_ATTR_NAME },
- { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, XML_TOK_NAMED_EXPRESSION_ATTR_BASE_CELL_ADDRESS },
- { XML_NAMESPACE_TABLE, XML_EXPRESSION, XML_TOK_NAMED_EXPRESSION_ATTR_EXPRESSION },
+ { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_NAMED_EXPRESSION_ATTR_NAME },
+ { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, XML_TOK_NAMED_EXPRESSION_ATTR_BASE_CELL_ADDRESS },
+ { XML_NAMESPACE_TABLE, XML_EXPRESSION, XML_TOK_NAMED_EXPRESSION_ATTR_EXPRESSION },
XML_TOKEN_MAP_END
};
@@ -971,7 +971,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangesElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangesTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_DATABASE_RANGE, XML_TOK_DATABASE_RANGE },
+ { XML_NAMESPACE_TABLE, XML_DATABASE_RANGE, XML_TOK_DATABASE_RANGE },
XML_TOKEN_MAP_END
};
@@ -987,12 +987,12 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, XML_TOK_DATABASE_RANGE_SOURCE_SQL },
- { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, XML_TOK_DATABASE_RANGE_SOURCE_TABLE },
- { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, XML_TOK_DATABASE_RANGE_SOURCE_QUERY },
- { XML_NAMESPACE_TABLE, XML_FILTER, XML_TOK_FILTER },
- { XML_NAMESPACE_TABLE, XML_SORT, XML_TOK_SORT },
- { XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULES, XML_TOK_DATABASE_RANGE_SUBTOTAL_RULES },
+ { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, XML_TOK_DATABASE_RANGE_SOURCE_SQL },
+ { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, XML_TOK_DATABASE_RANGE_SOURCE_TABLE },
+ { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, XML_TOK_DATABASE_RANGE_SOURCE_QUERY },
+ { XML_NAMESPACE_TABLE, XML_FILTER, XML_TOK_FILTER },
+ { XML_NAMESPACE_TABLE, XML_SORT, XML_TOK_SORT },
+ { XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULES, XML_TOK_DATABASE_RANGE_SUBTOTAL_RULES },
XML_TOKEN_MAP_END
};
@@ -1008,16 +1008,16 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DATABASE_RANGE_ATTR_NAME },
- { XML_NAMESPACE_TABLE, XML_IS_SELECTION, XML_TOK_DATABASE_RANGE_ATTR_IS_SELECTION },
- { XML_NAMESPACE_TABLE, XML_ON_UPDATE_KEEP_STYLES, XML_TOK_DATABASE_RANGE_ATTR_ON_UPDATE_KEEP_STYLES },
- { XML_NAMESPACE_TABLE, XML_ON_UPDATE_KEEP_SIZE, XML_TOK_DATABASE_RANGE_ATTR_ON_UPDATE_KEEP_SIZE },
- { XML_NAMESPACE_TABLE, XML_HAS_PERSISTENT_DATA, XML_TOK_DATABASE_RANGE_ATTR_HAS_PERSISTENT_DATA },
- { XML_NAMESPACE_TABLE, XML_ORIENTATION, XML_TOK_DATABASE_RANGE_ATTR_ORIENTATION },
- { XML_NAMESPACE_TABLE, XML_CONTAINS_HEADER, XML_TOK_DATABASE_RANGE_ATTR_CONTAINS_HEADER },
- { XML_NAMESPACE_TABLE, XML_DISPLAY_FILTER_BUTTONS, XML_TOK_DATABASE_RANGE_ATTR_DISPLAY_FILTER_BUTTONS },
- { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_DATABASE_RANGE_ATTR_TARGET_RANGE_ADDRESS },
- { XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, XML_TOK_DATABASE_RANGE_ATTR_REFRESH_DELAY },
+ { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DATABASE_RANGE_ATTR_NAME },
+ { XML_NAMESPACE_TABLE, XML_IS_SELECTION, XML_TOK_DATABASE_RANGE_ATTR_IS_SELECTION },
+ { XML_NAMESPACE_TABLE, XML_ON_UPDATE_KEEP_STYLES, XML_TOK_DATABASE_RANGE_ATTR_ON_UPDATE_KEEP_STYLES },
+ { XML_NAMESPACE_TABLE, XML_ON_UPDATE_KEEP_SIZE, XML_TOK_DATABASE_RANGE_ATTR_ON_UPDATE_KEEP_SIZE },
+ { XML_NAMESPACE_TABLE, XML_HAS_PERSISTENT_DATA, XML_TOK_DATABASE_RANGE_ATTR_HAS_PERSISTENT_DATA },
+ { XML_NAMESPACE_TABLE, XML_ORIENTATION, XML_TOK_DATABASE_RANGE_ATTR_ORIENTATION },
+ { XML_NAMESPACE_TABLE, XML_CONTAINS_HEADER, XML_TOK_DATABASE_RANGE_ATTR_CONTAINS_HEADER },
+ { XML_NAMESPACE_TABLE, XML_DISPLAY_FILTER_BUTTONS, XML_TOK_DATABASE_RANGE_ATTR_DISPLAY_FILTER_BUTTONS },
+ { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_DATABASE_RANGE_ATTR_TARGET_RANGE_ADDRESS },
+ { XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, XML_TOK_DATABASE_RANGE_ATTR_REFRESH_DELAY },
XML_TOKEN_MAP_END
};
@@ -1033,11 +1033,11 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceSQLAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSourceSQLAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_SQL_ATTR_DATABASE_NAME },
+ { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_SQL_ATTR_DATABASE_NAME },
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_SQL_ATTR_HREF },
{ XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE, XML_TOK_SOURCE_SQL_ATTR_CONNECTION_RESSOURCE},
- { XML_NAMESPACE_TABLE, XML_SQL_STATEMENT, XML_TOK_SOURCE_SQL_ATTR_SQL_STATEMENT },
- { XML_NAMESPACE_TABLE, XML_PARSE_SQL_STATEMENT, XML_TOK_SOURCE_SQL_ATTR_PARSE_SQL_STATEMENT },
+ { XML_NAMESPACE_TABLE, XML_SQL_STATEMENT, XML_TOK_SOURCE_SQL_ATTR_SQL_STATEMENT },
+ { XML_NAMESPACE_TABLE, XML_PARSE_SQL_STATEMENT, XML_TOK_SOURCE_SQL_ATTR_PARSE_SQL_STATEMENT },
XML_TOKEN_MAP_END
};
@@ -1053,10 +1053,10 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceTableAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSourceTableAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_TABLE_ATTR_DATABASE_NAME },
+ { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_TABLE_ATTR_DATABASE_NAME },
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_TABLE_ATTR_HREF },
{ XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE, XML_TOK_SOURCE_TABLE_ATTR_CONNECTION_RESSOURCE },
- { XML_NAMESPACE_TABLE, XML_TABLE_NAME, XML_TOK_SOURCE_TABLE_ATTR_TABLE_NAME },
+ { XML_NAMESPACE_TABLE, XML_TABLE_NAME, XML_TOK_SOURCE_TABLE_ATTR_TABLE_NAME },
XML_TOKEN_MAP_END
};
@@ -1072,10 +1072,10 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceQueryAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSourceQueryAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_QUERY_ATTR_DATABASE_NAME },
+ { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_QUERY_ATTR_DATABASE_NAME },
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_QUERY_ATTR_HREF },
{ XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE, XML_TOK_SOURCE_QUERY_ATTR_CONNECTION_RESSOURCE },
- { XML_NAMESPACE_TABLE, XML_QUERY_NAME, XML_TOK_SOURCE_QUERY_ATTR_QUERY_NAME },
+ { XML_NAMESPACE_TABLE, XML_QUERY_NAME, XML_TOK_SOURCE_QUERY_ATTR_QUERY_NAME },
XML_TOKEN_MAP_END
};
@@ -1091,9 +1091,9 @@ const SvXMLTokenMap& ScXMLImport::GetFilterElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aFilterTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_FILTER_AND, XML_TOK_FILTER_AND },
- { XML_NAMESPACE_TABLE, XML_FILTER_OR, XML_TOK_FILTER_OR },
- { XML_NAMESPACE_TABLE, XML_FILTER_CONDITION, XML_TOK_FILTER_CONDITION },
+ { XML_NAMESPACE_TABLE, XML_FILTER_AND, XML_TOK_FILTER_AND },
+ { XML_NAMESPACE_TABLE, XML_FILTER_OR, XML_TOK_FILTER_OR },
+ { XML_NAMESPACE_TABLE, XML_FILTER_CONDITION, XML_TOK_FILTER_CONDITION },
XML_TOKEN_MAP_END
};
@@ -1109,10 +1109,10 @@ const SvXMLTokenMap& ScXMLImport::GetFilterAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aFilterAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_FILTER_ATTR_TARGET_RANGE_ADDRESS },
- { XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS, XML_TOK_FILTER_ATTR_CONDITION_SOURCE_RANGE_ADDRESS },
- { XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE, XML_TOK_FILTER_ATTR_CONDITION_SOURCE },
- { XML_NAMESPACE_TABLE, XML_DISPLAY_DUPLICATES, XML_TOK_FILTER_ATTR_DISPLAY_DUPLICATES },
+ { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_FILTER_ATTR_TARGET_RANGE_ADDRESS },
+ { XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS, XML_TOK_FILTER_ATTR_CONDITION_SOURCE_RANGE_ADDRESS },
+ { XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE, XML_TOK_FILTER_ATTR_CONDITION_SOURCE },
+ { XML_NAMESPACE_TABLE, XML_DISPLAY_DUPLICATES, XML_TOK_FILTER_ATTR_DISPLAY_DUPLICATES },
XML_TOKEN_MAP_END
};
@@ -1128,11 +1128,11 @@ const SvXMLTokenMap& ScXMLImport::GetFilterConditionAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aFilterConditionAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_CONDITION_ATTR_FIELD_NUMBER },
- { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_CONDITION_ATTR_CASE_SENSITIVE },
- { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_CONDITION_ATTR_DATA_TYPE },
- { XML_NAMESPACE_TABLE, XML_VALUE, XML_TOK_CONDITION_ATTR_VALUE },
- { XML_NAMESPACE_TABLE, XML_OPERATOR, XML_TOK_CONDITION_ATTR_OPERATOR },
+ { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_CONDITION_ATTR_FIELD_NUMBER },
+ { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_CONDITION_ATTR_CASE_SENSITIVE },
+ { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_CONDITION_ATTR_DATA_TYPE },
+ { XML_NAMESPACE_TABLE, XML_VALUE, XML_TOK_CONDITION_ATTR_VALUE },
+ { XML_NAMESPACE_TABLE, XML_OPERATOR, XML_TOK_CONDITION_ATTR_OPERATOR },
XML_TOKEN_MAP_END
};
@@ -1148,7 +1148,7 @@ const SvXMLTokenMap& ScXMLImport::GetSortElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aSortTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_SORT_BY, XML_TOK_SORT_SORT_BY },
+ { XML_NAMESPACE_TABLE, XML_SORT_BY, XML_TOK_SORT_SORT_BY },
XML_TOKEN_MAP_END
};
@@ -1164,12 +1164,12 @@ const SvXMLTokenMap& ScXMLImport::GetSortAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aSortAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT, XML_TOK_SORT_ATTR_BIND_STYLES_TO_CONTENT },
- { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_SORT_ATTR_TARGET_RANGE_ADDRESS },
- { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_SORT_ATTR_CASE_SENSITIVE },
- { XML_NAMESPACE_TABLE, XML_LANGUAGE, XML_TOK_SORT_ATTR_LANGUAGE },
- { XML_NAMESPACE_TABLE, XML_COUNTRY, XML_TOK_SORT_ATTR_COUNTRY },
- { XML_NAMESPACE_TABLE, XML_ALGORITHM, XML_TOK_SORT_ATTR_ALGORITHM },
+ { XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT, XML_TOK_SORT_ATTR_BIND_STYLES_TO_CONTENT },
+ { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_SORT_ATTR_TARGET_RANGE_ADDRESS },
+ { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_SORT_ATTR_CASE_SENSITIVE },
+ { XML_NAMESPACE_TABLE, XML_LANGUAGE, XML_TOK_SORT_ATTR_LANGUAGE },
+ { XML_NAMESPACE_TABLE, XML_COUNTRY, XML_TOK_SORT_ATTR_COUNTRY },
+ { XML_NAMESPACE_TABLE, XML_ALGORITHM, XML_TOK_SORT_ATTR_ALGORITHM },
XML_TOKEN_MAP_END
};
@@ -1185,9 +1185,9 @@ const SvXMLTokenMap& ScXMLImport::GetSortSortByAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aSortSortByAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_SORT_BY_ATTR_FIELD_NUMBER },
- { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_SORT_BY_ATTR_DATA_TYPE },
- { XML_NAMESPACE_TABLE, XML_ORDER, XML_TOK_SORT_BY_ATTR_ORDER },
+ { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_SORT_BY_ATTR_FIELD_NUMBER },
+ { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_SORT_BY_ATTR_DATA_TYPE },
+ { XML_NAMESPACE_TABLE, XML_ORDER, XML_TOK_SORT_BY_ATTR_ORDER },
XML_TOKEN_MAP_END
};
@@ -1203,8 +1203,8 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSubTotalRulesElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_SORT_GROUPS, XML_TOK_SUBTOTAL_RULES_SORT_GROUPS },
- { XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, XML_TOK_SUBTOTAL_RULES_SUBTOTAL_RULE },
+ { XML_NAMESPACE_TABLE, XML_SORT_GROUPS, XML_TOK_SUBTOTAL_RULES_SORT_GROUPS },
+ { XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, XML_TOK_SUBTOTAL_RULES_SUBTOTAL_RULE },
XML_TOKEN_MAP_END
};
@@ -1220,9 +1220,9 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSubTotalRulesAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT, XML_TOK_SUBTOTAL_RULES_ATTR_BIND_STYLES_TO_CONTENT },
- { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_SUBTOTAL_RULES_ATTR_CASE_SENSITIVE },
- { XML_NAMESPACE_TABLE, XML_PAGE_BREAKS_ON_GROUP_CHANGE, XML_TOK_SUBTOTAL_RULES_ATTR_PAGE_BREAKS_ON_GROUP_CHANGE },
+ { XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT, XML_TOK_SUBTOTAL_RULES_ATTR_BIND_STYLES_TO_CONTENT },
+ { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_SUBTOTAL_RULES_ATTR_CASE_SENSITIVE },
+ { XML_NAMESPACE_TABLE, XML_PAGE_BREAKS_ON_GROUP_CHANGE, XML_TOK_SUBTOTAL_RULES_ATTR_PAGE_BREAKS_ON_GROUP_CHANGE },
XML_TOKEN_MAP_END
};
@@ -1238,8 +1238,8 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRulesSortGroupsAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aSubTotalRulesSortGroupsAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_SORT_GROUPS_ATTR_DATA_TYPE },
- { XML_NAMESPACE_TABLE, XML_ORDER, XML_TOK_SORT_GROUPS_ATTR_ORDER },
+ { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_SORT_GROUPS_ATTR_DATA_TYPE },
+ { XML_NAMESPACE_TABLE, XML_ORDER, XML_TOK_SORT_GROUPS_ATTR_ORDER },
XML_TOKEN_MAP_END
};
@@ -1255,7 +1255,7 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRulesSubTotalRuleElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aSubTotalRulesSubTotalRuleTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_SUBTOTAL_FIELD, XML_TOK_SUBTOTAL_RULE_SUBTOTAL_FIELD },
+ { XML_NAMESPACE_TABLE, XML_SUBTOTAL_FIELD, XML_TOK_SUBTOTAL_RULE_SUBTOTAL_FIELD },
XML_TOKEN_MAP_END
};
@@ -1271,7 +1271,7 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRulesSubTotalRuleAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aSubTotalRulesSubTotalRuleAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, XML_TOK_SUBTOTAL_RULE_ATTR_GROUP_BY_FIELD_NUMBER },
+ { XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, XML_TOK_SUBTOTAL_RULE_ATTR_GROUP_BY_FIELD_NUMBER },
XML_TOKEN_MAP_END
};
@@ -1287,8 +1287,8 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRuleSubTotalFieldAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aSubTotalRuleSubTotalFieldAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_SUBTOTAL_FIELD_ATTR_FIELD_NUMBER },
- { XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_SUBTOTAL_FIELD_ATTR_FUNCTION },
+ { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_SUBTOTAL_FIELD_ATTR_FIELD_NUMBER },
+ { XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_SUBTOTAL_FIELD_ATTR_FUNCTION },
XML_TOKEN_MAP_END
};
@@ -1304,7 +1304,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTablesElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDataPilotTablesElemTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLE, XML_TOK_DATA_PILOT_TABLE },
+ { XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLE, XML_TOK_DATA_PILOT_TABLE },
XML_TOKEN_MAP_END
};
@@ -1320,15 +1320,15 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DATA_PILOT_TABLE_ATTR_NAME },
- { XML_NAMESPACE_TABLE, XML_APPLICATION_DATA, XML_TOK_DATA_PILOT_TABLE_ATTR_APPLICATION_DATA },
- { XML_NAMESPACE_TABLE, XML_GRAND_TOTAL, XML_TOK_DATA_PILOT_TABLE_ATTR_GRAND_TOTAL },
- { XML_NAMESPACE_TABLE, XML_IGNORE_EMPTY_ROWS, XML_TOK_DATA_PILOT_TABLE_ATTR_IGNORE_EMPTY_ROWS },
- { XML_NAMESPACE_TABLE, XML_IDENTIFY_CATEGORIES, XML_TOK_DATA_PILOT_TABLE_ATTR_IDENTIFY_CATEGORIES },
- { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_DATA_PILOT_TABLE_ATTR_TARGET_RANGE_ADDRESS },
- { XML_NAMESPACE_TABLE, XML_BUTTONS, XML_TOK_DATA_PILOT_TABLE_ATTR_BUTTONS },
- { XML_NAMESPACE_TABLE, XML_SHOW_FILTER_BUTTON, XML_TOK_DATA_PILOT_TABLE_ATTR_SHOW_FILTER_BUTTON },
- { XML_NAMESPACE_TABLE, XML_DRILL_DOWN_ON_DOUBLE_CLICK, XML_TOK_DATA_PILOT_TABLE_ATTR_DRILL_DOWN },
+ { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DATA_PILOT_TABLE_ATTR_NAME },
+ { XML_NAMESPACE_TABLE, XML_APPLICATION_DATA, XML_TOK_DATA_PILOT_TABLE_ATTR_APPLICATION_DATA },
+ { XML_NAMESPACE_TABLE, XML_GRAND_TOTAL, XML_TOK_DATA_PILOT_TABLE_ATTR_GRAND_TOTAL },
+ { XML_NAMESPACE_TABLE, XML_IGNORE_EMPTY_ROWS, XML_TOK_DATA_PILOT_TABLE_ATTR_IGNORE_EMPTY_ROWS },
+ { XML_NAMESPACE_TABLE, XML_IDENTIFY_CATEGORIES, XML_TOK_DATA_PILOT_TABLE_ATTR_IDENTIFY_CATEGORIES },
+ { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_DATA_PILOT_TABLE_ATTR_TARGET_RANGE_ADDRESS },
+ { XML_NAMESPACE_TABLE, XML_BUTTONS, XML_TOK_DATA_PILOT_TABLE_ATTR_BUTTONS },
+ { XML_NAMESPACE_TABLE, XML_SHOW_FILTER_BUTTON, XML_TOK_DATA_PILOT_TABLE_ATTR_SHOW_FILTER_BUTTON },
+ { XML_NAMESPACE_TABLE, XML_DRILL_DOWN_ON_DOUBLE_CLICK, XML_TOK_DATA_PILOT_TABLE_ATTR_DRILL_DOWN },
XML_TOKEN_MAP_END
};
@@ -1344,13 +1344,13 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableElemTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SQL },
- { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_TABLE },
+ { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SQL },
+ { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_TABLE },
{ XML_NAMESPACE_TABLE, XML_DATA_PILOT_GRAND_TOTAL, XML_TOK_DATA_PILOT_TABLE_ELEM_GRAND_TOTAL },
- { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_QUERY },
- { XML_NAMESPACE_TABLE, XML_SOURCE_SERVICE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SERVICE },
- { XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_CELL_RANGE },
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD, XML_TOK_DATA_PILOT_TABLE_ELEM_DATA_PILOT_FIELD },
+ { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_QUERY },
+ { XML_NAMESPACE_TABLE, XML_SOURCE_SERVICE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SERVICE },
+ { XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_CELL_RANGE },
+ { XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD, XML_TOK_DATA_PILOT_TABLE_ELEM_DATA_PILOT_FIELD },
XML_TOKEN_MAP_END
};
@@ -1366,10 +1366,10 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceServiceAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableSourceServiceAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_SOURCE_SERVICE_ATTR_NAME },
- { XML_NAMESPACE_TABLE, XML_SOURCE_NAME, XML_TOK_SOURCE_SERVICE_ATTR_SOURCE_NAME },
- { XML_NAMESPACE_TABLE, XML_OBJECT_NAME, XML_TOK_SOURCE_SERVICE_ATTR_OBJECT_NAME },
- { XML_NAMESPACE_TABLE, XML_USER_NAME, XML_TOK_SOURCE_SERVICE_ATTR_USER_NAME },
+ { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_SOURCE_SERVICE_ATTR_NAME },
+ { XML_NAMESPACE_TABLE, XML_SOURCE_NAME, XML_TOK_SOURCE_SERVICE_ATTR_SOURCE_NAME },
+ { XML_NAMESPACE_TABLE, XML_OBJECT_NAME, XML_TOK_SOURCE_SERVICE_ATTR_OBJECT_NAME },
+ { XML_NAMESPACE_TABLE, XML_USER_NAME, XML_TOK_SOURCE_SERVICE_ATTR_USER_NAME },
{ XML_NAMESPACE_TABLE, XML_PASSWORD, XML_TOK_SOURCE_SERVICE_ATTR_PASSWORD },
XML_TOKEN_MAP_END
};
@@ -1405,7 +1405,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceCellRangeAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableSourceCellRangeAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_SOURCE_CELL_RANGE_ATTR_CELL_RANGE_ADDRESS},
+ { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_SOURCE_CELL_RANGE_ATTR_CELL_RANGE_ADDRESS},
XML_TOKEN_MAP_END
};
@@ -1421,7 +1421,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceCellRangeElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableSourceCellRangeElemTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_FILTER, XML_TOK_SOURCE_CELL_RANGE_ELEM_FILTER},
+ { XML_NAMESPACE_TABLE, XML_FILTER, XML_TOK_SOURCE_CELL_RANGE_ELEM_FILTER},
XML_TOKEN_MAP_END
};
@@ -1460,7 +1460,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotFieldElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDataPilotFieldElemTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_LEVEL, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LEVEL },
+ { XML_NAMESPACE_TABLE, XML_DATA_PILOT_LEVEL, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LEVEL },
{ XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD_REFERENCE, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_REFERENCE },
{ XML_NAMESPACE_TABLE, XML_DATA_PILOT_GROUPS, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_GROUPS },
XML_TOKEN_MAP_END
@@ -1478,7 +1478,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotLevelAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDataPilotLevelAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_SHOW_EMPTY, XML_TOK_DATA_PILOT_LEVEL_ATTR_SHOW_EMPTY },
+ { XML_NAMESPACE_TABLE, XML_SHOW_EMPTY, XML_TOK_DATA_PILOT_LEVEL_ATTR_SHOW_EMPTY },
XML_TOKEN_MAP_END
};
@@ -1494,11 +1494,11 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotLevelElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDataPilotLevelElemTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTALS, XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_SUBTOTALS },
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBERS, XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_MEMBERS },
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_DISPLAY_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_DISPLAY_INFO },
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SORT_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_SORT_INFO },
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_LAYOUT_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LAYOUT_INFO },
+ { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTALS, XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_SUBTOTALS },
+ { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBERS, XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_MEMBERS },
+ { XML_NAMESPACE_TABLE, XML_DATA_PILOT_DISPLAY_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_DISPLAY_INFO },
+ { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SORT_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_SORT_INFO },
+ { XML_NAMESPACE_TABLE, XML_DATA_PILOT_LAYOUT_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LAYOUT_INFO },
XML_TOKEN_MAP_END
};
@@ -1514,7 +1514,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotSubTotalsElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDataPilotSubTotalsElemTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTAL, XML_TOK_DATA_PILOT_SUBTOTALS_ELEM_DATA_PILOT_SUBTOTAL },
+ { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTAL, XML_TOK_DATA_PILOT_SUBTOTALS_ELEM_DATA_PILOT_SUBTOTAL },
XML_TOKEN_MAP_END
};
@@ -1548,7 +1548,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotMembersElemTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aDataPilotMembersElemTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER, XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER },
+ { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER, XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER },
XML_TOKEN_MAP_END
};
@@ -1584,11 +1584,11 @@ const SvXMLTokenMap& ScXMLImport::GetConsolidationAttrTokenMap()
{
static __FAR_DATA SvXMLTokenMapEntry aConsolidationAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_CONSOLIDATION_ATTR_FUNCTION },
- { XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE_ADDRESSES, XML_TOK_CONSOLIDATION_ATTR_SOURCE_RANGES },
- { XML_NAMESPACE_TABLE, XML_TARGET_CELL_ADDRESS, XML_TOK_CONSOLIDATION_ATTR_TARGET_ADDRESS },
- { XML_NAMESPACE_TABLE, XML_USE_LABEL, XML_TOK_CONSOLIDATION_ATTR_USE_LABEL },
- { XML_NAMESPACE_TABLE, XML_LINK_TO_SOURCE_DATA, XML_TOK_CONSOLIDATION_ATTR_LINK_TO_SOURCE },
+ { XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_CONSOLIDATION_ATTR_FUNCTION },
+ { XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE_ADDRESSES, XML_TOK_CONSOLIDATION_ATTR_SOURCE_RANGES },
+ { XML_NAMESPACE_TABLE, XML_TARGET_CELL_ADDRESS, XML_TOK_CONSOLIDATION_ATTR_TARGET_ADDRESS },
+ { XML_NAMESPACE_TABLE, XML_USE_LABEL, XML_TOK_CONSOLIDATION_ATTR_USE_LABEL },
+ { XML_NAMESPACE_TABLE, XML_LINK_TO_SOURCE_DATA, XML_TOK_CONSOLIDATION_ATTR_LINK_TO_SOURCE },
XML_TOKEN_MAP_END
};
@@ -1636,7 +1636,7 @@ SvXMLImportContext *ScXMLImport::CreateContext( USHORT nPrefix,
ScXMLImport::ScXMLImport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
const sal_uInt16 nImportFlag)
-: SvXMLImport( xServiceFactory, nImportFlag ),
+: SvXMLImport( xServiceFactory, nImportFlag ),
pDoc( NULL ),
pChangeTrackingImportHelper(NULL),
pStylesImportHelper(NULL),
@@ -1645,9 +1645,9 @@ ScXMLImport::ScXMLImport(
sCellStyle(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLSTYL)),
sStandardFormat(RTL_CONSTASCII_USTRINGPARAM(SC_STANDARDFORMAT)),
sType(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_TYPE)),
-// pScAutoStylePool(new SvXMLAutoStylePoolP),
-// pParaItemMapper( 0 ),
-// pI18NMap( new SvI18NMap ),
+// pScAutoStylePool(new SvXMLAutoStylePoolP),
+// pParaItemMapper( 0 ),
+// pI18NMap( new SvI18NMap ),
pDocElemTokenMap( 0 ),
pStylesElemTokenMap( 0 ),
pStylesAttrTokenMap( 0 ),
@@ -1771,7 +1771,7 @@ ScXMLImport::ScXMLImport(
ScXMLImport::~ScXMLImport() throw()
{
- // delete pI18NMap;
+ // delete pI18NMap;
delete pDocElemTokenMap;
delete pStylesElemTokenMap;
delete pStylesAttrTokenMap;
@@ -1838,8 +1838,8 @@ ScXMLImport::~ScXMLImport() throw()
delete pDataPilotMemberAttrTokenMap;
delete pConsolidationAttrTokenMap;
- // if (pScAutoStylePool)
- // delete pScAutoStylePool;
+ // if (pScAutoStylePool)
+ // delete pScAutoStylePool;
if (pChangeTrackingImportHelper)
delete pChangeTrackingImportHelper;
if (pNumberFormatAttributesExportHelper)
@@ -2248,19 +2248,19 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa
uno::Type aType = aConfigProps[i].Value.getValueType();
uno::Reference<beans::XPropertySet> xImportInfo =
getImportInfo();
-
+
if (xImportInfo.is() &&
- (aType.equals(getCppuType(
+ (aType.equals(getCppuType(
(uno::Reference<container::XNameContainer> *)0 ) ) ||
- aType.equals(getCppuType(
+ aType.equals(getCppuType(
(uno::Reference<container::XNameAccess> *)0 ) ) ) )
{
- uno::Reference< beans::XPropertySetInfo > xPropertySetInfo =
+ uno::Reference< beans::XPropertySetInfo > xPropertySetInfo =
xImportInfo->getPropertySetInfo();
- if (xPropertySetInfo.is() &&
+ if (xPropertySetInfo.is() &&
xPropertySetInfo->hasPropertyByName(sSCName) )
{
- xImportInfo->setPropertyValue(sSCName,
+ xImportInfo->setPropertyValue(sSCName,
aConfigProps[i].Value );
}
}
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 9771655ebd4b..a09b877e383e 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -238,7 +238,7 @@ enum ScXMLTableRowAttrTokens
XML_TOK_TABLE_ROW_ATTR_VISIBILITY,
XML_TOK_TABLE_ROW_ATTR_REPEATED,
XML_TOK_TABLE_ROW_ATTR_DEFAULT_CELL_STYLE_NAME
-// XML_TOK_TABLE_ROW_ATTR_USE_OPTIMAL_HEIGHT
+// XML_TOK_TABLE_ROW_ATTR_USE_OPTIMAL_HEIGHT
};
enum ScXMLTableRowCellTokens
@@ -632,133 +632,133 @@ typedef std::list<const ScMyLabelRange*> ScMyLabelRanges;
struct ScMyImportValidation
{
- rtl::OUString sName;
- rtl::OUString sImputTitle;
- rtl::OUString sImputMessage;
- rtl::OUString sErrorTitle;
- rtl::OUString sErrorMessage;
- rtl::OUString sFormula1;
- rtl::OUString sFormula2;
+ rtl::OUString sName;
+ rtl::OUString sImputTitle;
+ rtl::OUString sImputMessage;
+ rtl::OUString sErrorTitle;
+ rtl::OUString sErrorMessage;
+ rtl::OUString sFormula1;
+ rtl::OUString sFormula2;
rtl::OUString sFormulaNmsp1;
rtl::OUString sFormulaNmsp2;
rtl::OUString sBaseCellAddress; // #b4974740# string is used directly
- com::sun::star::sheet::ValidationAlertStyle aAlertStyle;
- com::sun::star::sheet::ValidationType aValidationType;
- com::sun::star::sheet::ConditionOperator aOperator;
+ com::sun::star::sheet::ValidationAlertStyle aAlertStyle;
+ com::sun::star::sheet::ValidationType aValidationType;
+ com::sun::star::sheet::ConditionOperator aOperator;
formula::FormulaGrammar::Grammar eGrammar1;
formula::FormulaGrammar::Grammar eGrammar2;
sal_Int16 nShowList;
- sal_Bool bShowErrorMessage;
- sal_Bool bShowImputMessage;
- sal_Bool bIgnoreBlanks;
+ sal_Bool bShowErrorMessage;
+ sal_Bool bShowImputMessage;
+ sal_Bool bIgnoreBlanks;
};
-typedef std::vector<ScMyImportValidation> ScMyImportValidations;
-typedef std::list<SvXMLImportContext*> ScMyViewContextList;
+typedef std::vector<ScMyImportValidation> ScMyImportValidations;
+typedef std::list<SvXMLImportContext*> ScMyViewContextList;
class ScMyStylesImportHelper;
class ScXMLImport: public SvXMLImport
{
- typedef ::std::hash_map< ::rtl::OUString, sal_Int16, ::rtl::OUStringHash > CellTypeMap;
- CellTypeMap aCellTypeMap;
-
- ScDocument* pDoc;
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- ScMyViewContextList aViewContextList;
- ScMyStylesImportHelper* pStylesImportHelper;
- rtl::OUString sNumberFormat;
- rtl::OUString sLocale;
- rtl::OUString sCellStyle;
- rtl::OUString sStandardFormat;
- rtl::OUString sType;
-
-// SvXMLAutoStylePoolP *pScAutoStylePool;
- UniReference < XMLPropertyHandlerFactory > xScPropHdlFactory;
- UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper;
- UniReference < XMLPropertySetMapper > xColumnStylesPropertySetMapper;
- UniReference < XMLPropertySetMapper > xRowStylesPropertySetMapper;
- UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper;
-// SvXMLImportContextRef xStyles;
-// SvXMLImportContextRef xAutoStyles;
-
-// SvXMLImportItemMapper *pParaItemMapper;// paragraph item import
-// SvI18NMap *pI18NMap; // name mapping for I18N
- SvXMLTokenMap *pDocElemTokenMap;
- SvXMLTokenMap *pStylesElemTokenMap;
- SvXMLTokenMap *pStylesAttrTokenMap;
- SvXMLTokenMap *pStyleElemTokenMap;
- SvXMLTokenMap *pBodyElemTokenMap;
- SvXMLTokenMap *pContentValidationsElemTokenMap;
- SvXMLTokenMap *pContentValidationElemTokenMap;
- SvXMLTokenMap *pContentValidationAttrTokenMap;
- SvXMLTokenMap *pContentValidationMessageElemTokenMap;
- SvXMLTokenMap *pContentValidationHelpMessageAttrTokenMap;
- SvXMLTokenMap *pContentValidationErrorMessageAttrTokenMap;
- SvXMLTokenMap *pContentValidationErrorMacroAttrTokenMap;
- SvXMLTokenMap *pLabelRangesElemTokenMap;
- SvXMLTokenMap *pLabelRangeAttrTokenMap;
- SvXMLTokenMap *pTableElemTokenMap;
- SvXMLTokenMap *pTableRowsElemTokenMap;
- SvXMLTokenMap *pTableColsElemTokenMap;
- SvXMLTokenMap *pTableScenarioAttrTokenMap;
- SvXMLTokenMap *pTableAttrTokenMap;
- SvXMLTokenMap *pTableColAttrTokenMap;
- SvXMLTokenMap *pTableRowElemTokenMap;
- SvXMLTokenMap *pTableRowAttrTokenMap;
- SvXMLTokenMap *pTableRowCellElemTokenMap;
- SvXMLTokenMap *pTableRowCellAttrTokenMap;
- SvXMLTokenMap *pTableAnnotationAttrTokenMap;
- SvXMLTokenMap *pDetectiveElemTokenMap;
- SvXMLTokenMap *pDetectiveHighlightedAttrTokenMap;
- SvXMLTokenMap *pDetectiveOperationAttrTokenMap;
- SvXMLTokenMap *pTableCellRangeSourceAttrTokenMap;
- SvXMLTokenMap *pNamedExpressionsElemTokenMap;
- SvXMLTokenMap *pNamedRangeAttrTokenMap;
- SvXMLTokenMap *pNamedExpressionAttrTokenMap;
- SvXMLTokenMap *pDatabaseRangesElemTokenMap;
- SvXMLTokenMap *pDatabaseRangeElemTokenMap;
- SvXMLTokenMap *pDatabaseRangeAttrTokenMap;
- SvXMLTokenMap *pDatabaseRangeSourceSQLAttrTokenMap;
- SvXMLTokenMap *pDatabaseRangeSourceTableAttrTokenMap;
- SvXMLTokenMap *pDatabaseRangeSourceQueryAttrTokenMap;
- SvXMLTokenMap *pFilterElemTokenMap;
- SvXMLTokenMap *pFilterAttrTokenMap;
- SvXMLTokenMap *pFilterConditionAttrTokenMap;
- SvXMLTokenMap *pSortElemTokenMap;
- SvXMLTokenMap *pSortAttrTokenMap;
- SvXMLTokenMap *pSortSortByAttrTokenMap;
- SvXMLTokenMap *pDatabaseRangeSubTotalRulesElemTokenMap;
- SvXMLTokenMap *pDatabaseRangeSubTotalRulesAttrTokenMap;
- SvXMLTokenMap *pSubTotalRulesSortGroupsAttrTokenMap;
- SvXMLTokenMap *pSubTotalRulesSubTotalRuleElemTokenMap;
- SvXMLTokenMap *pSubTotalRulesSubTotalRuleAttrTokenMap;
- SvXMLTokenMap *pSubTotalRuleSubTotalFieldAttrTokenMap;
- SvXMLTokenMap *pDataPilotTablesElemTokenMap;
- SvXMLTokenMap *pDataPilotTableAttrTokenMap;
- SvXMLTokenMap *pDataPilotTableElemTokenMap;
- SvXMLTokenMap *pDataPilotTableSourceServiceAttrTokenMap;
+ typedef ::std::hash_map< ::rtl::OUString, sal_Int16, ::rtl::OUStringHash > CellTypeMap;
+ CellTypeMap aCellTypeMap;
+
+ ScDocument* pDoc;
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
+ ScMyViewContextList aViewContextList;
+ ScMyStylesImportHelper* pStylesImportHelper;
+ rtl::OUString sNumberFormat;
+ rtl::OUString sLocale;
+ rtl::OUString sCellStyle;
+ rtl::OUString sStandardFormat;
+ rtl::OUString sType;
+
+// SvXMLAutoStylePoolP *pScAutoStylePool;
+ UniReference < XMLPropertyHandlerFactory > xScPropHdlFactory;
+ UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper;
+ UniReference < XMLPropertySetMapper > xColumnStylesPropertySetMapper;
+ UniReference < XMLPropertySetMapper > xRowStylesPropertySetMapper;
+ UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper;
+// SvXMLImportContextRef xStyles;
+// SvXMLImportContextRef xAutoStyles;
+
+// SvXMLImportItemMapper *pParaItemMapper;// paragraph item import
+// SvI18NMap *pI18NMap; // name mapping for I18N
+ SvXMLTokenMap *pDocElemTokenMap;
+ SvXMLTokenMap *pStylesElemTokenMap;
+ SvXMLTokenMap *pStylesAttrTokenMap;
+ SvXMLTokenMap *pStyleElemTokenMap;
+ SvXMLTokenMap *pBodyElemTokenMap;
+ SvXMLTokenMap *pContentValidationsElemTokenMap;
+ SvXMLTokenMap *pContentValidationElemTokenMap;
+ SvXMLTokenMap *pContentValidationAttrTokenMap;
+ SvXMLTokenMap *pContentValidationMessageElemTokenMap;
+ SvXMLTokenMap *pContentValidationHelpMessageAttrTokenMap;
+ SvXMLTokenMap *pContentValidationErrorMessageAttrTokenMap;
+ SvXMLTokenMap *pContentValidationErrorMacroAttrTokenMap;
+ SvXMLTokenMap *pLabelRangesElemTokenMap;
+ SvXMLTokenMap *pLabelRangeAttrTokenMap;
+ SvXMLTokenMap *pTableElemTokenMap;
+ SvXMLTokenMap *pTableRowsElemTokenMap;
+ SvXMLTokenMap *pTableColsElemTokenMap;
+ SvXMLTokenMap *pTableScenarioAttrTokenMap;
+ SvXMLTokenMap *pTableAttrTokenMap;
+ SvXMLTokenMap *pTableColAttrTokenMap;
+ SvXMLTokenMap *pTableRowElemTokenMap;
+ SvXMLTokenMap *pTableRowAttrTokenMap;
+ SvXMLTokenMap *pTableRowCellElemTokenMap;
+ SvXMLTokenMap *pTableRowCellAttrTokenMap;
+ SvXMLTokenMap *pTableAnnotationAttrTokenMap;
+ SvXMLTokenMap *pDetectiveElemTokenMap;
+ SvXMLTokenMap *pDetectiveHighlightedAttrTokenMap;
+ SvXMLTokenMap *pDetectiveOperationAttrTokenMap;
+ SvXMLTokenMap *pTableCellRangeSourceAttrTokenMap;
+ SvXMLTokenMap *pNamedExpressionsElemTokenMap;
+ SvXMLTokenMap *pNamedRangeAttrTokenMap;
+ SvXMLTokenMap *pNamedExpressionAttrTokenMap;
+ SvXMLTokenMap *pDatabaseRangesElemTokenMap;
+ SvXMLTokenMap *pDatabaseRangeElemTokenMap;
+ SvXMLTokenMap *pDatabaseRangeAttrTokenMap;
+ SvXMLTokenMap *pDatabaseRangeSourceSQLAttrTokenMap;
+ SvXMLTokenMap *pDatabaseRangeSourceTableAttrTokenMap;
+ SvXMLTokenMap *pDatabaseRangeSourceQueryAttrTokenMap;
+ SvXMLTokenMap *pFilterElemTokenMap;
+ SvXMLTokenMap *pFilterAttrTokenMap;
+ SvXMLTokenMap *pFilterConditionAttrTokenMap;
+ SvXMLTokenMap *pSortElemTokenMap;
+ SvXMLTokenMap *pSortAttrTokenMap;
+ SvXMLTokenMap *pSortSortByAttrTokenMap;
+ SvXMLTokenMap *pDatabaseRangeSubTotalRulesElemTokenMap;
+ SvXMLTokenMap *pDatabaseRangeSubTotalRulesAttrTokenMap;
+ SvXMLTokenMap *pSubTotalRulesSortGroupsAttrTokenMap;
+ SvXMLTokenMap *pSubTotalRulesSubTotalRuleElemTokenMap;
+ SvXMLTokenMap *pSubTotalRulesSubTotalRuleAttrTokenMap;
+ SvXMLTokenMap *pSubTotalRuleSubTotalFieldAttrTokenMap;
+ SvXMLTokenMap *pDataPilotTablesElemTokenMap;
+ SvXMLTokenMap *pDataPilotTableAttrTokenMap;
+ SvXMLTokenMap *pDataPilotTableElemTokenMap;
+ SvXMLTokenMap *pDataPilotTableSourceServiceAttrTokenMap;
SvXMLTokenMap *pDataPilotGrandTotalAttrTokenMap;
- SvXMLTokenMap *pDataPilotTableSourceCellRangeElemTokenMap;
- SvXMLTokenMap *pDataPilotTableSourceCellRangeAttrTokenMap;
- SvXMLTokenMap *pDataPilotFieldAttrTokenMap;
- SvXMLTokenMap *pDataPilotFieldElemTokenMap;
- SvXMLTokenMap *pDataPilotLevelAttrTokenMap;
- SvXMLTokenMap *pDataPilotLevelElemTokenMap;
- SvXMLTokenMap *pDataPilotSubTotalsElemTokenMap;
- SvXMLTokenMap *pDataPilotSubTotalAttrTokenMap;
- SvXMLTokenMap *pDataPilotMembersElemTokenMap;
- SvXMLTokenMap *pDataPilotMemberAttrTokenMap;
- SvXMLTokenMap *pConsolidationAttrTokenMap;
-
- ScMyTables aTables;
-
- ScMyNamedExpressions* pMyNamedExpressions;
+ SvXMLTokenMap *pDataPilotTableSourceCellRangeElemTokenMap;
+ SvXMLTokenMap *pDataPilotTableSourceCellRangeAttrTokenMap;
+ SvXMLTokenMap *pDataPilotFieldAttrTokenMap;
+ SvXMLTokenMap *pDataPilotFieldElemTokenMap;
+ SvXMLTokenMap *pDataPilotLevelAttrTokenMap;
+ SvXMLTokenMap *pDataPilotLevelElemTokenMap;
+ SvXMLTokenMap *pDataPilotSubTotalsElemTokenMap;
+ SvXMLTokenMap *pDataPilotSubTotalAttrTokenMap;
+ SvXMLTokenMap *pDataPilotMembersElemTokenMap;
+ SvXMLTokenMap *pDataPilotMemberAttrTokenMap;
+ SvXMLTokenMap *pConsolidationAttrTokenMap;
+
+ ScMyTables aTables;
+
+ ScMyNamedExpressions* pMyNamedExpressions;
ScMyLabelRanges* pMyLabelRanges;
- ScMyImportValidations* pValidations;
- ScMyImpDetectiveOpArray* pDetectiveOpArray;
- ScUnoGuard* pScUnoGuard;
+ ScMyImportValidations* pValidations;
+ ScMyImpDetectiveOpArray* pDetectiveOpArray;
+ ScUnoGuard* pScUnoGuard;
- std::vector<rtl::OUString> aTableStyles;
+ std::vector<rtl::OUString> aTableStyles;
XMLNumberFormatAttributesExportHelper* pNumberFormatAttributesExportHelper;
ScMyStyleNumberFormats* pStyleNumberFormats;
com::sun::star::uno::Reference <com::sun::star::util::XNumberFormats> xNumberFormats;
@@ -766,16 +766,16 @@ class ScXMLImport: public SvXMLImport
com::sun::star::uno::Reference <com::sun::star::sheet::XSheetCellRangeContainer> xSheetCellRanges;
- rtl::OUString sEmpty;
- rtl::OUString sPrevStyleName;
- rtl::OUString sPrevCurrency;
- sal_uInt32 nSolarMutexLocked;
+ rtl::OUString sEmpty;
+ rtl::OUString sPrevStyleName;
+ rtl::OUString sPrevCurrency;
+ sal_uInt32 nSolarMutexLocked;
sal_Int32 nProgressCount;
- sal_uInt16 nStyleFamilyMask;// Mask of styles to load
- sal_Int16 nPrevCellType;
- sal_Bool bLoadDoc; // Load doc or styles only
- sal_Bool bRemoveLastChar;
- sal_Bool bNullDateSetted;
+ sal_uInt16 nStyleFamilyMask;// Mask of styles to load
+ sal_Int16 nPrevCellType;
+ sal_Bool bLoadDoc; // Load doc or styles only
+ sal_Bool bRemoveLastChar;
+ sal_Bool bNullDateSetted;
sal_Bool bSelfImportingXMLSet;
sal_Bool bLatinDefaultStyle; // latin-only number format in default style?
sal_Bool bFromWrapper; // called from ScDocShell / ScXMLImportWrapper?
@@ -810,8 +810,8 @@ public:
const ::rtl::OUString& rLocalName );
SvXMLImportContext *CreateStylesContext(const ::rtl::OUString& rLocalName,
const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList, sal_Bool bAutoStyles );
-// SvXMLImportContext *CreateUseStylesContext(const ::rtl::OUString& rLocalName ,
-// const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList);
+// SvXMLImportContext *CreateUseStylesContext(const ::rtl::OUString& rLocalName ,
+// const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList);
SvXMLImportContext *CreateBodyContext(
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList );
@@ -819,8 +819,8 @@ public:
virtual void SetStatistics(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats);
- inline ScDocument* GetDocument() { return pDoc; }
- inline const ScDocument* GetDocument() const { return pDoc; }
+ inline ScDocument* GetDocument() { return pDoc; }
+ inline const ScDocument* GetDocument() const { return pDoc; }
ScMyTables& GetTables() { return aTables; }
@@ -831,21 +831,21 @@ public:
sal_Int16 GetCellType(const ::rtl::OUString& rStrValue) const;
-// SvI18NMap& GetI18NMap() { return *pI18NMap; }
+// SvI18NMap& GetI18NMap() { return *pI18NMap; }
-// inline const SvXMLImportItemMapper& GetParaItemMapper() const;
-// SvXMLImportContext *CreateParaItemImportContext( USHORT nPrefix,
-// const ::rtl::OUString& rLocalName,
-// const ::com::sun::star::uno::Reference<
-// ::com::sun::star::xml::sax::XAttributeList& xAttrList,
-// SfxItemSet& rItemSet );
+// inline const SvXMLImportItemMapper& GetParaItemMapper() const;
+// SvXMLImportContext *CreateParaItemImportContext( USHORT nPrefix,
+// const ::rtl::OUString& rLocalName,
+// const ::com::sun::star::uno::Reference<
+// ::com::sun::star::xml::sax::XAttributeList& xAttrList,
+// SfxItemSet& rItemSet );
UniReference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const { return xCellStylesPropertySetMapper; }
UniReference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const { return xColumnStylesPropertySetMapper; }
UniReference < XMLPropertySetMapper > GetRowStylesPropertySetMapper() const { return xRowStylesPropertySetMapper; }
UniReference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const { return xTableStylesPropertySetMapper; }
-// SvXMLImportContextRef GetAutoStyles() const { return xAutoStyles; }
-// SvXMLImportContextRef GetStyles() const { return xStyles; }
+// SvXMLImportContextRef GetAutoStyles() const { return xAutoStyles; }
+// SvXMLImportContextRef GetStyles() const { return xStyles; }
const SvXMLTokenMap& GetDocElemTokenMap();
//UNUSED2008-05 const SvXMLTokenMap& GetStylesElemTokenMap();
@@ -913,13 +913,13 @@ public:
const SvXMLTokenMap& GetDataPilotMembersElemTokenMap();
const SvXMLTokenMap& GetDataPilotMemberAttrTokenMap();
const SvXMLTokenMap& GetConsolidationAttrTokenMap();
-// const SvXMLTokenMap& GetTextPElemTokenMap();
-// const SvXMLTokenMap& GetTextPAttrTokenMap();
-// const SvXMLTokenMap& GetStyleStylesElemTokenMap();
-// const SvXMLTokenMap& GetTextListBlockAttrTokenMap();
-// const SvXMLTokenMap& GetTextListBlockElemTokenMap();
+// const SvXMLTokenMap& GetTextPElemTokenMap();
+// const SvXMLTokenMap& GetTextPAttrTokenMap();
+// const SvXMLTokenMap& GetStyleStylesElemTokenMap();
+// const SvXMLTokenMap& GetTextListBlockAttrTokenMap();
+// const SvXMLTokenMap& GetTextListBlockElemTokenMap();
- void AddNamedExpression(const ScMyNamedExpression* pMyNamedExpression) {
+ void AddNamedExpression(const ScMyNamedExpression* pMyNamedExpression) {
if (!pMyNamedExpressions)
pMyNamedExpressions = new ScMyNamedExpressions();
pMyNamedExpressions->push_back(pMyNamedExpression); }
@@ -937,7 +937,7 @@ public:
pValidations->push_back(rValidation); }
sal_Bool GetValidation(const rtl::OUString& sName, ScMyImportValidation& aValidation);
- inline ScMyImpDetectiveOpArray* GetDetectiveOpArray() {
+ inline ScMyImpDetectiveOpArray* GetDetectiveOpArray() {
if (!pDetectiveOpArray)
pDetectiveOpArray = new ScMyImpDetectiveOpArray();
return pDetectiveOpArray; }
@@ -1000,7 +1000,7 @@ public:
void SetRangeOverflowType(sal_uInt32 nType);
- sal_Int32 GetRangeType(const rtl::OUString sRangeType) const;
+ sal_Int32 GetRangeType(const rtl::OUString sRangeType) const;
void SetNamedRanges();
void SetLabelRanges();
void AddDefaultNote( const com::sun::star::table::CellAddress& aCell );
diff --git a/sc/source/filter/xml/xmllabri.cxx b/sc/source/filter/xml/xmllabri.cxx
index 70ec803cc46f..1bdc12bbb451 100644
--- a/sc/source/filter/xml/xmllabri.cxx
+++ b/sc/source/filter/xml/xmllabri.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +62,8 @@ SvXMLImportContext* ScXMLLabelRangesContext::CreateChildContext(
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
- SvXMLImportContext* pContext(NULL);
- const SvXMLTokenMap& rTokenMap(GetScImport().GetLabelRangesElemTokenMap());
+ SvXMLImportContext* pContext(NULL);
+ const SvXMLTokenMap& rTokenMap(GetScImport().GetLabelRangesElemTokenMap());
switch( rTokenMap.Get( nPrefix, rLName ) )
{
@@ -92,15 +92,15 @@ ScXMLLabelRangeContext::ScXMLLabelRangeContext(
SvXMLImportContext( rImport, nPrfx, rLName ),
bColumnOrientation( sal_False )
{
- sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0);
- const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetLabelRangeAttrTokenMap());
+ sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0);
+ const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetLabelRangeAttrTokenMap());
for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex )
{
- const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex ));
- const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex ));
- OUString aLocalName;
- USHORT nPrefix (GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ));
+ const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex ));
+ const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex ));
+ OUString aLocalName;
+ USHORT nPrefix (GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ));
switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
{
diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx
index c3cbd6532c90..7cb40b8efb6a 100644
--- a/sc/source/filter/xml/xmllabri.hxx
+++ b/sc/source/filter/xml/xmllabri.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 ScXMLImport;
class ScXMLLabelRangesContext : public SvXMLImportContext
{
private:
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
- ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
+ const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
+ ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
ScXMLLabelRangesContext(
@@ -47,14 +47,14 @@ public:
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList
);
- virtual ~ScXMLLabelRangesContext();
+ virtual ~ScXMLLabelRangesContext();
- virtual SvXMLImportContext* CreateChildContext(
+ virtual SvXMLImportContext* CreateChildContext(
USHORT nPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList
);
- virtual void EndElement();
+ virtual void EndElement();
};
@@ -63,12 +63,12 @@ public:
class ScXMLLabelRangeContext : public SvXMLImportContext
{
private:
- ::rtl::OUString sLabelRangeStr;
- ::rtl::OUString sDataRangeStr;
- sal_Bool bColumnOrientation;
+ ::rtl::OUString sLabelRangeStr;
+ ::rtl::OUString sDataRangeStr;
+ sal_Bool bColumnOrientation;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
- ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
+ const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
+ ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
ScXMLLabelRangeContext(
@@ -77,14 +77,14 @@ public:
const ::rtl::OUString& rLName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList
);
- virtual ~ScXMLLabelRangeContext();
+ virtual ~ScXMLLabelRangeContext();
- virtual SvXMLImportContext* CreateChildContext(
+ virtual SvXMLImportContext* CreateChildContext(
USHORT nPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList
);
- virtual void EndElement();
+ virtual void EndElement();
};
#endif
diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx
index 3ef17c321f23..09db7dc4f7bb 100644
--- a/sc/source/filter/xml/xmlnexpi.cxx
+++ b/sc/source/filter/xml/xmlnexpi.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScXMLNamedExpressionsContext::ScXMLNamedExpressionsContext( ScXMLImport& rImport
::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) :
SvXMLImportContext( rImport, nPrfx, rLName )
{
-/* sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
+/* sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for( sal_Int16 i=0; i < nAttrCount; ++i )
{
const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
@@ -174,7 +174,7 @@ SvXMLImportContext *ScXMLNamedRangeContext::CreateChildContext( USHORT nPrefix,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
{
-/* const SvXMLTokenMap& rTokenMap = GetScImport().GetTableElemTokenMap();
+/* const SvXMLTokenMap& rTokenMap = GetScImport().GetTableElemTokenMap();
switch( rTokenMap.Get( nPrefix, rLName ) )
{
}*/
@@ -237,7 +237,7 @@ SvXMLImportContext *ScXMLNamedExpressionContext::CreateChildContext( USHORT nPre
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
{
-/* const SvXMLTokenMap& rTokenMap = GetScImport().GetTableElemTokenMap();
+/* const SvXMLTokenMap& rTokenMap = GetScImport().GetTableElemTokenMap();
switch( rTokenMap.Get( nPrefix, rLName ) )
{
}*/
diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx
index 94d0b2738d52..bf112f24f55b 100644
--- a/sc/source/filter/xml/xmlnexpi.hxx
+++ b/sc/source/filter/xml/xmlnexpi.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx
index 341445431cc8..d99e9f6e0e5d 100644
--- a/sc/source/filter/xml/xmlrowi.cxx
+++ b/sc/source/filter/xml/xmlrowi.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -132,7 +132,7 @@ SvXMLImportContext *ScXMLTableRowContext::CreateChildContext( USHORT nPrefix,
switch( rTokenMap.Get( nPrefix, rLName ) )
{
case XML_TOK_TABLE_ROW_CELL:
-// if( IsInsertCellPossible() )
+// if( IsInsertCellPossible() )
{
bHasCell = sal_True;
pContext = new ScXMLTableRowCellContext( GetScImport(), nPrefix,
@@ -142,7 +142,7 @@ SvXMLImportContext *ScXMLTableRowContext::CreateChildContext( USHORT nPrefix,
}
break;
case XML_TOK_TABLE_ROW_COVERED_CELL:
-// if( IsInsertCellPossible() )
+// if( IsInsertCellPossible() )
{
bHasCell = sal_True;
pContext = new ScXMLTableRowCellContext( GetScImport(), nPrefix,
diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx
index 558555b233e3..efa8f7e4d205 100644
--- a/sc/source/filter/xml/xmlrowi.hxx
+++ b/sc/source/filter/xml/xmlrowi.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/xmlsceni.cxx b/sc/source/filter/xml/xmlsceni.cxx
index 652dd0a1dd43..0670667e5293 100644
--- a/sc/source/filter/xml/xmlsceni.cxx
+++ b/sc/source/filter/xml/xmlsceni.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ SvXMLImportContext *ScXMLTableScenarioContext::CreateChildContext(
void ScXMLTableScenarioContext::EndElement()
{
SCTAB nCurrTable( sal::static_int_cast<SCTAB>( GetScImport().GetTables().GetCurrentSheet() ) );
- ScDocument* pDoc(GetScImport().GetDocument());
+ ScDocument* pDoc(GetScImport().GetDocument());
if (pDoc)
{
pDoc->SetScenario( nCurrTable, TRUE );
diff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx
index f3a5a75fa563..39a045f7b8f7 100644
--- a/sc/source/filter/xml/xmlsceni.hxx
+++ b/sc/source/filter/xml/xmlsceni.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +37,14 @@ class ScXMLImport;
class ScXMLTableScenarioContext : public SvXMLImportContext
{
private:
- rtl::OUString sComment;
- Color aBorderColor;
- ScRangeList aScenarioRanges;
- sal_Bool bDisplayBorder;
- sal_Bool bCopyBack;
- sal_Bool bCopyStyles;
- sal_Bool bCopyFormulas;
- sal_Bool bIsActive;
+ rtl::OUString sComment;
+ Color aBorderColor;
+ ScRangeList aScenarioRanges;
+ sal_Bool bDisplayBorder;
+ sal_Bool bCopyBack;
+ sal_Bool bCopyStyles;
+ sal_Bool bCopyFormulas;
+ sal_Bool bIsActive;
sal_Bool bProtected;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx
index ff007240b12b..c998202c0700 100644
--- a/sc/source/filter/xml/xmlsorti.cxx
+++ b/sc/source/filter/xml/xmlsorti.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx
index 30ac31e0dd22..6d69ccb2a50c 100644
--- a/sc/source/filter/xml/xmlsorti.hxx
+++ b/sc/source/filter/xml/xmlsorti.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +42,14 @@ class ScXMLSortContext : public SvXMLImportContext
com::sun::star::uno::Sequence <com::sun::star::util::SortField> aSortFields;
com::sun::star::table::CellAddress aOutputPosition;
- rtl::OUString sCountry;
- rtl::OUString sLanguage;
- rtl::OUString sAlgorithm;
- sal_Int16 nUserListIndex;
- sal_Bool bCopyOutputData;
- sal_Bool bBindFormatsToContent;
- sal_Bool bIsCaseSensitive;
- sal_Bool bEnabledUserList;
+ rtl::OUString sCountry;
+ rtl::OUString sLanguage;
+ rtl::OUString sAlgorithm;
+ sal_Int16 nUserListIndex;
+ sal_Bool bCopyOutputData;
+ sal_Bool bBindFormatsToContent;
+ sal_Bool bIsCaseSensitive;
+ sal_Bool bEnabledUserList;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -78,9 +78,9 @@ class ScXMLSortByContext : public SvXMLImportContext
{
ScXMLSortContext* pSortContext;
- rtl::OUString sFieldNumber;
- rtl::OUString sDataType;
- rtl::OUString sOrder;
+ rtl::OUString sFieldNumber;
+ rtl::OUString sDataType;
+ rtl::OUString sOrder;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index d061ea24b194..90fa69acd56f 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using ::rtl::OUString;
#define MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010 }
#define MAP_EXT(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_LATEST }
-#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010 }
+#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010 }
const XMLPropertyMapEntry aXMLScCellStylesProperties[] =
{
@@ -100,7 +100,7 @@ const XMLPropertyMapEntry aXMLScCellStylesProperties[] =
MAP( "ParaBottomMargin", XML_NAMESPACE_FO, XML_PADDING, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_ALLPADDING ),
MAP( "ParaBottomMargin", XML_NAMESPACE_FO, XML_PADDING_BOTTOM, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_BOTTOMPADDING ),
MAP( "ParaIndent", XML_NAMESPACE_FO, XML_MARGIN_LEFT, XML_TYPE_PROP_PARAGRAPH|XML_TYPE_MEASURE16, 0 ),
-// MAP( "ParaIsHyphenation", XML_NAMESPACE_FO, XML_HYPHENATE, XML_TYPE_PROP_TEXT|XML_TYPE_BOOL, 0 ),
+// MAP( "ParaIsHyphenation", XML_NAMESPACE_FO, XML_HYPHENATE, XML_TYPE_PROP_TEXT|XML_TYPE_BOOL, 0 ),
MAP( "ParaLeftMargin", XML_NAMESPACE_FO, XML_PADDING_LEFT, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_LEFTPADDING ),
MAP( "ParaRightMargin", XML_NAMESPACE_FO, XML_PADDING_RIGHT, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_RIGHTPADDING ),
MAP( "ParaTopMargin", XML_NAMESPACE_FO, XML_PADDING_TOP, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_TOPPADDING ),
@@ -125,7 +125,7 @@ const XMLPropertyMapEntry aXMLScColumnStylesProperties[] =
MAP( "IsManualPageBreak", XML_NAMESPACE_FO, XML_BREAK_BEFORE, XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_BREAKBEFORE, 0),
MAP( "IsVisible", XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM, CTF_SC_ISVISIBLE ),
MAP( "Width", XML_NAMESPACE_STYLE, XML_COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_MEASURE, 0 ),
-// MAP( "OptimalWidth", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_BOOL, 0),
+// MAP( "OptimalWidth", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_BOOL, 0),
MAP_END()
};
@@ -245,31 +245,31 @@ void ScXMLCellExportPropertyMapper::ContextFilter(
{
switch( getPropertySetMapper()->GetEntryContextId( propertie->mnIndex ) )
{
- case CTF_SC_ALLPADDING: pPadding = propertie; break;
- case CTF_SC_BOTTOMPADDING: pPadding_Bottom = propertie; break;
- case CTF_SC_LEFTPADDING: pPadding_Left = propertie; break;
- case CTF_SC_RIGHTPADDING: pPadding_Right = propertie; break;
- case CTF_SC_TOPPADDING: pPadding_Top = propertie; break;
- case CTF_SC_ALLBORDER: pBorder = propertie; break;
- case CTF_SC_LEFTBORDER: pBorder_Left = propertie; break;
- case CTF_SC_RIGHTBORDER: pBorder_Right = propertie; break;
- case CTF_SC_BOTTOMBORDER: pBorder_Bottom = propertie; break;
- case CTF_SC_TOPBORDER: pBorder_Top = propertie; break;
- case CTF_SC_ALLBORDERWIDTH: pAllBorderWidthState = propertie; break;
- case CTF_SC_LEFTBORDERWIDTH: pLeftBorderWidthState = propertie; break;
- case CTF_SC_RIGHTBORDERWIDTH: pRightBorderWidthState = propertie; break;
- case CTF_SC_TOPBORDERWIDTH: pTopBorderWidthState = propertie; break;
- case CTF_SC_BOTTOMBORDERWIDTH: pBottomBorderWidthState = propertie; break;
- case CTF_ALLBORDER: pSWBorder = propertie; break;
- case CTF_LEFTBORDER: pSWBorder_Left = propertie; break;
- case CTF_RIGHTBORDER: pSWBorder_Right = propertie; break;
- case CTF_BOTTOMBORDER: pSWBorder_Bottom = propertie; break;
- case CTF_TOPBORDER: pSWBorder_Top = propertie; break;
- case CTF_ALLBORDERWIDTH: pSWAllBorderWidthState = propertie; break;
- case CTF_LEFTBORDERWIDTH: pSWLeftBorderWidthState = propertie; break;
- case CTF_RIGHTBORDERWIDTH: pSWRightBorderWidthState = propertie; break;
- case CTF_TOPBORDERWIDTH: pSWTopBorderWidthState = propertie; break;
- case CTF_BOTTOMBORDERWIDTH: pSWBottomBorderWidthState = propertie; break;
+ case CTF_SC_ALLPADDING: pPadding = propertie; break;
+ case CTF_SC_BOTTOMPADDING: pPadding_Bottom = propertie; break;
+ case CTF_SC_LEFTPADDING: pPadding_Left = propertie; break;
+ case CTF_SC_RIGHTPADDING: pPadding_Right = propertie; break;
+ case CTF_SC_TOPPADDING: pPadding_Top = propertie; break;
+ case CTF_SC_ALLBORDER: pBorder = propertie; break;
+ case CTF_SC_LEFTBORDER: pBorder_Left = propertie; break;
+ case CTF_SC_RIGHTBORDER: pBorder_Right = propertie; break;
+ case CTF_SC_BOTTOMBORDER: pBorder_Bottom = propertie; break;
+ case CTF_SC_TOPBORDER: pBorder_Top = propertie; break;
+ case CTF_SC_ALLBORDERWIDTH: pAllBorderWidthState = propertie; break;
+ case CTF_SC_LEFTBORDERWIDTH: pLeftBorderWidthState = propertie; break;
+ case CTF_SC_RIGHTBORDERWIDTH: pRightBorderWidthState = propertie; break;
+ case CTF_SC_TOPBORDERWIDTH: pTopBorderWidthState = propertie; break;
+ case CTF_SC_BOTTOMBORDERWIDTH: pBottomBorderWidthState = propertie; break;
+ case CTF_ALLBORDER: pSWBorder = propertie; break;
+ case CTF_LEFTBORDER: pSWBorder_Left = propertie; break;
+ case CTF_RIGHTBORDER: pSWBorder_Right = propertie; break;
+ case CTF_BOTTOMBORDER: pSWBorder_Bottom = propertie; break;
+ case CTF_TOPBORDER: pSWBorder_Top = propertie; break;
+ case CTF_ALLBORDERWIDTH: pSWAllBorderWidthState = propertie; break;
+ case CTF_LEFTBORDERWIDTH: pSWLeftBorderWidthState = propertie; break;
+ case CTF_RIGHTBORDERWIDTH: pSWRightBorderWidthState = propertie; break;
+ case CTF_TOPBORDERWIDTH: pSWTopBorderWidthState = propertie; break;
+ case CTF_BOTTOMBORDERWIDTH: pSWBottomBorderWidthState = propertie; break;
case CTF_SC_DIAGONALTLBR: pDiagonalTLBR = propertie; break;
case CTF_SC_DIAGONALTLBRWIDTH: pDiagonalTLBRWidthState = propertie; break;
case CTF_SC_DIAGONALBLTR: pDiagonalBLTR = propertie; break;
@@ -537,7 +537,7 @@ void ScXMLRowExportPropertyMapper::ContextFilter(
{
//#108550#; don't filter the height, so other applications know the calculated height
-/* XMLPropertyState* pHeight = NULL;
+/* XMLPropertyState* pHeight = NULL;
XMLPropertyState* pOptimalHeight = NULL;
for( ::std::vector< XMLPropertyState >::iterator propertie = rProperties.begin();
@@ -546,8 +546,8 @@ void ScXMLRowExportPropertyMapper::ContextFilter(
{
switch( getPropertySetMapper()->GetEntryContextId( propertie->mnIndex ) )
{
- case CTF_SC_ROWHEIGHT: pHeight = propertie; break;
- case CTF_SC_ROWOPTIMALHEIGHT: pOptimalHeight = propertie; break;
+ case CTF_SC_ROWHEIGHT: pHeight = propertie; break;
+ case CTF_SC_ROWOPTIMALHEIGHT: pOptimalHeight = propertie; break;
}
}
if ((pHeight && pOptimalHeight && ::cppu::any2bool( pOptimalHeight->maValue )) ||
diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx
index f8abf5e6443d..3199ccbf6986 100644
--- a/sc/source/filter/xml/xmlstyle.hxx
+++ b/sc/source/filter/xml/xmlstyle.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,63 +45,63 @@ extern const XMLPropertyMapEntry aXMLScTableStylesProperties[];
extern const XMLPropertyMapEntry aXMLScTableStylesImportProperties[];
//CellStyles
-#define XML_SC_TYPE_CELLPROTECTION (XML_SC_TYPES_START + 1)
-#define XML_SC_TYPE_PRINTCONTENT (XML_SC_TYPES_START + 2)
-#define XML_SC_TYPE_HORIJUSTIFY (XML_SC_TYPES_START + 3)
-#define XML_SC_TYPE_HORIJUSTIFYSOURCE (XML_SC_TYPES_START + 4)
+#define XML_SC_TYPE_CELLPROTECTION (XML_SC_TYPES_START + 1)
+#define XML_SC_TYPE_PRINTCONTENT (XML_SC_TYPES_START + 2)
+#define XML_SC_TYPE_HORIJUSTIFY (XML_SC_TYPES_START + 3)
+#define XML_SC_TYPE_HORIJUSTIFYSOURCE (XML_SC_TYPES_START + 4)
#define XML_SC_TYPE_HORIJUSTIFYREPEAT (XML_SC_TYPES_START + 5)
-#define XML_SC_TYPE_ORIENTATION (XML_SC_TYPES_START + 6)
-#define XML_SC_TYPE_ROTATEANGLE (XML_SC_TYPES_START + 7)
-#define XML_SC_TYPE_ROTATEREFERENCE (XML_SC_TYPES_START + 8)
-#define XML_SC_TYPE_BORDERLEFT (XML_SC_TYPES_START + 9)
-#define XML_SC_TYPE_BORDERRIGHT (XML_SC_TYPES_START + 10)
-#define XML_SC_TYPE_BORDERTOP (XML_SC_TYPES_START + 11)
-#define XML_SC_TYPE_BORDERBOTTOM (XML_SC_TYPES_START + 12)
-#define XML_SC_TYPE_VERTJUSTIFY (XML_SC_TYPES_START + 13)
-#define XML_SC_ISTEXTWRAPPED (XML_SC_TYPES_START + 14)
-#define XML_SC_TYPE_EQUAL (XML_SC_TYPES_START + 15)
-#define XML_SC_TYPE_VERTICAL (XML_SC_TYPES_START + 16)
-
-#define CTF_SC_HORIJUSTIFY (XML_SC_CTF_START + 1)
-#define CTF_SC_HORIJUSTIFY_SOURCE (XML_SC_CTF_START + 2)
-#define CTF_SC_ALLPADDING (XML_SC_CTF_START + 3)
-#define CTF_SC_BOTTOMPADDING (XML_SC_CTF_START + 4)
-#define CTF_SC_LEFTPADDING (XML_SC_CTF_START + 5)
-#define CTF_SC_RIGHTPADDING (XML_SC_CTF_START + 6)
-#define CTF_SC_TOPPADDING (XML_SC_CTF_START + 7)
-#define CTF_SC_ALLBORDER (XML_SC_CTF_START + 8)
-#define CTF_SC_LEFTBORDER (XML_SC_CTF_START + 9)
-#define CTF_SC_RIGHTBORDER (XML_SC_CTF_START + 10)
-#define CTF_SC_TOPBORDER (XML_SC_CTF_START + 11)
-#define CTF_SC_BOTTOMBORDER (XML_SC_CTF_START + 12)
-#define CTF_SC_ALLBORDERWIDTH (XML_SC_CTF_START + 13)
-#define CTF_SC_LEFTBORDERWIDTH (XML_SC_CTF_START + 14)
-#define CTF_SC_RIGHTBORDERWIDTH (XML_SC_CTF_START + 15)
-#define CTF_SC_TOPBORDERWIDTH (XML_SC_CTF_START + 16)
-#define CTF_SC_BOTTOMBORDERWIDTH (XML_SC_CTF_START + 17)
-#define CTF_SC_NUMBERFORMAT (XML_SC_CTF_START + 18)
-#define CTF_SC_MAP (XML_SC_CTF_START + 19)
-#define CTF_SC_PARAINDENT (XML_SC_CTF_START + 20)
-#define CTF_SC_OLDTEXTBACKGROUND (XML_SC_CTF_START + 21)
-#define CTF_SC_IMPORT_MAP (XML_SC_CTF_START + 22)
-#define CTF_SC_CELLSTYLE (XML_SC_CTF_START + 23)
-#define CTF_SC_VALIDATION (XML_SC_CTF_START + 24)
-#define CTF_SC_DIAGONALTLBR (XML_SC_CTF_START + 25)
-#define CTF_SC_DIAGONALTLBRWIDTH (XML_SC_CTF_START + 26)
-#define CTF_SC_DIAGONALBLTR (XML_SC_CTF_START + 27)
-#define CTF_SC_DIAGONALBLTRWIDTH (XML_SC_CTF_START + 28)
+#define XML_SC_TYPE_ORIENTATION (XML_SC_TYPES_START + 6)
+#define XML_SC_TYPE_ROTATEANGLE (XML_SC_TYPES_START + 7)
+#define XML_SC_TYPE_ROTATEREFERENCE (XML_SC_TYPES_START + 8)
+#define XML_SC_TYPE_BORDERLEFT (XML_SC_TYPES_START + 9)
+#define XML_SC_TYPE_BORDERRIGHT (XML_SC_TYPES_START + 10)
+#define XML_SC_TYPE_BORDERTOP (XML_SC_TYPES_START + 11)
+#define XML_SC_TYPE_BORDERBOTTOM (XML_SC_TYPES_START + 12)
+#define XML_SC_TYPE_VERTJUSTIFY (XML_SC_TYPES_START + 13)
+#define XML_SC_ISTEXTWRAPPED (XML_SC_TYPES_START + 14)
+#define XML_SC_TYPE_EQUAL (XML_SC_TYPES_START + 15)
+#define XML_SC_TYPE_VERTICAL (XML_SC_TYPES_START + 16)
+
+#define CTF_SC_HORIJUSTIFY (XML_SC_CTF_START + 1)
+#define CTF_SC_HORIJUSTIFY_SOURCE (XML_SC_CTF_START + 2)
+#define CTF_SC_ALLPADDING (XML_SC_CTF_START + 3)
+#define CTF_SC_BOTTOMPADDING (XML_SC_CTF_START + 4)
+#define CTF_SC_LEFTPADDING (XML_SC_CTF_START + 5)
+#define CTF_SC_RIGHTPADDING (XML_SC_CTF_START + 6)
+#define CTF_SC_TOPPADDING (XML_SC_CTF_START + 7)
+#define CTF_SC_ALLBORDER (XML_SC_CTF_START + 8)
+#define CTF_SC_LEFTBORDER (XML_SC_CTF_START + 9)
+#define CTF_SC_RIGHTBORDER (XML_SC_CTF_START + 10)
+#define CTF_SC_TOPBORDER (XML_SC_CTF_START + 11)
+#define CTF_SC_BOTTOMBORDER (XML_SC_CTF_START + 12)
+#define CTF_SC_ALLBORDERWIDTH (XML_SC_CTF_START + 13)
+#define CTF_SC_LEFTBORDERWIDTH (XML_SC_CTF_START + 14)
+#define CTF_SC_RIGHTBORDERWIDTH (XML_SC_CTF_START + 15)
+#define CTF_SC_TOPBORDERWIDTH (XML_SC_CTF_START + 16)
+#define CTF_SC_BOTTOMBORDERWIDTH (XML_SC_CTF_START + 17)
+#define CTF_SC_NUMBERFORMAT (XML_SC_CTF_START + 18)
+#define CTF_SC_MAP (XML_SC_CTF_START + 19)
+#define CTF_SC_PARAINDENT (XML_SC_CTF_START + 20)
+#define CTF_SC_OLDTEXTBACKGROUND (XML_SC_CTF_START + 21)
+#define CTF_SC_IMPORT_MAP (XML_SC_CTF_START + 22)
+#define CTF_SC_CELLSTYLE (XML_SC_CTF_START + 23)
+#define CTF_SC_VALIDATION (XML_SC_CTF_START + 24)
+#define CTF_SC_DIAGONALTLBR (XML_SC_CTF_START + 25)
+#define CTF_SC_DIAGONALTLBRWIDTH (XML_SC_CTF_START + 26)
+#define CTF_SC_DIAGONALBLTR (XML_SC_CTF_START + 27)
+#define CTF_SC_DIAGONALBLTRWIDTH (XML_SC_CTF_START + 28)
#define CTF_SC_DIAGONALTLBRWIDTHS (XML_SC_CTF_START + 29)
#define CTF_SC_DIAGONALBLTRWIDTHS (XML_SC_CTF_START + 30)
-#define CTF_SC_ROWHEIGHT (XML_SC_CTF_START + 50)
-#define CTF_SC_ROWOPTIMALHEIGHT (XML_SC_CTF_START + 51)
-#define CTF_SC_ROWBREAKBEFORE (XML_SC_CTF_START + 52)
-#define CTF_SC_ISVISIBLE (XML_SC_CTF_START + 53)
+#define CTF_SC_ROWHEIGHT (XML_SC_CTF_START + 50)
+#define CTF_SC_ROWOPTIMALHEIGHT (XML_SC_CTF_START + 51)
+#define CTF_SC_ROWBREAKBEFORE (XML_SC_CTF_START + 52)
+#define CTF_SC_ISVISIBLE (XML_SC_CTF_START + 53)
-#define CTF_SC_MASTERPAGENAME (XML_SC_CTF_START + 53)
+#define CTF_SC_MASTERPAGENAME (XML_SC_CTF_START + 53)
//ColumnStyles
-#define XML_SC_TYPE_BREAKBEFORE (XML_SC_TYPES_START + 50)
+#define XML_SC_TYPE_BREAKBEFORE (XML_SC_TYPES_START + 50)
class ScXMLExport;
class ScXMLImport;
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 3866bba63239..2e9a668ee822 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -244,9 +244,9 @@ void ScXMLRowImportPropertyMapper::finished(::std::vector< XMLPropertyState >& r
sal_Int16 nContextID = getPropertySetMapper()->GetEntryContextId(property->mnIndex);
switch (nContextID)
{
- case CTF_SC_ROWHEIGHT : pHeight = property; break;
- case CTF_SC_ROWOPTIMALHEIGHT : pOptimalHeight = property; break;
- case CTF_SC_ROWBREAKBEFORE : pPageBreak = property; break;
+ case CTF_SC_ROWHEIGHT : pHeight = property; break;
+ case CTF_SC_ROWOPTIMALHEIGHT : pOptimalHeight = property; break;
+ case CTF_SC_ROWBREAKBEFORE : pPageBreak = property; break;
}
}
}
@@ -296,7 +296,7 @@ public:
};
ScXMLMapContext::ScXMLMapContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList )
+ const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList )
: SvXMLImportContext( rImport, nPrfx, rLName )
{
sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0);
diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx
index b2a8589f5524..8013db8f11c3 100644
--- a/sc/source/filter/xml/xmlstyli.hxx
+++ b/sc/source/filter/xml/xmlstyli.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 ~ScXMLCellImportPropertyMapper();
/** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_IMPORT flag set */
-/* virtual sal_Bool handleSpecialItem(
+/* virtual sal_Bool handleSpecialItem(
XMLPropertyState& rProperty,
::std::vector< XMLPropertyState >& rProperties,
const ::rtl::OUString& rValue,
@@ -63,7 +63,7 @@ public:
const SvXMLNamespaceMap& rNamespaceMap ) const;*/
/** this method is called for every item that has the MID_FLAG_NO_ITEM_IMPORT flag set */
-/* virtual sal_Bool handleNoItem(
+/* virtual sal_Bool handleNoItem(
sal_Int32 nIndex,
::std::vector< XMLPropertyState >& rProperties,
const ::rtl::OUString& rValue,
@@ -94,16 +94,16 @@ struct ScXMLMapContent;
class XMLTableStyleContext : public XMLPropStyleContext
{
- ::rtl::OUString sDataStyleName;
- rtl::OUString sPageStyle;
- const rtl::OUString sNumberFormat;
- SvXMLStylesContext* pStyles;
- std::vector<ScXMLMapContent> aMaps;
- com::sun::star::uno::Any aConditionalFormat;
- sal_Int32 nNumberFormat;
+ ::rtl::OUString sDataStyleName;
+ rtl::OUString sPageStyle;
+ const rtl::OUString sNumberFormat;
+ SvXMLStylesContext* pStyles;
+ std::vector<ScXMLMapContent> aMaps;
+ com::sun::star::uno::Any aConditionalFormat;
+ sal_Int32 nNumberFormat;
sal_Int32 nLastSheet;
- sal_Bool bConditionalFormatCreated;
- sal_Bool bParentSet;
+ sal_Bool bConditionalFormatCreated;
+ sal_Bool bParentSet;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -209,7 +209,7 @@ protected:
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
-// virtual SvXMLImportPropertyMapper *GetImpPropMapper();
+// virtual SvXMLImportPropertyMapper *GetImpPropMapper();
public:
@@ -220,7 +220,7 @@ public:
virtual ~XMLTableStylesContext();
// Create child element.
-/* virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+/* virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );*/
@@ -271,9 +271,9 @@ namespace com { namespace sun { namespace star {
class ScMasterPageContext : public XMLTextMasterPageContext
{
com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xPropSet;
- const rtl::OUString sEmpty;
- sal_Bool bContainsRightHeader;
- sal_Bool bContainsRightFooter;
+ const rtl::OUString sEmpty;
+ sal_Bool bContainsRightHeader;
+ sal_Bool bContainsRightFooter;
void ClearContent(const rtl::OUString& rContent);
public:
diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx
index 89077eb4bee9..bde6633dc023 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using ::std::auto_ptr;
using namespace com::sun::star;
ScMyTableData::ScMyTableData(sal_Int32 nSheet, sal_Int32 nCol, sal_Int32 nRow)
- : nColsPerCol(nDefaultColCount, 1),
+ : nColsPerCol(nDefaultColCount, 1),
nRealCols(nDefaultColCount + 1, 0),
nRowsPerRow(nDefaultRowCount, 1),
nRealRows(nDefaultRowCount + 1, 0),
@@ -456,7 +456,7 @@ void ScMyTables::InsertColumn()
//insert Cell
sheet::CellInsertMode aCellInsertMode(sheet::CellInsertMode_RIGHT);
- uno::Reference <sheet::XCellRangeMovement> xCellRangeMovement (xCurrentSheet, uno::UNO_QUERY);
+ uno::Reference <sheet::XCellRangeMovement> xCellRangeMovement (xCurrentSheet, uno::UNO_QUERY);
xCellRangeMovement->insertCells(aTempCellAddress, aCellInsertMode);
//merge
@@ -484,7 +484,7 @@ void ScMyTables::NewColumn(sal_Bool bIsCovered)
{
sal_Int32 FirstColsSpanned(nSpannedCols / nColCount);
sal_Int32 LastColSpanned(FirstColsSpanned
- + (nSpannedCols % nColCount));
+ + (nSpannedCols % nColCount));
for (sal_Int32 i = 0; i < nColCount - 1; ++i)
{
aTableVec[nTableCount - 1]->SetColsPerCol(i, FirstColsSpanned);
@@ -528,7 +528,7 @@ void ScMyTables::AddColumn(sal_Bool bIsCovered)
else
{
NewColumn(bIsCovered);
- // if (!bIsCovered)
+ // if (!bIsCovered)
aTableVec[nTableCount - 1]->SetRealCols(aTableVec[nTableCount - 1]->GetColumn() + 1,
aTableVec[nTableCount - 1]->GetRealCols(aTableVec[nTableCount - 1]->GetColumn())
+ aTableVec[nTableCount - 1]->GetColsPerCol(aTableVec[nTableCount - 1]->GetColumn()));
@@ -678,7 +678,7 @@ void ScMyTables::DeleteTable()
rImport.GetDocument()->RenameTab( static_cast<SCTAB>(nCurrentSheet),
sCurrentSheetName, sal_False, sal_True);
-/* rtl::OUString sErrorMessage(RTL_CONSTASCII_USTRINGPARAM("Could not create a table with the name "));
+/* rtl::OUString sErrorMessage(RTL_CONSTASCII_USTRINGPARAM("Could not create a table with the name "));
sErrorMessage += sCurrentSheetName;
sErrorMessage += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(". The new name is "));
sErrorMessage += sCurrentName;
diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx
index 6e39844b5b8f..3abb88568eab 100644
--- a/sc/source/filter/xml/xmlsubti.hxx
+++ b/sc/source/filter/xml/xmlsubti.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,40 +53,40 @@ const ScMysalIntVec::size_type nDefaultTabCount = 10;
class ScMyTableData
{
private:
- com::sun::star::table::CellAddress aTableCellPos;
- ScMysalIntVec nColsPerCol;
- ScMysalIntVec nRealCols;
- ScMysalIntVec nRowsPerRow;
- ScMysalIntVec nRealRows;
- sal_Int32 nSpannedCols;
- sal_Int32 nColCount;
- sal_Int32 nSubTableSpanned;
- ScMysalIntList nChangedCols;
+ com::sun::star::table::CellAddress aTableCellPos;
+ ScMysalIntVec nColsPerCol;
+ ScMysalIntVec nRealCols;
+ ScMysalIntVec nRowsPerRow;
+ ScMysalIntVec nRealRows;
+ sal_Int32 nSpannedCols;
+ sal_Int32 nColCount;
+ sal_Int32 nSubTableSpanned;
+ ScMysalIntList nChangedCols;
public:
ScMyTableData(sal_Int32 nSheet = -1, sal_Int32 nCol = -1, sal_Int32 nRow = -1);
~ScMyTableData();
- com::sun::star::table::CellAddress GetCellPos() const { return aTableCellPos; }
- sal_Int32 GetRow() const { return aTableCellPos.Row; }
- sal_Int32 GetColumn() const { return aTableCellPos.Column; }
- void AddRow();
- void AddColumn();
- void SetFirstColumn() { aTableCellPos.Column = -1; }
+ com::sun::star::table::CellAddress GetCellPos() const { return aTableCellPos; }
+ sal_Int32 GetRow() const { return aTableCellPos.Row; }
+ sal_Int32 GetColumn() const { return aTableCellPos.Column; }
+ void AddRow();
+ void AddColumn();
+ void SetFirstColumn() { aTableCellPos.Column = -1; }
sal_Int32 GetColsPerCol(const sal_Int32 nIndex) const { return nColsPerCol[nIndex]; }
- void SetColsPerCol(const sal_Int32 nIndex, sal_Int32 nValue = 1) { nColsPerCol[nIndex] = nValue; }
- sal_Int32 GetRealCols(const sal_Int32 nIndex, const sal_Bool bIsNormal = sal_True) const;
- void SetRealCols(const sal_Int32 nIndex, const sal_Int32 nValue) { nRealCols[nIndex] = nValue; }
- sal_Int32 GetRowsPerRow(const sal_Int32 nIndex) const { return nRowsPerRow[nIndex]; }
- void SetRowsPerRow(const sal_Int32 nIndex, const sal_Int32 nValue = 1) { nRowsPerRow[nIndex] = nValue; }
- sal_Int32 GetRealRows(const sal_Int32 nIndex) const { return nIndex < 0 ? 0 : nRealRows[nIndex]; }
- void SetRealRows(const sal_Int32 nIndex, const sal_Int32 nValue) { nRealRows[nIndex] = nValue; }
- sal_Int32 GetSpannedCols() const { return nSpannedCols; }
- void SetSpannedCols(const sal_Int32 nTempSpannedCols) { nSpannedCols = nTempSpannedCols; }
- sal_Int32 GetColCount() const { return nColCount; }
- void SetColCount(const sal_Int32 nTempColCount) { nColCount = nTempColCount; }
- sal_Int32 GetSubTableSpanned() const { return nSubTableSpanned; }
- void SetSubTableSpanned(const sal_Int32 nValue) { nSubTableSpanned = nValue; }
- sal_Int32 GetChangedCols(const sal_Int32 nFromIndex, const sal_Int32 nToIndex) const;
- void SetChangedCols(const sal_Int32 nValue);
+ void SetColsPerCol(const sal_Int32 nIndex, sal_Int32 nValue = 1) { nColsPerCol[nIndex] = nValue; }
+ sal_Int32 GetRealCols(const sal_Int32 nIndex, const sal_Bool bIsNormal = sal_True) const;
+ void SetRealCols(const sal_Int32 nIndex, const sal_Int32 nValue) { nRealCols[nIndex] = nValue; }
+ sal_Int32 GetRowsPerRow(const sal_Int32 nIndex) const { return nRowsPerRow[nIndex]; }
+ void SetRowsPerRow(const sal_Int32 nIndex, const sal_Int32 nValue = 1) { nRowsPerRow[nIndex] = nValue; }
+ sal_Int32 GetRealRows(const sal_Int32 nIndex) const { return nIndex < 0 ? 0 : nRealRows[nIndex]; }
+ void SetRealRows(const sal_Int32 nIndex, const sal_Int32 nValue) { nRealRows[nIndex] = nValue; }
+ sal_Int32 GetSpannedCols() const { return nSpannedCols; }
+ void SetSpannedCols(const sal_Int32 nTempSpannedCols) { nSpannedCols = nTempSpannedCols; }
+ sal_Int32 GetColCount() const { return nColCount; }
+ void SetColCount(const sal_Int32 nTempColCount) { nColCount = nTempColCount; }
+ sal_Int32 GetSubTableSpanned() const { return nSubTableSpanned; }
+ void SetSubTableSpanned(const sal_Int32 nValue) { nSubTableSpanned = nValue; }
+ sal_Int32 GetChangedCols(const sal_Int32 nFromIndex, const sal_Int32 nToIndex) const;
+ void SetChangedCols(const sal_Int32 nValue);
};
//*******************************************************************************************************************************
@@ -111,7 +111,7 @@ class ScMyTables
private:
typedef std::list<ScMatrixRange> ScMyMatrixRangeList;
- ScXMLImport& rImport;
+ ScXMLImport& rImport;
ScMyShapeResizer aResizeShapes;
@@ -119,57 +119,57 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > xCurrentCellRange;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage;
::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShapes > xShapes;
- rtl::OUString sCurrentSheetName;
- rtl::OUString sPassword;
- std::vector<ScMyTableData*> aTableVec;
+ rtl::OUString sCurrentSheetName;
+ rtl::OUString sPassword;
+ std::vector<ScMyTableData*> aTableVec;
ScMyMatrixRangeList aMatrixRangeList;
- com::sun::star::table::CellAddress aRealCellPos;
- sal_Int32 nCurrentColStylePos;
- sal_Int16 nCurrentDrawPage;
- sal_Int16 nCurrentXShapes;
- sal_Int32 nTableCount;
- sal_Int32 nCurrentSheet;
- sal_Bool bProtection;
-
- sal_Bool IsMerged (const com::sun::star::uno::Reference <com::sun::star::table::XCellRange>& xCellRange,
+ com::sun::star::table::CellAddress aRealCellPos;
+ sal_Int32 nCurrentColStylePos;
+ sal_Int16 nCurrentDrawPage;
+ sal_Int16 nCurrentXShapes;
+ sal_Int32 nTableCount;
+ sal_Int32 nCurrentSheet;
+ sal_Bool bProtection;
+
+ sal_Bool IsMerged (const com::sun::star::uno::Reference <com::sun::star::table::XCellRange>& xCellRange,
const sal_Int32 nCol, const sal_Int32 nRow,
com::sun::star::table::CellRangeAddress& aCellAddress) const;
- void UnMerge();
- void DoMerge(sal_Int32 nCount = -1);
- void InsertRow();
- void NewRow();
- void InsertColumn();
- void NewColumn(sal_Bool bIsCovered);
+ void UnMerge();
+ void DoMerge(sal_Int32 nCount = -1);
+ void InsertRow();
+ void NewRow();
+ void InsertColumn();
+ void NewColumn(sal_Bool bIsCovered);
public:
ScMyTables(ScXMLImport& rImport);
~ScMyTables();
- void NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName,
+ void NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName,
const sal_Bool bProtection, const rtl::OUString& sPassword);
- void AddRow();
- void SetRowStyle(const rtl::OUString& rCellStyleName);
- void AddColumn(sal_Bool bIsCovered);
- void NewTable(sal_Int32 nTempSpannedCols);
- void UpdateRowHeights();
- void ResizeShapes() { aResizeShapes.ResizeShapes(); }
- void DeleteTable();
- com::sun::star::table::CellAddress GetRealCellPos();
- void AddColCount(sal_Int32 nTempColCount);
- void AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCellStyleName);
- rtl::OUString GetCurrentSheetName() const { return sCurrentSheetName; }
- sal_Int32 GetCurrentSheet() const { return nCurrentSheet; }
- sal_Int32 GetCurrentColumn() const { return aTableVec[nTableCount - 1]->GetColCount(); }
- sal_Int32 GetCurrentRow() const { return aTableVec[nTableCount - 1]->GetRow(); }
+ void AddRow();
+ void SetRowStyle(const rtl::OUString& rCellStyleName);
+ void AddColumn(sal_Bool bIsCovered);
+ void NewTable(sal_Int32 nTempSpannedCols);
+ void UpdateRowHeights();
+ void ResizeShapes() { aResizeShapes.ResizeShapes(); }
+ void DeleteTable();
+ com::sun::star::table::CellAddress GetRealCellPos();
+ void AddColCount(sal_Int32 nTempColCount);
+ void AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCellStyleName);
+ rtl::OUString GetCurrentSheetName() const { return sCurrentSheetName; }
+ sal_Int32 GetCurrentSheet() const { return nCurrentSheet; }
+ sal_Int32 GetCurrentColumn() const { return aTableVec[nTableCount - 1]->GetColCount(); }
+ sal_Int32 GetCurrentRow() const { return aTableVec[nTableCount - 1]->GetRow(); }
::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet >
- GetCurrentXSheet() { return xCurrentSheet; }
+ GetCurrentXSheet() { return xCurrentSheet; }
::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >
- GetCurrentXCellRange() { return xCurrentCellRange; }
+ GetCurrentXCellRange() { return xCurrentCellRange; }
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >
GetCurrentXDrawPage();
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >
GetCurrentXShapes();
- sal_Bool HasDrawPage();
- sal_Bool HasXShapes();
- void AddShape(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape,
+ sal_Bool HasDrawPage();
+ sal_Bool HasXShapes();
+ void AddShape(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape,
rtl::OUString* pRangeList,
com::sun::star::table::CellAddress& rStartAddress,
com::sun::star::table::CellAddress& rEndAddress,
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index 69f00106b7c7..aa3f3430d261 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,17 +64,17 @@
using namespace com::sun::star;
using namespace xmloff::token;
-/**
- * Determine whether this table is an external reference cache from its
+/**
+ * Determine whether this table is an external reference cache from its
* name. There is currently no way of determining whether a table is a
- * regular table or an external reference cache other than examining the
- * name itself. We should probably introduce a new boolean value for
- * table:table element and use it instead of doing this, to make it more
- * reliable and future-proof.
- *
- * @param rName
+ * regular table or an external reference cache other than examining the
+ * name itself. We should probably introduce a new boolean value for
+ * table:table element and use it instead of doing this, to make it more
+ * reliable and future-proof.
*
- * @return
+ * @param rName
+ *
+ * @return
*/
static bool lcl_isExternalRefCache(const rtl::OUString& rName, rtl::OUString& rUrl, rtl::OUString& rExtTabName)
{
@@ -241,7 +241,7 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( USHORT nPrefix,
sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLName);
if (pExternalRefInfo.get())
{
- // We only care about the table-row and table-source elements for
+ // We only care about the table-row and table-source elements for
// external cache data.
switch (nToken)
{
diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx
index c066b8bf3a9e..8dd3b3efec69 100644
--- a/sc/source/filter/xml/xmltabi.hxx
+++ b/sc/source/filter/xml/xmltabi.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +47,10 @@ struct ScXMLExternalTabData
class ScXMLTableContext : public SvXMLImportContext
{
- rtl::OUString sPrintRanges;
+ rtl::OUString sPrintRanges;
::std::auto_ptr<ScXMLExternalTabData> pExternalRefInfo;
sal_Int32 nStartOffset;
- sal_Bool bStartFormPage;
+ sal_Bool bStartFormPage;
sal_Bool bPrintEntireSheet;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index dbe647bc433f..327bf672814c 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -155,8 +155,8 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
// Get data source ...
-// uno::Reference< uno::XInterface > xPipe;
-// uno::Reference< io::XActiveDataSource > xSource;
+// uno::Reference< uno::XInterface > xPipe;
+// uno::Reference< io::XActiveDataSource > xSource;
sal_Bool bEncrypted = sal_False;
rtl::OUString sStream(sDocName);
@@ -195,7 +195,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
}
}
// #99667#; no longer necessary
-/* else if ( pMedium )
+/* else if ( pMedium )
{
// if there is a medium and if this medium has a load environment,
// we get an active data source from the medium.
@@ -252,7 +252,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
xParser->setDocumentHandler( xDocHandler );
// parse
-/* if( xSource.is() )
+/* if( xSource.is() )
{
uno::Reference<io::XActiveDataControl> xSourceControl( xSource, uno::UNO_QUERY );
if( xSourceControl.is() )
@@ -534,8 +534,8 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError)
sal_uInt32 nSettingsRetval(0);
if (!bStylesOnly)
{
- // Settings must be loaded first because of the printer setting,
- // which is needed in the page styles (paper tray).
+ // Settings must be loaded first because of the printer setting,
+ // which is needed in the page styles (paper tray).
uno::Sequence<uno::Any> aSettingsArgs(1);
uno::Any* pSettingsArgs = aSettingsArgs.getArray();
@@ -705,7 +705,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic
xOut = xStream->getOutputStream();
}
// #99667#; no longer necessary
-/* else if ( pMedium )
+/* else if ( pMedium )
{
xOut = pMedium->GetDataSink();
}*/
@@ -845,7 +845,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
if ( pObjSh && xStorage.is() )
{
- pObjSh->UpdateDocInfoForSave(); // update information
+ pObjSh->UpdateDocInfoForSave(); // update information
uno::Reference<frame::XModel> xModel(pObjSh->GetModel());
uno::Reference<task::XStatusIndicator> xStatusIndicator(GetStatusIndicator());
diff --git a/sc/source/ui/Accessibility/AccessibilityHints.cxx b/sc/source/ui/Accessibility/AccessibilityHints.cxx
index 6c276b806e88..f627f27f34e6 100644
--- a/sc/source/ui/Accessibility/AccessibilityHints.cxx
+++ b/sc/source/ui/Accessibility/AccessibilityHints.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 "AccessibilityHints.hxx"
-using namespace ::com::sun::star;
+using namespace ::com::sun::star;
// -----------------------------------------------------------------------
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 434ea2dea40c..bb7b0eac04ef 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +62,8 @@
#include <comphelper/sequence.hxx>
#include <float.h>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
//===== internal ============================================================
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index cc93d0a93350..666d88f6b826 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +59,8 @@
#include <float.h>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
//===== internal ============================================================
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index 0f1fcfa337a5..3bdfe8c1ff7f 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +51,9 @@
#include <tools/color.hxx>
#include <comphelper/accessibleeventnotifier.hxx>
-using namespace ::rtl;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
+using namespace ::rtl;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
//===== internal ============================================================
@@ -103,7 +103,7 @@ void ScAccessibleContextBase::Init()
void SAL_CALL ScAccessibleContextBase::disposing()
{
ScUnoGuard aGuard;
-// CommitDefunc(); not necessary and should not be send, because it cost a lot of time
+// CommitDefunc(); not necessary and should not be send, because it cost a lot of time
// hold reference to make sure that the destructor is not called
uno::Reference< XAccessibleContext > xOwnContext(this);
@@ -295,12 +295,12 @@ sal_Int32 SAL_CALL
{
ScUnoGuard aGuard;
IsObjectValid();
- // Use a simple but slow solution for now. Optimize later.
- // Return -1 to indicate that this object's parent does not know about the
- // object.
+ // Use a simple but slow solution for now. Optimize later.
+ // Return -1 to indicate that this object's parent does not know about the
+ // object.
sal_Int32 nIndex(-1);
- // Iterate over all the parent's children and search for this object.
+ // Iterate over all the parent's children and search for this object.
if (mxParent.is())
{
uno::Reference<XAccessibleContext> xParentContext (
@@ -339,7 +339,7 @@ sal_Int16 SAL_CALL
if (!msDescription.getLength())
{
OUString sDescription(createAccessibleDescription());
-// DBG_ASSERT(sDescription.getLength(), "We should give always a descripition.");
+// DBG_ASSERT(sDescription.getLength(), "We should give always a descripition.");
if (msDescription != sDescription)
{
@@ -413,8 +413,8 @@ lang::Locale SAL_CALL
return xParentContext->getLocale ();
}
- // No locale and no parent. Therefore throw exception to indicate this
- // cluelessness.
+ // No locale and no parent. Therefore throw exception to indicate this
+ // cluelessness.
throw IllegalAccessibleComponentStateException ();
}
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index e99bd1971e4c..5cfef56ff892 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using ::com::sun::star::lang::DisposedException;
using ::com::sun::star::lang::IndexOutOfBoundsException;
using ::com::sun::star::lang::IllegalArgumentException;
using ::com::sun::star::beans::PropertyValue;
-using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star::accessibility;
// ----------------------------------------------------------------------------
diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
index 1848c7bfefc0..7d72e4d33abb 100644
--- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +47,11 @@
#include <toolkit/helper/convert.hxx>
#include <tools/debug.hxx>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
class ScAccessibleDataPilotButton
- : public ScAccessibleContextBase
+ : public ScAccessibleContextBase
{
public:
//===== internal ========================================================
@@ -94,22 +94,22 @@ public:
///===== XAccessibleContext ==============================================
- /// Return the number of currently visible children.
+ /// Return the number of currently visible children.
virtual sal_Int32 SAL_CALL
getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException);
- /// Return the specified child or NULL if index is invalid.
+ /// Return the specified child or NULL if index is invalid.
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);
- /// Return this objects index among the parents children.
- virtual sal_Int32 SAL_CALL
+ /// Return this objects index among the parents children.
+ virtual sal_Int32 SAL_CALL
getAccessibleIndexInParent(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the set of current states.
+ /// Return the set of current states.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
getAccessibleStateSet(void)
@@ -117,7 +117,7 @@ public:
///===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName(void)
@@ -125,28 +125,28 @@ public:
///===== XTypeProvider ===================================================
- /** Returns a implementation id.
+ /** Returns a implementation id.
*/
virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
getImplementationId(void)
throw (::com::sun::star::uno::RuntimeException);
protected:
- /// Return this object's description.
+ /// Return this object's description.
virtual ::rtl::OUString SAL_CALL
createAccessibleDescription(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current name.
+ /// Return the object's current name.
virtual ::rtl::OUString SAL_CALL
createAccessibleName(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current bounding box relative to the desktop.
+ /// Return the object's current bounding box relative to the desktop.
virtual Rectangle GetBoundingBoxOnScreen(void) const
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current bounding box relative to the parent object.
+ /// Return the object's current bounding box relative to the parent object.
virtual Rectangle GetBoundingBox(void) const
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 4c65632fb45e..85c44fe3a253 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +77,8 @@
#include <list>
#include <algorithm>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
using ::std::for_each;
//===== internal ========================================================
@@ -91,7 +91,7 @@ struct ScAccessibleShapeData
mutable ScAddress* pRelationCell; // if it is NULL this shape is anchored on the table
// SdrObject* pShape;
com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape;
- mutable sal_Bool bSelected;
+ mutable sal_Bool bSelected;
sal_Bool bSelectable;
};
@@ -247,7 +247,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape,
const long _nIndex,
const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo
- ) throw (::com::sun::star::uno::RuntimeException);
+ ) throw (::com::sun::star::uno::RuntimeException);
///===== Internal ========================================================
void SetDrawBroadcaster();
@@ -432,7 +432,7 @@ sal_Bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurr
::accessibility::AccessibleShapeInfo ( _rxShape, pCurrentChild->getAccessibleParent(), this, _nIndex ),
_rShapeTreeInfo
);
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xNewChild( pReplacement ); // keep this alive (do this before calling Init!)
+ ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xNewChild( pReplacement ); // keep this alive (do this before calling Init!)
if ( pReplacement )
pReplacement->Init();
@@ -1012,8 +1012,8 @@ ScAddress* ScChildrenShapes::GetAnchor(const uno::Reference<drawing::XShape>& xS
pAddress = new ScAddress(aRange.aStart);
}
}
-// else
-// do nothing, because it is always a NULL Pointer
+// else
+// do nothing, because it is always a NULL Pointer
}
}
}
@@ -1568,7 +1568,7 @@ void SAL_CALL ScAccessibleDocument::grabFocus( )
//===== XAccessibleContext ==============================================
- /// Return the number of currently visible children.
+ /// Return the number of currently visible children.
sal_Int32 SAL_CALL
ScAccessibleDocument::getAccessibleChildCount(void)
throw (uno::RuntimeException)
@@ -1585,7 +1585,7 @@ sal_Int32 SAL_CALL
return nCount;
}
- /// Return the specified child or NULL if index is invalid.
+ /// Return the specified child or NULL if index is invalid.
uno::Reference<XAccessible> SAL_CALL
ScAccessibleDocument::getAccessibleChild(sal_Int32 nIndex)
throw (uno::RuntimeException,
@@ -1617,7 +1617,7 @@ uno::Reference<XAccessible> SAL_CALL
return xAccessible;
}
- /// Return the set of current states.
+ /// Return the set of current states.
uno::Reference<XAccessibleStateSet> SAL_CALL
ScAccessibleDocument::getAccessibleStateSet(void)
throw (uno::RuntimeException)
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx b/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx
index 76be8e67aa07..c12caec54df9 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#endif
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
//===== internal ========================================================
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 894e57d3802e..60a0b46a7d3f 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +68,8 @@
#include <algorithm>
#include <memory>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
//=========================================================================
@@ -706,7 +706,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape,
const long _nIndex,
const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo
- ) throw (::com::sun::star::uno::RuntimeException);
+ ) throw (::com::sun::star::uno::RuntimeException);
///===== Internal ========================================================
@@ -1373,7 +1373,7 @@ SdrPage* ScShapeChilds::GetDrawPage() const
struct ScPagePreviewCountData
{
- // order is background shapes, header, table or notes, footer, foreground shapes, controls
+ // order is background shapes, header, table or notes, footer, foreground shapes, controls
Rectangle aVisRect;
long nBackShapes;
@@ -1421,7 +1421,7 @@ ScPagePreviewCountData::ScPagePreviewCountData( const ScPreviewLocationData& rDa
if ( rData.HasCellsInRange( aVisRect ) )
nTables = 1;
- //! shapes...
+ //! shapes...
nBackShapes = pShapeChilds->GetBackShapeCount();
nForeShapes = pShapeChilds->GetForeShapeCount();
nControls = pShapeChilds->GetControlCount();
@@ -1538,7 +1538,7 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const SfxHint
if (aCount.nTables > 0)
{
- //! order is background shapes, header, table or notes, footer, foreground shapes, controls
+ //! order is background shapes, header, table or notes, footer, foreground shapes, controls
sal_Int32 nIndex (aCount.nBackShapes + aCount.nHeaders);
mpTable = new ScAccessiblePreviewTable( this, mpViewShell, nIndex );
@@ -1607,11 +1607,11 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces
const ScPreviewLocationData& rData = mpViewShell->GetLocationData();
ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(), GetShapeChilds() );
-/* if ( rData.HasCellsInRange( Rectangle( rPoint, rPoint ) ) )
+/* if ( rData.HasCellsInRange( Rectangle( rPoint, rPoint ) ) )
{
if ( !mpTable && (aCount.nTables > 0) )
{
- //! order is background shapes, header, table or notes, footer, foreground shapes, controls
+ //! order is background shapes, header, table or notes, footer, foreground shapes, controls
sal_Int32 nIndex (aCount.nBackShapes + aCount.nHeaders);
mpTable = new ScAccessiblePreviewTable( this, mpViewShell, nIndex );
@@ -1622,7 +1622,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleDocumentPagePreview::getAcces
}*/
if ( !mpTable && (aCount.nTables > 0) )
{
- //! order is background shapes, header, table or notes, footer, foreground shapes, controls
+ //! order is background shapes, header, table or notes, footer, foreground shapes, controls
sal_Int32 nIndex (aCount.nBackShapes + aCount.nHeaders);
mpTable = new ScAccessiblePreviewTable( this, mpViewShell, nIndex );
@@ -1765,7 +1765,7 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessi
return xAccessible;
}
- /// Return the set of current states.
+ /// Return the set of current states.
uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleStateSet(void)
throw (uno::RuntimeException)
{
@@ -1886,7 +1886,7 @@ ScNotesChilds* ScAccessibleDocumentPagePreview::GetNotesChilds()
const ScPreviewLocationData& rData = mpViewShell->GetLocationData();
ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(), GetShapeChilds() );
- //! order is background shapes, header, table or notes, footer, foreground shapes, controls
+ //! order is background shapes, header, table or notes, footer, foreground shapes, controls
mpNotesChilds->Init(aCount.aVisRect, aCount.nBackShapes + aCount.nHeaders);
}
return mpNotesChilds;
@@ -1913,7 +1913,7 @@ ScShapeChilds* ScAccessibleDocumentPagePreview::GetShapeChilds()
//UNUSED2009-05 ScPagePreviewCountData aCount( rData, mpViewShell->GetWindow(), GetNotesChilds(), GetShapeChilds() );
//UNUSED2009-05 //! order is background shapes, header, table or notes, footer, foreground shapes, controls
//UNUSED2009-05 sal_Int32 nIndex (aCount.nBackShapes + aCount.nHeaders);
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 mpTable = new ScAccessiblePreviewTable( this, mpViewShell, nIndex );
//UNUSED2009-05 mpTable->acquire();
//UNUSED2009-05 mpTable->Init();
@@ -1935,7 +1935,7 @@ ScShapeChilds* ScAccessibleDocumentPagePreview::GetShapeChilds()
//UNUSED2009-05 mpTable->SetCurrentIndexInParent(aCount.nBackShapes + aCount.nHeaders);
//UNUSED2009-05 if (mpFooter)
//UNUSED2009-05 mpFooter->SetCurrentIndexInParent(aCount.nBackShapes + aCount.nHeaders + aCount.nTables + aCount.nNoteParagraphs);
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 if (mpNotesChilds)
//UNUSED2009-05 mpNotesChilds->SetOffset(aCount.nBackShapes + aCount.nHeaders);
//UNUSED2009-05 }
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index fd7cbaf454c1..41a23b208aa6 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include <editeng/editeng.hxx>
#include <svx/svdmodel.hxx>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
//===== internal ============================================================
@@ -176,7 +176,7 @@ Rectangle ScAccessibleEditObject::GetBoundingBox(void) const
uno::Reference< XAccessible > xParent( xContext->getAccessibleParent() );
if ( xParent.is() )
{
- uno::Reference< XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), uno::UNO_QUERY );
+ uno::Reference< XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), uno::UNO_QUERY );
if ( xParentComponent.is() )
{
Point aScreenLoc = aBounds.TopLeft();
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
index 02fb5c12463e..a3d99badc6c4 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 {
class AddRemoveEventListener : public ::std::unary_function<void, Reference<XAccessible> >
{
public:
- explicit AddRemoveEventListener(const Reference<XAccessibleEventListener>& rListener, bool bAdd) :
+ explicit AddRemoveEventListener(const Reference<XAccessibleEventListener>& rListener, bool bAdd) :
mxListener(rListener), mbAdd(bAdd) {}
void operator() (const Reference<XAccessible>& xAccessible) const
@@ -129,13 +129,13 @@ void ScAccessibleFilterMenu::grabFocus()
{
}
-sal_Int32 ScAccessibleFilterMenu::getForeground()
+sal_Int32 ScAccessibleFilterMenu::getForeground()
throw (RuntimeException)
{
return 0;
}
-sal_Int32 ScAccessibleFilterMenu::getBackground()
+sal_Int32 ScAccessibleFilterMenu::getBackground()
throw (RuntimeException)
{
return 0;
@@ -148,13 +148,13 @@ OUString ScAccessibleFilterMenu::getAccessibleName() throw (RuntimeException)
return ScAccessibleContextBase::getAccessibleName();
}
-sal_Int32 ScAccessibleFilterMenu::getAccessibleChildCount()
+sal_Int32 ScAccessibleFilterMenu::getAccessibleChildCount()
throw (RuntimeException)
{
return getMenuItemCount();
}
-Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleChild(sal_Int32 nIndex)
+Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleChild(sal_Int32 nIndex)
throw (RuntimeException, IndexOutOfBoundsException)
{
if (maMenuItems.size() <= static_cast<size_t>(nIndex))
@@ -163,14 +163,14 @@ Reference<XAccessible> ScAccessibleFilterMenu::getAccessibleChild(sal_Int32 nInd
return maMenuItems[nIndex];
}
-Reference<XAccessibleStateSet> ScAccessibleFilterMenu::getAccessibleStateSet()
+Reference<XAccessibleStateSet> ScAccessibleFilterMenu::getAccessibleStateSet()
throw (RuntimeException)
{
updateStates();
return mxStateSet;
}
-OUString ScAccessibleFilterMenu::getImplementationName()
+OUString ScAccessibleFilterMenu::getImplementationName()
throw (RuntimeException)
{
return OUString::createFromAscii("ScAccessibleFilterMenu");
@@ -198,7 +198,7 @@ void ScAccessibleFilterMenu::removeEventListener(
// XAccessibleSelection
-void ScAccessibleFilterMenu::selectAccessibleChild(sal_Int32 nChildIndex)
+void ScAccessibleFilterMenu::selectAccessibleChild(sal_Int32 nChildIndex)
throw (IndexOutOfBoundsException, RuntimeException)
{
if (static_cast<size_t>(nChildIndex) >= maMenuItems.size())
@@ -207,7 +207,7 @@ void ScAccessibleFilterMenu::selectAccessibleChild(sal_Int32 nChildIndex)
mpWindow->setSelectedMenuItem(nChildIndex, false, true);
}
-sal_Bool ScAccessibleFilterMenu::isAccessibleChildSelected(sal_Int32 nChildIndex)
+sal_Bool ScAccessibleFilterMenu::isAccessibleChildSelected(sal_Int32 nChildIndex)
throw (IndexOutOfBoundsException, RuntimeException)
{
if (static_cast<size_t>(nChildIndex) >= maMenuItems.size())
@@ -232,7 +232,7 @@ sal_Int32 ScAccessibleFilterMenu::getSelectedAccessibleChildCount() throw (Runti
return mpWindow->getSelectedMenuItem() == ScMenuFloatingWindow::MENU_NOT_SELECTED ? 0 : 1;
}
-Reference<XAccessible> ScAccessibleFilterMenu::getSelectedAccessibleChild(sal_Int32 nChildIndex)
+Reference<XAccessible> ScAccessibleFilterMenu::getSelectedAccessibleChild(sal_Int32 nChildIndex)
throw (IndexOutOfBoundsException, RuntimeException)
{
if (static_cast<size_t>(nChildIndex) >= maMenuItems.size())
@@ -273,7 +273,7 @@ void SAL_CALL ScAccessibleFilterMenu::release() throw ()
// XTypeProvider
-Sequence<sal_Int8> ScAccessibleFilterMenu::getImplementationId()
+Sequence<sal_Int8> ScAccessibleFilterMenu::getImplementationId()
throw (RuntimeException)
{
Sequence<sal_Int8> aId(16);
@@ -285,8 +285,8 @@ Rectangle ScAccessibleFilterMenu::GetBoundingBoxOnScreen() const
{
if (mnMenuPos == ScMenuFloatingWindow::MENU_NOT_SELECTED)
return Rectangle();
-
- // Menu object's bounding box is the bounding box of the menu item that
+
+ // Menu object's bounding box is the bounding box of the menu item that
// launches the menu, which belongs to the parent window.
ScMenuFloatingWindow* pParentWin = mpWindow->getParentMenuWindow();
if (!pParentWin)
@@ -309,7 +309,7 @@ Rectangle ScAccessibleFilterMenu::GetBoundingBox() const
if (mnMenuPos == ScMenuFloatingWindow::MENU_NOT_SELECTED)
return Rectangle();
- // Menu object's bounding box is the bounding box of the menu item that
+ // Menu object's bounding box is the bounding box of the menu item that
// launches the menu, which belongs to the parent window.
ScMenuFloatingWindow* pParentWin = mpWindow->getParentMenuWindow();
if (!pParentWin)
@@ -333,7 +333,7 @@ void ScAccessibleFilterMenu::appendMenuItem(const OUString& rName, bool bEnabled
if (pSubMenu)
{
xAccessible = pSubMenu->CreateAccessible();
- ScAccessibleFilterMenu* p =
+ ScAccessibleFilterMenu* p =
static_cast<ScAccessibleFilterMenu*>(xAccessible.get());
p->setEnabled(bEnabled);
p->setMenuPos(nMenuPos);
@@ -341,7 +341,7 @@ void ScAccessibleFilterMenu::appendMenuItem(const OUString& rName, bool bEnabled
else
{
xAccessible.set(new ScAccessibleFilterMenuItem(this, mpWindow, rName, nMenuPos));
- ScAccessibleFilterMenuItem* p =
+ ScAccessibleFilterMenuItem* p =
static_cast<ScAccessibleFilterMenuItem*>(xAccessible.get());
p->setEnabled(bEnabled);
}
diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
index 0da1e6858a75..347093c73825 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
index 2af69faa33c8..6211fa613772 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ Reference<XAccessible> ScAccessibleFilterTopWindow::getAccessibleChild(
sal_Int32 nMenuCount = getMenuItemCount();
if (nIndex < nMenuCount)
return ScAccessibleFilterMenu::getAccessibleChild(nIndex);
-
+
nIndex -= nMenuCount;
switch (nIndex)
{
@@ -107,16 +107,16 @@ void ScAccessibleFilterTopWindow::setAccessibleChild(
case LISTBOX:
mxAccListBox = rAccessible;
break;
- case TOGGLE_ALL:
+ case TOGGLE_ALL:
mxAccToggleAll = rAccessible;
break;
- case SINGLE_ON_BTN:
+ case SINGLE_ON_BTN:
mxAccSingleOnBtn = rAccessible;
break;
- case SINGLE_OFF_BTN:
+ case SINGLE_OFF_BTN:
mxAccSingleOffBtn = rAccessible;
break;
- case OK_BTN:
+ case OK_BTN:
mxAccOkBtn = rAccessible;
break;
case CANCEL_BTN:
diff --git a/sc/source/ui/Accessibility/AccessibleGlobal.cxx b/sc/source/ui/Accessibility/AccessibleGlobal.cxx
index ac2562fa9bd5..5e1e14d3e4f3 100644
--- a/sc/source/ui/Accessibility/AccessibleGlobal.cxx
+++ b/sc/source/ui/Accessibility/AccessibleGlobal.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +50,7 @@ sal_Bool SAL_CALL ScAccessibleStateSet::isEmpty() throw (RuntimeException)
return maStates.empty();
}
-sal_Bool SAL_CALL ScAccessibleStateSet::contains(sal_Int16 nState)
+sal_Bool SAL_CALL ScAccessibleStateSet::contains(sal_Int16 nState)
throw (RuntimeException)
{
return maStates.count(nState) != 0;
@@ -70,7 +70,7 @@ sal_Bool SAL_CALL ScAccessibleStateSet::containsAll(
return true;
}
-Sequence<sal_Int16> SAL_CALL ScAccessibleStateSet::getStates()
+Sequence<sal_Int16> SAL_CALL ScAccessibleStateSet::getStates()
throw (RuntimeException)
{
Sequence<sal_Int16> aSeq(0);
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index 6c28d22b0236..c15674862a5d 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +58,8 @@
#include <algorithm>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
const sal_uInt8 MAX_AREAS = 3;
@@ -182,7 +182,7 @@ void ScAccessiblePageHeader::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
CommitChange(aEvent);
}
}
-
+
ScAccessibleContextBase::Notify(rBC, rHint);
}
@@ -252,7 +252,7 @@ sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleChildCount() throw (uno:
nPageWhichId = mpViewShell->GetLocationData().IsHeaderLeft() ? ATTR_PAGE_HEADERLEFT : ATTR_PAGE_HEADERRIGHT;
else
nPageWhichId = mpViewShell->GetLocationData().IsFooterLeft() ? ATTR_PAGE_FOOTERLEFT : ATTR_PAGE_FOOTERRIGHT;
-
+
const ScPageHFItem& rPageItem = static_cast<const ScPageHFItem&>(pStyle->GetItemSet().Get(nPageWhichId));
AddChild(rPageItem.GetLeftArea(), 0, SVX_ADJUST_LEFT);
AddChild(rPageItem.GetCenterArea(), 1, SVX_ADJUST_CENTER);
@@ -400,7 +400,7 @@ Rectangle ScAccessiblePageHeader::GetBoundingBox() const throw (uno::RuntimeExce
}
if (aRect.IsEmpty())
aRect.SetSize(Size(-1, -1));
-
+
return aRect;
}
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index 10c6a9eff13f..06d234dd75a0 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +54,8 @@
#include <rtl/ustrbuf.hxx>
#include <toolkit/helper/convert.hxx>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
//===== internal ========================================================
@@ -236,7 +236,7 @@ uno::Sequence<sal_Int8> SAL_CALL
}
//===== internal ==============================================================
-rtl::OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription(void)
+rtl::OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription(void)
throw(uno::RuntimeException)
{
rtl::OUString sDesc;
@@ -297,7 +297,7 @@ Rectangle ScAccessiblePageHeaderArea::GetBoundingBoxOnScreen(void) const
return aRect;
}
-Rectangle ScAccessiblePageHeaderArea::GetBoundingBox(void) const
+Rectangle ScAccessiblePageHeaderArea::GetBoundingBox(void) const
throw (::com::sun::star::uno::RuntimeException)
{
Rectangle aRect;
@@ -312,7 +312,7 @@ Rectangle ScAccessiblePageHeaderArea::GetBoundingBox(void) const
aRect = aNewRect;
}
}
-
+
return aRect;
}
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
index c07eb0844b7f..2bf337fcfe70 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +46,8 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
//===== internal ============================================================
@@ -283,7 +283,7 @@ sal_Bool ScAccessiblePreviewCell::IsOpaque(
const uno::Reference<XAccessibleStateSet>& /* rxParentStates */)
{
// test whether there is a background color
- //! could be moved to ScAccessibleCellBase
+ //! could be moved to ScAccessibleCellBase
sal_Bool bOpaque(sal_True);
if (mpDoc)
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index 3bb66ae01d4f..65d87a0449a3 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +53,8 @@
#include <comphelper/sequence.hxx>
#include <toolkit/helper/convert.hxx>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
//===== internal ============================================================
@@ -112,8 +112,8 @@ void ScAccessiblePreviewHeaderCell::Notify( SfxBroadcaster& rBC, const SfxHint&
}
else if ( nId == SFX_HINT_DATACHANGED )
{
- // column / row layout may change with any document change,
- // so it must be invalidated
+ // column / row layout may change with any document change,
+ // so it must be invalidated
DELETEZ( mpTableInfo );
}
}
@@ -163,7 +163,7 @@ uno::Any SAL_CALL ScAccessiblePreviewHeaderCell::getCurrentValue() throw (uno::R
sal_Bool SAL_CALL ScAccessiblePreviewHeaderCell::setCurrentValue( const uno::Any& /* aNumber */ )
throw (uno::RuntimeException)
{
- // it is not possible to set a value
+ // it is not possible to set a value
return sal_False;
}
@@ -388,9 +388,9 @@ rtl::OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() thr
{
if ( mbRowHeader )
{
- //! name for corner cell?
+ //! name for corner cell?
-// sName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Column/Row Header"));
+// sName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Column/Row Header"));
}
else
{
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index e3fe26f47b4d..98c7e5a0dd16 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +53,8 @@
#include <unotools/accessiblestatesethelper.hxx>
#include <comphelper/sequence.hxx>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
//===== internal ============================================================
@@ -105,8 +105,8 @@ void ScAccessiblePreviewTable::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
ULONG nId = rRef.GetId();
if ( nId == SFX_HINT_DATACHANGED )
{
- // column / row layout may change with any document change,
- // so it must be invalidated
+ // column / row layout may change with any document change,
+ // so it must be invalidated
DELETEZ( mpTableInfo );
}
else if (rRef.GetId() == SC_HINT_ACC_VISAREACHANGED)
@@ -174,7 +174,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sa
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
// is not supported or specified so not implemented
-/* ScUnoGuard aGuard;
+/* ScUnoGuard aGuard;
IsObjectValid();
FillTableInfo();
@@ -185,7 +185,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleRowDescription( sa
const ScPreviewColRowInfo& rInfo = mpTableInfo->GetRowInfo()[nRow];
if ( rInfo.bIsHeader )
{
- //! name of column headers row?
+ //! name of column headers row?
sName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Column Headers"));
}
@@ -210,7 +210,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription(
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
// is not supported or specified so not implemented
-/* ScUnoGuard aGuard;
+/* ScUnoGuard aGuard;
IsObjectValid();
FillTableInfo();
@@ -221,7 +221,7 @@ rtl::OUString SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnDescription(
const ScPreviewColRowInfo& rInfo = mpTableInfo->GetColInfo()[nColumn];
if ( rInfo.bIsHeader )
{
- //! name of row headers column?
+ //! name of row headers column?
sName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Row Headers"));
}
@@ -259,7 +259,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRowExtentAt( sal_Int32
if ( rColInfo.bIsHeader || rRowInfo.bIsHeader )
{
- // header cells only span a single cell
+ // header cells only span a single cell
}
else
{
@@ -293,7 +293,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumnExtentAt( sal_In
if ( rColInfo.bIsHeader || rRowInfo.bIsHeader )
{
- // header cells only span a single cell
+ // header cells only span a single cell
}
else
{
@@ -324,20 +324,20 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessiblePreviewTable::getAccessi
uno::Sequence< sal_Int32 > SAL_CALL ScAccessiblePreviewTable::getSelectedAccessibleRows() throw (uno::RuntimeException)
{
- // in the page preview, there is no selection
+ // in the page preview, there is no selection
return uno::Sequence<sal_Int32>(0);
}
uno::Sequence< sal_Int32 > SAL_CALL ScAccessiblePreviewTable::getSelectedAccessibleColumns() throw (uno::RuntimeException)
{
- // in the page preview, there is no selection
+ // in the page preview, there is no selection
return uno::Sequence<sal_Int32>(0);
}
sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleRowSelected( sal_Int32 nRow )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- // in the page preview, there is no selection
+ // in the page preview, there is no selection
ScUnoGuard aGuard;
FillTableInfo();
@@ -350,7 +350,7 @@ sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleRowSelected( sal_Int32 n
sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleColumnSelected( sal_Int32 nColumn )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- // in the page preview, there is no selection
+ // in the page preview, there is no selection
ScUnoGuard aGuard;
FillTableInfo();
@@ -371,7 +371,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCe
uno::Reference<XAccessible> xRet;
if ( mpTableInfo && nColumn >= 0 && nRow >= 0 && nColumn < mpTableInfo->GetCols() && nRow < mpTableInfo->GetRows() )
{
- // index iterates horizontally
+ // index iterates horizontally
long nNewIndex = nRow * mpTableInfo->GetCols() + nColumn;
const ScPreviewColRowInfo& rColInfo = mpTableInfo->GetColInfo()[nColumn];
@@ -414,7 +414,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleSu
sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- // in the page preview, there is no selection
+ // in the page preview, there is no selection
ScUnoGuard aGuard;
IsObjectValid();
@@ -422,7 +422,7 @@ sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleSelected( sal_Int32 nRow
if ( mpTableInfo && nColumn >= 0 && nRow >= 0 && nColumn < mpTableInfo->GetCols() && nRow < mpTableInfo->GetRows() )
{
- // index iterates horizontally
+ // index iterates horizontally
}
else
throw lang::IndexOutOfBoundsException();
@@ -441,7 +441,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndex( sal_Int32 nRow,
sal_Int32 nRet = 0;
if ( mpTableInfo && nColumn >= 0 && nRow >= 0 && nColumn < mpTableInfo->GetCols() && nRow < mpTableInfo->GetRows() )
{
- // index iterates horizontally
+ // index iterates horizontally
nRet = nRow * mpTableInfo->GetCols() + nColumn;
}
else
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index f85fb22531aa..42e27903dd82 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include <algorithm>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
//===== internal ============================================================
@@ -276,7 +276,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
mbDelIns = sal_False;
}
// no longer needed, because the document calls the VisAreaChanged method
-/* else if (rRef.GetId() == SC_HINT_ACC_VISAREACHANGED)
+/* else if (rRef.GetId() == SC_HINT_ACC_VISAREACHANGED)
{
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::VISIBLE_DATA_CHANGED;
@@ -285,7 +285,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
CommitChange(aEvent);*/
// commented out, because to use a ModelChangeEvent is not the right way
// at the moment there is no way, but the Java/Gnome Api should be extended sometime
-/* if (mpViewShell)
+/* if (mpViewShell)
{
Rectangle aNewVisCells(GetVisCells(GetVisArea(mpViewShell, meSplitPos)));
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index 2d46d3eb776b..d8a8fe96d14d 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +48,8 @@
#include <comphelper/sequence.hxx>
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
//===== internal ============================================================
@@ -331,7 +331,7 @@ sal_Int32 SAL_CALL
IsObjectValid();
return static_cast<sal_Int32>(maRange.aEnd.Row() - maRange.aStart.Row() + 1) *
(maRange.aEnd.Col() - maRange.aStart.Col() + 1);
-// return 1;
+// return 1;
}
uno::Reference< XAccessible > SAL_CALL
@@ -358,7 +358,7 @@ uno::Reference< XAccessible > SAL_CALL
throw (uno::RuntimeException)
{
String sDesc(ScResId(STR_ACC_TABLE_DESCR));
-/* String sCoreName;
+/* String sCoreName;
if (mpDoc && mpDoc->GetName( maRange.aStart.Tab(), sCoreName ))
sDesc.SearchAndReplaceAscii("%1", sCoreName);
sDesc.SearchAndReplaceAscii("%2", String(ScResId(SCSTR_UNKNOWN)));*/
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 4073e23f837f..50e2484668d9 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,17 +59,17 @@
class ScViewForwarder : public SvxViewForwarder
{
- ScTabViewShell* mpViewShell;
- ScAddress maCellPos;
- ScSplitPos meSplitPos;
+ ScTabViewShell* mpViewShell;
+ ScAddress maCellPos;
+ ScSplitPos meSplitPos;
public:
ScViewForwarder(ScTabViewShell* pViewShell, ScSplitPos eSplitPos, const ScAddress& rCell);
- virtual ~ScViewForwarder();
+ virtual ~ScViewForwarder();
- virtual BOOL IsValid() const;
- virtual Rectangle GetVisArea() const;
- virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
- virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
+ virtual BOOL IsValid() const;
+ virtual Rectangle GetVisArea() const;
+ virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
+ virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
void SetInvalid();
};
@@ -168,12 +168,12 @@ public:
ScEditObjectViewForwarder( Window* pWindow,
const EditView* _pEditView);
// <--
- virtual ~ScEditObjectViewForwarder();
+ virtual ~ScEditObjectViewForwarder();
- virtual BOOL IsValid() const;
- virtual Rectangle GetVisArea() const;
- virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
- virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
+ virtual BOOL IsValid() const;
+ virtual Rectangle GetVisArea() const;
+ virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
+ virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
void SetInvalid();
};
@@ -269,16 +269,16 @@ void ScEditObjectViewForwarder::SetInvalid()
class ScPreviewViewForwarder : public SvxViewForwarder
{
protected:
- ScPreviewShell* mpViewShell;
- mutable ScPreviewTableInfo* mpTableInfo;
+ ScPreviewShell* mpViewShell;
+ mutable ScPreviewTableInfo* mpTableInfo;
public:
ScPreviewViewForwarder(ScPreviewShell* pViewShell);
- virtual ~ScPreviewViewForwarder();
+ virtual ~ScPreviewViewForwarder();
- virtual BOOL IsValid() const;
- virtual Rectangle GetVisArea() const;
- virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
- virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
+ virtual BOOL IsValid() const;
+ virtual Rectangle GetVisArea() const;
+ virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
+ virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
void SetInvalid();
@@ -406,9 +406,9 @@ class ScPreviewHeaderFooterViewForwarder : public ScPreviewViewForwarder
sal_Bool mbHeader;
public:
ScPreviewHeaderFooterViewForwarder(ScPreviewShell* pViewShell, sal_Bool bHeader);
- virtual ~ScPreviewHeaderFooterViewForwarder();
+ virtual ~ScPreviewHeaderFooterViewForwarder();
- virtual Rectangle GetVisArea() const;
+ virtual Rectangle GetVisArea() const;
};
ScPreviewHeaderFooterViewForwarder::ScPreviewHeaderFooterViewForwarder(ScPreviewShell* pViewShell, sal_Bool bHeader)
@@ -450,9 +450,9 @@ class ScPreviewCellViewForwarder : public ScPreviewViewForwarder
public:
ScPreviewCellViewForwarder(ScPreviewShell* pViewShell,
ScAddress aCellPos);
- virtual ~ScPreviewCellViewForwarder();
+ virtual ~ScPreviewCellViewForwarder();
- virtual Rectangle GetVisArea() const;
+ virtual Rectangle GetVisArea() const;
};
ScPreviewCellViewForwarder::ScPreviewCellViewForwarder(ScPreviewShell* pViewShell,
@@ -495,9 +495,9 @@ public:
ScPreviewHeaderCellViewForwarder(ScPreviewShell* pViewShell,
ScAddress aCellPos,
sal_Bool bColHeader, sal_Bool bRowHeader);
- virtual ~ScPreviewHeaderCellViewForwarder();
+ virtual ~ScPreviewHeaderCellViewForwarder();
- virtual Rectangle GetVisArea() const;
+ virtual Rectangle GetVisArea() const;
};
ScPreviewHeaderCellViewForwarder::ScPreviewHeaderCellViewForwarder(ScPreviewShell* pViewShell,
@@ -542,9 +542,9 @@ public:
ScPreviewNoteViewForwarder(ScPreviewShell* pViewShell,
ScAddress aCellPos,
sal_Bool bNoteMark);
- virtual ~ScPreviewNoteViewForwarder();
+ virtual ~ScPreviewNoteViewForwarder();
- virtual Rectangle GetVisArea() const;
+ virtual Rectangle GetVisArea() const;
};
ScPreviewNoteViewForwarder::ScPreviewNoteViewForwarder(ScPreviewShell* pViewShell,
@@ -586,19 +586,19 @@ class ScEditViewForwarder : public SvxEditViewForwarder
Window* mpWindow;
public:
ScEditViewForwarder(EditView* pEditView, Window* pWin);
- virtual ~ScEditViewForwarder();
+ virtual ~ScEditViewForwarder();
- virtual BOOL IsValid() const;
- virtual Rectangle GetVisArea() const;
- virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
- virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
- virtual sal_Bool GetSelection( ESelection& rSelection ) const;
- virtual sal_Bool SetSelection( const ESelection& rSelection );
- virtual sal_Bool Copy();
- virtual sal_Bool Cut();
- virtual sal_Bool Paste();
+ virtual BOOL IsValid() const;
+ virtual Rectangle GetVisArea() const;
+ virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
+ virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
+ virtual sal_Bool GetSelection( ESelection& rSelection ) const;
+ virtual sal_Bool SetSelection( const ESelection& rSelection );
+ virtual sal_Bool Copy();
+ virtual sal_Bool Cut();
+ virtual sal_Bool Paste();
- void GrabFocus();
+ void GrabFocus();
void SetInvalid();
};
@@ -749,7 +749,7 @@ void ScEditViewForwarder::SetInvalid()
// ============================================================================
-// ScAccessibleCellTextData: shared data between sub objects of a accessible cell text object
+// ScAccessibleCellTextData: shared data between sub objects of a accessible cell text object
ScAccessibleCellTextData::ScAccessibleCellTextData(ScTabViewShell* pViewShell,
const ScAddress& rP, ScSplitPos eSplitPos, ScAccessibleCell* pAccCell)
@@ -780,7 +780,7 @@ void ScAccessibleCellTextData::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
if ( nId == SFX_HINT_DYING )
{
- mpViewShell = NULL; // invalid now
+ mpViewShell = NULL; // invalid now
if (mpViewForwarder)
mpViewForwarder->SetInvalid();
if (mpEditViewForwarder)
@@ -824,7 +824,7 @@ void ScAccessibleCellTextData::GetCellText(const ScAddress& rCellPos, String& rT
SvxTextForwarder* ScAccessibleCellTextData::GetTextForwarder()
{
-/* sal_Bool bHasForwarder(sal_False);
+/* sal_Bool bHasForwarder(sal_False);
if (mpViewShell && mpViewShell->GetViewData() &&
(mpViewShell->GetViewData()->GetCurPos() == aCellPos) &&
(mpViewShell->GetViewData()->HasEditView(meSplitPos)) &&
@@ -1024,7 +1024,7 @@ SvxViewForwarder* ScAccessibleCellTextData::GetViewForwarder()
SvxEditViewForwarder* ScAccessibleCellTextData::GetEditViewForwarder( sal_Bool /* bCreate */ )
{
//#102219#; there should no EditViewForwarder be, because the cell is now readonly in this interface
-/* if (!mpEditViewForwarder)
+/* if (!mpEditViewForwarder)
{
SCCOL nCol;
SCROW nRow;
@@ -1245,9 +1245,9 @@ SvxTextForwarder* ScAccessibleEditLineTextData::GetTextForwarder()
pEnginePool->FreezeIdRanges();
mpEditEngine = new ScFieldEditEngine( pEnginePool, NULL, TRUE );
mbEditEngineCreated = sal_True;
- // currently, GetPortions doesn't work if UpdateMode is FALSE,
- // this will be fixed (in EditEngine) by src600
- // pEditEngine->SetUpdateMode( FALSE );
+ // currently, GetPortions doesn't work if UpdateMode is FALSE,
+ // this will be fixed (in EditEngine) by src600
+ // pEditEngine->SetUpdateMode( FALSE );
mpEditEngine->EnableUndo( FALSE );
mpEditEngine->SetRefMapMode( MAP_100TH_MM );
mpForwarder = new SvxEditEngineForwarder(*mpEditEngine);
@@ -1280,8 +1280,8 @@ SvxEditViewForwarder* ScAccessibleEditLineTextData::GetEditViewForwarder( sal_Bo
{
pTxtWnd->StartEditEngine();
pTxtWnd->GrabFocus();
-// pTxtWnd->SetTextString( rText );
-// pTxtWnd->GetEditView()->SetSelection( rSel );
+// pTxtWnd->SetTextString( rText );
+// pTxtWnd->GetEditView()->SetSelection( rSel );
mpEditView = pTxtWnd->GetEditView();
}
@@ -1341,7 +1341,7 @@ void ScAccessibleEditLineTextData::EndEdit()
// ============================================================================
-// ScAccessiblePreviewCellTextData: shared data between sub objects of a accessible cell text object
+// ScAccessiblePreviewCellTextData: shared data between sub objects of a accessible cell text object
ScAccessiblePreviewCellTextData::ScAccessiblePreviewCellTextData(ScPreviewShell* pViewShell,
const ScAddress& rP)
@@ -1366,7 +1366,7 @@ void ScAccessiblePreviewCellTextData::Notify( SfxBroadcaster& rBC, const SfxHint
ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
if ( nId == SFX_HINT_DYING )
{
- mpViewShell = NULL; // invalid now
+ mpViewShell = NULL; // invalid now
if (mpViewForwarder)
mpViewForwarder->SetInvalid();
}
@@ -1431,7 +1431,7 @@ ScDocShell* ScAccessiblePreviewCellTextData::GetDocShell(ScPreviewShell* pViewSh
// ============================================================================
-// ScAccessiblePreviewHeaderCellTextData: shared data between sub objects of a accessible cell text object
+// ScAccessiblePreviewHeaderCellTextData: shared data between sub objects of a accessible cell text object
ScAccessiblePreviewHeaderCellTextData::ScAccessiblePreviewHeaderCellTextData(ScPreviewShell* pViewShell,
const String& rText, const ScAddress& rP, sal_Bool bColHeader, sal_Bool bRowHeader)
@@ -1459,7 +1459,7 @@ void ScAccessiblePreviewHeaderCellTextData::Notify( SfxBroadcaster& rBC, const S
ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
if ( nId == SFX_HINT_DYING )
{
- mpViewShell = NULL; // invalid now
+ mpViewShell = NULL; // invalid now
if (mpViewForwarder)
mpViewForwarder->SetInvalid();
}
@@ -1487,9 +1487,9 @@ SvxTextForwarder* ScAccessiblePreviewHeaderCellTextData::GetTextForwarder()
pEnginePool->FreezeIdRanges();
pEditEngine = new ScFieldEditEngine( pEnginePool, NULL, TRUE );
}
- // currently, GetPortions doesn't work if UpdateMode is FALSE,
- // this will be fixed (in EditEngine) by src600
-// pEditEngine->SetUpdateMode( FALSE );
+ // currently, GetPortions doesn't work if UpdateMode is FALSE,
+ // this will be fixed (in EditEngine) by src600
+// pEditEngine->SetUpdateMode( FALSE );
pEditEngine->EnableUndo( FALSE );
if (pDocShell)
pEditEngine->SetRefDevice(pDocShell->GetRefDevice());
@@ -1580,7 +1580,7 @@ ScAccessibleHeaderTextData::ScAccessibleHeaderTextData(ScPreviewShell* pViewShel
ScAccessibleHeaderTextData::~ScAccessibleHeaderTextData()
{
- ScUnoGuard aGuard; // needed for EditEngine dtor
+ ScUnoGuard aGuard; // needed for EditEngine dtor
if (mpDocSh)
mpDocSh->GetDocument()->RemoveUnoObject(*this);
@@ -1621,14 +1621,14 @@ SvxTextForwarder* ScAccessibleHeaderTextData::GetTextForwarder()
pHdrEngine->EnableUndo( FALSE );
pHdrEngine->SetRefMapMode( MAP_TWIP );
- // default font must be set, independently of document
- // -> use global pool from module
+ // default font must be set, independently of document
+ // -> use global pool from module
SfxItemSet aDefaults( pHdrEngine->GetEmptyItemSet() );
const ScPatternAttr& rPattern = (const ScPatternAttr&)SC_MOD()->GetPool().GetDefaultItem(ATTR_PATTERN);
rPattern.FillEditItemSet( &aDefaults );
- // FillEditItemSet adjusts font height to 1/100th mm,
- // but for header/footer twips is needed, as in the PatternAttr:
+ // FillEditItemSet adjusts font height to 1/100th mm,
+ // but for header/footer twips is needed, as in the PatternAttr:
aDefaults.Put( rPattern.GetItem(ATTR_FONT_HEIGHT), EE_CHAR_FONTHEIGHT );
aDefaults.Put( rPattern.GetItem(ATTR_CJK_FONT_HEIGHT), EE_CHAR_FONTHEIGHT_CJK );
aDefaults.Put( rPattern.GetItem(ATTR_CTL_FONT_HEIGHT), EE_CHAR_FONTHEIGHT_CTL );
@@ -1697,7 +1697,7 @@ ScAccessibleNoteTextData::ScAccessibleNoteTextData(ScPreviewShell* pViewShell,
ScAccessibleNoteTextData::~ScAccessibleNoteTextData()
{
- ScUnoGuard aGuard; // needed for EditEngine dtor
+ ScUnoGuard aGuard; // needed for EditEngine dtor
if (mpDocSh)
mpDocSh->GetDocument()->RemoveUnoObject(*this);
@@ -1742,9 +1742,9 @@ SvxTextForwarder* ScAccessibleNoteTextData::GetTextForwarder()
pEnginePool->FreezeIdRanges();
mpEditEngine = new ScFieldEditEngine( pEnginePool, NULL, TRUE );
}
- // currently, GetPortions doesn't work if UpdateMode is FALSE,
- // this will be fixed (in EditEngine) by src600
-// pEditEngine->SetUpdateMode( FALSE );
+ // currently, GetPortions doesn't work if UpdateMode is FALSE,
+ // this will be fixed (in EditEngine) by src600
+// pEditEngine->SetUpdateMode( FALSE );
mpEditEngine->EnableUndo( FALSE );
if (mpDocSh)
mpEditEngine->SetRefDevice(mpDocSh->GetRefDevice());
diff --git a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
index 31bf438772d0..0c7a622d67c9 100644
--- a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
+++ b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 <svx/unomod.hxx>
#include <tools/debug.hxx>
-using namespace ::com::sun::star;
+using namespace ::com::sun::star;
ScDrawModelBroadcaster::ScDrawModelBroadcaster( SdrModel *pDrawModel ) :
maEventListeners( maListenerMutex ),
diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx
index b1cb325ceb69..8a55721e031a 100644
--- a/sc/source/ui/app/client.cxx
+++ b/sc/source/ui/app/client.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -122,8 +122,8 @@ void __EXPORT ScClient::RequestNewObjectArea( Rectangle& aLogicRect )
Size aSize = pPage->GetSize();
if ( aSize.Width() < 0 )
{
- aPos.X() = aSize.Width() + 1; // negative
- aSize.Width() = -aSize.Width(); // positive
+ aPos.X() = aSize.Width() + 1; // negative
+ aSize.Width() = -aSize.Width(); // positive
}
Rectangle aPageRect( aPos, aSize );
@@ -165,7 +165,7 @@ void __EXPORT ScClient::ObjectAreaChanged()
return;
}
- // Position und Groesse ins Dokument uebernehmen
+ // Position und Groesse ins Dokument uebernehmen
SdrOle2Obj* pDrawObj = GetDrawObj();
if (pDrawObj)
{
@@ -208,7 +208,7 @@ void __EXPORT ScClient::ViewChanged()
MapUnit aMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( GetAspect() ) );
Size aVisSize = OutputDevice::LogicToLogic( Size( aSz.Width, aSz.Height ), aMapUnit, MAP_100TH_MM );
- // Groesse ins Dokument uebernehmen
+ // Groesse ins Dokument uebernehmen
SdrOle2Obj* pDrawObj = GetDrawObj();
if (pDrawObj)
{
@@ -235,7 +235,7 @@ void __EXPORT ScClient::ViewChanged()
aLogicRect.SetSize( aVisSize );
pDrawObj->SetLogicRect( aLogicRect );
- // set document modified (SdrModel::SetChanged is not used)
+ // set document modified (SdrModel::SetChanged is not used)
pViewSh->GetViewData()->GetDocShell()->SetDrawModified();
}
}
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index b256233d7394..85ad39189248 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 55aa0986d2ec..685ea397858e 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,31 +82,31 @@
#include "userlist.hxx"
#include "rfindlst.hxx"
#include "inputopt.hxx"
-#include "cell.hxx" // fuer Formel-Preview
-#include "compiler.hxx" // fuer Formel-Preview
+#include "cell.hxx" // fuer Formel-Preview
+#include "compiler.hxx" // fuer Formel-Preview
#include "editable.hxx"
#include "funcdesc.hxx"
#define _INPUTHDL_CXX
#include "inputhdl.hxx"
-// max. Ranges im RangeFinder
-#define RANGEFIND_MAX 32
+// max. Ranges im RangeFinder
+#define RANGEFIND_MAX 32
using namespace formula;
// STATIC DATA -----------------------------------------------------------
-BOOL ScInputHandler::bOptLoaded = FALSE; // App-Optionen ausgewertet
-BOOL ScInputHandler::bAutoComplete = FALSE; // wird in KeyInput gesetzt
+BOOL ScInputHandler::bOptLoaded = FALSE; // App-Optionen ausgewertet
+BOOL ScInputHandler::bAutoComplete = FALSE; // wird in KeyInput gesetzt
-// delimiters (in addition to ScEditUtil) needed for range finder:
-// only characters that are allowed in formulas next to references
-// and the quotation mark (so string constants can be skipped)
+// delimiters (in addition to ScEditUtil) needed for range finder:
+// only characters that are allowed in formulas next to references
+// and the quotation mark (so string constants can be skipped)
static const sal_Char __FAR_DATA pMinDelimiters[] = " !\"";
-extern USHORT nEditAdjust; //! Member an ViewData
+extern USHORT nEditAdjust; //! Member an ViewData
//==================================================================
@@ -127,16 +127,16 @@ void ScInputHandler::InitRangeFinder( const String& rFormula )
if ( !pActiveViewSh || !SC_MOD()->GetInputOptions().GetRangeFinder() )
return;
-// String aDelimiters = pEngine->GetWordDelimiters();
+// String aDelimiters = pEngine->GetWordDelimiters();
String aDelimiters = ScEditUtil::ModifyDelimiters(
String::CreateFromAscii( pMinDelimiters ) );
xub_StrLen nColon = aDelimiters.Search(':');
if ( nColon != STRING_NOTFOUND )
- aDelimiters.Erase( nColon, 1 ); // Delimiter ohne Doppelpunkt
+ aDelimiters.Erase( nColon, 1 ); // Delimiter ohne Doppelpunkt
xub_StrLen nDot = aDelimiters.Search(cSheetSep);
if ( nDot != STRING_NOTFOUND )
- aDelimiters.Erase( nDot, 1 ); // Delimiter ohne Punkt
+ aDelimiters.Erase( nDot, 1 ); // Delimiter ohne Punkt
const sal_Unicode* pChar = rFormula.GetBuffer();
xub_StrLen nLen = rFormula.Len();
@@ -146,19 +146,19 @@ void ScInputHandler::InitRangeFinder( const String& rFormula )
ScRange aRange;
while ( nPos < nLen && nCount < RANGEFIND_MAX )
{
- // Trenner ueberlesen
+ // Trenner ueberlesen
while ( nPos<nLen && ScGlobal::UnicodeStrChr( aDelimiters.GetBuffer(), pChar[nPos] ) )
{
- if ( pChar[nPos] == '"' ) // String
+ if ( pChar[nPos] == '"' ) // String
{
++nPos;
- while (nPos<nLen && pChar[nPos] != '"') // bis zum Ende ueberlesen
+ while (nPos<nLen && pChar[nPos] != '"') // bis zum Ende ueberlesen
++nPos;
}
- ++nPos; // Trennzeichen oder schliessender Quote
+ ++nPos; // Trennzeichen oder schliessender Quote
}
- // Text zwischen Trennern
+ // Text zwischen Trennern
nStart = nPos;
handle_r1c1:
while ( nPos<nLen && !ScGlobal::UnicodeStrChr( aDelimiters.GetBuffer(), pChar[nPos] ) )
@@ -183,7 +183,7 @@ handle_r1c1:
USHORT nFlags = aRange.ParseAny( aTest, pDoc, aAddrDetails );
if ( nFlags & SCA_VALID )
{
- // Tabelle setzen, wenn nicht angegeben
+ // Tabelle setzen, wenn nicht angegeben
if ( (nFlags & SCA_TAB_3D) == 0 )
aRange.aStart.SetTab( pActiveViewSh->GetViewData()->GetTabNo() );
if ( (nFlags & SCA_TAB2_3D) == 0 )
@@ -215,7 +215,7 @@ handle_r1c1:
}
}
- // letzten Trenner nicht ueberlesen, koennte ja ein Quote sein (?)
+ // letzten Trenner nicht ueberlesen, koennte ja ein Quote sein (?)
}
if (nCount)
@@ -238,13 +238,13 @@ void lcl_Replace( EditView* pView, const String& rNewStr, const ESelection& rOld
EditEngine* pEngine = pView->GetEditEngine();
pEngine->QuickInsertText( rNewStr, rOldSel );
- // Dummy-InsertText fuer Update und Paint
- // dafuer muss oben die Selektion aufgehoben werden (vor QuickInsertText)
+ // Dummy-InsertText fuer Update und Paint
+ // dafuer muss oben die Selektion aufgehoben werden (vor QuickInsertText)
pView->InsertText( EMPTY_STRING, FALSE );
xub_StrLen nLen = pEngine->GetTextLen(0);
ESelection aSel( 0, nLen, 0, nLen );
- pView->SetSelection( aSel ); // Cursor ans Ende
+ pView->SetSelection( aSel ); // Cursor ans Ende
}
}
@@ -258,7 +258,7 @@ void ScInputHandler::UpdateRange( USHORT nIndex, const ScRange& rNew )
xub_StrLen nOldEnd = pData->nSelEnd;
ScRange aJustified = rNew;
- aJustified.Justify(); // Ref in der Formel immer richtigherum anzeigen
+ aJustified.Justify(); // Ref in der Formel immer richtigherum anzeigen
String aNewStr;
ScDocument* pDoc = pDocView->GetViewData()->GetDocument();
const ScAddress::Details aAddrDetails( pDoc, aCursorPos );
@@ -300,7 +300,7 @@ void ScInputHandler::DeleteRangeFinder()
{
ScDocShell* pDocSh = pActiveViewSh->GetViewData()->GetDocShell();
pRangeFindList->SetHidden(TRUE);
- pDocSh->Broadcast( SfxSimpleHint( SC_HINT_SHOWRANGEFINDER ) ); // wegnehmen
+ pDocSh->Broadcast( SfxSimpleHint( SC_HINT_SHOWRANGEFINDER ) ); // wegnehmen
DELETEZ(pRangeFindList);
}
}
@@ -404,7 +404,7 @@ xub_StrLen lcl_MatchParenthesis( const String& rStr, xub_StrLen nPos )
{
bInString = !bInString;
if ( bLookInString && !bInString )
- p = p1; //That's it then
+ p = p1; //That's it then
}
else if ( bInString == bLookInString )
{
@@ -463,20 +463,20 @@ ScInputHandler::ScInputHandler()
pDelayTimer( NULL ),
pRangeFindList( NULL )
{
- // The InputHandler is constructed with the view, so SfxViewShell::Current
- // doesn't have the right view yet. pActiveViewSh is updated in NotifyChange.
+ // The InputHandler is constructed with the view, so SfxViewShell::Current
+ // doesn't have the right view yet. pActiveViewSh is updated in NotifyChange.
pActiveViewSh = NULL;
- // Bindings (nur noch fuer Invalidate benutzt) werden bei Bedarf aktuell geholt
+ // Bindings (nur noch fuer Invalidate benutzt) werden bei Bedarf aktuell geholt
}
__EXPORT ScInputHandler::~ScInputHandler()
{
- // Wenn dies der Applikations-InputHandler ist, wird der dtor erst nach SfxApplication::Main
- // gerufen, darf sich also auf keine Sfx-Funktionen mehr verlassen
+ // Wenn dies der Applikations-InputHandler ist, wird der dtor erst nach SfxApplication::Main
+ // gerufen, darf sich also auf keine Sfx-Funktionen mehr verlassen
- if ( !SFX_APP()->IsDowning() ) // inplace
- EnterHandler(); // Eingabe noch abschliessen
+ if ( !SFX_APP()->IsDowning() ) // inplace
+ EnterHandler(); // Eingabe noch abschliessen
if (SC_MOD()->GetRefInputHdl()==this)
SC_MOD()->SetRefInputHdl(NULL);
@@ -522,8 +522,8 @@ void ScInputHandler::UpdateRefDevice()
MapMode aMode( MAP_100TH_MM, Point(), aScaleX, aScaleY );
pEngine->SetRefMapMode( aMode );
- // SetRefDevice(NULL) uses VirtualDevice, SetRefMapMode forces creation of a local VDev,
- // so the DigitLanguage can be safely modified (might use an own VDev instead of NULL).
+ // SetRefDevice(NULL) uses VirtualDevice, SetRefMapMode forces creation of a local VDev,
+ // so the DigitLanguage can be safely modified (might use an own VDev instead of NULL).
if ( !( bTextWysiwyg && pActiveViewSh ) )
{
pEngine->GetRefDevice()->SetDigitLanguage( SC_MOD()->GetOptDigitLanguage() );
@@ -542,7 +542,7 @@ void ScInputHandler::ImplCreateEditEngine()
else
pEngine = new ScFieldEditEngine( EditEngine::CreatePool(), NULL, TRUE );
pEngine->SetWordDelimiters( ScEditUtil::ModifyDelimiters( pEngine->GetWordDelimiters() ) );
- UpdateRefDevice(); // also sets MapMode
+ UpdateRefDevice(); // also sets MapMode
pEngine->SetPaperSize( Size( 1000000, 1000000 ) );
pEditDefaults = new SfxItemSet( pEngine->GetEmptyItemSet() );
@@ -556,7 +556,7 @@ void ScInputHandler::UpdateAutoCorrFlag()
ULONG nCntrl = pEngine->GetControlWord();
ULONG nOld = nCntrl;
- // don't use pLastPattern here (may be invalid because of AutoStyle)
+ // don't use pLastPattern here (may be invalid because of AutoStyle)
BOOL bDisable = bLastIsSymbol || bFormulaMode;
if ( bDisable )
@@ -575,14 +575,14 @@ void ScInputHandler::UpdateSpellSettings( BOOL bFromStartTab )
ScViewData* pViewData = pActiveViewSh->GetViewData();
BOOL bOnlineSpell = pViewData->GetDocument()->GetDocOptions().IsAutoSpell();
- // SetDefaultLanguage is independent of the language attributes,
- // ScGlobal::GetEditDefaultLanguage is always used.
- // It must be set every time in case the office language was changed.
+ // SetDefaultLanguage is independent of the language attributes,
+ // ScGlobal::GetEditDefaultLanguage is always used.
+ // It must be set every time in case the office language was changed.
pEngine->SetDefaultLanguage( ScGlobal::GetEditDefaultLanguage() );
- // if called for changed options, update flags only if already editing
- // if called from StartTable, always update flags
+ // if called for changed options, update flags only if already editing
+ // if called from StartTable, always update flags
if ( bFromStartTab || eMode != SC_INPUT_NONE )
{
@@ -609,8 +609,8 @@ void ScInputHandler::UpdateSpellSettings( BOOL bFromStartTab )
pEngine->SetFirstWordCapitalization( FALSE );
}
- // language is set separately, so the speller is needed only if online
- // spelling is active
+ // language is set separately, so the speller is needed only if online
+ // spelling is active
if ( bOnlineSpell ) {
com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellChecker1> xXSpellChecker1( LinguMgr::GetSpellChecker() );
@@ -626,11 +626,11 @@ void ScInputHandler::UpdateSpellSettings( BOOL bFromStartTab )
}
//
-// Funktionen/Bereichsnamen etc. als Tip-Hilfe
+// Funktionen/Bereichsnamen etc. als Tip-Hilfe
//
-#define SC_STRTYPE_FUNCTIONS 1
-// die anderen Typen sind in ScDocument::GetFormulaEntries festgelegt
+#define SC_STRTYPE_FUNCTIONS 1
+// die anderen Typen sind in ScDocument::GetFormulaEntries festgelegt
void ScInputHandler::GetFormulaData()
{
@@ -648,9 +648,9 @@ void ScInputHandler::GetFormulaData()
else
pFormulaDataPara = new TypedScStrCollection;
- // MRU-Funktionen aus dem Funktions-Autopiloten
- // wie in ScPosWnd::FillFunctions (inputwin.cxx)
-
+ // MRU-Funktionen aus dem Funktions-Autopiloten
+ // wie in ScPosWnd::FillFunctions (inputwin.cxx)
+
const ScAppOptions& rOpt = SC_MOD()->GetAppOptions();
USHORT nMRUCount = rOpt.GetLRUFuncListCount();
const USHORT* pMRUList = rOpt.GetLRUFuncList();
@@ -758,7 +758,7 @@ void ScInputHandler::ShowTipCursor()
xub_StrLen nArgPos = 0;
const IFunctionDescription* ppFDesc;
::std::vector< ::rtl::OUString> aArgs;
- USHORT nArgs;
+ USHORT nArgs;
BOOL bFound = FALSE;
FormulaHelper aHelper(ScGlobal::GetStarCalcFunctionMgr());
@@ -897,7 +897,7 @@ void ScInputHandler::ShowTipCursor()
ShowTipBelow( aNew );
bFound = TRUE;
}
- else
+ else
break;
}
else
@@ -912,7 +912,7 @@ void ScInputHandler::ShowTipCursor()
void ScInputHandler::ShowTip( const String& rText )
{
- // aManualTip muss hinterher von aussen gesetzt werden
+ // aManualTip muss hinterher von aussen gesetzt werden
HideTip();
EditView* pActiveView = pTopView ? pTopView : pTableView;
@@ -963,21 +963,21 @@ void ScInputHandler::UseFormulaData()
const sal_Unicode cSep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
const sal_Unicode cSheetSep = lcl_getSheetSeparator(pDocSh->GetDocument());
- // Formeln duerfen nur 1 Absatz haben
+ // Formeln duerfen nur 1 Absatz haben
if ( pActiveView && pFormulaData && pEngine->GetParagraphCount() == 1 )
{
String aTotal = pEngine->GetText( (USHORT) 0 );
ESelection aSel = pActiveView->GetSelection();
aSel.Adjust();
- // #59348# Durch Differenzen zwischen Tabelle und Eingabezeile
- // (z.B. Clipboard mit Zeilenumbruechen) kann es sein, dass die Selektion
- // nicht mehr zur EditEngine passt. Dann halt kommentarlos abbrechen:
+ // #59348# Durch Differenzen zwischen Tabelle und Eingabezeile
+ // (z.B. Clipboard mit Zeilenumbruechen) kann es sein, dass die Selektion
+ // nicht mehr zur EditEngine passt. Dann halt kommentarlos abbrechen:
if ( aSel.nEndPos > aTotal.Len() )
return;
- // steht der Cursor am Ende eines Wortes?
+ // steht der Cursor am Ende eines Wortes?
if ( aSel.nEndPos > 0 )
{
@@ -989,7 +989,7 @@ void ScInputHandler::UseFormulaData()
xub_StrLen nArgPos = 0;
const IFunctionDescription* ppFDesc;
::std::vector< ::rtl::OUString> aArgs;
- USHORT nArgs;
+ USHORT nArgs;
BOOL bFound = FALSE;
String aText = pEngine->GetWord( 0, aSel.nEndPos-1 );
@@ -1049,7 +1049,7 @@ void ScInputHandler::UseFormulaData()
{
nCountSemicolon = aNew.GetTokenCount(cSep)-1;
nCountDot = aNew.GetTokenCount(cSheetSep)-1;
-
+
if( !nCountSemicolon )
{
for( USHORT i = 0; i < aNew.Len(); i++ )
@@ -1135,10 +1135,10 @@ void ScInputHandler::NextFormulaEntry( BOOL bBack )
{
String aNew;
if ( pFormulaData->FindText( aAutoSearch, aNew, nAutoPos, bBack ) )
- ShowTip( aNew ); // als QuickHelp anzeigen
+ ShowTip( aNew ); // als QuickHelp anzeigen
}
- // bei Tab wird vorher immer HideCursor gerufen
+ // bei Tab wird vorher immer HideCursor gerufen
if (pActiveView)
pActiveView->ShowCursor();
@@ -1160,9 +1160,9 @@ void lcl_CompleteFunction( EditView* pView, const String& rInsert, BOOL& rParIns
&& aInsStr.GetChar(nInsLen-1) == ')' );
if ( bDoParen )
{
- // Klammern hinter Funktionsnamen nicht einfuegen, wenn direkt dahinter
- // schon eine Klammer steht (z.B. wenn der Funktionsname geaendert wurde,
- // #39393#).
+ // Klammern hinter Funktionsnamen nicht einfuegen, wenn direkt dahinter
+ // schon eine Klammer steht (z.B. wenn der Funktionsname geaendert wurde,
+ // #39393#).
ESelection aWordSel = pView->GetSelection();
String aOld = pView->GetEditEngine()->GetText((USHORT)0);
@@ -1170,13 +1170,13 @@ void lcl_CompleteFunction( EditView* pView, const String& rInsert, BOOL& rParIns
if ( cNext == '(' )
{
bDoParen = FALSE;
- aInsStr.Erase( nInsLen - 2 ); // Klammern weglassen
+ aInsStr.Erase( nInsLen - 2 ); // Klammern weglassen
}
}
pView->InsertText( aInsStr, FALSE );
- if ( bDoParen ) // Cursor zwischen die Klammern setzen
+ if ( bDoParen ) // Cursor zwischen die Klammern setzen
{
aSel = pView->GetSelection();
--aSel.nStartPos;
@@ -1198,7 +1198,7 @@ void ScInputHandler::PasteFunctionData()
String aInsert = pData->GetString();
BOOL bParInserted = FALSE;
- DataChanging(); // kann nicht neu sein
+ DataChanging(); // kann nicht neu sein
lcl_CompleteFunction( pTopView, aInsert, bParInserted );
lcl_CompleteFunction( pTableView, aInsert, bParInserted );
DataChanged();
@@ -1217,13 +1217,13 @@ void ScInputHandler::PasteFunctionData()
}
//
-// Selektion berechnen und als Tip-Hilfe anzeigen
+// Selektion berechnen und als Tip-Hilfe anzeigen
//
String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScAddress &rPos )
{
- //! mit ScFormulaDlg::CalcValue zusammenfassen und ans Dokument verschieben !!!!
- //! (Anfuehrungszeichen bei Strings werden nur hier eingefuegt)
+ //! mit ScFormulaDlg::CalcValue zusammenfassen und ans Dokument verschieben !!!!
+ //! (Anfuehrungszeichen bei Strings werden nur hier eingefuegt)
String aValue;
@@ -1240,7 +1240,7 @@ String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScAddress
{
// ColRowName im RPN-Code?
if ( pCell->GetCode()->GetCodeLen() <= 1 )
- { // ==1: einzelner ist als Parameter immer Bereich
+ { // ==1: einzelner ist als Parameter immer Bereich
// ==0: es waere vielleicht einer, wenn..
String aBraced( '(' );
aBraced += rFormula;
@@ -1263,7 +1263,7 @@ String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScAddress
ULONG nFormat = aFormatter.GetStandardFormat( n, 0,
pCell->GetFormatType(), ScGlobal::eLnge );
aFormatter.GetInputLineString( n, nFormat, aValue );
- //! display OutputString but insert InputLineString
+ //! display OutputString but insert InputLineString
}
else
{
@@ -1275,14 +1275,14 @@ String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScAddress
aFormatter.GetOutputString( aStr, nFormat,
aValue, &pColor );
- aValue.Insert('"',0); // in Anfuehrungszeichen
+ aValue.Insert('"',0); // in Anfuehrungszeichen
aValue+='"';
- //! Anfuehrungszeichen im String escapen ????
+ //! Anfuehrungszeichen im String escapen ????
}
ScRange aTestRange;
if ( bColRowName || (aTestRange.Parse(rFormula) & SCA_VALID) )
- aValue.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " ..." )); // Bereich
+ aValue.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " ..." )); // Bereich
}
else
aValue = ScGlobal::GetErrorString(nErrCode);
@@ -1307,27 +1307,27 @@ void ScInputHandler::FormulaPreview()
if (aValue.Len())
{
- ShowTip( aValue ); // als QuickHelp anzeigen
- aManualTip = aValue; // nach ShowTip setzen
- nAutoPos = SCPOS_INVALID; // Formel-Autocomplete aufheben
+ ShowTip( aValue ); // als QuickHelp anzeigen
+ aManualTip = aValue; // nach ShowTip setzen
+ nAutoPos = SCPOS_INVALID; // Formel-Autocomplete aufheben
}
}
void ScInputHandler::PasteManualTip()
{
- // drei Punkte am Ende -> Bereichsreferenz -> nicht einfuegen
- // (wenn wir mal Matrix-Konstanten haben, kann das geaendert werden)
+ // drei Punkte am Ende -> Bereichsreferenz -> nicht einfuegen
+ // (wenn wir mal Matrix-Konstanten haben, kann das geaendert werden)
xub_StrLen nTipLen = aManualTip.Len();
if ( nTipLen && ( nTipLen < 3 || !aManualTip.Copy( nTipLen-3 ).EqualsAscii("...") ) )
{
- DataChanging(); // kann nicht neu sein
+ DataChanging(); // kann nicht neu sein
String aInsert = aManualTip;
EditView* pActiveView = pTopView ? pTopView : pTableView;
if (!pActiveView->HasSelection())
{
- // nichts selektiert -> alles selektieren
+ // nichts selektiert -> alles selektieren
xub_StrLen nOldLen = pEngine->GetTextLen(0);
ESelection aAllSel( 0, 0, 0, nOldLen );
if ( pTopView )
@@ -1339,11 +1339,11 @@ void ScInputHandler::PasteManualTip()
ESelection aSel = pActiveView->GetSelection();
aSel.Adjust();
DBG_ASSERT( !aSel.nStartPara && !aSel.nEndPara, "Zuviele Absaetze in Formel" );
- if ( !aSel.nStartPos ) // Selektion ab Anfang?
+ if ( !aSel.nStartPos ) // Selektion ab Anfang?
{
if ( aSel.nEndPos == pEngine->GetTextLen(0) )
{
- // alles selektiert -> Anfuehrungszeichen weglassen
+ // alles selektiert -> Anfuehrungszeichen weglassen
if ( aInsert.GetChar(0) == '"' )
aInsert.Erase(0,1);
xub_StrLen nInsLen = aInsert.Len();
@@ -1352,8 +1352,8 @@ void ScInputHandler::PasteManualTip()
}
else if ( aSel.nEndPos )
{
- // nicht alles selektiert -> Gleichheitszeichen nicht ueberschreiben
- //! doppelte Gleichheitszeichen auch ???
+ // nicht alles selektiert -> Gleichheitszeichen nicht ueberschreiben
+ //! doppelte Gleichheitszeichen auch ???
aSel.nStartPos = 1;
if ( pTopView )
@@ -1380,14 +1380,14 @@ void ScInputHandler::ResetAutoPar()
void ScInputHandler::AutoParAdded()
{
- ++nAutoPar; // closing parenthesis can be overwritten
+ ++nAutoPar; // closing parenthesis can be overwritten
}
BOOL ScInputHandler::CursorAtClosingPar()
{
- // test if the cursor is before a closing parenthesis
+ // test if the cursor is before a closing parenthesis
- // selection from SetReference has been removed before
+ // selection from SetReference has been removed before
EditView* pActiveView = pTopView ? pTopView : pTableView;
if ( pActiveView && !pActiveView->HasSelection() && bFormulaMode )
{
@@ -1402,8 +1402,8 @@ BOOL ScInputHandler::CursorAtClosingPar()
void ScInputHandler::SkipClosingPar()
{
- // this is called when a ')' is typed and the cursor is before a ')'
- // that can be overwritten -> just set the cursor behind the ')'
+ // this is called when a ')' is typed and the cursor is before a ')'
+ // that can be overwritten -> just set the cursor behind the ')'
EditView* pActiveView = pTopView ? pTopView : pTableView;
if (pActiveView)
@@ -1412,8 +1412,8 @@ void ScInputHandler::SkipClosingPar()
++aSel.nStartPos;
++aSel.nEndPos;
- // this is in a formula (only one paragraph), so the selection
- // can be used directly for the TopView
+ // this is in a formula (only one paragraph), so the selection
+ // can be used directly for the TopView
if ( pTopView )
pTopView->SetSelection( aSel );
@@ -1426,7 +1426,7 @@ void ScInputHandler::SkipClosingPar()
}
//
-// Auto-Eingabe
+// Auto-Eingabe
//
void ScInputHandler::GetColData()
@@ -1440,7 +1440,7 @@ void ScInputHandler::GetColData()
else
{
pColumnData = new TypedScStrCollection;
- pColumnData->SetCaseSensitive( TRUE ); // equal strings are handled in FindText
+ pColumnData->SetCaseSensitive( TRUE ); // equal strings are handled in FindText
}
pDoc->GetDataEntries( aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(),
@@ -1448,12 +1448,12 @@ void ScInputHandler::GetColData()
}
}
-void ScInputHandler::UseColData() // beim Tippen
+void ScInputHandler::UseColData() // beim Tippen
{
EditView* pActiveView = pTopView ? pTopView : pTableView;
if ( pActiveView && pColumnData )
{
- // nur anpassen, wenn Cursor am Ende steht
+ // nur anpassen, wenn Cursor am Ende steht
ESelection aSel = pActiveView->GetSelection();
aSel.Adjust();
@@ -1468,27 +1468,27 @@ void ScInputHandler::UseColData() // beim Tippen
if (aText.Len())
{
String aNew;
- nAutoPos = SCPOS_INVALID; // nix
+ nAutoPos = SCPOS_INVALID; // nix
if ( pColumnData->FindText( aText, aNew, nAutoPos, FALSE ) )
{
- // #45434# durch dBase Import etc. koennen Umbrueche im String sein,
- // das wuerde hier mehrere Absaetze ergeben -> nicht gut
- //! GetExactMatch funktioniert dann auch nicht
+ // #45434# durch dBase Import etc. koennen Umbrueche im String sein,
+ // das wuerde hier mehrere Absaetze ergeben -> nicht gut
+ //! GetExactMatch funktioniert dann auch nicht
lcl_RemoveLineEnd( aNew );
// Absaetze beibehalten, nur den Rest anfuegen
- //! genaue Ersetzung im EnterHandler !!!
+ //! genaue Ersetzung im EnterHandler !!!
// ein Space zwischen Absaetzen:
ULONG nEdLen = pEngine->GetTextLen() + nParCnt - 1;
String aIns = aNew.Copy( (xub_StrLen)nEdLen );
- // selection must be "backwards", so the cursor stays behind the last
- // typed character
+ // selection must be "backwards", so the cursor stays behind the last
+ // typed character
ESelection aSelection( aSel.nEndPara, aSel.nEndPos + aIns.Len(),
aSel.nEndPara, aSel.nEndPos );
- // when editing in input line, apply to both edit views
+ // when editing in input line, apply to both edit views
if ( pTableView )
{
pTableView->InsertText( aIns, FALSE );
@@ -1500,12 +1500,12 @@ void ScInputHandler::UseColData() // beim Tippen
pTopView->SetSelection( aSelection );
}
- aAutoSearch = aText; // zum Weitersuchen - nAutoPos ist gesetzt
+ aAutoSearch = aText; // zum Weitersuchen - nAutoPos ist gesetzt
if ( aText.Len() == aNew.Len() )
{
- // Wenn der eingegebene Text gefunden wurde, TAB nur dann
- // verschlucken, wenn noch etwas kommt
+ // Wenn der eingegebene Text gefunden wurde, TAB nur dann
+ // verschlucken, wenn noch etwas kommt
String aDummy;
USHORT nNextPos = nAutoPos;
@@ -1527,7 +1527,7 @@ void ScInputHandler::NextAutoEntry( BOOL bBack )
{
if ( nAutoPos != SCPOS_INVALID && aAutoSearch.Len() )
{
- // stimmt die Selektion noch? (kann per Maus geaendert sein)
+ // stimmt die Selektion noch? (kann per Maus geaendert sein)
ESelection aSel = pActiveView->GetSelection();
aSel.Adjust();
@@ -1542,12 +1542,12 @@ void ScInputHandler::NextAutoEntry( BOOL bBack )
String aNew;
if ( pColumnData->FindText( aAutoSearch, aNew, nAutoPos, bBack ) )
{
- bInOwnChange = TRUE; // disable ModifyHdl (reset below)
+ bInOwnChange = TRUE; // disable ModifyHdl (reset below)
lcl_RemoveLineEnd( aNew );
String aIns = aNew.Copy( aAutoSearch.Len() );
- // when editing in input line, apply to both edit views
+ // when editing in input line, apply to both edit views
if ( pTableView )
{
pTableView->DeleteSelected();
@@ -1578,31 +1578,31 @@ void ScInputHandler::NextAutoEntry( BOOL bBack )
}
}
- // bei Tab wird vorher immer HideCursor gerufen
+ // bei Tab wird vorher immer HideCursor gerufen
if (pActiveView)
pActiveView->ShowCursor();
}
//
-// Klammern hervorheben
+// Klammern hervorheben
//
void ScInputHandler::UpdateParenthesis()
{
- // Klammern suchen
+ // Klammern suchen
- //! Klammer-Hervorhebung einzeln abschaltbar ????
+ //! Klammer-Hervorhebung einzeln abschaltbar ????
BOOL bFound = FALSE;
if ( bFormulaMode && eMode != SC_INPUT_TOP )
{
- if ( pTableView && !pTableView->HasSelection() ) // Selektion ist immer unten
+ if ( pTableView && !pTableView->HasSelection() ) // Selektion ist immer unten
{
ESelection aSel = pTableView->GetSelection();
if (aSel.nStartPos)
{
- // Das Zeichen links vom Cursor wird angeschaut
+ // Das Zeichen links vom Cursor wird angeschaut
xub_StrLen nPos = aSel.nStartPos - 1;
String aFormula = pEngine->GetText((USHORT)0);
@@ -1614,11 +1614,11 @@ void ScInputHandler::UpdateParenthesis()
{
SfxItemSet aSet( pEngine->GetEmptyItemSet() );
aSet.Put( SvxWeightItem( WEIGHT_BOLD, EE_CHAR_WEIGHT ) );
- //! Unterscheidung, wenn die Zelle schon fett ist !!!!
+ //! Unterscheidung, wenn die Zelle schon fett ist !!!!
if (bParenthesisShown)
{
- // alte Hervorhebung wegnehmen
+ // alte Hervorhebung wegnehmen
USHORT nCount = pEngine->GetParagraphCount();
for (USHORT i=0; i<nCount; i++)
pEngine->QuickRemoveCharAttribs( i, EE_CHAR_WEIGHT );
@@ -1629,7 +1629,7 @@ void ScInputHandler::UpdateParenthesis()
ESelection aSelOther( 0,nOther, 0,nOther+1 );
pEngine->QuickSetAttribs( aSet, aSelOther );
- // Dummy-InsertText fuer Update und Paint (Selektion ist leer)
+ // Dummy-InsertText fuer Update und Paint (Selektion ist leer)
pTableView->InsertText( EMPTY_STRING, FALSE );
bFound = TRUE;
@@ -1637,12 +1637,12 @@ void ScInputHandler::UpdateParenthesis()
}
}
- // mark parenthesis right of cursor if it will be overwritten (nAutoPar)
- // with different color (COL_LIGHTBLUE) ??
+ // mark parenthesis right of cursor if it will be overwritten (nAutoPar)
+ // with different color (COL_LIGHTBLUE) ??
}
}
- // alte Hervorhebung wegnehmen, wenn keine neue gesetzt
+ // alte Hervorhebung wegnehmen, wenn keine neue gesetzt
if ( bParenthesisShown && !bFound && pTableView )
{
@@ -1654,7 +1654,7 @@ void ScInputHandler::UpdateParenthesis()
bParenthesisShown = bFound;
}
-void ScInputHandler::ViewShellGone(ScTabViewShell* pViewSh) // wird synchron aufgerufen!
+void ScInputHandler::ViewShellGone(ScTabViewShell* pViewSh) // wird synchron aufgerufen!
{
if ( pViewSh == pActiveViewSh )
{
@@ -1666,7 +1666,7 @@ void ScInputHandler::ViewShellGone(ScTabViewShell* pViewSh) // wird synchron
if ( pViewSh == pRefViewSh )
{
//! Die Eingabe kommt aus dem EnterHandler nicht mehr an
- // Trotzdem wird immerhin der Editmodus beendet
+ // Trotzdem wird immerhin der Editmodus beendet
EnterHandler();
bFormulaMode = FALSE;
@@ -1687,7 +1687,7 @@ void ScInputHandler::ViewShellGone(ScTabViewShell* pViewSh) // wird synchron
}
if ( SC_MOD()->GetInputOptions().GetTextWysiwyg() )
- UpdateRefDevice(); // don't keep old document's printer as RefDevice
+ UpdateRefDevice(); // don't keep old document's printer as RefDevice
}
void ScInputHandler::UpdateActiveView()
@@ -1729,7 +1729,7 @@ void ScInputHandler::StopInputWinEngine( BOOL bAll )
if (pInputWin)
pInputWin->StopEditEngine( bAll );
- pTopView = NULL; // invalid now
+ pTopView = NULL; // invalid now
}
EditView* ScInputHandler::GetActiveView()
@@ -1742,7 +1742,7 @@ void ScInputHandler::ForgetLastPattern()
{
pLastPattern = NULL;
if ( !pLastState && pActiveViewSh )
- pActiveViewSh->UpdateInputHandler( TRUE ); // Status neu holen
+ pActiveViewSh->UpdateInputHandler( TRUE ); // Status neu holen
else
NotifyChange( pLastState, TRUE );
}
@@ -1755,8 +1755,8 @@ void ScInputHandler::UpdateAdjust( sal_Unicode cTyped )
case SVX_HOR_JUSTIFY_STANDARD:
{
BOOL bNumber = FALSE;
- if (cTyped) // neu angefangen
- bNumber = (cTyped>='0' && cTyped<='9'); // nur Ziffern sind Zahlen
+ if (cTyped) // neu angefangen
+ bNumber = (cTyped>='0' && cTyped<='9'); // nur Ziffern sind Zahlen
else if ( pActiveViewSh )
{
ScDocument* pDoc = pActiveViewSh->GetViewData()->GetDocShell()->GetDocument();
@@ -1774,7 +1774,7 @@ void ScInputHandler::UpdateAdjust( sal_Unicode cTyped )
case SVX_HOR_JUSTIFY_RIGHT:
eSvxAdjust = SVX_ADJUST_RIGHT;
break;
- default: // SVX_HOR_JUSTIFY_LEFT
+ default: // SVX_HOR_JUSTIFY_LEFT
eSvxAdjust = SVX_ADJUST_LEFT;
break;
}
@@ -1784,7 +1784,7 @@ void ScInputHandler::UpdateAdjust( sal_Unicode cTyped )
((const SfxBoolItem&)pLastPattern->GetItem( ATTR_VERTICAL_ASIAN )).GetValue();
if ( bAsianVertical )
{
- // always edit at top of cell -> LEFT when editing vertically
+ // always edit at top of cell -> LEFT when editing vertically
eSvxAdjust = SVX_ADJUST_LEFT;
}
@@ -1798,13 +1798,13 @@ void ScInputHandler::UpdateAdjust( sal_Unicode cTyped )
void ScInputHandler::RemoveAdjust()
{
- // harte Ausrichtungs-Attribute loeschen
+ // harte Ausrichtungs-Attribute loeschen
BOOL bUndo = pEngine->IsUndoEnabled();
if ( bUndo )
pEngine->EnableUndo( FALSE );
- // RemoveParaAttribs removes all paragraph attributes, including EE_PARA_JUST
+ // RemoveParaAttribs removes all paragraph attributes, including EE_PARA_JUST
#if 0
BOOL bChange = FALSE;
USHORT nCount = pEngine->GetParagraphCount();
@@ -1821,8 +1821,8 @@ void ScInputHandler::RemoveAdjust()
}
#endif
- // #89403# non-default paragraph attributes (e.g. from clipboard)
- // must be turned into character attributes
+ // #89403# non-default paragraph attributes (e.g. from clipboard)
+ // must be turned into character attributes
pEngine->RemoveParaAttribs();
if ( bUndo )
@@ -1840,10 +1840,10 @@ void ScInputHandler::RemoveAdjust()
void ScInputHandler::RemoveRangeFinder()
{
- // pRangeFindList und Farben loeschen
+ // pRangeFindList und Farben loeschen
pEngine->SetUpdateMode(FALSE);
- USHORT nCount = pEngine->GetParagraphCount(); // koennte gerade neu eingefuegt worden sein
+ USHORT nCount = pEngine->GetParagraphCount(); // koennte gerade neu eingefuegt worden sein
for (USHORT i=0; i<nCount; i++)
pEngine->QuickRemoveCharAttribs( i, EE_CHAR_COLOR );
pEngine->SetUpdateMode(TRUE);
@@ -1851,7 +1851,7 @@ void ScInputHandler::RemoveRangeFinder()
EditView* pActiveView = pTopView ? pTopView : pTableView;
pActiveView->ShowCursor( FALSE, TRUE );
- DeleteRangeFinder(); // loescht die Liste und die Markierungen auf der Tabelle
+ DeleteRangeFinder(); // loescht die Liste und die Markierungen auf der Tabelle
}
BOOL ScInputHandler::StartTable( sal_Unicode cTyped, BOOL bFromCommand )
@@ -1882,14 +1882,14 @@ BOOL ScInputHandler::StartTable( sal_Unicode cTyped, BOOL bFromCommand )
// UpdateMode is enabled again in ScViewData::SetEditEngine (and not needed otherwise)
pEngine->SetUpdateMode( FALSE );
- // Attribute in EditEngine uebernehmen
+ // Attribute in EditEngine uebernehmen
const ScPatternAttr* pPattern = pDoc->GetPattern( aCursorPos.Col(),
aCursorPos.Row(),
aCursorPos.Tab() );
if (pPattern != pLastPattern)
{
- // Prozent-Format?
+ // Prozent-Format?
const SfxItemSet& rAttrSet = pPattern->GetItemSet();
const SfxPoolItem* pItem;
@@ -1903,18 +1903,18 @@ BOOL ScInputHandler::StartTable( sal_Unicode cTyped, BOOL bFromCommand )
else
bCellHasPercentFormat = FALSE; // Default: kein Prozent
- // Gueltigkeit angegeben?
+ // Gueltigkeit angegeben?
if ( SFX_ITEM_SET == rAttrSet.GetItemState( ATTR_VALIDDATA, TRUE, &pItem ) )
nValidation = ((const SfxUInt32Item*)pItem)->GetValue();
else
nValidation = 0;
- // EditEngine Defaults
+ // EditEngine Defaults
- // Hier auf keinen Fall SetParaAttribs, weil die EditEngine evtl.
- // schon gefuellt ist (bei Edit-Zellen).
- // SetParaAttribs wuerde dann den Inhalt aendern
+ // Hier auf keinen Fall SetParaAttribs, weil die EditEngine evtl.
+ // schon gefuellt ist (bei Edit-Zellen).
+ // SetParaAttribs wuerde dann den Inhalt aendern
//! ER 30.08.00 The SetDefaults is now (since MUST/src602
//! EditEngine changes) implemented as a SetParaAttribs.
@@ -1925,19 +1925,19 @@ BOOL ScInputHandler::StartTable( sal_Unicode cTyped, BOOL bFromCommand )
pLastPattern = pPattern;
bLastIsSymbol = pPattern->IsSymbolFont();
- // Background color must be known for automatic font color.
- // For transparent cell background, the document background color must be used.
+ // Background color must be known for automatic font color.
+ // For transparent cell background, the document background color must be used.
Color aBackCol = ((const SvxBrushItem&)
pPattern->GetItem( ATTR_BACKGROUND )).GetColor();
ScModule* pScMod = SC_MOD();
- // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
+ // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
if ( aBackCol.GetTransparency() > 0 ||
Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
aBackCol.SetColor( pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor );
pEngine->SetBackgroundColor( aBackCol );
- // Ausrichtung
+ // Ausrichtung
eAttrAdjust = (SvxCellHorJustify)((const SvxHorJustifyItem&)pPattern->
GetItem(ATTR_HOR_JUSTIFY)).GetValue();
@@ -1949,12 +1949,12 @@ BOOL ScInputHandler::StartTable( sal_Unicode cTyped, BOOL bFromCommand )
}
}
- // UpdateSpellSettings enables online spelling if needed
- // -> also call if attributes are unchanged
+ // UpdateSpellSettings enables online spelling if needed
+ // -> also call if attributes are unchanged
- UpdateSpellSettings( TRUE ); // uses pLastPattern
+ UpdateSpellSettings( TRUE ); // uses pLastPattern
- // Edit-Engine fuellen
+ // Edit-Engine fuellen
String aStr;
if (bTextValid)
@@ -1967,7 +1967,7 @@ BOOL ScInputHandler::StartTable( sal_Unicode cTyped, BOOL bFromCommand )
else
aStr = GetEditText(pEngine);
- if (aStr.Len() > 3 && // Matrix-Formel ?
+ if (aStr.Len() > 3 && // Matrix-Formel ?
aStr.GetChar(0) == '{' &&
aStr.GetChar(1) == '=' &&
aStr.GetChar(aStr.Len()-1) == '}')
@@ -1986,9 +1986,9 @@ BOOL ScInputHandler::StartTable( sal_Unicode cTyped, BOOL bFromCommand )
if ( ( aStr.GetChar(0) == '=' || aStr.GetChar(0) == '+' || aStr.GetChar(0) == '-' ) &&
!cTyped && !bCreatingFuncView )
- InitRangeFinder(aStr); // Formel wird editiert -> RangeFinder
+ InitRangeFinder(aStr); // Formel wird editiert -> RangeFinder
- bNewTable = TRUE; // -> PostEditView-Aufruf
+ bNewTable = TRUE; // -> PostEditView-Aufruf
}
else
{
@@ -1998,10 +1998,10 @@ BOOL ScInputHandler::StartTable( sal_Unicode cTyped, BOOL bFromCommand )
UpdateFormulaMode();
if ( pActiveViewSh && ( !bFromCommand || !bCommandErrorShown ) )
{
- // #97673# Prevent repeated error messages for the same cell from command events
- // (for keyboard events, multiple messages are wanted).
- // Set the flag before showing the error message because the command handler
- // for the next IME command may be called when showing the dialog.
+ // #97673# Prevent repeated error messages for the same cell from command events
+ // (for keyboard events, multiple messages are wanted).
+ // Set the flag before showing the error message because the command handler
+ // for the next IME command may be called when showing the dialog.
if ( bFromCommand )
bCommandErrorShown = TRUE;
@@ -2029,14 +2029,14 @@ void lcl_SetTopSelection( EditView* pEditView, ESelection& rSel )
xub_StrLen nParLen = pEngine->GetTextLen(rSel.nStartPara);
while (rSel.nStartPos > nParLen && rSel.nStartPara+1 < nCount)
{
- rSel.nStartPos -= nParLen + 1; // incl. Leerzeichen vom Umbruch
+ rSel.nStartPos -= nParLen + 1; // incl. Leerzeichen vom Umbruch
nParLen = pEngine->GetTextLen(++rSel.nStartPara);
}
nParLen = pEngine->GetTextLen(rSel.nEndPara);
while (rSel.nEndPos > nParLen && rSel.nEndPara+1 < nCount)
{
- rSel.nEndPos -= nParLen + 1; // incl. Leerzeichen vom Umbruch
+ rSel.nEndPos -= nParLen + 1; // incl. Leerzeichen vom Umbruch
nParLen = pEngine->GetTextLen(++rSel.nEndPara);
}
}
@@ -2072,8 +2072,8 @@ IMPL_LINK( ScInputHandler, ModifyHdl, void *, EMPTYARG )
if ( !bInOwnChange && ( eMode==SC_INPUT_TYPE || eMode==SC_INPUT_TABLE ) &&
pEngine && pEngine->GetUpdateMode() && pInputWin )
{
- // #102745# update input line from ModifyHdl for changes that are not
- // wrapped by DataChanging/DataChanged calls (like Drag&Drop)
+ // #102745# update input line from ModifyHdl for changes that are not
+ // wrapped by DataChanging/DataChanged calls (like Drag&Drop)
String aText = GetEditText(pEngine);
lcl_RemoveTabs(aText);
@@ -2082,9 +2082,9 @@ IMPL_LINK( ScInputHandler, ModifyHdl, void *, EMPTYARG )
return 0;
}
-BOOL ScInputHandler::DataChanging( sal_Unicode cTyped, BOOL bFromCommand ) // return TRUE = new view created
+BOOL ScInputHandler::DataChanging( sal_Unicode cTyped, BOOL bFromCommand ) // return TRUE = new view created
{
- bInOwnChange = TRUE; // disable ModifyHdl (reset in DataChanged)
+ bInOwnChange = TRUE; // disable ModifyHdl (reset in DataChanged)
if ( eMode == SC_INPUT_NONE )
return StartTable( cTyped, bFromCommand );
@@ -2101,13 +2101,13 @@ void ScInputHandler::DataChanged( BOOL bFromTopNotify )
if ( eMode == SC_INPUT_TOP && pTopView && !bFromTopNotify )
{
- // table EditEngine is formatted below, input line needs formatting after paste
- // #i20282# not when called from the input line's modify handler
+ // table EditEngine is formatted below, input line needs formatting after paste
+ // #i20282# not when called from the input line's modify handler
pTopView->GetEditEngine()->QuickFormatDoc( TRUE );
- // #i23720# QuickFormatDoc hides the cursor, but can't show it again because it
- // can't safely access the EditEngine's current view, so the cursor has to be
- // shown again here.
+ // #i23720# QuickFormatDoc hides the cursor, but can't show it again because it
+ // can't safely access the EditEngine's current view, so the cursor has to be
+ // shown again here.
pTopView->ShowCursor();
}
@@ -2115,12 +2115,12 @@ void ScInputHandler::DataChanged( BOOL bFromTopNotify )
bSelIsRef = FALSE;
if ( pRangeFindList && !bInRangeUpdate )
- RemoveRangeFinder(); // Attribute und Markierung loeschen
+ RemoveRangeFinder(); // Attribute und Markierung loeschen
- UpdateParenthesis(); // Hervorhebung der Klammern neu
+ UpdateParenthesis(); // Hervorhebung der Klammern neu
// ER 31.08.00 New SetDefaults sets ParaAttribs, don't clear them away ...
-// RemoveAdjust(); // #40255# harte Ausrichtungs-Attribute loeschen
+// RemoveAdjust(); // #40255# harte Ausrichtungs-Attribute loeschen
if (eMode==SC_INPUT_TYPE || eMode==SC_INPUT_TABLE)
{
@@ -2131,12 +2131,12 @@ void ScInputHandler::DataChanged( BOOL bFromTopNotify )
pInputWin->SetTextString(aText);
}
- // wenn der Cursor vor dem Absatzende steht, werden Teile rechts rausgeschoben
- // (unabhaengig von eMode) -> View anpassen!
- // wenn der Cursor am Ende steht, reicht der Status-Handler an der ViewData
+ // wenn der Cursor vor dem Absatzende steht, werden Teile rechts rausgeschoben
+ // (unabhaengig von eMode) -> View anpassen!
+ // wenn der Cursor am Ende steht, reicht der Status-Handler an der ViewData
- // #93767# first make sure the status handler is called now if the cursor
- // is outside the visible area
+ // #93767# first make sure the status handler is called now if the cursor
+ // is outside the visible area
pEngine->QuickFormatDoc();
EditView* pActiveView = pTopView ? pTopView : pTableView;
@@ -2144,10 +2144,10 @@ void ScInputHandler::DataChanged( BOOL bFromTopNotify )
{
ScViewData* pViewData = pActiveViewSh->GetViewData();
- BOOL bNeedGrow = ( nEditAdjust != SVX_ADJUST_LEFT ); // rechtsbuendig immer
+ BOOL bNeedGrow = ( nEditAdjust != SVX_ADJUST_LEFT ); // rechtsbuendig immer
if (!bNeedGrow)
{
- // Cursor vor dem Ende?
+ // Cursor vor dem Ende?
ESelection aSel = pActiveView->GetSelection();
aSel.Adjust();
bNeedGrow = ( aSel.nEndPos != pEngine->GetTextLen(aSel.nEndPara) );
@@ -2165,7 +2165,7 @@ void ScInputHandler::DataChanged( BOOL bFromTopNotify )
}
UpdateFormulaMode();
- bTextValid = FALSE; // Aenderungen sind nur in der Edit-Engine
+ bTextValid = FALSE; // Aenderungen sind nur in der Edit-Engine
bInOwnChange = FALSE;
}
@@ -2195,7 +2195,7 @@ void ScInputHandler::UpdateFormulaMode()
UpdateAutoCorrFlag();
}
}
- else // ausschalten
+ else // ausschalten
{
if (bFormulaMode)
{
@@ -2231,12 +2231,12 @@ void ScInputHandler::ShowRefFrame()
if (bFound)
{
- // Hier wird sich darauf verlassen, dass Activate synchron funktioniert
- // (dabei wird pActiveViewSh umgesetzt)
+ // Hier wird sich darauf verlassen, dass Activate synchron funktioniert
+ // (dabei wird pActiveViewSh umgesetzt)
- pRefViewSh->SetActive(); // Appear und SetViewFrame
+ pRefViewSh->SetActive(); // Appear und SetViewFrame
- // pLastState wird im NotifyChange aus dem Activate richtig gesetzt
+ // pLastState wird im NotifyChange aus dem Activate richtig gesetzt
}
else
{
@@ -2285,7 +2285,7 @@ void ScInputHandler::InvalidateAttribs()
//
-// --------------- public Methoden --------------------------------------------
+// --------------- public Methoden --------------------------------------------
//
void ScInputHandler::SetMode( ScInputMode eNewMode )
@@ -2304,7 +2304,7 @@ void ScInputHandler::SetMode( ScInputMode eNewMode )
return;
}
- bInOwnChange = TRUE; // disable ModifyHdl (reset below)
+ bInOwnChange = TRUE; // disable ModifyHdl (reset below)
ScInputMode eOldMode = eMode;
eMode = eNewMode;
@@ -2313,9 +2313,9 @@ void ScInputHandler::SetMode( ScInputMode eNewMode )
if (eMode==SC_INPUT_TOP || eMode==SC_INPUT_TABLE)
{
- if (eOldMode == SC_INPUT_NONE) // not when switching between modes
+ if (eOldMode == SC_INPUT_NONE) // not when switching between modes
{
- if (StartTable(0, FALSE)) // 0 = look at existing document content for text or number
+ if (StartTable(0, FALSE)) // 0 = look at existing document content for text or number
{
if (pActiveViewSh)
pActiveViewSh->GetViewData()->GetDocShell()->PostEditView( pEngine, aCursorPos );
@@ -2330,7 +2330,7 @@ void ScInputHandler::SetMode( ScInputMode eNewMode )
{
if ( eMode == SC_INPUT_TABLE && eOldMode == SC_INPUT_TOP )
{
- // Selektion bleibt
+ // Selektion bleibt
}
else
{
@@ -2361,7 +2361,7 @@ void ScInputHandler::SetMode( ScInputMode eNewMode )
//----------------------------------------------------------------------------------------
-// lcl_IsNumber - TRUE, wenn nur Ziffern (dann keine Autokorrektur)
+// lcl_IsNumber - TRUE, wenn nur Ziffern (dann keine Autokorrektur)
BOOL lcl_IsNumber(const String& rString)
{
@@ -2390,22 +2390,22 @@ void lcl_SelectionToEnd( EditView* pView )
void ScInputHandler::EnterHandler( BYTE nBlockMode )
{
- // #62806# Bei Makro-Aufrufen fuer Gueltigkeit kann Tod und Teufel passieren,
- // darum dafuer sorgen, dass EnterHandler nicht verschachtelt gerufen wird:
+ // #62806# Bei Makro-Aufrufen fuer Gueltigkeit kann Tod und Teufel passieren,
+ // darum dafuer sorgen, dass EnterHandler nicht verschachtelt gerufen wird:
if (bInEnterHandler) return;
bInEnterHandler = TRUE;
- bInOwnChange = TRUE; // disable ModifyHdl (reset below)
+ bInOwnChange = TRUE; // disable ModifyHdl (reset below)
ImplCreateEditEngine();
BOOL bMatrix = ( nBlockMode == SC_ENTER_MATRIX );
- SfxApplication* pSfxApp = SFX_APP();
- EditTextObject* pObject = NULL;
- ScPatternAttr* pCellAttrs = NULL;
- BOOL bAttrib = FALSE; // Formatierung vorhanden ?
- BOOL bForget = FALSE; // wegen Gueltigkeit streichen ?
+ SfxApplication* pSfxApp = SFX_APP();
+ EditTextObject* pObject = NULL;
+ ScPatternAttr* pCellAttrs = NULL;
+ BOOL bAttrib = FALSE; // Formatierung vorhanden ?
+ BOOL bForget = FALSE; // wegen Gueltigkeit streichen ?
String aString = GetEditText(pEngine);
EditView* pActiveView = pTopView ? pTopView : pTableView;
@@ -2421,19 +2421,19 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
}
if (pTopView)
- pTopView->CompleteAutoCorrect(); // #59759# CompleteAutoCorrect fuer beide Views
+ pTopView->CompleteAutoCorrect(); // #59759# CompleteAutoCorrect fuer beide Views
if (pTableView)
pTableView->CompleteAutoCorrect();
aString = GetEditText(pEngine);
}
lcl_RemoveTabs(aString);
- // Test, ob zulaessig (immer mit einfachem String)
+ // Test, ob zulaessig (immer mit einfachem String)
if ( bModified && nValidation && pActiveViewSh )
{
ScDocument* pDoc = pActiveViewSh->GetViewData()->GetDocument();
- const ScValidationData* pData = pDoc->GetValidationEntry( nValidation );
+ const ScValidationData* pData = pDoc->GetValidationEntry( nValidation );
if (pData && pData->HasErrMsg())
{
// #i67990# don't use pLastPattern in EnterHandler
@@ -2442,15 +2442,15 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
if (!bOk)
{
- if ( pActiveViewSh ) // falls aus MouseButtonDown gekommen
- pActiveViewSh->StopMarking(); // (die InfoBox verschluckt das MouseButtonUp)
+ if ( pActiveViewSh ) // falls aus MouseButtonDown gekommen
+ pActiveViewSh->StopMarking(); // (die InfoBox verschluckt das MouseButtonUp)
- //! es gibt noch Probleme, wenn die Eingabe durch Aktivieren einer
- //! anderen View ausgeloest wurde
+ //! es gibt noch Probleme, wenn die Eingabe durch Aktivieren einer
+ //! anderen View ausgeloest wurde
Window* pParent = Application::GetDefDialogParent();
if ( pData->DoError( pParent, aString, aCursorPos ) )
- bForget = TRUE; // Eingabe nicht uebernehmen
+ bForget = TRUE; // Eingabe nicht uebernehmen
}
}
}
@@ -2475,8 +2475,8 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
BOOL bSpellErrors = !bFormulaMode && pEngine->HasOnlineSpellErrors();
if ( bSpellErrors )
{
- // #i3820# If the spell checker flags numerical input as error,
- // it still has to be treated as number, not EditEngine object.
+ // #i3820# If the spell checker flags numerical input as error,
+ // it still has to be treated as number, not EditEngine object.
if ( pActiveViewSh )
{
@@ -2489,17 +2489,17 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
double nVal;
if ( pFormatter->IsNumberFormat( aString, nFormat, nVal ) )
{
- bSpellErrors = FALSE; // ignore the spelling errors
+ bSpellErrors = FALSE; // ignore the spelling errors
}
}
}
- // After RemoveAdjust, the EditView must not be repainted (has wrong font size etc).
- // SetUpdateMode must come after CompleteOnlineSpelling.
- // The view is hidden in any case below (Broadcast).
+ // After RemoveAdjust, the EditView must not be repainted (has wrong font size etc).
+ // SetUpdateMode must come after CompleteOnlineSpelling.
+ // The view is hidden in any case below (Broadcast).
pEngine->SetUpdateMode( FALSE );
- if ( bModified && !bForget ) // was wird eingeben (Text/Objekt) ?
+ if ( bModified && !bForget ) // was wird eingeben (Text/Objekt) ?
{
USHORT nParCnt = pEngine->GetParagraphCount();
if ( nParCnt == 0 )
@@ -2508,7 +2508,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
SfxItemSet aOldAttribs = pEngine->GetAttribs( aSel );
const SfxPoolItem* pItem = NULL;
- // find common (cell) attributes before RemoveAdjust
+ // find common (cell) attributes before RemoveAdjust
if ( pActiveViewSh )
{
@@ -2536,11 +2536,11 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
}
}
- // clear ParaAttribs (including adjustment)
+ // clear ParaAttribs (including adjustment)
RemoveAdjust();
- // check if EditObject is needed
+ // check if EditObject is needed
if ( bSpellErrors || nParCnt > 1 )
bAttrib = TRUE;
@@ -2553,7 +2553,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
bAttrib = TRUE;
else if (eState == SFX_ITEM_SET)
{
- // keep same items in EditEngine as in ScEditAttrTester
+ // keep same items in EditEngine as in ScEditAttrTester
if ( nId == EE_CHAR_ESCAPEMENT || nId == EE_CHAR_PAIRKERNING ||
nId == EE_CHAR_KERNING || nId == EE_CHAR_XMLATTRIBS )
{
@@ -2563,20 +2563,20 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
}
}
- // Feldbefehle enthalten?
+ // Feldbefehle enthalten?
SfxItemState eFieldState = aOldAttribs.GetItemState( EE_FEATURE_FIELD, FALSE );
if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET )
bAttrib = TRUE;
- // not converted characters?
+ // not converted characters?
SfxItemState eConvState = aOldAttribs.GetItemState( EE_FEATURE_NOTCONV, FALSE );
if ( eConvState == SFX_ITEM_DONTCARE || eConvState == SFX_ITEM_SET )
bAttrib = TRUE;
- // Formeln immer als Formeln erkennen (#38309#)
- // (der Test vorher ist trotzdem noetig wegen Zell-Attributen)
+ // Formeln immer als Formeln erkennen (#38309#)
+ // (der Test vorher ist trotzdem noetig wegen Zell-Attributen)
}
if (bMatrix)
@@ -2590,12 +2590,12 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
pEngine->SetControlWord( (nCtrl & ~EE_CNTRL_ALLOWBIGOBJS) | nWantBig );
pObject = pEngine->CreateTextObject();
}
- else if (bAutoComplete) // Gross-/Kleinschreibung anpassen
+ else if (bAutoComplete) // Gross-/Kleinschreibung anpassen
{
if (pColumnData)
pColumnData->GetExactMatch( aString );
- //! effizienter in der Liste suchen (ScUserList, nur einmal ToUpper)
+ //! effizienter in der Liste suchen (ScUserList, nur einmal ToUpper)
USHORT nIndex;
ScUserListData* pData = ScGlobal::GetUserList()->GetData(aString);
@@ -2604,9 +2604,9 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
}
}
- // don't rely on ShowRefFrame switching the active view synchronously
- // execute the function directly on the correct view's bindings instead
- // pRefViewSh is reset in ShowRefFrame - get pointer before ShowRefFrame call
+ // don't rely on ShowRefFrame switching the active view synchronously
+ // execute the function directly on the correct view's bindings instead
+ // pRefViewSh is reset in ShowRefFrame - get pointer before ShowRefFrame call
ScTabViewShell* pExecuteSh = pRefViewSh ? pRefViewSh : pActiveViewSh;
if (bFormulaMode)
@@ -2626,7 +2626,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
pInputWin->SetFormulaMode(FALSE);
UpdateAutoCorrFlag();
}
- pRefViewSh = NULL; // auch ohne FormulaMode wegen Funktions-AP
+ pRefViewSh = NULL; // auch ohne FormulaMode wegen Funktions-AP
DeleteRangeFinder();
ResetAutoPar();
@@ -2634,7 +2634,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
bModified = FALSE;
bSelIsRef = FALSE;
- eMode = SC_INPUT_NONE;
+ eMode = SC_INPUT_NONE;
StopInputWinEngine( TRUE );
// #123344# Text input (through number formats) or ApplySelectionPattern modify
@@ -2643,7 +2643,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
if (bOldMod && !bProtected && !bForget)
{
- // keine typographische Anfuehrungszeichen in Formeln
+ // keine typographische Anfuehrungszeichen in Formeln
if ( aString.GetChar(0) == '=' )
{
@@ -2697,7 +2697,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
rBindings.Execute( nId, aArgs );
}
- delete pLastState; // pLastState enthaelt noch den alten Text
+ delete pLastState; // pLastState enthaelt noch den alten Text
pLastState = NULL;
}
else
@@ -2705,7 +2705,7 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
if ( bOldMod && pExecuteSh && pCellAttrs && !bForget )
{
- // mit Eingabe zusammenfassen ?
+ // mit Eingabe zusammenfassen ?
pExecuteSh->ApplySelectionPattern( *pCellAttrs, TRUE, TRUE );
pExecuteSh->AdjustBlockHeight();
}
@@ -2725,15 +2725,15 @@ void ScInputHandler::EnterHandler( BYTE nBlockMode )
void ScInputHandler::CancelHandler()
{
- bInOwnChange = TRUE; // disable ModifyHdl (reset below)
+ bInOwnChange = TRUE; // disable ModifyHdl (reset below)
ImplCreateEditEngine();
bModified = FALSE;
- // don't rely on ShowRefFrame switching the active view synchronously
- // execute the function directly on the correct view's bindings instead
- // pRefViewSh is reset in ShowRefFrame - get pointer before ShowRefFrame call
+ // don't rely on ShowRefFrame switching the active view synchronously
+ // execute the function directly on the correct view's bindings instead
+ // pRefViewSh is reset in ShowRefFrame - get pointer before ShowRefFrame call
ScTabViewShell* pExecuteSh = pRefViewSh ? pRefViewSh : pActiveViewSh;
if (bFormulaMode)
@@ -2751,7 +2751,7 @@ void ScInputHandler::CancelHandler()
pInputWin->SetFormulaMode(FALSE);
UpdateAutoCorrFlag();
}
- pRefViewSh = NULL; // auch ohne FormulaMode wegen Funktions-AP
+ pRefViewSh = NULL; // auch ohne FormulaMode wegen Funktions-AP
DeleteRangeFinder();
ResetAutoPar();
@@ -2760,11 +2760,11 @@ void ScInputHandler::CancelHandler()
if (pExecuteSh)
pExecuteSh->StopEditShell();
- aCursorPos.Set(MAXCOL+1,0,0); // Flag, dass ungueltig
+ aCursorPos.Set(MAXCOL+1,0,0); // Flag, dass ungueltig
pEngine->SetText(String());
if ( !pLastState && pExecuteSh )
- pExecuteSh->UpdateInputHandler( TRUE ); // Status neu holen
+ pExecuteSh->UpdateInputHandler( TRUE ); // Status neu holen
else
NotifyChange( pLastState, TRUE );
@@ -2776,7 +2776,7 @@ void ScInputHandler::CancelHandler()
BOOL ScInputHandler::IsModalMode( SfxObjectShell* pDocSh )
{
- // Referenzen auf unbenanntes Dokument gehen nicht
+ // Referenzen auf unbenanntes Dokument gehen nicht
return bFormulaMode && pRefViewSh
&& pRefViewSh->GetViewData()->GetDocument()->GetDocumentShell() != pDocSh
@@ -2788,9 +2788,9 @@ void ScInputHandler::AddRefEntry()
const sal_Unicode cSep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
UpdateActiveView();
if (!pTableView && !pTopView)
- return; // z.B. FillMode
+ return; // z.B. FillMode
- DataChanging(); // kann nicht neu sein
+ DataChanging(); // kann nicht neu sein
RemoveSelection();
if (pTableView)
@@ -2810,26 +2810,26 @@ void ScInputHandler::SetReference( const ScRange& rRef, ScDocument* pDoc )
if (bOtherDoc)
if (!pDoc->GetDocumentShell()->HasName())
{
- // Referenzen auf unbenanntes Dokument gehen nicht
- // (SetReference sollte dann auch nicht gerufen werden)
+ // Referenzen auf unbenanntes Dokument gehen nicht
+ // (SetReference sollte dann auch nicht gerufen werden)
return;
}
UpdateActiveView();
if (!pTableView && !pTopView)
- return; // z.B. FillMode
+ return; // z.B. FillMode
- // nie das "=" ueberschreiben!
+ // nie das "=" ueberschreiben!
EditView* pActiveView = pTopView ? pTopView : pTableView;
ESelection aSel = pActiveView->GetSelection();
aSel.Adjust();
if ( aSel.nStartPara == 0 && aSel.nStartPos == 0 )
return;
- DataChanging(); // kann nicht neu sein
+ DataChanging(); // kann nicht neu sein
- // Selektion umdrehen, falls rueckwaerts (noetig ???)
+ // Selektion umdrehen, falls rueckwaerts (noetig ???)
if (pTableView)
{
@@ -2850,18 +2850,18 @@ void ScInputHandler::SetReference( const ScRange& rRef, ScDocument* pDoc )
}
}
- // String aus Referenz erzeugen
+ // String aus Referenz erzeugen
String aRefStr;
const ScAddress::Details aAddrDetails( pDoc, aCursorPos );
if (bOtherDoc)
{
- // Referenz auf anderes Dokument
+ // Referenz auf anderes Dokument
DBG_ASSERT(rRef.aStart.Tab()==rRef.aEnd.Tab(), "nStartTab!=nEndTab");
String aTmp;
- rRef.Format( aTmp, SCA_VALID|SCA_TAB_3D, pDoc, aAddrDetails ); // immer 3d
+ rRef.Format( aTmp, SCA_VALID|SCA_TAB_3D, pDoc, aAddrDetails ); // immer 3d
SfxObjectShell* pObjSh = pDoc->GetDocumentShell();
// #i75893# convert escaped URL of the document to something user friendly
@@ -2905,9 +2905,9 @@ void ScInputHandler::InsertFunction( const String& rFuncName, BOOL bAddPar )
UpdateActiveView();
if (!pTableView && !pTopView)
- return; // z.B. FillMode
+ return; // z.B. FillMode
- DataChanging(); // kann nicht neu sein
+ DataChanging(); // kann nicht neu sein
String aText = rFuncName;
if (bAddPar)
@@ -2952,9 +2952,9 @@ void ScInputHandler::ClearText()
UpdateActiveView();
if (!pTableView && !pTopView)
- return; // z.B. FillMode
+ return; // z.B. FillMode
- DataChanging(); // darf nicht neu sein
+ DataChanging(); // darf nicht neu sein
String aEmpty;
if (pTableView)
@@ -2983,11 +2983,11 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
USHORT nModi = aCode.GetModifier();
BOOL bShift = aCode.IsShift();
BOOL bControl = aCode.IsMod1();
- BOOL bAlt = aCode.IsMod2();
+ BOOL bAlt = aCode.IsMod2();
USHORT nCode = aCode.GetCode();
sal_Unicode nChar = rKEvt.GetCharCode();
- // Alt-Return is accepted, everything else with ALT, or CTRL-TAB are not:
+ // Alt-Return is accepted, everything else with ALT, or CTRL-TAB are not:
if (( bAlt && !bControl && nCode != KEY_RETURN ) ||
( bControl && aCode.GetCode() == KEY_TAB ))
return FALSE;
@@ -3033,13 +3033,13 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
{
if ( pFormulaData && nTipVisible && nAutoPos != SCPOS_INVALID )
{
- // blaettern
+ // blaettern
NextFormulaEntry( bShift );
}
else if ( pColumnData && bUseTab && nAutoPos != SCPOS_INVALID )
{
- // in den Eintraegen der AutoEingabe blaettern
+ // in den Eintraegen der AutoEingabe blaettern
NextAutoEntry( bShift );
}
@@ -3047,8 +3047,8 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
{
EnterHandler();
- // TabKeyInput gibt auf manchen Rechnern unter W95 Stackueberlaeufe,
- // darum direkter Aufruf:
+ // TabKeyInput gibt auf manchen Rechnern unter W95 Stackueberlaeufe,
+ // darum direkter Aufruf:
if (pActiveViewSh)
pActiveViewSh->FindNextUnprot( bShift );
}
@@ -3083,11 +3083,11 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
break;
}
- // Cursortasten nur ausfuehren, wenn schon im Edit-Modus
- // z.B. wegen Shift-Ctrl-PageDn (ist nicht als Accelerator definiert)
+ // Cursortasten nur ausfuehren, wenn schon im Edit-Modus
+ // z.B. wegen Shift-Ctrl-PageDn (ist nicht als Accelerator definiert)
BOOL bCursorKey = EditEngine::DoesKeyMoveCursor(rKEvt);
- BOOL bInsKey = ( nCode == KEY_INSERT && !nModi ); // Insert wie Cursortasten behandeln
+ BOOL bInsKey = ( nCode == KEY_INSERT && !nModi ); // Insert wie Cursortasten behandeln
if ( !bUsed && !bSkip && ( bDoEnter || EditEngine::DoesKeyChangeText(rKEvt) ||
( eMode != SC_INPUT_NONE && ( bCursorKey || bInsKey ) ) ) )
{
@@ -3103,11 +3103,11 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
UpdateActiveView();
BOOL bNewView = DataChanging( nChar );
- if (bProtected) // Zelle geschuetzt?
- bUsed = TRUE; // Key-Event nicht weiterleiten
- else // Aenderungen erlaubt
+ if (bProtected) // Zelle geschuetzt?
+ bUsed = TRUE; // Key-Event nicht weiterleiten
+ else // Aenderungen erlaubt
{
- if (bNewView ) // neu anlegen
+ if (bNewView ) // neu anlegen
{
if (pActiveViewSh)
pActiveViewSh->GetViewData()->GetDocShell()->PostEditView( pEngine, aCursorPos );
@@ -3124,7 +3124,7 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
{
pTableView->GetEditEngine()->SetText( aStrLoP );
if ( aStrLoP.Len() )
- pTableView->SetSelection( ESelection(0,0, 0,0) ); // before the '%'
+ pTableView->SetSelection( ESelection(0,0, 0,0) ); // before the '%'
// don't call SetSelection if the string is empty anyway,
// to avoid breaking the bInitial handling in ScViewData::EditGrowY
@@ -3133,7 +3133,7 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
{
pTopView->GetEditEngine()->SetText( aStrLoP );
if ( aStrLoP.Len() )
- pTopView->SetSelection( ESelection(0,0, 0,0) ); // before the '%'
+ pTopView->SetSelection( ESelection(0,0, 0,0) ); // before the '%'
}
}
SyncViews();
@@ -3141,7 +3141,7 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
if (pTableView || pTopView)
{
-// pActiveView->SetEditEngineUpdateMode(TRUE); //! gibt Muell !!!!
+// pActiveView->SetEditEngineUpdateMode(TRUE); //! gibt Muell !!!!
if (bDoEnter)
{
@@ -3167,16 +3167,16 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
bUsed = TRUE;
}
- // Auto-Eingabe:
+ // Auto-Eingabe:
if ( bUsed && bAutoComplete )
{
bUseTab = FALSE;
- nAutoPos = SCPOS_INVALID; // do not search further
+ nAutoPos = SCPOS_INVALID; // do not search further
KeyFuncType eFunc = rKEvt.GetKeyCode().GetFunction();
- if ( nChar && nChar != 8 && nChar != 127 && // no 'backspace', no 'delete'
- KEYFUNC_CUT != eFunc) // and no 'CTRL-X'
+ if ( nChar && nChar != 8 && nChar != 127 && // no 'backspace', no 'delete'
+ KEYFUNC_CUT != eFunc) // and no 'CTRL-X'
{
if (bFormulaMode)
UseFormulaData();
@@ -3185,8 +3185,8 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
}
}
- // when the selection is changed manually or an opening parenthesis
- // is typed, stop overwriting parentheses
+ // when the selection is changed manually or an opening parenthesis
+ // is typed, stop overwriting parentheses
if ( bUsed && nChar == '(' )
ResetAutoPar();
@@ -3202,8 +3202,8 @@ BOOL ScInputHandler::KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit /* = FALSE
}
}
- DataChanged(); // ruft auch UpdateParenthesis()
- InvalidateAttribs(); //! in DataChanged ?
+ DataChanged(); // ruft auch UpdateParenthesis()
+ InvalidateAttribs(); //! in DataChanged ?
}
}
@@ -3219,8 +3219,8 @@ BOOL ScInputHandler::InputCommand( const CommandEvent& rCEvt, BOOL bForce )
if ( rCEvt.GetCommand() == COMMAND_CURSORPOS )
{
- // #90346# for COMMAND_CURSORPOS, do as little as possible, because
- // with remote VCL, even a ShowCursor will generate another event.
+ // #90346# for COMMAND_CURSORPOS, do as little as possible, because
+ // with remote VCL, even a ShowCursor will generate another event.
if ( eMode != SC_INPUT_NONE )
{
UpdateActiveView();
@@ -3228,7 +3228,7 @@ BOOL ScInputHandler::InputCommand( const CommandEvent& rCEvt, BOOL bForce )
{
if (pTableView)
pTableView->Command( rCEvt );
- else if (pTopView) // call only once
+ else if (pTopView) // call only once
pTopView->Command( rCEvt );
bUsed = TRUE;
}
@@ -3256,11 +3256,11 @@ BOOL ScInputHandler::InputCommand( const CommandEvent& rCEvt, BOOL bForce )
UpdateActiveView();
BOOL bNewView = DataChanging( 0, TRUE );
- if (bProtected) // cell protected
- bUsed = TRUE; // event is used
- else // changes allowed
+ if (bProtected) // cell protected
+ bUsed = TRUE; // event is used
+ else // changes allowed
{
- if (bNewView) // create new edit view
+ if (bNewView) // create new edit view
{
if (pActiveViewSh)
pActiveViewSh->GetViewData()->GetDocShell()->PostEditView( pEngine, aCursorPos );
@@ -3294,7 +3294,7 @@ BOOL ScInputHandler::InputCommand( const CommandEvent& rCEvt, BOOL bForce )
if ( rCEvt.GetCommand() == COMMAND_ENDEXTTEXTINPUT )
{
- // AutoInput after ext text input
+ // AutoInput after ext text input
nAutoPos = SCPOS_INVALID;
if (bFormulaMode)
@@ -3304,8 +3304,8 @@ BOOL ScInputHandler::InputCommand( const CommandEvent& rCEvt, BOOL bForce )
}
}
- DataChanged(); // calls UpdateParenthesis()
- InvalidateAttribs(); //! in DataChanged ?
+ DataChanged(); // calls UpdateParenthesis()
+ InvalidateAttribs(); //! in DataChanged ?
}
}
@@ -3320,8 +3320,8 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
BOOL bForce, ScTabViewShell* pSourceSh,
BOOL bStopEditing)
{
- // #62806# Wenn der Aufruf aus einem Makro-Aufruf im EnterHandler kommt,
- // gleich abbrechen und nicht den Status durcheinander bringen
+ // #62806# Wenn der Aufruf aus einem Makro-Aufruf im EnterHandler kommt,
+ // gleich abbrechen und nicht den Status durcheinander bringen
if (bInEnterHandler)
return;
@@ -3331,9 +3331,9 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
if (bRepeat && !bForce)
return;
- bInOwnChange = TRUE; // disable ModifyHdl (reset below)
+ bInOwnChange = TRUE; // disable ModifyHdl (reset below)
- if ( pState && !pLastState ) // wieder enablen
+ if ( pState && !pLastState ) // wieder enablen
bForce = TRUE;
BOOL bHadObject = pLastState && pLastState->GetEditData();
@@ -3360,8 +3360,8 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
{
BOOL bIgnore = FALSE;
- // hier auch fremde Referenzeingabe beruecksichtigen (z.B. Funktions-AP),
- // FormEditData falls gerade von der Hilfe auf Calc umgeschaltet wird:
+ // hier auch fremde Referenzeingabe beruecksichtigen (z.B. Funktions-AP),
+ // FormEditData falls gerade von der Hilfe auf Calc umgeschaltet wird:
if ( !bFormulaMode && !pScMod->IsFormulaMode() && !pScMod->GetFormEditData() )
{
@@ -3378,15 +3378,15 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
if ( !bIgnore /* || bRepeat */ )
{
- const ScAddress& rSPos = pState->GetStartPos();
- const ScAddress& rEPos = pState->GetEndPos();
- const EditTextObject* pData = pState->GetEditData();
- String aString = pState->GetString();
- BOOL bTxtMod = FALSE;
+ const ScAddress& rSPos = pState->GetStartPos();
+ const ScAddress& rEPos = pState->GetEndPos();
+ const EditTextObject* pData = pState->GetEditData();
+ String aString = pState->GetString();
+ BOOL bTxtMod = FALSE;
ScDocShell* pDocSh = pActiveViewSh->GetViewData()->GetDocShell();
ScDocument* pDoc = pDocSh->GetDocument();
- aCursorPos = pState->GetPos();
+ aCursorPos = pState->GetPos();
if ( pData /* || bRepeat */ )
bTxtMod = TRUE;
@@ -3410,26 +3410,26 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
else
{
aCurrentText = aString;
- bTextValid = TRUE; //! erst nur als String merken
+ bTextValid = TRUE; //! erst nur als String merken
}
if ( pInputWin )
pInputWin->SetTextString(aString);
}
- if ( pInputWin ) // Bereichsanzeige
+ if ( pInputWin ) // Bereichsanzeige
{
String aPosStr;
const ScAddress::Details aAddrDetails( pDoc, aCursorPos );
- // Ist der Bereich ein Name?
- //! per Timer suchen ???
+ // Ist der Bereich ein Name?
+ //! per Timer suchen ???
if ( pActiveViewSh )
pActiveViewSh->GetViewData()->GetDocument()->
GetRangeAtBlock( ScRange( rSPos, rEPos ), &aPosStr );
- if ( !aPosStr.Len() ) // kein Name -> formatieren
+ if ( !aPosStr.Len() ) // kein Name -> formatieren
{
USHORT nFlags = 0;
if( aAddrDetails.eConv == formula::FormulaGrammar::CONV_XL_R1C1 )
@@ -3451,9 +3451,9 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
if (bStopEditing)
SFX_APP()->Broadcast( SfxSimpleHint( FID_KILLEDITVIEW ) );
- // As long as the content is not edited, turn off online spelling.
- // Online spelling is turned back on in StartTable, after setting
- // the right language from cell attributes.
+ // As long as the content is not edited, turn off online spelling.
+ // Online spelling is turned back on in StartTable, after setting
+ // the right language from cell attributes.
ULONG nCntrl = pEngine->GetControlWord();
if ( nCntrl & EE_CNTRL_ONLINESPELLING )
@@ -3467,12 +3467,12 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
}
}
-// bProtected = FALSE;
+// bProtected = FALSE;
if ( pInputWin)
{
- if(!pScMod->IsFormulaMode()&& !pScMod->IsRefDialogOpen()) //BugID 54702
- { //Wenn RefDialog offen, dann nicht enablen
+ if(!pScMod->IsFormulaMode()&& !pScMod->IsRefDialogOpen()) //BugID 54702
+ { //Wenn RefDialog offen, dann nicht enablen
if ( !pInputWin->IsEnabled())
{
pInputWin->Enable();
@@ -3483,9 +3483,9 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
}
}
else if(pScMod->IsRefDialogOpen())
- { // Da jedes Dokument eigenes InputWin hat, sollte
- if ( !pDelayTimer ) // nochmals Timer gestartet werden, da sonst Ein-
- { // gabezeile evt. noch aktiv ist.
+ { // Da jedes Dokument eigenes InputWin hat, sollte
+ if ( !pDelayTimer ) // nochmals Timer gestartet werden, da sonst Ein-
+ { // gabezeile evt. noch aktiv ist.
pDelayTimer = new Timer;
pDelayTimer->SetTimeout( 500 ); // 100ms Verzoegerung
pDelayTimer->SetTimeoutHdl( LINK( this, ScInputHandler, DelayTimer ) );
@@ -3537,7 +3537,7 @@ IMPL_LINK( ScInputHandler, DelayTimer, Timer*, pTimer )
if ( NULL == pLastState || SC_MOD()->IsFormulaMode() || SC_MOD()->IsRefDialogOpen())
{
- //! new method at ScModule to query if function autopilot is open
+ //! new method at ScModule to query if function autopilot is open
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
if ( pViewFrm && pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) )
@@ -3548,9 +3548,9 @@ IMPL_LINK( ScInputHandler, DelayTimer, Timer*, pTimer )
pInputWin->Disable();
}
}
- else if ( !bFormulaMode ) // #39210# Formel auch z.B. bei Hilfe behalten
+ else if ( !bFormulaMode ) // #39210# Formel auch z.B. bei Hilfe behalten
{
- bInOwnChange = TRUE; // disable ModifyHdl (reset below)
+ bInOwnChange = TRUE; // disable ModifyHdl (reset below)
pActiveViewSh = NULL;
pEngine->SetText( EMPTY_STRING );
@@ -3572,9 +3572,9 @@ void ScInputHandler::InputSelection( EditView* pView )
{
SyncViews( pView );
ShowTipCursor();
- UpdateParenthesis(); // Selektion geaendert -> Klammer-Hervorhebung neu
+ UpdateParenthesis(); // Selektion geaendert -> Klammer-Hervorhebung neu
- // when the selection is changed manually, stop overwriting parentheses
+ // when the selection is changed manually, stop overwriting parentheses
ResetAutoPar();
}
@@ -3587,11 +3587,11 @@ void ScInputHandler::InputChanged( EditView* pView, BOOL bFromNotify )
// #i20282# DataChanged needs to know if this is from the input line's modify handler
BOOL bFromTopNotify = ( bFromNotify && pView == pTopView );
- BOOL bNewView = DataChanging(); //! kann das hier ueberhaupt sein?
- aCurrentText = pView->GetEditEngine()->GetText(); // auch den String merken
+ BOOL bNewView = DataChanging(); //! kann das hier ueberhaupt sein?
+ aCurrentText = pView->GetEditEngine()->GetText(); // auch den String merken
pEngine->SetText( aCurrentText );
DataChanged( bFromTopNotify );
- bTextValid = TRUE; // wird in DataChanged auf FALSE gesetzt
+ bTextValid = TRUE; // wird in DataChanged auf FALSE gesetzt
if ( pActiveViewSh )
{
@@ -3610,7 +3610,7 @@ const String& ScInputHandler::GetEditString()
{
if (pEngine)
{
- aCurrentText = pEngine->GetText(); // immer neu aus Engine
+ aCurrentText = pEngine->GetText(); // immer neu aus Engine
bTextValid = TRUE;
}
@@ -3631,31 +3631,31 @@ BOOL ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine )
BOOL bRet = FALSE;
if (pEngine)
{
- // Feldbefehle enthalten?
+ // Feldbefehle enthalten?
USHORT nParCnt = pEngine->GetParagraphCount();
SfxItemSet aSet = pEngine->GetAttribs( ESelection(0,0,nParCnt,0) );
SfxItemState eFieldState = aSet.GetItemState( EE_FEATURE_FIELD, FALSE );
if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET )
{
- // Inhalt kopieren
+ // Inhalt kopieren
EditTextObject* pObj = pEngine->CreateTextObject();
rDestEngine.SetText(*pObj);
delete pObj;
- // Attribute loeschen
+ // Attribute loeschen
for (USHORT i=0; i<nParCnt; i++)
rDestEngine.QuickRemoveCharAttribs( i );
- // Absaetze zusammenfassen
+ // Absaetze zusammenfassen
while ( nParCnt > 1 )
{
xub_StrLen nLen = rDestEngine.GetTextLen( (USHORT)0 );
ESelection aSel( 0,nLen, 1,0 );
- rDestEngine.QuickInsertText( ' ', aSel ); // Umbruch durch Space ersetzen
+ rDestEngine.QuickInsertText( ' ', aSel ); // Umbruch durch Space ersetzen
--nParCnt;
}
@@ -3681,7 +3681,7 @@ void ScInputHandler::InputGetSelection( xub_StrLen& rStart, xub_StrLen& rEnd )
EditView* ScInputHandler::GetFuncEditView()
{
- UpdateActiveView(); // wegen pTableView
+ UpdateActiveView(); // wegen pTableView
EditView* pView = NULL;
if ( pInputWin )
@@ -3693,7 +3693,7 @@ EditView* ScInputHandler::GetFuncEditView()
{
if ( eMode != SC_INPUT_TABLE )
{
- bCreatingFuncView = TRUE; // RangeFinder nicht anzeigen
+ bCreatingFuncView = TRUE; // RangeFinder nicht anzeigen
SetMode( SC_INPUT_TABLE );
bCreatingFuncView = FALSE;
if ( pTableView )
@@ -3748,7 +3748,7 @@ void ScInputHandler::InputReplaceSelection( const String& rStr )
if (pView)
{
pView->SetEditEngineUpdateMode( FALSE );
-// pView->InsertText( rStr, TRUE );
+// pView->InsertText( rStr, TRUE );
pView->GetEditEngine()->SetText( aFormText );
pView->SetSelection( ESelection(0,nFormSelStart, 0,nFormSelEnd) );
pView->SetEditEngineUpdateMode( TRUE );
@@ -3760,11 +3760,11 @@ void ScInputHandler::InputReplaceSelection( const String& rStr )
String ScInputHandler::InputGetFormulaStr()
{
- return aFormText; //! eigene Membervariable?
+ return aFormText; //! eigene Membervariable?
}
//========================================================================
-// ScInputHdlState
+// ScInputHdlState
//========================================================================
ScInputHdlState::ScInputHdlState( const ScAddress& rCurPos,
@@ -3772,18 +3772,18 @@ ScInputHdlState::ScInputHdlState( const ScAddress& rCurPos,
const ScAddress& rEndPos,
const String& rString,
const EditTextObject* pData )
- : aCursorPos ( rCurPos ),
- aStartPos ( rStartPos ),
- aEndPos ( rEndPos ),
- aString ( rString ),
- pEditData ( pData ? pData->Clone() : NULL )
+ : aCursorPos ( rCurPos ),
+ aStartPos ( rStartPos ),
+ aEndPos ( rEndPos ),
+ aString ( rString ),
+ pEditData ( pData ? pData->Clone() : NULL )
{
}
//------------------------------------------------------------------------
ScInputHdlState::ScInputHdlState( const ScInputHdlState& rCpy )
- : pEditData ( NULL )
+ : pEditData ( NULL )
{
*this = rCpy;
}
@@ -3799,10 +3799,10 @@ ScInputHdlState::~ScInputHdlState()
int ScInputHdlState::operator==( const ScInputHdlState& r ) const
{
- return ( (aStartPos == r.aStartPos)
- && (aEndPos == r.aEndPos)
- && (aCursorPos == r.aCursorPos)
- && (aString == r.aString)
+ return ( (aStartPos == r.aStartPos)
+ && (aEndPos == r.aEndPos)
+ && (aCursorPos == r.aCursorPos)
+ && (aString == r.aString)
&& ScGlobal::EETextObjEqual( pEditData, r.pEditData ) );
}
@@ -3812,11 +3812,11 @@ ScInputHdlState& ScInputHdlState::operator=( const ScInputHdlState& r )
{
delete pEditData;
- aCursorPos = r.aCursorPos;
- aStartPos = r.aStartPos;
- aEndPos = r.aEndPos;
- aString = r.aString;
- pEditData = r.pEditData ? r.pEditData->Clone() : NULL;
+ aCursorPos = r.aCursorPos;
+ aStartPos = r.aStartPos;
+ aEndPos = r.aEndPos;
+ aString = r.aString;
+ pEditData = r.pEditData ? r.pEditData->Clone() : NULL;
return *this;
}
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 2cabe7f9f2d6..2a832cdec8b1 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/event.hxx>
#include <sfx2/imgmgr.hxx>
-#include <stdlib.h> // qsort
+#include <stdlib.h> // qsort
#include <editeng/scriptspaceitem.hxx>
#include <editeng/scripttypeitem.hxx>
#include <vcl/cursor.hxx>
@@ -75,9 +75,9 @@
#include "AccessibleEditObject.hxx"
#include "AccessibleText.hxx"
-#define TEXT_STARTPOS 3
-#define THESIZE 1000000 //!!! langt... :-)
-#define TBX_WINDOW_HEIGHT 22 // in Pixeln - fuer alle Systeme gleich?
+#define TEXT_STARTPOS 3
+#define THESIZE 1000000 //!!! langt... :-)
+#define TBX_WINDOW_HEIGHT 22 // in Pixeln - fuer alle Systeme gleich?
enum ScNameInputType
{
@@ -94,14 +94,14 @@ enum ScNameInputType
//==================================================================
-// class ScInputWindowWrapper
+// class ScInputWindowWrapper
//==================================================================
SFX_IMPL_CHILDWINDOW(ScInputWindowWrapper,FID_INPUTLINE_STATUS)
ScInputWindowWrapper::ScInputWindowWrapper( Window* pParentP,
- USHORT nId,
- SfxBindings* pBindings,
+ USHORT nId,
+ SfxBindings* pBindings,
SfxChildWinInfo* /* pInfo */ )
: SfxChildWindow( pParentP, nId )
{
@@ -116,7 +116,7 @@ ScInputWindowWrapper::ScInputWindowWrapper( Window* pParentP,
pBindings->Invalidate( FID_TOGGLEINPUTLINE );
}
-// GetInfo fliegt wieder raus, wenn es ein SFX_IMPL_TOOLBOX gibt !!!!
+// GetInfo fliegt wieder raus, wenn es ein SFX_IMPL_TOOLBOX gibt !!!!
SfxChildWinInfo __EXPORT ScInputWindowWrapper::GetInfo() const
{
@@ -129,7 +129,7 @@ SfxChildWinInfo __EXPORT ScInputWindowWrapper::GetInfo() const
#define IMAGE(id) pImgMgr->SeekImage(id, bHC)
//==================================================================
-// class ScInputWindow
+// class ScInputWindow
//==================================================================
ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) :
@@ -142,15 +142,15 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) :
#endif
aWndPos ( this ),
aTextWindow ( this ),
- pInputHdl ( NULL ),
+ pInputHdl ( NULL ),
pBindings ( pBind ),
- aTextOk ( ScResId( SCSTR_QHELP_BTNOK ) ), // nicht immer neu aus Resource
- aTextCancel ( ScResId( SCSTR_QHELP_BTNCANCEL ) ),
- aTextSum ( ScResId( SCSTR_QHELP_BTNSUM ) ),
- aTextEqual ( ScResId( SCSTR_QHELP_BTNEQUAL ) ),
+ aTextOk ( ScResId( SCSTR_QHELP_BTNOK ) ), // nicht immer neu aus Resource
+ aTextCancel ( ScResId( SCSTR_QHELP_BTNCANCEL ) ),
+ aTextSum ( ScResId( SCSTR_QHELP_BTNSUM ) ),
+ aTextEqual ( ScResId( SCSTR_QHELP_BTNEQUAL ) ),
bIsOkCancelMode ( FALSE )
{
- ScModule* pScMod = SC_MOD();
+ ScModule* pScMod = SC_MOD();
SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod );
// #i73615# don't rely on SfxViewShell::Current while constructing the input line
@@ -168,34 +168,34 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) :
BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
// Positionsfenster, 3 Buttons, Eingabefenster
- InsertWindow ( 1, &aWndPos, 0, 0 );
- InsertSeparator ( 1 );
+ InsertWindow ( 1, &aWndPos, 0, 0 );
+ InsertSeparator ( 1 );
InsertItem ( SID_INPUT_FUNCTION, IMAGE( SID_INPUT_FUNCTION ), 0, 2 );
- InsertItem ( SID_INPUT_SUM, IMAGE( SID_INPUT_SUM ), 0, 3 );
- InsertItem ( SID_INPUT_EQUAL, IMAGE( SID_INPUT_EQUAL ), 0, 4 );
- InsertSeparator ( 5 );
+ InsertItem ( SID_INPUT_SUM, IMAGE( SID_INPUT_SUM ), 0, 3 );
+ InsertItem ( SID_INPUT_EQUAL, IMAGE( SID_INPUT_EQUAL ), 0, 4 );
+ InsertSeparator ( 5 );
InsertWindow ( 7, &aTextWindow, 0, 6 );
- aWndPos .SetQuickHelpText( ScResId( SCSTR_QHELP_POSWND ) );
- aWndPos .SetHelpId ( HID_INSWIN_POS );
+ aWndPos .SetQuickHelpText( ScResId( SCSTR_QHELP_POSWND ) );
+ aWndPos .SetHelpId ( HID_INSWIN_POS );
aTextWindow.SetQuickHelpText( ScResId( SCSTR_QHELP_INPUTWND ) );
- aTextWindow.SetHelpId ( HID_INSWIN_INPUT );
+ aTextWindow.SetHelpId ( HID_INSWIN_INPUT );
- // kein SetHelpText, die Hilfetexte kommen aus der Hilfe
+ // kein SetHelpText, die Hilfetexte kommen aus der Hilfe
SetItemText ( SID_INPUT_FUNCTION, ScResId( SCSTR_QHELP_BTNCALC ) );
- SetHelpId ( SID_INPUT_FUNCTION, HID_INSWIN_CALC );
+ SetHelpId ( SID_INPUT_FUNCTION, HID_INSWIN_CALC );
SetItemText ( SID_INPUT_SUM, aTextSum );
- SetHelpId ( SID_INPUT_SUM, HID_INSWIN_SUMME );
+ SetHelpId ( SID_INPUT_SUM, HID_INSWIN_SUMME );
SetItemText ( SID_INPUT_EQUAL, aTextEqual );
- SetHelpId ( SID_INPUT_EQUAL, HID_INSWIN_FUNC );
+ SetHelpId ( SID_INPUT_EQUAL, HID_INSWIN_FUNC );
- SetHelpId( HID_SC_INPUTWIN ); // fuer die ganze Eingabezeile
+ SetHelpId( HID_SC_INPUTWIN ); // fuer die ganze Eingabezeile
- aWndPos .Show();
- aTextWindow .Show();
+ aWndPos .Show();
+ aTextWindow .Show();
pInputHdl = SC_MOD()->GetInputHdl( pViewSh, FALSE ); // use own handler even if ref-handler is set
if (pInputHdl)
@@ -203,21 +203,21 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) :
if ( pInputHdl && pInputHdl->GetFormString().Len() )
{
- // Umschalten waehrend der Funktionsautopilot aktiv ist
- // -> Inhalt des Funktionsautopiloten wieder anzeigen
- //! auch Selektion (am InputHdl gemerkt) wieder anzeigen
+ // Umschalten waehrend der Funktionsautopilot aktiv ist
+ // -> Inhalt des Funktionsautopiloten wieder anzeigen
+ //! auch Selektion (am InputHdl gemerkt) wieder anzeigen
aTextWindow.SetTextString( pInputHdl->GetFormString() );
}
else if ( pInputHdl && pInputHdl->IsInputMode() )
{
- // wenn waehrend des Editierens die Eingabezeile weg war
- // (Editieren einer Formel, dann umschalten zu fremdem Dokument/Hilfe),
- // wieder den gerade editierten Text aus dem InputHandler anzeigen
+ // wenn waehrend des Editierens die Eingabezeile weg war
+ // (Editieren einer Formel, dann umschalten zu fremdem Dokument/Hilfe),
+ // wieder den gerade editierten Text aus dem InputHandler anzeigen
- aTextWindow.SetTextString( pInputHdl->GetEditString() ); // Text anzeigen
+ aTextWindow.SetTextString( pInputHdl->GetEditString() ); // Text anzeigen
if ( pInputHdl->IsTopMode() )
- pInputHdl->SetMode( SC_INPUT_TABLE ); // Focus kommt eh nach unten
+ pInputHdl->SetMode( SC_INPUT_TABLE ); // Focus kommt eh nach unten
}
else if ( pViewSh )
pViewSh->UpdateInputHandler( TRUE ); // unbedingtes Update
@@ -229,9 +229,9 @@ __EXPORT ScInputWindow::~ScInputWindow()
{
BOOL bDown = ( ScGlobal::pSysLocale == NULL ); // after Clear?
- // if any view's input handler has a pointer to this input window, reset it
- // (may be several ones, #74522#)
- // member pInputHdl is not used here
+ // if any view's input handler has a pointer to this input window, reset it
+ // (may be several ones, #74522#)
+ // member pInputHdl is not used here
if ( !bDown )
{
@@ -254,12 +254,12 @@ __EXPORT ScInputWindow::~ScInputWindow()
void ScInputWindow::SetInputHandler( ScInputHandler* pNew )
{
- // wird im Activate der View gerufen...
+ // wird im Activate der View gerufen...
if ( pNew != pInputHdl )
{
- // Bei Reload (letzte Version) ist pInputHdl der Input-Handler der alten,
- // geloeschten ViewShell, darum hier auf keinen Fall anfassen!
+ // Bei Reload (letzte Version) ist pInputHdl der Input-Handler der alten,
+ // geloeschten ViewShell, darum hier auf keinen Fall anfassen!
pInputHdl = pNew;
if (pInputHdl)
@@ -337,16 +337,16 @@ void __EXPORT ScInputWindow::Select()
{
case SID_INPUT_FUNCTION:
{
- //! new method at ScModule to query if function autopilot is open
+ //! new method at ScModule to query if function autopilot is open
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
if ( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) )
{
pViewFrm->GetDispatcher()->Execute( SID_OPENDLG_FUNCTION,
SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD );
- // die Toolbox wird sowieso disabled, also braucht auch nicht umgeschaltet
- // zu werden, egal ob's geklappt hat oder nicht
-// SetOkCancelMode();
+ // die Toolbox wird sowieso disabled, also braucht auch nicht umgeschaltet
+ // zu werden, egal ob's geklappt hat oder nicht
+// SetOkCancelMode();
}
}
break;
@@ -359,7 +359,7 @@ void __EXPORT ScInputWindow::Select()
case SID_INPUT_OK:
pScMod->InputEnterHandler();
SetSumAssignMode();
- aTextWindow.Invalidate(); // sonst bleibt Selektion stehen
+ aTextWindow.Invalidate(); // sonst bleibt Selektion stehen
break;
case SID_INPUT_SUM:
@@ -396,7 +396,7 @@ void __EXPORT ScInputWindow::Select()
if ( bDataFound )
{
const sal_Bool bSubTotal( UseSubTotal( &aRangeList ) );
- pViewSh->EnterAutoSum( aRangeList, bSubTotal ); // Block mit Summen fuellen
+ pViewSh->EnterAutoSum( aRangeList, bSubTotal ); // Block mit Summen fuellen
}
}
else
@@ -419,7 +419,7 @@ void __EXPORT ScInputWindow::Select()
}
}
}
- else // nur in Eingabezeile einfuegen
+ else // nur in Eingabezeile einfuegen
{
ScRangeList aRangeList;
const BOOL bDataFound = pViewSh->GetAutoSumArea( aRangeList );
@@ -434,8 +434,8 @@ void __EXPORT ScInputWindow::Select()
{
pHdl->InitRangeFinder( aFormula );
- //! SetSelection am InputHandler ???
- //! bSelIsRef setzen ???
+ //! SetSelection am InputHandler ???
+ //! bSelIsRef setzen ???
const xub_StrLen nOpen = aFormula.Search('(');
const xub_StrLen nLen = aFormula.Len();
if ( nOpen != STRING_NOTFOUND && nLen > nOpen )
@@ -461,7 +461,7 @@ void __EXPORT ScInputWindow::Select()
case SID_INPUT_EQUAL:
{
aTextWindow.StartEditEngine();
- if ( pScMod->IsEditMode() ) // nicht, wenn z.B. geschuetzt
+ if ( pScMod->IsEditMode() ) // nicht, wenn z.B. geschuetzt
{
aTextWindow.GrabFocus();
aTextWindow.SetTextString( '=' );
@@ -495,7 +495,7 @@ void __EXPORT ScInputWindow::Resize()
void ScInputWindow::SetFuncString( const String& rString, BOOL bDoEdit )
{
- //! new method at ScModule to query if function autopilot is open
+ //! new method at ScModule to query if function autopilot is open
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
EnableButtons( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) );
aTextWindow.StartEditEngine();
@@ -519,7 +519,7 @@ void ScInputWindow::SetFuncString( const String& rString, BOOL bDoEdit )
pScMod->InputChanged(pView);
if ( bDoEdit )
- SetOkCancelMode(); // nicht, wenn gleich hinterher Enter/Cancel
+ SetOkCancelMode(); // nicht, wenn gleich hinterher Enter/Cancel
pView->SetEditEngineUpdateMode(TRUE);
}
@@ -545,7 +545,7 @@ void ScInputWindow::SetTextString( const String& rString )
void ScInputWindow::SetOkCancelMode()
{
- //! new method at ScModule to query if function autopilot is open
+ //! new method at ScModule to query if function autopilot is open
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
EnableButtons( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) );
@@ -558,18 +558,18 @@ void ScInputWindow::SetOkCancelMode()
RemoveItem( 3 ); // SID_INPUT_SUM und SID_INPUT_EQUAL entfernen
RemoveItem( 3 );
InsertItem( SID_INPUT_CANCEL, IMAGE( SID_INPUT_CANCEL ), 0, 3 );
- InsertItem( SID_INPUT_OK, IMAGE( SID_INPUT_OK ), 0, 4 );
- SetItemText ( SID_INPUT_CANCEL, aTextCancel );
- SetHelpId ( SID_INPUT_CANCEL, HID_INSWIN_CANCEL );
- SetItemText ( SID_INPUT_OK, aTextOk );
- SetHelpId ( SID_INPUT_OK, HID_INSWIN_OK );
+ InsertItem( SID_INPUT_OK, IMAGE( SID_INPUT_OK ), 0, 4 );
+ SetItemText ( SID_INPUT_CANCEL, aTextCancel );
+ SetHelpId ( SID_INPUT_CANCEL, HID_INSWIN_CANCEL );
+ SetItemText ( SID_INPUT_OK, aTextOk );
+ SetHelpId ( SID_INPUT_OK, HID_INSWIN_OK );
bIsOkCancelMode = TRUE;
}
}
void ScInputWindow::SetSumAssignMode()
{
- //! new method at ScModule to query if function autopilot is open
+ //! new method at ScModule to query if function autopilot is open
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
EnableButtons( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) );
@@ -582,15 +582,15 @@ void ScInputWindow::SetSumAssignMode()
// SID_INPUT_CANCEL, und SID_INPUT_OK entfernen
RemoveItem( 3 );
RemoveItem( 3 );
- InsertItem( SID_INPUT_SUM, IMAGE( SID_INPUT_SUM ), 0, 3 );
- InsertItem( SID_INPUT_EQUAL, IMAGE( SID_INPUT_EQUAL ), 0, 4 );
- SetItemText ( SID_INPUT_SUM, aTextSum );
- SetHelpId ( SID_INPUT_SUM, HID_INSWIN_SUMME );
- SetItemText ( SID_INPUT_EQUAL, aTextEqual );
- SetHelpId ( SID_INPUT_EQUAL, HID_INSWIN_FUNC );
+ InsertItem( SID_INPUT_SUM, IMAGE( SID_INPUT_SUM ), 0, 3 );
+ InsertItem( SID_INPUT_EQUAL, IMAGE( SID_INPUT_EQUAL ), 0, 4 );
+ SetItemText ( SID_INPUT_SUM, aTextSum );
+ SetHelpId ( SID_INPUT_SUM, HID_INSWIN_SUMME );
+ SetItemText ( SID_INPUT_EQUAL, aTextEqual );
+ SetHelpId ( SID_INPUT_EQUAL, HID_INSWIN_FUNC );
bIsOkCancelMode = FALSE;
- SetFormulaMode(FALSE); // kein editieren -> keine Formel
+ SetFormulaMode(FALSE); // kein editieren -> keine Formel
}
}
@@ -668,7 +668,7 @@ void ScInputWindow::SwitchToTextWin()
{
xub_StrLen nLen = pView->GetEditEngine()->GetTextLen(0);
ESelection aSel( 0, nLen, 0, nLen );
- pView->SetSelection( aSel ); // set cursor to end of text
+ pView->SetSelection( aSel ); // set cursor to end of text
}
}
}
@@ -680,14 +680,14 @@ void ScInputWindow::PosGrabFocus()
void ScInputWindow::EnableButtons( BOOL bEnable )
{
- // when enabling buttons, always also enable the input window itself
+ // when enabling buttons, always also enable the input window itself
if ( bEnable && !IsEnabled() )
Enable();
- EnableItem( SID_INPUT_FUNCTION, bEnable );
+ EnableItem( SID_INPUT_FUNCTION, bEnable );
EnableItem( bIsOkCancelMode ? SID_INPUT_CANCEL : SID_INPUT_SUM, bEnable );
EnableItem( bIsOkCancelMode ? SID_INPUT_OK : SID_INPUT_EQUAL, bEnable );
-// Invalidate();
+// Invalidate();
}
void ScInputWindow::StateChanged( StateChangedType nType )
@@ -701,9 +701,9 @@ void ScInputWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( rDCEvt.GetType() == DATACHANGED_SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
- // update item images
+ // update item images
- ScModule* pScMod = SC_MOD();
+ ScModule* pScMod = SC_MOD();
SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod );
BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
// IMAGE macro uses pScMod, pImgMgr, bHC
@@ -725,26 +725,26 @@ void ScInputWindow::DataChanged( const DataChangedEvent& rDCEvt )
}
//========================================================================
-// Eingabefenster
+// Eingabefenster
//========================================================================
ScTextWnd::ScTextWnd( Window* pParent )
- : Window ( pParent, WinBits(WB_HIDE | WB_BORDER) ),
+ : Window ( pParent, WinBits(WB_HIDE | WB_BORDER) ),
DragSourceHelper( this ),
- pEditEngine ( NULL ),
- pEditView ( NULL ),
+ pEditEngine ( NULL ),
+ pEditView ( NULL ),
bIsInsertMode( TRUE ),
bFormulaMode ( FALSE ),
bInputMode ( FALSE )
{
- EnableRTL( FALSE ); // #106269# EditEngine can't be used with VCL EnableRTL
+ EnableRTL( FALSE ); // #106269# EditEngine can't be used with VCL EnableRTL
bIsRTL = GetSettings().GetLayoutRTL();
- // #79096# always use application font, so a font with cjk chars can be installed
+ // #79096# always use application font, so a font with cjk chars can be installed
Font aAppFont = GetFont();
aTextFont = aAppFont;
- aTextFont.SetSize( PixelToLogic( aAppFont.GetSize(), MAP_TWIP ) ); // AppFont ist in Pixeln
+ aTextFont.SetSize( PixelToLogic( aAppFont.GetSize(), MAP_TWIP ) ); // AppFont ist in Pixeln
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
@@ -753,15 +753,15 @@ ScTextWnd::ScTextWnd( Window* pParent )
aTextFont.SetTransparent ( TRUE );
aTextFont.SetFillColor ( aBgColor );
- //aTextFont.SetColor ( COL_FIELDTEXT );
- aTextFont.SetColor (aTxtColor);
- aTextFont.SetWeight ( WEIGHT_NORMAL );
+ //aTextFont.SetColor ( COL_FIELDTEXT );
+ aTextFont.SetColor (aTxtColor);
+ aTextFont.SetWeight ( WEIGHT_NORMAL );
- SetSizePixel ( Size(1,TBX_WINDOW_HEIGHT) );
- SetBackground ( aBgColor );
- SetLineColor ( COL_BLACK );
- SetMapMode ( MAP_TWIP );
- SetPointer ( POINTER_TEXT );
+ SetSizePixel ( Size(1,TBX_WINDOW_HEIGHT) );
+ SetBackground ( aBgColor );
+ SetLineColor ( COL_BLACK );
+ SetMapMode ( MAP_TWIP );
+ SetPointer ( POINTER_TEXT );
}
__EXPORT ScTextWnd::~ScTextWnd()
@@ -783,16 +783,16 @@ void __EXPORT ScTextWnd::Paint( const Rectangle& rRec )
long nDiff = GetOutputSizePixel().Height()
- LogicToPixel( Size( 0, GetTextHeight() ) ).Height();
-// if (nDiff<2) nDiff=2; // mind. 1 Pixel
+// if (nDiff<2) nDiff=2; // mind. 1 Pixel
long nStartPos = TEXT_STARTPOS;
if ( bIsRTL )
{
- // right-align
+ // right-align
nStartPos += GetOutputSizePixel().Width() - 2*TEXT_STARTPOS -
LogicToPixel( Size( GetTextWidth( aString ), 0 ) ).Width();
- // LayoutMode isn't changed as long as ModifyRTLDefaults doesn't include SvxFrameDirectionItem
+ // LayoutMode isn't changed as long as ModifyRTLDefaults doesn't include SvxFrameDirectionItem
}
DrawText( PixelToLogic( Point( nStartPos, nDiff/2 ) ), aString );
@@ -808,7 +808,7 @@ void __EXPORT ScTextWnd::Resize()
- LogicToPixel( Size( 0, GetTextHeight() ) ).Height();
#ifdef OS2_DOCH_NICHT
- nDiff-=2; // wird durch 2 geteilt
+ nDiff-=2; // wird durch 2 geteilt
// passt sonst nicht zur normalen Textausgabe
#endif
@@ -850,7 +850,7 @@ void __EXPORT ScTextWnd::MouseButtonUp( const MouseEvent& rMEvt )
if ( rMEvt.IsMiddle() &&
GetSettings().GetMouseSettings().GetMiddleButtonAction() == MOUSE_MIDDLE_PASTESELECTION )
{
- // EditView may have pasted from selection
+ // EditView may have pasted from selection
SC_MOD()->InputChanged( pEditView );
}
else
@@ -875,13 +875,13 @@ void __EXPORT ScTextWnd::Command( const CommandEvent& rCEvt )
pEditView->Command( rCEvt );
pScMod->SetInEditCommand( FALSE );
- // #48929# COMMAND_STARTDRAG heiss noch lange nicht, dass der Inhalt geaendert wurde
- // darum in dem Fall kein InputChanged
- //! erkennen, ob mit Move gedraggt wurde, oder Drag&Move irgendwie verbieten
+ // #48929# COMMAND_STARTDRAG heiss noch lange nicht, dass der Inhalt geaendert wurde
+ // darum in dem Fall kein InputChanged
+ //! erkennen, ob mit Move gedraggt wurde, oder Drag&Move irgendwie verbieten
if ( nCommand == COMMAND_STARTDRAG )
{
- // ist auf eine andere View gedraggt worden?
+ // ist auf eine andere View gedraggt worden?
ScTabViewShell* pEndViewSh = ScTabViewShell::GetActiveViewShell();
if ( pEndViewSh != pStartViewSh && pStartViewSh != NULL )
{
@@ -890,13 +890,13 @@ void __EXPORT ScTextWnd::Command( const CommandEvent& rCEvt )
if ( pHdl && pViewData->HasEditView( pViewData->GetActivePart() ) )
{
pHdl->CancelHandler();
- pViewData->GetView()->ShowCursor(); // fehlt bei KillEditView, weil nicht aktiv
+ pViewData->GetView()->ShowCursor(); // fehlt bei KillEditView, weil nicht aktiv
}
}
}
else if ( nCommand == COMMAND_CURSORPOS )
{
- // don't call InputChanged for COMMAND_CURSORPOS
+ // don't call InputChanged for COMMAND_CURSORPOS
}
else if ( nCommand == COMMAND_INPUTLANGUAGECHANGE )
{
@@ -915,7 +915,7 @@ void __EXPORT ScTextWnd::Command( const CommandEvent& rCEvt )
SC_MOD()->InputChanged( pEditView );
}
else
- Window::Command(rCEvt); // sonst soll sich die Basisklasse drum kuemmern...
+ Window::Command(rCEvt); // sonst soll sich die Basisklasse drum kuemmern...
bInputMode = FALSE;
}
@@ -927,8 +927,8 @@ void ScTextWnd::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel )
CommandEvent aDragEvent( rPosPixel, COMMAND_STARTDRAG, TRUE );
pEditView->Command( aDragEvent );
- // handling of d&d to different view (CancelHandler) can't be done here,
- // because the call returns before d&d is complete.
+ // handling of d&d to different view (CancelHandler) can't be done here,
+ // because the call returns before d&d is complete.
}
}
@@ -940,7 +940,7 @@ void __EXPORT ScTextWnd::KeyInput(const KeyEvent& rKEvt)
BOOL bUsed = FALSE;
ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
if ( pViewSh )
- bUsed = pViewSh->SfxKeyInput(rKEvt); // nur Acceleratoren, keine Eingabe
+ bUsed = pViewSh->SfxKeyInput(rKEvt); // nur Acceleratoren, keine Eingabe
if (!bUsed)
Window::KeyInput( rKEvt );
}
@@ -960,7 +960,7 @@ void __EXPORT ScTextWnd::LoseFocus()
String __EXPORT ScTextWnd::GetText() const
{
- // ueberladen, um per Testtool an den Text heranzukommen
+ // ueberladen, um per Testtool an den Text heranzukommen
if ( pEditEngine )
return pEditEngine->GetText();
@@ -984,9 +984,9 @@ void ScTextWnd::UpdateAutoCorrFlag()
ULONG nControl = pEditEngine->GetControlWord();
ULONG nOld = nControl;
if ( bFormulaMode )
- nControl &= ~EE_CNTRL_AUTOCORRECT; // keine Autokorrektur in Formeln
+ nControl &= ~EE_CNTRL_AUTOCORRECT; // keine Autokorrektur in Formeln
else
- nControl |= EE_CNTRL_AUTOCORRECT; // sonst schon
+ nControl |= EE_CNTRL_AUTOCORRECT; // sonst schon
if ( nControl != nOld )
pEditEngine->SetControlWord( nControl );
}
@@ -1015,12 +1015,12 @@ void lcl_ModifyRTLDefaults( SfxItemSet& rSet )
{
rSet.Put( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) );
- // always using rtl writing direction would break formulas
+ // always using rtl writing direction would break formulas
//rSet.Put( SvxFrameDirectionItem( FRMDIR_HORI_RIGHT_TOP, EE_PARA_WRITINGDIR ) );
- // PaperSize width is limited to USHRT_MAX in RTL mode (because of EditEngine's
- // USHORT values in EditLine), so the text may be wrapped and line spacing must be
- // increased to not see the beginning of the next line.
+ // PaperSize width is limited to USHRT_MAX in RTL mode (because of EditEngine's
+ // USHORT values in EditLine), so the text may be wrapped and line spacing must be
+ // increased to not see the beginning of the next line.
SvxLineSpacingItem aItem( SVX_LINESPACE_TWO_LINES, EE_PARA_SBL );
aItem.SetPropLineSpace( 200 );
rSet.Put( aItem );
@@ -1038,7 +1038,7 @@ void lcl_ModifyRTLVisArea( EditView* pEditView )
void ScTextWnd::StartEditEngine()
{
- // #31147# Bei "eigener Modalitaet" (Doc-modale Dialoge) nicht aktivieren
+ // #31147# Bei "eigener Modalitaet" (Doc-modale Dialoge) nicht aktivieren
SfxObjectShell* pObjSh = SfxObjectShell::Current();
if ( pObjSh && pObjSh->IsInModalMode() )
return;
@@ -1053,7 +1053,7 @@ void ScTextWnd::StartEditEngine()
pNew = new ScFieldEditEngine( pDoc->GetEnginePool(), pDoc->GetEditPool() );
}
else
- pNew = new ScFieldEditEngine( EditEngine::CreatePool(), NULL, TRUE );
+ pNew = new ScFieldEditEngine( EditEngine::CreatePool(), NULL, TRUE );
pNew->SetExecuteURL( FALSE );
pEditEngine = pNew;
@@ -1075,28 +1075,28 @@ void ScTextWnd::StartEditEngine()
pEditEngine->SetDefaults( pSet );
}
- // #57254# Wenn in der Zelle URL-Felder enthalten sind, muessen die auch in
- // die Eingabezeile uebernommen werden, weil sonst die Positionen nicht stimmen.
+ // #57254# Wenn in der Zelle URL-Felder enthalten sind, muessen die auch in
+ // die Eingabezeile uebernommen werden, weil sonst die Positionen nicht stimmen.
BOOL bFilled = FALSE;
ScInputHandler* pHdl = SC_MOD()->GetInputHdl();
- if ( pHdl ) //! Testen, ob's der richtige InputHdl ist?
+ if ( pHdl ) //! Testen, ob's der richtige InputHdl ist?
bFilled = pHdl->GetTextAndFields( *pEditEngine );
pEditEngine->SetUpdateMode( TRUE );
- // aString ist die Wahrheit...
+ // aString ist die Wahrheit...
if ( bFilled && pEditEngine->GetText() == aString )
- Invalidate(); // Repaint fuer (hinterlegte) Felder
+ Invalidate(); // Repaint fuer (hinterlegte) Felder
else
- pEditEngine->SetText(aString); // dann wenigstens den richtigen Text
+ pEditEngine->SetText(aString); // dann wenigstens den richtigen Text
pEditView = new EditView( pEditEngine, this );
pEditView->SetInsertMode(bIsInsertMode);
// Text aus Clipboard wird als ASCII einzeilig uebernommen
ULONG n = pEditView->GetControlWord();
- pEditView->SetControlWord( n | EV_CNTRL_SINGLELINEPASTE );
+ pEditView->SetControlWord( n | EV_CNTRL_SINGLELINEPASTE );
pEditEngine->InsertView( pEditView, EE_APPEND );
@@ -1110,12 +1110,12 @@ void ScTextWnd::StartEditEngine()
if (!maAccTextDatas.empty())
maAccTextDatas.back()->StartEdit();
- // as long as EditEngine and DrawText sometimes differ for CTL text,
- // repaint now to have the EditEngine's version visible
+ // as long as EditEngine and DrawText sometimes differ for CTL text,
+ // repaint now to have the EditEngine's version visible
// SfxObjectShell* pObjSh = SfxObjectShell::Current();
if ( pObjSh && pObjSh->ISA(ScDocShell) )
{
- ScDocument* pDoc = ((ScDocShell*)pObjSh)->GetDocument(); // any document
+ ScDocument* pDoc = ((ScDocShell*)pObjSh)->GetDocument(); // any document
BYTE nScript = pDoc->GetStringScriptType( aString );
if ( nScript & SCRIPTTYPE_COMPLEX )
Invalidate();
@@ -1135,11 +1135,11 @@ IMPL_LINK(ScTextWnd, NotifyHdl, EENotify*, EMPTYARG)
{
ScInputHandler* pHdl = SC_MOD()->GetInputHdl();
- // #105354# Use the InputHandler's InOwnChange flag to prevent calling InputChanged
- // while an InputHandler method is modifying the EditEngine content
+ // #105354# Use the InputHandler's InOwnChange flag to prevent calling InputChanged
+ // while an InputHandler method is modifying the EditEngine content
if ( pHdl && !pHdl->IsInOwnChange() )
- pHdl->InputChanged( pEditView, TRUE ); // #i20282# InputChanged must know if called from modify handler
+ pHdl->InputChanged( pEditView, TRUE ); // #i20282# InputChanged must know if called from modify handler
}
return 0;
@@ -1171,7 +1171,7 @@ void ScTextWnd::StopEditEngine( BOOL bAll )
pViewFrm->GetBindings().Invalidate( SID_ATTR_INSERT );
if (bSelection)
- Invalidate(); // damit Selektion nicht stehenbleibt
+ Invalidate(); // damit Selektion nicht stehenbleibt
}
}
@@ -1181,7 +1181,7 @@ void ScTextWnd::SetTextString( const String& rNewString )
{
bInputMode = TRUE;
- // Position der Aenderung suchen, nur Rest painten
+ // Position der Aenderung suchen, nur Rest painten
long nInvPos = 0;
long nStartPos = 0;
@@ -1194,13 +1194,13 @@ void ScTextWnd::SetTextString( const String& rNewString )
bPaintAll = TRUE;
else
{
- // test if CTL script type is involved
+ // test if CTL script type is involved
BYTE nOldScript = 0;
BYTE nNewScript = 0;
SfxObjectShell* pObjSh = SfxObjectShell::Current();
if ( pObjSh && pObjSh->ISA(ScDocShell) )
{
- // any document can be used (used only for its break iterator)
+ // any document can be used (used only for its break iterator)
ScDocument* pDoc = ((ScDocShell*)pObjSh)->GetDocument();
nOldScript = pDoc->GetStringScriptType( aString );
nNewScript = pDoc->GetStringScriptType( rNewString );
@@ -1226,7 +1226,7 @@ void ScTextWnd::SetTextString( const String& rNewString )
if ( nSize1>0 && nSize2>0 )
nTextSize = Max( nSize1, nSize2 );
else
- nTextSize = GetOutputSize().Width(); // Ueberlauf
+ nTextSize = GetOutputSize().Width(); // Ueberlauf
if (nDifPos == STRING_MATCH)
nDifPos = 0;
@@ -1239,8 +1239,8 @@ void ScTextWnd::SetTextString( const String& rNewString )
nInvPos += GetTextWidth(aString,0,nDifPos);
USHORT nFlags = 0;
- if ( nDifPos == aString.Len() ) // only new characters appended
- nFlags = INVALIDATE_NOERASE; // then background is already clear
+ if ( nDifPos == aString.Len() ) // only new characters appended
+ nFlags = INVALIDATE_NOERASE; // then background is already clear
Invalidate( Rectangle( nInvPos, 0,
nStartPos+nTextSize, GetOutputSize().Height()-1 ),
@@ -1288,7 +1288,7 @@ void ScTextWnd::MakeDialogEditView()
pNew = new ScFieldEditEngine( pDoc->GetEnginePool(), pDoc->GetEditPool() );
}
else
- pNew = new ScFieldEditEngine( EditEngine::CreatePool(), NULL, TRUE );
+ pNew = new ScFieldEditEngine( EditEngine::CreatePool(), NULL, TRUE );
pNew->SetExecuteURL( FALSE );
pEditEngine = pNew;
@@ -1304,7 +1304,7 @@ void ScTextWnd::MakeDialogEditView()
pEditEngine->SetDefaults( pSet );
pEditEngine->SetUpdateMode( TRUE );
- pEditView = new EditView( pEditEngine, this );
+ pEditView = new EditView( pEditEngine, this );
pEditEngine->InsertView( pEditView, EE_APPEND );
Resize();
@@ -1326,8 +1326,8 @@ void ScTextWnd::ImplInitSettings()
Color aTxtColor= rStyleSettings.GetWindowTextColor();
aTextFont.SetFillColor ( aBgColor );
- aTextFont.SetColor (aTxtColor);
- SetBackground ( aBgColor );
+ aTextFont.SetColor (aTxtColor);
+ SetBackground ( aBgColor );
Invalidate();
}
@@ -1370,24 +1370,24 @@ void ScTextWnd::DataChanged( const DataChangedEvent& rDCEvt )
//========================================================================
-// Positionsfenster
+// Positionsfenster
//========================================================================
ScPosWnd::ScPosWnd( Window* pParent ) :
- ComboBox ( pParent, WinBits(WB_HIDE | WB_DROPDOWN) ),
- pAccel ( NULL ),
+ ComboBox ( pParent, WinBits(WB_HIDE | WB_DROPDOWN) ),
+ pAccel ( NULL ),
nTipVisible ( 0 ),
bFormulaMode( FALSE )
{
Size aSize( GetTextWidth( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("GW99999:GW99999")) ),
GetTextHeight() );
- aSize.Width() += 25; // ??
- aSize.Height() = CalcWindowSizePixel(11); // Funktionen: 10 MRU + "andere..."
+ aSize.Width() += 25; // ??
+ aSize.Height() = CalcWindowSizePixel(11); // Funktionen: 10 MRU + "andere..."
SetSizePixel( aSize );
FillRangeNames();
- StartListening( *SFX_APP() ); // fuer Navigator-Bereichsnamen-Updates
+ StartListening( *SFX_APP() ); // fuer Navigator-Bereichsnamen-Updates
}
__EXPORT ScPosWnd::~ScPosWnd()
@@ -1432,7 +1432,7 @@ void ScPosWnd::FillRangeNames()
{
ScDocument* pDoc = ((ScDocShell*)pObjSh)->GetDocument();
- // per Hand sortieren, weil Funktionen nicht sortiert werden:
+ // per Hand sortieren, weil Funktionen nicht sortiert werden:
ScRangeName* pRangeNames = pDoc->GetRangeName();
USHORT nCount = pRangeNames->GetCount();
@@ -1496,16 +1496,16 @@ void ScPosWnd::FillFunctions()
InsertEntry( *pDesc->pFuncName );
if (!aFirstName.Len())
aFirstName = *pDesc->pFuncName;
- break; // nicht weitersuchen
+ break; // nicht weitersuchen
}
}
}
}
- //! Eintrag "Andere..." fuer Funktions-Autopilot wieder aufnehmen,
- //! wenn der Funktions-Autopilot mit dem bisher eingegebenen Text arbeiten kann!
+ //! Eintrag "Andere..." fuer Funktions-Autopilot wieder aufnehmen,
+ //! wenn der Funktions-Autopilot mit dem bisher eingegebenen Text arbeiten kann!
-// InsertEntry( ScGlobal::GetRscString(STR_FUNCTIONLIST_MORE) );
+// InsertEntry( ScGlobal::GetRscString(STR_FUNCTIONLIST_MORE) );
SetText(aFirstName);
}
@@ -1514,7 +1514,7 @@ void __EXPORT ScPosWnd::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
if ( !bFormulaMode )
{
- // muss die Liste der Bereichsnamen updgedated werden?
+ // muss die Liste der Bereichsnamen updgedated werden?
if ( rHint.ISA(SfxSimpleHint) )
{
@@ -1648,7 +1648,7 @@ void ScPosWnd::Modify()
void __EXPORT ScPosWnd::Select()
{
- ComboBox::Select(); // in VCL gibt GetText() erst danach den ausgewaehlten Eintrag
+ ComboBox::Select(); // in VCL gibt GetText() erst danach den ausgewaehlten Eintrag
HideTip();
@@ -1666,10 +1666,10 @@ void ScPosWnd::DoEnter()
ScModule* pScMod = SC_MOD();
if ( aText == ScGlobal::GetRscString(STR_FUNCTIONLIST_MORE) )
{
- // Funktions-Autopilot
- //! mit dem bisher eingegebenen Text weiterarbeiten !!!
+ // Funktions-Autopilot
+ //! mit dem bisher eingegebenen Text weiterarbeiten !!!
- //! new method at ScModule to query if function autopilot is open
+ //! new method at ScModule to query if function autopilot is open
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
if ( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) )
pViewFrm->GetDispatcher()->Execute( SID_OPENDLG_FUNCTION,
@@ -1791,7 +1791,7 @@ void ScPosWnd::ReleaseFocus_Impl()
ScInputHandler* pHdl = SC_MOD()->GetInputHdl( PTR_CAST( ScTabViewShell, pCurSh ) );
if ( pHdl && pHdl->IsTopMode() )
{
- // Focus wieder in die Eingabezeile?
+ // Focus wieder in die Eingabezeile?
ScInputWindow* pInputWin = pHdl->GetInputWindow();
if (pInputWin)
@@ -1801,7 +1801,7 @@ void ScPosWnd::ReleaseFocus_Impl()
}
}
- // Focus auf die aktive View
+ // Focus auf die aktive View
if ( pCurSh )
{
diff --git a/sc/source/ui/app/lnktrans.cxx b/sc/source/ui/app/lnktrans.cxx
index 2e0f5d276a97..f4e48a9358e0 100644
--- a/sc/source/ui/app/lnktrans.cxx
+++ b/sc/source/ui/app/lnktrans.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ void ScLinkTransferObj::AddSupportedFormats()
{
if ( aLinkURL.Len() )
{
- // TransferableHelper::SetINetBookmark formats
+ // TransferableHelper::SetINetBookmark formats
AddFormat( SOT_FORMATSTR_ID_SOLK );
AddFormat( SOT_FORMAT_STRING );
diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx
index 78cb70fa64f0..75e1c9b48d35 100644
--- a/sc/source/ui/app/msgpool.cxx
+++ b/sc/source/ui/app/msgpool.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,49 +41,49 @@
static SfxItemInfo __READONLY_DATA aMsgItemInfos[] =
{
- { 0, SFX_ITEM_POOLABLE }, // SCITEM_STRING
- { 0, SFX_ITEM_POOLABLE }, // SCITEM_SEARCHDATA - nicht mehr benutzt !!!
- { SID_SORT, SFX_ITEM_POOLABLE }, // SCITEM_SORTDATA
- { SID_QUERY, SFX_ITEM_POOLABLE }, // SCITEM_QUERYDATA
- { SID_SUBTOTALS, SFX_ITEM_POOLABLE }, // SCITEM_SUBTDATA
- { SID_CONSOLIDATE, SFX_ITEM_POOLABLE }, // SCITEM_CONSOLIDATEDATA
- { SID_PIVOT_TABLE, SFX_ITEM_POOLABLE }, // SCITEM_PIVOTDATA
- { SID_SOLVE, SFX_ITEM_POOLABLE }, // SCITEM_SOLVEDATA
- { SID_SCUSERLISTS, SFX_ITEM_POOLABLE }, // SCITEM_USERLIST
- { SID_PRINTER_NOTFOUND_WARN, SFX_ITEM_POOLABLE } // SCITEM_PRINTWARN
+ { 0, SFX_ITEM_POOLABLE }, // SCITEM_STRING
+ { 0, SFX_ITEM_POOLABLE }, // SCITEM_SEARCHDATA - nicht mehr benutzt !!!
+ { SID_SORT, SFX_ITEM_POOLABLE }, // SCITEM_SORTDATA
+ { SID_QUERY, SFX_ITEM_POOLABLE }, // SCITEM_QUERYDATA
+ { SID_SUBTOTALS, SFX_ITEM_POOLABLE }, // SCITEM_SUBTDATA
+ { SID_CONSOLIDATE, SFX_ITEM_POOLABLE }, // SCITEM_CONSOLIDATEDATA
+ { SID_PIVOT_TABLE, SFX_ITEM_POOLABLE }, // SCITEM_PIVOTDATA
+ { SID_SOLVE, SFX_ITEM_POOLABLE }, // SCITEM_SOLVEDATA
+ { SID_SCUSERLISTS, SFX_ITEM_POOLABLE }, // SCITEM_USERLIST
+ { SID_PRINTER_NOTFOUND_WARN, SFX_ITEM_POOLABLE } // SCITEM_PRINTWARN
};
//------------------------------------------------------------------------
ScMessagePool::ScMessagePool()
- : SfxItemPool ( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScMessagePool")),
+ : SfxItemPool ( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScMessagePool")),
MSGPOOL_START, MSGPOOL_END,
aMsgItemInfos, NULL ),
//
- aGlobalStringItem ( SfxStringItem ( SCITEM_STRING, String() ) ),
- aGlobalSearchItem ( SvxSearchItem ( SCITEM_SEARCHDATA ) ),
- aGlobalSortItem ( ScSortItem ( SCITEM_SORTDATA, NULL ) ),
- aGlobalQueryItem ( ScQueryItem ( SCITEM_QUERYDATA, NULL, NULL ) ),
- aGlobalSubTotalItem ( ScSubTotalItem ( SCITEM_SUBTDATA, NULL, NULL ) ),
- aGlobalConsolidateItem ( ScConsolidateItem ( SCITEM_CONSOLIDATEDATA, NULL ) ),
- aGlobalPivotItem ( ScPivotItem ( SCITEM_PIVOTDATA, NULL, NULL, FALSE ) ),
- aGlobalSolveItem ( ScSolveItem ( SCITEM_SOLVEDATA, NULL ) ),
- aGlobalUserListItem ( ScUserListItem ( SCITEM_USERLIST ) ),
+ aGlobalStringItem ( SfxStringItem ( SCITEM_STRING, String() ) ),
+ aGlobalSearchItem ( SvxSearchItem ( SCITEM_SEARCHDATA ) ),
+ aGlobalSortItem ( ScSortItem ( SCITEM_SORTDATA, NULL ) ),
+ aGlobalQueryItem ( ScQueryItem ( SCITEM_QUERYDATA, NULL, NULL ) ),
+ aGlobalSubTotalItem ( ScSubTotalItem ( SCITEM_SUBTDATA, NULL, NULL ) ),
+ aGlobalConsolidateItem ( ScConsolidateItem ( SCITEM_CONSOLIDATEDATA, NULL ) ),
+ aGlobalPivotItem ( ScPivotItem ( SCITEM_PIVOTDATA, NULL, NULL, FALSE ) ),
+ aGlobalSolveItem ( ScSolveItem ( SCITEM_SOLVEDATA, NULL ) ),
+ aGlobalUserListItem ( ScUserListItem ( SCITEM_USERLIST ) ),
//
- aPrintWarnItem ( SfxBoolItem ( SCITEM_PRINTWARN, FALSE ) )
+ aPrintWarnItem ( SfxBoolItem ( SCITEM_PRINTWARN, FALSE ) )
{
ppPoolDefaults = new SfxPoolItem*[MSGPOOL_END - MSGPOOL_START + 1];
- ppPoolDefaults[SCITEM_STRING - MSGPOOL_START] = &aGlobalStringItem;
- ppPoolDefaults[SCITEM_SEARCHDATA - MSGPOOL_START] = &aGlobalSearchItem;
- ppPoolDefaults[SCITEM_SORTDATA - MSGPOOL_START] = &aGlobalSortItem;
- ppPoolDefaults[SCITEM_QUERYDATA - MSGPOOL_START] = &aGlobalQueryItem;
- ppPoolDefaults[SCITEM_SUBTDATA - MSGPOOL_START] = &aGlobalSubTotalItem;
- ppPoolDefaults[SCITEM_CONSOLIDATEDATA - MSGPOOL_START] = &aGlobalConsolidateItem;
- ppPoolDefaults[SCITEM_PIVOTDATA - MSGPOOL_START] = &aGlobalPivotItem;
- ppPoolDefaults[SCITEM_SOLVEDATA - MSGPOOL_START] = &aGlobalSolveItem;
- ppPoolDefaults[SCITEM_USERLIST - MSGPOOL_START] = &aGlobalUserListItem;
- ppPoolDefaults[SCITEM_PRINTWARN - MSGPOOL_START] = &aPrintWarnItem;
+ ppPoolDefaults[SCITEM_STRING - MSGPOOL_START] = &aGlobalStringItem;
+ ppPoolDefaults[SCITEM_SEARCHDATA - MSGPOOL_START] = &aGlobalSearchItem;
+ ppPoolDefaults[SCITEM_SORTDATA - MSGPOOL_START] = &aGlobalSortItem;
+ ppPoolDefaults[SCITEM_QUERYDATA - MSGPOOL_START] = &aGlobalQueryItem;
+ ppPoolDefaults[SCITEM_SUBTDATA - MSGPOOL_START] = &aGlobalSubTotalItem;
+ ppPoolDefaults[SCITEM_CONSOLIDATEDATA - MSGPOOL_START] = &aGlobalConsolidateItem;
+ ppPoolDefaults[SCITEM_PIVOTDATA - MSGPOOL_START] = &aGlobalPivotItem;
+ ppPoolDefaults[SCITEM_SOLVEDATA - MSGPOOL_START] = &aGlobalSolveItem;
+ ppPoolDefaults[SCITEM_USERLIST - MSGPOOL_START] = &aGlobalUserListItem;
+ ppPoolDefaults[SCITEM_PRINTWARN - MSGPOOL_START] = &aPrintWarnItem;
SetDefaults( ppPoolDefaults );
@@ -96,7 +96,7 @@ ScMessagePool::ScMessagePool()
__EXPORT ScMessagePool::~ScMessagePool()
{
Delete();
- SetSecondaryPool( NULL ); // before deleting defaults (accesses defaults)
+ SetSecondaryPool( NULL ); // before deleting defaults (accesses defaults)
for ( USHORT i=0; i <= MSGPOOL_END-MSGPOOL_START; i++ )
SetRefCount( *ppPoolDefaults[i], 0 );
@@ -109,7 +109,7 @@ __EXPORT ScMessagePool::~ScMessagePool()
SfxMapUnit __EXPORT ScMessagePool::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/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxx
index 3d62c0396b51..50c2bfd155cc 100644
--- a/sc/source/ui/app/rfindlst.cxx
+++ b/sc/source/ui/app/rfindlst.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
// STATIC DATA -----------------------------------------------------------
-#define SC_RANGECOLORS 8
+#define SC_RANGECOLORS 8
static ColorData aColNames[SC_RANGECOLORS] =
{ COL_LIGHTBLUE, COL_LIGHTRED, COL_LIGHTMAGENTA, COL_GREEN,
@@ -58,7 +58,7 @@ ScRangeFindList::~ScRangeFindList()
}
}
-ColorData ScRangeFindList::GetColorName( USHORT nIndex ) // static
+ColorData ScRangeFindList::GetColorName( USHORT nIndex ) // static
{
return aColNames[nIndex % SC_RANGECOLORS];
}
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index a1b8f05d2918..77c22bd15eca 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -1,7 +1,7 @@
/************************************************************************
*
* DO NOT ALTER 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,13 +56,13 @@
#include <sot/formats.hxx>
#define SOT_FORMATSTR_ID_STARCALC_30 SOT_FORMATSTR_ID_STARCALC
-#include "scitems.hxx" // fuer tbxctrls etc.
+#include "scitems.hxx" // fuer tbxctrls etc.
#include "scmod.hxx"
#include "scresid.hxx"
#include "sc.hrc"
#include "cfgids.hxx"
-//! die Registrierung wird wegen CLOOKs in ein eigenes File wandern muessen...
+//! die Registrierung wird wegen CLOOKs in ein eigenes File wandern muessen...
// Interface-Registrierung
#include "docsh.hxx"
@@ -122,7 +122,7 @@
#include <svx/imapdlg.hxx>
#include "editutil.hxx"
-#include <svx/svdfield.hxx> // SdrRegisterFieldClasses
+#include <svx/svdfield.hxx> // SdrRegisterFieldClasses
#include <rtl/logfile.hxx>
#include "dwfunctr.hxx"
@@ -130,21 +130,21 @@
//------------------------------------------------------------------
-//UNUSED2008-05 // filter detection can't use ScFilterOptions (in sc-dll),
-//UNUSED2008-05 // so access to wk3 flag must be implemented here again
-//UNUSED2008-05
+//UNUSED2008-05 // filter detection can't use ScFilterOptions (in sc-dll),
+//UNUSED2008-05 // so access to wk3 flag must be implemented here again
+//UNUSED2008-05
//UNUSED2008-05 class ScLibOptions : public utl::ConfigItem
//UNUSED2008-05 {
//UNUSED2008-05 BOOL bWK3Flag;
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 public:
//UNUSED2008-05 ScLibOptions();
//UNUSED2008-05 BOOL GetWK3Flag() const { return bWK3Flag; }
//UNUSED2008-05 };
-//UNUSED2008-05
-//UNUSED2008-05 #define CFGPATH_LIBFILTER "Office.Calc/Filter/Import/Lotus123"
-//UNUSED2008-05 #define ENTRYSTR_WK3 "WK3"
-//UNUSED2008-05
+//UNUSED2008-05
+//UNUSED2008-05 #define CFGPATH_LIBFILTER "Office.Calc/Filter/Import/Lotus123"
+//UNUSED2008-05 #define ENTRYSTR_WK3 "WK3"
+//UNUSED2008-05
//UNUSED2008-05 ScLibOptions::ScLibOptions() :
//UNUSED2008-05 ConfigItem( rtl::OUString::createFromAscii( CFGPATH_LIBFILTER ) ),
//UNUSED2008-05 bWK3Flag( FALSE )
@@ -173,86 +173,86 @@ void ScDLL::Init()
if ( *ppShlPtr )
return;
- ScDocumentPool::InitVersionMaps(); // wird im ScModule ctor gebraucht
+ ScDocumentPool::InitVersionMaps(); // wird im ScModule ctor gebraucht
ScModule* pMod = new ScModule( &ScDocShell::Factory() );
(*ppShlPtr) = pMod;
-//REMOVE ScDocShell::RegisterFactory( SDT_SC_DOCFACTPRIO );
+//REMOVE ScDocShell::RegisterFactory( SDT_SC_DOCFACTPRIO );
ScDocShell::Factory().SetDocumentServiceName( rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" ) );
- ScGlobal::Init(); // erst wenn der ResManager initialisiert ist
- // erst nach ScGlobal::Init duerfen die App-Optionen
- // initialisiert werden
+ ScGlobal::Init(); // erst wenn der ResManager initialisiert ist
+ // erst nach ScGlobal::Init duerfen die App-Optionen
+ // initialisiert werden
// register your view-factories here
- ScTabViewShell ::RegisterFactory(1);
- ScPreviewShell ::RegisterFactory(2);
+ ScTabViewShell ::RegisterFactory(1);
+ ScPreviewShell ::RegisterFactory(2);
// register your shell-interfaces here
- ScModule ::RegisterInterface(pMod);
- ScDocShell ::RegisterInterface(pMod);
- ScTabViewShell ::RegisterInterface(pMod);
- ScPreviewShell ::RegisterInterface(pMod);
- ScDrawShell ::RegisterInterface(pMod);
- ScDrawFormShell ::RegisterInterface(pMod);
- ScDrawTextObjectBar ::RegisterInterface(pMod);
- ScEditShell ::RegisterInterface(pMod);
- ScPivotShell ::RegisterInterface(pMod);
- ScAuditingShell ::RegisterInterface(pMod);
- ScFormatShell ::RegisterInterface(pMod);
- ScCellShell ::RegisterInterface(pMod);
- ScOleObjectShell ::RegisterInterface(pMod);
- ScChartShell ::RegisterInterface(pMod);
- ScGraphicShell ::RegisterInterface(pMod);
- ScMediaShell ::RegisterInterface(pMod);
- ScPageBreakShell ::RegisterInterface(pMod);
-
- // eigene Controller
- ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSERT, pMod);
- ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSCELLS, pMod);
- ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSOBJ, pMod);
+ ScModule ::RegisterInterface(pMod);
+ ScDocShell ::RegisterInterface(pMod);
+ ScTabViewShell ::RegisterInterface(pMod);
+ ScPreviewShell ::RegisterInterface(pMod);
+ ScDrawShell ::RegisterInterface(pMod);
+ ScDrawFormShell ::RegisterInterface(pMod);
+ ScDrawTextObjectBar ::RegisterInterface(pMod);
+ ScEditShell ::RegisterInterface(pMod);
+ ScPivotShell ::RegisterInterface(pMod);
+ ScAuditingShell ::RegisterInterface(pMod);
+ ScFormatShell ::RegisterInterface(pMod);
+ ScCellShell ::RegisterInterface(pMod);
+ ScOleObjectShell ::RegisterInterface(pMod);
+ ScChartShell ::RegisterInterface(pMod);
+ ScGraphicShell ::RegisterInterface(pMod);
+ ScMediaShell ::RegisterInterface(pMod);
+ ScPageBreakShell ::RegisterInterface(pMod);
+
+ // eigene Controller
+ ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSERT, pMod);
+ ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSCELLS, pMod);
+ ScTbxInsertCtrl ::RegisterControl(SID_TBXCTL_INSOBJ, pMod);
ScZoomSliderControl ::RegisterControl(SID_PREVIEW_SCALINGFACTOR, pMod);
- // Svx-Toolbox-Controller
+ // Svx-Toolbox-Controller
SvxTbxCtlDraw ::RegisterControl(SID_INSERT_DRAW, pMod);
- SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_BASIC, pMod);
- SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_SYMBOL, pMod);
- SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_ARROW, pMod);
- SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_FLOWCHART, pMod);
- SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_CALLOUT, pMod);
- SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_STAR, pMod);
- SvxTbxCtlAlign ::RegisterControl(SID_OBJECT_ALIGN, pMod);
- SvxFillToolBoxControl ::RegisterControl(0, pMod);
- SvxLineStyleToolBoxControl ::RegisterControl(0, pMod);
- SvxLineWidthToolBoxControl ::RegisterControl(0, pMod);
- SvxLineColorToolBoxControl ::RegisterControl(0, pMod);
- SvxLineEndToolBoxControl ::RegisterControl(SID_ATTR_LINEEND_STYLE, pMod);
- SvxStyleToolBoxControl ::RegisterControl(SID_STYLE_APPLY, pMod);
- SvxFontNameToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONT, pMod);
-// SvxFontHeightToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod);
- SvxFontColorToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR, pMod);
- SvxColorToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR, pMod);
- SvxFrameToolBoxControl ::RegisterControl(SID_ATTR_BORDER, pMod);
- SvxFrameLineStyleToolBoxControl ::RegisterControl(SID_FRAME_LINESTYLE, pMod);
- SvxFrameLineColorToolBoxControl ::RegisterControl(SID_FRAME_LINECOLOR, pMod);
- SvxClipBoardControl ::RegisterControl(SID_PASTE, pMod );
- SvxUndoRedoControl ::RegisterControl(SID_UNDO, pMod );
- SvxUndoRedoControl ::RegisterControl(SID_REDO, pMod );
+ SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_BASIC, pMod);
+ SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_SYMBOL, pMod);
+ SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_ARROW, pMod);
+ SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_FLOWCHART, pMod);
+ SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_CALLOUT, pMod);
+ SvxTbxCtlCustomShapes ::RegisterControl(SID_DRAWTBX_CS_STAR, pMod);
+ SvxTbxCtlAlign ::RegisterControl(SID_OBJECT_ALIGN, pMod);
+ SvxFillToolBoxControl ::RegisterControl(0, pMod);
+ SvxLineStyleToolBoxControl ::RegisterControl(0, pMod);
+ SvxLineWidthToolBoxControl ::RegisterControl(0, pMod);
+ SvxLineColorToolBoxControl ::RegisterControl(0, pMod);
+ SvxLineEndToolBoxControl ::RegisterControl(SID_ATTR_LINEEND_STYLE, pMod);
+ SvxStyleToolBoxControl ::RegisterControl(SID_STYLE_APPLY, pMod);
+ SvxFontNameToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONT, pMod);
+// SvxFontHeightToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod);
+ SvxFontColorToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR, pMod);
+ SvxColorToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR, pMod);
+ SvxFrameToolBoxControl ::RegisterControl(SID_ATTR_BORDER, pMod);
+ SvxFrameLineStyleToolBoxControl ::RegisterControl(SID_FRAME_LINESTYLE, pMod);
+ SvxFrameLineColorToolBoxControl ::RegisterControl(SID_FRAME_LINECOLOR, pMod);
+ SvxClipBoardControl ::RegisterControl(SID_PASTE, pMod );
+ SvxUndoRedoControl ::RegisterControl(SID_UNDO, pMod );
+ SvxUndoRedoControl ::RegisterControl(SID_REDO, pMod );
svx::FormatPaintBrushToolBoxControl::RegisterControl(SID_FORMATPAINTBRUSH, pMod );
- SvxGrafModeToolBoxControl ::RegisterControl(SID_ATTR_GRAF_MODE, pMod);
- SvxGrafRedToolBoxControl ::RegisterControl(SID_ATTR_GRAF_RED, pMod);
- SvxGrafGreenToolBoxControl ::RegisterControl(SID_ATTR_GRAF_GREEN, pMod);
- SvxGrafBlueToolBoxControl ::RegisterControl(SID_ATTR_GRAF_BLUE, pMod);
- SvxGrafLuminanceToolBoxControl ::RegisterControl(SID_ATTR_GRAF_LUMINANCE, pMod);
- SvxGrafContrastToolBoxControl ::RegisterControl(SID_ATTR_GRAF_CONTRAST, pMod);
- SvxGrafGammaToolBoxControl ::RegisterControl(SID_ATTR_GRAF_GAMMA, pMod);
+ SvxGrafModeToolBoxControl ::RegisterControl(SID_ATTR_GRAF_MODE, pMod);
+ SvxGrafRedToolBoxControl ::RegisterControl(SID_ATTR_GRAF_RED, pMod);
+ SvxGrafGreenToolBoxControl ::RegisterControl(SID_ATTR_GRAF_GREEN, pMod);
+ SvxGrafBlueToolBoxControl ::RegisterControl(SID_ATTR_GRAF_BLUE, pMod);
+ SvxGrafLuminanceToolBoxControl ::RegisterControl(SID_ATTR_GRAF_LUMINANCE, pMod);
+ SvxGrafContrastToolBoxControl ::RegisterControl(SID_ATTR_GRAF_CONTRAST, pMod);
+ SvxGrafGammaToolBoxControl ::RegisterControl(SID_ATTR_GRAF_GAMMA, pMod);
SvxGrafTransparenceToolBoxControl::RegisterControl(SID_ATTR_GRAF_TRANSPARENCE, pMod);
- SvxGrafFilterToolBoxControl ::RegisterControl(SID_GRFFILTER, pMod);
+ SvxGrafFilterToolBoxControl ::RegisterControl(SID_GRFFILTER, pMod);
SvxVertTextTbxCtrl::RegisterControl(SID_DRAW_CAPTION_VERTICAL, pMod);
SvxVertTextTbxCtrl::RegisterControl(SID_DRAW_TEXT_VERTICAL, pMod);
@@ -268,77 +268,77 @@ void ScDLL::Init()
::sfx2::TaskPaneWrapper::RegisterChildWindow( FALSE, pMod );
// Svx-StatusBar-Controller
- SvxInsertStatusBarControl ::RegisterControl(SID_ATTR_INSERT, pMod);
- SvxSelectionModeControl ::RegisterControl(SID_STATUS_SELMODE, pMod);
- SvxZoomStatusBarControl ::RegisterControl(SID_ATTR_ZOOM, pMod);
+ SvxInsertStatusBarControl ::RegisterControl(SID_ATTR_INSERT, pMod);
+ SvxSelectionModeControl ::RegisterControl(SID_STATUS_SELMODE, pMod);
+ SvxZoomStatusBarControl ::RegisterControl(SID_ATTR_ZOOM, pMod);
SvxZoomSliderControl ::RegisterControl(SID_ATTR_ZOOMSLIDER, pMod);
- SvxModifyControl ::RegisterControl(SID_DOC_MODIFIED, pMod);
+ SvxModifyControl ::RegisterControl(SID_DOC_MODIFIED, pMod);
XmlSecStatusBarControl ::RegisterControl( SID_SIGNATURE, pMod );
- SvxPosSizeStatusBarControl ::RegisterControl(SID_ATTR_SIZE, pMod);
+ SvxPosSizeStatusBarControl ::RegisterControl(SID_ATTR_SIZE, pMod);
// Svx-Menue-Controller
- SvxFontMenuControl ::RegisterControl(SID_ATTR_CHAR_FONT, pMod);
- SvxFontSizeMenuControl ::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod);
+ SvxFontMenuControl ::RegisterControl(SID_ATTR_CHAR_FONT, pMod);
+ SvxFontSizeMenuControl ::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod);
// CustomShape extrusion controller
svx::ExtrusionColorControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod );
svx::FontWorkShapeTypeControl::RegisterControl( SID_FONTWORK_SHAPE_TYPE, pMod );
- // Child-Windows
+ // Child-Windows
// Hack: Eingabezeile mit 42 registrieren, damit sie im PlugIn immer sichtbar ist
- ScInputWindowWrapper ::RegisterChildWindow(42, pMod, SFX_CHILDWIN_TASK|SFX_CHILDWIN_FORCEDOCK);
+ ScInputWindowWrapper ::RegisterChildWindow(42, pMod, SFX_CHILDWIN_TASK|SFX_CHILDWIN_FORCEDOCK);
ScNavigatorDialogWrapper ::RegisterChildWindowContext(
sal::static_int_cast<sal_uInt16>(ScTabViewShell::GetInterfaceId()), pMod);
- ScSolverDlgWrapper ::RegisterChildWindow(FALSE, pMod);
+ ScSolverDlgWrapper ::RegisterChildWindow(FALSE, pMod);
ScOptSolverDlgWrapper ::RegisterChildWindow(FALSE, pMod);
- ScNameDlgWrapper ::RegisterChildWindow(FALSE, pMod);
- ScPivotLayoutWrapper ::RegisterChildWindow(FALSE, pMod);
- ScTabOpDlgWrapper ::RegisterChildWindow(FALSE, pMod);
- ScFilterDlgWrapper ::RegisterChildWindow(FALSE, pMod);
- ScSpecialFilterDlgWrapper ::RegisterChildWindow(FALSE, pMod);
- ScDbNameDlgWrapper ::RegisterChildWindow(FALSE, pMod);
- ScConsolidateDlgWrapper ::RegisterChildWindow(FALSE, pMod);
- ScPrintAreasDlgWrapper ::RegisterChildWindow(FALSE, pMod);
- ScCondFormatDlgWrapper ::RegisterChildWindow(FALSE, pMod);
+ ScNameDlgWrapper ::RegisterChildWindow(FALSE, pMod);
+ ScPivotLayoutWrapper ::RegisterChildWindow(FALSE, pMod);
+ ScTabOpDlgWrapper ::RegisterChildWindow(FALSE, pMod);
+ ScFilterDlgWrapper ::RegisterChildWindow(FALSE, pMod);
+ ScSpecialFilterDlgWrapper ::RegisterChildWindow(FALSE, pMod);
+ ScDbNameDlgWrapper ::RegisterChildWindow(FALSE, pMod);
+ ScConsolidateDlgWrapper ::RegisterChildWindow(FALSE, pMod);
+ ScPrintAreasDlgWrapper ::RegisterChildWindow(FALSE, pMod);
+ ScCondFormatDlgWrapper ::RegisterChildWindow(FALSE, pMod);
ScColRowNameRangesDlgWrapper::RegisterChildWindow(FALSE, pMod);
- ScFormulaDlgWrapper ::RegisterChildWindow(FALSE, pMod);
+ ScFormulaDlgWrapper ::RegisterChildWindow(FALSE, pMod);
// First docking Window for Calc
- ScFunctionChildWindow ::RegisterChildWindow(FALSE, pMod);
+ ScFunctionChildWindow ::RegisterChildWindow(FALSE, pMod);
// Redlining- Window
- ScAcceptChgDlgWrapper ::RegisterChildWindow(FALSE, pMod);
+ ScAcceptChgDlgWrapper ::RegisterChildWindow(FALSE, pMod);
ScSimpleRefDlgWrapper ::RegisterChildWindow(FALSE, pMod, SFX_CHILDWIN_ALWAYSAVAILABLE|SFX_CHILDWIN_NEVERHIDE );
- ScHighlightChgDlgWrapper ::RegisterChildWindow(FALSE, pMod);
+ ScHighlightChgDlgWrapper ::RegisterChildWindow(FALSE, pMod);
SvxSearchDialogWrapper ::RegisterChildWindow(FALSE, pMod);
SvxHlinkDlgWrapper ::RegisterChildWindow(FALSE, pMod);
- SvxFontWorkChildWindow ::RegisterChildWindow(FALSE, pMod);
- SvxHyperlinkDlgWrapper ::RegisterChildWindow(FALSE, pMod, SFX_CHILDWIN_FORCEDOCK);
- SvxIMapDlgChildWindow ::RegisterChildWindow(FALSE, pMod);
- GalleryChildWindow ::RegisterChildWindow(FALSE, pMod);
+ SvxFontWorkChildWindow ::RegisterChildWindow(FALSE, pMod);
+ SvxHyperlinkDlgWrapper ::RegisterChildWindow(FALSE, pMod, SFX_CHILDWIN_FORCEDOCK);
+ SvxIMapDlgChildWindow ::RegisterChildWindow(FALSE, pMod);
+ GalleryChildWindow ::RegisterChildWindow(FALSE, pMod);
ScSpellDialogChildWindow ::RegisterChildWindow(FALSE, pMod);
- ::avmedia::MediaPlayer ::RegisterChildWindow(FALSE, pMod);
+ ::avmedia::MediaPlayer ::RegisterChildWindow(FALSE, pMod);
//<!--Added by PengYunQuan for Validity Cell Range Picker
ScValidityRefChildWin::RegisterChildWindow(FALSE, pMod);
//-->Added by PengYunQuan for Validity Cell Range Picker
-
- // Edit-Engine-Felder, soweit nicht schon in OfficeApplication::Init
+
+ // Edit-Engine-Felder, soweit nicht schon in OfficeApplication::Init
SvClassManager& rClassManager = SvxFieldItem::GetClassManager();
-// rClassManager.SV_CLASS_REGISTER( SvxURLField );
-// rClassManager.SV_CLASS_REGISTER( SvxDateField );
-// rClassManager.SV_CLASS_REGISTER( SvxPageField );
+// rClassManager.SV_CLASS_REGISTER( SvxURLField );
+// rClassManager.SV_CLASS_REGISTER( SvxDateField );
+// rClassManager.SV_CLASS_REGISTER( SvxPageField );
rClassManager.SV_CLASS_REGISTER( SvxPagesField );
-// rClassManager.SV_CLASS_REGISTER( SvxTimeField );
+// rClassManager.SV_CLASS_REGISTER( SvxTimeField );
rClassManager.SV_CLASS_REGISTER( SvxFileField );
-// rClassManager.SV_CLASS_REGISTER( SvxExtFileField );
+// rClassManager.SV_CLASS_REGISTER( SvxExtFileField );
rClassManager.SV_CLASS_REGISTER( SvxTableField );
- SdrRegisterFieldClasses(); // SvDraw-Felder registrieren
+ SdrRegisterFieldClasses(); // SvDraw-Felder registrieren
// 3D-Objekt-Factory eintragen
E3dObjFactory();
@@ -348,7 +348,7 @@ void ScDLL::Init()
pMod->PutItem( SfxUInt16Item( SID_ATTR_METRIC, sal::static_int_cast<UINT16>(pMod->GetAppOptions().GetAppMetric()) ) );
- // StarOne Services are now handled in the registry
+ // StarOne Services are now handled in the registry
}
void ScDLL::Exit()
@@ -358,14 +358,14 @@ void ScDLL::Exit()
delete (*ppShlPtr);
(*ppShlPtr) = NULL;
- // ScGlobal::Clear ist schon im Module-dtor
+ // ScGlobal::Clear ist schon im Module-dtor
}
//------------------------------------------------------------------
-// Statusbar
+// Statusbar
//------------------------------------------------------------------
-#define TEXT_WIDTH(s) rStatusBar.GetTextWidth((s))
+#define TEXT_WIDTH(s) rStatusBar.GetTextWidth((s))
//UNUSED2008-05 void ScDLL::FillStatusBar(StatusBar &rStatusBar)
//UNUSED2008-05 {
@@ -373,40 +373,40 @@ void ScDLL::Exit()
//UNUSED2008-05 rStatusBar.InsertItem( SID_STATUS_DOCPOS,
//UNUSED2008-05 TEXT_WIDTH( String().Fill( 10, 'X' ) ),
//UNUSED2008-05 SIB_LEFT|SIB_AUTOSIZE );
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 // Seitenvorlage
//UNUSED2008-05 rStatusBar.InsertItem( SID_STATUS_PAGESTYLE,
//UNUSED2008-05 TEXT_WIDTH( String().Fill( 15, 'X' ) ),
//UNUSED2008-05 SIB_LEFT|SIB_AUTOSIZE );
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 // Ma"sstab
//UNUSED2008-05 rStatusBar.InsertItem( SID_ATTR_ZOOM,
//UNUSED2008-05 SvxZoomStatusBarControl::GetDefItemWidth(rStatusBar),
//UNUSED2008-05 SIB_CENTER );
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 // Einfuege-/Ueberschreibmodus
//UNUSED2008-05 rStatusBar.InsertItem( SID_ATTR_INSERT,
//UNUSED2008-05 SvxInsertStatusBarControl::GetDefItemWidth(rStatusBar),
//UNUSED2008-05 SIB_CENTER );
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 // Selektionsmodus
//UNUSED2008-05 rStatusBar.InsertItem( SID_STATUS_SELMODE,
//UNUSED2008-05 SvxSelectionModeControl::GetDefItemWidth(rStatusBar),
//UNUSED2008-05 SIB_CENTER );
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 // Dokument geaendert
//UNUSED2008-05 rStatusBar.InsertItem( SID_DOC_MODIFIED,
//UNUSED2008-05 SvxModifyControl::GetDefItemWidth(rStatusBar));
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 // signatures
//UNUSED2008-05 rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW );
//UNUSED2008-05 rStatusBar.SetHelpId(SID_SIGNATURE, SID_SIGNATURE);
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 // Mail
//UNUSED2008-05 rStatusBar.InsertItem( SID_MAIL_NOTIFY,
//UNUSED2008-05 TEXT_WIDTH( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Mail")) ),
//UNUSED2008-05 SIB_CENTER );
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 // den aktuellen Kontext anzeigen Uhrzeit / FramePos / TabellenInfo / Errors
//UNUSED2008-05 rStatusBar.InsertItem( SID_ATTR_SIZE,
//UNUSED2008-05 SvxPosSizeStatusBarControl::GetDefItemWidth(rStatusBar),
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 272852efcf71..92d26176622c 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +117,10 @@
#include "scabstdlg.hxx" //CHINA001
-#define SC_IDLE_MIN 150
-#define SC_IDLE_MAX 3000
-#define SC_IDLE_STEP 75
-#define SC_IDLE_COUNT 50
+#define SC_IDLE_MIN 150
+#define SC_IDLE_MAX 3000
+#define SC_IDLE_STEP 75
+#define SC_IDLE_COUNT 50
static USHORT nIdleCount = 0;
@@ -130,7 +130,7 @@ SFX_IMPL_INTERFACE( ScModule, SfxShell, ScResId(RID_APPTITLE) )
{
SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER,
ScResId(RID_OBJECTBAR_APP) );
- SFX_STATUSBAR_REGISTRATION( ScResId(SCCFG_STATUSBAR) ); // nur ID wichtig
+ SFX_STATUSBAR_REGISTRATION( ScResId(SCCFG_STATUSBAR) ); // nur ID wichtig
SFX_CHILDWINDOW_REGISTRATION( SvxHyperlinkDlgWrapper::GetChildWindowId() );
}
@@ -162,19 +162,19 @@ ScModule::ScModule( SfxObjectFactory* pFact ) :
mbIsInSharedDocLoading( false ),
mbIsInSharedDocSaving( false )
{
- // im ctor ist der ResManager (DLL-Daten) noch nicht initialisiert!
+ // im ctor ist der ResManager (DLL-Daten) noch nicht initialisiert!
- SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("StarCalc"))); // fuer Basic
+ SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("StarCalc"))); // fuer Basic
ResetDragObject();
SetClipObject( NULL, NULL );
- // InputHandler braucht nicht mehr angelegt zu werden
+ // InputHandler braucht nicht mehr angelegt zu werden
- // ErrorHandler anlegen - war in Init()
- // zwischen OfficeApplication::Init und ScGlobal::Init
+ // ErrorHandler anlegen - war in Init()
+ // zwischen OfficeApplication::Init und ScGlobal::Init
SvxErrorHandler::Get();
- pErrorHdl = new SfxErrorHandler( RID_ERRHDLSC,
+ pErrorHdl = new SfxErrorHandler( RID_ERRHDLSC,
ERRCODE_AREA_SC,
ERRCODE_AREA_APP2-1,
GetResMgr() );
@@ -190,25 +190,25 @@ ScModule::ScModule( SfxObjectFactory* pFact ) :
SetPool( pMessagePool );
ScGlobal::InitTextHeight( pMessagePool );
- StartListening( *SFX_APP() ); // for SFX_HINT_DEINITIALIZING
+ StartListening( *SFX_APP() ); // for SFX_HINT_DEINITIALIZING
}
ScModule::~ScModule()
{
DBG_ASSERT( !pSelTransfer, "Selection Transfer object not deleted" );
- // InputHandler braucht nicht mehr geloescht zu werden (gibt keinen an der App mehr)
+ // InputHandler braucht nicht mehr geloescht zu werden (gibt keinen an der App mehr)
SfxItemPool::Free(pMessagePool);
DELETEZ( pFormEditData );
delete pErrorHdl;
-// delete pSvxErrorHdl;
+// delete pSvxErrorHdl;
- ScGlobal::Clear(); // ruft auch ScDocumentPool::DeleteVersionMaps();
+ ScGlobal::Clear(); // ruft auch ScDocumentPool::DeleteVersionMaps();
- DeleteCfg(); // wurde mal aus Exit() gerufen
+ DeleteCfg(); // wurde mal aus Exit() gerufen
}
//------------------------------------------------------------------
@@ -216,8 +216,8 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3
{
if ( p == pColorConfig || p == pAccessOptions )
{
- // Test if detective objects have to be updated with new colors
- // (if the detective colors haven't been used yet, there's nothing to update)
+ // Test if detective objects have to be updated with new colors
+ // (if the detective colors haven't been used yet, there's nothing to update)
if ( ScDetectiveFunc::IsColorsInitialized() )
{
const svtools::ColorConfig& rColors = GetColorConfig();
@@ -228,10 +228,10 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3
( ScDetectiveFunc::GetCommentColor() != (ColorData)rColors.GetColorValue(svtools::CALCNOTESBACKGROUND).nColor );
if ( bArrows || bComments )
{
- ScDetectiveFunc::InitializeColors(); // get the new colors
+ ScDetectiveFunc::InitializeColors(); // get the new colors
- // update detective objects in all open documents
- SfxObjectShell* pObjSh = SfxObjectShell::GetFirst();
+ // update detective objects in all open documents
+ SfxObjectShell* pObjSh = SfxObjectShell::GetFirst();
while ( pObjSh )
{
if ( pObjSh->Type() == TYPE(ScDocShell) )
@@ -247,7 +247,7 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3
}
}
- // force all views to repaint, using the new options
+ // force all views to repaint, using the new options
SfxViewShell* pViewShell = SfxViewShell::GetFirst();
while(pViewShell)
@@ -262,7 +262,7 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3
ScInputHandler* pHdl = pViewSh->GetInputHandler();
if ( pHdl )
- pHdl->ForgetLastPattern(); // EditEngine BackgroundColor may change
+ pHdl->ForgetLastPattern(); // EditEngine BackgroundColor may change
}
else if ( pViewShell->ISA(ScPreviewShell) )
{
@@ -275,8 +275,8 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3
}
else if ( p == pCTLOptions )
{
- // for all documents: set digit language for printer, recalc output factor, update row heights
- SfxObjectShell* pObjSh = SfxObjectShell::GetFirst();
+ // for all documents: set digit language for printer, recalc output factor, update row heights
+ SfxObjectShell* pObjSh = SfxObjectShell::GetFirst();
while ( pObjSh )
{
if ( pObjSh->Type() == TYPE(ScDocShell) )
@@ -295,7 +295,7 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3
pObjSh = SfxObjectShell::GetNext( *pObjSh );
}
- // for all views (table and preview): update digit language
+ // for all views (table and preview): update digit language
SfxViewShell* pSh = SfxViewShell::GetFirst();
while ( pSh )
{
@@ -303,7 +303,7 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3
{
ScTabViewShell* pViewSh = (ScTabViewShell*)pSh;
- // set ref-device for EditEngine (re-evaluates digit settings)
+ // set ref-device for EditEngine (re-evaluates digit settings)
ScInputHandler* pHdl = GetInputHdl(pViewSh);
if (pHdl)
pHdl->UpdateRefDevice();
@@ -332,7 +332,7 @@ void ScModule::Notify( SfxBroadcaster&, const SfxHint& rHint )
ULONG nHintId = ((SfxSimpleHint&)rHint).GetId();
if ( nHintId == SFX_HINT_DEINITIALIZING )
{
- // ConfigItems must be removed before ConfigManager
+ // ConfigItems must be removed before ConfigManager
DeleteCfg();
}
}
@@ -373,7 +373,7 @@ void ScModule::DeleteCfg()
//------------------------------------------------------------------
-#define TEXT_WIDTH(s) rStatusBar.GetTextWidth((s))
+#define TEXT_WIDTH(s) rStatusBar.GetTextWidth((s))
void ScModule::FillStatusBar(StatusBar& rStatusBar)
{
@@ -435,7 +435,7 @@ void ScModule::FillStatusBar(StatusBar& rStatusBar)
//------------------------------------------------------------------
//
-// von der Applikation verschoben:
+// von der Applikation verschoben:
//
//------------------------------------------------------------------
@@ -444,8 +444,8 @@ void ScModule::Execute( SfxRequest& rReq )
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
SfxBindings* pBindings = pViewFrm ? &pViewFrm->GetBindings() : NULL;
- const SfxItemSet* pReqArgs = rReq.GetArgs();
- USHORT nSlot = rReq.GetSlot();
+ const SfxItemSet* pReqArgs = rReq.GetArgs();
+ USHORT nSlot = rReq.GetSlot();
switch ( nSlot )
{
@@ -476,7 +476,7 @@ void ScModule::Execute( SfxRequest& rReq )
if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( nSlot, TRUE, &pItem ) )
bSet = ((const SfxBoolItem*)pItem)->GetValue();
else
- { // Toggle
+ { // Toggle
ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current());
if ( pDocSh )
bSet = !pDocSh->GetDocument()->GetDocOptions().IsAutoSpell();
@@ -499,7 +499,7 @@ void ScModule::Execute( SfxRequest& rReq )
FieldUnit eUnit = (FieldUnit)((const SfxUInt16Item*)pItem)->GetValue();
switch( eUnit )
{
- case FUNIT_MM: // nur die Einheiten, die auch im Dialog stehen
+ case FUNIT_MM: // nur die Einheiten, die auch im Dialog stehen
case FUNIT_CM:
case FUNIT_INCH:
case FUNIT_PICA:
@@ -564,7 +564,7 @@ void ScModule::Execute( SfxRequest& rReq )
if (pBindings)
{
pBindings->Invalidate( SID_TABLE_CELL );
- pBindings->Update( SID_TABLE_CELL ); // sofort
+ pBindings->Update( SID_TABLE_CELL ); // sofort
pBindings->Invalidate( SID_PSZ_FUNCTION );
pBindings->Update( SID_PSZ_FUNCTION );
@@ -602,10 +602,10 @@ void ScModule::Execute( SfxRequest& rReq )
ScInputHandler* pInputHandler = GetInputHdl();
if ( pInputHandler )
- pInputHandler->UpdateSpellSettings(); // EditEngine-Flags
+ pInputHandler->UpdateSpellSettings(); // EditEngine-Flags
ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current());
if ( pViewSh )
- pViewSh->UpdateDrawTextOutliner(); // EditEngine-Flags
+ pViewSh->UpdateDrawTextOutliner(); // EditEngine-Flags
pDocSh->SetDocumentModified();
}
@@ -684,8 +684,8 @@ void ScModule::GetState( SfxItemSet& rSet )
}
break;
case SID_ATTR_LANGUAGE:
- case ATTR_CJK_FONT_LANGUAGE: // WID for SID_ATTR_CHAR_CJK_LANGUAGE
- case ATTR_CTL_FONT_LANGUAGE: // WID for SID_ATTR_CHAR_CTL_LANGUAGE
+ case ATTR_CJK_FONT_LANGUAGE: // WID for SID_ATTR_CHAR_CJK_LANGUAGE
+ case ATTR_CTL_FONT_LANGUAGE: // WID for SID_ATTR_CHAR_CTL_LANGUAGE
{
ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current());
ScDocument* pDoc = pDocSh ? pDocSh->GetDocument() : NULL;
@@ -748,9 +748,9 @@ void ScModule::SetDragLink( const String& rDoc, const String& rTab, const String
{
ResetDragObject();
- aDragData.aLinkDoc = rDoc;
+ aDragData.aLinkDoc = rDoc;
aDragData.aLinkTable = rTab;
- aDragData.aLinkArea = rArea;
+ aDragData.aLinkArea = rArea;
}
void ScModule::SetDragJump( ScDocument* pLocalDoc, const String& rTarget, const String& rText )
@@ -774,7 +774,7 @@ void ScModule::SetClipObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawO
ScDocument* ScModule::GetClipDoc()
{
- // called from document
+ // called from document
ScTransferObj* pObj = ScTransferObj::GetOwnClipboard( NULL );
if (pObj)
@@ -836,7 +836,7 @@ const ScDocOptions& ScModule::GetDocOptions()
return *pDocCfg;
}
-#ifndef LRU_MAX
+#ifndef LRU_MAX
#define LRU_MAX 10
#endif
@@ -846,27 +846,27 @@ void ScModule::InsertEntryToLRUList(USHORT nFIndex)
{
const ScAppOptions& rAppOpt = GetAppOptions();
USHORT nLRUFuncCount = Min( rAppOpt.GetLRUFuncListCount(), (USHORT)LRU_MAX );
- USHORT* pLRUListIds = rAppOpt.GetLRUFuncList();
+ USHORT* pLRUListIds = rAppOpt.GetLRUFuncList();
- USHORT aIdxList[LRU_MAX];
- USHORT n = 0;
- BOOL bFound = FALSE;
+ USHORT aIdxList[LRU_MAX];
+ USHORT n = 0;
+ BOOL bFound = FALSE;
- while ((n < LRU_MAX) && n<nLRUFuncCount) // alte Liste abklappern
+ while ((n < LRU_MAX) && n<nLRUFuncCount) // alte Liste abklappern
{
if (!bFound && (pLRUListIds[n]== nFIndex))
- bFound = TRUE; // erster! Treffer
+ bFound = TRUE; // erster! Treffer
else if (bFound)
- aIdxList[n ] = pLRUListIds[n]; // hinter Treffer kopieren
+ aIdxList[n ] = pLRUListIds[n]; // hinter Treffer kopieren
else if ((n+1) < LRU_MAX)
- aIdxList[n+1] = pLRUListIds[n]; // vor Treffer verschieben
+ aIdxList[n+1] = pLRUListIds[n]; // vor Treffer verschieben
n++;
}
- if (!bFound && (n < LRU_MAX)) // Eintrag nicht gefunden?
- n++; // einen mehr
- aIdxList[0] = nFIndex; // Current on Top
+ if (!bFound && (n < LRU_MAX)) // Eintrag nicht gefunden?
+ n++; // einen mehr
+ aIdxList[0] = nFIndex; // Current on Top
- ScAppOptions aNewOpts(rAppOpt); // an App melden
+ ScAppOptions aNewOpts(rAppOpt); // an App melden
aNewOpts.SetLRUFuncList(aIdxList, n);
SetAppOptions(aNewOpts);
@@ -876,10 +876,10 @@ void ScModule::InsertEntryToLRUList(USHORT nFIndex)
void ScModule::RecentFunctionsChanged()
{
- // update function list window
+ // update function list window
USHORT nFuncListID = ScFunctionChildWindow::GetChildWindowId();
- //! notify all views
+ //! notify all views
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
if ( pViewFrm && pViewFrm->HasChildWindow(nFuncListID) )
{
@@ -1012,12 +1012,12 @@ USHORT ScModule::GetOptDigitLanguage()
//------------------------------------------------------------------
//
-// Optionen
+// Optionen
//
//------------------------------------------------------------------
//
-// ModifyOptions - Items aus Calc-Options-Dialog
+// ModifyOptions - Items aus Calc-Options-Dialog
// und SID_AUTOSPELL_CHECK
//
@@ -1042,23 +1042,23 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
SfxBindings* pBindings = pViewFrm ? &pViewFrm->GetBindings() : NULL;
- ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current());
- ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current());
- ScDocument* pDoc = pDocSh ? pDocSh->GetDocument() : NULL;
- const SfxPoolItem* pItem = NULL;
- BOOL bRepaint = FALSE;
- BOOL bUpdateMarks = FALSE;
- BOOL bUpdateRefDev = FALSE;
- BOOL bCalcAll = FALSE;
- BOOL bSaveSpellCheck = FALSE;
- BOOL bSaveAppOptions = FALSE;
- BOOL bSaveInputOptions = FALSE;
+ ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current());
+ ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current());
+ ScDocument* pDoc = pDocSh ? pDocSh->GetDocument() : NULL;
+ const SfxPoolItem* pItem = NULL;
+ BOOL bRepaint = FALSE;
+ BOOL bUpdateMarks = FALSE;
+ BOOL bUpdateRefDev = FALSE;
+ BOOL bCalcAll = FALSE;
+ BOOL bSaveSpellCheck = FALSE;
+ BOOL bSaveAppOptions = FALSE;
+ BOOL bSaveInputOptions = FALSE;
//--------------------------------------------------------------------------
// SFX_APP()->SetOptions( rOptSet );
- // Linguistik nicht mehr
+ // Linguistik nicht mehr
if ( IS_AVAILABLE(SID_ATTR_METRIC,pItem) )
{
@@ -1089,15 +1089,15 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
if ( pViewSh )
{
- ScViewData* pViewData = pViewSh->GetViewData();
- const ScViewOptions& rOldOpt = pViewData->GetOptions();
+ ScViewData* pViewData = pViewSh->GetViewData();
+ const ScViewOptions& rOldOpt = pViewData->GetOptions();
BOOL bAnchorList = ( rOldOpt.GetOption( VOPT_ANCHOR ) !=
rNewOpt.GetOption( VOPT_ANCHOR ) );
if ( rOldOpt != rNewOpt )
{
- pViewData->SetOptions( rNewOpt ); // veraendert rOldOpt
+ pViewData->SetOptions( rNewOpt ); // veraendert rOldOpt
pViewData->GetDocument()->SetViewOptions( rNewOpt );
pDocSh->SetDocumentModified();
bRepaint = TRUE;
@@ -1121,8 +1121,8 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
if ( pViewSh )
{
- ScViewData* pViewData = pViewSh->GetViewData();
- ScViewOptions aNewViewOpt( pViewData->GetOptions() );
+ ScViewData* pViewData = pViewSh->GetViewData();
+ ScViewOptions aNewViewOpt( pViewData->GetOptions() );
const ScGridOptions& rOldGridOpt = aNewViewOpt.GetGridOptions();
if ( rOldGridOpt != aNewGridOpt )
@@ -1151,7 +1151,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
if ( IS_AVAILABLE(SID_SCDOCOPTIONS,pItem) )
{
- const ScDocOptions& rNewOpt = ((const ScTpCalcItem*)pItem)->GetDocOptions();
+ const ScDocOptions& rNewOpt = ((const ScTpCalcItem*)pItem)->GetDocOptions();
if ( pDoc )
{
@@ -1167,7 +1167,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
|| (rNewOpt.IsCalcAsShown() &&
rOldOpt.GetStdPrecision() != rNewOpt.GetStdPrecision())
|| rOldOpt.IsMatchWholeCell() != rNewOpt.IsMatchWholeCell()
- || rOldOpt.GetYear2000() != rNewOpt.GetYear2000()
+ || rOldOpt.GetYear2000() != rNewOpt.GetYear2000()
|| rOldOpt.IsFormulaRegexEnabled() != rNewOpt.IsFormulaRegexEnabled()
);
pDoc->SetDocOptions( rNewOpt );
@@ -1195,9 +1195,9 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
}
}
- // AutoSpell nach den Doc-Options (weil Member)
+ // AutoSpell nach den Doc-Options (weil Member)
- if ( IS_AVAILABLE(SID_AUTOSPELL_CHECK,pItem) ) // an Doc-Options
+ if ( IS_AVAILABLE(SID_AUTOSPELL_CHECK,pItem) ) // an Doc-Options
{
BOOL bDoAutoSpell = ((const SfxBoolItem*)pItem)->GetValue();
@@ -1210,18 +1210,18 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
pDoc->SetDocOptions( aNewOpt );
if (bDoAutoSpell)
- pDoc->SetOnlineSpellPos( ScAddress(0,0,0) ); // vorne anfangen
+ pDoc->SetOnlineSpellPos( ScAddress(0,0,0) ); // vorne anfangen
else
{
WaitObject aWait( pDocSh->GetActiveDialogParent() );
- pDoc->RemoveAutoSpellObj(); // Edit-Text-Objekte wieder zurueckwandeln
+ pDoc->RemoveAutoSpellObj(); // Edit-Text-Objekte wieder zurueckwandeln
}
//#92038#; don't set document modified, because this flag is no longer saved
-// pDocSh->SetDocumentModified();
+// pDocSh->SetDocumentModified();
- bRepaint = TRUE; // weil HideAutoSpell evtl. ungueltig
- //! alle Views painten ???
+ bRepaint = TRUE; // weil HideAutoSpell evtl. ungueltig
+ //! alle Views painten ???
}
}
@@ -1231,12 +1231,12 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
bSaveSpellCheck = TRUE;
}
if ( pDocSh )
- pDocSh->PostPaintGridAll(); // wegen Markierungen
+ pDocSh->PostPaintGridAll(); // wegen Markierungen
ScInputHandler* pInputHandler = GetInputHdl();
if ( pInputHandler )
- pInputHandler->UpdateSpellSettings(); // EditEngine-Flags
+ pInputHandler->UpdateSpellSettings(); // EditEngine-Flags
if ( pViewSh )
- pViewSh->UpdateDrawTextOutliner(); // EditEngine-Flags
+ pViewSh->UpdateDrawTextOutliner(); // EditEngine-Flags
if (pBindings)
pBindings->Invalidate( SID_AUTOSPELL_CHECK );
@@ -1307,17 +1307,17 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
const ScPrintOptions& rNewOpt = ((const ScTpPrintItem*)pItem)->GetPrintOptions();
SetPrintOptions( rNewOpt );
- // broadcast causes all previews to recalc page numbers
+ // broadcast causes all previews to recalc page numbers
SFX_APP()->Broadcast( SfxSimpleHint( SID_SCPRINTOPTIONS ) );
}
//----------------------------------------------------------
-// if ( bSaveSpellCheck )
-// {
- // currently LinguProperties are saved only at program exit.
- // if a save method becomes available, it should be called here.
-// }
+// if ( bSaveSpellCheck )
+// {
+ // currently LinguProperties are saved only at program exit.
+ // if a save method becomes available, it should be called here.
+// }
if ( bSaveAppOptions )
pAppCfg->OptionsChanged();
@@ -1363,8 +1363,8 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
if ( bUpdateRefDev )
{
- // for all documents: recalc output factor, update row heights
- SfxObjectShell* pObjSh = SfxObjectShell::GetFirst();
+ // for all documents: recalc output factor, update row heights
+ SfxObjectShell* pObjSh = SfxObjectShell::GetFirst();
while ( pObjSh )
{
if ( pObjSh->Type() == TYPE(ScDocShell) )
@@ -1378,23 +1378,23 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
pObjSh = SfxObjectShell::GetNext( *pObjSh );
}
- // for all (tab-) views:
+ // for all (tab-) views:
TypeId aScType = TYPE(ScTabViewShell);
SfxViewShell* pSh = SfxViewShell::GetFirst( &aScType );
while ( pSh )
{
ScTabViewShell* pOneViewSh = (ScTabViewShell*)pSh;
- // set ref-device for EditEngine
+ // set ref-device for EditEngine
ScInputHandler* pHdl = GetInputHdl(pOneViewSh);
if (pHdl)
pHdl->UpdateRefDevice();
- // update view scale
+ // update view scale
ScViewData* pViewData = pOneViewSh->GetViewData();
pOneViewSh->SetZoom( pViewData->GetZoomX(), pViewData->GetZoomY(), FALSE );
- // repaint
+ // repaint
pOneViewSh->PaintGrid();
pOneViewSh->PaintTop();
pOneViewSh->PaintLeft();
@@ -1408,7 +1408,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
//------------------------------------------------------------------
//
-// Input-Handler
+// Input-Handler
//
//------------------------------------------------------------------
@@ -1429,9 +1429,9 @@ ScInputHandler* ScModule::GetInputHdl( ScTabViewShell* pViewSh, BOOL bUseRef )
}
if ( pViewSh )
- pHdl = pViewSh->GetInputHandler(); // Viewshell hat jetzt immer einen
+ pHdl = pViewSh->GetInputHandler(); // Viewshell hat jetzt immer einen
- // #57989# wenn keine ViewShell uebergeben oder aktiv, kann NULL herauskommen
+ // #57989# wenn keine ViewShell uebergeben oder aktiv, kann NULL herauskommen
DBG_ASSERT( pHdl || !pViewSh, "GetInputHdl: kein InputHandler gefunden" );
return pHdl;
}
@@ -1471,7 +1471,7 @@ BOOL ScModule::InputKeyEvent( const KeyEvent& rKEvt, BOOL bStartEdit )
void ScModule::InputEnterHandler( BYTE nBlockMode )
{
- if ( !SFX_APP()->IsDowning() ) // nicht beim Programmende
+ if ( !SFX_APP()->IsDowning() ) // nicht beim Programmende
{
ScInputHandler* pHdl = GetInputHdl();
if (pHdl)
@@ -1518,7 +1518,7 @@ ScInputHandler* ScModule::GetRefInputHdl()
}
//------------------------------------------------------------------------
-// Olk's Krempel:
+// Olk's Krempel:
void ScModule::InputGetSelection( xub_StrLen& rStart, xub_StrLen& rEnd )
{
@@ -1567,7 +1567,7 @@ void ScModule::ActivateInputWindow( const String* pStrFormula, BOOL bMatrix )
BYTE nMode = bMatrix ? SC_ENTER_MATRIX : SC_ENTER_NORMAL;
pHdl->EnterHandler( nMode );
- // ohne Invalidate bleibt die Selektion stehen, wenn die Formel unveraendert ist
+ // ohne Invalidate bleibt die Selektion stehen, wenn die Formel unveraendert ist
if (pWin)
pWin->TextInvalidate();
}
@@ -1586,14 +1586,14 @@ void ScModule::ActivateInputWindow( const String* pStrFormula, BOOL bMatrix )
//------------------------------------------------------------------
//
-// Referenz - Dialoge
+// Referenz - Dialoge
//
//------------------------------------------------------------------
void ScModule::SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm )
{
- //! move reference dialog handling to view
- //! (only keep function autopilot here for references to other documents)
+ //! move reference dialog handling to view
+ //! (only keep function autopilot here for references to other documents)
if(nCurRefDlgId==0 || (nId==nCurRefDlgId && !bVis))
{
@@ -1603,13 +1603,13 @@ void ScModule::SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm )
// #79379# bindings update causes problems with update of stylist if
// current style family has changed
//if ( pViewFrm )
- // pViewFrm->GetBindings().Update(); // to avoid trouble in LockDispatcher
+ // pViewFrm->GetBindings().Update(); // to avoid trouble in LockDispatcher
- nCurRefDlgId = bVis ? nId : 0 ; // before SetChildWindow
+ nCurRefDlgId = bVis ? nId : 0 ; // before SetChildWindow
if ( pViewFrm )
{
- // store the dialog id also in the view shell
+ // store the dialog id also in the view shell
SfxViewShell* pViewSh = pViewFrm->GetViewShell();
if ( pViewSh && pViewSh->ISA( ScTabViewShell ) )
((ScTabViewShell*)pViewSh)->SetCurRefDlgId( nCurRefDlgId );
@@ -1630,34 +1630,34 @@ void ScModule::SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm )
SfxChildWindow* lcl_GetChildWinFromAnyView( USHORT nId )
{
- // first try the current view
+ // first try the current view
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
// #i46999# current view frame can be null (for example, when closing help)
SfxChildWindow* pChildWnd = pViewFrm ? pViewFrm->GetChildWindow( nId ) : NULL;
if ( pChildWnd )
- return pChildWnd; // found in the current view
+ return pChildWnd; // found in the current view
- // if not found there, get the child window from any open view
- // it can be open only in one view because nCurRefDlgId is global
+ // if not found there, get the child window from any open view
+ // it can be open only in one view because nCurRefDlgId is global
pViewFrm = SfxViewFrame::GetFirst();
while ( pViewFrm )
{
pChildWnd = pViewFrm->GetChildWindow( nId );
if ( pChildWnd )
- return pChildWnd; // found in any view
+ return pChildWnd; // found in any view
pViewFrm = SfxViewFrame::GetNext( *pViewFrm );
}
- return NULL; // none found
+ return NULL; // none found
}
BOOL ScModule::IsModalMode(SfxObjectShell* pDocSh)
{
- //! move reference dialog handling to view
- //! (only keep function autopilot here for references to other documents)
+ //! move reference dialog handling to view
+ //! (only keep function autopilot here for references to other documents)
BOOL bIsModal = FALSE;
@@ -1673,13 +1673,13 @@ BOOL ScModule::IsModalMode(SfxObjectShell* pDocSh)
else
{
// in 592 and above, the dialog isn't visible in other views
- // if the dialog is open but can't be accessed, disable input
+ // if the dialog is open but can't be accessed, disable input
bIsModal = TRUE;
}
- // pChildWnd kann 0 sein, wenn der Dialog nach dem Umschalten
- // von einer anderen Shell noch nicht erzeugt wurde (z.B. in GetFocus)
+ // pChildWnd kann 0 sein, wenn der Dialog nach dem Umschalten
+ // von einer anderen Shell noch nicht erzeugt wurde (z.B. in GetFocus)
}
else if (pDocSh)
{
@@ -1693,12 +1693,12 @@ BOOL ScModule::IsModalMode(SfxObjectShell* pDocSh)
BOOL ScModule::IsTableLocked()
{
- //! move reference dialog handling to view
- //! (only keep function autopilot here for references to other documents)
+ //! move reference dialog handling to view
+ //! (only keep function autopilot here for references to other documents)
BOOL bLocked = FALSE;
- // bisher nur bei ScAnyRefDlg
+ // bisher nur bei ScAnyRefDlg
if ( nCurRefDlgId )
{
@@ -1706,7 +1706,7 @@ BOOL ScModule::IsTableLocked()
if ( pChildWnd )
bLocked = dynamic_cast<IAnyRefDialog*>(pChildWnd->GetWindow())->IsTableLocked();
else
- bLocked = TRUE; // for other views, see IsModalMode
+ bLocked = TRUE; // for other views, see IsModalMode
}
return bLocked;
@@ -1714,8 +1714,8 @@ BOOL ScModule::IsTableLocked()
BOOL ScModule::IsRefDialogOpen()
{
- //! move reference dialog handling to view
- //! (only keep function autopilot here for references to other documents)
+ //! move reference dialog handling to view
+ //! (only keep function autopilot here for references to other documents)
BOOL bIsOpen = FALSE;
@@ -1725,7 +1725,7 @@ BOOL ScModule::IsRefDialogOpen()
if ( pChildWnd )
bIsOpen = pChildWnd->IsVisible();
else
- bIsOpen = TRUE; // for other views, see IsModalMode
+ bIsOpen = TRUE; // for other views, see IsModalMode
}
return bIsOpen;
@@ -1733,8 +1733,8 @@ BOOL ScModule::IsRefDialogOpen()
BOOL ScModule::IsFormulaMode()
{
- //! move reference dialog handling to view
- //! (only keep function autopilot here for references to other documents)
+ //! move reference dialog handling to view
+ //! (only keep function autopilot here for references to other documents)
BOOL bIsFormula = FALSE;
@@ -1779,14 +1779,14 @@ void lcl_MarkedTabs( const ScMarkData& rMark, SCTAB& rStartTab, SCTAB& rEndTab )
void ScModule::SetReference( const ScRange& rRef, ScDocument* pDoc,
const ScMarkData* pMarkData )
{
- //! move reference dialog handling to view
- //! (only keep function autopilot here for references to other documents)
+ //! move reference dialog handling to view
+ //! (only keep function autopilot here for references to other documents)
- // in Ref-Dialogen wird hiermit auch das Zoom-In ausgeloest,
- // wenn Start und Ende der Ref unterschiedlich sind
+ // in Ref-Dialogen wird hiermit auch das Zoom-In ausgeloest,
+ // wenn Start und Ende der Ref unterschiedlich sind
ScRange aNew = rRef;
- aNew.Justify(); // immer "richtig herum"
+ aNew.Justify(); // immer "richtig herum"
if( nCurRefDlgId )
{
@@ -1805,8 +1805,8 @@ void ScModule::SetReference( const ScRange& rRef, ScDocument* pDoc,
IAnyRefDialog* pRefDlg = dynamic_cast<IAnyRefDialog*>(pChildWnd->GetWindow());
- // hide the (color) selection now instead of later from LoseFocus,
- // don't abort the ref input that causes this call (bDoneRefMode = FALSE)
+ // hide the (color) selection now instead of later from LoseFocus,
+ // don't abort the ref input that causes this call (bDoneRefMode = FALSE)
pRefDlg->HideReference( FALSE );
pRefDlg->SetReference( aNew, pDoc );
}
@@ -1823,10 +1823,10 @@ void ScModule::SetReference( const ScRange& rRef, ScDocument* pDoc,
}
}
-void ScModule::AddRefEntry() // "Mehrfachselektion"
+void ScModule::AddRefEntry() // "Mehrfachselektion"
{
- //! move reference dialog handling to view
- //! (only keep function autopilot here for references to other documents)
+ //! move reference dialog handling to view
+ //! (only keep function autopilot here for references to other documents)
if ( nCurRefDlgId )
{
@@ -1848,12 +1848,12 @@ void ScModule::AddRefEntry() // "Mehrfachselektion"
void ScModule::EndReference()
{
- //! move reference dialog handling to view
- //! (only keep function autopilot here for references to other documents)
+ //! move reference dialog handling to view
+ //! (only keep function autopilot here for references to other documents)
- // in Ref-Dialogen wird hiermit auch das Zoom-In wieder aufgehoben
+ // in Ref-Dialogen wird hiermit auch das Zoom-In wieder aufgehoben
- //! ShowRefFrame am InputHdl, wenn der Funktions-AP offen ist ???
+ //! ShowRefFrame am InputHdl, wenn der Funktions-AP offen ist ???
if ( nCurRefDlgId )
{
@@ -1869,7 +1869,7 @@ void ScModule::EndReference()
//------------------------------------------------------------------
//
-// Idle / Online-Spelling
+// Idle / Online-Spelling
//
//------------------------------------------------------------------
@@ -1899,7 +1899,7 @@ IMPL_LINK( ScModule, IdleHandler, Timer*, EMPTYARG )
{
if ( Application::AnyInput( INPUT_MOUSEANDKEYBOARD ) )
{
- aIdleTimer.Start(); // Timeout unveraendert
+ aIdleTimer.Start(); // Timeout unveraendert
return 0;
}
@@ -1913,12 +1913,12 @@ IMPL_LINK( ScModule, IdleHandler, Timer*, EMPTYARG )
BOOL bWidth = pDoc->IdleCalcTextWidth();
BOOL bSpell = pDoc->ContinueOnlineSpelling();
if ( bSpell )
- aSpellTimer.Start(); // da ist noch was
+ aSpellTimer.Start(); // da ist noch was
- bMore = bLinks || bWidth || bSpell; // ueberhaupt noch was?
+ bMore = bLinks || bWidth || bSpell; // ueberhaupt noch was?
- // While calculating a Basic formula, a paint event may have occured,
- // so check the bNeedsRepaint flags for this document's views
+ // While calculating a Basic formula, a paint event may have occured,
+ // so check the bNeedsRepaint flags for this document's views
if (bWidth)
lcl_CheckNeedsRepaint( pDocSh );
}
@@ -1932,7 +1932,7 @@ IMPL_LINK( ScModule, IdleHandler, Timer*, EMPTYARG )
}
else
{
- // SC_IDLE_COUNT mal mit initialem Timeout, dann hochzaehlen
+ // SC_IDLE_COUNT mal mit initialem Timeout, dann hochzaehlen
if ( nIdleCount < SC_IDLE_COUNT )
++nIdleCount;
@@ -1955,7 +1955,7 @@ IMPL_LINK( ScModule, SpellTimerHdl, Timer*, EMPTYARG )
if ( Application::AnyInput( INPUT_KEYBOARD ) )
{
aSpellTimer.Start();
- return 0; // dann spaeter wieder...
+ return 0; // dann spaeter wieder...
}
ScDocShell* pDocSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() );
@@ -1969,46 +1969,46 @@ IMPL_LINK( ScModule, SpellTimerHdl, Timer*, EMPTYARG )
}
//virtuelle Methoden fuer den Optionendialog
-SfxItemSet* ScModule::CreateItemSet( USHORT nId )
+SfxItemSet* ScModule::CreateItemSet( USHORT nId )
{
- SfxItemSet* pRet = 0;
+ SfxItemSet* pRet = 0;
if(SID_SC_EDITOPTIONS == nId)
{
pRet = new SfxItemSet( GetPool(),
// TP_CALC:
- SID_SCDOCOPTIONS, SID_SCDOCOPTIONS,
+ SID_SCDOCOPTIONS, SID_SCDOCOPTIONS,
// TP_VIEW:
- SID_SCVIEWOPTIONS, SID_SCVIEWOPTIONS,
+ SID_SCVIEWOPTIONS, SID_SCVIEWOPTIONS,
SID_SC_OPT_SYNCZOOM, SID_SC_OPT_SYNCZOOM,
// TP_INPUT:
SID_SC_INPUT_SELECTION,SID_SC_INPUT_MARK_HEADER,
SID_SC_INPUT_TEXTWYSIWYG,SID_SC_INPUT_TEXTWYSIWYG,
SID_SC_INPUT_REPLCELLSWARN,SID_SC_INPUT_REPLCELLSWARN,
// TP_USERLISTS:
- SCITEM_USERLIST, SCITEM_USERLIST,
+ SCITEM_USERLIST, SCITEM_USERLIST,
// TP_PRINT:
- SID_SCPRINTOPTIONS, SID_SCPRINTOPTIONS,
+ SID_SCPRINTOPTIONS, SID_SCPRINTOPTIONS,
// TP_GRID:
SID_ATTR_GRID_OPTIONS, SID_ATTR_GRID_OPTIONS,
//
- SID_ATTR_METRIC, SID_ATTR_METRIC,
- SID_ATTR_DEFTABSTOP, SID_ATTR_DEFTABSTOP,
+ SID_ATTR_METRIC, SID_ATTR_METRIC,
+ SID_ATTR_DEFTABSTOP, SID_ATTR_DEFTABSTOP,
0 );
- ScDocShell* pDocSh = PTR_CAST(ScDocShell,
+ ScDocShell* pDocSh = PTR_CAST(ScDocShell,
SfxObjectShell::Current());
- ScDocOptions aCalcOpt = pDocSh
+ ScDocOptions aCalcOpt = pDocSh
? pDocSh->GetDocument()->GetDocOptions()
: GetDocOptions();
ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell,
SfxViewShell::Current());
- ScViewOptions aViewOpt = pViewSh
+ ScViewOptions aViewOpt = pViewSh
? pViewSh->GetViewData()->GetOptions()
: GetViewOptions();
- ScUserListItem aULItem( SCITEM_USERLIST );
- ScUserList* pUL = ScGlobal::GetUserList();
+ ScUserListItem aULItem( SCITEM_USERLIST );
+ ScUserList* pUL = ScGlobal::GetUserList();
// SFX_APP()->GetOptions( aSet );
@@ -2070,7 +2070,7 @@ void ScModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
}
}
-SfxTabPage* ScModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet )
+SfxTabPage* ScModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet )
{
SfxTabPage* pRet = NULL;
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
@@ -2093,7 +2093,7 @@ SfxTabPage* ScModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItem
pRet = (*ScTpContentOptionsCreate)(pParent, rSet);
}
break;
- case SID_SC_TP_GRID: pRet = SvxGridTabPage::Create(pParent, rSet); break;
+ case SID_SC_TP_GRID: pRet = SvxGridTabPage::Create(pParent, rSet); break;
case SID_SC_TP_USERLISTS:
{
//CHINA001 pRet = ScTpUserLists::Create(pParent, rSet);
@@ -2103,22 +2103,22 @@ SfxTabPage* ScModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItem
}
break;
case SID_SC_TP_CALC:
- { //CHINA001 pRet = ScTpCalcOptions::Create(pParent, rSet);
+ { //CHINA001 pRet = ScTpCalcOptions::Create(pParent, rSet);
::CreateTabPage ScTpCalcOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_CALC );
if ( ScTpCalcOptionsCreate )
pRet = (*ScTpCalcOptionsCreate)(pParent, rSet);
}
break;
case SID_SC_TP_CHANGES:
- { //CHINA001 pRet = ScRedlineOptionsTabPage::Create(pParent, rSet);
- ::CreateTabPage ScRedlineOptionsTabPageCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_OPREDLINE );
+ { //CHINA001 pRet = ScRedlineOptionsTabPage::Create(pParent, rSet);
+ ::CreateTabPage ScRedlineOptionsTabPageCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_OPREDLINE );
if ( ScRedlineOptionsTabPageCreate )
pRet =(*ScRedlineOptionsTabPageCreate)(pParent, rSet);
}
break;
case RID_SC_TP_PRINT:
{//CHINA001 pRet = ScTpPrintOptions::Create(pParent, rSet);
- ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT );
+ ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT );
if ( ScTpPrintOptionsCreate )
pRet = (*ScTpPrintOptionsCreate)( pParent, rSet);
}
@@ -2144,7 +2144,7 @@ SfxTabPage* ScModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItem
IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo )
{
- //! mit ScFieldEditEngine zusammenfassen !!!
+ //! mit ScFieldEditEngine zusammenfassen !!!
if (pInfo)
{
diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxx
index c92f0bf5d206..0e042cfd7c17 100644
--- a/sc/source/ui/app/scmod2.cxx
+++ b/sc/source/ui/app/scmod2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using namespace com::sun::star;
//------------------------------------------------------------------
-#define LINGUPROP_AUTOSPELL "IsSpellAuto"
+#define LINGUPROP_AUTOSPELL "IsSpellAuto"
//------------------------------------------------------------------
@@ -53,8 +53,8 @@ using namespace com::sun::star;
void ScModule::GetSpellSettings( USHORT& rDefLang, USHORT& rCjkLang, USHORT& rCtlLang,
BOOL& rAutoSpell )
{
- // use SvtLinguConfig instead of service LinguProperties to avoid
- // loading the linguistic component
+ // use SvtLinguConfig instead of service LinguProperties to avoid
+ // loading the linguistic component
SvtLinguConfig aConfig;
SvtLinguOptions aOptions;
@@ -69,8 +69,8 @@ void ScModule::GetSpellSettings( USHORT& rDefLang, USHORT& rCjkLang, USHORT& rCt
// static
void ScModule::SetAutoSpellProperty( BOOL bSet )
{
- // use SvtLinguConfig instead of service LinguProperties to avoid
- // loading the linguistic component
+ // use SvtLinguConfig instead of service LinguProperties to avoid
+ // loading the linguistic component
SvtLinguConfig aConfig;
uno::Any aAny;
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index 0b213709863d..a357a128af70 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "transobj.hxx"
#include "drwtrans.hxx"
#include "scmod.hxx"
-#include "dbfunc.hxx" // for CopyToClip
+#include "dbfunc.hxx" // for CopyToClip
#include "docsh.hxx"
#include "drawview.hxx"
#include "drwlayer.hxx"
@@ -96,7 +96,7 @@ ScSelectionTransferObj* ScSelectionTransferObj::CreateFromView( ScTabView* pView
SdrView* pSdrView = pView->GetSdrView();
if ( pSdrView )
{
- // handle selection on drawing layer
+ // handle selection on drawing layer
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
ULONG nMarkCount = rMarkList.GetMarkCount();
if ( nMarkCount )
@@ -120,23 +120,23 @@ ScSelectionTransferObj* ScSelectionTransferObj::CreateFromView( ScTabView* pView
}
if ( eMode == SC_SELTRANS_INVALID )
- eMode = SC_SELTRANS_DRAW_OTHER; // something selected but no special selection
+ eMode = SC_SELTRANS_DRAW_OTHER; // something selected but no special selection
}
}
- if ( eMode == SC_SELTRANS_INVALID ) // no drawing object selected
+ if ( eMode == SC_SELTRANS_INVALID ) // no drawing object selected
{
ScRange aRange;
ScViewData* pViewData = pView->GetViewData();
const ScMarkData& rMark = pViewData->GetMarkData();
- // allow MultiMarked because GetSimpleArea may be able to merge into a simple range
- // (GetSimpleArea modifies a local copy of MarkData)
+ // allow MultiMarked because GetSimpleArea may be able to merge into a simple range
+ // (GetSimpleArea modifies a local copy of MarkData)
// Also allow simple filtered area.
ScMarkType eMarkType;
if ( ( rMark.IsMarked() || rMark.IsMultiMarked() ) &&
(((eMarkType = pViewData->GetSimpleArea( aRange )) == SC_MARK_SIMPLE) ||
(eMarkType == SC_MARK_SIMPLE_FILTERED)) )
{
- // only for "real" selection, cursor alone isn't used
+ // only for "real" selection, cursor alone isn't used
if ( aRange.aStart == aRange.aEnd )
eMode = SC_SELTRANS_CELL;
else
@@ -158,7 +158,7 @@ ScSelectionTransferObj::ScSelectionTransferObj( ScTabView* pSource, ScSelectionT
pCellData( NULL ),
pDrawData( NULL )
{
- //! store range for StillValid
+ //! store range for StillValid
}
ScSelectionTransferObj::~ScSelectionTransferObj()
@@ -166,8 +166,8 @@ ScSelectionTransferObj::~ScSelectionTransferObj()
ScModule* pScMod = SC_MOD();
if ( pScMod->GetSelectionTransfer() == this )
{
- // this is reached when the object wasn't really copied to the selection
- // (CopyToSelection has no effect under Windows)
+ // this is reached when the object wasn't really copied to the selection
+ // (CopyToSelection has no effect under Windows)
ForgetView();
pScMod->SetSelectionTransfer( NULL );
@@ -178,8 +178,8 @@ ScSelectionTransferObj::~ScSelectionTransferObj()
BOOL ScSelectionTransferObj::StillValid()
{
- //! check if view still has same cell selection
- //! (but return FALSE if data has changed inbetween)
+ //! check if view still has same cell selection
+ //! (but return FALSE if data has changed inbetween)
return FALSE;
}
@@ -202,14 +202,14 @@ void ScSelectionTransferObj::ForgetView()
void ScSelectionTransferObj::AddSupportedFormats()
{
- // AddSupportedFormats must work without actually creating the
- // "real" transfer object
+ // AddSupportedFormats must work without actually creating the
+ // "real" transfer object
switch (eMode)
{
case SC_SELTRANS_CELL:
case SC_SELTRANS_CELLS:
- // same formats as in ScTransferObj::AddSupportedFormats
+ // same formats as in ScTransferObj::AddSupportedFormats
AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
AddFormat( SOT_FORMAT_GDIMETAFILE );
@@ -256,7 +256,7 @@ void ScSelectionTransferObj::AddSupportedFormats()
break;
case SC_SELTRANS_DRAW_OTHER:
- // other drawing objects
+ // other drawing objects
AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
AddFormat( SOT_FORMATSTR_ID_DRAWING );
@@ -277,10 +277,10 @@ void ScSelectionTransferObj::CreateCellData()
if ( pView )
{
ScViewData* pViewData = pView->GetViewData();
- ScMarkData aNewMark( pViewData->GetMarkData() ); // use local copy for MarkToSimple
+ ScMarkData aNewMark( pViewData->GetMarkData() ); // use local copy for MarkToSimple
aNewMark.MarkToSimple();
- // similar to ScViewFunctionSet::BeginDrag
+ // similar to ScViewFunctionSet::BeginDrag
if ( aNewMark.IsMarked() && !aNewMark.IsMultiMarked() )
{
ScDocShell* pDocSh = pViewData->GetDocShell();
@@ -290,7 +290,7 @@ void ScSelectionTransferObj::CreateCellData()
ScDocShellRef aDragShellRef;
if ( pDocSh->GetDocument()->HasOLEObjectsInArea( aSelRange, &aNewMark ) )
{
- aDragShellRef = new ScDocShell; // DocShell needs a Ref immediately
+ aDragShellRef = new ScDocShell; // DocShell needs a Ref immediately
aDragShellRef->DoInitNew(NULL);
}
ScDrawLayer::SetGlobalDrawPersist(aDragShellRef);
@@ -317,12 +317,12 @@ void ScSelectionTransferObj::CreateCellData()
//? pTransferObj->SetVisibleTab( nTab );
SfxObjectShellRef aPersistRef( aDragShellRef );
- pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive
+ pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive
pTransferObj->SetDragSource( pDocSh, aNewMark );
pCellData = pTransferObj;
- pCellData->acquire(); // keep ref count up - released in ForgetView
+ pCellData->acquire(); // keep ref count up - released in ForgetView
}
else
delete pClipDoc;
@@ -331,7 +331,7 @@ void ScSelectionTransferObj::CreateCellData()
DBG_ASSERT( pCellData, "can't create CellData" );
}
-//! make static member of ScDrawView
+//! make static member of ScDrawView
extern void lcl_CheckOle( const SdrMarkList& rMarkList, BOOL& rAnyOle, BOOL& rOneOle );
void ScSelectionTransferObj::CreateDrawData()
@@ -339,7 +339,7 @@ void ScSelectionTransferObj::CreateDrawData()
DBG_ASSERT( !pDrawData, "CreateDrawData twice" );
if ( pView )
{
- // similar to ScDrawView::BeginDrag
+ // similar to ScDrawView::BeginDrag
ScDrawView* pDrawView = pView->GetScDrawView();
if ( pDrawView )
@@ -352,7 +352,7 @@ void ScSelectionTransferObj::CreateDrawData()
ScDocShellRef aDragShellRef;
if (bAnyOle)
{
- aDragShellRef = new ScDocShell; // ohne Ref lebt die DocShell nicht !!!
+ aDragShellRef = new ScDocShell; // ohne Ref lebt die DocShell nicht !!!
aDragShellRef->DoInitNew(NULL);
}
//---------------------------------------------------------
@@ -373,11 +373,11 @@ void ScSelectionTransferObj::CreateDrawData()
uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj );
SfxObjectShellRef aPersistRef( aDragShellRef );
- pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive
- pTransferObj->SetDragSource( pDrawView ); // copies selection
+ pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive
+ pTransferObj->SetDragSource( pDrawView ); // copies selection
pDrawData = pTransferObj;
- pDrawData->acquire(); // keep ref count up - released in ForgetView
+ pDrawData->acquire(); // keep ref count up - released in ForgetView
}
}
DBG_ASSERT( pDrawData, "can't create DrawData" );
@@ -435,7 +435,7 @@ sal_Bool ScSelectionTransferObj::GetData( const ::com::sun::star::datatransfer::
void ScSelectionTransferObj::ObjectReleased()
{
- // called when another selection is set from outside
+ // called when another selection is set from outside
ForgetView();
diff --git a/sc/source/ui/app/template.cxx b/sc/source/ui/app/template.cxx
index 80dc667c5de6..3f49cb3a63ff 100644
--- a/sc/source/ui/app/template.cxx
+++ b/sc/source/ui/app/template.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 4b268b9da791..ae3b9ec79c46 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +76,10 @@ using namespace com::sun::star;
// -----------------------------------------------------------------------
-#define SCTRANS_TYPE_IMPEX 1
-#define SCTRANS_TYPE_EDIT_RTF 2
-#define SCTRANS_TYPE_EDIT_BIN 3
-#define SCTRANS_TYPE_EMBOBJ 4
+#define SCTRANS_TYPE_IMPEX 1
+#define SCTRANS_TYPE_EDIT_RTF 2
+#define SCTRANS_TYPE_EDIT_BIN 3
+#define SCTRANS_TYPE_EMBOBJ 4
// -----------------------------------------------------------------------
@@ -113,7 +113,7 @@ void ScTransferObj::PaintToDev( OutputDevice* pDev, ScDocument* pDoc, double nPr
return;
Point aPoint;
- Rectangle aBound( aPoint, pDev->GetOutputSize() ); //! use size from clip area?
+ Rectangle aBound( aPoint, pDev->GetOutputSize() ); //! use size from clip area?
ScViewData aViewData(NULL,NULL);
aViewData.InitData( pDoc );
@@ -147,14 +147,14 @@ ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDesc
SCCOL nCol2;
SCROW nRow2;
pDoc->GetClipStart( nCol1, nRow1 );
- pDoc->GetClipArea( nCol2, nRow2, TRUE ); // real source area - include filtered rows
+ pDoc->GetClipArea( nCol2, nRow2, TRUE ); // real source area - include filtered rows
nCol2 = sal::static_int_cast<SCCOL>( nCol2 + nCol1 );
nRow2 = sal::static_int_cast<SCROW>( nRow2 + nRow1 );
SCCOL nDummy;
pDoc->GetClipArea( nDummy, nNonFiltered, FALSE );
bHasFiltered = (nNonFiltered < (nRow2 - nRow1));
- ++nNonFiltered; // to get count instead of diff
+ ++nNonFiltered; // to get count instead of diff
SCTAB nTab1=0;
SCTAB nTab2=0;
@@ -169,8 +169,8 @@ ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDesc
}
DBG_ASSERT(!bFirst, "no sheet selected");
- // only limit to used cells if whole sheet was marked
- // (so empty cell areas can be copied)
+ // only limit to used cells if whole sheet was marked
+ // (so empty cell areas can be copied)
if ( nCol2>=MAXCOL && nRow2>=MAXROW )
{
SCROW nMaxRow;
@@ -183,7 +183,7 @@ ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDesc
}
aBlock = ScRange( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
- nVisibleTab = nTab1; // valid table as default
+ nVisibleTab = nTab1; // valid table as default
Rectangle aMMRect = pDoc->GetMMRect( nCol1,nRow1, nCol2,nRow2, nTab1 );
aObjDesc.maSize = aMMRect.GetSize();
@@ -206,9 +206,9 @@ ScTransferObj::~ScTransferObj()
pScMod->ResetDragObject();
}
- delete pDoc; // ScTransferObj is owner of clipboard document
+ delete pDoc; // ScTransferObj is owner of clipboard document
- aDocShellRef.Clear(); // before releasing the mutex
+ aDocShellRef.Clear(); // before releasing the mutex
aDrawPersistRef.Clear(); // after the model
@@ -221,16 +221,16 @@ ScTransferObj* ScTransferObj::GetOwnClipboard( Window* pUIWin )
ScTransferObj* pObj = SC_MOD()->GetClipData().pCellClipboard;
if ( pObj && pUIWin )
{
- // check formats to see if pObj is really in the system clipboard
+ // check formats to see if pObj is really in the system clipboard
- // pUIWin is NULL when called from core (IsClipboardSource),
- // in that case don't access the system clipboard, because the call
- // may be from other clipboard operations (like flushing, #86059#)
+ // pUIWin is NULL when called from core (IsClipboardSource),
+ // in that case don't access the system clipboard, because the call
+ // may be from other clipboard operations (like flushing, #86059#)
TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pUIWin ) );
if ( !aDataHelper.HasFormat( SOT_FORMATSTR_ID_DIF ) )
{
-// DBG_ERROR("ScTransferObj wasn't released");
+// DBG_ERROR("ScTransferObj wasn't released");
pObj = NULL;
}
}
@@ -258,8 +258,8 @@ void ScTransferObj::AddSupportedFormats()
sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor )
{
- sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor );
- sal_Bool bOK = sal_False;
+ sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor );
+ sal_Bool bOK = sal_False;
if( HasFormat( nFormat ) )
{
@@ -270,7 +270,7 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor )
else if ( ( nFormat == SOT_FORMAT_RTF || nFormat == SOT_FORMATSTR_ID_EDITENGINE ) &&
aBlock.aStart == aBlock.aEnd )
{
- // RTF from a single cell is handled by EditEngine
+ // RTF from a single cell is handled by EditEngine
SCCOL nCol = aBlock.aStart.Col();
SCROW nRow = aBlock.aStart.Row();
@@ -302,8 +302,8 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor )
}
else if ( ScImportExport::IsFormatSupported( nFormat ) || nFormat == SOT_FORMAT_RTF )
{
- // if this transfer object was used to create a DDE link, filtered rows
- // have to be included for subsequent calls (to be consistent with link data)
+ // if this transfer object was used to create a DDE link, filtered rows
+ // have to be included for subsequent calls (to be consistent with link data)
if ( nFormat == SOT_FORMATSTR_ID_LINK )
bUsedForLink = TRUE;
@@ -315,7 +315,7 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor )
aObj.SetFormulas( pDoc->GetViewOptions().GetOption( VOPT_FORMULAS ) );
aObj.SetIncludeFiltered( bIncludeFiltered );
- // DataType depends on format type:
+ // DataType depends on format type:
if ( rFlavor.DataType.equals( ::getCppuType( (const ::rtl::OUString*) 0 ) ) )
{
@@ -325,7 +325,7 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor )
}
else if ( rFlavor.DataType.equals( ::getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ) )
{
- // SetObject converts a stream into a Int8-Sequence
+ // SetObject converts a stream into a Int8-Sequence
bOK = SetObject( &aObj, SCTRANS_TYPE_IMPEX, rFlavor );
}
else
@@ -354,10 +354,10 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor )
// like SvEmbeddedTransfer::GetData:
- GDIMetaFile aMtf;
- VirtualDevice aVDev;
- MapMode aMapMode( pEmbObj->GetMapUnit() );
- Rectangle aVisArea( pEmbObj->GetVisArea( ASPECT_CONTENT ) );
+ GDIMetaFile aMtf;
+ VirtualDevice aVDev;
+ MapMode aMapMode( pEmbObj->GetMapUnit() );
+ Rectangle aVisArea( pEmbObj->GetVisArea( ASPECT_CONTENT ) );
aVDev.EnableOutput( FALSE );
aVDev.SetMapMode( aMapMode );
@@ -375,7 +375,7 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor )
else if ( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE )
{
//TODO/LATER: differentiate between formats?!
- InitDocShell(); // set aDocShellRef
+ InitDocShell(); // set aDocShellRef
SfxObjectShell* pEmbObj = aDocShellRef;
bOK = SetObject( pEmbObj, SCTRANS_TYPE_EMBOBJ, rFlavor );
@@ -414,9 +414,9 @@ sal_Bool ScTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObj
}
else
{
- // #107722# can't use Write for EditEngine format because that would
- // write old format without support for unicode characters.
- // Get the data from the EditEngine's transferable instead.
+ // #107722# can't use Write for EditEngine format because that would
+ // write old format without support for unicode characters.
+ // Get the data from the EditEngine's transferable instead.
USHORT nParCnt = pEngine->GetParagraphCount();
if ( nParCnt == 0 )
@@ -487,13 +487,13 @@ void ScTransferObj::DragFinished( sal_Int8 nDropAction )
{
if ( nDropAction == DND_ACTION_MOVE && !bDragWasInternal && !(nDragSourceFlags & SC_DROP_NAVIGATOR) )
{
- // move: delete source data
+ // move: delete source data
ScDocShell* pSourceSh = GetSourceDocShell();
if (pSourceSh)
{
ScMarkData aMarkData = GetSourceMarkData();
- // external drag&drop doesn't copy objects, so they also aren't deleted:
- // #105703# bApi=TRUE, don't show error messages from drag&drop
+ // external drag&drop doesn't copy objects, so they also aren't deleted:
+ // #105703# bApi=TRUE, don't show error messages from drag&drop
pSourceSh->GetDocFunc().DeleteContents( aMarkData, IDF_ALL & ~IDF_OBJECTS, TRUE, TRUE );
}
}
@@ -502,7 +502,7 @@ void ScTransferObj::DragFinished( sal_Int8 nDropAction )
if ( pScMod->GetDragData().pCellTransfer == this )
pScMod->ResetDragObject();
- xDragSourceRanges = NULL; // don't keep source after dropping
+ xDragSourceRanges = NULL; // don't keep source after dropping
TransferableHelper::DragFinished( nDropAction );
}
@@ -554,7 +554,7 @@ ScDocShell* ScTransferObj::GetSourceDocShell()
if (pRangesObj)
return pRangesObj->GetDocShell();
- return NULL; // none set
+ return NULL; // none set
}
ScMarkData ScTransferObj::GetSourceMarkData()
@@ -570,7 +570,7 @@ ScMarkData ScTransferObj::GetSourceMarkData()
}
//
-// initialize aDocShellRef with a live document from the ClipDoc
+// initialize aDocShellRef with a live document from the ClipDoc
//
void ScTransferObj::InitDocShell()
@@ -578,7 +578,7 @@ void ScTransferObj::InitDocShell()
if ( !aDocShellRef.Is() )
{
ScDocShell* pDocSh = new ScDocShell;
- aDocShellRef = pDocSh; // ref must be there before InitNew
+ aDocShellRef = pDocSh; // ref must be there before InitNew
pDocSh->DoInitNew(NULL);
@@ -590,7 +590,7 @@ void ScTransferObj::InitDocShell()
String aTabName;
pDoc->GetName( aBlock.aStart.Tab(), aTabName );
- pDestDoc->RenameTab( 0, aTabName, FALSE ); // no UpdateRef (empty)
+ pDestDoc->RenameTab( 0, aTabName, FALSE ); // no UpdateRef (empty)
pDestDoc->CopyStdStylesFrom( pDoc );
@@ -599,8 +599,8 @@ void ScTransferObj::InitDocShell()
SCCOL nEndX = aBlock.aEnd.Col();
SCROW nEndY = aBlock.aEnd.Row();
- // widths / heights
- // (must be copied before CopyFromClip, for drawing objects)
+ // widths / heights
+ // (must be copied before CopyFromClip, for drawing objects)
SCCOL nCol, nLastCol;
SCTAB nSrcTab = aBlock.aStart.Tab();
@@ -624,7 +624,7 @@ void ScTransferObj::InitDocShell()
{
pDestDoc->SetRowHeight( nRow, 0, pDoc->GetOriginalHeight( nRow, nSrcTab ) );
- // if height was set manually, that flag has to be copied, too
+ // if height was set manually, that flag has to be copied, too
if ( nSourceFlags & CR_MANUALSIZE )
rDestRowFlags.OrValue( nRow, CR_MANUALSIZE);
}
@@ -633,14 +633,14 @@ void ScTransferObj::InitDocShell()
if ( pDoc->GetDrawLayer() )
pDocSh->MakeDrawLayer();
- // cell range is copied to the original position, but on the first sheet
- // -> bCutMode must be set
- // pDoc is always a Clipboard-document
+ // cell range is copied to the original position, but on the first sheet
+ // -> bCutMode must be set
+ // pDoc is always a Clipboard-document
ScRange aDestRange( nStartX,nStartY,0, nEndX,nEndY,0 );
BOOL bWasCut = pDoc->IsCutMode();
if (!bWasCut)
- pDoc->SetClipArea( aDestRange, TRUE ); // Cut
+ pDoc->SetClipArea( aDestRange, TRUE ); // Cut
pDestDoc->CopyFromClip( aDestRange, aDestMark, IDF_ALL, NULL, pDoc, FALSE );
pDoc->SetClipArea( aDestRange, bWasCut );
@@ -649,11 +649,11 @@ void ScTransferObj::InitDocShell()
ScRange aMergeRange = aDestRange;
pDestDoc->ExtendMerge( aMergeRange, TRUE );
- pDoc->CopyDdeLinks( pDestDoc ); // copy values of DDE Links
+ pDoc->CopyDdeLinks( pDestDoc ); // copy values of DDE Links
- // page format (grid etc) and page size (maximum size for ole object)
+ // page format (grid etc) and page size (maximum size for ole object)
- Size aPaperSize = SvxPaperInfo::GetPaperSize( PAPER_A4 ); // Twips
+ Size aPaperSize = SvxPaperInfo::GetPaperSize( PAPER_A4 ); // Twips
ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
String aStyleName = pDoc->GetPageStyle( aBlock.aStart.Tab() );
SfxStyleSheetBase* pStyleSheet = pStylePool->Find( aStyleName, SFX_STYLE_FAMILY_PAGE );
@@ -662,7 +662,7 @@ void ScTransferObj::InitDocShell()
const SfxItemSet& rSourceSet = pStyleSheet->GetItemSet();
aPaperSize = ((const SvxSizeItem&) rSourceSet.Get(ATTR_PAGE_SIZE)).GetSize();
- // CopyStyleFrom kopiert SetItems mit richtigem Pool
+ // CopyStyleFrom kopiert SetItems mit richtigem Pool
ScStyleSheetPool* pDestPool = pDestDoc->GetStyleSheetPool();
pDestPool->CopyStyleFrom( pStylePool, aStyleName, SFX_STYLE_FAMILY_PAGE );
}
@@ -674,7 +674,7 @@ void ScTransferObj::InitDocShell()
pDestDoc->SetViewOptions( pDoc->GetViewOptions() );
- // Size
+ // Size
//! get while copying sizes
long nPosX = 0;
@@ -687,7 +687,7 @@ void ScTransferObj::InitDocShell()
nPosY = (long) ( nPosY * HMM_PER_TWIPS );
- aPaperSize.Width() *= 2; // limit OLE object to double of page size
+ aPaperSize.Width() *= 2; // limit OLE object to double of page size
aPaperSize.Height() *= 2;
long nSizeX = 0;
@@ -695,21 +695,21 @@ void ScTransferObj::InitDocShell()
for (nCol=nStartX; nCol<=nEndX; nCol++)
{
long nAdd = pDestDoc->GetColWidth( nCol, 0 );
- if ( nSizeX+nAdd > aPaperSize.Width() && nSizeX ) // above limit?
+ if ( nSizeX+nAdd > aPaperSize.Width() && nSizeX ) // above limit?
break;
nSizeX += nAdd;
}
for (SCROW nRow=nStartY; nRow<=nEndY; nRow++)
{
long nAdd = pDestDoc->GetRowHeight( nRow, 0 );
- if ( nSizeY+nAdd > aPaperSize.Height() && nSizeY ) // above limit?
+ if ( nSizeY+nAdd > aPaperSize.Height() && nSizeY ) // above limit?
break;
nSizeY += nAdd;
}
nSizeX = (long) ( nSizeX * HMM_PER_TWIPS );
nSizeY = (long) ( nSizeY * HMM_PER_TWIPS );
-// pDocSh->SetVisAreaSize( Size(nSizeX,nSizeY) );
+// pDocSh->SetVisAreaSize( Size(nSizeX,nSizeY) );
Rectangle aNewArea( Point(nPosX,nPosY), Size(nSizeX,nSizeY) );
//TODO/LATER: why twice?!
@@ -718,13 +718,13 @@ void ScTransferObj::InitDocShell()
pDocSh->UpdateOle(&aViewData, TRUE);
- //! SetDocumentModified?
+ //! SetDocumentModified?
if ( pDestDoc->IsChartListenerCollectionNeedsUpdate() )
pDestDoc->UpdateChartListenerCollection();
}
}
-// static
+// static
SfxObjectShell* ScTransferObj::SetDrawClipDoc( BOOL bAnyOle )
{
// update ScGlobal::pDrawClipDocShellRef
@@ -744,7 +744,7 @@ SfxObjectShell* ScTransferObj::SetDrawClipDoc( BOOL bAnyOle )
}
}
-// static
+// static
void ScTransferObj::StripRefs( ScDocument* pDoc,
SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY,
ScDocument* pDestDoc, SCCOL nSubX, SCROW nSubY )
@@ -755,7 +755,7 @@ void ScTransferObj::StripRefs( ScDocument* pDoc,
DBG_ASSERT(nSubX==0&&nSubY==0, "can't move within the document");
}
- // In a clipboard doc the data don't have to be on the first sheet
+ // In a clipboard doc the data don't have to be on the first sheet
SCTAB nSrcTab = 0;
while (nSrcTab<MAXTAB && !pDoc->HasTable(nSrcTab))
@@ -821,7 +821,7 @@ void ScTransferObj::StripRefs( ScDocument* pDoc,
}
pDestDoc->PutCell( nCol,nRow,nDestTab, pNew );
- // number formats
+ // number formats
ULONG nOldFormat = ((const SfxUInt32Item*)
pDestDoc->GetAttr(nCol,nRow,nDestTab, ATTR_VALUE_FORMAT))->GetValue();
diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx
index 4450c00db807..33a8069c7b56 100644
--- a/sc/source/ui/app/typemap.cxx
+++ b/sc/source/ui/app/typemap.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
#include <editeng/memberids.hrc>
-#define ITEMID_DBTYPE 0
+#define ITEMID_DBTYPE 0
@@ -128,7 +128,7 @@
#define SvxDrawToolItem SfxAllEnumItem
#define SvxDrawAlignItem SfxAllEnumItem
-#define SvxChooseControlItem SfxEnumItem
+#define SvxChooseControlItem SfxEnumItem
#define avmedia_MediaItem ::avmedia::MediaItem
#define SFX_TYPEMAP
diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx
index a63491f0929b..36eab35ca14e 100644
--- a/sc/source/ui/app/uiitems.cxx
+++ b/sc/source/ui/app/uiitems.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +44,14 @@ TYPEINIT1(ScQueryItem, SfxPoolItem);
TYPEINIT1(ScSubTotalItem, SfxPoolItem);
TYPEINIT1(ScUserListItem, SfxPoolItem);
TYPEINIT1(ScConsolidateItem, SfxPoolItem);
-TYPEINIT1(ScPivotItem, SfxPoolItem);
-TYPEINIT1(ScSolveItem, SfxPoolItem);
-TYPEINIT1(ScTabOpItem, SfxPoolItem);
-TYPEINIT1(ScCondFrmtItem, SfxPoolItem);
+TYPEINIT1(ScPivotItem, SfxPoolItem);
+TYPEINIT1(ScSolveItem, SfxPoolItem);
+TYPEINIT1(ScTabOpItem, SfxPoolItem);
+TYPEINIT1(ScCondFrmtItem, SfxPoolItem);
-TYPEINIT1(ScTablesHint, SfxHint);
-TYPEINIT1(ScEditViewHint, SfxHint);
-TYPEINIT1(ScIndexHint, SfxHint);
+TYPEINIT1(ScTablesHint, SfxHint);
+TYPEINIT1(ScEditViewHint, SfxHint);
+TYPEINIT1(ScIndexHint, SfxHint);
// -----------------------------------------------------------------------
// ScInputStatusItem - Status-Update fuer Eingabezeile
@@ -63,7 +63,7 @@ TYPEINIT1(ScIndexHint, SfxHint);
//UNUSED2008-05 SCCOL nStartCol, SCROW nStartRow,
//UNUSED2008-05 SCCOL nEndCol, SCROW nEndRow,
//UNUSED2008-05 const String& rString, const EditTextObject* pData )
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 : SfxPoolItem ( nWhichP ),
//UNUSED2008-05 aCursorPos ( nCol, nRow, nTab ),
//UNUSED2008-05 aStartPos ( nStartCol, nStartRow, nTab ),
@@ -80,21 +80,21 @@ ScInputStatusItem::ScInputStatusItem( USHORT nWhichP,
const String& rString,
const EditTextObject* pData )
: SfxPoolItem ( nWhichP ),
- aCursorPos ( rCurPos ),
- aStartPos ( rStartPos ),
- aEndPos ( rEndPos ),
- aString ( rString ),
- pEditData ( pData ? pData->Clone() : NULL )
+ aCursorPos ( rCurPos ),
+ aStartPos ( rStartPos ),
+ aEndPos ( rEndPos ),
+ aString ( rString ),
+ pEditData ( pData ? pData->Clone() : NULL )
{
}
ScInputStatusItem::ScInputStatusItem( const ScInputStatusItem& rItem )
- : SfxPoolItem ( rItem ),
- aCursorPos ( rItem.aCursorPos ),
- aStartPos ( rItem.aStartPos ),
- aEndPos ( rItem.aEndPos ),
- aString ( rItem.aString ),
- pEditData ( rItem.pEditData ? rItem.pEditData->Clone() : NULL )
+ : SfxPoolItem ( rItem ),
+ aCursorPos ( rItem.aCursorPos ),
+ aStartPos ( rItem.aStartPos ),
+ aEndPos ( rItem.aEndPos ),
+ aString ( rItem.aString ),
+ pEditData ( rItem.pEditData ? rItem.pEditData->Clone() : NULL )
{
}
@@ -112,11 +112,11 @@ int __EXPORT ScInputStatusItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal Which or Type" );
- return ( (aStartPos == ((ScInputStatusItem&)rItem).aStartPos)
- && (aEndPos == ((ScInputStatusItem&)rItem).aEndPos)
- && (aCursorPos == ((ScInputStatusItem&)rItem).aCursorPos)
- && (aString == ((ScInputStatusItem&)rItem).aString) );
- //! Edit-Daten vergleichen!
+ return ( (aStartPos == ((ScInputStatusItem&)rItem).aStartPos)
+ && (aEndPos == ((ScInputStatusItem&)rItem).aEndPos)
+ && (aCursorPos == ((ScInputStatusItem&)rItem).aCursorPos)
+ && (aString == ((ScInputStatusItem&)rItem).aString) );
+ //! Edit-Daten vergleichen!
}
SfxPoolItem* __EXPORT ScInputStatusItem::Clone( SfxItemPool * ) const
@@ -125,11 +125,11 @@ SfxPoolItem* __EXPORT ScInputStatusItem::Clone( SfxItemPool * ) const
}
//
-// ScPaintHint ist nach schints.cxx verschoben
+// ScPaintHint ist nach schints.cxx verschoben
//
// -----------------------------------------------------------------------
-// ScTablesHint - Views anpassen, wenn Tabellen eingefuegt / geloescht
+// ScTablesHint - Views anpassen, wenn Tabellen eingefuegt / geloescht
// -----------------------------------------------------------------------
ScTablesHint::ScTablesHint(USHORT nNewId, SCTAB nTable1, SCTAB nTable2) :
@@ -145,7 +145,7 @@ ScTablesHint::~ScTablesHint()
// -----------------------------------------------------------------------
-// ScIndexHint
+// ScIndexHint
// -----------------------------------------------------------------------
ScIndexHint::ScIndexHint(USHORT nNewId, USHORT nIdx) :
@@ -253,7 +253,7 @@ ScQueryItem::ScQueryItem( USHORT nWhichP,
const ScQueryParam* pQueryData ) :
SfxPoolItem ( nWhichP ),
pViewData ( ptrViewData ),
- bIsAdvanced ( FALSE )
+ bIsAdvanced ( FALSE )
{
if ( pQueryData ) theQueryData = *pQueryData;
}
@@ -264,7 +264,7 @@ ScQueryItem::ScQueryItem( USHORT nWhichP,
const ScQueryParam* pQueryData ) :
SfxPoolItem ( nWhichP ),
pViewData ( NULL ),
- bIsAdvanced ( FALSE )
+ bIsAdvanced ( FALSE )
{
if ( pQueryData ) theQueryData = *pQueryData;
}
@@ -275,8 +275,8 @@ ScQueryItem::ScQueryItem( const ScQueryItem& rItem ) :
SfxPoolItem ( rItem ),
pViewData ( rItem.pViewData ),
theQueryData( rItem.theQueryData ),
- bIsAdvanced ( rItem.bIsAdvanced ),
- aAdvSource ( rItem.aAdvSource )
+ bIsAdvanced ( rItem.bIsAdvanced ),
+ aAdvSource ( rItem.aAdvSource )
{
}
@@ -336,8 +336,8 @@ SfxPoolItem* __EXPORT ScQueryItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
ScSubTotalItem::ScSubTotalItem( USHORT nWhichP,
- ScViewData* ptrViewData,
- const ScSubTotalParam* pSubTotalData ) :
+ ScViewData* ptrViewData,
+ const ScSubTotalParam* pSubTotalData ) :
SfxPoolItem ( nWhichP ),
pViewData ( ptrViewData )
{
@@ -347,7 +347,7 @@ ScSubTotalItem::ScSubTotalItem( USHORT nWhichP,
//------------------------------------------------------------------------
ScSubTotalItem::ScSubTotalItem( USHORT nWhichP,
- const ScSubTotalParam* pSubTotalData ) :
+ const ScSubTotalParam* pSubTotalData ) :
SfxPoolItem ( nWhichP ),
pViewData ( NULL )
{
@@ -357,9 +357,9 @@ ScSubTotalItem::ScSubTotalItem( USHORT nWhichP,
//------------------------------------------------------------------------
ScSubTotalItem::ScSubTotalItem( const ScSubTotalItem& rItem ) :
- SfxPoolItem ( rItem ),
- pViewData ( rItem.pViewData ),
- theSubTotalData ( rItem.theSubTotalData )
+ SfxPoolItem ( rItem ),
+ pViewData ( rItem.pViewData ),
+ theSubTotalData ( rItem.theSubTotalData )
{
}
@@ -382,7 +382,7 @@ int __EXPORT ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const
const ScSubTotalItem& rSTItem = (const ScSubTotalItem&)rItem;
- return ( (pViewData == rSTItem.pViewData)
+ return ( (pViewData == rSTItem.pViewData)
&& (theSubTotalData == rSTItem.theSubTotalData) );
}
@@ -408,14 +408,14 @@ sal_Bool ScSubTotalItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /* nMe
ScUserListItem::ScUserListItem( USHORT nWhichP )
: SfxPoolItem ( nWhichP ),
- pUserList ( NULL )
+ pUserList ( NULL )
{
}
//------------------------------------------------------------------------
ScUserListItem::ScUserListItem( const ScUserListItem& rItem )
- : SfxPoolItem ( rItem )
+ : SfxPoolItem ( rItem )
{
if ( rItem.pUserList )
pUserList = new ScUserList( *(rItem.pUserList) );
@@ -474,7 +474,7 @@ void ScUserListItem::SetUserList( const ScUserList& rUserList )
ScConsolidateItem::ScConsolidateItem(
USHORT nWhichP,
- const ScConsolidateParam* pConsolidateData ) :
+ const ScConsolidateParam* pConsolidateData ) :
SfxPoolItem ( nWhichP )
{
if ( pConsolidateData ) theConsData = *pConsolidateData;
@@ -483,8 +483,8 @@ ScConsolidateItem::ScConsolidateItem(
//------------------------------------------------------------------------
ScConsolidateItem::ScConsolidateItem( const ScConsolidateItem& rItem ) :
- SfxPoolItem ( rItem ),
- theConsData ( rItem.theConsData )
+ SfxPoolItem ( rItem ),
+ theConsData ( rItem.theConsData )
{
}
@@ -528,7 +528,7 @@ ScPivotItem::ScPivotItem( USHORT nWhichP, const ScDPSaveData* pData,
const ScRange* pRange, BOOL bNew ) :
SfxPoolItem ( nWhichP )
{
- // pSaveData must always exist
+ // pSaveData must always exist
if ( pData )
pSaveData = new ScDPSaveData(*pData);
else
@@ -540,9 +540,9 @@ ScPivotItem::ScPivotItem( USHORT nWhichP, const ScDPSaveData* pData,
//------------------------------------------------------------------------
ScPivotItem::ScPivotItem( const ScPivotItem& rItem ) :
- SfxPoolItem ( rItem ),
- aDestRange ( rItem.aDestRange ),
- bNewSheet ( rItem.bNewSheet )
+ SfxPoolItem ( rItem ),
+ aDestRange ( rItem.aDestRange ),
+ bNewSheet ( rItem.bNewSheet )
{
DBG_ASSERT(rItem.pSaveData, "pSaveData");
pSaveData = new ScDPSaveData(*rItem.pSaveData);
@@ -588,7 +588,7 @@ SfxPoolItem* __EXPORT ScPivotItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
ScSolveItem::ScSolveItem( USHORT nWhichP,
- const ScSolveParam* pSolveData )
+ const ScSolveParam* pSolveData )
: SfxPoolItem ( nWhichP )
{
if ( pSolveData ) theSolveData = *pSolveData;
@@ -597,8 +597,8 @@ ScSolveItem::ScSolveItem( USHORT nWhichP,
//------------------------------------------------------------------------
ScSolveItem::ScSolveItem( const ScSolveItem& rItem )
- : SfxPoolItem ( rItem ),
- theSolveData ( rItem.theSolveData )
+ : SfxPoolItem ( rItem ),
+ theSolveData ( rItem.theSolveData )
{
}
@@ -638,7 +638,7 @@ SfxPoolItem* __EXPORT ScSolveItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
ScTabOpItem::ScTabOpItem( USHORT nWhichP,
- const ScTabOpParam* pTabOpData )
+ const ScTabOpParam* pTabOpData )
: SfxPoolItem ( nWhichP )
{
if ( pTabOpData ) theTabOpData = *pTabOpData;
@@ -647,8 +647,8 @@ ScTabOpItem::ScTabOpItem( USHORT nWhichP,
//------------------------------------------------------------------------
ScTabOpItem::ScTabOpItem( const ScTabOpItem& rItem )
- : SfxPoolItem ( rItem ),
- theTabOpData ( rItem.theTabOpData )
+ : SfxPoolItem ( rItem ),
+ theTabOpData ( rItem.theTabOpData )
{
}
@@ -689,18 +689,18 @@ SfxPoolItem* __EXPORT ScTabOpItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
ScCondFrmtItem::ScCondFrmtItem( USHORT nWhichP,
-//! const ScConditionalFormat* pCondFrmt )
+//! const ScConditionalFormat* pCondFrmt )
const ScConditionalFormat& rCondFrmt )
: SfxPoolItem ( nWhichP ),
- theCondFrmtData ( rCondFrmt ) //!
+ theCondFrmtData ( rCondFrmt ) //!
{
-//! if ( pCondFrmt ) theCondFrmtData = *pCondFrmt;
+//! if ( pCondFrmt ) theCondFrmtData = *pCondFrmt;
}
//------------------------------------------------------------------------
ScCondFrmtItem::ScCondFrmtItem( const ScCondFrmtItem& rItem )
- : SfxPoolItem ( rItem ),
+ : SfxPoolItem ( rItem ),
theCondFrmtData ( rItem.theCondFrmtData )
{
}
diff --git a/sc/source/ui/app/wtcdummy.cxx b/sc/source/ui/app/wtcdummy.cxx
index a755830cbd71..424f71890d40 100644
--- a/sc/source/ui/app/wtcdummy.cxx
+++ b/sc/source/ui/app/wtcdummy.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index ca62ebb887a5..65fa88ea08e9 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
//==================================================================
ScAttrDlg::ScAttrDlg( SfxViewFrame* pFrameP,
- Window* pParent,
+ Window* pParent,
const SfxItemSet* pCellAttrs )
: SfxTabDialog( pFrameP,
@@ -75,32 +75,32 @@ ScAttrDlg::ScAttrDlg( SfxViewFrame* pFrameP,
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageCreatorFunc fail!");//CHINA001
#if LAYOUT_SFX_TABDIALOG_BROKEN
- AddTabPage( TP_NUMBER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), 0 ); //CHINA001 AddTabPage( TP_NUMBER, SvxNumberFormatTabPage::Create, 0 );
+ AddTabPage( TP_NUMBER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), 0 ); //CHINA001 AddTabPage( TP_NUMBER, SvxNumberFormatTabPage::Create, 0 );
#else
String number = rtl::OUString::createFromAscii ("Numbers");
AddTabPage( TP_NUMBER, number, pFact->GetTabPageCreatorFunc (RID_SVXPAGE_NUMBERFORMAT), 0, FALSE, TAB_APPEND);
#endif
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!");//CHINA001
- AddTabPage( TP_FONT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), 0 ); //CHINA001 AddTabPage( TP_FONT, SvxCharNamePage::Create, 0 );
+ AddTabPage( TP_FONT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), 0 ); //CHINA001 AddTabPage( TP_FONT, SvxCharNamePage::Create, 0 );
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!");//CHINA001
- AddTabPage( TP_FONTEFF, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 ); //CHINA001 AddTabPage( TP_FONTEFF, SvxCharEffectsPage::Create, 0 );
+ AddTabPage( TP_FONTEFF, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 ); //CHINA001 AddTabPage( TP_FONTEFF, SvxCharEffectsPage::Create, 0 );
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), "GetTabPageCreatorFunc fail!");//CHINA001
- AddTabPage( TP_ALIGNMENT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), 0 ); //CHINA001 AddTabPage( TP_ALIGNMENT, SvxAlignmentTabPage::Create, 0 );
+ AddTabPage( TP_ALIGNMENT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), 0 ); //CHINA001 AddTabPage( TP_ALIGNMENT, SvxAlignmentTabPage::Create, 0 );
if ( aCJKOptions.IsAsianTypographyEnabled() )
{
- //CHINA001 AddTabPage( TP_ASIAN, SvxAsianTabPage::Create, 0 );
+ //CHINA001 AddTabPage( TP_ASIAN, SvxAsianTabPage::Create, 0 );
// ::CreateTabPage pCreateTabpage = pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN);
DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!");//CHINA001
- AddTabPage( TP_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), 0 );
+ AddTabPage( TP_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), 0 );
}
else
RemoveTabPage( TP_ASIAN );
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");//CHINA001
- AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), 0 ); //CHINA001 AddTabPage( TP_BORDER, SvxBorderTabPage::Create, 0 );
+ AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), 0 ); //CHINA001 AddTabPage( TP_BORDER, SvxBorderTabPage::Create, 0 );
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");//CHINA001
- AddTabPage( TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); //CHINA001 AddTabPage( TP_BACKGROUND, SvxBackgroundTabPage::Create, 0 );
- AddTabPage( TP_PROTECTION, ScTabPageProtection::Create, 0 );
+ AddTabPage( TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 ); //CHINA001 AddTabPage( TP_BACKGROUND, SvxBackgroundTabPage::Create, 0 );
+ AddTabPage( TP_PROTECTION, ScTabPageProtection::Create, 0 );
FreeResource();
}
diff --git a/sc/source/ui/attrdlg/condfrmt.cxx b/sc/source/ui/attrdlg/condfrmt.cxx
index 5e3b23af8afa..f8df8ed49948 100644
--- a/sc/source/ui/attrdlg/condfrmt.cxx
+++ b/sc/source/ui/attrdlg/condfrmt.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
//============================================================================
-// class ScConditionalFormat
+// class ScConditionalFormat
//----------------------------------------------------------------------------
// Konstruktor
@@ -58,53 +58,53 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
ScDocument* pCurDoc,
const ScConditionalFormat* pCurrentFormat )
- : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_CONDFORMAT ),
+ : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_CONDFORMAT ),
- aCbxCond1 ( this, ScResId( CBX_COND1 ) ),
- aLbCond11 ( this, ScResId( LB_COND1_1 ) ),
- aLbCond12 ( this, ScResId( LB_COND1_2 ) ),
+ aCbxCond1 ( this, ScResId( CBX_COND1 ) ),
+ aLbCond11 ( this, ScResId( LB_COND1_1 ) ),
+ aLbCond12 ( this, ScResId( LB_COND1_2 ) ),
aEdtCond11 ( this, this, ScResId( EDT_COND1_1 ) ),
- aRbCond11 ( this, ScResId( RB_COND1_1 ), &aEdtCond11,this ),
- aFtCond1And ( this, ScResId( FT_COND1_AND ) ),
+ aRbCond11 ( this, ScResId( RB_COND1_1 ), &aEdtCond11,this ),
+ aFtCond1And ( this, ScResId( FT_COND1_AND ) ),
aEdtCond12 ( this, this, ScResId( EDT_COND1_2 ) ),
- aRbCond12 ( this, ScResId( RB_COND1_2 ), &aEdtCond12,this ),
- aFtCond1Template ( this, ScResId( FT_COND1_TEMPLATE ) ),
- aLbCond1Template ( this, ScResId( LB_COND1_TEMPLATE ) ),
+ aRbCond12 ( this, ScResId( RB_COND1_2 ), &aEdtCond12,this ),
+ aFtCond1Template ( this, ScResId( FT_COND1_TEMPLATE ) ),
+ aLbCond1Template ( this, ScResId( LB_COND1_TEMPLATE ) ),
aBtnNew1 ( this, ScResId( BTN_COND1_NEW ) ),
aFlSep1 ( this, ScResId( FL_SEP1 ) ),
- aCbxCond2 ( this, ScResId( CBX_COND2 ) ),
- aLbCond21 ( this, ScResId( LB_COND2_1 ) ),
- aLbCond22 ( this, ScResId( LB_COND2_2 ) ),
+ aCbxCond2 ( this, ScResId( CBX_COND2 ) ),
+ aLbCond21 ( this, ScResId( LB_COND2_1 ) ),
+ aLbCond22 ( this, ScResId( LB_COND2_2 ) ),
aEdtCond21 ( this, this, ScResId( EDT_COND2_1 ) ),
- aRbCond21 ( this, ScResId( RB_COND2_1 ), &aEdtCond21,this ),
- aFtCond2And ( this, ScResId( FT_COND2_AND ) ),
+ aRbCond21 ( this, ScResId( RB_COND2_1 ), &aEdtCond21,this ),
+ aFtCond2And ( this, ScResId( FT_COND2_AND ) ),
aEdtCond22 ( this, this, ScResId( EDT_COND2_2 ) ),
- aRbCond22 ( this, ScResId( RB_COND2_2 ), &aEdtCond22,this ),
- aFtCond2Template ( this, ScResId( FT_COND2_TEMPLATE ) ),
- aLbCond2Template ( this, ScResId( LB_COND2_TEMPLATE ) ),
+ aRbCond22 ( this, ScResId( RB_COND2_2 ), &aEdtCond22,this ),
+ aFtCond2Template ( this, ScResId( FT_COND2_TEMPLATE ) ),
+ aLbCond2Template ( this, ScResId( LB_COND2_TEMPLATE ) ),
aBtnNew2 ( this, ScResId( BTN_COND2_NEW ) ),
aFlSep2 ( this, ScResId( FL_SEP2 ) ),
- aCbxCond3 ( this, ScResId( CBX_COND3 ) ),
- aLbCond31 ( this, ScResId( LB_COND3_1 ) ),
- aLbCond32 ( this, ScResId( LB_COND3_2 ) ),
+ aCbxCond3 ( this, ScResId( CBX_COND3 ) ),
+ aLbCond31 ( this, ScResId( LB_COND3_1 ) ),
+ aLbCond32 ( this, ScResId( LB_COND3_2 ) ),
aEdtCond31 ( this, this, ScResId( EDT_COND3_1 ) ),
- aRbCond31 ( this, ScResId( RB_COND3_1 ), &aEdtCond31,this ),
- aFtCond3And ( this, ScResId( FT_COND3_AND ) ),
+ aRbCond31 ( this, ScResId( RB_COND3_1 ), &aEdtCond31,this ),
+ aFtCond3And ( this, ScResId( FT_COND3_AND ) ),
aEdtCond32 ( this, this, ScResId( EDT_COND3_2 ) ),
- aRbCond32 ( this, ScResId( RB_COND3_2 ), &aEdtCond32,this ),
- aFtCond3Template ( this, ScResId( FT_COND3_TEMPLATE ) ),
- aLbCond3Template ( this, ScResId( LB_COND3_TEMPLATE ) ),
+ aRbCond32 ( this, ScResId( RB_COND3_2 ), &aEdtCond32,this ),
+ aFtCond3Template ( this, ScResId( FT_COND3_TEMPLATE ) ),
+ aLbCond3Template ( this, ScResId( LB_COND3_TEMPLATE ) ),
aBtnNew3 ( this, ScResId( BTN_COND3_NEW ) ),
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
- pEdActive ( NULL ),
+ aBtnOk ( this, ScResId( BTN_OK ) ),
+ aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
+ aBtnHelp ( this, ScResId( BTN_HELP ) ),
+ pEdActive ( NULL ),
bDlgLostFocus ( FALSE ),
- pDoc ( pCurDoc )
+ pDoc ( pCurDoc )
{
Point aPos;
String aName;
@@ -126,7 +126,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
aLbCond32.SetSelectHdl( LINK( this, ScConditionalFormatDlg, ChangeCond32Hdl ) );
aBtnOk.SetClickHdl ( LINK( this, ScConditionalFormatDlg, BtnHdl ) );
-//? aBtnCancel.SetClickHdl( LINK( this, ScConditionalFormatDlg, BtnHdl ) );
+//? aBtnCancel.SetClickHdl( LINK( this, ScConditionalFormatDlg, BtnHdl ) );
Link aLink = LINK( this, ScConditionalFormatDlg, NewBtnHdl );
aBtnNew1.SetClickHdl( aLink );
@@ -162,12 +162,12 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
aRbCond32.SetLoseFocusHdl( aLink );
// Condition 1
- aCond1Pos1 = aLbCond12.GetPosPixel(); // Position Edit ohne Listbox
- aCond1Pos2 = aEdtCond11.GetPosPixel(); // Position Edit mit Listbox
+ aCond1Pos1 = aLbCond12.GetPosPixel(); // Position Edit ohne Listbox
+ aCond1Pos2 = aEdtCond11.GetPosPixel(); // Position Edit mit Listbox
aRBtn1Pos1 = aRbCond11.GetPosPixel();
aRBtn1Pos2 = aRbCond12.GetPosPixel();
aPos = aEdtCond12.GetPosPixel();
- aPos.X() += aEdtCond12.GetSizePixel().Width(); // rechter Rand
+ aPos.X() += aEdtCond12.GetSizePixel().Width(); // rechter Rand
aCond1Size3 = aEdtCond11.GetSizePixel();
aCond1Size2 = Size( aPos.X() - aCond1Pos2.X(), aCond1Size3.Height() );
aCond1Size1 = Size( aPos.X() - aCond1Pos1.X(), aCond1Size3.Height() );
@@ -177,12 +177,12 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
aLbCond12.SelectEntryPos( 0 );
// Condition 2
- aCond2Pos1 = aLbCond22.GetPosPixel(); // Position Edit ohne Listbox
- aCond2Pos2 = aEdtCond21.GetPosPixel(); // Position Edit mit Listbox
+ aCond2Pos1 = aLbCond22.GetPosPixel(); // Position Edit ohne Listbox
+ aCond2Pos2 = aEdtCond21.GetPosPixel(); // Position Edit mit Listbox
aRBtn2Pos1 = aRbCond21.GetPosPixel();
aRBtn2Pos2 = aRbCond22.GetPosPixel();
aPos = aEdtCond22.GetPosPixel();
- aPos.X() += aEdtCond22.GetSizePixel().Width(); // rechter Rand
+ aPos.X() += aEdtCond22.GetSizePixel().Width(); // rechter Rand
aCond2Size3 = aEdtCond21.GetSizePixel();
aCond2Size2 = Size( aPos.X() - aCond2Pos2.X(), aCond2Size3.Height() );
aCond2Size1 = Size( aPos.X() - aCond2Pos1.X(), aCond2Size3.Height() );
@@ -192,12 +192,12 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
aLbCond22.SelectEntryPos( 0 );
// Condition 3
- aCond3Pos1 = aLbCond32.GetPosPixel(); // Position Edit ohne Listbox
- aCond3Pos2 = aEdtCond31.GetPosPixel(); // Position Edit mit Listbox
+ aCond3Pos1 = aLbCond32.GetPosPixel(); // Position Edit ohne Listbox
+ aCond3Pos2 = aEdtCond31.GetPosPixel(); // Position Edit mit Listbox
aRBtn3Pos1 = aRbCond31.GetPosPixel();
aRBtn3Pos2 = aRbCond32.GetPosPixel();
aPos = aEdtCond32.GetPosPixel();
- aPos.X() += aEdtCond32.GetSizePixel().Width(); // rechter Rand
+ aPos.X() += aEdtCond32.GetSizePixel().Width(); // rechter Rand
aCond3Size3 = aEdtCond31.GetSizePixel();
aCond3Size2 = Size( aPos.X() - aCond3Pos2.X(), aCond3Size3.Height() );
aCond3Size1 = Size( aPos.X() - aCond3Pos1.X(), aCond3Size3.Height() );
@@ -217,8 +217,8 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
}
// Vorlagen eintragen
-//! pStyle = pDoc->GetSelectionStyle( /* ??? const ScMarkData& rMark ??? */ );
- pStyle = NULL; //!
+//! pStyle = pDoc->GetSelectionStyle( /* ??? const ScMarkData& rMark ??? */ );
+ pStyle = NULL; //!
if (pStyle)
aName = pStyle->GetName();
else
@@ -245,15 +245,15 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
aEdtCond11.SetText( pEntry->GetExpression( aCurPos, 0 ) );
aLbCond1Template.SelectEntry( pEntry->GetStyle() );
- ScConditionMode eMode = pEntry->GetOperation();
- if ( eMode == SC_COND_DIRECT ) // via Formel
+ ScConditionMode eMode = pEntry->GetOperation();
+ if ( eMode == SC_COND_DIRECT ) // via Formel
{
aLbCond11.SelectEntryPos( 1 );
ChangeCond11Hdl( NULL );
}
- else if ( eMode == SC_COND_NONE ) // ???
+ else if ( eMode == SC_COND_NONE ) // ???
;
- else // via Werte
+ else // via Werte
{
aLbCond12.SelectEntryPos( sal::static_int_cast<USHORT>( eMode ) );
if ( ( eMode == SC_COND_BETWEEN ) || ( eMode == SC_COND_NOTBETWEEN ) )
@@ -269,15 +269,15 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
aEdtCond21.SetText( pEntry->GetExpression( aCurPos, 0 ) );
aLbCond2Template.SelectEntry( pEntry->GetStyle() );
- ScConditionMode eMode = pEntry->GetOperation();
- if ( eMode == SC_COND_DIRECT ) // via Formel
+ ScConditionMode eMode = pEntry->GetOperation();
+ if ( eMode == SC_COND_DIRECT ) // via Formel
{
aLbCond21.SelectEntryPos( 1 );
ChangeCond21Hdl( NULL );
}
- else if ( eMode == SC_COND_NONE ) // ???
+ else if ( eMode == SC_COND_NONE ) // ???
;
- else // via Werte
+ else // via Werte
{
aLbCond22.SelectEntryPos( sal::static_int_cast<USHORT>( eMode ) );
if ( ( eMode == SC_COND_BETWEEN ) || ( eMode == SC_COND_NOTBETWEEN ) )
@@ -292,15 +292,15 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
aEdtCond31.SetText( pEntry->GetExpression( aCurPos, 0 ) );
aLbCond3Template.SelectEntry( pEntry->GetStyle() );
- ScConditionMode eMode = pEntry->GetOperation();
- if ( eMode == SC_COND_DIRECT ) // via Formel
+ ScConditionMode eMode = pEntry->GetOperation();
+ if ( eMode == SC_COND_DIRECT ) // via Formel
{
aLbCond31.SelectEntryPos( 1 );
ChangeCond31Hdl( NULL );
}
- else if ( eMode == SC_COND_NONE ) // ???
+ else if ( eMode == SC_COND_NONE ) // ???
;
- else // via Werte
+ else // via Werte
{
aLbCond32.SelectEntryPos( sal::static_int_cast<USHORT>( eMode ) );
if ( ( eMode == SC_COND_BETWEEN ) || ( eMode == SC_COND_NOTBETWEEN ) )
@@ -320,8 +320,8 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
aEdtCond11.GrabFocus();
pEdActive = &aEdtCond11;
//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
- //SFX_APPWINDOW->Enable(); // Ref-Feld hat Focus
-// SFX_APPWINDOW->Disable();
+ //SFX_APPWINDOW->Enable(); // Ref-Feld hat Focus
+// SFX_APPWINDOW->Disable();
}
@@ -352,7 +352,7 @@ void ScConditionalFormatDlg::SetReference( const ScRange& rRef, ScDocument* pDoc
Selection aNewSel( aSel.Min(), aSel.Min()+aStr.Len() );
pEdActive->SetRefString( aVal );
pEdActive->SetSelection( aNewSel );
-// pEdActive->SetModifyFlag();
+// pEdActive->SetModifyFlag();
}
}
@@ -368,7 +368,7 @@ void ScConditionalFormatDlg::AddRefEntry()
xub_StrLen nLen = aVal.Len();
pEdActive->SetSelection( Selection( nLen, nLen ) );
-// pEdActive->SetModifyFlag();
+// pEdActive->SetModifyFlag();
}
}
@@ -417,7 +417,7 @@ void ScConditionalFormatDlg::GetConditionalFormat( ScConditionalFormat& rCndFmt
if ( aCbxCond1.IsChecked() )
{
- if ( aLbCond11.GetSelectEntryPos() == 1 ) // via Formel
+ if ( aLbCond11.GetSelectEntryPos() == 1 ) // via Formel
eOper = SC_COND_DIRECT;
else
eOper = (ScConditionMode)aLbCond12.GetSelectEntryPos();
@@ -430,7 +430,7 @@ void ScConditionalFormatDlg::GetConditionalFormat( ScConditionalFormat& rCndFmt
if ( aCbxCond2.IsChecked() )
{
- if ( aLbCond21.GetSelectEntryPos() == 1 ) // via Formel???
+ if ( aLbCond21.GetSelectEntryPos() == 1 ) // via Formel???
eOper = SC_COND_DIRECT;
else
eOper = (ScConditionMode)aLbCond22.GetSelectEntryPos();
@@ -443,7 +443,7 @@ void ScConditionalFormatDlg::GetConditionalFormat( ScConditionalFormat& rCndFmt
if ( aCbxCond3.IsChecked() )
{
- if ( aLbCond31.GetSelectEntryPos() == 1 ) // via Formel???
+ if ( aLbCond31.GetSelectEntryPos() == 1 ) // via Formel???
eOper = SC_COND_DIRECT;
else
eOper = (ScConditionMode)aLbCond32.GetSelectEntryPos();
@@ -747,7 +747,7 @@ IMPL_LINK( ScConditionalFormatDlg, LoseFocusHdl, Control*, EMPTYARG )
//----------------------------------------------------------------------------
-// [OK], [Cancel]
+// [OK], [Cancel]
IMPL_LINK( ScConditionalFormatDlg, BtnHdl, PushButton*, pBtn )
{
diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx
index b50435041409..0f0ec3445034 100644
--- a/sc/source/ui/attrdlg/scabstdlg.cxx
+++ b/sc/source/ui/attrdlg/scabstdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create()
{
ScFuncPtrCreateDialogFactory fp = 0;
static ::osl::Module aDialogLibrary;
-
+
OUStringBuffer aStrBuf;
aStrBuf.appendAscii( SVLIBRARY("scui") );
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 73a5f1a1c4ee..944bd8c7355f 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -294,7 +294,7 @@ void AbstractScDeleteContentsDlg_Impl::DisableObjects()
{
pDlg->DisableObjects();
}
-USHORT AbstractScDeleteContentsDlg_Impl::GetDelContentsCmdBits() const
+USHORT AbstractScDeleteContentsDlg_Impl::GetDelContentsCmdBits() const
{
return pDlg->GetDelContentsCmdBits();
}
@@ -306,7 +306,7 @@ FillDir AbstractScFillSeriesDlg_Impl::GetFillDir() const
return pDlg->GetFillDir();
}
-FillCmd AbstractScFillSeriesDlg_Impl::GetFillCmd() const
+FillCmd AbstractScFillSeriesDlg_Impl::GetFillCmd() const
{
return pDlg->GetFillCmd();
}
@@ -316,23 +316,23 @@ FillDateCmd AbstractScFillSeriesDlg_Impl::GetFillDateCmd() const
return pDlg->GetFillDateCmd();
}
-double AbstractScFillSeriesDlg_Impl::GetStart() const
+double AbstractScFillSeriesDlg_Impl::GetStart() const
{
return pDlg->GetStart();
}
-double AbstractScFillSeriesDlg_Impl::GetStep() const
+double AbstractScFillSeriesDlg_Impl::GetStep() const
{
return pDlg->GetStep();
}
-double AbstractScFillSeriesDlg_Impl::GetMax() const
+double AbstractScFillSeriesDlg_Impl::GetMax() const
{
return pDlg->GetMax();
}
-String AbstractScFillSeriesDlg_Impl::GetStartStr() const
+String AbstractScFillSeriesDlg_Impl::GetStartStr() const
{
return pDlg->GetStartStr();
}
-void AbstractScFillSeriesDlg_Impl::SetEdStartValEnabled(BOOL bFlag)
+void AbstractScFillSeriesDlg_Impl::SetEdStartValEnabled(BOOL bFlag)
{
pDlg->SetEdStartValEnabled(bFlag);
}
@@ -362,42 +362,42 @@ USHORT AbstractScInsertContentsDlg_Impl::GetInsContentsCmdBits() const
}
-USHORT AbstractScInsertContentsDlg_Impl::GetFormulaCmdBits() const
+USHORT AbstractScInsertContentsDlg_Impl::GetFormulaCmdBits() const
{
return pDlg->GetFormulaCmdBits();
}
-BOOL AbstractScInsertContentsDlg_Impl::IsSkipEmptyCells() const
+BOOL AbstractScInsertContentsDlg_Impl::IsSkipEmptyCells() const
{
return pDlg->IsSkipEmptyCells();
}
-BOOL AbstractScInsertContentsDlg_Impl::IsLink() const
+BOOL AbstractScInsertContentsDlg_Impl::IsLink() const
{
return pDlg->IsLink();
}
-void AbstractScInsertContentsDlg_Impl::SetFillMode( BOOL bSet )
+void AbstractScInsertContentsDlg_Impl::SetFillMode( BOOL bSet )
{
pDlg->SetFillMode( bSet );
}
-void AbstractScInsertContentsDlg_Impl::SetOtherDoc( BOOL bSet )
+void AbstractScInsertContentsDlg_Impl::SetOtherDoc( BOOL bSet )
{
pDlg->SetOtherDoc( bSet );
}
-BOOL AbstractScInsertContentsDlg_Impl::IsTranspose() const
+BOOL AbstractScInsertContentsDlg_Impl::IsTranspose() const
{
return pDlg->IsTranspose();
}
-void AbstractScInsertContentsDlg_Impl::SetChangeTrack( BOOL bSet )
+void AbstractScInsertContentsDlg_Impl::SetChangeTrack( BOOL bSet )
{
pDlg->SetChangeTrack( bSet );
}
-void AbstractScInsertContentsDlg_Impl::SetCellShiftDisabled( int nDisable )
+void AbstractScInsertContentsDlg_Impl::SetCellShiftDisabled( int nDisable )
{
pDlg->SetCellShiftDisabled( nDisable );
}
-InsCellCmd AbstractScInsertContentsDlg_Impl::GetMoveMode()
+InsCellCmd AbstractScInsertContentsDlg_Impl::GetMoveMode()
{
return pDlg->GetMoveMode();
}
@@ -410,27 +410,27 @@ BOOL AbstractScInsertTableDlg_Impl::GetTablesFromFile()
return pDlg->GetTablesFromFile();
}
-BOOL AbstractScInsertTableDlg_Impl::GetTablesAsLink()
+BOOL AbstractScInsertTableDlg_Impl::GetTablesAsLink()
{
return pDlg->GetTablesAsLink();
}
-const String* AbstractScInsertTableDlg_Impl::GetFirstTable( USHORT* pN )
+const String* AbstractScInsertTableDlg_Impl::GetFirstTable( USHORT* pN )
{
return pDlg->GetFirstTable( pN );
}
-ScDocShell* AbstractScInsertTableDlg_Impl::GetDocShellTables()
+ScDocShell* AbstractScInsertTableDlg_Impl::GetDocShellTables()
{
return pDlg->GetDocShellTables();
}
-BOOL AbstractScInsertTableDlg_Impl::IsTableBefore()
+BOOL AbstractScInsertTableDlg_Impl::IsTableBefore()
{
return pDlg->IsTableBefore();
}
-USHORT AbstractScInsertTableDlg_Impl::GetTableCount()
+USHORT AbstractScInsertTableDlg_Impl::GetTableCount()
{
return pDlg->GetTableCount();
}
-const String* AbstractScInsertTableDlg_Impl::GetNextTable( USHORT* pN )
+const String* AbstractScInsertTableDlg_Impl::GetNextTable( USHORT* pN )
{
return pDlg->GetNextTable( pN );
}
@@ -451,23 +451,23 @@ void AbstractScLinkedAreaDlg_Impl::InitFromOldLink( const String& rFile, const S
pDlg->InitFromOldLink( rFile, rFilter, rOptions, rSource, nRefresh);
}
-String AbstractScLinkedAreaDlg_Impl::GetURL()
+String AbstractScLinkedAreaDlg_Impl::GetURL()
{
return pDlg->GetURL();
}
-String AbstractScLinkedAreaDlg_Impl::GetFilter()
+String AbstractScLinkedAreaDlg_Impl::GetFilter()
{
return pDlg->GetFilter();
}
-String AbstractScLinkedAreaDlg_Impl::GetOptions()
+String AbstractScLinkedAreaDlg_Impl::GetOptions()
{
return pDlg->GetOptions();
}
-String AbstractScLinkedAreaDlg_Impl::GetSource()
+String AbstractScLinkedAreaDlg_Impl::GetSource()
{
return pDlg->GetSource();
}
-ULONG AbstractScLinkedAreaDlg_Impl::GetRefresh()
+ULONG AbstractScLinkedAreaDlg_Impl::GetRefresh()
{
return pDlg->GetRefresh();
}
@@ -488,19 +488,19 @@ USHORT AbstractScMoveTableDlg_Impl::GetSelectedDocument() const //add for ScMove
return pDlg->GetSelectedDocument();
}
-USHORT AbstractScMoveTableDlg_Impl::GetSelectedTable() const
+USHORT AbstractScMoveTableDlg_Impl::GetSelectedTable() const
{
return pDlg->GetSelectedTable();
}
-BOOL AbstractScMoveTableDlg_Impl::GetCopyTable() const
+BOOL AbstractScMoveTableDlg_Impl::GetCopyTable() const
{
return pDlg->GetCopyTable();
}
-void AbstractScMoveTableDlg_Impl::SetCopyTable(BOOL bFla)
+void AbstractScMoveTableDlg_Impl::SetCopyTable(BOOL bFla)
{
return pDlg->SetCopyTable( bFla );
}
-void AbstractScMoveTableDlg_Impl::EnableCopyTable(BOOL bFlag)
+void AbstractScMoveTableDlg_Impl::EnableCopyTable(BOOL bFlag)
{
return pDlg->EnableCopyTable( bFlag);
}
@@ -522,7 +522,7 @@ String AbstractScNamePasteDlg_Impl::GetSelectedName() const //add for ScNamePas
//add for AbstractScNamePasteDlg_Impl end
//add for AbstractScPivotFilterDlg_Impl begin
-const ScQueryItem& AbstractScPivotFilterDlg_Impl::GetOutputItem() //add for ScPivotFilterDlg
+const ScQueryItem& AbstractScPivotFilterDlg_Impl::GetOutputItem() //add for ScPivotFilterDlg
{
return pDlg->GetOutputItem();
}
@@ -593,11 +593,11 @@ void AbstractScShowTabDlg_Impl::Insert( const String& rString, BOOL bSelected )
pDlg->Insert( rString, bSelected);
}
-USHORT AbstractScShowTabDlg_Impl::GetSelectEntryCount() const
+USHORT AbstractScShowTabDlg_Impl::GetSelectEntryCount() const
{
return pDlg->GetSelectEntryCount();
}
-void AbstractScShowTabDlg_Impl::SetDescription(
+void AbstractScShowTabDlg_Impl::SetDescription(
const String& rTitle, const String& rFixedText,
ULONG nDlgHelpId, ULONG nLbHelpId )
{
@@ -607,7 +607,7 @@ USHORT AbstractScShowTabDlg_Impl::GetSelectEntryPos(USHORT nPos) const
{
return pDlg->GetSelectEntryPos( nPos);
}
-String AbstractScShowTabDlg_Impl::GetSelectEntry(USHORT nPos) const
+String AbstractScShowTabDlg_Impl::GetSelectEntry(USHORT nPos) const
{
return pDlg->GetSelectEntry(nPos);
}
@@ -687,8 +687,8 @@ AbstractScTextImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScTextImpor
//add for ScAutoFormatDlg begin
-AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg( Window* pParent, //add for ScAutoFormatDlg
- ScAutoFormat* pAutoFormat,
+AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg( Window* pParent, //add for ScAutoFormatDlg
+ ScAutoFormat* pAutoFormat,
const ScAutoFormatData* pSelFormatData,
ScDocument* pDoc,
int nId)
@@ -735,11 +735,11 @@ AbstractScColRowLabelDlg * ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg
//add for ScColOrRowDlg begin
-VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window* pParent,
- const String& rStrTitle,
- const String& rStrLabel,
+VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window* pParent,
+ const String& rStrTitle,
+ const String& rStrLabel,
int nId,
- BOOL bColDefault)
+ BOOL bColDefault)
{
Dialog * pDlg=NULL;
switch ( nId )
@@ -758,7 +758,7 @@ VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window*
//add for ScColOrRowDlg end
//add for ScSortWarningDlg begin
-VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( Window* pParent, const String& rExtendText,
+VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( Window* pParent, const String& rExtendText,
const String& rCurrentText, int nId )
{
Dialog * pDlg=NULL;
@@ -885,15 +885,15 @@ AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContent
//add for ScDeleteContentsDlg end
//add for ScFillSeriesDlg begin
-AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg
- ScDocument& rDocument,
- FillDir eFillDir,
- FillCmd eFillCmd,
- FillDateCmd eFillDateCmd,
- String aStartStr,
- double fStep,
- double fMax,
- USHORT nPossDir,
+AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg
+ ScDocument& rDocument,
+ FillDir eFillDir,
+ FillCmd eFillCmd,
+ FillDateCmd eFillDateCmd,
+ String aStartStr,
+ double fStep,
+ double fMax,
+ USHORT nPossDir,
int nId)
{
ScFillSeriesDlg * pDlg=NULL;
@@ -915,10 +915,10 @@ AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Wi
//add for ScGroupDlg begin
AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( Window* pParent,
- USHORT nResId,
+ USHORT nResId,
int nId,
- BOOL bUnGroup ,
- BOOL bRows )
+ BOOL bUnGroup ,
+ BOOL bRows )
{
ScGroupDlg * pDlg=NULL;
switch ( nId )
@@ -962,10 +962,10 @@ AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( W
//add for ScInsertCellDlg end
//add for ScInsertContentsDlg begin
-AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg( Window* pParent,
+AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg( Window* pParent,
int nId,
- USHORT nCheckDefaults,
- const String* pStrTitle )
+ USHORT nCheckDefaults,
+ const String* pStrTitle )
{
ScInsertContentsDlg * pDlg=NULL;
switch ( nId )
@@ -1005,10 +1005,10 @@ AbstractScInsertTableDlg * ScAbstractDialogFactory_Impl::CreateScInsertTableDlg
// add for ScSelEntryDlg begin
AbstractScSelEntryDlg * ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( Window* pParent,
- USHORT nResId,
+ USHORT nResId,
const String& aTitle,
const String& aLbTitle,
- List& aEntryList,
+ List& aEntryList,
int nId )
{
ScSelEntryDlg * pDlg=NULL;
@@ -1048,16 +1048,16 @@ AbstractScLinkedAreaDlg * ScAbstractDialogFactory_Impl::CreateScLinkedAreaDlg (
//add for ScLinkedAreaDlg end
//add for ScMetricInputDlg begin
-AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg ( Window* pParent,
- USHORT nResId, // Ableitung fuer jeden Dialog!
- long nCurrent,
- long nDefault,
+AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg ( Window* pParent,
+ USHORT nResId, // Ableitung fuer jeden Dialog!
+ long nCurrent,
+ long nDefault,
int nId ,
- FieldUnit eFUnit,
- USHORT nDecimals,
- long nMaximum ,
- long nMinimum,
- long nFirst,
+ FieldUnit eFUnit,
+ USHORT nDecimals,
+ long nMaximum ,
+ long nMinimum,
+ long nFirst,
long nLast )
{
ScMetricInputDlg * pDlg=NULL;
@@ -1143,7 +1143,7 @@ AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg (
//add for ScPivotFilterDlg begin
AbstractScPivotFilterDlg * ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg ( Window* pParent,
- const SfxItemSet& rArgSet, USHORT nSourceTab , int nId )
+ const SfxItemSet& rArgSet, USHORT nSourceTab , int nId )
{
ScPivotFilterDlg * pDlg=NULL;
switch ( nId )
@@ -1329,11 +1329,11 @@ return 0;
//add for ScTabBgColorDlg end
//add for ScImportOptionsDlg begin
-AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptionsDlg ( Window* pParent,
+AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptionsDlg ( Window* pParent,
int nId,
BOOL bAscii,
- const ScImportOptions* pOptions,
- const String* pStrTitle,
+ const ScImportOptions* pOptions,
+ const String* pStrTitle,
BOOL bMultiByte,
BOOL bOnlyDbtoolsEncodings,
BOOL bImport )
@@ -1359,8 +1359,8 @@ AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptions
#define AbstractTabDialog_Impl layout::AbstractTabDialog_Impl
#endif /* ENABLE_LAYOUT */
//add for ScAttrDlg begin
-SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg( SfxViewFrame* pFrame,
- Window* pParent,
+SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg( SfxViewFrame* pFrame,
+ Window* pParent,
const SfxItemSet* pCellAttrs,
int nId)
{
@@ -1384,12 +1384,12 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg( SfxViewFra
#undef AbstractTabDialog_Impl
//add for ScHFEditDlg begin
-SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewFrame* pFrame,
- Window* pParent,
- const SfxItemSet& rCoreSet,
- const String& rPageStyle,
+SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewFrame* pFrame,
+ Window* pParent,
+ const SfxItemSet& rCoreSet,
+ const String& rPageStyle,
int nId,
- USHORT nResId )
+ USHORT nResId )
{
SfxTabDialog* pDlg=NULL;
switch ( nId )
@@ -1408,9 +1408,9 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewF
//add for ScHFEditDlg end
//add for ScStyleDlg begin
-SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window* pParent,
- SfxStyleSheetBase& rStyleBase,
- USHORT nRscId,
+SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window* pParent,
+ SfxStyleSheetBase& rStyleBase,
+ USHORT nRscId,
int nId)
{
SfxTabDialog* pDlg=NULL;
@@ -1431,8 +1431,8 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window*
//add for ScStyleDlg end
//add for ScSubTotalDlg begin
-SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg( Window* pParent,
- const SfxItemSet* pArgSet,
+SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg( Window* pParent,
+ const SfxItemSet* pArgSet,
int nId)
{
SfxTabDialog* pDlg=NULL;
@@ -1494,7 +1494,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( Windo
//add for ScValidationDlg begin
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg( Window* pParent,
//<!--Modified by PengYunQuan for Validity Cell Range Picker
-// const SfxItemSet* pArgSet,int nId )
+// const SfxItemSet* pArgSet,int nId )
const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh )
//-->Modified by PengYunQuan for Validity Cell Range Picke
{
@@ -1522,7 +1522,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg( Wind
#define AbstractTabDialog_Impl layout::AbstractTabDialog_Impl
#endif /* ENABLE_LAYOUT */
//add for ScSortDlg begin
-SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg( Window* pParent,
+SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg( Window* pParent,
const SfxItemSet* pArgSet,int nId )
{
SfxTabDialog* pDlg=NULL;
@@ -1551,13 +1551,13 @@ CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
case RID_SCPAGE_OPREDLINE :
return ScRedlineOptionsTabPage::Create;
//break;
- case RID_SCPAGE_CALC :
+ case RID_SCPAGE_CALC :
return ScTpCalcOptions::Create;
//break;
- case RID_SCPAGE_PRINT :
+ case RID_SCPAGE_PRINT :
return ScTpPrintOptions::Create;
//break;
- case RID_SCPAGE_STAT :
+ case RID_SCPAGE_STAT :
return ScDocStatPage::Create;
//break;
case RID_SCPAGE_USERLISTS :
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index cd0f79dd1598..d8ae11367fab 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +64,15 @@ class SfxTabDialog;
class ScSortWarningDlg;
class ScTextImportOptionsDlg;
-#define DECL_ABSTDLG_BASE(Class,DialogClass) \
- DialogClass* pDlg; \
-public: \
- Class( DialogClass* p) \
- : pDlg(p) \
+#define DECL_ABSTDLG_BASE(Class,DialogClass) \
+ DialogClass* pDlg; \
+public: \
+ Class( DialogClass* p) \
+ : pDlg(p) \
{} \
- virtual ~Class(); \
- virtual short Execute() ;
-// virtual void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 )
+ virtual ~Class(); \
+ virtual short Execute() ;
+// virtual void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 )
#define DECL_ABSTDLG2_BASE(Class,DialogClass) \
DialogClass* pDlg; \
@@ -85,13 +85,13 @@ public: \
long GetResult();
#define IMPL_ABSTDLG_BASE(Class) \
-Class::~Class() \
+Class::~Class() \
{ \
- delete pDlg; \
-} \
+ delete pDlg; \
+} \
short Class::Execute() \
{ \
- return pDlg->Execute(); \
+ return pDlg->Execute(); \
}
#define IMPL_ABSTDLG2_BASE(Class) \
@@ -138,24 +138,24 @@ class AbstractScColRowLabelDlg_Impl : public AbstractScColRowLabelDlg //add for
class AbstractScDataPilotDatabaseDlg_Impl :public AbstractScDataPilotDatabaseDlg //add for ScDataPilotDatabaseDlg
{
DECL_ABSTDLG_BASE(AbstractScDataPilotDatabaseDlg_Impl, ScDataPilotDatabaseDlg)
- virtual void GetValues( ScImportSourceDesc& rDesc );
+ virtual void GetValues( ScImportSourceDesc& rDesc );
};
class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTypeDlg //add for ScDataPilotSourceTypeDlg
{
DECL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl, ScDataPilotSourceTypeDlg)
- virtual BOOL IsDatabase() const;
- virtual BOOL IsExternal() const;
+ virtual BOOL IsDatabase() const;
+ virtual BOOL IsExternal() const;
};
class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg //add for ScDataPilotServiceDlg
{
DECL_ABSTDLG_BASE(AbstractScDataPilotServiceDlg_Impl, ScDataPilotServiceDlg)
- virtual String GetServiceName() const;
- virtual String GetParSource() const;
- virtual String GetParName() const;
- virtual String GetParUser() const;
- virtual String GetParPass() const;
+ virtual String GetServiceName() const;
+ virtual String GetParSource() const;
+ virtual String GetParName() const;
+ virtual String GetParUser() const;
+ virtual String GetParPass() const;
};
class AbstractScDeleteCellDlg_Impl : public AbstractScDeleteCellDlg //add for ScDeleteCellDlg
@@ -167,21 +167,21 @@ class AbstractScDeleteCellDlg_Impl : public AbstractScDeleteCellDlg //add for S
class AbstractScDeleteContentsDlg_Impl : public AbstractScDeleteContentsDlg //add for ScDeleteContentsDlg
{
DECL_ABSTDLG_BASE( AbstractScDeleteContentsDlg_Impl,ScDeleteContentsDlg)
- virtual void DisableObjects();
- virtual USHORT GetDelContentsCmdBits() const;
+ virtual void DisableObjects();
+ virtual USHORT GetDelContentsCmdBits() const;
};
class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg //add for ScFillSeriesDlg
{
DECL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl, ScFillSeriesDlg)
- virtual FillDir GetFillDir() const;
- virtual FillCmd GetFillCmd() const;
- virtual FillDateCmd GetFillDateCmd() const;
- virtual double GetStart() const;
- virtual double GetStep() const;
- virtual double GetMax() const;
- virtual String GetStartStr() const;
- virtual void SetEdStartValEnabled(BOOL bFlag=FALSE);
+ virtual FillDir GetFillDir() const;
+ virtual FillCmd GetFillCmd() const;
+ virtual FillDateCmd GetFillDateCmd() const;
+ virtual double GetStart() const;
+ virtual double GetStep() const;
+ virtual double GetMax() const;
+ virtual String GetStartStr() const;
+ virtual void SetEdStartValEnabled(BOOL bFlag=FALSE);
};
class AbstractScGroupDlg_Impl : public AbstractScGroupDlg //add for ScGroupDlg
@@ -199,28 +199,28 @@ class AbstractScInsertCellDlg_Impl : public AbstractScInsertCellDlg //add for S
class AbstractScInsertContentsDlg_Impl : public AbstractScInsertContentsDlg //add for ScInsertContentsDlg
{
DECL_ABSTDLG_BASE(AbstractScInsertContentsDlg_Impl, ScInsertContentsDlg)
- virtual USHORT GetInsContentsCmdBits() const;
- virtual USHORT GetFormulaCmdBits() const;
- virtual BOOL IsSkipEmptyCells() const;
- virtual BOOL IsLink() const;
- virtual void SetFillMode( BOOL bSet );
- virtual void SetOtherDoc( BOOL bSet );
- virtual BOOL IsTranspose() const;
- virtual void SetChangeTrack( BOOL bSet );
- virtual void SetCellShiftDisabled( int nDisable );
- virtual InsCellCmd GetMoveMode();
+ virtual USHORT GetInsContentsCmdBits() const;
+ virtual USHORT GetFormulaCmdBits() const;
+ virtual BOOL IsSkipEmptyCells() const;
+ virtual BOOL IsLink() const;
+ virtual void SetFillMode( BOOL bSet );
+ virtual void SetOtherDoc( BOOL bSet );
+ virtual BOOL IsTranspose() const;
+ virtual void SetChangeTrack( BOOL bSet );
+ virtual void SetCellShiftDisabled( int nDisable );
+ virtual InsCellCmd GetMoveMode();
};
class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg //add for ScInsertTableDlg
{
DECL_ABSTDLG_BASE( AbstractScInsertTableDlg_Impl, ScInsertTableDlg)
- virtual BOOL GetTablesFromFile();
- virtual BOOL GetTablesAsLink();
- virtual const String* GetFirstTable( USHORT* pN = NULL );
- virtual ScDocShell* GetDocShellTables();
- virtual BOOL IsTableBefore();
- virtual USHORT GetTableCount();
- virtual const String* GetNextTable( USHORT* pN = NULL );
+ virtual BOOL GetTablesFromFile();
+ virtual BOOL GetTablesAsLink();
+ virtual const String* GetFirstTable( USHORT* pN = NULL );
+ virtual ScDocShell* GetDocShellTables();
+ virtual BOOL IsTableBefore();
+ virtual USHORT GetTableCount();
+ virtual const String* GetNextTable( USHORT* pN = NULL );
};
@@ -234,14 +234,14 @@ class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg //add for S
{
DECL_ABSTDLG2_BASE( AbstractScLinkedAreaDlg_Impl, ScLinkedAreaDlg)
- 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 );
- virtual String GetURL();
- virtual String GetFilter(); // may be empty
- virtual String GetOptions(); // filter options
- virtual String GetSource(); // separated by ";"
- virtual ULONG GetRefresh(); // 0 if disabled
+ virtual String GetURL();
+ virtual String GetFilter(); // may be empty
+ virtual String GetOptions(); // filter options
+ virtual String GetSource(); // separated by ";"
+ virtual ULONG GetRefresh(); // 0 if disabled
};
class AbstractScMetricInputDlg_Impl : public AbstractScMetricInputDlg //add for ScMetricInputDlg
@@ -253,29 +253,29 @@ class AbstractScMetricInputDlg_Impl : public AbstractScMetricInputDlg //add for
class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg //add for ScMoveTableDlg
{
DECL_ABSTDLG_BASE( AbstractScMoveTableDlg_Impl, ScMoveTableDlg)
- virtual USHORT GetSelectedDocument () const;
- virtual USHORT GetSelectedTable () const;
- virtual BOOL GetCopyTable () const;
- virtual void SetCopyTable (BOOL bFlag=TRUE);
- virtual void EnableCopyTable (BOOL bFlag=TRUE);
+ virtual USHORT GetSelectedDocument () const;
+ virtual USHORT GetSelectedTable () const;
+ virtual BOOL GetCopyTable () const;
+ virtual void SetCopyTable (BOOL bFlag=TRUE);
+ virtual void EnableCopyTable (BOOL bFlag=TRUE);
};
class AbstractScNameCreateDlg_Impl : public AbstractScNameCreateDlg //add for ScNameCreateDlg
{
DECL_ABSTDLG_BASE( AbstractScNameCreateDlg_Impl, ScNameCreateDlg)
- virtual USHORT GetFlags() const;
+ virtual USHORT GetFlags() const;
};
class AbstractScNamePasteDlg_Impl : public AbstractScNamePasteDlg //add for ScNamePasteDlg
{
DECL_ABSTDLG_BASE( AbstractScNamePasteDlg_Impl, ScNamePasteDlg )
- virtual String GetSelectedName() const;
+ virtual String GetSelectedName() const;
};
class AbstractScPivotFilterDlg_Impl : public AbstractScPivotFilterDlg //add for ScPivotFilterDlg
{
DECL_ABSTDLG_BASE( AbstractScPivotFilterDlg_Impl, ScPivotFilterDlg)
- virtual const ScQueryItem& GetOutputItem();
+ virtual const ScQueryItem& GetOutputItem();
};
class AbstractScDPFunctionDlg_Impl : public AbstractScDPFunctionDlg //add for ScDPFunctionDlg
@@ -325,9 +325,9 @@ class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg //add for ScShowT
{
DECL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl,ScShowTabDlg)
virtual void Insert( const String& rString, BOOL bSelected );
- virtual USHORT GetSelectEntryCount() const;
+ virtual USHORT GetSelectEntryCount() const;
virtual void SetDescription(const String& rTitle, const String& rFixedText,ULONG nDlgHelpId, ULONG nLbHelpId );
- virtual String GetSelectEntry(USHORT nPos) const;
+ virtual String GetSelectEntry(USHORT nPos) const;
virtual USHORT GetSelectEntryPos(USHORT nPos) const;
};
@@ -360,13 +360,13 @@ class AbstractScTextImportOptionsDlg_Impl : public AbstractScTextImportOptionsDl
class AbstractTabDialog_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
- virtual void SetCurPageId( USHORT nId );
- virtual const SfxItemSet* GetOutputItemSet() const;
- virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); //add by CHINA001
- virtual void SetInputSet( const SfxItemSet* pInSet ); //add by CHINA001
+ virtual void SetCurPageId( USHORT nId );
+ virtual const SfxItemSet* GetOutputItemSet() const;
+ virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); //add by CHINA001
+ virtual void SetInputSet( const SfxItemSet* pInSet ); //add by CHINA001
//From class Window.
- virtual void SetText( const XubString& rStr ); //add by CHINA001
- virtual String GetText() const; //add by CHINA001
+ virtual void SetText( const XubString& rStr ); //add by CHINA001
+ virtual String GetText() const; //add by CHINA001
};
#if ENABLE_LAYOUT
namespace layout
@@ -375,13 +375,13 @@ namespace layout
class AbstractTabDialog_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
- virtual void SetCurPageId( USHORT nId );
- virtual const SfxItemSet* GetOutputItemSet() const;
- virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); //add by CHINA001
- virtual void SetInputSet( const SfxItemSet* pInSet ); //add by CHINA001
+ virtual void SetCurPageId( USHORT nId );
+ virtual const SfxItemSet* GetOutputItemSet() const;
+ virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); //add by CHINA001
+ virtual void SetInputSet( const SfxItemSet* pInSet ); //add by CHINA001
//From class Window.
- virtual void SetText( const XubString& rStr ); //add by CHINA001
- virtual String GetText() const; //add by CHINA001
+ virtual void SetText( const XubString& rStr ); //add by CHINA001
+ virtual String GetText() const; //add by CHINA001
};
} // end namespace layout
#endif /* ENABLE_LAYOUT */
@@ -391,16 +391,16 @@ class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory
{
public:
- //CHINA001 AbstractSwSaveLabelDlg* CreateSwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec, int nId );
+ //CHINA001 AbstractSwSaveLabelDlg* CreateSwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec, int nId );
- 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');
virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg( Window* pParent, int nId );
- 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);
@@ -409,11 +409,11 @@ public:
BOOL bCol = FALSE,
BOOL bRow = FALSE);
- 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 );
+ BOOL bColDefault = TRUE );
virtual VclAbstractDialog * CreateScSortWarningDlg( Window* pParent, const String& rExtendText, const String& rCurrentText, int nId );
@@ -430,54 +430,54 @@ public:
virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
USHORT nCheckDefaults = 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);
virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, //add for ScGroupDlg
- USHORT nResId,
+ USHORT nResId,
int nId,
- BOOL bUnGroup = FALSE,
- BOOL bRows = TRUE );
+ BOOL bUnGroup = FALSE,
+ BOOL bRows = TRUE );
virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, //add for ScInsertCellDlg
int nId,
BOOL bDisallowCellMove = FALSE );
- 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 );
+ USHORT nCheckDefaults = 0,
+ const String* pStrTitle = NULL );
virtual AbstractScInsertTableDlg * CreateScInsertTableDlg ( Window* pParent, ScViewData& rViewData, //add for ScInsertTableDlg
SCTAB nTabCount, bool bFromFile, int nId);
virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg
- USHORT nResId,
+ USHORT nResId,
const String& aTitle,
const String& aLbTitle,
- List& aEntryList,
+ List& aEntryList,
int nId );
virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg ( Window* pParent, //add for ScLinkedAreaDlg
int nId);
- 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 );
virtual AbstractScMoveTableDlg * CreateScMoveTableDlg( Window* pParent, int nId ); //add for ScMoveTableDlg
@@ -487,7 +487,7 @@ public:
int nId , BOOL bInsList=TRUE );
virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent, //add for ScPivotFilterDlg
- const SfxItemSet& rArgSet, USHORT nSourceTab , int nId );
+ const SfxItemSet& rArgSet, USHORT nSourceTab , int nId );
virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, int nId,
const ScDPLabelDataVec& rLabelVec,
@@ -534,33 +534,33 @@ public:
ULONG nHelpId ,
int nId );
- 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 );
- 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);
- 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 );
+ USHORT nResId = RID_SCDLG_HFEDIT );
- 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);
- virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, //add for ScSubTotalDlg
- const SfxItemSet* pArgSet,
+ virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, //add for ScSubTotalDlg
+ const SfxItemSet* pArgSet,
int nId);
virtual SfxAbstractTabDialog * CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr,//add for ScCharDlg
const SfxObjectShell* pDocShell, int nId );
@@ -570,22 +570,22 @@ public:
virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, //add for ScValidationDlg
//<!--Modified by PengYunQuan for Validity Cell Range Picker
- // const SfxItemSet* pArgSet,int nId );
+ // const SfxItemSet* pArgSet,int nId );
const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh );
//-->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 );
// For TabPage
- virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId );
+ virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId );
- virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId );
+ virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId );
};
//CHINA001 struct ScDialogsResMgr
//CHINA001 {
-//CHINA001 static ResMgr* GetResMgr();
+//CHINA001 static ResMgr* GetResMgr();
//CHINA001 };
#endif
diff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxx
index 35a0a3a1fb35..ab5190c3e6e2 100644
--- a/sc/source/ui/attrdlg/scuiexp.cxx
+++ b/sc/source/ui/attrdlg/scuiexp.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +41,7 @@ namespace scui
if ( !pFactory )
pFactory = new ScAbstractDialogFactory_Impl;
//if ( !pSwResMgr)
- // ScDialogsResMgr::GetResMgr();
+ // ScDialogsResMgr::GetResMgr();
return pFactory;
}
}
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index 21c769cf0603..2783ef5be8cd 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,31 +54,31 @@ static USHORT pProtectionRanges[] =
// Zellschutz-Tabpage:
//========================================================================
-ScTabPageProtection::ScTabPageProtection( Window* pParent,
+ScTabPageProtection::ScTabPageProtection( Window* pParent,
const SfxItemSet& rCoreAttrs )
- : SfxTabPage ( pParent,
+ : SfxTabPage ( pParent,
ScResId( RID_SCPAGE_PROTECTION ),
rCoreAttrs ),
//
aFlProtect ( this, ScResId( FL_PROTECTION ) ),
- aBtnHideCell ( this, ScResId( BTN_HIDE_ALL ) ),
- aBtnProtect ( this, ScResId( BTN_PROTECTED ) ),
- aBtnHideFormula ( this, ScResId( BTN_HIDE_FORMULAR ) ),
- aTxtHint ( this, ScResId( FT_HINT ) ),
+ aBtnHideCell ( this, ScResId( BTN_HIDE_ALL ) ),
+ aBtnProtect ( this, ScResId( BTN_PROTECTED ) ),
+ aBtnHideFormula ( this, ScResId( BTN_HIDE_FORMULAR ) ),
+ aTxtHint ( this, ScResId( FT_HINT ) ),
aFlPrint ( this, ScResId( FL_PRINT ) ),
- aBtnHidePrint ( this, ScResId( BTN_HIDE_PRINT ) ),
+ aBtnHidePrint ( this, ScResId( BTN_HIDE_PRINT ) ),
aTxtHint2 ( this, ScResId( FT_HINT2 ) )
{
// diese Page braucht ExchangeSupport
SetExchangeSupport();
- // States werden in Reset gesetzt
+ // States werden in Reset gesetzt
bTriEnabled = bDontCare = bProtect = bHideForm = bHideCell = bHidePrint = FALSE;
- aBtnProtect.SetClickHdl( LINK( this, ScTabPageProtection, ButtonClickHdl ) );
- aBtnHideCell.SetClickHdl( LINK( this, ScTabPageProtection, ButtonClickHdl ) );
+ aBtnProtect.SetClickHdl( LINK( this, ScTabPageProtection, ButtonClickHdl ) );
+ aBtnHideCell.SetClickHdl( LINK( this, ScTabPageProtection, ButtonClickHdl ) );
aBtnHideFormula.SetClickHdl( LINK( this, ScTabPageProtection, ButtonClickHdl ) );
- aBtnHidePrint.SetClickHdl( LINK( this, ScTabPageProtection, ButtonClickHdl ) );
+ aBtnHidePrint.SetClickHdl( LINK( this, ScTabPageProtection, ButtonClickHdl ) );
FreeResource();
}
@@ -98,8 +98,8 @@ USHORT* __EXPORT ScTabPageProtection::GetRanges()
// -----------------------------------------------------------------------
-SfxTabPage* __EXPORT ScTabPageProtection::Create( Window* pParent,
- const SfxItemSet& rAttrSet )
+SfxTabPage* __EXPORT ScTabPageProtection::Create( Window* pParent,
+ const SfxItemSet& rAttrSet )
{
return ( new ScTabPageProtection( pParent, rAttrSet ) );
}
@@ -108,7 +108,7 @@ SfxTabPage* __EXPORT ScTabPageProtection::Create( Window* pParent,
void __EXPORT ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs )
{
- // Variablen initialisieren
+ // Variablen initialisieren
USHORT nWhich = GetWhich( SID_SCATTR_PROTECTION );
const ScProtectionAttr* pProtAttr = NULL;
@@ -120,13 +120,13 @@ void __EXPORT ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs )
pProtAttr = (const ScProtectionAttr*)&(rCoreAttrs.Get(nWhich));
// bei SFX_ITEM_DONTCARE auf 0 lassen
- bTriEnabled = ( pProtAttr == NULL ); // TriState, wenn DontCare
+ bTriEnabled = ( pProtAttr == NULL ); // TriState, wenn DontCare
bDontCare = bTriEnabled;
if (bTriEnabled)
{
- // Defaults, die erscheinen wenn ein TriState weggeklickt wird:
- // (weil alles zusammen ein Attribut ist, kann auch nur alles zusammen
- // auf DontCare stehen - #38543#)
+ // Defaults, die erscheinen wenn ein TriState weggeklickt wird:
+ // (weil alles zusammen ein Attribut ist, kann auch nur alles zusammen
+ // auf DontCare stehen - #38543#)
bProtect = TRUE;
bHideForm = bHideCell = bHidePrint = FALSE;
}
@@ -138,12 +138,12 @@ void __EXPORT ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs )
bHidePrint = pProtAttr->GetHidePrint();
}
- // Controls initialisieren
+ // Controls initialisieren
- aBtnProtect .EnableTriState( bTriEnabled );
- aBtnHideCell .EnableTriState( bTriEnabled );
- aBtnHideFormula .EnableTriState( bTriEnabled );
- aBtnHidePrint .EnableTriState( bTriEnabled );
+ aBtnProtect .EnableTriState( bTriEnabled );
+ aBtnHideCell .EnableTriState( bTriEnabled );
+ aBtnHideFormula .EnableTriState( bTriEnabled );
+ aBtnHidePrint .EnableTriState( bTriEnabled );
UpdateButtons();
}
@@ -152,12 +152,12 @@ void __EXPORT ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs )
BOOL __EXPORT ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs )
{
- BOOL bAttrsChanged = FALSE;
- USHORT nWhich = GetWhich( SID_SCATTR_PROTECTION );
- const SfxPoolItem* pOldItem = GetOldItem( rCoreAttrs, SID_SCATTR_PROTECTION );
- const SfxItemSet& rOldSet = GetItemSet();
- SfxItemState eItemState = rOldSet.GetItemState( nWhich, FALSE );
- ScProtectionAttr aProtAttr;
+ BOOL bAttrsChanged = FALSE;
+ USHORT nWhich = GetWhich( SID_SCATTR_PROTECTION );
+ const SfxPoolItem* pOldItem = GetOldItem( rCoreAttrs, SID_SCATTR_PROTECTION );
+ const SfxItemSet& rOldSet = GetItemSet();
+ SfxItemState eItemState = rOldSet.GetItemState( nWhich, FALSE );
+ ScProtectionAttr aProtAttr;
if ( !bDontCare )
{
@@ -167,7 +167,7 @@ BOOL __EXPORT ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs )
aProtAttr.SetHidePrint( bHidePrint );
if ( bTriEnabled )
- bAttrsChanged = TRUE; // DontCare -> richtiger Wert
+ bAttrsChanged = TRUE; // DontCare -> richtiger Wert
else
bAttrsChanged = !pOldItem || !( aProtAttr == *(const ScProtectionAttr*)pOldItem );
}
@@ -198,11 +198,11 @@ IMPL_LINK( ScTabPageProtection, ButtonClickHdl, TriStateBox*, pBox )
{
TriState eState = pBox->GetState();
if ( eState == STATE_DONTKNOW )
- bDontCare = TRUE; // alles zusammen auf DontCare
+ bDontCare = TRUE; // alles zusammen auf DontCare
else
{
- bDontCare = FALSE; // DontCare ueberall aus
- BOOL bOn = ( eState == STATE_CHECK ); // ausgewaehlter Wert
+ bDontCare = FALSE; // DontCare ueberall aus
+ BOOL bOn = ( eState == STATE_CHECK ); // ausgewaehlter Wert
if ( pBox == &aBtnProtect )
bProtect = bOn;
@@ -218,7 +218,7 @@ IMPL_LINK( ScTabPageProtection, ButtonClickHdl, TriStateBox*, pBox )
}
}
- UpdateButtons(); // TriState und Enable-Logik
+ UpdateButtons(); // TriState und Enable-Logik
return 0;
}
diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx
index 6004fdfcfc51..4874d8ab12a1 100644
--- a/sc/source/ui/cctrl/cbuttonw.cxx
+++ b/sc/source/ui/cctrl/cbuttonw.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +35,11 @@
#include "cbutton.hxx"
//========================================================================
-// class ScDDComboBoxButton
+// class ScDDComboBoxButton
//========================================================================
ScDDComboBoxButton::ScDDComboBoxButton( OutputDevice* pOutputDevice )
- : pOut( pOutputDevice )
+ : pOut( pOutputDevice )
{
SetOptSizePixel();
}
@@ -68,31 +68,31 @@ void ScDDComboBoxButton::SetOptSizePixel()
// -------------------------------------------------------------------------
-void ScDDComboBoxButton::Draw( const Point& rAt,
- const Size& rSize,
+void ScDDComboBoxButton::Draw( const Point& rAt,
+ const Size& rSize,
BOOL bState,
- BOOL bBtnIn /* = FALSE */ )
+ BOOL bBtnIn /* = FALSE */ )
{
if ( rSize.Width() == 0 || rSize.Height() == 0 )
return; // #i43092# rectangle with size 0 would have RECT_EMPTY as end position
// save old state
- BOOL bHadFill = pOut->IsFillColor();
- Color aOldFill = pOut->GetFillColor();
- BOOL bHadLine = pOut->IsLineColor();
- Color aOldLine = pOut->GetLineColor();
- BOOL bOldEnable = pOut->IsMapModeEnabled();
+ BOOL bHadFill = pOut->IsFillColor();
+ Color aOldFill = pOut->GetFillColor();
+ BOOL bHadLine = pOut->IsLineColor();
+ Color aOldLine = pOut->GetLineColor();
+ BOOL bOldEnable = pOut->IsMapModeEnabled();
- Size aLogPix( 1, 1 );
- Rectangle aBtnRect( rAt, rSize );
- Rectangle aInnerRect = aBtnRect;
+ Size aLogPix( 1, 1 );
+ Rectangle aBtnRect( rAt, rSize );
+ Rectangle aInnerRect = aBtnRect;
pOut->EnableMapMode( FALSE );
DecorationView aDecoView( pOut);
USHORT nButtonStyle = BUTTON_DRAW_DEFAULT;
- if( bBtnIn ) // gedrueckt?
+ if( bBtnIn ) // gedrueckt?
{
nButtonStyle = BUTTON_DRAW_PRESSED;
}
@@ -133,9 +133,9 @@ void ScDDComboBoxButton::ImpDrawArrow( const Rectangle& rRect,
{
// no need to save old line and fill color here (is restored after the call)
- Rectangle aPixRect = rRect;
- Point aCenter = aPixRect.Center();
- Size aSize = aPixRect.GetSize();
+ Rectangle aPixRect = rRect;
+ Point aCenter = aPixRect.Center();
+ Size aSize = aPixRect.GetSize();
Size aSize3;
aSize3.Width() = aSize.Width() >> 1;
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index 82c276d98f2c..2b4cdd506a16 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -119,7 +119,7 @@ void ScDPFieldButton::draw()
const long nMargin = 2;
bool bOldMapEnablaed = mpOutDev->IsMapModeEnabled();
mpOutDev->EnableMapMode(false);
-
+
if (mbBaseButton)
{
// Background
@@ -127,18 +127,18 @@ void ScDPFieldButton::draw()
mpOutDev->SetLineColor(mpStyle->GetFaceColor());
mpOutDev->SetFillColor(mpStyle->GetFaceColor());
mpOutDev->DrawRect(aRect);
-
+
// Border lines
mpOutDev->SetLineColor(mpStyle->GetLightColor());
mpOutDev->DrawLine(Point(maPos), Point(maPos.X(), maPos.Y()+maSize.Height()-1));
mpOutDev->DrawLine(Point(maPos), Point(maPos.X()+maSize.Width()-1, maPos.Y()));
-
+
mpOutDev->SetLineColor(mpStyle->GetShadowColor());
mpOutDev->DrawLine(Point(maPos.X(), maPos.Y()+maSize.Height()-1),
Point(maPos.X()+maSize.Width()-1, maPos.Y()+maSize.Height()-1));
mpOutDev->DrawLine(Point(maPos.X()+maSize.Width()-1, maPos.Y()),
Point(maPos.X()+maSize.Width()-1, maPos.Y()+maSize.Height()-1));
-
+
// Field name.
// Get the font and size the same way as in scenario selection (lcl_DrawOneFrame in gridwin4.cxx)
Font aTextFont( mpStyle->GetAppFont() );
@@ -152,7 +152,7 @@ void ScDPFieldButton::draw()
}
mpOutDev->SetFont(aTextFont);
mpOutDev->SetTextColor(mpStyle->GetButtonTextColor());
-
+
Point aTextPos = maPos;
long nTHeight = mpOutDev->GetTextHeight();
aTextPos.setX(maPos.getX() + nMargin);
@@ -174,7 +174,7 @@ void ScDPFieldButton::getPopupBoundingBox(Point& rPos, Size& rSize) const
{
long nW = maSize.getWidth() / 2;
long nH = maSize.getHeight();
- if (nW > 18)
+ if (nW > 18)
nW = 18;
if (nH > 18)
nH = 18;
@@ -197,12 +197,12 @@ void ScDPFieldButton::drawPopupButton()
mpOutDev->DrawRect(Rectangle(aPos, aSize));
if (!mbPopupPressed)
- {
+ {
// border lines
mpOutDev->SetLineColor(mpStyle->GetLightColor());
mpOutDev->DrawLine(Point(aPos.X()+1, aPos.Y()+1), Point(aPos.X()+1, aPos.Y()+aSize.Height()-2));
mpOutDev->DrawLine(Point(aPos.X()+1, aPos.Y()+1), Point(aPos.X()+aSize.Width()-2, aPos.Y()+1));
-
+
mpOutDev->SetLineColor(mpStyle->GetShadowColor());
mpOutDev->DrawLine(Point(aPos.X()+1, aPos.Y()+aSize.Height()-2),
Point(aPos.X()+aSize.Width()-2, aPos.Y()+aSize.Height()-2));
@@ -429,14 +429,14 @@ void ScMenuFloatingWindow::Paint(const Rectangle& /*rRect*/)
Reference<XAccessible> ScMenuFloatingWindow::CreateAccessible()
{
if (!mxAccessible.is())
- {
- Reference<XAccessible> xAccParent = mpParentMenu ?
+ {
+ Reference<XAccessible> xAccParent = mpParentMenu ?
mpParentMenu->GetAccessible() : GetAccessibleParentWindow()->GetAccessible();
mxAccessible.set(new ScAccessibleFilterMenu(xAccParent, this, maName, 999, getDoc()));
ScAccessibleFilterMenu* p = static_cast<ScAccessibleFilterMenu*>(
mxAccessible.get());
-
+
vector<MenuItemData>::const_iterator itr, itrBeg = maMenuItems.begin(), itrEnd = maMenuItems.end();
for (itr = itrBeg; itr != itrEnd; ++itr)
{
@@ -499,7 +499,7 @@ void ScMenuFloatingWindow::drawAllMenuItems()
{
size_t n = maMenuItems.size();
for (size_t i = 0; i < n; ++i)
- highlightMenuItem(i, i == mnSelectedMenu);
+ highlightMenuItem(i, i == mnSelectedMenu);
}
const Font& ScMenuFloatingWindow::getLabelFont() const
@@ -529,10 +529,10 @@ void ScMenuFloatingWindow::setSelectedMenuItem(size_t nPos, bool bSubMenuTimer,
if (bEnsureSubMenu)
{
// Dismiss any child popup menu windows.
- if (mnSelectedMenu < maMenuItems.size() &&
- maMenuItems[mnSelectedMenu].mpSubMenuWin &&
+ if (mnSelectedMenu < maMenuItems.size() &&
+ maMenuItems[mnSelectedMenu].mpSubMenuWin &&
maMenuItems[mnSelectedMenu].mpSubMenuWin->IsVisible())
- {
+ {
maMenuItems[mnSelectedMenu].mpSubMenuWin->ensureSubMenuNotVisible();
}
@@ -654,7 +654,7 @@ void ScMenuFloatingWindow::endSubMenu(ScMenuFloatingWindow* pSubMenu)
size_t nMenuPos = getSubMenuPos(pSubMenu);
if (nMenuPos != MENU_NOT_SELECTED)
- {
+ {
highlightMenuItem(nMenuPos, true);
mnSelectedMenu = nMenuPos;
fireMenuHighlightedEvent();
@@ -704,7 +704,7 @@ void ScMenuFloatingWindow::selectMenuItem(size_t nPos, bool bSelected, bool bSub
}
if (!maMenuItems[nPos].mbEnabled)
- {
+ {
queueCloseSubMenu();
return;
}
@@ -777,7 +777,7 @@ void ScMenuFloatingWindow::highlightMenuItem(size_t nPos, bool bSelected)
{
Push(PUSH_CLIPREGION);
IntersectClipRegion(Rectangle(aPos, aSize));
- Rectangle aCtrlRect(Point(0,0), GetOutputSizePixel());
+ Rectangle aCtrlRect(Point(0,0), GetOutputSizePixel());
DrawNativeControl(
CTRL_MENU_POPUP, PART_ENTIRE_CONTROL, aCtrlRect, CTRL_STATE_ENABLED,
ImplControlValue(), OUString());
@@ -921,10 +921,10 @@ void ScMenuFloatingWindow::ensureSubMenuVisible(ScMenuFloatingWindow* pSubMenu)
void ScMenuFloatingWindow::ensureSubMenuNotVisible()
{
- if (mnSelectedMenu <= maMenuItems.size() &&
- maMenuItems[mnSelectedMenu].mpSubMenuWin &&
+ if (mnSelectedMenu <= maMenuItems.size() &&
+ maMenuItems[mnSelectedMenu].mpSubMenuWin &&
maMenuItems[mnSelectedMenu].mpSubMenuWin->IsVisible())
- {
+ {
maMenuItems[mnSelectedMenu].mpSubMenuWin->ensureSubMenuNotVisible();
}
@@ -968,8 +968,8 @@ ScDPFieldPopupWindow::ScDPFieldPopupWindow(Window* pParent, ScDocument* pDoc) :
ScMenuFloatingWindow(pParent, pDoc),
maChecks(this, 0),
maChkToggleAll(this, 0),
- maBtnSelectSingle (this, 0),
- maBtnUnselectSingle(this, 0),
+ maBtnSelectSingle (this, 0),
+ maBtnUnselectSingle(this, 0),
maBtnOk(this),
maBtnCancel(this),
mnCurTabStop(0),
@@ -1056,7 +1056,7 @@ void ScDPFieldPopupWindow::getSectionPosSize(Point& rPos, Size& rSize, SectionTy
// parameters calculated from constants.
const sal_uInt16 nListBoxWidth = static_cast< sal_uInt16 >( maWndSize.Width() - nListBoxMargin*2 );
- const sal_uInt16 nListBoxHeight = static_cast< sal_uInt16 >( maWndSize.Height() - nTopMargin - nMenuHeight -
+ const sal_uInt16 nListBoxHeight = static_cast< sal_uInt16 >( maWndSize.Height() - nTopMargin - nMenuHeight -
nMenuListMargin - nSingleItemBtnAreaHeight - nBottomBtnAreaHeight );
const sal_uInt16 nSingleBtnAreaY = nTopMargin + nMenuHeight + nListBoxHeight + nMenuListMargin - 1;
@@ -1183,12 +1183,12 @@ IMPL_LINK( ScDPFieldPopupWindow, ButtonHdl, Button*, pBtn )
if (pBtn == &maBtnOk)
close(true);
else if (pBtn == &maBtnSelectSingle)
- {
+ {
selectCurrentMemberOnly(true);
CheckHdl(&maChecks);
}
else if (pBtn == &maBtnUnselectSingle)
- {
+ {
selectCurrentMemberOnly(false);
CheckHdl(&maChecks);
}
@@ -1297,7 +1297,7 @@ Window* ScDPFieldPopupWindow::GetPreferredKeyInputWindow()
Reference<XAccessible> ScDPFieldPopupWindow::CreateAccessible()
{
if (!mxAccessible.is())
- {
+ {
mxAccessible.set(new ScAccessibleFilterTopWindow(
GetAccessibleParentWindow()->GetAccessible(), this, getName(), getDoc()));
ScAccessibleFilterTopWindow* pAccTop = static_cast<ScAccessibleFilterTopWindow*>(mxAccessible.get());
@@ -1345,19 +1345,19 @@ void ScDPFieldPopupWindow::initMembers()
++nVisMemCount;
}
if (nVisMemCount == n)
- {
+ {
// all members visible
maChkToggleAll.SetState(STATE_CHECK);
mePrevToggleAllState = STATE_CHECK;
}
else if (nVisMemCount == 0)
- {
+ {
// no members visible
maChkToggleAll.SetState(STATE_NOCHECK);
mePrevToggleAllState = STATE_NOCHECK;
}
else
- {
+ {
maChkToggleAll.SetState(STATE_DONTKNOW);
mePrevToggleAllState = STATE_DONTKNOW;
}
diff --git a/sc/source/ui/cctrl/dpcontrol.src b/sc/source/ui/cctrl/dpcontrol.src
index b38548369be5..a992c5d17c98 100644
--- a/sc/source/ui/cctrl/dpcontrol.src
+++ b/sc/source/ui/cctrl/dpcontrol.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/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx
index 4358694f6b04..3d135c24f485 100644
--- a/sc/source/ui/cctrl/editfield.cxx
+++ b/sc/source/ui/cctrl/editfield.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/cctrl/popmenu.cxx b/sc/source/ui/cctrl/popmenu.cxx
index 6510fff87ead..3656c6691144 100644
--- a/sc/source/ui/cctrl/popmenu.cxx
+++ b/sc/source/ui/cctrl/popmenu.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index e27baecec115..1676a1883c3a 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ SFX_IMPL_TOOLBOX_CONTROL( ScTbxInsertCtrl, SfxUInt16Item);
//------------------------------------------------------------------
//
-// ToolBox - Controller
+// ToolBox - Controller
//
//------------------------------------------------------------------
@@ -88,7 +88,7 @@ void __EXPORT ScTbxInsertCtrl::StateChanged( USHORT /* nSID */, SfxItemState eSt
USHORT nImageId = nLastSlotId ? nLastSlotId : GetSlotId();
rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
aSlotURL += rtl::OUString::valueOf( sal_Int32( nImageId ));
- Image aImage = GetImage( m_xFrame,
+ Image aImage = GetImage( m_xFrame,
aSlotURL,
hasBigImages(),
GetToolBox().GetSettings().GetStyleSettings().GetHighContrastMode() );
@@ -106,21 +106,21 @@ SfxPopupWindow* __EXPORT ScTbxInsertCtrl::CreatePopupWindow()
rtl::OUString aInsertBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertbar" ));
createAndPositionSubToolBar( aInsertBarResStr );
// nWinResId = RID_TBXCTL_INSERT;
-// nTbxResId = RID_TOOLBOX_INSERT;
+// nTbxResId = RID_TOOLBOX_INSERT;
}
else if (nSlotId == SID_TBXCTL_INSCELLS)
{
rtl::OUString aInsertCellsBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertcellsbar" ));
createAndPositionSubToolBar( aInsertCellsBarResStr );
-// nWinResId = RID_TBXCTL_INSCELLS;
-// nTbxResId = RID_TOOLBOX_INSCELLS;
+// nWinResId = RID_TBXCTL_INSCELLS;
+// nTbxResId = RID_TOOLBOX_INSCELLS;
}
else /* SID_TBXCTL_INSOBJ */
{
rtl::OUString aInsertObjectBarResStr( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/insertobjectbar" ));
createAndPositionSubToolBar( aInsertObjectBarResStr );
-// nWinResId = RID_TBXCTL_INSOBJ;
-// nTbxResId = RID_TOOLBOX_INSOBJ;
+// nWinResId = RID_TBXCTL_INSOBJ;
+// nTbxResId = RID_TOOLBOX_INSOBJ;
}
/*
WindowAlign eNewAlign = ( GetToolBox().IsHorizontal() ) ? WINDOWALIGN_LEFT : WINDOWALIGN_TOP;
@@ -150,22 +150,22 @@ void __EXPORT ScTbxInsertCtrl::Select( BOOL /* bMod1 */ )
if ( pViewFrame )
pDispatch = pViewFrame->GetDispatcher();
}
-
+
if ( pDispatch )
pDispatch->Execute(nLastSlotId);
}
/*
//------------------------------------------------------------------
//
-// Popup - Window
+// Popup - Window
//
//------------------------------------------------------------------
ScTbxInsertPopup::ScTbxInsertPopup( USHORT nId, WindowAlign eNewAlign,
const ResId& rRIdWin, const ResId& rRIdTbx,
SfxBindings& rBindings ) :
- SfxPopupWindow ( nId, rRIdWin, rBindings),
- aTbx ( this, GetBindings(), rRIdTbx ),
+ SfxPopupWindow ( nId, rRIdWin, rBindings),
+ aTbx ( this, GetBindings(), rRIdTbx ),
aRIdWinTemp(rRIdWin),
aRIdTbxTemp(rRIdTbx)
{
@@ -179,9 +179,9 @@ ScTbxInsertPopup::ScTbxInsertPopup( USHORT nId, WindowAlign eNewAlign,
Size aSize = aTbx.CalcWindowSizePixel();
aTbx.SetPosSizePixel( Point(), aSize );
SetOutputSizePixel( aSize );
- aTbx.GetToolBox().SetSelectHdl( LINK(this, ScTbxInsertPopup, TbxSelectHdl));
+ aTbx.GetToolBox().SetSelectHdl( LINK(this, ScTbxInsertPopup, TbxSelectHdl));
aTbxClickHdl = aTbx.GetToolBox().GetClickHdl();
- aTbx.GetToolBox().SetClickHdl( LINK(this, ScTbxInsertPopup, TbxClickHdl));
+ aTbx.GetToolBox().SetClickHdl( LINK(this, ScTbxInsertPopup, TbxClickHdl));
}
ScTbxInsertPopup::~ScTbxInsertPopup()
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index 7d43b31e0b30..04d2d1c4e2f9 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +64,8 @@ SFX_IMPL_TOOLBOX_CONTROL( ScZoomSliderControl, SvxZoomSliderItem );
ScZoomSliderControl::ScZoomSliderControl(
USHORT nSlotId,
- USHORT nId,
- ToolBox& rTbx )
+ USHORT nId,
+ ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx )
{
rTbx.Invalidate();
@@ -83,7 +83,7 @@ __EXPORT ScZoomSliderControl::~ScZoomSliderControl()
void ScZoomSliderControl::StateChanged( USHORT /*nSID*/, SfxItemState eState,
const SfxPoolItem* pState )
{
- USHORT nId = GetId();
+ USHORT nId = GetId();
ToolBox& rTbx = GetToolBox();
ScZoomSliderWnd* pBox = (ScZoomSliderWnd*)(rTbx.GetItemWindow( nId ));
DBG_ASSERT( pBox ,"Control not found!" );
@@ -145,7 +145,7 @@ struct ScZoomSliderWnd::ScZoomSliderWnd_Impl
maIncreaseButton(),
maDecreaseButton(),
mbValuesSet( true ),
- mbOmitPaint( false )
+ mbOmitPaint( false )
{
}
@@ -157,7 +157,7 @@ const long nButtonWidth = 10;
const long nButtonHeight = 10;
const long nIncDecWidth = 11;
const long nIncDecHeight = 11;
-const long nSliderHeight = 2; //
+const long nSliderHeight = 2; //
const long nSliderWidth = 4; //
const long nSnappingHeight = 4;
const long nSliderXOffset = 20;
@@ -172,7 +172,7 @@ USHORT ScZoomSliderWnd::Offset2Zoom( long nOffset ) const
Size aSliderWindowSize = GetOutputSizePixel();
const long nControlWidth = aSliderWindowSize.Width();
USHORT nRet = 0;
-
+
if( nOffset < nSliderXOffset )
return mpImpl->mnMinZoom;
if( nOffset > nControlWidth - nSliderXOffset )
@@ -219,7 +219,7 @@ USHORT ScZoomSliderWnd::Offset2Zoom( long nOffset ) const
if( nRet < mpImpl->mnMinZoom )
return mpImpl->mnMinZoom;
-
+
else if( nRet > mpImpl->mnMaxZoom )
return mpImpl->mnMaxZoom;
@@ -283,7 +283,7 @@ ScZoomSliderWnd::~ScZoomSliderWnd()
// -----------------------------------------------------------------------
void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt )
-{
+{
if ( !mpImpl->mbValuesSet )
return ;
Size aSliderWindowSize = GetOutputSizePixel();
@@ -320,19 +320,19 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt )
return ;
Rectangle aRect( Point( 0, 0 ), aSliderWindowSize );
-
+
Paint( aRect );
mpImpl->mbOmitPaint = true;
-
+
SvxZoomSliderItem aZoomSliderItem( mpImpl->mnCurrentZoom );
::com::sun::star::uno::Any a;
aZoomSliderItem.QueryValue( a );
-
+
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 );
aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScalingFactor" ));
aArgs[0].Value = a;
-
+
SfxToolBoxControl::Dispatch( m_xDispatchProvider, String::CreateFromAscii(".uno:ScalingFactor"), aArgs );
mpImpl->mbOmitPaint = false;
@@ -427,7 +427,7 @@ void ScZoomSliderWnd::UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem )
Size aSliderWindowSize = GetOutputSizePixel();
Rectangle aRect( Point( 0, 0 ), aSliderWindowSize );
-
+
if ( !mpImpl->mbOmitPaint )
Paint(aRect);
}
@@ -448,7 +448,7 @@ void ScZoomSliderWnd::DoPaint( const Rectangle& /*rRect*/ )
Size aSliderWindowSize = GetOutputSizePixel();
Rectangle aRect( Point( 0, 0 ), aSliderWindowSize );
-
+
VirtualDevice* pVDev = new VirtualDevice( *this );
pVDev->SetOutputSizePixel( aSliderWindowSize );
@@ -530,7 +530,7 @@ void ScZoomSliderWnd::DoPaint( const Rectangle& /*rRect*/ )
// draw increase button
aImagePoint.X() = aRect.TopLeft().X() + aSliderWindowSize.Width() - nIncDecWidth - (nSliderXOffset - nIncDecWidth)/2;
pVDev->DrawImage( aImagePoint, mpImpl->maIncreaseButton );
-
+
DrawOutDev( Point(0, 0), aSliderWindowSize, Point(0, 0), aSliderWindowSize, *pVDev );
delete pVDev;
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index a22953ade25b..54bc807461ab 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,35 +50,35 @@ static const sal_Char __FAR_DATA pStrMrg[] = "MRG";
// ============================================================================
ScAsciiOptions::ScAsciiOptions() :
- bFixedLen ( FALSE ),
- aFieldSeps ( ';' ),
- bMergeFieldSeps ( FALSE ),
+ bFixedLen ( FALSE ),
+ aFieldSeps ( ';' ),
+ bMergeFieldSeps ( FALSE ),
bQuotedFieldAsText(false),
bDetectSpecialNumber(false),
- cTextSep ( cDefaultTextSep ),
- eCharSet ( gsl_getSystemTextEncoding() ),
+ cTextSep ( cDefaultTextSep ),
+ eCharSet ( gsl_getSystemTextEncoding() ),
eLang ( LANGUAGE_SYSTEM ),
- bCharSetSystem ( FALSE ),
- nStartRow ( 1 ),
- nInfoCount ( 0 ),
+ bCharSetSystem ( FALSE ),
+ nStartRow ( 1 ),
+ nInfoCount ( 0 ),
pColStart ( NULL ),
- pColFormat ( NULL )
+ pColFormat ( NULL )
{
}
ScAsciiOptions::ScAsciiOptions(const ScAsciiOptions& rOpt) :
- bFixedLen ( rOpt.bFixedLen ),
- aFieldSeps ( rOpt.aFieldSeps ),
- bMergeFieldSeps ( rOpt.bMergeFieldSeps ),
+ bFixedLen ( rOpt.bFixedLen ),
+ aFieldSeps ( rOpt.aFieldSeps ),
+ bMergeFieldSeps ( rOpt.bMergeFieldSeps ),
bQuotedFieldAsText(rOpt.bQuotedFieldAsText),
bDetectSpecialNumber(rOpt.bDetectSpecialNumber),
- cTextSep ( rOpt.cTextSep ),
- eCharSet ( rOpt.eCharSet ),
+ cTextSep ( rOpt.cTextSep ),
+ eCharSet ( rOpt.eCharSet ),
eLang ( rOpt.eLang ),
- bCharSetSystem ( rOpt.bCharSetSystem ),
- nStartRow ( rOpt.nStartRow ),
- nInfoCount ( rOpt.nInfoCount )
+ bCharSetSystem ( rOpt.bCharSetSystem ),
+ nStartRow ( rOpt.nStartRow ),
+ nInfoCount ( rOpt.nInfoCount )
{
if (nInfoCount)
{
@@ -151,18 +151,18 @@ void ScAsciiOptions::SetColumnInfo( const ScCsvExpDataVec& rDataVec )
}
-ScAsciiOptions& ScAsciiOptions::operator=( const ScAsciiOptions& rCpy )
+ScAsciiOptions& ScAsciiOptions::operator=( const ScAsciiOptions& rCpy )
{
SetColInfo( rCpy.nInfoCount, rCpy.pColStart, rCpy.pColFormat );
- bFixedLen = rCpy.bFixedLen;
- aFieldSeps = rCpy.aFieldSeps;
- bMergeFieldSeps = rCpy.bMergeFieldSeps;
+ bFixedLen = rCpy.bFixedLen;
+ aFieldSeps = rCpy.aFieldSeps;
+ bMergeFieldSeps = rCpy.bMergeFieldSeps;
bQuotedFieldAsText = rCpy.bQuotedFieldAsText;
- cTextSep = rCpy.cTextSep;
- eCharSet = rCpy.eCharSet;
- bCharSetSystem = rCpy.bCharSetSystem;
- nStartRow = rCpy.nStartRow;
+ cTextSep = rCpy.cTextSep;
+ eCharSet = rCpy.eCharSet;
+ bCharSetSystem = rCpy.bCharSetSystem;
+ nStartRow = rCpy.nStartRow;
return *this;
}
@@ -170,15 +170,15 @@ ScAsciiOptions& ScAsciiOptions::operator=( const ScAsciiOptions& rCpy )
BOOL ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const
{
- if ( bFixedLen == rCmp.bFixedLen &&
- aFieldSeps == rCmp.aFieldSeps &&
+ if ( bFixedLen == rCmp.bFixedLen &&
+ aFieldSeps == rCmp.aFieldSeps &&
bMergeFieldSeps == rCmp.bMergeFieldSeps &&
bQuotedFieldAsText == rCmp.bQuotedFieldAsText &&
- cTextSep == rCmp.cTextSep &&
- eCharSet == rCmp.eCharSet &&
+ cTextSep == rCmp.cTextSep &&
+ eCharSet == rCmp.eCharSet &&
bCharSetSystem == rCmp.bCharSetSystem &&
- nStartRow == rCmp.nStartRow &&
- nInfoCount == rCmp.nInfoCount )
+ nStartRow == rCmp.nStartRow &&
+ nInfoCount == rCmp.nInfoCount )
{
DBG_ASSERT( !nInfoCount || (pColStart && pColFormat && rCmp.pColStart && rCmp.pColFormat),
"0-Zeiger in ScAsciiOptions" );
@@ -193,8 +193,8 @@ BOOL ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const
}
//
-// Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste)
-// darum ab Version 336 Komma stattdessen
+// Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste)
+// darum ab Version 336 Komma stattdessen
//
@@ -206,7 +206,7 @@ void ScAsciiOptions::ReadFromString( const String& rString )
xub_StrLen i;
//
- // Feld-Trenner
+ // Feld-Trenner
//
if ( nCount >= 1 )
@@ -233,7 +233,7 @@ void ScAsciiOptions::ReadFromString( const String& rString )
}
//
- // Text-Trenner
+ // Text-Trenner
//
if ( nCount >= 2 )
@@ -244,7 +244,7 @@ void ScAsciiOptions::ReadFromString( const String& rString )
}
//
- // Zeichensatz
+ // Zeichensatz
//
if ( nCount >= 3 )
@@ -254,7 +254,7 @@ void ScAsciiOptions::ReadFromString( const String& rString )
}
//
- // Startzeile
+ // Startzeile
//
if ( nCount >= 4 )
@@ -264,7 +264,7 @@ void ScAsciiOptions::ReadFromString( const String& rString )
}
//
- // Spalten-Infos
+ // Spalten-Infos
//
if ( nCount >= 5 )
@@ -294,7 +294,7 @@ void ScAsciiOptions::ReadFromString( const String& rString )
// Language
if (nCount >= 6)
- {
+ {
aToken = rString.GetToken(5, ',');
eLang = static_cast<LanguageType>(aToken.ToInt32());
}
@@ -320,7 +320,7 @@ String ScAsciiOptions::WriteToString() const
String aOutStr;
//
- // Feld-Trenner
+ // Feld-Trenner
//
if ( bFixedLen )
@@ -343,34 +343,34 @@ String ScAsciiOptions::WriteToString() const
}
}
- aOutStr += ','; // Token-Ende
+ aOutStr += ','; // Token-Ende
//
- // Text-Trenner
+ // Text-Trenner
//
aOutStr += String::CreateFromInt32(cTextSep);
- aOutStr += ','; // Token-Ende
+ aOutStr += ','; // Token-Ende
//
- // Zeichensatz
+ // Zeichensatz
//
- if ( bCharSetSystem ) // force "SYSTEM"
+ if ( bCharSetSystem ) // force "SYSTEM"
aOutStr += ScGlobal::GetCharsetString( RTL_TEXTENCODING_DONTKNOW );
else
aOutStr += ScGlobal::GetCharsetString( eCharSet );
- aOutStr += ','; // Token-Ende
+ aOutStr += ','; // Token-Ende
//
- // Startzeile
+ // Startzeile
//
aOutStr += String::CreateFromInt32(nStartRow);
- aOutStr += ','; // Token-Ende
+ aOutStr += ','; // Token-Ende
//
- // Spalten-Infos
+ // Spalten-Infos
//
DBG_ASSERT( !nInfoCount || (pColStart && pColFormat), "0-Zeiger in ScAsciiOptions" );
@@ -403,14 +403,14 @@ String ScAsciiOptions::WriteToString() const
}
#if 0
-// Code, um die Spalten-Liste aus einem Excel-kompatiblen String zu erzeugen:
-// (im Moment nicht benutzt)
+// Code, um die Spalten-Liste aus einem Excel-kompatiblen String zu erzeugen:
+// (im Moment nicht benutzt)
void ScAsciiOptions::InterpretColumnList( const String& rString )
{
- // Eingabe ist 1-basiert, pColStart fuer FixedLen ist 0-basiert
+ // Eingabe ist 1-basiert, pColStart fuer FixedLen ist 0-basiert
- // Kommas durch Semikolon ersetzen
+ // Kommas durch Semikolon ersetzen
String aSemiStr = rString;
USHORT nPos = 0;
@@ -418,11 +418,11 @@ void ScAsciiOptions::InterpretColumnList( const String& rString )
nPos = aSemiStr.SearchAndReplace( ',', ';', nPos );
while ( nPos != STRING_NOTFOUND );
- // Eintraege sortieren
+ // Eintraege sortieren
USHORT nCount = aSemiStr.GetTokenCount();
USHORT* pTemp = new USHORT[nCount+1];
- pTemp[0] = 1; // erste Spalte faengt immer bei 1 an
+ pTemp[0] = 1; // erste Spalte faengt immer bei 1 an
USHORT nFound = 1;
USHORT i,j;
for (i=0; i<nCount; i++)
@@ -449,7 +449,7 @@ void ScAsciiOptions::InterpretColumnList( const String& rString )
}
}
- // Eintraege uebernehmen
+ // Eintraege uebernehmen
delete[] pColStart;
delete[] pColFormat;
@@ -470,9 +470,9 @@ void ScAsciiOptions::InterpretColumnList( const String& rString )
pColFormat = NULL;
}
- bFixedLen = TRUE; // sonst macht's keinen Sinn
+ bFixedLen = TRUE; // sonst macht's keinen Sinn
- // aufraeumen
+ // aufraeumen
delete[] pTemp;
}
diff --git a/sc/source/ui/dbgui/asciiopt.hrc b/sc/source/ui/dbgui/asciiopt.hrc
index 7bf6d42d6e2f..a251127ce586 100644
--- a/sc/source/ui/dbgui/asciiopt.hrc
+++ b/sc/source/ui/dbgui/asciiopt.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,16 +26,16 @@
************************************************************************/
#include "sc.hrc"
//#define RID_SCDLG_ASCII 256
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_HELP 3
+#define BTN_OK 1
+#define BTN_CANCEL 2
+#define BTN_HELP 3
-#define FL_FIELDOPT 4
-#define FT_CHARSET 5
-#define LB_CHARSET 6
-#define FT_CUSTOMLANG 7
-#define LB_CUSTOMLANG 8
-#define FT_AT_ROW 9
+#define FL_FIELDOPT 4
+#define FT_CHARSET 5
+#define LB_CHARSET 6
+#define FT_CUSTOMLANG 7
+#define LB_CUSTOMLANG 8
+#define FT_AT_ROW 9
#define NF_AT_ROW 10
#define FL_SEPOPT 11
@@ -60,12 +60,12 @@
#define LB_TYPE1 28
#define CTR_TABLEBOX 29
#define STR_TEXTTOCOLUMNS 30
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/sc/source/ui/dbgui/asciiopt.src b/sc/source/ui/dbgui/asciiopt.src
index 9efbfe0f557f..1744ae4635bd 100644
--- a/sc/source/ui/dbgui/asciiopt.src
+++ b/sc/source/ui/dbgui/asciiopt.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/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index e094149ab99b..22d8318fad16 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#define INFOBOX(id) InfoBox(this, ScGlobal::GetRscString(id)).Execute()
//============================================================================
-// class ScAreaData
+// class ScAreaData
class ScAreaData
{
@@ -71,68 +71,68 @@ public:
bIsDbArea = bDb;
}
- String aStrName;
- String aStrArea;
- BOOL bIsDbArea;
+ String aStrName;
+ String aStrArea;
+ BOOL bIsDbArea;
};
//============================================================================
-// class ScConsolidateDialog
+// class ScConsolidateDialog
ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
- const SfxItemSet& rArgSet )
+ const SfxItemSet& rArgSet )
- : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_CONSOLIDATE ),
+ : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_CONSOLIDATE ),
//
- aFtFunc ( this, ScResId( FT_FUNC ) ),
- aLbFunc ( this, ScResId( LB_FUNC ) ),
+ aFtFunc ( this, ScResId( FT_FUNC ) ),
+ aLbFunc ( this, ScResId( LB_FUNC ) ),
- aFtConsAreas ( this, ScResId( FT_CONSAREAS ) ),
- aLbConsAreas ( this, ScResId( LB_CONSAREAS ) ),
+ aFtConsAreas ( this, ScResId( FT_CONSAREAS ) ),
+ aLbConsAreas ( this, ScResId( LB_CONSAREAS ) ),
- aLbDataArea ( this, ScResId( LB_DATA_AREA ) ),
- aFtDataArea ( this, ScResId( FT_DATA_AREA ) ),
+ aLbDataArea ( this, ScResId( LB_DATA_AREA ) ),
+ aFtDataArea ( this, ScResId( FT_DATA_AREA ) ),
aEdDataArea ( this, this, ScResId( ED_DATA_AREA ) ),
- aRbDataArea ( this, ScResId( RB_DATA_AREA ), &aEdDataArea, this ),
+ aRbDataArea ( this, ScResId( RB_DATA_AREA ), &aEdDataArea, this ),
- aLbDestArea ( this, ScResId( LB_DEST_AREA ) ),
- aFtDestArea ( this, ScResId( FT_DEST_AREA ) ),
+ aLbDestArea ( this, ScResId( LB_DEST_AREA ) ),
+ aFtDestArea ( this, ScResId( FT_DEST_AREA ) ),
aEdDestArea ( this, this, ScResId( ED_DEST_AREA ) ),
- aRbDestArea ( this, ScResId( RB_DEST_AREA ), &aEdDestArea, this),
+ aRbDestArea ( this, ScResId( RB_DEST_AREA ), &aEdDestArea, this),
aFlConsBy ( this, ScResId( FL_CONSBY ) ),
- aBtnByRow ( this, ScResId( BTN_BYROW ) ),
- aBtnByCol ( this, ScResId( BTN_BYCOL) ),
+ aBtnByRow ( this, ScResId( BTN_BYROW ) ),
+ aBtnByCol ( this, ScResId( BTN_BYCOL) ),
aFlSep ( this, ScResId( FL_SEP ) ),
aFlOptions ( this, ScResId( FL_OPTIONS ) ),
- aBtnRefs ( this, ScResId( BTN_REFS ) ),
+ aBtnRefs ( this, ScResId( BTN_REFS ) ),
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
- aBtnAdd ( this, ScResId( BTN_ADD ) ),
- aBtnRemove ( this, ScResId( BTN_REMOVE ) ),
- aBtnMore ( this, ScResId( BTN_MORE ) ),
+ aBtnOk ( this, ScResId( BTN_OK ) ),
+ aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
+ aBtnHelp ( this, ScResId( BTN_HELP ) ),
+ aBtnAdd ( this, ScResId( BTN_ADD ) ),
+ aBtnRemove ( this, ScResId( BTN_REMOVE ) ),
+ aBtnMore ( this, ScResId( BTN_MORE ) ),
- aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
+ aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
//
- theConsData ( ((const ScConsolidateItem&)
+ theConsData ( ((const ScConsolidateItem&)
rArgSet.Get( rArgSet.GetPool()->
GetWhich( SID_CONSOLIDATE ) )
).GetData() ),
- pViewData ( ((ScTabViewShell*)SfxViewShell::Current())->
+ pViewData ( ((ScTabViewShell*)SfxViewShell::Current())->
GetViewData() ),
- pDoc ( ((ScTabViewShell*)SfxViewShell::Current())->
+ pDoc ( ((ScTabViewShell*)SfxViewShell::Current())->
GetViewData()->GetDocument() ),
- pRangeUtil ( new ScRangeUtil ),
- pAreaData ( NULL ),
- nAreaDataCount ( 0 ),
- nWhichCons ( rArgSet.GetPool()->GetWhich( SID_CONSOLIDATE ) ),
+ pRangeUtil ( new ScRangeUtil ),
+ pAreaData ( NULL ),
+ nAreaDataCount ( 0 ),
+ nWhichCons ( rArgSet.GetPool()->GetWhich( SID_CONSOLIDATE ) ),
- pRefInputEdit ( &aEdDataArea )
+ pRefInputEdit ( &aEdDataArea )
{
Init();
FreeResource();
@@ -157,19 +157,19 @@ void ScConsolidateDlg::Init()
String aStr;
USHORT i=0;
- aEdDataArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) );
- aEdDestArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) );
+ aEdDataArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) );
+ aEdDestArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) );
aLbDataArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) );
aLbDestArea .SetGetFocusHdl( LINK( this, ScConsolidateDlg, GetFocusHdl ) );
- aEdDataArea .SetModifyHdl ( LINK( this, ScConsolidateDlg, ModifyHdl ) );
- aEdDestArea .SetModifyHdl ( LINK( this, ScConsolidateDlg, ModifyHdl ) );
- aLbConsAreas.SetSelectHdl ( LINK( this, ScConsolidateDlg, SelectHdl ) );
- aLbDataArea .SetSelectHdl ( LINK( this, ScConsolidateDlg, SelectHdl ) );
- aLbDestArea .SetSelectHdl ( LINK( this, ScConsolidateDlg, SelectHdl ) );
- aBtnOk .SetClickHdl ( LINK( this, ScConsolidateDlg, OkHdl ) );
- aBtnCancel .SetClickHdl ( LINK( this, ScConsolidateDlg, ClickHdl ) );
- aBtnAdd .SetClickHdl ( LINK( this, ScConsolidateDlg, ClickHdl ) );
- aBtnRemove .SetClickHdl ( LINK( this, ScConsolidateDlg, ClickHdl ) );
+ aEdDataArea .SetModifyHdl ( LINK( this, ScConsolidateDlg, ModifyHdl ) );
+ aEdDestArea .SetModifyHdl ( LINK( this, ScConsolidateDlg, ModifyHdl ) );
+ aLbConsAreas.SetSelectHdl ( LINK( this, ScConsolidateDlg, SelectHdl ) );
+ aLbDataArea .SetSelectHdl ( LINK( this, ScConsolidateDlg, SelectHdl ) );
+ aLbDestArea .SetSelectHdl ( LINK( this, ScConsolidateDlg, SelectHdl ) );
+ aBtnOk .SetClickHdl ( LINK( this, ScConsolidateDlg, OkHdl ) );
+ aBtnCancel .SetClickHdl ( LINK( this, ScConsolidateDlg, ClickHdl ) );
+ aBtnAdd .SetClickHdl ( LINK( this, ScConsolidateDlg, ClickHdl ) );
+ aBtnRemove .SetClickHdl ( LINK( this, ScConsolidateDlg, ClickHdl ) );
aBtnMore.AddWindow( &aFlConsBy );
aBtnMore.AddWindow( &aBtnByRow );
@@ -222,10 +222,10 @@ void ScConsolidateDlg::Init()
ScRangeName* pRangeNames = pDoc->GetRangeName();
ScDBCollection* pDbNames = pDoc->GetDBCollection();
const USHORT nRangeCount = pRangeNames ? pRangeNames->GetCount() : 0;
- const USHORT nDbCount = pDbNames ? pDbNames ->GetCount() : 0;
+ const USHORT nDbCount = pDbNames ? pDbNames ->GetCount() : 0;
nAreaDataCount = nRangeCount+nDbCount;
- pAreaData = NULL;
+ pAreaData = NULL;
if ( nAreaDataCount > 0 )
{
@@ -274,7 +274,7 @@ void ScConsolidateDlg::FillAreaLists()
{
aLbDataArea.InsertEntry( pAreaData[i].aStrName, i+1 );
-// if ( !pAreaData[i].bIsDbArea )
+// if ( !pAreaData[i].bIsDbArea )
aLbDestArea.InsertEntry( pAreaData[i].aStrName, i+1 );
}
}
@@ -293,8 +293,8 @@ void ScConsolidateDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
if ( rRef.aStart != rRef.aEnd )
RefInputStart( pRefInputEdit );
- String aStr;
- USHORT nFmt = SCR_ABS_3D; //!!! nCurTab fehlt noch
+ String aStr;
+ USHORT nFmt = SCR_ABS_3D; //!!! nCurTab fehlt noch
const formula::FormulaGrammar::AddressConvention eConv = pDocP->GetAddressConvention();
if ( rRef.aStart.Tab() != rRef.aEnd.Tab() )
@@ -357,9 +357,9 @@ BOOL ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd )
((pEd != &aEdDataArea) && (pEd != &aEdDestArea)) )
return FALSE;
- SCTAB nTab = pViewData->GetTabNo();
- BOOL bEditOk = FALSE;
- String theCompleteStr;
+ SCTAB nTab = pViewData->GetTabNo();
+ BOOL bEditOk = FALSE;
+ String theCompleteStr;
const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
if ( pEd == &aEdDataArea )
@@ -415,16 +415,16 @@ IMPL_LINK( ScConsolidateDlg, OkHdl, void*, EMPTYARG )
if ( nDataAreaCount > 0 )
{
ScRefAddress aDestAddress;
- SCTAB nTab = pViewData->GetTabNo();
- String aDestPosStr( aEdDestArea.GetText() );
+ SCTAB nTab = pViewData->GetTabNo();
+ String aDestPosStr( aEdDestArea.GetText() );
const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
if ( pRangeUtil->IsAbsPos( aDestPosStr, pDoc, nTab, NULL, &aDestAddress, eConv ) )
{
- ScConsolidateParam theOutParam( theConsData );
- ScArea** ppDataAreas = new ScArea*[nDataAreaCount];
- ScArea* pArea;
- USHORT i=0;
+ ScConsolidateParam theOutParam( theConsData );
+ ScArea** ppDataAreas = new ScArea*[nDataAreaCount];
+ ScArea* pArea;
+ USHORT i=0;
for ( i=0; i<nDataAreaCount; i++ )
{
@@ -434,13 +434,13 @@ IMPL_LINK( ScConsolidateDlg, OkHdl, void*, EMPTYARG )
ppDataAreas[i] = pArea;
}
- theOutParam.nCol = aDestAddress.Col();
- theOutParam.nRow = aDestAddress.Row();
- theOutParam.nTab = aDestAddress.Tab();
- theOutParam.eFunction = LbPosToFunc( aLbFunc.GetSelectEntryPos() );
- theOutParam.bByCol = aBtnByCol.IsChecked();
- theOutParam.bByRow = aBtnByRow.IsChecked();
- theOutParam.bReferenceData = aBtnRefs.IsChecked();
+ theOutParam.nCol = aDestAddress.Col();
+ theOutParam.nRow = aDestAddress.Row();
+ theOutParam.nTab = aDestAddress.Tab();
+ theOutParam.eFunction = LbPosToFunc( aLbFunc.GetSelectEntryPos() );
+ theOutParam.bByCol = aBtnByCol.IsChecked();
+ theOutParam.bByRow = aBtnByRow.IsChecked();
+ theOutParam.bReferenceData = aBtnRefs.IsChecked();
theOutParam.SetAreas( ppDataAreas, nDataAreaCount );
for ( i=0; i<nDataAreaCount; i++ )
@@ -478,9 +478,9 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn )
{
if ( aEdDataArea.GetText().Len() > 0 )
{
- String aNewEntry( aEdDataArea.GetText() );
- ScArea** ppAreas = NULL;
- USHORT nAreaCount = 0;
+ String aNewEntry( aEdDataArea.GetText() );
+ ScArea** ppAreas = NULL;
+ USHORT nAreaCount = 0;
const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
if ( pRangeUtil->IsAbsTabArea( aNewEntry, pDoc, &ppAreas, &nAreaCount, TRUE, eConv ) )
@@ -549,8 +549,8 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb )
}
else if ( (pLb == &aLbDataArea) || (pLb == &aLbDestArea) )
{
- Edit* pEd = (pLb == &aLbDataArea) ? &aEdDataArea : &aEdDestArea;
- USHORT nSelPos = pLb->GetSelectEntryPos();
+ Edit* pEd = (pLb == &aLbDataArea) ? &aEdDataArea : &aEdDestArea;
+ USHORT nSelPos = pLb->GetSelectEntryPos();
if ( pRangeUtil
&& (nSelPos > 0)
@@ -613,16 +613,16 @@ ScSubTotalFunc ScConsolidateDlg::LbPosToFunc( USHORT nPos )
{
switch ( nPos )
{
- case 2: return SUBTOTAL_FUNC_AVE;
- case 6: return SUBTOTAL_FUNC_CNT;
- case 1: return SUBTOTAL_FUNC_CNT2;
- case 3: return SUBTOTAL_FUNC_MAX;
- case 4: return SUBTOTAL_FUNC_MIN;
- case 5: return SUBTOTAL_FUNC_PROD;
- case 7: return SUBTOTAL_FUNC_STD;
- case 8: return SUBTOTAL_FUNC_STDP;
- case 9: return SUBTOTAL_FUNC_VAR;
- case 10: return SUBTOTAL_FUNC_VARP;
+ case 2: return SUBTOTAL_FUNC_AVE;
+ case 6: return SUBTOTAL_FUNC_CNT;
+ case 1: return SUBTOTAL_FUNC_CNT2;
+ case 3: return SUBTOTAL_FUNC_MAX;
+ case 4: return SUBTOTAL_FUNC_MIN;
+ case 5: return SUBTOTAL_FUNC_PROD;
+ case 7: return SUBTOTAL_FUNC_STD;
+ case 8: return SUBTOTAL_FUNC_STDP;
+ case 9: return SUBTOTAL_FUNC_VAR;
+ case 10: return SUBTOTAL_FUNC_VARP;
case 0:
default:
return SUBTOTAL_FUNC_SUM;
@@ -636,16 +636,16 @@ USHORT ScConsolidateDlg::FuncToLbPos( ScSubTotalFunc eFunc )
{
switch ( eFunc )
{
- case SUBTOTAL_FUNC_AVE: return 2;
- case SUBTOTAL_FUNC_CNT: return 6;
- case SUBTOTAL_FUNC_CNT2: return 1;
- case SUBTOTAL_FUNC_MAX: return 3;
- case SUBTOTAL_FUNC_MIN: return 4;
- case SUBTOTAL_FUNC_PROD: return 5;
- case SUBTOTAL_FUNC_STD: return 7;
- case SUBTOTAL_FUNC_STDP: return 8;
- case SUBTOTAL_FUNC_VAR: return 9;
- case SUBTOTAL_FUNC_VARP: return 10;
+ case SUBTOTAL_FUNC_AVE: return 2;
+ case SUBTOTAL_FUNC_CNT: return 6;
+ case SUBTOTAL_FUNC_CNT2: return 1;
+ case SUBTOTAL_FUNC_MAX: return 3;
+ case SUBTOTAL_FUNC_MIN: return 4;
+ case SUBTOTAL_FUNC_PROD: return 5;
+ case SUBTOTAL_FUNC_STD: return 7;
+ case SUBTOTAL_FUNC_STDP: return 8;
+ case SUBTOTAL_FUNC_VAR: return 9;
+ case SUBTOTAL_FUNC_VARP: return 10;
case SUBTOTAL_FUNC_NONE:
case SUBTOTAL_FUNC_SUM:
default:
diff --git a/sc/source/ui/dbgui/consdlg.hrc b/sc/source/ui/dbgui/consdlg.hrc
index 6f9f6708c388..f1f6c26fad8b 100644
--- a/sc/source/ui/dbgui/consdlg.hrc
+++ b/sc/source/ui/dbgui/consdlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
#include "sc.hrc"
-#define BTN_OK 1
+#define BTN_OK 1
#define BTN_CANCEL 2
#define BTN_HELP 3
#define BTN_MORE 4
diff --git a/sc/source/ui/dbgui/consdlg.src b/sc/source/ui/dbgui/consdlg.src
index 5226c22629c6..56748a0c58c1 100644
--- a/sc/source/ui/dbgui/consdlg.src
+++ b/sc/source/ui/dbgui/consdlg.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/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx
index 0dbc4e7dab39..80885d27b120 100644
--- a/sc/source/ui/dbgui/csvcontrol.cxx
+++ b/sc/source/ui/dbgui/csvcontrol.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index d271022a987c..2a43cb06fa8c 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index 56aa2a50a835..7b2f2f75c56a 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/dbgui/csvsplits.cxx b/sc/source/ui/dbgui/csvsplits.cxx
index b93bb09b5151..96254965d5ac 100644
--- a/sc/source/ui/dbgui/csvsplits.cxx
+++ b/sc/source/ui/dbgui/csvsplits.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx
index 842f1cc81dea..cbb4f8ec2891 100644
--- a/sc/source/ui/dbgui/csvtablebox.cxx
+++ b/sc/source/ui/dbgui/csvtablebox.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index 976e0ae23039..c656b8239bba 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,18 +51,18 @@ using namespace com::sun::star;
#include "sc.hrc"
#include "dapitype.hrc"
#include "miscuno.hxx"
-#include "dpsdbtab.hxx" // ScImportSourceDesc
+#include "dpsdbtab.hxx" // ScImportSourceDesc
//-------------------------------------------------------------------------
-#define DP_SERVICE_DBCONTEXT "com.sun.star.sdb.DatabaseContext"
-#define SC_SERVICE_INTHANDLER "com.sun.star.task.InteractionHandler"
+#define DP_SERVICE_DBCONTEXT "com.sun.star.sdb.DatabaseContext"
+#define SC_SERVICE_INTHANDLER "com.sun.star.task.InteractionHandler"
-// entries in the "type" ListBox
-#define DP_TYPELIST_TABLE 0
-#define DP_TYPELIST_QUERY 1
-#define DP_TYPELIST_SQL 2
-#define DP_TYPELIST_SQLNAT 3
+// entries in the "type" ListBox
+#define DP_TYPELIST_TABLE 0
+#define DP_TYPELIST_QUERY 1
+#define DP_TYPELIST_SQL 2
+#define DP_TYPELIST_SQLNAT 3
//-------------------------------------------------------------------------
@@ -82,11 +82,11 @@ ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( Window* pParent ) :
{
FreeResource();
- WaitObject aWait( this ); // initializing the database service the first time takes a while
+ WaitObject aWait( this ); // initializing the database service the first time takes a while
try
{
- // get database names
+ // get database names
uno::Reference<container::XNameAccess> xContext(
comphelper::getProcessServiceFactory()->createInstance(
@@ -157,11 +157,11 @@ void ScDataPilotDatabaseDlg::FillObjects()
USHORT nSelect = aLbType.GetSelectEntryPos();
if ( nSelect > DP_TYPELIST_QUERY )
- return; // only tables and queries
+ return; // only tables and queries
try
{
- // open connection (for tables or queries)
+ // open connection (for tables or queries)
uno::Reference<container::XNameAccess> xContext(
comphelper::getProcessServiceFactory()->createInstance(
@@ -184,30 +184,30 @@ void ScDataPilotDatabaseDlg::FillObjects()
uno::Sequence<rtl::OUString> aNames;
if ( nSelect == DP_TYPELIST_TABLE )
{
- // get all tables
+ // get all tables
uno::Reference<sdbcx::XTablesSupplier> xTablesSupp( xConnection, uno::UNO_QUERY );
if ( !xTablesSupp.is() ) return;
- uno::Reference<container::XNameAccess> xTables = xTablesSupp->getTables();
+ uno::Reference<container::XNameAccess> xTables = xTablesSupp->getTables();
if ( !xTables.is() ) return;
aNames = xTables->getElementNames();
}
else
{
- // get all queries
+ // get all queries
uno::Reference<sdb::XQueriesSupplier> xQueriesSupp( xConnection, uno::UNO_QUERY );
if ( !xQueriesSupp.is() ) return;
- uno::Reference<container::XNameAccess> xQueries = xQueriesSupp->getQueries();
+ uno::Reference<container::XNameAccess> xQueries = xQueriesSupp->getQueries();
if ( !xQueries.is() ) return;
aNames = xQueries->getElementNames();
}
-
- // fill list
+
+ // fill list
long nCount = aNames.getLength();
const rtl::OUString* pArray = aNames.getConstArray();
@@ -219,7 +219,7 @@ void ScDataPilotDatabaseDlg::FillObjects()
}
catch(uno::Exception&)
{
- // #71604# this may happen if an invalid database is selected -> no DBG_ERROR
+ // #71604# this may happen if an invalid database is selected -> no DBG_ERROR
DBG_WARNING("exception in database");
}
}
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index 31aafbcb13da..f076a7c021af 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +85,14 @@ ScDataPilotServiceDlg::ScDataPilotServiceDlg( Window* pParent,
aFlFrame ( this, ScResId( FL_FRAME ) ),
aFtService ( this, ScResId( FT_SERVICE ) ),
aLbService ( this, ScResId( LB_SERVICE ) ),
- aFtSource ( this, ScResId( FT_SOURCE ) ),
- aEdSource ( this, ScResId( ED_SOURCE ) ),
- aFtName ( this, ScResId( FT_NAME ) ),
- aEdName ( this, ScResId( ED_NAME ) ),
- aFtUser ( this, ScResId( FT_USER ) ),
- aEdUser ( this, ScResId( ED_USER ) ),
- aFtPasswd ( this, ScResId( FT_PASSWD ) ),
- aEdPasswd ( this, ScResId( ED_PASSWD ) ),
+ aFtSource ( this, ScResId( FT_SOURCE ) ),
+ aEdSource ( this, ScResId( ED_SOURCE ) ),
+ aFtName ( this, ScResId( FT_NAME ) ),
+ aEdName ( this, ScResId( ED_NAME ) ),
+ aFtUser ( this, ScResId( FT_USER ) ),
+ aEdUser ( this, ScResId( ED_USER ) ),
+ aFtPasswd ( this, ScResId( FT_PASSWD ) ),
+ aEdPasswd ( this, ScResId( ED_PASSWD ) ),
aBtnOk ( this, ScResId( BTN_OK ) ),
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp ( this, ScResId( BTN_HELP ) )
diff --git a/sc/source/ui/dbgui/dapitype.hrc b/sc/source/ui/dbgui/dapitype.hrc
index efbabe64fa04..c7800ca66840 100644
--- a/sc/source/ui/dbgui/dapitype.hrc
+++ b/sc/source/ui/dbgui/dapitype.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,29 +25,29 @@
*
************************************************************************/
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_HELP 3
-#define BTN_SELECTION 4
-#define BTN_DATABASE 5
-#define BTN_EXTERNAL 6
+#define BTN_OK 1
+#define BTN_CANCEL 2
+#define BTN_HELP 3
+#define BTN_SELECTION 4
+#define BTN_DATABASE 5
+#define BTN_EXTERNAL 6
#define FL_FRAME 7
-#define FT_SERVICE 8
-#define LB_SERVICE 9
-#define FT_SOURCE 10
-#define ED_SOURCE 11
-#define FT_NAME 12
-#define ED_NAME 13
-#define FT_USER 14
-#define ED_USER 15
-#define FT_PASSWD 16
-#define ED_PASSWD 17
+#define FT_SERVICE 8
+#define LB_SERVICE 9
+#define FT_SOURCE 10
+#define ED_SOURCE 11
+#define FT_NAME 12
+#define ED_NAME 13
+#define FT_USER 14
+#define ED_USER 15
+#define FT_PASSWD 16
+#define ED_PASSWD 17
-#define FT_DATABASE 18
-#define LB_DATABASE 19
-#define FT_OBJECT 20
-#define CB_OBJECT 21
-#define FT_OBJTYPE 22
-#define LB_OBJTYPE 23
+#define FT_DATABASE 18
+#define LB_DATABASE 19
+#define FT_OBJECT 20
+#define CB_OBJECT 21
+#define FT_OBJTYPE 22
+#define LB_OBJTYPE 23
diff --git a/sc/source/ui/dbgui/dapitype.src b/sc/source/ui/dbgui/dapitype.src
index 5cf1dacad819..7453f4af4121 100644
--- a/sc/source/ui/dbgui/dapitype.src
+++ b/sc/source/ui/dbgui/dapitype.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/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index a2f4d61af537..2db216539487 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +41,7 @@
#include "scresid.hxx"
#include "globstr.hrc"
#include "dbnamdlg.hrc"
-#include "rangenam.hxx" // IsNameValid
+#include "rangenam.hxx" // IsNameValid
#define _DBNAMDLG_CXX
#include "dbnamdlg.hxx"
@@ -50,12 +50,12 @@
//============================================================================
-#define ABS_SREF SCA_VALID \
+#define ABS_SREF SCA_VALID \
| SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE
-#define ABS_DREF ABS_SREF \
+#define ABS_DREF ABS_SREF \
| SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE
-#define ABS_SREF3D ABS_SREF | SCA_TAB_3D
-#define ABS_DREF3D ABS_DREF | SCA_TAB_3D
+#define ABS_SREF3D ABS_SREF | SCA_TAB_3D
+#define ABS_DREF3D ABS_DREF | SCA_TAB_3D
//----------------------------------------------------------------------------
@@ -67,7 +67,7 @@ static DBSaveData* pSaveObj = NULL;
#define QUERYBOX(m) QueryBox(this,WinBits(WB_YES_NO|WB_DEF_YES),m).Execute()
//============================================================================
-// class DBSaveData
+// class DBSaveData
class DBSaveData
{
@@ -82,19 +82,19 @@ public:
void Restore();
private:
- Edit& rEdAssign;
- CheckBox& rBtnHeader;
- CheckBox& rBtnSize;
- CheckBox& rBtnFormat;
- CheckBox& rBtnStrip;
- ScRange& rCurArea;
- String aStr;
- ScRange aArea;
- BOOL bHeader:1;
- BOOL bSize:1;
- BOOL bFormat:1;
- BOOL bStrip:1;
- BOOL bDirty:1;
+ Edit& rEdAssign;
+ CheckBox& rBtnHeader;
+ CheckBox& rBtnSize;
+ CheckBox& rBtnFormat;
+ CheckBox& rBtnStrip;
+ ScRange& rCurArea;
+ String aStr;
+ ScRange aArea;
+ BOOL bHeader:1;
+ BOOL bSize:1;
+ BOOL bFormat:1;
+ BOOL bStrip:1;
+ BOOL bDirty:1;
};
@@ -108,7 +108,7 @@ void DBSaveData::Save()
bHeader = rBtnHeader.IsChecked();
bSize = rBtnSize.IsChecked();
bFormat = rBtnFormat.IsChecked();
- bStrip = rBtnStrip.IsChecked();
+ bStrip = rBtnStrip.IsChecked();
bDirty = TRUE;
}
@@ -131,55 +131,55 @@ void DBSaveData::Restore()
//============================================================================
-// class ScDbNameDlg
+// class ScDbNameDlg
//----------------------------------------------------------------------------
ScDbNameDlg::ScDbNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
- ScViewData* ptrViewData )
+ ScViewData* ptrViewData )
- : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_DBNAMES ),
+ : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_DBNAMES ),
//
aFlName ( this, ScResId( FL_NAME ) ),
- aEdName ( this, ScResId( ED_NAME ) ),
+ aEdName ( this, ScResId( ED_NAME ) ),
aFlAssign ( this, ScResId( FL_ASSIGN ) ),
aEdAssign ( this, this, ScResId( ED_DBAREA ) ),
- aRbAssign ( this, ScResId( RB_DBAREA ), &aEdAssign, this ),
+ aRbAssign ( this, ScResId( RB_DBAREA ), &aEdAssign, this ),
aFlOptions ( this, ScResId( FL_OPTIONS ) ),
- aBtnHeader ( this, ScResId( BTN_HEADER ) ),
- aBtnDoSize ( this, ScResId( BTN_SIZE ) ),
- aBtnKeepFmt ( this, ScResId( BTN_FORMAT ) ),
- aBtnStripData ( this, ScResId( BTN_STRIPDATA ) ),
- aFTSource ( this, ScResId( FT_SOURCE ) ),
- aFTOperations ( this, ScResId( FT_OPERATIONS ) ),
-
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
- aBtnAdd ( this, ScResId( BTN_ADD ) ),
- aBtnRemove ( this, ScResId( BTN_REMOVE ) ),
- aBtnMore ( this, ScResId( BTN_MORE ) ),
-
- aStrAdd ( ScResId( STR_ADD ) ),
- aStrModify ( ScResId( STR_MODIFY ) ),
- aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ),
- aStrInvalid ( ScResId( STR_DB_INVALID ) ),
+ aBtnHeader ( this, ScResId( BTN_HEADER ) ),
+ aBtnDoSize ( this, ScResId( BTN_SIZE ) ),
+ aBtnKeepFmt ( this, ScResId( BTN_FORMAT ) ),
+ aBtnStripData ( this, ScResId( BTN_STRIPDATA ) ),
+ aFTSource ( this, ScResId( FT_SOURCE ) ),
+ aFTOperations ( this, ScResId( FT_OPERATIONS ) ),
+
+ aBtnOk ( this, ScResId( BTN_OK ) ),
+ aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
+ aBtnHelp ( this, ScResId( BTN_HELP ) ),
+ aBtnAdd ( this, ScResId( BTN_ADD ) ),
+ aBtnRemove ( this, ScResId( BTN_REMOVE ) ),
+ aBtnMore ( this, ScResId( BTN_MORE ) ),
+
+ aStrAdd ( ScResId( STR_ADD ) ),
+ aStrModify ( ScResId( STR_MODIFY ) ),
+ aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ),
+ aStrInvalid ( ScResId( STR_DB_INVALID ) ),
//
- pViewData ( ptrViewData ),
- pDoc ( ptrViewData->GetDocument() ),
- bRefInputMode ( FALSE ),
+ pViewData ( ptrViewData ),
+ pDoc ( ptrViewData->GetDocument() ),
+ bRefInputMode ( FALSE ),
aAddrDetails ( pDoc->GetAddressConvention(), 0, 0 ),
- aLocalDbCol ( *(pDoc->GetDBCollection()) )
+ aLocalDbCol ( *(pDoc->GetDBCollection()) )
{
// WB_NOLABEL can't be set in resource...
aFTSource.SetStyle( aFTSource.GetStyle() | WB_NOLABEL );
aFTOperations.SetStyle( aFTOperations.GetStyle() | WB_NOLABEL );
- // damit die Strings in der Resource bei den FixedTexten bleiben koennen:
- aStrSource = aFTSource.GetText();
- aStrOperations = aFTOperations.GetText();
+ // damit die Strings in der Resource bei den FixedTexten bleiben koennen:
+ aStrSource = aFTSource.GetText();
+ aStrOperations = aFTOperations.GetText();
pSaveObj = new DBSaveData( aEdAssign, aBtnHeader,
aBtnDoSize, aBtnKeepFmt, aBtnStripData, theCurArea );
@@ -208,7 +208,7 @@ __EXPORT ScDbNameDlg::~ScDbNameDlg()
void ScDbNameDlg::Init()
{
- aBtnHeader.Check( TRUE ); // Default: mit Spaltenkoepfen
+ aBtnHeader.Check( TRUE ); // Default: mit Spaltenkoepfen
aBtnMore.AddWindow( &aFlOptions );
aBtnMore.AddWindow( &aBtnHeader );
@@ -218,29 +218,29 @@ void ScDbNameDlg::Init()
aBtnMore.AddWindow( &aFTSource );
aBtnMore.AddWindow( &aFTOperations );
- String theAreaStr;
- SCCOL nStartCol = 0;
- SCROW nStartRow = 0;
- SCTAB nStartTab = 0;
- SCCOL nEndCol = 0;
- SCROW nEndRow = 0;
- SCTAB nEndTab = 0;
-
- aBtnOk.SetClickHdl ( LINK( this, ScDbNameDlg, OkBtnHdl ) );
- aBtnCancel.SetClickHdl ( LINK( this, ScDbNameDlg, CancelBtnHdl ) );
- aBtnAdd.SetClickHdl ( LINK( this, ScDbNameDlg, AddBtnHdl ) );
- aBtnRemove.SetClickHdl ( LINK( this, ScDbNameDlg, RemoveBtnHdl ) );
- aEdName.SetModifyHdl ( LINK( this, ScDbNameDlg, NameModifyHdl ) );
- aEdAssign.SetModifyHdl ( LINK( this, ScDbNameDlg, AssModifyHdl ) );
+ String theAreaStr;
+ SCCOL nStartCol = 0;
+ SCROW nStartRow = 0;
+ SCTAB nStartTab = 0;
+ SCCOL nEndCol = 0;
+ SCROW nEndRow = 0;
+ SCTAB nEndTab = 0;
+
+ aBtnOk.SetClickHdl ( LINK( this, ScDbNameDlg, OkBtnHdl ) );
+ aBtnCancel.SetClickHdl ( LINK( this, ScDbNameDlg, CancelBtnHdl ) );
+ aBtnAdd.SetClickHdl ( LINK( this, ScDbNameDlg, AddBtnHdl ) );
+ aBtnRemove.SetClickHdl ( LINK( this, ScDbNameDlg, RemoveBtnHdl ) );
+ aEdName.SetModifyHdl ( LINK( this, ScDbNameDlg, NameModifyHdl ) );
+ aEdAssign.SetModifyHdl ( LINK( this, ScDbNameDlg, AssModifyHdl ) );
UpdateNames();
if ( pViewData && pDoc )
{
- ScDBCollection* pDBColl = pDoc->GetDBCollection();
- ScDBData* pDBData = NULL;
+ ScDBCollection* pDBColl = pDoc->GetDBCollection();
+ ScDBData* pDBData = NULL;
pViewData->GetSimpleArea( nStartCol, nStartRow, nStartTab,
- nEndCol, nEndRow, nEndTab );
+ nEndCol, nEndRow, nEndTab );
theCurArea = ScRange( ScAddress( nStartCol, nStartRow, nStartTab ),
ScAddress( nEndCol, nEndRow, nEndTab ) );
@@ -253,9 +253,9 @@ void ScDbNameDlg::Init()
pDBData = pDBColl->GetDBAtCursor( nStartCol, nStartRow, nStartTab, TRUE );
if ( pDBData )
{
- String theDbName;
- ScAddress& rStart = theCurArea.aStart;
- ScAddress& rEnd = theCurArea.aEnd;
+ String theDbName;
+ ScAddress& rStart = theCurArea.aStart;
+ ScAddress& rEnd = theCurArea.aEnd;
SCCOL nCol1;
SCCOL nCol2;
SCROW nRow1;
@@ -352,9 +352,9 @@ void ScDbNameDlg::SetActive()
{
aEdAssign.GrabFocus();
- // kein NameModifyHdl, weil sonst Bereiche nicht geaendert werden koennen
- // (nach dem Aufziehen der Referenz wuerde der alte Inhalt wieder angezeigt)
- // (der ausgewaehlte DB-Name hat sich auch nicht veraendert)
+ // kein NameModifyHdl, weil sonst Bereiche nicht geaendert werden koennen
+ // (nach dem Aufziehen der Referenz wuerde der alte Inhalt wieder angezeigt)
+ // (der ausgewaehlte DB-Name hat sich auch nicht veraendert)
RefInputDone();
}
@@ -363,7 +363,7 @@ void ScDbNameDlg::SetActive()
void ScDbNameDlg::UpdateNames()
{
- USHORT nNameCount = aLocalDbCol.GetCount();
+ USHORT nNameCount = aLocalDbCol.GetCount();
aEdName.SetUpdateMode( FALSE );
//-----------------------------------------------------------
@@ -372,8 +372,8 @@ void ScDbNameDlg::UpdateNames()
if ( nNameCount > 0 )
{
- ScDBData* pDbData = NULL;
- String aString;
+ ScDBData* pDbData = NULL;
+ String aString;
for ( USHORT i=0; i<nNameCount; i++ )
{
@@ -401,9 +401,9 @@ void ScDbNameDlg::UpdateNames()
void ScDbNameDlg::UpdateDBData( const String& rStrName )
{
- String theArea;
- USHORT nAt;
- ScDBData* pData;
+ String theArea;
+ USHORT nAt;
+ ScDBData* pData;
aLocalDbCol.SearchName( rStrName, nAt );
pData = (ScDBData*)(aLocalDbCol.At( nAt ));
@@ -412,13 +412,13 @@ void ScDbNameDlg::UpdateDBData( const String& rStrName )
{
SCCOL nColStart = 0;
SCROW nRowStart = 0;
- SCCOL nColEnd = 0;
- SCROW nRowEnd = 0;
- SCTAB nTab = 0;
+ SCCOL nColEnd = 0;
+ SCROW nRowEnd = 0;
+ SCTAB nTab = 0;
pData->GetArea( nTab, nColStart, nRowStart, nColEnd, nRowEnd );
theCurArea = ScRange( ScAddress( nColStart, nRowStart, nTab ),
- ScAddress( nColEnd, nRowEnd, nTab ) );
+ ScAddress( nColEnd, nRowEnd, nTab ) );
theCurArea.Format( theArea, ABS_DREF3D, pDoc, aAddrDetails );
aEdAssign.SetText( theArea );
aBtnAdd.SetText( aStrModify );
@@ -480,8 +480,8 @@ IMPL_LINK_INLINE_END( ScDbNameDlg, CancelBtnHdl, void *, EMPTYARG )
IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG )
{
- String aNewName = aEdName.GetText();
- String aNewArea = aEdAssign.GetText();
+ String aNewName = aEdName.GetText();
+ String aNewArea = aEdAssign.GetText();
aNewName.EraseLeadingChars( ' ' );
aNewName.EraseTrailingChars( ' ' );
@@ -490,7 +490,7 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG )
{
if ( ScRangeData::IsNameValid( aNewName, pDoc ) )
{
- // weil jetzt editiert werden kann, muss erst geparst werden
+ // weil jetzt editiert werden kann, muss erst geparst werden
ScRange aTmpRange;
String aText = aEdAssign.GetText();
if ( aTmpRange.ParseAny( aText, pDoc, aAddrDetails ) & SCA_VALID )
@@ -505,7 +505,7 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG )
pOldEntry = aLocalDbCol[nFoundAt];
if (pOldEntry)
{
- // Bereich veraendern
+ // Bereich veraendern
pOldEntry->MoveTo( aStart.Tab(), aStart.Col(), aStart.Row(),
aEnd.Col(), aEnd.Row() );
@@ -517,7 +517,7 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG )
}
else
{
- // neuen Bereich einfuegen
+ // neuen Bereich einfuegen
ScDBData* pNewEntry = new ScDBData( aNewName, aStart.Tab(),
aStart.Col(), aStart.Row(),
@@ -539,11 +539,11 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG )
aBtnAdd.Disable();
aBtnRemove.Disable();
aEdAssign.SetText( EMPTY_STRING );
- aBtnHeader.Check( TRUE ); // Default: mit Spaltenkoepfen
+ aBtnHeader.Check( TRUE ); // Default: mit Spaltenkoepfen
aBtnDoSize.Check( FALSE );
aBtnKeepFmt.Check( FALSE );
aBtnStripData.Check( FALSE );
- SetInfoStrings( NULL ); // leer
+ SetInfoStrings( NULL ); // leer
theCurArea = ScRange();
bSaved=TRUE;
pSaveObj->Save();
@@ -570,13 +570,13 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG )
IMPL_LINK( ScDbNameDlg, RemoveBtnHdl, void *, EMPTYARG )
{
- USHORT nRemoveAt = 0;
+ USHORT nRemoveAt = 0;
const String aStrEntry = aEdName.GetText();
if ( aLocalDbCol.SearchName( aStrEntry, nRemoveAt ) )
{
String aStrDelMsg = ScGlobal::GetRscString( STR_QUERY_DELENTRY );
- String aMsg = aStrDelMsg.GetToken( 0, '#' );
+ String aMsg = aStrDelMsg.GetToken( 0, '#' );
aMsg += aStrEntry;
aMsg += aStrDelMsg.GetToken( 1, '#' );
@@ -606,11 +606,11 @@ IMPL_LINK( ScDbNameDlg, RemoveBtnHdl, void *, EMPTYARG )
aBtnRemove.Disable();
aEdAssign.SetText( EMPTY_STRING );
theCurArea = ScRange();
- aBtnHeader.Check( TRUE ); // Default: mit Spaltenkoepfen
+ aBtnHeader.Check( TRUE ); // Default: mit Spaltenkoepfen
aBtnDoSize.Check( FALSE );
aBtnKeepFmt.Check( FALSE );
aBtnStripData.Check( FALSE );
- SetInfoStrings( NULL ); // leer
+ SetInfoStrings( NULL ); // leer
bSaved=FALSE;
pSaveObj->Restore();
NameModifyHdl( 0 );
@@ -623,29 +623,29 @@ IMPL_LINK( ScDbNameDlg, RemoveBtnHdl, void *, EMPTYARG )
IMPL_LINK( ScDbNameDlg, NameModifyHdl, void *, EMPTYARG )
{
- String theName = aEdName.GetText();
- BOOL bNameFound = (COMBOBOX_ENTRY_NOTFOUND
+ String theName = aEdName.GetText();
+ BOOL bNameFound = (COMBOBOX_ENTRY_NOTFOUND
!= aEdName.GetEntryPos( theName ));
if ( theName.Len() == 0 )
{
if ( aBtnAdd.GetText() != aStrAdd )
aBtnAdd.SetText( aStrAdd );
- aBtnAdd .Disable();
- aBtnRemove .Disable();
+ aBtnAdd .Disable();
+ aBtnRemove .Disable();
aFlAssign .Disable();
- aBtnHeader .Disable();
- aBtnDoSize .Disable();
- aBtnKeepFmt .Disable();
+ aBtnHeader .Disable();
+ aBtnDoSize .Disable();
+ aBtnKeepFmt .Disable();
aBtnStripData.Disable();
- aFTSource .Disable();
+ aFTSource .Disable();
aFTOperations.Disable();
- aEdAssign .Disable();
- aRbAssign .Disable();
+ aEdAssign .Disable();
+ aRbAssign .Disable();
//bSaved=FALSE;
//pSaveObj->Restore();
//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
- //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
+ //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
bRefInputMode = FALSE;
}
else
@@ -708,7 +708,7 @@ IMPL_LINK( ScDbNameDlg, NameModifyHdl, void *, EMPTYARG )
IMPL_LINK( ScDbNameDlg, AssModifyHdl, void *, EMPTYARG )
{
- // hier parsen fuer Save() etc.
+ // hier parsen fuer Save() etc.
ScRange aTmpRange;
String aText = aEdAssign.GetText();
diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx
index 4ac3fb8d68ad..487a0b848e40 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/dbgui/dpgroupdlg.hrc b/sc/source/ui/dbgui/dpgroupdlg.hrc
index 5a4797489ddf..a75edbb32345 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.hrc
+++ b/sc/source/ui/dbgui/dpgroupdlg.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/source/ui/dbgui/dpgroupdlg.src b/sc/source/ui/dbgui/dpgroupdlg.src
index f9a5ac589af5..ba2aaec3edc1 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.src
+++ b/sc/source/ui/dbgui/dpgroupdlg.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/source/ui/dbgui/expftext.cxx b/sc/source/ui/dbgui/expftext.cxx
index 405a18fcc004..7e37c5902664 100644
--- a/sc/source/ui/dbgui/expftext.cxx
+++ b/sc/source/ui/dbgui/expftext.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +34,16 @@
#include <vcl/help.hxx>
/*************************************************************************
-#* Member: ScExpandedFixedText Datum:18.09.97
+#* Member: ScExpandedFixedText Datum:18.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: MD_Test
+#* Klasse: MD_Test
#*
-#* Funktion: Konstruktor der Klasse SvxCtrDial
+#* Funktion: Konstruktor der Klasse SvxCtrDial
#*
-#* Input: Parent- Window, Resource ID
+#* Input: Parent- Window, Resource ID
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -55,25 +55,25 @@ ScExpandedFixedText::ScExpandedFixedText( Window* pParent,
}
/*************************************************************************
-#* Member: RequestHelp Datum:18.09.97
+#* Member: RequestHelp Datum:18.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScExpandedFixedText
+#* Klasse: ScExpandedFixedText
#*
-#* Funktion: Die Methode wird gerufen, um Hilfe fuer das Fenster
-#* anzuzeigen. Zeigt das Fenster einen gekuerzten Text
-#* an, so wird selbiger in voller Laenge angezeigt.
+#* Funktion: Die Methode wird gerufen, um Hilfe fuer das Fenster
+#* anzuzeigen. Zeigt das Fenster einen gekuerzten Text
+#* an, so wird selbiger in voller Laenge angezeigt.
#*
-#* Input: HelpEvent
+#* Input: HelpEvent
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
void ScExpandedFixedText::RequestHelp(const HelpEvent& rEvt)
{
- String aTxtStr = GetText();
- long nTxtWidth = GetTextWidth(aTxtStr);
+ String aTxtStr = GetText();
+ long nTxtWidth = GetTextWidth(aTxtStr);
if ( ( rEvt.GetMode() & HELPMODE_QUICK ) == HELPMODE_QUICK &&
nTxtWidth > GetSizePixel().Width())
{
diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx
index d4b477cd4b33..723cd81d1d7f 100644
--- a/sc/source/ui/dbgui/fieldwnd.cxx
+++ b/sc/source/ui/dbgui/fieldwnd.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -274,14 +274,14 @@ void ScDPFieldWindow::DrawField(
void ScDPFieldWindow::Redraw()
{
- VirtualDevice aVirDev;
+ VirtualDevice aVirDev;
// #i97623# VirtualDevice is always LTR while other windows derive direction from parent
aVirDev.EnableRTL( IsRTLEnabled() );
aVirDev.SetMapMode( MAP_PIXEL );
- Point aPos0;
- Size aSize( GetSizePixel() );
- Font aFont( GetFont() ); // Font vom Window
+ Point aPos0;
+ Size aSize( GetSizePixel() );
+ Font aFont( GetFont() ); // Font vom Window
aFont.SetTransparent( TRUE );
aVirDev.SetFont( aFont );
aVirDev.SetOutputSizePixel( aSize );
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index b5dd2f3242c2..728bf216e3bf 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,41 +57,41 @@
// DEFINE --------------------------------------------------------------------
-#define ERRORBOX(rid) ErrorBox( this, WinBits( WB_OK|WB_DEF_OK), \
+#define ERRORBOX(rid) ErrorBox( this, WinBits( WB_OK|WB_DEF_OK), \
ScGlobal::GetRscString(rid) ).Execute()
//============================================================================
-// class ScFilterDlg
+// class ScFilterDlg
//----------------------------------------------------------------------------
ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
- const SfxItemSet& rArgSet )
+ const SfxItemSet& rArgSet )
- : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_FILTER ),
+ : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_FILTER ),
//
aFlCriteria ( this, ScResId( FL_CRITERIA ) ),
- aLbConnect1 ( this, ScResId( LB_OP1 ) ),
- aLbField1 ( this, ScResId( LB_FIELD1 ) ),
- aLbCond1 ( this, ScResId( LB_COND1 ) ),
- aEdVal1 ( this, ScResId( ED_VAL1 ) ),
- aLbConnect2 ( this, ScResId( LB_OP2 ) ),
- aLbField2 ( this, ScResId( LB_FIELD2 ) ),
- aLbCond2 ( this, ScResId( LB_COND2 ) ),
- aEdVal2 ( this, ScResId( ED_VAL2 ) ),
- aLbConnect3 ( this, ScResId( LB_OP3 ) ),
- aLbField3 ( this, ScResId( LB_FIELD3 ) ),
- aLbCond3 ( this, ScResId( LB_COND3 ) ),
- aEdVal3 ( this, ScResId( ED_VAL3 ) ),
- aLbConnect4 ( this, ScResId( LB_OP4 ) ),
- aLbField4 ( this, ScResId( LB_FIELD4 ) ),
- aLbCond4 ( this, ScResId( LB_COND4 ) ),
- aEdVal4 ( this, ScResId( ED_VAL4 ) ),
- aFtConnect ( this, ScResId( FT_OP ) ),
- aFtField ( this, ScResId( FT_FIELD ) ),
- aFtCond ( this, ScResId( FT_COND ) ),
- aFtVal ( this, ScResId( FT_VAL ) ),
+ aLbConnect1 ( this, ScResId( LB_OP1 ) ),
+ aLbField1 ( this, ScResId( LB_FIELD1 ) ),
+ aLbCond1 ( this, ScResId( LB_COND1 ) ),
+ aEdVal1 ( this, ScResId( ED_VAL1 ) ),
+ aLbConnect2 ( this, ScResId( LB_OP2 ) ),
+ aLbField2 ( this, ScResId( LB_FIELD2 ) ),
+ aLbCond2 ( this, ScResId( LB_COND2 ) ),
+ aEdVal2 ( this, ScResId( ED_VAL2 ) ),
+ aLbConnect3 ( this, ScResId( LB_OP3 ) ),
+ aLbField3 ( this, ScResId( LB_FIELD3 ) ),
+ aLbCond3 ( this, ScResId( LB_COND3 ) ),
+ aEdVal3 ( this, ScResId( ED_VAL3 ) ),
+ aLbConnect4 ( this, ScResId( LB_OP4 ) ),
+ aLbField4 ( this, ScResId( LB_FIELD4 ) ),
+ aLbCond4 ( this, ScResId( LB_COND4 ) ),
+ aEdVal4 ( this, ScResId( ED_VAL4 ) ),
+ aFtConnect ( this, ScResId( FT_OP ) ),
+ aFtField ( this, ScResId( FT_FIELD ) ),
+ aFtCond ( this, ScResId( FT_COND ) ),
+ aFtVal ( this, ScResId( FT_VAL ) ),
aFlSeparator ( this, ScResId( FL_SEPARATOR ) ),
aScrollBar ( this, ScResId( LB_SCROLL ) ),
aFlOptions ( this, ScResId( FL_OPTIONS ) ),
@@ -100,28 +100,28 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
aBtnOk ( this, ScResId( BTN_OK ) ),
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
_INIT_COMMON_FILTER_RSCOBJS
- aStrEmpty ( ScResId( SCSTR_EMPTY ) ),
- aStrNotEmpty ( ScResId( SCSTR_NOTEMPTY ) ),
- aStrRow ( ScResId( SCSTR_ROW ) ),
- aStrColumn ( ScResId( SCSTR_COLUMN ) ),
+ aStrEmpty ( ScResId( SCSTR_EMPTY ) ),
+ aStrNotEmpty ( ScResId( SCSTR_NOTEMPTY ) ),
+ aStrRow ( ScResId( SCSTR_ROW ) ),
+ aStrColumn ( ScResId( SCSTR_COLUMN ) ),
//
- pOptionsMgr ( NULL ),
- nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ),
- theQueryData ( ((const ScQueryItem&)
+ pOptionsMgr ( NULL ),
+ nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ),
+ theQueryData ( ((const ScQueryItem&)
rArgSet.Get( nWhichQuery )).GetQueryData() ),
- pOutItem ( NULL ),
- pViewData ( NULL ),
- pDoc ( NULL ),
- nSrcTab ( 0 ),
- nFieldCount ( 0 ),
- bRefInputMode ( FALSE ),
- pTimer ( NULL )
+ pOutItem ( NULL ),
+ pViewData ( NULL ),
+ pDoc ( NULL ),
+ nSrcTab ( 0 ),
+ nFieldCount ( 0 ),
+ bRefInputMode ( FALSE ),
+ pTimer ( NULL )
{
for (USHORT i=0; i<=MAXCOL; i++)
pEntryLists[i] = NULL;
for (SCSIZE i=0;i<MAXQUERY;i++)
{
- bRefreshExceptQuery[i]=FALSE;
+ bRefreshExceptQuery[i]=FALSE;
}
aBtnMore.SetMoreText( String(ScResId( SCSTR_MOREBTN_MOREOPTIONS )) );
aBtnMore.SetLessText( String(ScResId( SCSTR_MOREBTN_FEWEROPTIONS )) );
@@ -158,16 +158,16 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet )
const ScQueryItem& rQueryItem = (const ScQueryItem&)
rArgSet.Get( nWhichQuery );
- aBtnOk.SetClickHdl ( LINK( this, ScFilterDlg, EndDlgHdl ) );
- aBtnCancel.SetClickHdl ( LINK( this, ScFilterDlg, EndDlgHdl ) );
- aBtnMore.SetClickHdl ( LINK( this, ScFilterDlg, MoreClickHdl ) );
- aBtnHeader.SetClickHdl ( LINK( this, ScFilterDlg, CheckBoxHdl ) );
- aBtnCase.SetClickHdl ( LINK( this, ScFilterDlg, CheckBoxHdl ) );
+ aBtnOk.SetClickHdl ( LINK( this, ScFilterDlg, EndDlgHdl ) );
+ aBtnCancel.SetClickHdl ( LINK( this, ScFilterDlg, EndDlgHdl ) );
+ aBtnMore.SetClickHdl ( LINK( this, ScFilterDlg, MoreClickHdl ) );
+ aBtnHeader.SetClickHdl ( LINK( this, ScFilterDlg, CheckBoxHdl ) );
+ aBtnCase.SetClickHdl ( LINK( this, ScFilterDlg, CheckBoxHdl ) );
//
- aLbField1.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) );
- aLbField2.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) );
- aLbField3.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) );
- aLbField4.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) );
+ aLbField1.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) );
+ aLbField2.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) );
+ aLbField3.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) );
+ aLbField4.SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) );
aLbConnect1.SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) );
aLbConnect2.SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) );
aLbConnect3.SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) );
@@ -178,23 +178,23 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet )
aLbCond3.SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) );
aLbCond4.SetSelectHdl( LINK( this, ScFilterDlg, LbSelectHdl ) );
- pViewData = rQueryItem.GetViewData();
- pDoc = pViewData ? pViewData->GetDocument() : NULL;
- nSrcTab = pViewData ? pViewData->GetTabNo() : static_cast<SCTAB>(0);
+ pViewData = rQueryItem.GetViewData();
+ pDoc = pViewData ? pViewData->GetDocument() : NULL;
+ nSrcTab = pViewData ? pViewData->GetTabNo() : static_cast<SCTAB>(0);
// fuer leichteren Zugriff:
- aFieldLbArr [0] = &aLbField1;
- aFieldLbArr [1] = &aLbField2;
- aFieldLbArr [2] = &aLbField3;
- aFieldLbArr [3] = &aLbField4;
- aValueEdArr [0] = &aEdVal1;
- aValueEdArr [1] = &aEdVal2;
- aValueEdArr [2] = &aEdVal3;
- aValueEdArr [3] = &aEdVal4;
- aCondLbArr [0] = &aLbCond1;
- aCondLbArr [1] = &aLbCond2;
- aCondLbArr [2] = &aLbCond3;
- aCondLbArr [3] = &aLbCond4;
+ aFieldLbArr [0] = &aLbField1;
+ aFieldLbArr [1] = &aLbField2;
+ aFieldLbArr [2] = &aLbField3;
+ aFieldLbArr [3] = &aLbField4;
+ aValueEdArr [0] = &aEdVal1;
+ aValueEdArr [1] = &aEdVal2;
+ aValueEdArr [2] = &aEdVal3;
+ aValueEdArr [3] = &aEdVal4;
+ aCondLbArr [0] = &aLbCond1;
+ aCondLbArr [1] = &aLbCond2;
+ aCondLbArr [2] = &aLbCond3;
+ aCondLbArr [3] = &aLbCond4;
aConnLbArr [0] = &aLbConnect1;
aConnLbArr [1] = &aLbConnect2;
aConnLbArr [2] = &aLbConnect3;
@@ -202,7 +202,7 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet )
// Optionen initialisieren lassen:
- pOptionsMgr = new ScFilterOptionsMgr(
+ pOptionsMgr = new ScFilterOptionsMgr(
this,
pViewData,
theQueryData,
@@ -228,14 +228,14 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet )
for ( SCSIZE i=0; i<4; i++ )
{
- String aValStr;
- USHORT nCondPos = 0;
- USHORT nFieldSelPos = 0;
+ String aValStr;
+ USHORT nCondPos = 0;
+ USHORT nFieldSelPos = 0;
ScQueryEntry& rEntry = theQueryData.GetEntry(i);
if ( rEntry.bDoQuery )
{
- nCondPos = (USHORT)rEntry.eOp;
+ nCondPos = (USHORT)rEntry.eOp;
nFieldSelPos = GetFieldSelPos( static_cast<SCCOL>(rEntry.nField) );
if ( rEntry.nVal == SC_EMPTYFIELDS && !rEntry.bQueryByString && *rEntry.pStr == EMPTY_STRING )
{
@@ -271,31 +271,31 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet )
aScrollBar.SetRange( Range( 0, 4 ) );
aScrollBar.SetLineSize( 1 );
- aLbConnect1.Hide();
+ aLbConnect1.Hide();
// Disable/Enable Logik:
(aLbField1.GetSelectEntryPos() != 0)
&& (aLbField2.GetSelectEntryPos() != 0)
- ? aLbConnect2.SelectEntryPos( (USHORT)theQueryData.GetEntry(1).eConnect )
+ ? aLbConnect2.SelectEntryPos( (USHORT)theQueryData.GetEntry(1).eConnect )
: aLbConnect2.SetNoSelection();
(aLbField2.GetSelectEntryPos() != 0)
&& (aLbField3.GetSelectEntryPos() != 0)
- ? aLbConnect3.SelectEntryPos( (USHORT)theQueryData.GetEntry(2).eConnect )
+ ? aLbConnect3.SelectEntryPos( (USHORT)theQueryData.GetEntry(2).eConnect )
: aLbConnect3.SetNoSelection();
(aLbField3.GetSelectEntryPos() != 0)
&& (aLbField4.GetSelectEntryPos() != 0)
- ? aLbConnect4.SelectEntryPos( (USHORT)theQueryData.GetEntry(3).eConnect )
+ ? aLbConnect4.SelectEntryPos( (USHORT)theQueryData.GetEntry(3).eConnect )
: aLbConnect4.SetNoSelection();
if ( aLbField1.GetSelectEntryPos() == 0 )
{
- aLbConnect2.Disable();
+ aLbConnect2.Disable();
aLbField2.Disable();
aLbCond2.Disable();
aEdVal2.Disable();
}
- else if ( aLbConnect2.GetSelectEntryCount() == 0 )
+ else if ( aLbConnect2.GetSelectEntryCount() == 0 )
{
aLbField2.Disable();
aLbCond2.Disable();
@@ -304,12 +304,12 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet )
if ( aLbField2.GetSelectEntryPos() == 0 )
{
- aLbConnect3.Disable();
+ aLbConnect3.Disable();
aLbField3.Disable();
aLbCond3.Disable();
aEdVal3.Disable();
}
- else if ( aLbConnect3.GetSelectEntryCount() == 0 )
+ else if ( aLbConnect3.GetSelectEntryCount() == 0 )
{
aLbField3.Disable();
aLbCond3.Disable();
@@ -317,12 +317,12 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet )
}
if ( aLbField3.GetSelectEntryPos() == 0 )
{
- aLbConnect4.Disable();
+ aLbConnect4.Disable();
aLbField4.Disable();
aLbCond4.Disable();
aEdVal4.Disable();
}
- else if ( aLbConnect4.GetSelectEntryCount() == 0 )
+ else if ( aLbConnect4.GetSelectEntryCount() == 0 )
{
aLbField4.Disable();
aLbCond4.Disable();
@@ -332,9 +332,9 @@ void __EXPORT ScFilterDlg::Init( const SfxItemSet& rArgSet )
if(pDoc!=NULL &&
pDoc->GetChangeTrack()!=NULL) aBtnCopyResult.Disable();
// Modal-Modus einschalten
-// SetDispatcherLock( TRUE );
+// SetDispatcherLock( TRUE );
//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
-// SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
+// SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
}
@@ -355,7 +355,7 @@ BOOL __EXPORT ScFilterDlg::Close()
void ScFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
{
- if ( bRefInputMode ) // Nur moeglich, wenn im Referenz-Editmodus
+ if ( bRefInputMode ) // Nur moeglich, wenn im Referenz-Editmodus
{
if ( rRef.aStart != rRef.aEnd )
RefInputStart( &aEdCopyArea );
@@ -397,13 +397,13 @@ void ScFilterDlg::FillFieldLists()
if ( pDoc )
{
- String aFieldName;
- SCTAB nTab = nSrcTab;
- SCCOL nFirstCol = theQueryData.nCol1;
- SCROW nFirstRow = theQueryData.nRow1;
- SCCOL nMaxCol = theQueryData.nCol2;
- SCCOL col = 0;
- USHORT i=1;
+ String aFieldName;
+ SCTAB nTab = nSrcTab;
+ SCCOL nFirstCol = theQueryData.nCol1;
+ SCROW nFirstRow = theQueryData.nRow1;
+ SCCOL nMaxCol = theQueryData.nCol2;
+ SCCOL col = 0;
+ USHORT i=1;
for ( col=nFirstCol; col<=nMaxCol; col++ )
{
@@ -431,10 +431,10 @@ void ScFilterDlg::UpdateValueList( USHORT nList )
{
if ( pDoc && nList>0 && nList<=4 )
{
- ComboBox* pValList = aValueEdArr[nList-1];
- USHORT nFieldSelPos = aFieldLbArr[nList-1]->GetSelectEntryPos();
- USHORT nListPos = 0;
- String aCurValue = pValList->GetText();
+ ComboBox* pValList = aValueEdArr[nList-1];
+ USHORT nFieldSelPos = aFieldLbArr[nList-1]->GetSelectEntryPos();
+ USHORT nListPos = 0;
+ String aCurValue = pValList->GetText();
pValList->Clear();
pValList->InsertEntry( aStrNotEmpty, 0 );
@@ -443,26 +443,26 @@ void ScFilterDlg::UpdateValueList( USHORT nList )
if ( nFieldSelPos )
{
- WaitObject aWaiter( this ); // auch wenn nur die ListBox gefuellt wird
+ WaitObject aWaiter( this ); // auch wenn nur die ListBox gefuellt wird
SCCOL nColumn = theQueryData.nCol1 + static_cast<SCCOL>(nFieldSelPos) - 1;
if (!pEntryLists[nColumn])
{
USHORT nOffset = GetSliderPos();
- SCTAB nTab = nSrcTab;
+ SCTAB nTab = nSrcTab;
SCROW nFirstRow = theQueryData.nRow1;
- SCROW nLastRow = theQueryData.nRow2;
+ SCROW nLastRow = theQueryData.nRow2;
mbHasDates[nOffset+nList-1] = false;
- // erstmal ohne die erste Zeile
+ // erstmal ohne die erste Zeile
pEntryLists[nColumn] = new TypedScStrCollection( 128, 128 );
pEntryLists[nColumn]->SetCaseSensitive( aBtnCase.IsChecked() );
pDoc->GetFilterEntriesArea( nColumn, nFirstRow+1, nLastRow,
nTab, *pEntryLists[nColumn], mbHasDates[nOffset+nList-1] );
- // Eintrag fuer die erste Zeile
- //! Eintrag (pHdrEntry) ohne Collection erzeugen?
+ // Eintrag fuer die erste Zeile
+ //! Eintrag (pHdrEntry) ohne Collection erzeugen?
nHeaderPos[nColumn] = USHRT_MAX;
TypedScStrCollection aHdrColl( 1, 1 );
@@ -480,7 +480,7 @@ void ScFilterDlg::UpdateValueList( USHORT nList )
"Header-Eintrag nicht wiedergefunden" );
}
else
- delete pNewEntry; // war schon drin
+ delete pNewEntry; // war schon drin
}
}
@@ -503,7 +503,7 @@ void ScFilterDlg::UpdateValueList( USHORT nList )
void ScFilterDlg::UpdateHdrInValueList( USHORT nList )
{
- //! GetText / SetText ??
+ //! GetText / SetText ??
if ( pDoc && nList>0 && nList<=4 )
{
@@ -517,7 +517,7 @@ void ScFilterDlg::UpdateHdrInValueList( USHORT nList )
if ( nPos != USHRT_MAX )
{
ComboBox* pValList = aValueEdArr[nList-1];
- USHORT nListPos = nPos + 2; // nach "leer" und "nicht leer"
+ USHORT nListPos = nPos + 2; // nach "leer" und "nicht leer"
TypedStrData* pHdrEntry = (*pEntryLists[nColumn])[nPos];
if ( pHdrEntry )
@@ -526,12 +526,12 @@ void ScFilterDlg::UpdateHdrInValueList( USHORT nList )
BOOL bWasThere = ( pValList->GetEntry(nListPos) == aHdrStr );
BOOL bInclude = !aBtnHeader.IsChecked();
- if (bInclude) // Eintrag aufnehmen
+ if (bInclude) // Eintrag aufnehmen
{
if (!bWasThere)
pValList->InsertEntry(aHdrStr, nListPos);
}
- else // Eintrag weglassen
+ else // Eintrag weglassen
{
if (bWasThere)
pValList->RemoveEntry(nListPos);
@@ -580,8 +580,8 @@ USHORT ScFilterDlg::GetFieldSelPos( SCCOL nField )
ScQueryItem* ScFilterDlg::GetOutputItem()
{
- ScAddress theCopyPos;
- ScQueryParam theParam( theQueryData );
+ ScAddress theCopyPos;
+ ScQueryParam theParam( theQueryData );
BOOL bCopyPosOk = FALSE;
if ( aBtnCopyResult.IsChecked() )
@@ -599,26 +599,26 @@ ScQueryItem* ScFilterDlg::GetOutputItem()
if ( aBtnCopyResult.IsChecked() && bCopyPosOk )
{
theParam.bInplace = FALSE;
- theParam.nDestTab = theCopyPos.Tab();
- theParam.nDestCol = theCopyPos.Col();
- theParam.nDestRow = theCopyPos.Row();
+ theParam.nDestTab = theCopyPos.Tab();
+ theParam.nDestCol = theCopyPos.Col();
+ theParam.nDestRow = theCopyPos.Row();
}
else
{
theParam.bInplace = TRUE;
- theParam.nDestTab = 0;
- theParam.nDestCol = 0;
- theParam.nDestRow = 0;
+ theParam.nDestTab = 0;
+ theParam.nDestCol = 0;
+ theParam.nDestRow = 0;
}
- theParam.bHasHeader = aBtnHeader.IsChecked();
- theParam.bByRow = TRUE;
- theParam.bDuplicate = !aBtnUnique.IsChecked();
- theParam.bCaseSens = aBtnCase.IsChecked();
- theParam.bRegExp = aBtnRegExp.IsChecked();
- theParam.bDestPers = aBtnDestPers.IsChecked();
+ theParam.bHasHeader = aBtnHeader.IsChecked();
+ theParam.bByRow = TRUE;
+ theParam.bDuplicate = !aBtnUnique.IsChecked();
+ theParam.bCaseSens = aBtnCase.IsChecked();
+ theParam.bRegExp = aBtnRegExp.IsChecked();
+ theParam.bDestPers = aBtnDestPers.IsChecked();
- // nur die drei eingestellten - alles andere zuruecksetzen
+ // nur die drei eingestellten - alles andere zuruecksetzen
DELETEZ( pOutItem );
pOutItem = new ScQueryItem( nWhichQuery, &theParam );
@@ -688,7 +688,7 @@ IMPL_LINK( ScFilterDlg, MoreClickHdl, MoreButton*, EMPTYARG )
pTimer->Stop();
bRefInputMode = FALSE;
//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
- //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
+ //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
}
return 0;
}
@@ -726,7 +726,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
aLbCond1.Enable();
aEdVal1.Enable();
- USHORT nConnect1 = aLbConnect1.GetSelectEntryPos();
+ USHORT nConnect1 = aLbConnect1.GetSelectEntryPos();
USHORT nQE = nOffset;
theQueryData.GetEntry(nQE).eConnect =(ScQueryConnect)nConnect1;
bRefreshExceptQuery[nQE]=TRUE;
@@ -738,7 +738,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
aLbCond2.Enable();
aEdVal2.Enable();
- USHORT nConnect2 = aLbConnect2.GetSelectEntryPos();
+ USHORT nConnect2 = aLbConnect2.GetSelectEntryPos();
USHORT nQE = 1+nOffset;
theQueryData.GetEntry(nQE).eConnect =(ScQueryConnect)nConnect2;
bRefreshExceptQuery[nQE]=TRUE;
@@ -749,7 +749,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
aLbCond3.Enable();
aEdVal3.Enable();
- USHORT nConnect3 = aLbConnect3.GetSelectEntryPos();
+ USHORT nConnect3 = aLbConnect3.GetSelectEntryPos();
USHORT nQE = 2+nOffset;
theQueryData.GetEntry(nQE).eConnect = (ScQueryConnect)nConnect3;
bRefreshExceptQuery[nQE]=TRUE;
@@ -761,7 +761,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
aLbCond4.Enable();
aEdVal4.Enable();
- USHORT nConnect4 = aLbConnect4.GetSelectEntryPos();
+ USHORT nConnect4 = aLbConnect4.GetSelectEntryPos();
USHORT nQE = 3+nOffset;
theQueryData.GetEntry(nQE).eConnect = (ScQueryConnect)nConnect4;
bRefreshExceptQuery[nQE]=TRUE;
@@ -800,7 +800,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
for (USHORT i= nOffset; i< MAXQUERY; i++)
{
theQueryData.GetEntry(i).bDoQuery = FALSE;
- bRefreshExceptQuery[i]=FALSE;
+ bRefreshExceptQuery[i]=FALSE;
theQueryData.GetEntry(i).nField = static_cast<SCCOL>(0);
}
bRefreshExceptQuery[nOffset] =TRUE;
@@ -813,7 +813,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
aLbConnect2.Enable();
}
theQueryData.GetEntry(nOffset).bDoQuery = TRUE;
- USHORT nField = pLb->GetSelectEntryPos();
+ USHORT nField = pLb->GetSelectEntryPos();
theQueryData.GetEntry(nOffset).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
}
}
@@ -844,10 +844,10 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
for (USHORT i= nTemp; i< MAXQUERY; i++)
{
theQueryData.GetEntry(i).bDoQuery = FALSE;
- bRefreshExceptQuery[i]=FALSE;
+ bRefreshExceptQuery[i]=FALSE;
theQueryData.GetEntry(i).nField = static_cast<SCCOL>(0);
}
- bRefreshExceptQuery[nTemp]=TRUE;
+ bRefreshExceptQuery[nTemp]=TRUE;
}
else
{
@@ -856,7 +856,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
{
aLbConnect3.Enable();
}
- USHORT nField = pLb->GetSelectEntryPos();
+ USHORT nField = pLb->GetSelectEntryPos();
USHORT nQ=1+nOffset;
theQueryData.GetEntry(nQ).bDoQuery = TRUE;
theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
@@ -881,10 +881,10 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
for (USHORT i= nTemp; i< MAXQUERY; i++)
{
theQueryData.GetEntry(i).bDoQuery = FALSE;
- bRefreshExceptQuery[i]=FALSE;
+ bRefreshExceptQuery[i]=FALSE;
theQueryData.GetEntry(i).nField = static_cast<SCCOL>(0);
}
- bRefreshExceptQuery[nTemp]=TRUE;
+ bRefreshExceptQuery[nTemp]=TRUE;
}
else
{
@@ -893,8 +893,8 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
{
aLbConnect4.Enable();
}
-
- USHORT nField = pLb->GetSelectEntryPos();
+
+ USHORT nField = pLb->GetSelectEntryPos();
USHORT nQ=2+nOffset;
theQueryData.GetEntry(nQ).bDoQuery = TRUE;
theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
@@ -910,15 +910,15 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
for (USHORT i= nTemp; i< MAXQUERY; i++)
{
theQueryData.GetEntry(i).bDoQuery = FALSE;
- bRefreshExceptQuery[i]=FALSE;
+ bRefreshExceptQuery[i]=FALSE;
theQueryData.GetEntry(i).nField = static_cast<SCCOL>(0);
}
- bRefreshExceptQuery[nTemp]=TRUE;
+ bRefreshExceptQuery[nTemp]=TRUE;
}
else
{
UpdateValueList( 4 );
- USHORT nField = pLb->GetSelectEntryPos();
+ USHORT nField = pLb->GetSelectEntryPos();
USHORT nQ=3+nOffset;
theQueryData.GetEntry(nQ).bDoQuery = TRUE;
theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ;
@@ -939,7 +939,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
USHORT nQ=2+nOffset;
theQueryData.GetEntry(nQ).eOp=(ScQueryOp)pLb->GetSelectEntryPos();
}
- else
+ else
{
USHORT nQ=3+nOffset;
theQueryData.GetEntry(nQ).eOp=(ScQueryOp)pLb->GetSelectEntryPos();
@@ -953,13 +953,13 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox )
{
- // Spaltenkoepfe:
- // FeldListen: Spaltexx <-> Spaltenkopf-String
- // WertListen: Spaltenkopf-Wert entfaellt.
- // Gross-/Kleinschreibung:
- // WertListen: komplett neu
+ // Spaltenkoepfe:
+ // FeldListen: Spaltexx <-> Spaltenkopf-String
+ // WertListen: Spaltenkopf-Wert entfaellt.
+ // Gross-/Kleinschreibung:
+ // WertListen: komplett neu
- if ( pBox == &aBtnHeader ) // Feldlisten und Wertlisten
+ if ( pBox == &aBtnHeader ) // Feldlisten und Wertlisten
{
USHORT nCurSel1 = aLbField1.GetSelectEntryPos();
USHORT nCurSel2 = aLbField2.GetSelectEntryPos();
@@ -977,12 +977,12 @@ IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox )
UpdateHdrInValueList( 4 );
}
- if ( pBox == &aBtnCase ) // Wertlisten komplett
+ if ( pBox == &aBtnCase ) // Wertlisten komplett
{
for (USHORT i=0; i<=MAXCOL; i++)
DELETEZ( pEntryLists[i] );
- UpdateValueList( 1 ); // aktueller Text wird gemerkt
+ UpdateValueList( 1 ); // aktueller Text wird gemerkt
UpdateValueList( 2 );
UpdateValueList( 3 );
UpdateValueList( 4 );
@@ -1001,9 +1001,9 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd )
USHORT nQE =i + nOffset;
if ( pEd )
{
- String aStrVal = pEd->GetText();
- ListBox* pLbCond = &aLbCond1;
- ListBox* pLbField = &aLbField1;
+ String aStrVal = pEd->GetText();
+ ListBox* pLbCond = &aLbCond1;
+ ListBox* pLbField = &aLbField1;
if ( pEd == &aEdVal2 )
{
pLbCond = &aLbCond2;
@@ -1054,21 +1054,21 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd )
}
else
{
- *rEntry.pStr = aStrVal;
- rEntry.nVal = 0;
+ *rEntry.pStr = aStrVal;
+ rEntry.nVal = 0;
rEntry.bQueryByString = TRUE;
}
- USHORT nField = pLbField->GetSelectEntryPos();
+ USHORT nField = pLbField->GetSelectEntryPos();
rEntry.nField = nField ? (theQueryData.nCol1 +
static_cast<SCCOL>(nField) - 1) : static_cast<SCCOL>(0);
-
+
ScQueryOp eOp = (ScQueryOp)pLbCond->GetSelectEntryPos();
- rEntry.eOp = eOp;
+ rEntry.eOp = eOp;
rEntry.bQueryByDate = mbHasDates[nQE];
}
- }
+ }
return 0;
}
@@ -1089,23 +1089,23 @@ USHORT ScFilterDlg::GetSliderPos()
return (USHORT) aScrollBar.GetThumbPos();
}
void ScFilterDlg::RefreshEditRow( USHORT nOffset )
-{
- if (nOffset==0)
+{
+ if (nOffset==0)
aConnLbArr[0]->Hide();
else
- aConnLbArr[0]->Show();
+ aConnLbArr[0]->Show();
for ( USHORT i=0; i<4; i++ )
{
- String aValStr;
- USHORT nCondPos = 0;
- USHORT nFieldSelPos = 0;
+ String aValStr;
+ USHORT nCondPos = 0;
+ USHORT nFieldSelPos = 0;
USHORT nQE = i+nOffset;
ScQueryEntry& rEntry = theQueryData.GetEntry( nQE);
if ( rEntry.bDoQuery || bRefreshExceptQuery[nQE] )
{
- nCondPos = (USHORT)rEntry.eOp;
+ nCondPos = (USHORT)rEntry.eOp;
if(rEntry.bDoQuery)
nFieldSelPos = GetFieldSelPos( static_cast<SCCOL>(rEntry.nField) );
@@ -1154,9 +1154,9 @@ void ScFilterDlg::RefreshEditRow( USHORT nOffset )
else
aConnLbArr[i]->SetNoSelection();
}
-
+
}
- else
+ else
{
if (nOffset==0)
{
@@ -1164,7 +1164,7 @@ void ScFilterDlg::RefreshEditRow( USHORT nOffset )
{
aConnLbArr[i+1]->SetNoSelection();
aConnLbArr[i+1]->Disable();
- }
+ }
}
else
{
@@ -1177,7 +1177,7 @@ void ScFilterDlg::RefreshEditRow( USHORT nOffset )
aFieldLbArr[i]->Disable();
aCondLbArr[i]->Disable();
aValueEdArr[i]->Disable();
- }
+ }
aFieldLbArr[i]->SelectEntryPos( nFieldSelPos );
aCondLbArr [i]->SelectEntryPos( nCondPos );
aValueEdArr[i]->SetText( aValStr );
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index 1e274690c31c..6f56fc0ff73c 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,44 +51,44 @@
//----------------------------------------------------------------------------
ScFilterOptionsMgr::ScFilterOptionsMgr(
- Dialog* ptrDlg,
- ScViewData* ptrViewData,
- const ScQueryParam& refQueryData,
- MoreButton& refBtnMore,
- CheckBox& refBtnCase,
- CheckBox& refBtnRegExp,
- CheckBox& refBtnHeader,
- CheckBox& refBtnUnique,
- CheckBox& refBtnCopyResult,
- CheckBox& refBtnDestPers,
- ListBox& refLbCopyArea,
- Edit& refEdCopyArea,
- formula::RefButton& refRbCopyArea,
- FixedText& refFtDbAreaLabel,
- FixedInfo& refFtDbArea,
+ Dialog* ptrDlg,
+ ScViewData* ptrViewData,
+ const ScQueryParam& refQueryData,
+ MoreButton& refBtnMore,
+ CheckBox& refBtnCase,
+ CheckBox& refBtnRegExp,
+ CheckBox& refBtnHeader,
+ CheckBox& refBtnUnique,
+ CheckBox& refBtnCopyResult,
+ CheckBox& refBtnDestPers,
+ ListBox& refLbCopyArea,
+ Edit& refEdCopyArea,
+ formula::RefButton& refRbCopyArea,
+ FixedText& refFtDbAreaLabel,
+ FixedInfo& refFtDbArea,
FixedLine& refFlOptions,
- const String& refStrNoName,
- const String& refStrUndefined )
-
- : pDlg ( ptrDlg ),
- pViewData ( ptrViewData ),
- pDoc ( ptrViewData ? ptrViewData->GetDocument() : NULL ),
- rBtnMore ( refBtnMore ),
- rBtnCase ( refBtnCase ),
- rBtnRegExp ( refBtnRegExp ),
- rBtnHeader ( refBtnHeader ),
- rBtnUnique ( refBtnUnique ),
- rBtnCopyResult ( refBtnCopyResult ),
- rBtnDestPers ( refBtnDestPers ),
- rLbCopyPos ( refLbCopyArea ),
- rEdCopyPos ( refEdCopyArea ),
- rRbCopyPos ( refRbCopyArea ),
- rFtDbAreaLabel ( refFtDbAreaLabel ),
- rFtDbArea ( refFtDbArea ),
+ const String& refStrNoName,
+ const String& refStrUndefined )
+
+ : pDlg ( ptrDlg ),
+ pViewData ( ptrViewData ),
+ pDoc ( ptrViewData ? ptrViewData->GetDocument() : NULL ),
+ rBtnMore ( refBtnMore ),
+ rBtnCase ( refBtnCase ),
+ rBtnRegExp ( refBtnRegExp ),
+ rBtnHeader ( refBtnHeader ),
+ rBtnUnique ( refBtnUnique ),
+ rBtnCopyResult ( refBtnCopyResult ),
+ rBtnDestPers ( refBtnDestPers ),
+ rLbCopyPos ( refLbCopyArea ),
+ rEdCopyPos ( refEdCopyArea ),
+ rRbCopyPos ( refRbCopyArea ),
+ rFtDbAreaLabel ( refFtDbAreaLabel ),
+ rFtDbArea ( refFtDbArea ),
rFlOptions ( refFlOptions ),
- rStrNoName ( refStrNoName ),
- rStrUndefined ( refStrUndefined ),
- rQueryData ( refQueryData )
+ rStrNoName ( refStrNoName ),
+ rStrUndefined ( refStrUndefined ),
+ rQueryData ( refQueryData )
{
Init();
}
@@ -112,8 +112,8 @@ void ScFilterOptionsMgr::Init()
{
DBG_ASSERT( pViewData && pDoc, "Init failed :-/" );
- rLbCopyPos.SetSelectHdl ( LINK( this, ScFilterOptionsMgr, LbPosSelHdl ) );
- rEdCopyPos.SetModifyHdl ( LINK( this, ScFilterOptionsMgr, EdPosModifyHdl ) );
+ rLbCopyPos.SetSelectHdl ( LINK( this, ScFilterOptionsMgr, LbPosSelHdl ) );
+ rEdCopyPos.SetModifyHdl ( LINK( this, ScFilterOptionsMgr, EdPosModifyHdl ) );
rBtnCopyResult.SetClickHdl( LINK( this, ScFilterOptionsMgr, BtnCopyResultHdl ) );
rBtnMore.AddWindow( &rBtnCase );
@@ -129,23 +129,23 @@ void ScFilterOptionsMgr::Init()
rBtnMore.AddWindow( &rFtDbArea );
rBtnMore.AddWindow( &rFlOptions );
- rBtnCase .Check( rQueryData.bCaseSens );
- rBtnHeader .Check( rQueryData.bHasHeader );
- rBtnRegExp .Check( rQueryData.bRegExp );
- rBtnUnique .Check( !rQueryData.bDuplicate );
+ rBtnCase .Check( rQueryData.bCaseSens );
+ rBtnHeader .Check( rQueryData.bHasHeader );
+ rBtnRegExp .Check( rQueryData.bRegExp );
+ rBtnUnique .Check( !rQueryData.bDuplicate );
if ( pViewData && pDoc )
{
- String theAreaStr;
- ScRange theCurArea ( ScAddress( rQueryData.nCol1,
+ String theAreaStr;
+ ScRange theCurArea ( ScAddress( rQueryData.nCol1,
rQueryData.nRow1,
pViewData->GetTabNo() ),
ScAddress( rQueryData.nCol2,
rQueryData.nRow2,
pViewData->GetTabNo() ) );
- ScDBCollection* pDBColl = pDoc->GetDBCollection();
- String theDbArea;
- String theDbName = rStrNoName;
+ ScDBCollection* pDBColl = pDoc->GetDBCollection();
+ String theDbArea;
+ String theDbName = rStrNoName;
const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
theCurArea.Format( theAreaStr, SCR_ABS_3D, pDoc, eConv );
@@ -167,7 +167,7 @@ void ScFilterOptionsMgr::Init()
rLbCopyPos.SetEntryData( nInsert, new String( aRefStr ) );
}
- rBtnDestPers.Check( TRUE ); // beim Aufruf immer an
+ rBtnDestPers.Check( TRUE ); // beim Aufruf immer an
rLbCopyPos.SelectEntryPos( 0 );
rEdCopyPos.SetText( EMPTY_STRING );
@@ -180,9 +180,9 @@ void ScFilterOptionsMgr::Init()
if ( pDBColl )
{
- ScAddress& rStart = theCurArea.aStart;
- ScAddress& rEnd = theCurArea.aEnd;
- ScDBData* pDBData = pDBColl->GetDBAtArea( rStart.Tab(),
+ ScAddress& rStart = theCurArea.aStart;
+ ScAddress& rEnd = theCurArea.aEnd;
+ ScDBData* pDBData = pDBColl->GetDBAtArea( rStart.Tab(),
rStart.Col(), rStart.Row(),
rEnd.Col(), rEnd.Row() );
if ( pDBData )
@@ -281,15 +281,15 @@ IMPL_LINK( ScFilterOptionsMgr, EdPosModifyHdl, Edit*, pEd )
{
if ( pEd == &rEdCopyPos )
{
- String theCurPosStr = pEd->GetText();
- USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
+ String theCurPosStr = pEd->GetText();
+ USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
if ( SCA_VALID == (nResult & SCA_VALID) )
{
- String* pStr = NULL;
- BOOL bFound = FALSE;
- USHORT i = 0;
- USHORT nCount = rLbCopyPos.GetEntryCount();
+ String* pStr = NULL;
+ BOOL bFound = FALSE;
+ USHORT i = 0;
+ USHORT nCount = rLbCopyPos.GetEntryCount();
for ( i=2; i<nCount && !bFound; i++ )
{
diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx
index bd18008afd47..ce5874688789 100644
--- a/sc/source/ui/dbgui/imoptdlg.cxx
+++ b/sc/source/ui/dbgui/imoptdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +38,8 @@
static const sal_Char pStrFix[] = "FIX";
//------------------------------------------------------------------------
-// Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste)
-// darum ab Version 336 Komma stattdessen
+// Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste)
+// darum ab Version 336 Komma stattdessen
ScImportOptions::ScImportOptions( const String& rStr )
@@ -54,8 +54,8 @@ ScImportOptions::ScImportOptions( const String& rStr )
else
nFieldSepCode = (sal_Unicode) aToken.ToInt32();
nTextSepCode = (sal_Unicode) rStr.GetToken(1,',').ToInt32();
- aStrFont = rStr.GetToken(2,',');
- eCharSet = ScGlobal::GetCharsetValue(aStrFont);
+ aStrFont = rStr.GetToken(2,',');
+ eCharSet = ScGlobal::GetCharsetValue(aStrFont);
bSaveAsShown = (rStr.GetToken( 3, ',' ).ToInt32() ? TRUE : FALSE);
}
}
@@ -64,7 +64,7 @@ ScImportOptions::ScImportOptions( const String& rStr )
String ScImportOptions::BuildString() const
{
- String aResult;
+ String aResult;
if( bFixedWidth )
aResult.AppendAscii( pStrFix );
diff --git a/sc/source/ui/dbgui/imoptdlg.hrc b/sc/source/ui/dbgui/imoptdlg.hrc
index 5fd9256e8009..b6f1bf5555d2 100644
--- a/sc/source/ui/dbgui/imoptdlg.hrc
+++ b/sc/source/ui/dbgui/imoptdlg.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
@@ -28,16 +28,16 @@
//#define RID_SCDLG_IMPORTOPT 2256
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_HELP 3
-#define FT_FIELDSEP 4
-#define ED_FIELDSEP 5
-#define FT_TEXTSEP 6
-#define ED_TEXTSEP 7
-#define FT_FONT 8
-#define DDLB_FONT 9
-#define LB_FONT 10
+#define BTN_OK 1
+#define BTN_CANCEL 2
+#define BTN_HELP 3
+#define FT_FIELDSEP 4
+#define ED_FIELDSEP 5
+#define FT_TEXTSEP 6
+#define ED_TEXTSEP 7
+#define FT_FONT 8
+#define DDLB_FONT 9
+#define LB_FONT 10
#define FL_FIELDOPT 11
#define CB_FIXEDWIDTH 12
#define CB_SAVESHOWN 13
diff --git a/sc/source/ui/dbgui/imoptdlg.src b/sc/source/ui/dbgui/imoptdlg.src
index 914f2d1fb027..af38520aadb3 100644
--- a/sc/source/ui/dbgui/imoptdlg.src
+++ b/sc/source/ui/dbgui/imoptdlg.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
@@ -99,7 +99,7 @@ ModalDialog RID_SCDLG_IMPORTOPT
CheckBox CB_SAVESHOWN
{
Pos = MAP_APPFONT( 12, 66 );
- Size = MAP_APPFONT( 172, 10 );
+ Size = MAP_APPFONT( 172, 10 );
TabStop = TRUE;
Hide = TRUE;
Text [ en-US ] = "Save cell content as ~shown";
diff --git a/sc/source/ui/dbgui/outline.src b/sc/source/ui/dbgui/outline.src
index cd59bf3b099d..7f8eab69f716 100644
--- a/sc/source/ui/dbgui/outline.src
+++ b/sc/source/ui/dbgui/outline.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/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index d590ffb83457..4dec09c0faa1 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,54 +56,54 @@
//==================================================================
-ScPivotFilterDlg::ScPivotFilterDlg( Window* pParent,
- const SfxItemSet& rArgSet,
- SCTAB nSourceTab )
+ScPivotFilterDlg::ScPivotFilterDlg( Window* pParent,
+ const SfxItemSet& rArgSet,
+ SCTAB nSourceTab )
- : ModalDialog ( pParent, ScResId( RID_SCDLG_PIVOTFILTER ) ),
+ : ModalDialog ( pParent, ScResId( RID_SCDLG_PIVOTFILTER ) ),
//
aFlCriteria ( this, ScResId( FL_CRITERIA ) ),
- aLbField1 ( this, ScResId( LB_FIELD1 ) ),
- aLbCond1 ( this, ScResId( LB_COND1 ) ),
- aEdVal1 ( this, ScResId( ED_VAL1 ) ),
- aLbConnect1 ( this, ScResId( LB_OP1 ) ),
- aLbField2 ( this, ScResId( LB_FIELD2 ) ),
- aLbCond2 ( this, ScResId( LB_COND2 ) ),
- aEdVal2 ( this, ScResId( ED_VAL2 ) ),
- aLbConnect2 ( this, ScResId( LB_OP2 ) ),
- aLbField3 ( this, ScResId( LB_FIELD3 ) ),
- aLbCond3 ( this, ScResId( LB_COND3 ) ),
- aEdVal3 ( this, ScResId( ED_VAL3 ) ),
- aFtConnect ( this, ScResId( FT_OP ) ),
- aFtField ( this, ScResId( FT_FIELD ) ),
- aFtCond ( this, ScResId( FT_COND ) ),
- aFtVal ( this, ScResId( FT_VAL ) ),
+ aLbField1 ( this, ScResId( LB_FIELD1 ) ),
+ aLbCond1 ( this, ScResId( LB_COND1 ) ),
+ aEdVal1 ( this, ScResId( ED_VAL1 ) ),
+ aLbConnect1 ( this, ScResId( LB_OP1 ) ),
+ aLbField2 ( this, ScResId( LB_FIELD2 ) ),
+ aLbCond2 ( this, ScResId( LB_COND2 ) ),
+ aEdVal2 ( this, ScResId( ED_VAL2 ) ),
+ aLbConnect2 ( this, ScResId( LB_OP2 ) ),
+ aLbField3 ( this, ScResId( LB_FIELD3 ) ),
+ aLbCond3 ( this, ScResId( LB_COND3 ) ),
+ aEdVal3 ( this, ScResId( ED_VAL3 ) ),
+ aFtConnect ( this, ScResId( FT_OP ) ),
+ aFtField ( this, ScResId( FT_FIELD ) ),
+ aFtCond ( this, ScResId( FT_COND ) ),
+ aFtVal ( this, ScResId( FT_VAL ) ),
aFlOptions ( this, ScResId( FL_OPTIONS ) ),
- aBtnCase ( this, ScResId( BTN_CASE ) ),
- aBtnRegExp ( this, ScResId( BTN_REGEXP ) ),
- aBtnUnique ( this, ScResId( BTN_UNIQUE ) ),
- aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ),
- aFtDbArea ( this, ScResId( FT_DBAREA ) ),
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
- aBtnMore ( this, ScResId( BTN_MORE ) ),
- aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
- aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ),
- aStrNone ( ScResId( SCSTR_NONE ) ),
- aStrEmpty ( ScResId( SCSTR_EMPTY ) ),
- aStrNotEmpty ( ScResId( SCSTR_NOTEMPTY ) ),
- aStrRow ( ScResId( SCSTR_ROW ) ),
- aStrColumn ( ScResId( SCSTR_COLUMN ) ),
+ aBtnCase ( this, ScResId( BTN_CASE ) ),
+ aBtnRegExp ( this, ScResId( BTN_REGEXP ) ),
+ aBtnUnique ( this, ScResId( BTN_UNIQUE ) ),
+ aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ),
+ aFtDbArea ( this, ScResId( FT_DBAREA ) ),
+ aBtnOk ( this, ScResId( BTN_OK ) ),
+ aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
+ aBtnHelp ( this, ScResId( BTN_HELP ) ),
+ aBtnMore ( this, ScResId( BTN_MORE ) ),
+ aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
+ aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ),
+ aStrNone ( ScResId( SCSTR_NONE ) ),
+ aStrEmpty ( ScResId( SCSTR_EMPTY ) ),
+ aStrNotEmpty ( ScResId( SCSTR_NOTEMPTY ) ),
+ aStrRow ( ScResId( SCSTR_ROW ) ),
+ aStrColumn ( ScResId( SCSTR_COLUMN ) ),
//
- nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ),
- theQueryData ( ((const ScQueryItem&)
+ nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ),
+ theQueryData ( ((const ScQueryItem&)
rArgSet.Get( nWhichQuery )).GetQueryData() ),
- pOutItem ( NULL ),
- pViewData ( NULL ),
- pDoc ( NULL ),
- nSrcTab ( nSourceTab ), // ist nicht im QueryParam
- nFieldCount ( 0 )
+ pOutItem ( NULL ),
+ pViewData ( NULL ),
+ pDoc ( NULL ),
+ nSrcTab ( nSourceTab ), // ist nicht im QueryParam
+ nFieldCount ( 0 )
{
for (USHORT i=0; i<=MAXCOL; i++)
pEntryLists[i] = NULL;
@@ -130,11 +130,11 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
const ScQueryItem& rQueryItem = (const ScQueryItem&)
rArgSet.Get( nWhichQuery );
- aBtnCase.SetClickHdl ( LINK( this, ScPivotFilterDlg, CheckBoxHdl ) );
+ aBtnCase.SetClickHdl ( LINK( this, ScPivotFilterDlg, CheckBoxHdl ) );
- aLbField1.SetSelectHdl ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) );
- aLbField2.SetSelectHdl ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) );
- aLbField3.SetSelectHdl ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) );
+ aLbField1.SetSelectHdl ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) );
+ aLbField2.SetSelectHdl ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) );
+ aLbField3.SetSelectHdl ( LINK( this, ScPivotFilterDlg, LbSelectHdl ) );
aLbConnect1.SetSelectHdl( LINK( this, ScPivotFilterDlg, LbSelectHdl ) );
aLbConnect2.SetSelectHdl( LINK( this, ScPivotFilterDlg, LbSelectHdl ) );
@@ -145,36 +145,36 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
aBtnMore.AddWindow( &aFtDbArea );
aBtnMore.AddWindow( &aFlOptions );
- aBtnCase .Check( theQueryData.bCaseSens );
- aBtnRegExp .Check( theQueryData.bRegExp );
- aBtnUnique .Check( !theQueryData.bDuplicate );
+ aBtnCase .Check( theQueryData.bCaseSens );
+ aBtnRegExp .Check( theQueryData.bRegExp );
+ aBtnUnique .Check( !theQueryData.bDuplicate );
- pViewData = rQueryItem.GetViewData();
- pDoc = pViewData ? pViewData->GetDocument() : NULL;
+ pViewData = rQueryItem.GetViewData();
+ pDoc = pViewData ? pViewData->GetDocument() : NULL;
// fuer leichteren Zugriff:
- aFieldLbArr [0] = &aLbField1;
- aFieldLbArr [1] = &aLbField2;
- aFieldLbArr [2] = &aLbField3;
- aValueEdArr [0] = &aEdVal1;
- aValueEdArr [1] = &aEdVal2;
- aValueEdArr [2] = &aEdVal3;
- aCondLbArr [0] = &aLbCond1;
- aCondLbArr [1] = &aLbCond2;
- aCondLbArr [2] = &aLbCond3;
+ aFieldLbArr [0] = &aLbField1;
+ aFieldLbArr [1] = &aLbField2;
+ aFieldLbArr [2] = &aLbField3;
+ aValueEdArr [0] = &aEdVal1;
+ aValueEdArr [1] = &aEdVal2;
+ aValueEdArr [2] = &aEdVal3;
+ aCondLbArr [0] = &aLbCond1;
+ aCondLbArr [1] = &aLbCond2;
+ aCondLbArr [2] = &aLbCond3;
if ( pViewData && pDoc )
{
- String theAreaStr;
- ScRange theCurArea ( ScAddress( theQueryData.nCol1,
+ String theAreaStr;
+ ScRange theCurArea ( ScAddress( theQueryData.nCol1,
theQueryData.nRow1,
nSrcTab ),
ScAddress( theQueryData.nCol2,
theQueryData.nRow2,
nSrcTab ) );
- ScDBCollection* pDBColl = pDoc->GetDBCollection();
- String theDbArea;
- String theDbName = aStrNoName;
+ ScDBCollection* pDBColl = pDoc->GetDBCollection();
+ String theDbArea;
+ String theDbName = aStrNoName;
/*
* Ueberpruefen, ob es sich bei dem uebergebenen
@@ -185,9 +185,9 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
if ( pDBColl )
{
- ScAddress& rStart = theCurArea.aStart;
- ScAddress& rEnd = theCurArea.aEnd;
- ScDBData* pDBData = pDBColl->GetDBAtArea( rStart.Tab(),
+ ScAddress& rStart = theCurArea.aStart;
+ ScAddress& rEnd = theCurArea.aEnd;
+ ScDBData* pDBData = pDBColl->GetDBAtArea( rStart.Tab(),
rStart.Col(), rStart.Row(),
rEnd.Col(), rEnd.Row() );
if ( pDBData )
@@ -214,7 +214,7 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
{
ScQueryEntry& rEntry = theQueryData.GetEntry(i);
- String aValStr = *rEntry.pStr;
+ String aValStr = *rEntry.pStr;
if (!rEntry.bQueryByString && aValStr == EMPTY_STRING)
{
if (rEntry.nVal == SC_EMPTYFIELDS)
@@ -222,8 +222,8 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
else if (rEntry.nVal == SC_NONEMPTYFIELDS)
aValStr = aStrNotEmpty;
}
- USHORT nCondPos = (USHORT)rEntry.eOp;
- USHORT nFieldSelPos = GetFieldSelPos( static_cast<SCCOL>(rEntry.nField) );
+ USHORT nCondPos = (USHORT)rEntry.eOp;
+ USHORT nFieldSelPos = GetFieldSelPos( static_cast<SCCOL>(rEntry.nField) );
aFieldLbArr[i]->SelectEntryPos( nFieldSelPos );
aCondLbArr [i]->SelectEntryPos( nCondPos );
@@ -296,13 +296,13 @@ void ScPivotFilterDlg::FillFieldLists()
if ( pDoc )
{
- String aFieldName;
- SCTAB nTab = nSrcTab;
- SCCOL nFirstCol = theQueryData.nCol1;
- SCROW nFirstRow = theQueryData.nRow1;
- SCCOL nMaxCol = theQueryData.nCol2;
- SCCOL col = 0;
- USHORT i=1;
+ String aFieldName;
+ SCTAB nTab = nSrcTab;
+ SCCOL nFirstCol = theQueryData.nCol1;
+ SCROW nFirstRow = theQueryData.nRow1;
+ SCCOL nMaxCol = theQueryData.nCol2;
+ SCCOL col = 0;
+ USHORT i=1;
for ( col=nFirstCol; col<=nMaxCol; col++ )
{
@@ -328,10 +328,10 @@ void ScPivotFilterDlg::UpdateValueList( USHORT nList )
{
if ( pDoc && nList>0 && nList<=3 )
{
- ComboBox* pValList = aValueEdArr[nList-1];
- USHORT nFieldSelPos = aFieldLbArr[nList-1]->GetSelectEntryPos();
- USHORT nListPos = 0;
- String aCurValue = pValList->GetText();
+ ComboBox* pValList = aValueEdArr[nList-1];
+ USHORT nFieldSelPos = aFieldLbArr[nList-1]->GetSelectEntryPos();
+ USHORT nListPos = 0;
+ String aCurValue = pValList->GetText();
pValList->Clear();
pValList->InsertEntry( aStrNotEmpty, 0 );
@@ -345,9 +345,9 @@ void ScPivotFilterDlg::UpdateValueList( USHORT nList )
{
WaitObject aWaiter( this );
- SCTAB nTab = nSrcTab;
- SCROW nFirstRow = theQueryData.nRow1;
- SCROW nLastRow = theQueryData.nRow2;
+ SCTAB nTab = nSrcTab;
+ SCROW nFirstRow = theQueryData.nRow1;
+ SCROW nLastRow = theQueryData.nRow2;
nFirstRow++;
bool bHasDates = false;
@@ -400,14 +400,14 @@ USHORT ScPivotFilterDlg::GetFieldSelPos( SCCOL nField )
const ScQueryItem& ScPivotFilterDlg::GetOutputItem()
{
- ScQueryParam theParam( theQueryData );
- USHORT nConnect1 = aLbConnect1.GetSelectEntryPos();
- USHORT nConnect2 = aLbConnect2.GetSelectEntryPos();
+ ScQueryParam theParam( theQueryData );
+ USHORT nConnect1 = aLbConnect1.GetSelectEntryPos();
+ USHORT nConnect2 = aLbConnect2.GetSelectEntryPos();
for ( SCSIZE i=0; i<3; i++ )
{
- USHORT nField = aFieldLbArr[i]->GetSelectEntryPos();
- ScQueryOp eOp = (ScQueryOp)aCondLbArr[i]->GetSelectEntryPos();
+ USHORT nField = aFieldLbArr[i]->GetSelectEntryPos();
+ ScQueryOp eOp = (ScQueryOp)aCondLbArr[i]->GetSelectEntryPos();
BOOL bDoThis = (aFieldLbArr[i]->GetSelectEntryPos() != 0);
theParam.GetEntry(i).bDoQuery = bDoThis;
@@ -425,26 +425,26 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem()
*/
if ( aStrVal == aStrEmpty )
{
- *rEntry.pStr = EMPTY_STRING;
- rEntry.nVal = SC_EMPTYFIELDS;
+ *rEntry.pStr = EMPTY_STRING;
+ rEntry.nVal = SC_EMPTYFIELDS;
rEntry.bQueryByString = FALSE;
}
else if ( aStrVal == aStrNotEmpty )
{
- *rEntry.pStr = EMPTY_STRING;
- rEntry.nVal = SC_NONEMPTYFIELDS;
+ *rEntry.pStr = EMPTY_STRING;
+ rEntry.nVal = SC_NONEMPTYFIELDS;
rEntry.bQueryByString = FALSE;
}
else
{
- *rEntry.pStr = aStrVal;
- rEntry.nVal = 0;
+ *rEntry.pStr = aStrVal;
+ rEntry.nVal = 0;
rEntry.bQueryByString = TRUE;
}
- rEntry.nField = nField ? (theQueryData.nCol1 +
+ rEntry.nField = nField ? (theQueryData.nCol1 +
static_cast<SCCOL>(nField) - 1) : static_cast<SCCOL>(0);
- rEntry.eOp = eOp;
+ rEntry.eOp = eOp;
}
}
@@ -456,13 +456,13 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem()
: SC_AND;
theParam.bInplace = FALSE;
- theParam.nDestTab = 0; // Woher kommen diese Werte?
- theParam.nDestCol = 0;
- theParam.nDestRow = 0;
+ theParam.nDestTab = 0; // Woher kommen diese Werte?
+ theParam.nDestCol = 0;
+ theParam.nDestRow = 0;
- theParam.bDuplicate = !aBtnUnique.IsChecked();
- theParam.bCaseSens = aBtnCase.IsChecked();
- theParam.bRegExp = aBtnRegExp.IsChecked();
+ theParam.bDuplicate = !aBtnUnique.IsChecked();
+ theParam.bCaseSens = aBtnCase.IsChecked();
+ theParam.bRegExp = aBtnRegExp.IsChecked();
if ( pOutItem ) DELETEZ( pOutItem );
pOutItem = new ScQueryItem( nWhichQuery, &theParam );
@@ -569,9 +569,9 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb )
IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox )
{
- // bei Gross-/Kleinschreibung die Werte-Listen aktualisieren
+ // bei Gross-/Kleinschreibung die Werte-Listen aktualisieren
- if ( pBox == &aBtnCase ) // Wertlisten
+ if ( pBox == &aBtnCase ) // Wertlisten
{
for (USHORT i=0; i<=MAXCOL; i++)
DELETEZ( pEntryLists[i] );
@@ -596,11 +596,11 @@ IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd )
{
if ( pEd )
{
- String aStrVal = pEd->GetText();
- ListBox* pLb = &aLbCond1;
+ String aStrVal = pEd->GetText();
+ ListBox* pLb = &aLbCond1;
if ( pEd == &aEdVal2 ) pLb = &aLbCond2;
- else if ( pEd == &aEdVal3 ) pLb = &aLbCond3;
+ else if ( pEd == &aEdVal3 ) pLb = &aLbCond3;
// wenn einer der Sonderwerte leer/nicht-leer
// gewaehlt wird, so macht nur der =-Operator Sinn:
diff --git a/sc/source/ui/dbgui/pivot.hrc b/sc/source/ui/dbgui/pivot.hrc
index 1a97d4c75b52..097b0931ff3a 100644
--- a/sc/source/ui/dbgui/pivot.hrc
+++ b/sc/source/ui/dbgui/pivot.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,7 +26,7 @@
************************************************************************/
#include "sc.hrc" // ->RID_SCDLG_PIVOT_LAYOUT
-#define BTN_OK 1
+#define BTN_OK 1
#define BTN_CANCEL 2
#define BTN_HELP 3
#define BTN_MORE 4
@@ -67,15 +67,15 @@
#define RB_INAREA 41
#define ED_INAREA 42
-#define PIVOTSTR_SUM 1
-#define PIVOTSTR_COUNT 2
-#define PIVOTSTR_AVG 3
-#define PIVOTSTR_MAX 4
-#define PIVOTSTR_MIN 5
-#define PIVOTSTR_PROD 6
-#define PIVOTSTR_COUNT2 7
-#define PIVOTSTR_DEV 8
-#define PIVOTSTR_DEV2 9
-#define PIVOTSTR_VAR 10
-#define PIVOTSTR_VAR2 11
+#define PIVOTSTR_SUM 1
+#define PIVOTSTR_COUNT 2
+#define PIVOTSTR_AVG 3
+#define PIVOTSTR_MAX 4
+#define PIVOTSTR_MIN 5
+#define PIVOTSTR_PROD 6
+#define PIVOTSTR_COUNT2 7
+#define PIVOTSTR_DEV 8
+#define PIVOTSTR_DEV2 9
+#define PIVOTSTR_VAR 10
+#define PIVOTSTR_VAR2 11
diff --git a/sc/source/ui/dbgui/pivot.src b/sc/source/ui/dbgui/pivot.src
index 359c8a92d8e5..7e7fe2491ced 100644
--- a/sc/source/ui/dbgui/pivot.src
+++ b/sc/source/ui/dbgui/pivot.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/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 6b04993ba0bc..6ee2c1b13015 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -765,7 +765,7 @@ short ScDPShowDetailDlg::Execute()
String ScDPShowDetailDlg::GetDimensionName() const
{
- // Look up the internal dimension name which may be different from the
+ // Look up the internal dimension name which may be different from the
// displayed field name.
String aSelectedName = maLbDims.GetSelectEntry();
DimNameIndexMap::const_iterator itr = maNameIndexMap.find(aSelectedName);
diff --git a/sc/source/ui/dbgui/pvfundlg.hrc b/sc/source/ui/dbgui/pvfundlg.hrc
index c9b6f562a9e1..4e155cadf1b9 100644
--- a/sc/source/ui/dbgui/pvfundlg.hrc
+++ b/sc/source/ui/dbgui/pvfundlg.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
@@ -73,7 +73,7 @@
#define FT_HIERARCHY 10
#define FT_DIMS 11
-#define CB_SHOWALL 1
+#define CB_SHOWALL 1
#define CB_LAYOUT_EMPTY 2
#define CB_SHOW 3
diff --git a/sc/source/ui/dbgui/pvfundlg.src b/sc/source/ui/dbgui/pvfundlg.src
index ed00f6a65fa5..b3ff8cab02bf 100644
--- a/sc/source/ui/dbgui/pvfundlg.src
+++ b/sc/source/ui/dbgui/pvfundlg.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/source/ui/dbgui/pvglob.hxx b/sc/source/ui/dbgui/pvglob.hxx
index 6b6526266035..dfe67a8b3285 100644
--- a/sc/source/ui/dbgui/pvglob.hxx
+++ b/sc/source/ui/dbgui/pvglob.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx
index 1eca44a787ed..867277ea1500 100644
--- a/sc/source/ui/dbgui/pvlaydlg.cxx
+++ b/sc/source/ui/dbgui/pvlaydlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ PointerStyle lclGetPointerForField( ScDPFieldType eType )
ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
const ScDPObject& rDPObject )
- : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_PIVOT_LAYOUT ),
+ : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_PIVOT_LAYOUT ),
aFlLayout ( this, ScResId( FL_LAYOUT ) ),
aFtPage ( this, ScResId( FT_PAGE ) ),
aWndPage ( this, ScResId( WND_PAGE ), TYPE_PAGE, &aFtPage ),
@@ -117,49 +117,49 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pPar
aFtData ( this, ScResId( FT_DATA ) ),
aWndData ( this, ScResId( WND_DATA ), TYPE_DATA, &aFtData ),
aWndSelect ( this, ScResId( WND_SELECT ), TYPE_SELECT, String(ScResId(STR_SELECT)) ),
- aSlider ( this, ScResId( WND_HSCROLL ) ),
- aFtInfo ( this, ScResId( FT_INFO ) ),
+ aSlider ( this, ScResId( WND_HSCROLL ) ),
+ aFtInfo ( this, ScResId( FT_INFO ) ),
aFlAreas ( this, ScResId( FL_OUTPUT ) ),
- aFtInArea ( this, ScResId( FT_INAREA) ),
- aEdInPos ( this, ScResId( ED_INAREA) ),
- aRbInPos ( this, ScResId( RB_INAREA ), &aEdInPos, this ),
+ aFtInArea ( this, ScResId( FT_INAREA) ),
+ aEdInPos ( this, ScResId( ED_INAREA) ),
+ aRbInPos ( this, ScResId( RB_INAREA ), &aEdInPos, this ),
- aLbOutPos ( this, ScResId( LB_OUTAREA ) ),
- aFtOutArea ( this, ScResId( FT_OUTAREA ) ),
+ aLbOutPos ( this, ScResId( LB_OUTAREA ) ),
+ aFtOutArea ( this, ScResId( FT_OUTAREA ) ),
aEdOutPos ( this, this, ScResId( ED_OUTAREA ) ),
- aRbOutPos ( this, ScResId( RB_OUTAREA ), &aEdOutPos, this ),
+ aRbOutPos ( this, ScResId( RB_OUTAREA ), &aEdOutPos, this ),
aBtnIgnEmptyRows( this, ScResId( BTN_IGNEMPTYROWS ) ),
- aBtnDetectCat ( this, ScResId( BTN_DETECTCAT ) ),
- aBtnTotalCol ( this, ScResId( BTN_TOTALCOL ) ),
- aBtnTotalRow ( this, ScResId( BTN_TOTALROW ) ),
+ aBtnDetectCat ( this, ScResId( BTN_DETECTCAT ) ),
+ aBtnTotalCol ( this, ScResId( BTN_TOTALCOL ) ),
+ aBtnTotalRow ( this, ScResId( BTN_TOTALROW ) ),
aBtnFilter ( this, ScResId( BTN_FILTER ) ),
aBtnDrillDown ( this, ScResId( BTN_DRILLDOWN ) ),
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
+ aBtnOk ( this, ScResId( BTN_OK ) ),
+ aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
+ aBtnHelp ( this, ScResId( BTN_HELP ) ),
aBtnRemove ( this, ScResId( BTN_REMOVE ) ),
aBtnOptions ( this, ScResId( BTN_OPTIONS ) ),
- aBtnMore ( this, ScResId( BTN_MORE ) ),
+ aBtnMore ( this, ScResId( BTN_MORE ) ),
- aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
- aStrNewTable ( ScResId( SCSTR_NEWTABLE ) ),
+ aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
+ aStrNewTable ( ScResId( SCSTR_NEWTABLE ) ),
- bIsDrag ( FALSE ),
+ bIsDrag ( FALSE ),
pEditActive ( NULL ),
eLastActiveType ( TYPE_SELECT ),
- nOffset ( 0 ),
+ nOffset ( 0 ),
//
xDlgDPObject ( new ScDPObject( rDPObject ) ),
- pViewData ( ((ScTabViewShell*)SfxViewShell::Current())->
+ pViewData ( ((ScTabViewShell*)SfxViewShell::Current())->
GetViewData() ),
- pDoc ( ((ScTabViewShell*)SfxViewShell::Current())->
+ pDoc ( ((ScTabViewShell*)SfxViewShell::Current())->
GetViewData()->GetDocument() ),
- bRefInputMode ( FALSE )
+ bRefInputMode ( FALSE )
{
xDlgDPObject->SetAlive( TRUE ); // needed to get structure information
xDlgDPObject->FillOldParam( thePivotData, FALSE );
@@ -264,7 +264,7 @@ void __EXPORT ScDPLayoutDlg::Init()
aLbOutPos .SetSelectHdl( LINK( this, ScDPLayoutDlg, SelAreaHdl ) );
aEdOutPos .SetModifyHdl( LINK( this, ScDPLayoutDlg, EdModifyHdl ) );
- aEdInPos .SetModifyHdl( LINK( this, ScDPLayoutDlg, EdInModifyHdl ) );
+ aEdInPos .SetModifyHdl( LINK( this, ScDPLayoutDlg, EdInModifyHdl ) );
aBtnOk .SetClickHdl ( LINK( this, ScDPLayoutDlg, OkHdl ) );
aBtnCancel.SetClickHdl ( LINK( this, ScDPLayoutDlg, CancelHdl ) );
Link aLink = LINK( this, ScDPLayoutDlg, GetFocusHdl );
@@ -291,7 +291,7 @@ void __EXPORT ScDPLayoutDlg::Init()
String aRefStr;
while ( aIter.Next( aName, aRange ) )
{
- if ( !aIter.WasDBName() ) // hier keine DB-Bereiche !
+ if ( !aIter.WasDBName() ) // hier keine DB-Bereiche !
{
USHORT nInsert = aLbOutPos.InsertEntry( aName );
@@ -318,8 +318,8 @@ void __EXPORT ScDPLayoutDlg::Init()
aBtnIgnEmptyRows.Check( thePivotData.bIgnoreEmptyRows );
aBtnDetectCat .Check( thePivotData.bDetectCategories );
- aBtnTotalCol .Check( thePivotData.bMakeTotalCol );
- aBtnTotalRow .Check( thePivotData.bMakeTotalRow );
+ aBtnTotalCol .Check( thePivotData.bMakeTotalCol );
+ aBtnTotalRow .Check( thePivotData.bMakeTotalRow );
if( const ScDPSaveData* pSaveData = xDlgDPObject->GetSaveData() )
{
@@ -340,10 +340,10 @@ void __EXPORT ScDPLayoutDlg::Init()
InitFocus();
-// SetDispatcherLock( TRUE ); // Modal-Modus einschalten
+// SetDispatcherLock( TRUE ); // Modal-Modus einschalten
//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
- //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
+ //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
}
@@ -605,7 +605,7 @@ void ScDPLayoutDlg::AddField( size_t nFromIndex, ScDPFieldType eToType, const Po
{
USHORT nMask = fData.mnFuncMask;
OUString aStr = GetFuncString( nMask, rData.mbIsValue );
-
+
aStr += rData.getDisplayName();
if ( toWnd->AddField( aStr,
@@ -960,7 +960,7 @@ PointerStyle ScDPLayoutDlg::NotifyMouseMove( const Point& rAt )
PointerStyle ScDPLayoutDlg::NotifyMouseButtonDown( ScDPFieldType eType, size_t nFieldIndex )
{
- bIsDrag = TRUE;
+ bIsDrag = TRUE;
eDnDFromType = eType;
nDnDFromIndex = nFieldIndex;
return lclGetPointerForField( eType );
@@ -1141,7 +1141,7 @@ BOOL ScDPLayoutDlg::Contains( ScDPFuncDataVec* pArr, SCsCOL nCol, size_t& nAt )
if ( !pArr )
return FALSE;
- BOOL bFound = FALSE;
+ BOOL bFound = FALSE;
size_t i = 0;
while ( (i<pArr->size()) && ((*pArr)[i].get() != NULL) && !bFound )
@@ -1239,16 +1239,16 @@ String ScDPLayoutDlg::GetFuncString( USHORT& rFuncMask, BOOL bIsValue )
rFuncMask = PIVOT_FUNC_COUNT;
}
}
- else if ( rFuncMask == PIVOT_FUNC_SUM ) aStr = FSTR(PIVOTSTR_SUM);
- else if ( rFuncMask == PIVOT_FUNC_COUNT ) aStr = FSTR(PIVOTSTR_COUNT);
- else if ( rFuncMask == PIVOT_FUNC_AVERAGE ) aStr = FSTR(PIVOTSTR_AVG);
- else if ( rFuncMask == PIVOT_FUNC_MAX ) aStr = FSTR(PIVOTSTR_MAX);
- else if ( rFuncMask == PIVOT_FUNC_MIN ) aStr = FSTR(PIVOTSTR_MIN);
- else if ( rFuncMask == PIVOT_FUNC_PRODUCT ) aStr = FSTR(PIVOTSTR_PROD);
+ else if ( rFuncMask == PIVOT_FUNC_SUM ) aStr = FSTR(PIVOTSTR_SUM);
+ else if ( rFuncMask == PIVOT_FUNC_COUNT ) aStr = FSTR(PIVOTSTR_COUNT);
+ else if ( rFuncMask == PIVOT_FUNC_AVERAGE ) aStr = FSTR(PIVOTSTR_AVG);
+ else if ( rFuncMask == PIVOT_FUNC_MAX ) aStr = FSTR(PIVOTSTR_MAX);
+ else if ( rFuncMask == PIVOT_FUNC_MIN ) aStr = FSTR(PIVOTSTR_MIN);
+ else if ( rFuncMask == PIVOT_FUNC_PRODUCT ) aStr = FSTR(PIVOTSTR_PROD);
else if ( rFuncMask == PIVOT_FUNC_COUNT_NUM ) aStr = FSTR(PIVOTSTR_COUNT2);
- else if ( rFuncMask == PIVOT_FUNC_STD_DEV ) aStr = FSTR(PIVOTSTR_DEV);
+ else if ( rFuncMask == PIVOT_FUNC_STD_DEV ) aStr = FSTR(PIVOTSTR_DEV);
else if ( rFuncMask == PIVOT_FUNC_STD_DEVP ) aStr = FSTR(PIVOTSTR_DEV2);
- else if ( rFuncMask == PIVOT_FUNC_STD_VAR ) aStr = FSTR(PIVOTSTR_VAR);
+ else if ( rFuncMask == PIVOT_FUNC_STD_VAR ) aStr = FSTR(PIVOTSTR_VAR);
else if ( rFuncMask == PIVOT_FUNC_STD_VARP ) aStr = FSTR(PIVOTSTR_VAR2);
else
{
@@ -1298,10 +1298,10 @@ void ScDPLayoutDlg::CalcWndSizes()
aSlider.SetPosSizePixel( aSliderPos, aSliderSize );
aRectPage = Rectangle( aWndPage.GetPosPixel(), aWndPage.GetSizePixel() );
- aRectRow = Rectangle( aWndRow.GetPosPixel(), aWndRow.GetSizePixel() );
- aRectCol = Rectangle( aWndCol.GetPosPixel(), aWndCol.GetSizePixel() );
- aRectData = Rectangle( aWndData.GetPosPixel(), aWndData.GetSizePixel() );
- aRectSelect = Rectangle( aWndSelect.GetPosPixel(), aWndSelect.GetSizePixel() );
+ aRectRow = Rectangle( aWndRow.GetPosPixel(), aWndRow.GetSizePixel() );
+ aRectCol = Rectangle( aWndCol.GetPosPixel(), aWndCol.GetSizePixel() );
+ aRectData = Rectangle( aWndData.GetPosPixel(), aWndData.GetSizePixel() );
+ aRectSelect = Rectangle( aWndSelect.GetPosPixel(), aWndSelect.GetSizePixel() );
}
@@ -1309,8 +1309,8 @@ void ScDPLayoutDlg::CalcWndSizes()
BOOL ScDPLayoutDlg::GetPivotArrays( PivotField* pPageArr,
PivotField* pColArr,
- PivotField* pRowArr,
- PivotField* pDataArr,
+ PivotField* pRowArr,
+ PivotField* pDataArr,
USHORT& rPageCount,
USHORT& rColCount,
USHORT& rRowCount,
@@ -1340,7 +1340,7 @@ BOOL ScDPLayoutDlg::GetPivotArrays( PivotField* pPageArr,
else if ( rColCount < aColArr.size() )
pColArr[rColCount++].nCol = PIVOT_DATA_FIELD;
else
- bFit = FALSE; // kein Platz fuer Datenfeld
+ bFit = FALSE; // kein Platz fuer Datenfeld
return bFit;
}
@@ -1465,10 +1465,10 @@ IMPL_LINK( ScDPLayoutDlg, ClickHdl, PushButton *, pBtn )
IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
{
- String aOutPosStr( aEdOutPos.GetText() );
- ScAddress aAdrDest;
- BOOL bToNewTable = (aLbOutPos.GetSelectEntryPos() == 1);
- USHORT nResult = !bToNewTable ? aAdrDest.Parse( aOutPosStr, pDoc, pDoc->GetAddressConvention() ) : 0;
+ String aOutPosStr( aEdOutPos.GetText() );
+ ScAddress aAdrDest;
+ BOOL bToNewTable = (aLbOutPos.GetSelectEntryPos() == 1);
+ USHORT nResult = !bToNewTable ? aAdrDest.Parse( aOutPosStr, pDoc, pDoc->GetAddressConvention() ) : 0;
if ( bToNewTable
|| ( (aOutPosStr.Len() > 0) && (SCA_VALID == (nResult & SCA_VALID)) ) )
@@ -1476,11 +1476,11 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
//SFX_APPWINDOW->Enable();
- ScPivotParam theOutParam;
+ ScPivotParam theOutParam;
PivotPageFieldArr aPageFieldArr;
- PivotFieldArr aColFieldArr;
- PivotFieldArr aRowFieldArr;
- PivotFieldArr aDataFieldArr;
+ PivotFieldArr aColFieldArr;
+ PivotFieldArr aRowFieldArr;
+ PivotFieldArr aDataFieldArr;
USHORT nPageCount;
USHORT nColCount;
USHORT nRowCount;
@@ -1492,7 +1492,7 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
{
ScDPSaveData* pOldSaveData = xDlgDPObject->GetSaveData();
- ScRange aOutRange( aAdrDest ); // bToNewTable is passed separately
+ ScRange aOutRange( aAdrDest ); // bToNewTable is passed separately
ScDPSaveData aSaveData;
aSaveData.SetIgnoreEmptyRows( aBtnIgnEmptyRows.IsChecked() );
@@ -1584,15 +1584,15 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
USHORT nWhichPivot = SC_MOD()->GetPool().GetWhich( SID_PIVOT_TABLE );
ScPivotItem aOutItem( nWhichPivot, &aSaveData, &aOutRange, bToNewTable );
- bRefInputMode = FALSE; // to allow deselecting when switching sheets
+ bRefInputMode = FALSE; // to allow deselecting when switching sheets
SetDispatcherLock( FALSE );
SwitchToDocument();
- // #95513# don't hide the dialog before executing the slot, instead it is used as
- // parent for message boxes in ScTabViewShell::GetDialogParent
+ // #95513# don't hide the dialog before executing the slot, instead it is used as
+ // parent for message boxes in ScTabViewShell::GetDialogParent
- const SfxPoolItem* pRet = GetBindings().GetDispatcher()->Execute(
+ const SfxPoolItem* pRet = GetBindings().GetDispatcher()->Execute(
SID_PIVOT_TABLE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aOutItem, 0L, 0L );
bool bSuccess = true;
@@ -1606,7 +1606,7 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
// Table successfully inserted.
Close();
else
- {
+ {
// Table insertion failed. Keep the dialog open.
bRefInputMode = true;
SetDispatcherLock(true);
@@ -1668,7 +1668,7 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, MoreButton *, EMPTYARG )
{
bRefInputMode = FALSE;
//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
- //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
+ //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
}
return 0;
}
@@ -1678,15 +1678,15 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, MoreButton *, EMPTYARG )
IMPL_LINK( ScDPLayoutDlg, EdModifyHdl, Edit *, EMPTYARG )
{
- String theCurPosStr = aEdOutPos.GetText();
- USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
+ String theCurPosStr = aEdOutPos.GetText();
+ USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
if ( SCA_VALID == (nResult & SCA_VALID) )
{
- String* pStr = NULL;
- BOOL bFound = FALSE;
- USHORT i = 0;
- USHORT nCount = aLbOutPos.GetEntryCount();
+ String* pStr = NULL;
+ BOOL bFound = FALSE;
+ USHORT i = 0;
+ USHORT nCount = aLbOutPos.GetEntryCount();
for ( i=2; i<nCount && !bFound; i++ )
{
@@ -1714,8 +1714,8 @@ IMPL_LINK( ScDPLayoutDlg, EdInModifyHdl, Edit *, EMPTYARG )
IMPL_LINK( ScDPLayoutDlg, SelAreaHdl, ListBox *, EMPTYARG )
{
- String aString;
- USHORT nSelPos = aLbOutPos.GetSelectEntryPos();
+ String aString;
+ USHORT nSelPos = aLbOutPos.GetSelectEntryPos();
if ( nSelPos > 1 )
{
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index 96c9f120f5b1..709056d8ddab 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, BOOL bEdit, BOOL bSheetProtected)
- : ModalDialog ( pParent, ScResId( RID_SCDLG_NEWSCENARIO ) ),
+ : ModalDialog ( pParent, ScResId( RID_SCDLG_NEWSCENARIO ) ),
aFlName ( this, ScResId( FL_NAME )),
- aEdName ( this, ScResId( ED_NAME ) ),
+ aEdName ( this, ScResId( ED_NAME ) ),
aFlComment ( this, ScResId( FL_COMMENT ) ),
- aEdComment ( this, ScResId( ED_COMMENT ) ),
+ aEdComment ( this, ScResId( ED_COMMENT ) ),
aFlOptions ( this, ScResId( FL_OPTIONS ) ),
- aCbShowFrame ( this, ScResId( CB_SHOWFRAME ) ),
- aLbColor ( this, ScResId( LB_COLOR ) ),
- //aCbPrintFrame ( this, ScResId( CB_PRINTFRAME ) ),
- aCbTwoWay ( this, ScResId( CB_TWOWAY ) ),
- //aCbAttrib ( this, ScResId( CB_ATTRIB ) ),
- //aCbValue ( this, ScResId( CB_VALUE ) ),
- aCbCopyAll ( this, ScResId( CB_COPYALL ) ),
+ aCbShowFrame ( this, ScResId( CB_SHOWFRAME ) ),
+ aLbColor ( this, ScResId( LB_COLOR ) ),
+ //aCbPrintFrame ( this, ScResId( CB_PRINTFRAME ) ),
+ aCbTwoWay ( this, ScResId( CB_TWOWAY ) ),
+ //aCbAttrib ( this, ScResId( CB_ATTRIB ) ),
+ //aCbValue ( this, ScResId( CB_VALUE ) ),
+ aCbCopyAll ( this, ScResId( CB_COPYALL ) ),
aCbProtect ( this, ScResId( CB_PROTECT ) ),
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
+ aBtnOk ( this, ScResId( BTN_OK ) ),
+ aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
+ aBtnHelp ( this, ScResId( BTN_HELP ) ),
aDefScenarioName( rName ),
- bIsEdit ( bEdit )
+ bIsEdit ( bEdit )
{
if (bIsEdit)
SetText(String(ScResId(STR_EDIT)));
- SfxObjectShell* pDocSh = SfxObjectShell::Current();
+ SfxObjectShell* pDocSh = SfxObjectShell::Current();
if ( pDocSh )
{
const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE );
@@ -112,9 +112,9 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, BOOL b
aComment.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ", " ));
aComment += ScGlobal::GetpLocaleData()->getTime( Time() );//CHINA001 aComment += ScGlobal::pLocaleData->getTime( Time() );
- aEdComment .SetText( aComment );
- aEdName .SetText( rName );
- aBtnOk .SetClickHdl( LINK( this, ScNewScenarioDlg, OkHdl ) );
+ aEdComment .SetText( aComment );
+ aEdName .SetText( rName );
+ aBtnOk .SetClickHdl( LINK( this, ScNewScenarioDlg, OkHdl ) );
aCbShowFrame.SetClickHdl( LINK( this, ScNewScenarioDlg, EnableHdl ) );
FreeResource();
@@ -136,7 +136,7 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, BOOL b
if (bSheetProtected)
aCbProtect.Enable(FALSE);
- //! die drei funktionieren noch nicht...
+ //! die drei funktionieren noch nicht...
/*
aCbPrintFrame.Enable(FALSE);
aCbAttrib.Enable(FALSE);
@@ -156,7 +156,7 @@ void ScNewScenarioDlg::GetScenarioData( String& rName, String& rComment,
Color& rColor, USHORT& rFlags ) const
{
rComment = aEdComment.GetText();
- rName = aEdName.GetText();
+ rName = aEdName.GetText();
if ( rName.Len() == 0 )
rName = aDefScenarioName;
@@ -197,7 +197,7 @@ void ScNewScenarioDlg::SetScenarioData( const String& rName, const String& rComm
aCbTwoWay.Check ( (nFlags & SC_SCENARIO_TWOWAY) != 0 );
//aCbAttrib.Check ( (nFlags & SC_SCENARIO_ATTRIB) != 0 );
//aCbValue.Check ( (nFlags & SC_SCENARIO_VALUE) != 0 );
- // CopyAll nicht
+ // CopyAll nicht
aCbProtect.Check ( (nFlags & SC_SCENARIO_PROTECT) != 0 );
}
@@ -205,8 +205,8 @@ void ScNewScenarioDlg::SetScenarioData( const String& rName, const String& rComm
IMPL_LINK( ScNewScenarioDlg, OkHdl, OKButton *, EMPTYARG )
{
- String aName ( aEdName.GetText() );
- ScDocument* pDoc = ((ScTabViewShell*)SfxViewShell::Current())->
+ String aName ( aEdName.GetText() );
+ ScDocument* pDoc = ((ScTabViewShell*)SfxViewShell::Current())->
GetViewData()->GetDocument();
aName.EraseLeadingChars( ' ' );
@@ -229,7 +229,7 @@ IMPL_LINK( ScNewScenarioDlg, OkHdl, OKButton *, EMPTYARG )
EndDialog( RET_OK );
return 0;
- //! beim Editieren testen, ob eine andere Tabelle den Namen hat!
+ //! beim Editieren testen, ob eine andere Tabelle den Namen hat!
}
//------------------------------------------------------------------------
diff --git a/sc/source/ui/dbgui/scendlg.hrc b/sc/source/ui/dbgui/scendlg.hrc
index 83818773bf5a..fe01da8ffb48 100644
--- a/sc/source/ui/dbgui/scendlg.hrc
+++ b/sc/source/ui/dbgui/scendlg.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/source/ui/dbgui/scendlg.src b/sc/source/ui/dbgui/scendlg.src
index 40cfeb01b8ff..7e08ec7816cf 100644
--- a/sc/source/ui/dbgui/scendlg.src
+++ b/sc/source/ui/dbgui/scendlg.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/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 171daa0ca882..76ed611792a3 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 lcl_FillCombo( ComboBox& rCombo, const String& rList, sal_Unicode cSelect )
if ( (sal_Unicode)rList.GetToken(i+1,'\t').ToInt32() == cSelect )
aStr = rList.GetToken(i,'\t');
if (!aStr.Len())
- aStr = cSelect; // Ascii
+ aStr = cSelect; // Ascii
rCombo.SetText(aStr);
}
@@ -117,8 +117,8 @@ sal_Unicode lcl_CharFromCombo( ComboBox& rCombo, const String& rList )
return c;
}
-static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparators,
- bool &bMergeDelimiters, bool& bQuotedAsText, bool& bDetectSpecialNum,
+static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparators,
+ bool &bMergeDelimiters, bool& bQuotedAsText, bool& bDetectSpecialNum,
bool &bFixedWidth, sal_Int32 &nFromRow, sal_Int32 &nCharSet,
sal_Int32& nLanguage )
{
@@ -156,7 +156,7 @@ static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparato
if( pProperties[5].hasValue() )
pProperties[5] >>= nCharSet;
-
+
if ( pProperties[6].hasValue() )
pProperties[6] >>= bQuotedAsText;
@@ -167,7 +167,7 @@ static void load_Separators( OUString &sFieldSeparators, OUString &sTextSeparato
pProperties[8] >>= nLanguage;
}
-static void save_Separators(
+static void save_Separators(
String maSeparators, String maTxtSep, bool bMergeDelimiters, bool bQuotedAsText,
bool bDetectSpecialNum, bool bFixedWidth, sal_Int32 nFromRow, sal_Int32 nCharSet, sal_Int32 nLanguage )
{
@@ -207,7 +207,7 @@ static void save_Separators(
ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
SvStream* pInStream, sal_Unicode /*cSep*/ ) :
- ModalDialog ( pParent, ScResId( RID_SCDLG_ASCII ) ),
+ ModalDialog ( pParent, ScResId( RID_SCDLG_ASCII ) ),
mpDatStream ( pInStream ),
mnStreamPos( pInStream ? pInStream->Tell() : 0 ),
@@ -215,46 +215,46 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
mnRowPosCount(0),
aFlFieldOpt ( this, ScResId( FL_FIELDOPT ) ),
- aFtCharSet ( this, ScResId( FT_CHARSET ) ),
- aLbCharSet ( this, ScResId( LB_CHARSET ) ),
+ aFtCharSet ( this, ScResId( FT_CHARSET ) ),
+ aLbCharSet ( this, ScResId( LB_CHARSET ) ),
aFtCustomLang( this, ScResId( FT_CUSTOMLANG ) ),
- aLbCustomLang( this, ScResId( LB_CUSTOMLANG ) ),
+ aLbCustomLang( this, ScResId( LB_CUSTOMLANG ) ),
- aFtRow ( this, ScResId( FT_AT_ROW ) ),
- aNfRow ( this, ScResId( NF_AT_ROW ) ),
+ aFtRow ( this, ScResId( FT_AT_ROW ) ),
+ aNfRow ( this, ScResId( NF_AT_ROW ) ),
aFlSepOpt ( this, ScResId( FL_SEPOPT ) ),
- aRbFixed ( this, ScResId( RB_FIXED ) ),
+ aRbFixed ( this, ScResId( RB_FIXED ) ),
aRbSeparated( this, ScResId( RB_SEPARATED ) ),
- aCkbTab ( this, ScResId( CKB_TAB ) ),
+ aCkbTab ( this, ScResId( CKB_TAB ) ),
aCkbSemicolon(this, ScResId( CKB_SEMICOLON ) ),
- aCkbComma ( this, ScResId( CKB_COMMA ) ),
- aCkbSpace ( this, ScResId( CKB_SPACE ) ),
- aCkbOther ( this, ScResId( CKB_OTHER ) ),
- aEdOther ( this, ScResId( ED_OTHER ) ),
- aCkbAsOnce ( this, ScResId( CB_ASONCE) ),
- aFlOtherOpt ( this, ScResId( FL_OTHER_OPTIONS ) ),
+ aCkbComma ( this, ScResId( CKB_COMMA ) ),
+ aCkbSpace ( this, ScResId( CKB_SPACE ) ),
+ aCkbOther ( this, ScResId( CKB_OTHER ) ),
+ aEdOther ( this, ScResId( ED_OTHER ) ),
+ aCkbAsOnce ( this, ScResId( CB_ASONCE) ),
+ aFlOtherOpt ( this, ScResId( FL_OTHER_OPTIONS ) ),
- aFtTextSep ( this, ScResId( FT_TEXTSEP ) ),
- aCbTextSep ( this, ScResId( CB_TEXTSEP ) ),
+ aFtTextSep ( this, ScResId( FT_TEXTSEP ) ),
+ aCbTextSep ( this, ScResId( CB_TEXTSEP ) ),
aCkbQuotedAsText( this, ScResId(CB_QUOTED_AS_TEXT) ),
aCkbDetectNumber( this, ScResId(CB_DETECT_SPECIAL_NUMBER) ),
aFlWidth ( this, ScResId( FL_WIDTH ) ),
- aFtType ( this, ScResId( FT_TYPE ) ),
- aLbType ( this, ScResId( LB_TYPE1 ) ),
+ aFtType ( this, ScResId( FT_TYPE ) ),
+ aLbType ( this, ScResId( LB_TYPE1 ) ),
maTableBox ( this, ScResId( CTR_TABLEBOX ) ),
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
+ aBtnOk ( this, ScResId( BTN_OK ) ),
+ aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
+ aBtnHelp ( this, ScResId( BTN_HELP ) ),
aCharSetUser( ScResId( SCSTR_CHARSET_USER ) ),
- aColumnUser ( ScResId( SCSTR_COLUMN_USER ) ),
- aFldSepList ( ScResId( SCSTR_FIELDSEP ) ),
+ aColumnUser ( ScResId( SCSTR_COLUMN_USER ) ),
+ aFldSepList ( ScResId( SCSTR_FIELDSEP ) ),
aTextSepList( ScResId( SCSTR_TEXTSEP ) ),
mcTextSep ( ScAsciiOptions::cDefaultTextSep ),
maStrTextToColumns( ScResId( STR_TEXTTOCOLUMNS ) ),
@@ -285,7 +285,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
sal_Int32 nLanguage = 0;
if (mbFileImport)
// load separators only when importing csv files.
- load_Separators (sFieldSeparators, sTextSeparators, bMergeDelimiters,
+ load_Separators (sFieldSeparators, sTextSeparators, bMergeDelimiters,
bQuotedFieldAsText, bDetectSpecialNum, bFixedWidth, nFromRow, nCharSet, nLanguage);
maFieldSeparators = String(sFieldSeparators);
@@ -316,7 +316,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
aEdOther.SetText( aEdOther.GetText() + OUString( aSep[i] ) );
}
}
-
+
// Get Separators from the dialog
maFieldSeparators = GetSeparators();
@@ -329,7 +329,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
mpDatStream->StartReadingUnicodeText();
ULONG nUniPos = mpDatStream->Tell();
if ( nUniPos > 0 )
- bPreselectUnicode = TRUE; // read 0xfeff/0xfffe
+ bPreselectUnicode = TRUE; // read 0xfeff/0xfffe
else
{
UINT16 n;
@@ -483,10 +483,10 @@ bool ScImportAsciiDlg::GetLine( ULONG nLine, String &rText )
mnStreamPos = mpDatStream->Tell();
}
- // #107455# If the file content isn't unicode, ReadUniStringLine
- // may try to seek beyond the file's end and cause a CANTSEEK error
- // (depending on the stream type). The error code has to be cleared,
- // or further read operations (including non-unicode) will fail.
+ // #107455# If the file content isn't unicode, ReadUniStringLine
+ // may try to seek beyond the file's end and cause a CANTSEEK error
+ // (depending on the stream type). The error code has to be cleared,
+ // or further read operations (including non-unicode) will fail.
if ( mpDatStream->GetError() == ERRCODE_IO_CANTSEEK )
mpDatStream->ResetError();
@@ -539,10 +539,10 @@ void ScImportAsciiDlg::SaveParameters()
// We save parameters only for file import.
return;
- save_Separators( maFieldSeparators, aCbTextSep.GetText(), aCkbAsOnce.IsChecked(),
- aCkbQuotedAsText.IsChecked(), aCkbDetectNumber.IsChecked(),
- aRbFixed.IsChecked(),
- static_cast<sal_Int32>(aNfRow.GetValue()),
+ save_Separators( maFieldSeparators, aCbTextSep.GetText(), aCkbAsOnce.IsChecked(),
+ aCkbQuotedAsText.IsChecked(), aCkbDetectNumber.IsChecked(),
+ aRbFixed.IsChecked(),
+ static_cast<sal_Int32>(aNfRow.GetValue()),
static_cast<sal_Int32>(aLbCharSet.GetSelectEntryPos()),
static_cast<sal_Int32>(aLbCustomLang.GetSelectLanguage()) );
}
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 5440f515c86a..3edb76f0bec6 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 ScDelimiterTable
{
public:
ScDelimiterTable( const String& rDelTab )
- : theDelTab ( rDelTab ),
- cSep ( '\t' ),
- nCount ( rDelTab.GetTokenCount('\t') ),
- nIter ( 0 )
+ : theDelTab ( rDelTab ),
+ cSep ( '\t' ),
+ nCount ( rDelTab.GetTokenCount('\t') ),
+ nIter ( 0 )
{}
- USHORT GetCode( const String& rDelimiter ) const;
- String GetDelimiter( sal_Unicode nCode ) const;
+ USHORT GetCode( const String& rDelimiter ) const;
+ String GetDelimiter( sal_Unicode nCode ) const;
- String FirstDel() { nIter = 0; return theDelTab.GetToken( nIter, cSep ); }
- String NextDel() { nIter +=2; return theDelTab.GetToken( nIter, cSep ); }
+ String FirstDel() { nIter = 0; return theDelTab.GetToken( nIter, cSep ); }
+ String NextDel() { nIter +=2; return theDelTab.GetToken( nIter, cSep ); }
private:
- const String theDelTab;
- const sal_Unicode cSep;
- const xub_StrLen nCount;
- xub_StrLen nIter;
+ const String theDelTab;
+ const sal_Unicode cSep;
+ const xub_StrLen nCount;
+ xub_StrLen nIter;
};
//------------------------------------------------------------------------
@@ -124,18 +124,18 @@ ScImportOptionsDlg::ScImportOptionsDlg(
BOOL bOnlyDbtoolsEncodings,
BOOL bImport )
- : ModalDialog ( pParent, ScResId( RID_SCDLG_IMPORTOPT ) ),
+ : ModalDialog ( pParent, ScResId( RID_SCDLG_IMPORTOPT ) ),
aFlFieldOpt ( this, ScResId( FL_FIELDOPT ) ),
- aFtFont ( this, ScResId( FT_FONT ) ),
+ aFtFont ( this, ScResId( FT_FONT ) ),
aLbFont ( this, ScResId( bAscii ? DDLB_FONT : LB_FONT ) ),
- aFtFieldSep ( this, ScResId( FT_FIELDSEP ) ),
- aEdFieldSep ( this, ScResId( ED_FIELDSEP ) ),
- aFtTextSep ( this, ScResId( FT_TEXTSEP ) ),
- aEdTextSep ( this, ScResId( ED_TEXTSEP ) ),
+ aFtFieldSep ( this, ScResId( FT_FIELDSEP ) ),
+ aEdFieldSep ( this, ScResId( ED_FIELDSEP ) ),
+ aFtTextSep ( this, ScResId( FT_TEXTSEP ) ),
+ aEdTextSep ( this, ScResId( ED_TEXTSEP ) ),
aCbFixed ( this, ScResId( CB_FIXEDWIDTH ) ),
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
+ aBtnOk ( this, ScResId( BTN_OK ) ),
+ aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
+ aBtnHelp ( this, ScResId( BTN_HELP ) ),
aCbShown ( this, ScResId( CB_SAVESHOWN ) )
{
// im Ctor-Initializer nicht moeglich (MSC kann das nicht):
@@ -277,7 +277,7 @@ USHORT ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const
if ( !aStr.Len() )
{
- nCode = 0; // kein Trennzeichen
+ nCode = 0; // kein Trennzeichen
}
else
{
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index f70fbb094c92..34949ae5171f 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,19 +61,19 @@
//============================================================================
-// class ScSpecialFilterDialog
+// class ScSpecialFilterDialog
//----------------------------------------------------------------------------
ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
- const SfxItemSet& rArgSet )
+ const SfxItemSet& rArgSet )
- : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SPEC_FILTER ),
+ : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SPEC_FILTER ),
//
- aLbFilterArea ( this, ScResId( LB_CRITERIA_AREA ) ),
- aFtFilterArea ( this, ScResId( FT_CRITERIA_AREA ) ),
+ aLbFilterArea ( this, ScResId( LB_CRITERIA_AREA ) ),
+ aFtFilterArea ( this, ScResId( FT_CRITERIA_AREA ) ),
aEdFilterArea ( this, this, ScResId( ED_CRITERIA_AREA ) ),
- aRbFilterArea ( this, ScResId( RB_CRITERIA_AREA ), &aEdFilterArea, this ),
+ aRbFilterArea ( this, ScResId( RB_CRITERIA_AREA ), &aEdFilterArea, this ),
//
aFlOptions ( this, ScResId( FL_OPTIONS ) ),
_INIT_COMMON_FILTER_RSCOBJS
@@ -82,16 +82,16 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi
aBtnHelp ( this, ScResId( BTN_HELP ) ),
aBtnMore ( this, ScResId( BTN_MORE ) ),
//
- pOptionsMgr ( NULL ),
- nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ),
- theQueryData ( ((const ScQueryItem&)
+ pOptionsMgr ( NULL ),
+ nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ),
+ theQueryData ( ((const ScQueryItem&)
rArgSet.Get( nWhichQuery )).GetQueryData() ),
- pOutItem ( NULL ),
- pViewData ( NULL ),
- pDoc ( NULL ),
- pRefInputEdit ( NULL ),
- bRefInputMode ( FALSE ),
- pTimer ( NULL )
+ pOutItem ( NULL ),
+ pViewData ( NULL ),
+ pDoc ( NULL ),
+ pRefInputEdit ( NULL ),
+ bRefInputMode ( FALSE ),
+ pTimer ( NULL )
{
Init( rArgSet );
aEdFilterArea.GrabFocus();
@@ -134,22 +134,22 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet )
const ScQueryItem& rQueryItem = (const ScQueryItem&)
rArgSet.Get( nWhichQuery );
- aBtnOk.SetClickHdl ( LINK( this, ScSpecialFilterDlg, EndDlgHdl ) );
- aBtnCancel.SetClickHdl ( LINK( this, ScSpecialFilterDlg, EndDlgHdl ) );
- aLbFilterArea.SetSelectHdl ( LINK( this, ScSpecialFilterDlg, FilterAreaSelHdl ) );
- aEdFilterArea.SetModifyHdl ( LINK( this, ScSpecialFilterDlg, FilterAreaModHdl ) );
+ aBtnOk.SetClickHdl ( LINK( this, ScSpecialFilterDlg, EndDlgHdl ) );
+ aBtnCancel.SetClickHdl ( LINK( this, ScSpecialFilterDlg, EndDlgHdl ) );
+ aLbFilterArea.SetSelectHdl ( LINK( this, ScSpecialFilterDlg, FilterAreaSelHdl ) );
+ aEdFilterArea.SetModifyHdl ( LINK( this, ScSpecialFilterDlg, FilterAreaModHdl ) );
- pViewData = rQueryItem.GetViewData();
- pDoc = pViewData ? pViewData->GetDocument() : NULL;
+ pViewData = rQueryItem.GetViewData();
+ pDoc = pViewData ? pViewData->GetDocument() : NULL;
- aEdFilterArea.SetText( EMPTY_STRING ); // may be overwritten below
+ aEdFilterArea.SetText( EMPTY_STRING ); // may be overwritten below
if ( pViewData && pDoc )
{
if(pDoc->GetChangeTrack()!=NULL) aBtnCopyResult.Disable();
- ScRangeName* pRangeNames = pDoc->GetRangeName();
- const USHORT nCount = pRangeNames ? pRangeNames->GetCount() : 0;
+ ScRangeName* pRangeNames = pDoc->GetRangeName();
+ const USHORT nCount = pRangeNames ? pRangeNames->GetCount() : 0;
/*
* Aus den RangeNames des Dokumentes werden nun die
@@ -161,9 +161,9 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet )
if ( nCount > 0 )
{
- String aString;
+ String aString;
ScRangeData* pData = NULL;
- USHORT nInsert = 0;
+ USHORT nInsert = 0;
for ( USHORT i=0; i<nCount; i++ )
{
@@ -182,7 +182,7 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet )
}
}
- // is there a stored source range?
+ // is there a stored source range?
ScRange aAdvSource;
if (rQueryItem.GetAdvancedQuerySource(aAdvSource))
@@ -197,7 +197,7 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet )
// Optionen initialisieren lassen:
- pOptionsMgr = new ScFilterOptionsMgr(
+ pOptionsMgr = new ScFilterOptionsMgr(
this,
pViewData,
theQueryData,
@@ -217,14 +217,14 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet )
aStrNoName,
aStrUndefined );
- // #35206# Spezialfilter braucht immer Spaltenkoepfe
+ // #35206# Spezialfilter braucht immer Spaltenkoepfe
aBtnHeader.Check(TRUE);
aBtnHeader.Disable();
// Modal-Modus einschalten
-// SetDispatcherLock( TRUE );
+// SetDispatcherLock( TRUE );
//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
- //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
+ //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
}
@@ -245,7 +245,7 @@ BOOL __EXPORT ScSpecialFilterDlg::Close()
void ScSpecialFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
{
- if ( bRefInputMode && pRefInputEdit ) // Nur moeglich, wenn im Referenz-Editmodus
+ if ( bRefInputMode && pRefInputEdit ) // Nur moeglich, wenn im Referenz-Editmodus
{
if ( rRef.aStart != rRef.aEnd )
RefInputStart( pRefInputEdit );
@@ -319,13 +319,13 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
if ( (pBtn == &aBtnOk) && pDoc && pViewData )
{
- String theCopyStr( aEdCopyArea.GetText() );
- String theAreaStr( aEdFilterArea.GetText() );
- ScQueryParam theOutParam( theQueryData );
- ScAddress theAdrCopy;
- BOOL bEditInputOk = TRUE;
- BOOL bQueryOk = FALSE;
- ScRange theFilterArea;
+ String theCopyStr( aEdCopyArea.GetText() );
+ String theAreaStr( aEdFilterArea.GetText() );
+ ScQueryParam theOutParam( theQueryData );
+ ScAddress theAdrCopy;
+ BOOL bEditInputOk = TRUE;
+ BOOL bQueryOk = FALSE;
+ ScRange theFilterArea;
const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
if ( aBtnCopyResult.IsChecked() )
@@ -368,7 +368,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
* ein ScQueryParam zu erzeugen:
*/
- USHORT nResult = theFilterArea.Parse( theAreaStr, pDoc, eConv );
+ USHORT nResult = theFilterArea.Parse( theAreaStr, pDoc, eConv );
if ( SCA_VALID == (nResult & SCA_VALID) )
{
@@ -377,23 +377,23 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
if ( aBtnCopyResult.IsChecked() )
{
- theOutParam.bInplace = FALSE;
- theOutParam.nDestTab = theAdrCopy.Tab();
- theOutParam.nDestCol = theAdrCopy.Col();
- theOutParam.nDestRow = theAdrCopy.Row();
+ theOutParam.bInplace = FALSE;
+ theOutParam.nDestTab = theAdrCopy.Tab();
+ theOutParam.nDestCol = theAdrCopy.Col();
+ theOutParam.nDestRow = theAdrCopy.Row();
}
else
{
- theOutParam.bInplace = TRUE;
- theOutParam.nDestTab = 0;
- theOutParam.nDestCol = 0;
- theOutParam.nDestRow = 0;
+ theOutParam.bInplace = TRUE;
+ theOutParam.nDestTab = 0;
+ theOutParam.nDestCol = 0;
+ theOutParam.nDestRow = 0;
}
theOutParam.bHasHeader = aBtnHeader.IsChecked();
- theOutParam.bByRow = TRUE;
+ theOutParam.bByRow = TRUE;
theOutParam.bCaseSens = aBtnCase.IsChecked();
- theOutParam.bRegExp = aBtnRegExp.IsChecked();
+ theOutParam.bRegExp = aBtnRegExp.IsChecked();
theOutParam.bDuplicate = !aBtnUnique.IsChecked();
theOutParam.bDestPers = aBtnDestPers.IsChecked();
@@ -405,14 +405,14 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
rStart.Tab(),
theOutParam );
- // an der DB-Collection koennen nur MAXQUERY Filter-Eintraege
- // gespeichert werden
+ // an der DB-Collection koennen nur MAXQUERY Filter-Eintraege
+ // gespeichert werden
if ( bQueryOk && theOutParam.GetEntryCount() > MAXQUERY &&
theOutParam.GetEntry(MAXQUERY).bDoQuery )
{
- bQueryOk = FALSE; // zu viele
- //! andere Fehlermeldung ??
+ bQueryOk = FALSE; // zu viele
+ //! andere Fehlermeldung ??
}
}
}
@@ -436,7 +436,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
{
Close();
}
- return 0;
+ return 0;
}
@@ -477,8 +477,8 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb )
{
if ( pLb == &aLbFilterArea )
{
- String aString;
- USHORT nSelPos = aLbFilterArea.GetSelectEntryPos();
+ String aString;
+ USHORT nSelPos = aLbFilterArea.GetSelectEntryPos();
if ( nSelPos > 0 )
aString = *(String*)aLbFilterArea.GetEntryData( nSelPos );
@@ -498,15 +498,15 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, formula::RefEdit*, pEd )
{
if ( pDoc && pViewData )
{
- String theCurAreaStr = pEd->GetText();
- USHORT nResult = ScRange().Parse( theCurAreaStr, pDoc );
+ String theCurAreaStr = pEd->GetText();
+ USHORT nResult = ScRange().Parse( theCurAreaStr, pDoc );
if ( SCA_VALID == (nResult & SCA_VALID) )
{
- String* pStr = NULL;
- BOOL bFound = FALSE;
- USHORT i = 0;
- USHORT nCount = aLbFilterArea.GetEntryCount();
+ String* pStr = NULL;
+ BOOL bFound = FALSE;
+ USHORT i = 0;
+ USHORT nCount = aLbFilterArea.GetEntryCount();
for ( i=1; i<nCount && !bFound; i++ )
{
diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index f2a733af3aa8..93ad457372ad 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,24 +41,24 @@
#include <layout/layout-pre.hxx>
#endif
-ScSortDlg::ScSortDlg( Window* pParent,
+ScSortDlg::ScSortDlg( Window* pParent,
const SfxItemSet* pArgSet ) :
SfxTabDialog( pParent,
ScResId( RID_SCDLG_SORT ),
pArgSet ),
- bIsHeaders ( FALSE ),
- bIsByRows ( FALSE )
+ bIsHeaders ( FALSE ),
+ bIsByRows ( FALSE )
{
#if LAYOUT_SFX_TABDIALOG_BROKEN
- AddTabPage( TP_FIELDS, ScTabPageSortFields::Create, 0 );
- AddTabPage( TP_OPTIONS, ScTabPageSortOptions::Create, 0 );
+ AddTabPage( TP_FIELDS, ScTabPageSortFields::Create, 0 );
+ AddTabPage( TP_OPTIONS, ScTabPageSortOptions::Create, 0 );
#else
String fields = rtl::OUString::createFromAscii ("fields");
AddTabPage( TP_FIELDS, fields, ScTabPageSortFields::Create, 0, FALSE, TAB_APPEND);
String options = rtl::OUString::createFromAscii ("options");
- AddTabPage( TP_OPTIONS, options, ScTabPageSortOptions::Create, 0, FALSE, TAB_APPEND);
-#endif
+ AddTabPage( TP_OPTIONS, options, ScTabPageSortOptions::Create, 0, FALSE, TAB_APPEND);
+#endif
FreeResource();
}
@@ -67,7 +67,7 @@ __EXPORT ScSortDlg::~ScSortDlg()
}
//==================================================================
-ScSortWarningDlg::ScSortWarningDlg( Window* pParent,
+ScSortWarningDlg::ScSortWarningDlg( Window* pParent,
const String& rExtendText,
const String& rCurrentText ):
ModalDialog ( pParent, ScResId( RID_SCDLG_SORT_WARNING ) ),
@@ -82,7 +82,7 @@ ScSortWarningDlg::ScSortWarningDlg( Window* pParent,
sTextName.SearchAndReplaceAscii("%2", rCurrentText);
aFtText.SetText( sTextName );
- aBtnExtSort .SetClickHdl( LINK( this, ScSortWarningDlg, BtnHdl ) );
+ aBtnExtSort .SetClickHdl( LINK( this, ScSortWarningDlg, BtnHdl ) );
aBtnCurSort .SetClickHdl( LINK( this, ScSortWarningDlg, BtnHdl ) );
FreeResource();
diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx
index 2c9cba31cd13..b2b36ac31237 100644
--- a/sc/source/ui/dbgui/subtdlg.cxx
+++ b/sc/source/ui/dbgui/subtdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
//==================================================================
-ScSubTotalDlg::ScSubTotalDlg( Window* pParent,
- const SfxItemSet* pArgSet ) :
+ScSubTotalDlg::ScSubTotalDlg( Window* pParent,
+ const SfxItemSet* pArgSet ) :
SfxTabDialog( pParent,
ScResId( RID_SCDLG_SUBTOTALS ),
pArgSet ),
- aBtnRemove ( this, ScResId( BTN_REMOVE ) )
+ aBtnRemove ( this, ScResId( BTN_REMOVE ) )
{
AddTabPage( PAGE_GROUP1, ScTpSubTotalGroup1::Create, 0 );
AddTabPage( PAGE_GROUP2, ScTpSubTotalGroup2::Create, 0 );
diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx
index be918d2a0fbd..ac132ced0747 100644
--- a/sc/source/ui/dbgui/textimportoptions.cxx
+++ b/sc/source/ui/dbgui/textimportoptions.cxx
@@ -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
@@ -50,7 +50,7 @@ ScTextImportOptionsDlg::ScTextImportOptionsDlg(Window* pParent) :
maBtnCancel(this, ScResId(BTN_CANCEL)),
maBtnHelp(this, ScResId(BTN_HELP)),
maFlChooseLang(this, ScResId(FL_CHOOSE_LANG)),
- maRbAutomatic(this, ScResId(RB_AUTOMATIC)),
+ maRbAutomatic(this, ScResId(RB_AUTOMATIC)),
maRbCustom(this, ScResId(RB_CUSTOM)),
maLbCustomLang(this, ScResId(LB_CUSTOM_LANG)),
maFlOption(this, ScResId(FL_OPTION)),
diff --git a/sc/source/ui/dbgui/textimportoptions.src b/sc/source/ui/dbgui/textimportoptions.src
index 69e2d69b3142..eacd8f008a46 100644
--- a/sc/source/ui/dbgui/textimportoptions.src
+++ b/sc/source/ui/dbgui/textimportoptions.src
@@ -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
@@ -62,7 +62,7 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS
Pos = MAP_APPFONT( 6, 3 ) ;
Size = MAP_APPFONT( 165, 14 ) ;
- Text [ en-US ] = "Select the language to use for import" ;
+ Text [ en-US ] = "Select the language to use for import" ;
};
RadioButton RB_AUTOMATIC
@@ -71,7 +71,7 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS
Size = MAP_APPFONT( 159, 10 ) ;
TabStop = TRUE ;
- Text [ en-US ] = "Automatic" ;
+ Text [ en-US ] = "Automatic" ;
};
RadioButton RB_CUSTOM
@@ -80,7 +80,7 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS
Size = MAP_APPFONT( 159, 10 ) ;
TabStop = TRUE ;
- Text [ en-US ] = "Custom" ;
+ Text [ en-US ] = "Custom" ;
};
ListBox LB_CUSTOM_LANG
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 18c1eb25664a..0a222c545a1b 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ static USHORT pSortRanges[] =
*
* virtual BOOL HasExchangeSupport() const; -> return TRUE;
* virtual void ActivatePage(const SfxItemSet &);
- * virtual int DeactivatePage(SfxItemSet * = 0);
+ * virtual int DeactivatePage(SfxItemSet * = 0);
*
* muss noch geaendert werden!
*/
@@ -94,41 +94,41 @@ static USHORT pSortRanges[] =
//========================================================================
// Sortierkriterien-Tabpage:
-ScTabPageSortFields::ScTabPageSortFields( Window* pParent,
+ScTabPageSortFields::ScTabPageSortFields( Window* pParent,
const SfxItemSet& rArgSet )
- : SfxTabPage ( pParent,
+ : SfxTabPage ( pParent,
ScResId( RID_SCPAGE_SORT_FIELDS ),
rArgSet ),
//
aFlSort1 ( this, ScResId( FL_SORT1 ) ),
- aLbSort1 ( this, ScResId( LB_SORT1 ) ),
+ aLbSort1 ( this, ScResId( LB_SORT1 ) ),
aBtnUp1 ( this, ScResId( BTN_UP1 ) ),
- aBtnDown1 ( this, ScResId( BTN_DOWN1 ) ),
+ aBtnDown1 ( this, ScResId( BTN_DOWN1 ) ),
//
aFlSort2 ( this, ScResId( FL_SORT2 ) ),
- aLbSort2 ( this, ScResId( LB_SORT2 ) ),
+ aLbSort2 ( this, ScResId( LB_SORT2 ) ),
aBtnUp2 ( this, ScResId( BTN_UP2 ) ),
- aBtnDown2 ( this, ScResId( BTN_DOWN2 ) ),
+ aBtnDown2 ( this, ScResId( BTN_DOWN2 ) ),
//
aFlSort3 ( this, ScResId( FL_SORT3 ) ),
- aLbSort3 ( this, ScResId( LB_SORT3 ) ),
+ aLbSort3 ( this, ScResId( LB_SORT3 ) ),
aBtnUp3 ( this, ScResId( BTN_UP3 ) ),
- aBtnDown3 ( this, ScResId( BTN_DOWN3 ) ),
+ aBtnDown3 ( this, ScResId( BTN_DOWN3 ) ),
- aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
- aStrColumn ( ScResId( SCSTR_COLUMN ) ),
- aStrRow ( ScResId( SCSTR_ROW ) ),
+ aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
+ aStrColumn ( ScResId( SCSTR_COLUMN ) ),
+ aStrRow ( ScResId( SCSTR_ROW ) ),
//
- nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ),
- pDlg ( (ScSortDlg*)(GetParent()->GetParent()) ),
- pViewData ( NULL ),
- rSortData ( ((const ScSortItem&)
+ nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ),
+ pDlg ( (ScSortDlg*)(GetParent()->GetParent()) ),
+ pViewData ( NULL ),
+ rSortData ( ((const ScSortItem&)
rArgSet.Get( nWhichSort )).
GetSortData() ),
- nFieldCount ( 0 ),
- bHasHeader ( FALSE ),
- bSortByRows ( FALSE )
+ nFieldCount ( 0 ),
+ bHasHeader ( FALSE ),
+ bSortByRows ( FALSE )
{
Init();
FreeResource();
@@ -163,15 +163,15 @@ void ScTabPageSortFields::Init()
aLbSort2.Clear();
aLbSort3.Clear();
- aSortLbArr[0] = &aLbSort1;
- aSortLbArr[1] = &aLbSort2;
- aSortLbArr[2] = &aLbSort3;
- aDirBtnArr[0][0] = &aBtnUp1;
- aDirBtnArr[0][1] = &aBtnDown1;
- aDirBtnArr[1][0] = &aBtnUp2;
- aDirBtnArr[1][1] = &aBtnDown2;
- aDirBtnArr[2][0] = &aBtnUp3;
- aDirBtnArr[2][1] = &aBtnDown3;
+ aSortLbArr[0] = &aLbSort1;
+ aSortLbArr[1] = &aLbSort2;
+ aSortLbArr[2] = &aLbSort3;
+ aDirBtnArr[0][0] = &aBtnUp1;
+ aDirBtnArr[0][1] = &aBtnDown1;
+ aDirBtnArr[1][0] = &aBtnUp2;
+ aDirBtnArr[1][1] = &aBtnDown2;
+ aDirBtnArr[2][0] = &aBtnUp3;
+ aDirBtnArr[2][1] = &aBtnDown3;
aFlArr[0] = &aFlSort1;
aFlArr[1] = &aFlSort2;
aFlArr[2] = &aFlSort3;
@@ -186,8 +186,8 @@ USHORT* __EXPORT ScTabPageSortFields::GetRanges()
// -----------------------------------------------------------------------
-SfxTabPage* __EXPORT ScTabPageSortFields::Create( Window* pParent,
- const SfxItemSet& rArgSet )
+SfxTabPage* __EXPORT ScTabPageSortFields::Create( Window* pParent,
+ const SfxItemSet& rArgSet )
{
return ( new ScTabPageSortFields( pParent, rArgSet ) );
}
@@ -197,7 +197,7 @@ SfxTabPage* __EXPORT ScTabPageSortFields::Create( Window* pParent,
void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
{
bSortByRows = rSortData.bByRow;
- bHasHeader = rSortData.bHasHeader;
+ bHasHeader = rSortData.bHasHeader;
if ( aLbSort1.GetEntryCount() == 0 )
FillFieldLists();
@@ -214,13 +214,13 @@ void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
GetFieldSelPos( rSortData.nField[i] ) );
(rSortData.bAscending[i])
- ? aDirBtnArr[i][0]->Check() // Up
- : aDirBtnArr[i][1]->Check(); // Down
+ ? aDirBtnArr[i][0]->Check() // Up
+ : aDirBtnArr[i][1]->Check(); // Down
}
else
{
aSortLbArr[i]->SelectEntryPos( 0 ); // "keiner" selektieren
- aDirBtnArr[i][0]->Check(); // Up
+ aDirBtnArr[i][0]->Check(); // Up
}
}
@@ -241,7 +241,7 @@ void __EXPORT ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
else if( nCol > rSortData.nCol2 )
nCol = rSortData.nCol2;
- USHORT nSort1Pos = nCol - rSortData.nCol1+1;
+ USHORT nSort1Pos = nCol - rSortData.nCol1+1;
aLbSort1.SelectEntryPos( nSort1Pos );
aLbSort2.SelectEntryPos( 0 );
aLbSort3.SelectEntryPos( 0 );
@@ -273,9 +273,9 @@ BOOL __EXPORT ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
theSortData = ((const ScSortItem*)pItem)->GetSortData();
}
- USHORT nSort1Pos = aLbSort1.GetSelectEntryPos();
- USHORT nSort2Pos = aLbSort2.GetSelectEntryPos();
- USHORT nSort3Pos = aLbSort3.GetSelectEntryPos();
+ USHORT nSort1Pos = aLbSort1.GetSelectEntryPos();
+ USHORT nSort2Pos = aLbSort2.GetSelectEntryPos();
+ USHORT nSort3Pos = aLbSort3.GetSelectEntryPos();
DBG_ASSERT( (nSort1Pos <= SC_MAXFIELDS)
&& (nSort2Pos <= SC_MAXFIELDS)
@@ -314,7 +314,7 @@ BOOL __EXPORT ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
theSortData.bAscending[0] = aBtnUp1.IsChecked();
theSortData.bAscending[1] = aBtnUp2.IsChecked();
theSortData.bAscending[2] = aBtnUp3.IsChecked();
- // bHasHeader ist in ScTabPageSortOptions::FillItemSet, wo es hingehoert
+ // bHasHeader ist in ScTabPageSortOptions::FillItemSet, wo es hingehoert
}
else
{
@@ -340,11 +340,11 @@ void __EXPORT ScTabPageSortFields::ActivatePage()
if ( bHasHeader != pDlg->GetHeaders()
|| bSortByRows != pDlg->GetByRows() )
{
- USHORT nCurSel1 = aLbSort1.GetSelectEntryPos();
- USHORT nCurSel2 = aLbSort2.GetSelectEntryPos();
- USHORT nCurSel3 = aLbSort3.GetSelectEntryPos();
+ USHORT nCurSel1 = aLbSort1.GetSelectEntryPos();
+ USHORT nCurSel2 = aLbSort2.GetSelectEntryPos();
+ USHORT nCurSel3 = aLbSort3.GetSelectEntryPos();
- bHasHeader = pDlg->GetHeaders();
+ bHasHeader = pDlg->GetHeaders();
bSortByRows = pDlg->GetByRows();
FillFieldLists();
aLbSort1.SelectEntryPos( nCurSel1 );
@@ -381,7 +381,7 @@ void ScTabPageSortFields::DisableField( USHORT nField )
if ( nField<=2 )
{
- aSortLbArr[nField] ->Disable();
+ aSortLbArr[nField] ->Disable();
aDirBtnArr[nField][0]->Disable();
aDirBtnArr[nField][1]->Disable();
aFlArr[nField] ->Disable();
@@ -396,7 +396,7 @@ void ScTabPageSortFields::EnableField( USHORT nField )
if ( nField<=2 )
{
- aSortLbArr[nField] ->Enable();
+ aSortLbArr[nField] ->Enable();
aDirBtnArr[nField][0]->Enable();
aDirBtnArr[nField][1]->Enable();
aFlArr[nField] ->Enable();
@@ -420,23 +420,23 @@ void ScTabPageSortFields::FillFieldLists()
aLbSort2.InsertEntry( aStrUndefined, 0 );
aLbSort3.InsertEntry( aStrUndefined, 0 );
- SCCOL nFirstSortCol = rSortData.nCol1;
- SCROW nFirstSortRow = rSortData.nRow1;
- SCTAB nTab = pViewData->GetTabNo();
- USHORT i = 1;
+ SCCOL nFirstSortCol = rSortData.nCol1;
+ SCROW nFirstSortRow = rSortData.nRow1;
+ SCTAB nTab = pViewData->GetTabNo();
+ USHORT i = 1;
if ( bSortByRows )
{
- String aFieldName;
- SCCOL nMaxCol = rSortData.nCol2;
- SCCOL col;
+ String aFieldName;
+ SCCOL nMaxCol = rSortData.nCol2;
+ SCCOL col;
for ( col=nFirstSortCol; col<=nMaxCol && i<SC_MAXFIELDS; col++ )
{
pDoc->GetString( col, nFirstSortRow, nTab, aFieldName );
if ( !bHasHeader || (aFieldName.Len() == 0) )
{
- aFieldName = aStrColumn;
+ aFieldName = aStrColumn;
aFieldName += ' ';
aFieldName += ScColToAlpha( col );
}
@@ -449,16 +449,16 @@ void ScTabPageSortFields::FillFieldLists()
}
else
{
- String aFieldName;
- SCROW nMaxRow = rSortData.nRow2;
- SCROW row;
+ String aFieldName;
+ SCROW nMaxRow = rSortData.nRow2;
+ SCROW row;
for ( row=nFirstSortRow; row<=nMaxRow && i<SC_MAXFIELDS; row++ )
{
pDoc->GetString( nFirstSortCol, row, nTab, aFieldName );
if ( !bHasHeader || (aFieldName.Len() == 0) )
{
- aFieldName = aStrRow;
+ aFieldName = aStrRow;
aFieldName += ' ';
aFieldName += String::CreateFromInt32( row+1 );
}
@@ -478,8 +478,8 @@ void ScTabPageSortFields::FillFieldLists()
USHORT ScTabPageSortFields::GetFieldSelPos( SCCOLROW nField )
{
- USHORT nFieldPos = 0;
- BOOL bFound = FALSE;
+ USHORT nFieldPos = 0;
+ BOOL bFound = FALSE;
for ( USHORT n=1; n<nFieldCount && !bFound; n++ )
{
@@ -553,49 +553,49 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb )
#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
-ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent,
- const SfxItemSet& rArgSet )
+ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent,
+ const SfxItemSet& rArgSet )
- : SfxTabPage ( pParent,
+ : SfxTabPage ( pParent,
ScResId( RID_SCPAGE_SORT_OPTIONS ),
rArgSet ),
//
- aBtnCase ( this, ScResId( BTN_CASESENSITIVE ) ),
- aBtnHeader ( this, ScResId( BTN_LABEL ) ),
- aBtnFormats ( this, ScResId( BTN_FORMATS ) ),
- aBtnCopyResult ( this, ScResId( BTN_COPYRESULT ) ),
- aLbOutPos ( this, ScResId( LB_OUTAREA ) ),
- aEdOutPos ( this, ScResId( ED_OUTAREA ) ),
- aBtnSortUser ( this, ScResId( BTN_SORT_USER ) ),
- aLbSortUser ( this, ScResId( LB_SORT_USER ) ),
+ aBtnCase ( this, ScResId( BTN_CASESENSITIVE ) ),
+ aBtnHeader ( this, ScResId( BTN_LABEL ) ),
+ aBtnFormats ( this, ScResId( BTN_FORMATS ) ),
+ aBtnCopyResult ( this, ScResId( BTN_COPYRESULT ) ),
+ aLbOutPos ( this, ScResId( LB_OUTAREA ) ),
+ aEdOutPos ( this, ScResId( ED_OUTAREA ) ),
+ aBtnSortUser ( this, ScResId( BTN_SORT_USER ) ),
+ aLbSortUser ( this, ScResId( LB_SORT_USER ) ),
aFtLanguage ( this, ScResId( FT_LANGUAGE ) ),
- aLbLanguage ( this, ScResId( LB_LANGUAGE ) ),
+ aLbLanguage ( this, ScResId( LB_LANGUAGE ) ),
aFtAlgorithm ( this, ScResId( FT_ALGORITHM ) ),
- aLbAlgorithm ( this, ScResId( LB_ALGORITHM ) ),
- aLineDirection ( this, ScResId( FL_DIRECTION ) ),
- aBtnTopDown ( this, ScResId( BTN_TOP_DOWN ) ),
- aBtnLeftRight ( this, ScResId( BTN_LEFT_RIGHT ) ),
- aFtAreaLabel ( this, ScResId( FT_AREA_LABEL ) ),
-// aFtArea ( this, ScResId( FT_AREA ) ),
+ aLbAlgorithm ( this, ScResId( LB_ALGORITHM ) ),
+ aLineDirection ( this, ScResId( FL_DIRECTION ) ),
+ aBtnTopDown ( this, ScResId( BTN_TOP_DOWN ) ),
+ aBtnLeftRight ( this, ScResId( BTN_LEFT_RIGHT ) ),
+ aFtAreaLabel ( this, ScResId( FT_AREA_LABEL ) ),
+// aFtArea ( this, ScResId( FT_AREA ) ),
//
#if ENABLE_LAYOUT_EXPERIMENTAL
#undef this
#undef ScResId
#define ScResId(x) this, #x
#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
- aStrRowLabel ( ScResId( STR_ROW_LABEL ) ),
- aStrColLabel ( ScResId( STR_COL_LABEL ) ),
- aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
- aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ),
+ aStrRowLabel ( ScResId( STR_ROW_LABEL ) ),
+ aStrColLabel ( ScResId( STR_COL_LABEL ) ),
+ aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
+ aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ),
//
- nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ),
- rSortData ( ((const ScSortItem&)
+ nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ),
+ rSortData ( ((const ScSortItem&)
rArgSet.Get( nWhichSort )).GetSortData() ),
- pViewData ( NULL ),
- pDoc ( NULL ),
- pDlg ( (ScSortDlg*)(GetParent() ? GetParent()->GetParent() : 0 ) ),
- pColRes ( NULL ),
- pColWrap ( NULL )
+ pViewData ( NULL ),
+ pDoc ( NULL ),
+ pDlg ( (ScSortDlg*)(GetParent() ? GetParent()->GetParent() : 0 ) ),
+ pColRes ( NULL ),
+ pColWrap ( NULL )
{
Init();
FreeResource();
@@ -612,7 +612,7 @@ __EXPORT ScTabPageSortOptions::~ScTabPageSortOptions()
delete (String*)aLbOutPos.GetEntryData( i );
delete pColRes;
- delete pColWrap; //! not if from document
+ delete pColWrap; //! not if from document
}
// -----------------------------------------------------------------------
@@ -622,34 +622,34 @@ void ScTabPageSortOptions::Init()
aStrAreaLabel = aFtAreaLabel.GetText();
aStrAreaLabel.Append( (sal_Unicode) ' ' );
- // CollatorRessource has user-visible names for sort algorithms
+ // CollatorRessource has user-visible names for sort algorithms
pColRes = new CollatorRessource();
- //! use CollatorWrapper from document?
+ //! use CollatorWrapper from document?
pColWrap = new CollatorWrapper( comphelper::getProcessServiceFactory() );
- const ScSortItem& rSortItem = (const ScSortItem&)
+ const ScSortItem& rSortItem = (const ScSortItem&)
GetItemSet().Get( nWhichSort );
- aLbOutPos.SetSelectHdl ( LINK( this, ScTabPageSortOptions, SelOutPosHdl ) );
+ aLbOutPos.SetSelectHdl ( LINK( this, ScTabPageSortOptions, SelOutPosHdl ) );
aBtnCopyResult.SetClickHdl( LINK( this, ScTabPageSortOptions, EnableHdl ) );
aBtnSortUser.SetClickHdl ( LINK( this, ScTabPageSortOptions, EnableHdl ) );
- aBtnTopDown.SetClickHdl ( LINK( this, ScTabPageSortOptions, SortDirHdl ) );
+ aBtnTopDown.SetClickHdl ( LINK( this, ScTabPageSortOptions, SortDirHdl ) );
aBtnLeftRight.SetClickHdl ( LINK( this, ScTabPageSortOptions, SortDirHdl ) );
aLbLanguage.SetSelectHdl ( LINK( this, ScTabPageSortOptions, FillAlgorHdl ) );
pViewData = rSortItem.GetViewData();
- pDoc = pViewData ? pViewData->GetDocument() : NULL;
+ pDoc = pViewData ? pViewData->GetDocument() : NULL;
DBG_ASSERT( pViewData, "ViewData not found! :-/" );
if ( pViewData && pDoc )
{
- String theArea;
- ScDBCollection* pDBColl = pDoc->GetDBCollection();
- String theDbArea;
- String theDbName = aStrNoName;
- const SCTAB nCurTab = pViewData->GetTabNo();
+ String theArea;
+ ScDBCollection* pDBColl = pDoc->GetDBCollection();
+ String theDbArea;
+ String theDbName = aStrNoName;
+ const SCTAB nCurTab = pViewData->GetTabNo();
const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
aLbOutPos.Clear();
@@ -707,7 +707,7 @@ void ScTabPageSortOptions::Init()
FillUserSortListBox();
- // get available languages
+ // get available languages
aLbLanguage.SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, FALSE );
aLbLanguage.InsertLanguage( LANGUAGE_SYSTEM );
@@ -726,8 +726,8 @@ USHORT* __EXPORT ScTabPageSortOptions::GetRanges()
#undef SfxTabPage
#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
SfxTabPage* __EXPORT ScTabPageSortOptions::Create(
- Window* pParent,
- const SfxItemSet& rArgSet )
+ Window* pParent,
+ const SfxItemSet& rArgSet )
{
return ( new ScTabPageSortOptions( pParent, rArgSet ) );
}
@@ -749,9 +749,9 @@ void __EXPORT ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
aLbSortUser.SelectEntryPos( 0 );
}
- aBtnCase.Check ( rSortData.bCaseSens );
- aBtnFormats.Check ( rSortData.bIncludePattern );
- aBtnHeader.Check ( rSortData.bHasHeader );
+ aBtnCase.Check ( rSortData.bCaseSens );
+ aBtnFormats.Check ( rSortData.bIncludePattern );
+ aBtnHeader.Check ( rSortData.bHasHeader );
if ( rSortData.bByRow )
{
@@ -768,7 +768,7 @@ void __EXPORT ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
if ( eLang == LANGUAGE_DONTKNOW )
eLang = LANGUAGE_SYSTEM;
aLbLanguage.SelectLanguage( eLang );
- FillAlgorHdl( &aLbLanguage ); // get algorithms, select default
+ FillAlgorHdl( &aLbLanguage ); // get algorithms, select default
if ( rSortData.aCollatorAlgorithm.Len() )
aLbAlgorithm.SelectEntry( pColRes->GetTranslation( rSortData.aCollatorAlgorithm ) );
@@ -814,16 +814,16 @@ BOOL __EXPORT ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
theSortData = ((const ScSortItem*)pItem)->GetSortData();
}
- theSortData.bByRow = aBtnTopDown.IsChecked();
- theSortData.bHasHeader = aBtnHeader.IsChecked();
- theSortData.bCaseSens = aBtnCase.IsChecked();
+ theSortData.bByRow = aBtnTopDown.IsChecked();
+ theSortData.bHasHeader = aBtnHeader.IsChecked();
+ theSortData.bCaseSens = aBtnCase.IsChecked();
theSortData.bIncludePattern = aBtnFormats.IsChecked();
- theSortData.bInplace = !aBtnCopyResult.IsChecked();
- theSortData.nDestCol = theOutPos.Col();
- theSortData.nDestRow = theOutPos.Row();
- theSortData.nDestTab = theOutPos.Tab();
- theSortData.bUserDef = aBtnSortUser.IsChecked();
- theSortData.nUserIndex = (aBtnSortUser.IsChecked())
+ theSortData.bInplace = !aBtnCopyResult.IsChecked();
+ theSortData.nDestCol = theOutPos.Col();
+ theSortData.nDestRow = theOutPos.Row();
+ theSortData.nDestTab = theOutPos.Tab();
+ theSortData.bUserDef = aBtnSortUser.IsChecked();
+ theSortData.nUserIndex = (aBtnSortUser.IsChecked())
? aLbSortUser.GetSelectEntryPos()
: 0;
@@ -881,17 +881,17 @@ int __EXPORT ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP )
if ( aBtnCopyResult.IsChecked() )
{
- String thePosStr = aEdOutPos.GetText();
- ScAddress thePos;
- xub_StrLen nColonPos = thePosStr.Search( ':' );
+ String thePosStr = aEdOutPos.GetText();
+ ScAddress thePos;
+ xub_StrLen nColonPos = thePosStr.Search( ':' );
if ( STRING_NOTFOUND != nColonPos )
thePosStr.Erase( nColonPos );
if ( pViewData )
{
- // visible table is default for input without table
- // must be changed to GetRefTabNo when sorting has RefInput!
+ // visible table is default for input without table
+ // must be changed to GetRefTabNo when sorting has RefInput!
thePos.SetTab( pViewData->GetTabNo() );
}
@@ -983,8 +983,8 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb )
{
if ( pLb == &aLbOutPos )
{
- String aString;
- USHORT nSelPos = aLbOutPos.GetSelectEntryPos();
+ String aString;
+ USHORT nSelPos = aLbOutPos.GetSelectEntryPos();
if ( nSelPos > 0 )
aString = *(String*)aLbOutPos.GetEntryData( nSelPos );
@@ -1015,15 +1015,15 @@ void __EXPORT ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd )
{
if ( pEd == &aEdOutPos )
{
- String theCurPosStr = aEdOutPos.GetText();
- USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
+ String theCurPosStr = aEdOutPos.GetText();
+ USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
if ( SCA_VALID == (nResult & SCA_VALID) )
{
- String* pStr = NULL;
- BOOL bFound = FALSE;
- USHORT i = 0;
- USHORT nCount = aLbOutPos.GetEntryCount();
+ String* pStr = NULL;
+ BOOL bFound = FALSE;
+ USHORT i = 0;
+ USHORT nCount = aLbOutPos.GetEntryCount();
for ( i=2; i<nCount && !bFound; i++ )
{
@@ -1049,11 +1049,11 @@ IMPL_LINK( ScTabPageSortOptions, FillAlgorHdl, void *, EMPTYARG )
LanguageType eLang = aLbLanguage.GetSelectLanguage();
if ( eLang == LANGUAGE_SYSTEM )
{
- // for LANGUAGE_SYSTEM no algorithm can be selected because
- // it wouldn't necessarily exist for other languages
- // -> leave list box empty if LANGUAGE_SYSTEM is selected
+ // for LANGUAGE_SYSTEM no algorithm can be selected because
+ // it wouldn't necessarily exist for other languages
+ // -> leave list box empty if LANGUAGE_SYSTEM is selected
aFtAlgorithm.Enable( FALSE ); // nothing to select
- aLbAlgorithm.Enable( FALSE ); // nothing to select
+ aLbAlgorithm.Enable( FALSE ); // nothing to select
}
else
{
@@ -1068,9 +1068,9 @@ IMPL_LINK( ScTabPageSortOptions, FillAlgorHdl, void *, EMPTYARG )
String sUser = pColRes->GetTranslation( sAlg );
aLbAlgorithm.InsertEntry( sUser, LISTBOX_APPEND );
}
- aLbAlgorithm.SelectEntryPos( 0 ); // first entry is default
+ aLbAlgorithm.SelectEntryPos( 0 ); // first entry is default
aFtAlgorithm.Enable( nCount > 1 ); // enable only if there is a choice
- aLbAlgorithm.Enable( nCount > 1 ); // enable only if there is a choice
+ aLbAlgorithm.Enable( nCount > 1 ); // enable only if there is a choice
}
aLbAlgorithm.SetUpdateMode( TRUE );
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index fbada165b55d..54c0d5b2bb73 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,26 +59,26 @@ static USHORT pSubTotalsRanges[] =
ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, USHORT nResId,
const SfxItemSet& rArgSet )
- : SfxTabPage ( pParent,
+ : SfxTabPage ( pParent,
ScResId( nResId ),
rArgSet ),
//
- aFtGroup ( this, ScResId( FT_GROUP ) ),
- aLbGroup ( this, ScResId( LB_GROUP ) ),
- aFtColumns ( this, ScResId( FT_COLUMNS ) ),
- aLbColumns ( this, ScResId( WND_COLUMNS ) ),
- aFtFunctions ( this, ScResId( FT_FUNCTIONS ) ),
- aLbFunctions ( this, ScResId( LB_FUNCTIONS ) ),
- aStrNone ( ScResId( SCSTR_NONE ) ),
- aStrColumn ( ScResId( SCSTR_COLUMN ) ),
+ aFtGroup ( this, ScResId( FT_GROUP ) ),
+ aLbGroup ( this, ScResId( LB_GROUP ) ),
+ aFtColumns ( this, ScResId( FT_COLUMNS ) ),
+ aLbColumns ( this, ScResId( WND_COLUMNS ) ),
+ aFtFunctions ( this, ScResId( FT_FUNCTIONS ) ),
+ aLbFunctions ( this, ScResId( LB_FUNCTIONS ) ),
+ aStrNone ( ScResId( SCSTR_NONE ) ),
+ aStrColumn ( ScResId( SCSTR_COLUMN ) ),
//
- pViewData ( NULL ),
- pDoc ( NULL ),
+ pViewData ( NULL ),
+ pDoc ( NULL ),
nWhichSubTotals ( rArgSet.GetPool()->GetWhich( SID_SUBTOTALS ) ),
- rSubTotalData ( ((const ScSubTotalItem&)
+ rSubTotalData ( ((const ScSubTotalItem&)
rArgSet.Get( nWhichSubTotals )).
GetSubTotalData() ),
- nFieldCount ( 0 )
+ nFieldCount ( 0 )
{
// Font is correctly initialized by SvTreeListBox ctor
aLbColumns.SetSelectionMode( SINGLE_SELECTION );
@@ -94,7 +94,7 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, USHORT nResId,
__EXPORT ScTpSubTotalGroup::~ScTpSubTotalGroup()
{
- USHORT nCount = (USHORT)aLbColumns.GetEntryCount();
+ USHORT nCount = (USHORT)aLbColumns.GetEntryCount();
if ( nCount > 0 )
{
@@ -117,15 +117,15 @@ void ScTpSubTotalGroup::Init()
const ScSubTotalItem& rSubTotalItem = (const ScSubTotalItem&)
GetItemSet().Get( nWhichSubTotals );
- pViewData = rSubTotalItem.GetViewData();
- pDoc = ( pViewData ) ? pViewData->GetDocument() : NULL;
+ pViewData = rSubTotalItem.GetViewData();
+ pDoc = ( pViewData ) ? pViewData->GetDocument() : NULL;
DBG_ASSERT( pViewData && pDoc, "ViewData or Document not found :-(" );
- aLbGroup.SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) );
- aLbColumns.SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) );
- aLbColumns.SetCheckButtonHdl ( LINK( this, ScTpSubTotalGroup, CheckHdl ) );
- aLbFunctions.SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) );
+ aLbGroup.SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) );
+ aLbColumns.SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) );
+ aLbColumns.SetCheckButtonHdl ( LINK( this, ScTpSubTotalGroup, CheckHdl ) );
+ aLbFunctions.SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) );
nFieldArr[0] = 0;
FillListBoxes();
@@ -140,8 +140,8 @@ USHORT* __EXPORT ScTpSubTotalGroup::GetRanges()
// -----------------------------------------------------------------------
-BOOL ScTpSubTotalGroup::DoReset( USHORT nGroupNo,
- const SfxItemSet& rArgSet )
+BOOL ScTpSubTotalGroup::DoReset( USHORT nGroupNo,
+ const SfxItemSet& rArgSet )
{
USHORT nGroupIdx = 0;
@@ -168,16 +168,16 @@ BOOL ScTpSubTotalGroup::DoReset( USHORT nGroupNo,
if ( theSubTotalData.bGroupActive[nGroupIdx] )
{
- SCCOL nField = theSubTotalData.nField[nGroupIdx];
- SCCOL nSubTotals = theSubTotalData.nSubTotals[nGroupIdx];
- SCCOL* pSubTotals = theSubTotalData.pSubTotals[nGroupIdx];
- ScSubTotalFunc* pFunctions = theSubTotalData.pFunctions[nGroupIdx];
+ SCCOL nField = theSubTotalData.nField[nGroupIdx];
+ SCCOL nSubTotals = theSubTotalData.nSubTotals[nGroupIdx];
+ SCCOL* pSubTotals = theSubTotalData.pSubTotals[nGroupIdx];
+ ScSubTotalFunc* pFunctions = theSubTotalData.pFunctions[nGroupIdx];
aLbGroup.SelectEntryPos( GetFieldSelPos( nField )+1 );
for ( USHORT i=0; i<nSubTotals; i++ )
{
- USHORT nCheckPos = GetFieldSelPos( pSubTotals[i] );
+ USHORT nCheckPos = GetFieldSelPos( pSubTotals[i] );
USHORT* pFunction = (USHORT*)aLbColumns.GetEntryData( nCheckPos );
aLbColumns.CheckEntryPos( nCheckPos );
@@ -197,8 +197,8 @@ BOOL ScTpSubTotalGroup::DoReset( USHORT nGroupNo,
// -----------------------------------------------------------------------
-BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT nGroupNo,
- SfxItemSet& rArgSet )
+BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT nGroupNo,
+ SfxItemSet& rArgSet )
{
USHORT nGroupIdx = 0;
@@ -220,7 +220,7 @@ BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT nGroupNo,
//----------------------------------------------------------
- ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt
+ ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt
SfxTabDialog* pDlg = GetTabDialog();
if ( pDlg )
{
@@ -230,26 +230,26 @@ BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT nGroupNo,
theSubTotalData = ((const ScSubTotalItem*)pItem)->GetSubTotalData();
}
- ScSubTotalFunc* pFunctions = NULL;
- SCCOL* pSubTotals = NULL;
- USHORT nGroup = aLbGroup.GetSelectEntryPos();
- USHORT nEntryCount = (USHORT)aLbColumns.GetEntryCount();
- USHORT nCheckCount = aLbColumns.GetCheckedEntryCount();
+ ScSubTotalFunc* pFunctions = NULL;
+ SCCOL* pSubTotals = NULL;
+ USHORT nGroup = aLbGroup.GetSelectEntryPos();
+ USHORT nEntryCount = (USHORT)aLbColumns.GetEntryCount();
+ USHORT nCheckCount = aLbColumns.GetCheckedEntryCount();
- theSubTotalData.nCol1 = rSubTotalData.nCol1;
- theSubTotalData.nRow1 = rSubTotalData.nRow1;
- theSubTotalData.nCol2 = rSubTotalData.nCol2;
- theSubTotalData.nRow2 = rSubTotalData.nRow2;
+ theSubTotalData.nCol1 = rSubTotalData.nCol1;
+ theSubTotalData.nRow1 = rSubTotalData.nRow1;
+ theSubTotalData.nCol2 = rSubTotalData.nCol2;
+ theSubTotalData.nRow2 = rSubTotalData.nRow2;
theSubTotalData.bGroupActive[nGroupIdx] = (nGroup != 0);
- theSubTotalData.nField[nGroupIdx] = (nGroup != 0)
+ theSubTotalData.nField[nGroupIdx] = (nGroup != 0)
? nFieldArr[nGroup-1]
: static_cast<SCCOL>(0);
if ( nEntryCount>0 && nCheckCount>0 && nGroup!=0 )
{
- USHORT nFunction = 0;
+ USHORT nFunction = 0;
- pSubTotals = new SCCOL [nCheckCount];
+ pSubTotals = new SCCOL [nCheckCount];
pFunctions = new ScSubTotalFunc [nCheckCount];
for ( USHORT i=0, nCheck=0; i<nEntryCount; i++ )
@@ -264,7 +264,7 @@ BOOL ScTpSubTotalGroup::DoFillItemSet( USHORT nGroupNo,
nCheck++;
}
}
- theSubTotalData.SetSubTotals( nGroupNo, // Gruppen-Nr.
+ theSubTotalData.SetSubTotals( nGroupNo, // Gruppen-Nr.
pSubTotals,
pFunctions,
nCheckCount ); // Anzahl der Array-Elemente
@@ -287,13 +287,13 @@ void ScTpSubTotalGroup::FillListBoxes()
if ( pViewData && pDoc )
{
- SCCOL nFirstCol = rSubTotalData.nCol1;
- SCROW nFirstRow = rSubTotalData.nRow1;
- SCTAB nTab = pViewData->GetTabNo();
- SCCOL nMaxCol = rSubTotalData.nCol2;
- SCCOL col;
- USHORT i=0;
- String aFieldName;
+ SCCOL nFirstCol = rSubTotalData.nCol1;
+ SCROW nFirstRow = rSubTotalData.nRow1;
+ SCTAB nTab = pViewData->GetTabNo();
+ SCCOL nMaxCol = rSubTotalData.nCol2;
+ SCCOL col;
+ USHORT i=0;
+ String aFieldName;
aLbGroup.Clear();
aLbColumns.Clear();
@@ -324,8 +324,8 @@ void ScTpSubTotalGroup::FillListBoxes()
USHORT ScTpSubTotalGroup::GetFieldSelPos( SCCOL nField )
{
- USHORT nFieldPos = 0;
- BOOL bFound = FALSE;
+ USHORT nFieldPos = 0;
+ BOOL bFound = FALSE;
for ( USHORT n=0; n<nFieldCount && !bFound; n++ )
{
@@ -345,18 +345,18 @@ ScSubTotalFunc ScTpSubTotalGroup::LbPosToFunc( USHORT nPos )
{
switch ( nPos )
{
-// case 0: return SUBTOTAL_FUNC_NONE;
- case 2: return SUBTOTAL_FUNC_AVE;
- case 6: return SUBTOTAL_FUNC_CNT;
- case 1: return SUBTOTAL_FUNC_CNT2;
- case 3: return SUBTOTAL_FUNC_MAX;
- case 4: return SUBTOTAL_FUNC_MIN;
- case 5: return SUBTOTAL_FUNC_PROD;
- case 7: return SUBTOTAL_FUNC_STD;
- case 8: return SUBTOTAL_FUNC_STDP;
- case 0: return SUBTOTAL_FUNC_SUM;
- case 9: return SUBTOTAL_FUNC_VAR;
- case 10: return SUBTOTAL_FUNC_VARP;
+// case 0: return SUBTOTAL_FUNC_NONE;
+ case 2: return SUBTOTAL_FUNC_AVE;
+ case 6: return SUBTOTAL_FUNC_CNT;
+ case 1: return SUBTOTAL_FUNC_CNT2;
+ case 3: return SUBTOTAL_FUNC_MAX;
+ case 4: return SUBTOTAL_FUNC_MIN;
+ case 5: return SUBTOTAL_FUNC_PROD;
+ case 7: return SUBTOTAL_FUNC_STD;
+ case 8: return SUBTOTAL_FUNC_STDP;
+ case 0: return SUBTOTAL_FUNC_SUM;
+ case 9: return SUBTOTAL_FUNC_VAR;
+ case 10: return SUBTOTAL_FUNC_VARP;
default:
DBG_ERROR( "ScTpSubTotalGroup::LbPosToFunc" );
return SUBTOTAL_FUNC_NONE;
@@ -369,18 +369,18 @@ USHORT ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc )
{
switch ( eFunc )
{
-// case SUBTOTAL_FUNC_NONE: return 0;
- case SUBTOTAL_FUNC_AVE: return 2;
- case SUBTOTAL_FUNC_CNT: return 6;
- case SUBTOTAL_FUNC_CNT2: return 1;
- case SUBTOTAL_FUNC_MAX: return 3;
- case SUBTOTAL_FUNC_MIN: return 4;
- case SUBTOTAL_FUNC_PROD: return 5;
- case SUBTOTAL_FUNC_STD: return 7;
- case SUBTOTAL_FUNC_STDP: return 8;
- case SUBTOTAL_FUNC_SUM: return 0;
- case SUBTOTAL_FUNC_VAR: return 9;
- case SUBTOTAL_FUNC_VARP: return 10;
+// case SUBTOTAL_FUNC_NONE: return 0;
+ case SUBTOTAL_FUNC_AVE: return 2;
+ case SUBTOTAL_FUNC_CNT: return 6;
+ case SUBTOTAL_FUNC_CNT2: return 1;
+ case SUBTOTAL_FUNC_MAX: return 3;
+ case SUBTOTAL_FUNC_MIN: return 4;
+ case SUBTOTAL_FUNC_PROD: return 5;
+ case SUBTOTAL_FUNC_STD: return 7;
+ case SUBTOTAL_FUNC_STDP: return 8;
+ case SUBTOTAL_FUNC_SUM: return 0;
+ case SUBTOTAL_FUNC_VAR: return 9;
+ case SUBTOTAL_FUNC_VARP: return 10;
default:
DBG_ERROR( "ScTpSubTotalGroup::FuncToLbPos" );
return 0;
@@ -396,9 +396,9 @@ IMPL_LINK( ScTpSubTotalGroup, SelectHdl, ListBox *, pLb )
if ( (aLbColumns.GetEntryCount() > 0)
&& (aLbColumns.GetSelectionCount() > 0) )
{
- USHORT nFunction = aLbFunctions.GetSelectEntryPos();
- USHORT nColumn = aLbColumns.GetSelectEntryPos();
- USHORT* pFunction = (USHORT*)aLbColumns.GetEntryData( nColumn );
+ USHORT nFunction = aLbFunctions.GetSelectEntryPos();
+ USHORT nColumn = aLbColumns.GetSelectEntryPos();
+ USHORT* pFunction = (USHORT*)aLbColumns.GetEntryData( nColumn );
DBG_ASSERT( pFunction, "EntryData nicht gefunden!" );
if ( !pFunction )
@@ -411,7 +411,7 @@ IMPL_LINK( ScTpSubTotalGroup, SelectHdl, ListBox *, pLb )
else if ( pLb == &aLbFunctions )
{
*pFunction = nFunction;
-// aLbColumns.CheckEntryPos( nColumn, (nFunction != 0) );//XXX
+// aLbColumns.CheckEntryPos( nColumn, (nFunction != 0) );//XXX
aLbColumns.CheckEntryPos( nColumn, TRUE );
}
}
@@ -438,20 +438,20 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb )
//========================================================================
// Abgeleitete Gruppen-TabPages:
-SfxTabPage* __EXPORT ScTpSubTotalGroup1::Create( Window* pParent,
- const SfxItemSet& rArgSet )
+SfxTabPage* __EXPORT ScTpSubTotalGroup1::Create( Window* pParent,
+ const SfxItemSet& rArgSet )
{ return ( new ScTpSubTotalGroup1( pParent, rArgSet ) ); }
// -----------------------------------------------------------------------
-SfxTabPage* __EXPORT ScTpSubTotalGroup2::Create( Window* pParent,
- const SfxItemSet& rArgSet )
+SfxTabPage* __EXPORT ScTpSubTotalGroup2::Create( Window* pParent,
+ const SfxItemSet& rArgSet )
{ return ( new ScTpSubTotalGroup2( pParent, rArgSet ) ); }
// -----------------------------------------------------------------------
-SfxTabPage* __EXPORT ScTpSubTotalGroup3::Create( Window* pParent,
- const SfxItemSet& rArgSet )
+SfxTabPage* __EXPORT ScTpSubTotalGroup3::Create( Window* pParent,
+ const SfxItemSet& rArgSet )
{ return ( new ScTpSubTotalGroup3( pParent, rArgSet ) ); }
// -----------------------------------------------------------------------
@@ -496,28 +496,28 @@ BOOL __EXPORT ScTpSubTotalGroup3::FillItemSet( SfxItemSet& rArgSet ) { return FI
//========================================================================
// Optionen-Tabpage:
-ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent,
- const SfxItemSet& rArgSet )
+ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent,
+ const SfxItemSet& rArgSet )
- : SfxTabPage ( pParent,
+ : SfxTabPage ( pParent,
ScResId( RID_SCPAGE_SUBT_OPTIONS ),
rArgSet ),
//
aFlGroup ( this, ScResId( FL_GROUP ) ),
- aBtnPagebreak ( this, ScResId( BTN_PAGEBREAK ) ),
- aBtnCase ( this, ScResId( BTN_CASE ) ),
- aBtnSort ( this, ScResId( BTN_SORT ) ),
+ aBtnPagebreak ( this, ScResId( BTN_PAGEBREAK ) ),
+ aBtnCase ( this, ScResId( BTN_CASE ) ),
+ aBtnSort ( this, ScResId( BTN_SORT ) ),
aFlSort ( this, ScResId( FL_SORT ) ),
- aBtnAscending ( this, ScResId( BTN_ASCENDING ) ),
- aBtnDescending ( this, ScResId( BTN_DESCENDING ) ),
- aBtnFormats ( this, ScResId( BTN_FORMATS ) ),
- aBtnUserDef ( this, ScResId( BTN_USERDEF ) ),
- aLbUserDef ( this, ScResId( LB_USERDEF ) ),
+ aBtnAscending ( this, ScResId( BTN_ASCENDING ) ),
+ aBtnDescending ( this, ScResId( BTN_DESCENDING ) ),
+ aBtnFormats ( this, ScResId( BTN_FORMATS ) ),
+ aBtnUserDef ( this, ScResId( BTN_USERDEF ) ),
+ aLbUserDef ( this, ScResId( LB_USERDEF ) ),
//
- pViewData ( NULL ),
- pDoc ( NULL ),
+ pViewData ( NULL ),
+ pDoc ( NULL ),
nWhichSubTotals ( rArgSet.GetPool()->GetWhich( SID_SUBTOTALS ) ),
- rSubTotalData ( ((const ScSubTotalItem&)
+ rSubTotalData ( ((const ScSubTotalItem&)
rArgSet.Get( nWhichSubTotals )).
GetSubTotalData() )
{
@@ -538,21 +538,21 @@ void ScTpSubTotalOptions::Init()
const ScSubTotalItem& rSubTotalItem = (const ScSubTotalItem&)
GetItemSet().Get( nWhichSubTotals );
- pViewData = rSubTotalItem.GetViewData();
- pDoc = ( pViewData ) ? pViewData->GetDocument() : NULL;
+ pViewData = rSubTotalItem.GetViewData();
+ pDoc = ( pViewData ) ? pViewData->GetDocument() : NULL;
DBG_ASSERT( pViewData && pDoc, "ViewData oder Document nicht gefunden!" );
- aBtnSort.SetClickHdl ( LINK( this, ScTpSubTotalOptions, CheckHdl ) );
- aBtnUserDef.SetClickHdl ( LINK( this, ScTpSubTotalOptions, CheckHdl ) );
+ aBtnSort.SetClickHdl ( LINK( this, ScTpSubTotalOptions, CheckHdl ) );
+ aBtnUserDef.SetClickHdl ( LINK( this, ScTpSubTotalOptions, CheckHdl ) );
FillUserSortListBox();
}
// -----------------------------------------------------------------------
-SfxTabPage* __EXPORT ScTpSubTotalOptions::Create( Window* pParent,
- const SfxItemSet& rArgSet )
+SfxTabPage* __EXPORT ScTpSubTotalOptions::Create( Window* pParent,
+ const SfxItemSet& rArgSet )
{
return ( new ScTpSubTotalOptions( pParent, rArgSet ) );
}
@@ -562,9 +562,9 @@ SfxTabPage* __EXPORT ScTpSubTotalOptions::Create( Window* pParent
void __EXPORT ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ )
{
aBtnPagebreak.Check ( rSubTotalData.bPagebreak );
- aBtnCase.Check ( rSubTotalData.bCaseSens );
- aBtnFormats.Check ( rSubTotalData.bIncludePattern );
- aBtnSort.Check ( rSubTotalData.bDoSort );
+ aBtnCase.Check ( rSubTotalData.bCaseSens );
+ aBtnFormats.Check ( rSubTotalData.bIncludePattern );
+ aBtnSort.Check ( rSubTotalData.bDoSort );
aBtnAscending.Check ( rSubTotalData.bAscending );
aBtnDescending.Check( !rSubTotalData.bAscending );
@@ -588,7 +588,7 @@ void __EXPORT ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ )
BOOL __EXPORT ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet )
{
- ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt
+ ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt
SfxTabDialog* pDlg = GetTabDialog();
if ( pDlg )
{
@@ -598,14 +598,14 @@ BOOL __EXPORT ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet )
theSubTotalData = ((const ScSubTotalItem*)pItem)->GetSubTotalData();
}
- theSubTotalData.bPagebreak = aBtnPagebreak.IsChecked();
- theSubTotalData.bReplace = TRUE;
- theSubTotalData.bCaseSens = aBtnCase.IsChecked();
+ theSubTotalData.bPagebreak = aBtnPagebreak.IsChecked();
+ theSubTotalData.bReplace = TRUE;
+ theSubTotalData.bCaseSens = aBtnCase.IsChecked();
theSubTotalData.bIncludePattern = aBtnFormats.IsChecked();
- theSubTotalData.bDoSort = aBtnSort.IsChecked();
- theSubTotalData.bAscending = aBtnAscending.IsChecked();
- theSubTotalData.bUserDef = aBtnUserDef.IsChecked();
- theSubTotalData.nUserIndex = (aBtnUserDef.IsChecked())
+ theSubTotalData.bDoSort = aBtnSort.IsChecked();
+ theSubTotalData.bAscending = aBtnAscending.IsChecked();
+ theSubTotalData.bUserDef = aBtnUserDef.IsChecked();
+ theSubTotalData.nUserIndex = (aBtnUserDef.IsChecked())
? aLbUserDef.GetSelectEntryPos()
: 0;
@@ -640,10 +640,10 @@ IMPL_LINK( ScTpSubTotalOptions, CheckHdl, CheckBox *, pBox )
if ( aBtnSort.IsChecked() )
{
aFlSort .Enable();
- aBtnFormats .Enable();
- aBtnUserDef .Enable();
- aBtnAscending .Enable();
- aBtnDescending .Enable();
+ aBtnFormats .Enable();
+ aBtnUserDef .Enable();
+ aBtnAscending .Enable();
+ aBtnDescending .Enable();
if ( aBtnUserDef.IsChecked() )
aLbUserDef.Enable();
@@ -651,11 +651,11 @@ IMPL_LINK( ScTpSubTotalOptions, CheckHdl, CheckBox *, pBox )
else
{
aFlSort .Disable();
- aBtnFormats .Disable();
- aBtnUserDef .Disable();
- aBtnAscending .Disable();
- aBtnDescending .Disable();
- aLbUserDef .Disable();
+ aBtnFormats .Disable();
+ aBtnUserDef .Disable();
+ aBtnAscending .Disable();
+ aBtnDescending .Disable();
+ aLbUserDef .Disable();
}
}
else if ( pBox == &aBtnUserDef )
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 1ee02badefe1..532a16b1f945 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "compiler.hxx"
#include "formula/opcode.hxx" //CHINA001
//<!--Added by PengYunQuan for Validity Cell Range Picker
-#include "tabvwsh.hxx"
+#include "tabvwsh.hxx"
#include <sfx2/viewfrm.hxx>
#include <sfx2/childwin.hxx>
#include "reffact.hxx"
@@ -61,7 +61,7 @@
static USHORT pValueRanges[] =
{
- FID_VALID_MODE, FID_VALID_ERRTEXT,
+ FID_VALID_MODE, FID_VALID_ERRTEXT,
FID_VALID_LISTTYPE, FID_VALID_LISTTYPE,
0
};
@@ -72,7 +72,7 @@ static USHORT pValueRanges[] =
//<!--Modified by PengYunQuan for Validity Cell Range Picker
//ScValidationDlg::ScValidationDlg( Window* pParent, const SfxItemSet* pArgSet ) :
// SfxTabDialog( pParent, ScResId( TAB_DLG_VALIDATION ), pArgSet )
-ScValidationDlg::ScValidationDlg( Window* pParent,
+ScValidationDlg::ScValidationDlg( Window* pParent,
const SfxItemSet* pArgSet,
ScTabViewShell *pTabViewSh,
SfxBindings *pB /*= NULL*/
@@ -94,12 +94,12 @@ void ScTPValidationValue::SetReferenceHdl( const ScRange&rRange , ScDocument* pD
{
if ( rRange.aStart != rRange.aEnd )
if ( ScValidationDlg *pValidationDlg = GetValidationDlg() )
- if( m_pRefEdit )
+ if( m_pRefEdit )
pValidationDlg/*->GetRefHandler()*/->RefInputStart( m_pRefEdit );
if ( m_pRefEdit )
{
- String aStr;
+ String aStr;
rRange.Format( aStr, SCR_ABS_3D, pDoc );
m_pRefEdit->SetRefString( aStr );
//m_pRefEdit->SetRefString( rRange.aStart != rRange.aEnd ? aStr : String::CreateFromAscii("=").Append( aStr ) );
@@ -109,15 +109,15 @@ void ScTPValidationValue::SetReferenceHdl( const ScRange&rRange , ScDocument* pD
void ScTPValidationValue:: SetActiveHdl()
{
if ( m_pRefEdit ) m_pRefEdit->GrabFocus();
-
+
if ( ScValidationDlg *pValidationDlg = GetValidationDlg() )
- if( m_pRefEdit )
+ if( m_pRefEdit )
{
pValidationDlg/*->GetRefHandler()*/->RefInputDone();
}
}
-void ScTPValidationValue::RefInputStartPreHdl( ScRefEdit* pEdit, ScRefButton* pButton )
+void ScTPValidationValue::RefInputStartPreHdl( ScRefEdit* pEdit, ScRefButton* pButton )
{
if ( ScValidationDlg *pValidationDlg = GetValidationDlg() )
{
@@ -136,9 +136,9 @@ void ScTPValidationValue::RefInputStartPreHdl( ScRefEdit* pEdit, ScRe
}
}
-void ScTPValidationValue::RefInputDonePreHdl()
+void ScTPValidationValue::RefInputDonePreHdl()
{
-
+
if( m_pRefEdit && m_pRefEdit->GetParent()!= this )
{
if( Window *pPreWnd = m_pRefEdit==&maEdMax?&maFtMax:(m_pRefEdit==&maEdMin?&maFtMin:NULL) )
@@ -150,22 +150,22 @@ void ScTPValidationValue::RefInputDonePreHdl()
m_pRefEdit->SetParent( this );
m_btnRef.SetParent( m_pRefEdit ); //if Edit SetParent but button not, the tab order will be incorrect, need button to setparent to anthor window and restore parent later in order to restore the tab order
-// aExample1.SetParent( m_pRefEdit ); // the aExample1's child order will affect acc key
+// aExample1.SetParent( m_pRefEdit ); // the aExample1's child order will affect acc key
}
-
+
if( m_btnRef.GetParent()!=this ) m_btnRef.SetParent( this );
-// if( aExample1.GetParent()!=this ) aExample1.SetParent( this );
+// if( aExample1.GetParent()!=this ) aExample1.SetParent( this );
}
-void ScTPValidationValue::RefInputDonePostHdl()
+void ScTPValidationValue::RefInputDonePostHdl()
{
-
-
+
+
if( m_pRefEdit && !m_pRefEdit->HasFocus() )
m_pRefEdit->GrabFocus();
}
-
+
BOOL ScValidationDlg::Close()
{
@@ -352,7 +352,7 @@ ScTPValidationValue::ScTPValidationValue( Window* pParent, const SfxItemSet& rAr
// list separator in formulas
//CHINA001 const String& rListSep = ScCompiler::pSymbolTableNative[ ocSep ];
- String aListSep = ::GetScCompilerNativeSymbol( ocSep ); //CHINA001
+ String aListSep = ::GetScCompilerNativeSymbol( ocSep ); //CHINA001
DBG_ASSERT( aListSep.Len() == 1, "ScTPValidationValue::ScTPValidationValue - list separator error" );
mcFmlaSep = aListSep.Len() ? aListSep.GetChar( 0 ) : ';';
//<!--Added by PengYunQuan for Validity Cell Range Picker
@@ -499,7 +499,7 @@ ScValidationDlg * ScTPValidationValue::GetValidationDlg()
if( Window *pParent = GetParent() )
do{
if ( dynamic_cast<ScValidationDlg*>( pParent ) )
- return static_cast< ScValidationDlg * >( pParent );
+ return static_cast< ScValidationDlg * >( pParent );
}while ( NULL != ( pParent = pParent->GetParent() ) );
return NULL;
}
@@ -581,7 +581,7 @@ void ScTPValidationValue::TidyListBoxes()
pWnd = GetChild(0);
- while( std::find( alstOrder.begin(), alstOrder.end(), pWnd ) != alstOrder.end() && NULL != ( pWnd = pWnd->GetWindow( WINDOW_NEXT) ) ) ;
+ while( std::find( alstOrder.begin(), alstOrder.end(), pWnd ) != alstOrder.end() && NULL != ( pWnd = pWnd->GetWindow( WINDOW_NEXT) ) ) ;
if ( pWnd )
{
@@ -598,7 +598,7 @@ void ScTPValidationValue::TidyListBoxes()
IMPL_LINK( ScTPValidationValue, EditSetFocusHdl, Edit *, /*pEdit*/ )
{
USHORT nPos=maLbAllow.GetSelectEntryPos();
-
+
if ( nPos == SC_VALIDDLG_ALLOW_RANGE )
{
SetupRefDlg();
@@ -609,7 +609,7 @@ IMPL_LINK( ScTPValidationValue, EditSetFocusHdl, Edit *, /*pEdit*/ )
IMPL_LINK( ScTPValidationValue, KillFocusHdl, Window *, pWnd )
{
- if( pWnd == m_pRefEdit || pWnd == &m_btnRef )
+ if( pWnd == m_pRefEdit || pWnd == &m_btnRef )
if( ScValidationDlg *pValidationDlg = GetValidationDlg() )
if ( (pValidationDlg->IsActive() || pValidationDlg->IsChildFocus() ) && !pValidationDlg->IsRefInputting() )
if( ( !m_pRefEdit || !m_pRefEdit->HasFocus()) && !m_btnRef.HasFocus() )
@@ -690,18 +690,18 @@ IMPL_LINK( ScTPValidationValue, CheckHdl, CheckBox*, EMPTYARG )
//========================================================================
// Input Help Page
-ScTPValidationHelp::ScTPValidationHelp( Window* pParent,
+ScTPValidationHelp::ScTPValidationHelp( Window* pParent,
const SfxItemSet& rArgSet )
- : SfxTabPage ( pParent,
+ : SfxTabPage ( pParent,
ScResId( TP_VALIDATION_INPUTHELP ),
rArgSet ),
- aTsbHelp ( this, ScResId( TSB_HELP ) ),
+ aTsbHelp ( this, ScResId( TSB_HELP ) ),
aFlContent ( this, ScResId( FL_CONTENT ) ),
- aFtTitle ( this, ScResId( FT_TITLE ) ),
- aEdtTitle ( this, ScResId( EDT_TITLE ) ),
- aFtInputHelp ( this, ScResId( FT_INPUTHELP ) ),
- aEdInputHelp ( this, ScResId( EDT_INPUTHELP ) ),
+ aFtTitle ( this, ScResId( FT_TITLE ) ),
+ aEdtTitle ( this, ScResId( EDT_TITLE ) ),
+ aFtInputHelp ( this, ScResId( FT_INPUTHELP ) ),
+ aEdInputHelp ( this, ScResId( EDT_INPUTHELP ) ),
mrArgSet ( rArgSet )
{
@@ -733,8 +733,8 @@ USHORT* __EXPORT ScTPValidationHelp::GetRanges()
// -----------------------------------------------------------------------
-SfxTabPage* __EXPORT ScTPValidationHelp::Create( Window* pParent,
- const SfxItemSet& rArgSet )
+SfxTabPage* __EXPORT ScTPValidationHelp::Create( Window* pParent,
+ const SfxItemSet& rArgSet )
{
return ( new ScTPValidationHelp( pParent, rArgSet ) );
}
@@ -776,21 +776,21 @@ BOOL __EXPORT ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet )
//========================================================================
// Error Alert Page
-ScTPValidationError::ScTPValidationError( Window* pParent,
+ScTPValidationError::ScTPValidationError( Window* pParent,
const SfxItemSet& rArgSet )
- : SfxTabPage ( pParent,
+ : SfxTabPage ( pParent,
ScResId( TP_VALIDATION_ERROR ),
rArgSet ),
- aTsbShow ( this, ScResId( TSB_SHOW ) ),
+ aTsbShow ( this, ScResId( TSB_SHOW ) ),
aFlContent ( this, ScResId( FL_CONTENT ) ),
- aFtAction ( this, ScResId( FT_ACTION ) ),
- aLbAction ( this, ScResId( LB_ACTION ) ),
- aBtnSearch ( this, ScResId( BTN_SEARCH ) ),
- aFtTitle ( this, ScResId( FT_TITLE ) ),
- aEdtTitle ( this, ScResId( EDT_TITLE ) ),
- aFtError ( this, ScResId( FT_ERROR ) ),
- aEdError ( this, ScResId( EDT_ERROR ) ),
+ aFtAction ( this, ScResId( FT_ACTION ) ),
+ aLbAction ( this, ScResId( LB_ACTION ) ),
+ aBtnSearch ( this, ScResId( BTN_SEARCH ) ),
+ aFtTitle ( this, ScResId( FT_TITLE ) ),
+ aEdtTitle ( this, ScResId( EDT_TITLE ) ),
+ aFtError ( this, ScResId( FT_ERROR ) ),
+ aEdError ( this, ScResId( EDT_ERROR ) ),
mrArgSet ( rArgSet )
{
@@ -826,8 +826,8 @@ USHORT* __EXPORT ScTPValidationError::GetRanges()
// -----------------------------------------------------------------------
-SfxTabPage* __EXPORT ScTPValidationError::Create( Window* pParent,
- const SfxItemSet& rArgSet )
+SfxTabPage* __EXPORT ScTPValidationError::Create( Window* pParent,
+ const SfxItemSet& rArgSet )
{
return ( new ScTPValidationError( pParent, rArgSet ) );
}
@@ -970,12 +970,12 @@ bool ScValidationDlg::RemoveRefDlg( BOOL bRestoreModal /* = TRUE */ )
}
if ( !m_bOwnRefHdlr ) return false;
- if( LeaveRefStatus() && LeaveRefMode() )
+ if( LeaveRefStatus() && LeaveRefMode() )
{
m_bOwnRefHdlr = false;
if( bRestoreModal )
- SetModal( TRUE );
+ SetModal( TRUE );
}
if ( SfxChildWindow* pWnd = pTabVwSh->GetViewFrame()->GetChildWindow( SID_VALIDITY_REFERENCE ) )
@@ -993,7 +993,7 @@ void ScTPValidationValue::ScRefButtonEx::Click()
{
if( ScTPValidationValue *pParent = dynamic_cast< ScTPValidationValue*>( GetParent() ) )
pParent->OnClick( this );
-
+
ScRefButton::Click();
}
@@ -1014,7 +1014,7 @@ BOOL ScValidationDlg::IsChildFocus()
}
-bool ScValidationDlg::IsAlive()
+bool ScValidationDlg::IsAlive()
{
return SC_MOD()->IsAliveRefDlg( SLOTID, this );
}
diff --git a/sc/source/ui/dbgui/validate.src b/sc/source/ui/dbgui/validate.src
index c861fbc200cb..67207cdfaba2 100644
--- a/sc/source/ui/dbgui/validate.src
+++ b/sc/source/ui/dbgui/validate.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 @@ TabDialog TAB_DLG_VALIDATION
Text [ en-US ] = "Validity" ;
};
//<!--Added by PengYunQuan for Validity Cell Range Picker
-#define OFFSET_X 30
+#define OFFSET_X 30
//-->Added by PengYunQuan for Validity Cell Range Picker
TabPage TP_VALIDATION_VALUES
{
@@ -121,7 +121,7 @@ TabPage TP_VALIDATION_VALUES
Size = MAP_APPFONT ( 90 , 90 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
- // Reihenfolge entspricht enum ScConditionMode
+ // Reihenfolge entspricht enum ScConditionMode
StringList [ en-US ] =
{
< "equal" ; SC_VALIDDLG_DATA_EQUAL ; > ;
@@ -342,7 +342,7 @@ TabPage TP_VALIDATION_ERROR
Size = MAP_APPFONT ( 107 , 76 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
- // Reihenfolge entspricht enum ScValidErrorStyle
+ // Reihenfolge entspricht enum ScValidErrorStyle
StringList [ en-US ] =
{
< "Stop" ; Default ; > ;
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index d819785c843b..9c4655fa7317 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +52,11 @@
#include "markdata.hxx"
#include "hints.hxx"
#include "filter.hxx"
-//CHINA001 #include "linkarea.hxx" // dialog
+//CHINA001 #include "linkarea.hxx" // dialog
-#include "attrib.hxx" // raus, wenn ResetAttrib am Dokument
-#include "patattr.hxx" // raus, wenn ResetAttrib am Dokument
-#include "docpool.hxx" // raus, wenn ResetAttrib am Dokument
+#include "attrib.hxx" // raus, wenn ResetAttrib am Dokument
+#include "patattr.hxx" // raus, wenn ResetAttrib am Dokument
+#include "docpool.hxx" // raus, wenn ResetAttrib am Dokument
#include "sc.hrc" //CHINA001
#include "scabstdlg.hxx" //CHINA001
@@ -79,16 +79,16 @@ ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const String& rFile,
const String& rArea, const ScRange& rDest,
ULONG nRefresh ) :
::sfx2::SvBaseLink(sfx2::LINKUPDATE_ONCALL,FORMAT_FILE),
- ScRefreshTimer ( nRefresh ),
+ ScRefreshTimer ( nRefresh ),
pImpl ( new AreaLink_Impl() ),
- aFileName (rFile),
- aFilterName (rFilter),
- aOptions (rOpt),
- aSourceArea (rArea),
- aDestArea (rDest),
- bAddUndo (TRUE),
- bInCreate (FALSE),
- bDoInsert (TRUE)
+ aFileName (rFile),
+ aFilterName (rFilter),
+ aOptions (rOpt),
+ aSourceArea (rArea),
+ aDestArea (rDest),
+ bAddUndo (TRUE),
+ bInCreate (FALSE),
+ bDoInsert (TRUE)
{
DBG_ASSERT(pShell->ISA(ScDocShell), "ScAreaLink mit falscher ObjectShell");
pImpl->m_pDocSh = static_cast< ScDocShell* >( pShell );
@@ -104,9 +104,9 @@ __EXPORT ScAreaLink::~ScAreaLink()
void __EXPORT ScAreaLink::Edit(Window* pParent, const Link& /* rEndEditHdl */ )
{
- // use own dialog instead of SvBaseLink::Edit...
- // DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom
- // ein Optionen-Dialog kommt...
+ // use own dialog instead of SvBaseLink::Edit...
+ // DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom
+ // ein Optionen-Dialog kommt...
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -121,8 +121,8 @@ void __EXPORT ScAreaLink::Edit(Window* pParent, const Link& /* rEndEditHdl */ )
void __EXPORT ScAreaLink::DataChanged( const String&,
const ::com::sun::star::uno::Any& )
{
- // bei bInCreate nichts tun, damit Update gerufen werden kann, um den Status im
- // LinkManager zu setzen, ohne die Daten im Dokument zu aendern
+ // bei bInCreate nichts tun, damit Update gerufen werden kann, um den Status im
+ // LinkManager zu setzen, ohne die Daten im Dokument zu aendern
if (bInCreate)
return;
@@ -135,8 +135,8 @@ void __EXPORT ScAreaLink::DataChanged( const String&,
String aArea;
pLinkManager->GetDisplayNames( this,0,&aFile,&aArea,&aFilter);
- // the file dialog returns the filter name with the application prefix
- // -> remove prefix
+ // the file dialog returns the filter name with the application prefix
+ // -> remove prefix
ScDocumentLoader::RemoveAppPrefix( aFilter );
// #81155# dialog doesn't set area, so keep old one
@@ -166,7 +166,7 @@ void __EXPORT ScAreaLink::Closed()
aFileName, aFilterName, aOptions,
aSourceArea, aDestArea, GetRefreshDelay() ) );
- bAddUndo = FALSE; // nur einmal
+ bAddUndo = FALSE; // nur einmal
}
SCTAB nDestTab = aDestArea.aStart.Tab();
@@ -178,18 +178,18 @@ void __EXPORT ScAreaLink::Closed()
void ScAreaLink::SetDestArea(const ScRange& rNew)
{
- aDestArea = rNew; // fuer Undo
+ aDestArea = rNew; // fuer Undo
}
void ScAreaLink::SetSource(const String& rDoc, const String& rFlt, const String& rOpt,
const String& rArea)
{
- aFileName = rDoc;
- aFilterName = rFlt;
- aOptions = rOpt;
- aSourceArea = rArea;
+ aFileName = rDoc;
+ aFilterName = rFlt;
+ aOptions = rOpt;
+ aSourceArea = rArea;
- // also update link name for dialog
+ // also update link name for dialog
String aNewLinkName;
sfx2::MakeLnkName( aNewLinkName, NULL, aFileName, aSourceArea, &aFilterName );
SetName( aNewLinkName );
@@ -208,15 +208,15 @@ BOOL ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const Strin
BOOL bFound = FALSE;
ScRangeName* pNames = pSrcDoc->GetRangeName();
USHORT nPos;
- if (pNames) // benannte Bereiche
+ if (pNames) // benannte Bereiche
{
if (pNames->SearchName( rAreaName, nPos ))
if ( (*pNames)[nPos]->IsValidReference( rRange ) )
bFound = TRUE;
}
- if (!bFound) // Datenbankbereiche
+ if (!bFound) // Datenbankbereiche
{
- ScDBCollection* pDBColl = pSrcDoc->GetDBCollection();
+ ScDBCollection* pDBColl = pSrcDoc->GetDBCollection();
if (pDBColl)
if (pDBColl->SearchName( rAreaName, nPos ))
{
@@ -228,7 +228,7 @@ BOOL ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const Strin
bFound = TRUE;
}
}
- if (!bFound) // direct reference (range or cell)
+ if (!bFound) // direct reference (range or cell)
{
ScAddress::Details aDetails(pSrcDoc->GetAddressConvention(), 0, 0);
if ( rRange.ParseAny( rAreaName, pSrcDoc, aDetails ) & SCA_VALID )
@@ -237,12 +237,12 @@ BOOL ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const Strin
return bFound;
}
-// ausfuehren:
+// ausfuehren:
BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
const String& rNewArea, ULONG nNewRefresh )
{
- // Dokument laden - wie TabLink
+ // Dokument laden - wie TabLink
if (!rNewFile.Len() || !rNewFilter.Len())
return FALSE;
@@ -259,11 +259,11 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
BOOL bUndo (pDoc->IsUndoEnabled());
pDoc->SetInLinkUpdate( TRUE );
- // wenn neuer Filter ausgewaehlt wurde, Optionen vergessen
+ // wenn neuer Filter ausgewaehlt wurde, Optionen vergessen
if ( rNewFilter != aFilterName )
aOptions.Erase();
- // ItemSet immer anlegen, damit die DocShell die Optionen setzen kann
+ // ItemSet immer anlegen, damit die DocShell die Optionen setzen kann
SfxItemSet* pSet = new SfxAllItemSet( SFX_APP()->GetPool() );
if ( aOptions.Len() )
pSet->Put( SfxStringItem( SID_FILE_FILTEROPTIONS, aOptions ) );
@@ -271,7 +271,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
SfxMedium* pMed = new SfxMedium(aNewUrl, STREAM_STD_READ, FALSE, pFilter);
ScDocShell* pSrcShell = new ScDocShell(SFX_CREATE_MODE_INTERNAL);
-//REMOVE SvEmbeddedObjectRef aRef = pSrcShell;
+//REMOVE SvEmbeddedObjectRef aRef = pSrcShell;
SfxObjectShellRef aRef = pSrcShell;
pSrcShell->DoLoad(pMed);
@@ -313,12 +313,12 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
if( nHeight > 0 )
nHeight--;
- // alte Daten loeschen / neue kopieren
+ // alte Daten loeschen / neue kopieren
ScAddress aDestPos = aDestArea.aStart;
SCTAB nDestTab = aDestPos.Tab();
ScRange aOldRange = aDestArea;
- ScRange aNewRange = aDestArea; // alter Bereich, wenn Datei nicht gefunden o.ae.
+ ScRange aNewRange = aDestArea; // alter Bereich, wenn Datei nicht gefunden o.ae.
if (nWidth > 0 && nHeight > 0)
{
aNewRange.aEnd.SetCol( aNewRange.aStart.Col() + nWidth - 1 );
@@ -339,7 +339,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
ScRange aMaxRange( aDestPos,
ScAddress(Max(nOldEndX,nNewEndX), Max(nOldEndY,nNewEndY), nDestTab) );
- // Undo initialisieren
+ // Undo initialisieren
ScDocument* pUndoDoc = NULL;
ScDocument* pRedoDoc = NULL;
@@ -348,32 +348,32 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
if ( bDoInsert )
{
- if ( nNewEndX != nOldEndX || nNewEndY != nOldEndY ) // Bereich veraendert?
+ if ( nNewEndX != nOldEndX || nNewEndY != nOldEndY ) // Bereich veraendert?
{
pUndoDoc->InitUndo( pDoc, 0, pDoc->GetTableCount()-1 );
pDoc->CopyToDocument( 0,0,0,MAXCOL,MAXROW,MAXTAB,
- IDF_FORMULA, FALSE, pUndoDoc ); // alle Formeln
+ IDF_FORMULA, FALSE, pUndoDoc ); // alle Formeln
}
else
- pUndoDoc->InitUndo( pDoc, nDestTab, nDestTab ); // nur Zieltabelle
+ pUndoDoc->InitUndo( pDoc, nDestTab, nDestTab ); // nur Zieltabelle
pDoc->CopyToDocument( aOldRange, IDF_ALL & ~IDF_NOTE, FALSE, pUndoDoc );
}
- else // ohne Einfuegen
+ else // ohne Einfuegen
{
- pUndoDoc->InitUndo( pDoc, nDestTab, nDestTab ); // nur Zieltabelle
+ pUndoDoc->InitUndo( pDoc, nDestTab, nDestTab ); // nur Zieltabelle
pDoc->CopyToDocument( aMaxRange, IDF_ALL & ~IDF_NOTE, FALSE, pUndoDoc );
}
}
- // Zellen einfuegen / loeschen
- // DeleteAreaTab loescht auch MERGE_FLAG Attribute
+ // Zellen einfuegen / loeschen
+ // DeleteAreaTab loescht auch MERGE_FLAG Attribute
if (bDoInsert)
- pDoc->FitBlock( aOldRange, aNewRange ); // incl. loeschen
+ pDoc->FitBlock( aOldRange, aNewRange ); // incl. loeschen
else
pDoc->DeleteAreaTab( aMaxRange, IDF_ALL & ~IDF_NOTE );
- // Daten kopieren
+ // Daten kopieren
if (nWidth > 0 && nHeight > 0)
{
@@ -388,7 +388,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
{
SCTAB nSrcTab = aTokenRange.aStart.Tab();
ScMarkData aSourceMark;
- aSourceMark.SelectOneTable( nSrcTab ); // selektieren fuer CopyToClip
+ aSourceMark.SelectOneTable( nSrcTab ); // selektieren fuer CopyToClip
aSourceMark.SetMarkArea( aTokenRange );
ScClipParam aClipParam(aTokenRange, false);
@@ -397,10 +397,10 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
if ( aClipDoc.HasAttrib( 0,0,nSrcTab, MAXCOL,MAXROW,nSrcTab,
HASATTR_MERGED | HASATTR_OVERLAPPED ) )
{
- //! ResetAttrib am Dokument !!!
+ //! ResetAttrib am Dokument !!!
ScPatternAttr aPattern( pSrcDoc->GetPool() );
- aPattern.GetItemSet().Put( ScMergeAttr() ); // Defaults
+ aPattern.GetItemSet().Put( ScMergeAttr() ); // Defaults
aPattern.GetItemSet().Put( ScMergeFlagAttr() );
aClipDoc.ApplyPatternAreaTab( 0,0, MAXCOL,MAXROW, nSrcTab, aPattern );
}
@@ -421,7 +421,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
pDoc->SetString( aDestPos.Col(), aDestPos.Row(), aDestPos.Tab(), aErr );
}
- // Undo eintragen
+ // Undo eintragen
if ( bAddUndo && bUndo)
{
@@ -438,7 +438,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
pUndoDoc, pRedoDoc, bDoInsert ) );
}
- // neue Einstellungen merken
+ // neue Einstellungen merken
if ( bNewUrlName )
aFileName = aNewUrl;
@@ -470,18 +470,18 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
}
else
{
- // CanFitBlock FALSE -> Probleme mit zusammengefassten Zellen
- // oder Tabellengrenze erreicht!
- //! Zellschutz ???
+ // CanFitBlock FALSE -> Probleme mit zusammengefassten Zellen
+ // oder Tabellengrenze erreicht!
+ //! Zellschutz ???
- //! Link-Dialog muss Default-Parent setzen
- // "kann keine Zeilen einfuegen"
+ //! Link-Dialog muss Default-Parent setzen
+ // "kann keine Zeilen einfuegen"
InfoBox aBox( Application::GetDefDialogParent(),
ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_2 ) );
aBox.Execute();
}
- // aufraeumen
+ // aufraeumen
aRef->DoClose();
@@ -489,8 +489,8 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
if (bCanDo)
{
- // notify Uno objects (for XRefreshListener)
- //! also notify Uno objects if file name was changed!
+ // notify Uno objects (for XRefreshListener)
+ //! also notify Uno objects if file name was changed!
ScLinkRefreshedHint aHint;
aHint.SetAreaLink( aDestPos );
pDoc->BroadcastUno( aHint );
diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx
index 61683e169f02..a38eb742e1db 100644
--- a/sc/source/ui/docshell/autostyl.cxx
+++ b/sc/source/ui/docshell/autostyl.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +43,10 @@
struct ScAutoStyleInitData
{
- ScRange aRange;
- String aStyle1;
- ULONG nTimeout;
- String aStyle2;
+ ScRange aRange;
+ String aStyle1;
+ ULONG nTimeout;
+ String aStyle2;
ScAutoStyleInitData( const ScRange& rR, const String& rSt1, ULONG nT, const String& rSt2 ) :
aRange(rR), aStyle1(rSt1), nTimeout(nT), aStyle2(rSt2) {}
@@ -54,9 +54,9 @@ struct ScAutoStyleInitData
struct ScAutoStyleData
{
- ULONG nTimeout;
- ScRange aRange;
- String aStyle;
+ ULONG nTimeout;
+ ScRange aRange;
+ String aStyle;
ScAutoStyleData( ULONG nT, const ScRange& rR, const String& rT ) :
nTimeout(nT), aRange(rR), aStyle(rT) {}
@@ -64,7 +64,7 @@ struct ScAutoStyleData
//==================================================================
-inline ULONG TimeNow() // Sekunden
+inline ULONG TimeNow() // Sekunden
{
return (ULONG) time(0);
}
@@ -92,7 +92,7 @@ ScAutoStyleList::~ScAutoStyleList()
//==================================================================
-// initial short delay (asynchronous call)
+// initial short delay (asynchronous call)
void ScAutoStyleList::AddInitial( const ScRange& rRange, const String& rStyle1,
ULONG nTimeout, const String& rStyle2 )
@@ -110,10 +110,10 @@ IMPL_LINK( ScAutoStyleList, InitHdl, Timer*, EMPTYARG )
{
ScAutoStyleInitData* pData = (ScAutoStyleInitData*) aInitials.GetObject(i);
- // apply first style immediately
+ // apply first style immediately
pDocSh->DoAutoStyle( pData->aRange, pData->aStyle1 );
- // add second style to list
+ // add second style to list
if ( pData->nTimeout )
AddEntry( pData->nTimeout, pData->aRange, pData->aStyle2 );
@@ -131,7 +131,7 @@ void ScAutoStyleList::AddEntry( ULONG nTimeout, const ScRange& rRange, const Str
aTimer.Stop();
ULONG nNow = TimeNow();
- // alten Eintrag loeschen
+ // alten Eintrag loeschen
ULONG nCount = aEntries.Count();
ULONG i;
@@ -143,11 +143,11 @@ void ScAutoStyleList::AddEntry( ULONG nTimeout, const ScRange& rRange, const Str
delete pData;
aEntries.Remove(i);
--nCount;
- break; // nicht weitersuchen - es kann nur einen geben
+ break; // nicht weitersuchen - es kann nur einen geben
}
}
- // Timeouts von allen Eintraegen anpassen
+ // Timeouts von allen Eintraegen anpassen
if (nCount && nNow != nTimerStart)
{
@@ -155,7 +155,7 @@ void ScAutoStyleList::AddEntry( ULONG nTimeout, const ScRange& rRange, const Str
AdjustEntries((nNow-nTimerStart)*1000);
}
- // Einfuege-Position suchen
+ // Einfuege-Position suchen
ULONG nPos = LIST_APPEND;
for (i=0; i<nCount && nPos == LIST_APPEND; i++)
@@ -165,22 +165,22 @@ void ScAutoStyleList::AddEntry( ULONG nTimeout, const ScRange& rRange, const Str
ScAutoStyleData* pNew = new ScAutoStyleData( nTimeout, rRange, rStyle );
aEntries.Insert( pNew, nPos );
- // abgelaufene ausfuehren, Timer neu starten
+ // abgelaufene ausfuehren, Timer neu starten
ExecuteEntries();
StartTimer(nNow);
}
-void ScAutoStyleList::AdjustEntries( ULONG nDiff ) // Millisekunden
+void ScAutoStyleList::AdjustEntries( ULONG nDiff ) // Millisekunden
{
ULONG nCount = aEntries.Count();
for (ULONG i=0; i<nCount; i++)
{
ScAutoStyleData* pData = (ScAutoStyleData*) aEntries.GetObject(i);
if ( pData->nTimeout <= nDiff )
- pData->nTimeout = 0; // abgelaufen
+ pData->nTimeout = 0; // abgelaufen
else
- pData->nTimeout -= nDiff; // weiterzaehlen
+ pData->nTimeout -= nDiff; // weiterzaehlen
}
}
@@ -189,7 +189,7 @@ void ScAutoStyleList::ExecuteEntries()
ScAutoStyleData* pData;
while ((pData = (ScAutoStyleData*) aEntries.GetObject(0)) != NULL && pData->nTimeout == 0)
{
- pDocSh->DoAutoStyle( pData->aRange, pData->aStyle ); //! oder Request ???
+ pDocSh->DoAutoStyle( pData->aRange, pData->aStyle ); //! oder Request ???
delete pData;
aEntries.Remove((ULONG)0);
@@ -205,14 +205,14 @@ void ScAutoStyleList::ExecuteAllNow()
{
ScAutoStyleData* pData = (ScAutoStyleData*) aEntries.GetObject(i);
- pDocSh->DoAutoStyle( pData->aRange, pData->aStyle ); //! oder Request ???
+ pDocSh->DoAutoStyle( pData->aRange, pData->aStyle ); //! oder Request ???
delete pData;
}
aEntries.Clear();
}
-void ScAutoStyleList::StartTimer( ULONG nNow ) // Sekunden
+void ScAutoStyleList::StartTimer( ULONG nNow ) // Sekunden
{
// ersten Eintrag mit Timeout != 0 suchen
@@ -232,7 +232,7 @@ void ScAutoStyleList::StartTimer( ULONG nNow ) // Sekunden
IMPL_LINK( ScAutoStyleList, TimerHdl, Timer*, EMPTYARG )
{
ULONG nNow = TimeNow();
- AdjustEntries(aTimer.GetTimeout()); // eingestellte Wartezeit
+ AdjustEntries(aTimer.GetTimeout()); // eingestellte Wartezeit
ExecuteEntries();
StartTimer(nNow);
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index cf149d258062..ca09bc8ec943 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +50,8 @@
#include "rangenam.hxx"
#include "olinetab.hxx"
#include "dpobject.hxx"
-#include "dociter.hxx" // for lcl_EmptyExcept
-#include "cell.hxx" // for lcl_EmptyExcept
+#include "dociter.hxx" // for lcl_EmptyExcept
+#include "cell.hxx" // for lcl_EmptyExcept
#include "editable.hxx"
#include "attrib.hxx"
#include "drwlayer.hxx"
@@ -123,9 +123,9 @@ BOOL ScDBDocFunc::DeleteDBRange( const String& rName, BOOL /* bApi */ )
if (bUndo)
pUndoColl = new ScDBCollection( *pDocColl );
- pDoc->CompileDBFormula( TRUE ); // CreateFormulaString
+ pDoc->CompileDBFormula( TRUE ); // CreateFormulaString
pDocColl->AtFree( nPos );
- pDoc->CompileDBFormula( FALSE ); // CompileFormulaString
+ pDoc->CompileDBFormula( FALSE ); // CompileFormulaString
if (bUndo)
{
@@ -162,17 +162,17 @@ BOOL ScDBDocFunc::RenameDBRange( const String& rOld, const String& rNew, BOOL /*
ScDBCollection* pUndoColl = new ScDBCollection( *pDocColl );
- pDoc->CompileDBFormula( TRUE ); // CreateFormulaString
+ pDoc->CompileDBFormula( TRUE ); // CreateFormulaString
pDocColl->AtFree( nPos );
BOOL bInserted = pDocColl->Insert( pNewData );
- if (!bInserted) // Fehler -> alten Zustand wiederherstellen
+ if (!bInserted) // Fehler -> alten Zustand wiederherstellen
{
delete pNewData;
- pDoc->SetDBCollection( pUndoColl ); // gehoert dann dem Dokument
+ pDoc->SetDBCollection( pUndoColl ); // gehoert dann dem Dokument
}
- pDoc->CompileDBFormula( FALSE ); // CompileFormulaString
+ pDoc->CompileDBFormula( FALSE ); // CompileFormulaString
- if (bInserted) // Einfuegen hat geklappt
+ if (bInserted) // Einfuegen hat geklappt
{
if (bUndo)
{
@@ -209,7 +209,7 @@ BOOL ScDBDocFunc::ModifyDBData( const ScDBData& rNewData, BOOL /* bApi */ )
ScRange aOldRange, aNewRange;
pData->GetArea(aOldRange);
rNewData.GetArea(aNewRange);
- BOOL bAreaChanged = ( aOldRange != aNewRange ); // dann muss neu compiliert werden
+ BOOL bAreaChanged = ( aOldRange != aNewRange ); // dann muss neu compiliert werden
ScDBCollection* pUndoColl = NULL;
if (bUndo)
@@ -237,13 +237,13 @@ BOOL ScDBDocFunc::ModifyDBData( const ScDBData& rNewData, BOOL /* bApi */ )
BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi )
{
- //! auch fuer ScDBFunc::RepeatDB benutzen!
+ //! auch fuer ScDBFunc::RepeatDB benutzen!
BOOL bDone = FALSE;
ScDocument* pDoc = rDocShell.GetDocument();
if (bRecord && !pDoc->IsUndoEnabled())
bRecord = FALSE;
- ScDBCollection* pColl = pDoc->GetDBCollection();
+ ScDBCollection* pColl = pDoc->GetDBCollection();
USHORT nIndex;
if ( pColl && pColl->SearchName( rDBName, nIndex ) )
{
@@ -284,7 +284,7 @@ BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi )
SCROW nEndRow;
pDBData->GetArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow );
- //! Undo nur benoetigte Daten ?
+ //! Undo nur benoetigte Daten ?
ScDocument* pUndoDoc = NULL;
ScOutlineTable* pUndoTab = NULL;
@@ -317,13 +317,13 @@ BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi )
else
pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, TRUE );
- // Datenbereich sichern - incl. Filter-Ergebnis
+ // Datenbereich sichern - incl. Filter-Ergebnis
pDoc->CopyToDocument( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab, IDF_ALL, FALSE, pUndoDoc );
- // alle Formeln wegen Referenzen
+ // alle Formeln wegen Referenzen
pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1, IDF_FORMULA, FALSE, pUndoDoc );
- // DB- und andere Bereiche
+ // DB- und andere Bereiche
ScRangeName* pDocRange = pDoc->GetRangeName();
if (pDocRange->GetCount())
pUndoRange = new ScRangeName( *pDocRange );
@@ -334,33 +334,33 @@ BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi )
if (bSort && bSubTotal)
{
- // Sortieren ohne SubTotals
+ // Sortieren ohne SubTotals
- aSubTotalParam.bRemoveOnly = TRUE; // wird unten wieder zurueckgesetzt
+ aSubTotalParam.bRemoveOnly = TRUE; // wird unten wieder zurueckgesetzt
DoSubTotals( nTab, aSubTotalParam, NULL, FALSE, bApi );
}
if (bSort)
{
- pDBData->GetSortParam( aSortParam ); // Bereich kann sich geaendert haben
+ pDBData->GetSortParam( aSortParam ); // Bereich kann sich geaendert haben
Sort( nTab, aSortParam, FALSE, FALSE, bApi );
}
if (bQuery)
{
- pDBData->GetQueryParam( aQueryParam ); // Bereich kann sich geaendert haben
+ pDBData->GetQueryParam( aQueryParam ); // Bereich kann sich geaendert haben
ScRange aAdvSource;
if (pDBData->GetAdvancedQuerySource(aAdvSource))
Query( nTab, aQueryParam, &aAdvSource, FALSE, bApi );
else
Query( nTab, aQueryParam, NULL, FALSE, bApi );
- // bei nicht-inplace kann die Tabelle umgestellt worden sein
-// if ( !aQueryParam.bInplace && aQueryParam.nDestTab != nTab )
-// SetTabNo( nTab );
+ // bei nicht-inplace kann die Tabelle umgestellt worden sein
+// if ( !aQueryParam.bInplace && aQueryParam.nDestTab != nTab )
+// SetTabNo( nTab );
}
if (bSubTotal)
{
- pDBData->GetSubTotalParam( aSubTotalParam ); // Bereich kann sich geaendert haben
+ pDBData->GetSubTotalParam( aSubTotalParam ); // Bereich kann sich geaendert haben
aSubTotalParam.bRemoveOnly = FALSE;
DoSubTotals( nTab, aSubTotalParam, NULL, FALSE, bApi );
}
@@ -402,7 +402,7 @@ BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi )
PAINT_GRID | PAINT_LEFT | PAINT_TOP | PAINT_SIZE );
bDone = TRUE;
}
- else if (!bApi) // "Keine Operationen auszufuehren"
+ else if (!bApi) // "Keine Operationen auszufuehren"
rDocShell.ErrorMessage(STR_MSSG_REPEATDB_0);
}
@@ -468,18 +468,18 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
aLocalParam.nCol2, aLocalParam.nRow2, nTab,
HASATTR_MERGED | HASATTR_OVERLAPPED ) )
{
- // Merge-Attribute wuerden beim Sortieren durcheinanderkommen
+ // Merge-Attribute wuerden beim Sortieren durcheinanderkommen
if (!bApi)
rDocShell.ErrorMessage(STR_SORT_ERR_MERGED);
return FALSE;
}
- // ausfuehren
+ // ausfuehren
WaitObject aWait( rDocShell.GetActiveDialogParent() );
- BOOL bRepeatQuery = FALSE; // bestehenden Filter wiederholen?
+ BOOL bRepeatQuery = FALSE; // bestehenden Filter wiederholen?
ScQueryParam aQueryParam;
pDBData->GetQueryParam( aQueryParam );
if ( aQueryParam.GetEntry(0).bDoQuery )
@@ -490,7 +490,7 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
if ( aQueryParam.bInplace ||
aQueryParam.nDestCol != rSortParam.nDestCol ||
aQueryParam.nDestRow != rSortParam.nDestRow ||
- aQueryParam.nDestTab != rSortParam.nDestTab ) // Query auf selben Zielbereich?
+ aQueryParam.nDestTab != rSortParam.nDestTab ) // Query auf selben Zielbereich?
bRepeatQuery = FALSE;
}
@@ -526,8 +526,8 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
pR = &aOldDest;
}
- // Zeilenhoehen immer (wegen automatischer Anpassung)
- //! auf ScBlockUndo umstellen
+ // Zeilenhoehen immer (wegen automatischer Anpassung)
+ //! auf ScBlockUndo umstellen
// if (bRepeatQuery)
pDoc->CopyToDocument( 0, aLocalParam.nRow1, nTab, MAXCOL, aLocalParam.nRow2, nTab,
IDF_NONE, FALSE, pUndoDoc );
@@ -548,7 +548,7 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
if ( bCopy )
{
if (pDestData)
- pDoc->DeleteAreaTab(aOldDest, IDF_CONTENTS); // Zielbereich vorher loeschen
+ pDoc->DeleteAreaTab(aOldDest, IDF_CONTENTS); // Zielbereich vorher loeschen
ScRange aSource( rSortParam.nCol1,rSortParam.nRow1,nSrcTab,
rSortParam.nCol2,rSortParam.nRow2,nSrcTab );
@@ -566,33 +566,33 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
{
ScSortParam aOldSortParam;
pDBData->GetSortParam( aOldSortParam );
- if ( aOldSortParam.bDoSort[0] && aOldSortParam.bInplace ) // Inplace-Sortierung gemerkt?
+ if ( aOldSortParam.bDoSort[0] && aOldSortParam.bInplace ) // Inplace-Sortierung gemerkt?
{
bSave = FALSE;
aOldSortParam.nDestCol = rSortParam.nDestCol;
aOldSortParam.nDestRow = rSortParam.nDestRow;
aOldSortParam.nDestTab = rSortParam.nDestTab;
- pDBData->SetSortParam( aOldSortParam ); // dann nur DestPos merken
+ pDBData->SetSortParam( aOldSortParam ); // dann nur DestPos merken
}
}
- if (bSave) // Parameter merken
+ if (bSave) // Parameter merken
{
pDBData->SetSortParam( rSortParam );
- pDBData->SetHeader( rSortParam.bHasHeader ); //! ???
- pDBData->SetByRow( rSortParam.bByRow ); //! ???
+ pDBData->SetHeader( rSortParam.bHasHeader ); //! ???
+ pDBData->SetByRow( rSortParam.bByRow ); //! ???
}
- if (bCopy) // neuen DB-Bereich merken
+ if (bCopy) // neuen DB-Bereich merken
{
- // Tabelle umschalten von aussen (View)
- //! SetCursor ??!?!
+ // Tabelle umschalten von aussen (View)
+ //! SetCursor ??!?!
ScRange aDestPos( aLocalParam.nCol1, aLocalParam.nRow1, nTab,
aLocalParam.nCol2, aLocalParam.nRow2, nTab );
ScDBData* pNewData;
if (pDestData)
- pNewData = pDestData; // Bereich vorhanden -> anpassen
- else // Bereich ab Cursor/Markierung wird angelegt
+ pNewData = pDestData; // Bereich vorhanden -> anpassen
+ else // Bereich ab Cursor/Markierung wird angelegt
pNewData = rDocShell.GetDBData(aDestPos, SC_DB_MAKE, SC_DBSEL_FORCE_MARK );
if (pNewData)
{
@@ -600,7 +600,7 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
aLocalParam.nCol1,aLocalParam.nRow1,
aLocalParam.nCol2,aLocalParam.nRow2 );
pNewData->SetSortParam( aLocalParam );
- pNewData->SetHeader( aLocalParam.bHasHeader ); //! ???
+ pNewData->SetHeader( aLocalParam.bHasHeader ); //! ???
pNewData->SetByRow( aLocalParam.bByRow );
}
else
@@ -666,8 +666,8 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
return FALSE;
}
- // Wechsel von Inplace auf nicht-Inplace, dann erst Inplace aufheben:
- // (nur, wenn im Dialog "Persistent" ausgewaehlt ist)
+ // Wechsel von Inplace auf nicht-Inplace, dann erst Inplace aufheben:
+ // (nur, wenn im Dialog "Persistent" ausgewaehlt ist)
if ( !rQueryParam.bInplace && pDBData->HasQueryParam() && rQueryParam.bDestPers )
{
@@ -675,7 +675,7 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
pDBData->GetQueryParam(aOldQuery);
if (aOldQuery.bInplace)
{
- // alte Filterung aufheben
+ // alte Filterung aufheben
SCSIZE nEC = aOldQuery.GetEntryCount();
for (SCSIZE i=0; i<nEC; i++)
@@ -685,11 +685,11 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
}
}
- ScQueryParam aLocalParam( rQueryParam ); // fuer Paint / Zielbereich
- BOOL bCopy = !rQueryParam.bInplace; // kopiert wird in Table::Query
- ScDBData* pDestData = NULL; // Bereich, in den kopiert wird
- BOOL bDoSize = FALSE; // Zielgroesse anpassen (einf./loeschen)
- SCCOL nFormulaCols = 0; // nur bei bDoSize
+ ScQueryParam aLocalParam( rQueryParam ); // fuer Paint / Zielbereich
+ BOOL bCopy = !rQueryParam.bInplace; // kopiert wird in Table::Query
+ ScDBData* pDestData = NULL; // Bereich, in den kopiert wird
+ BOOL bDoSize = FALSE; // Zielgroesse anpassen (einf./loeschen)
+ SCCOL nFormulaCols = 0; // nur bei bDoSize
BOOL bKeepFmt = FALSE;
ScRange aOldDest;
ScRange aDestTotal;
@@ -730,10 +730,10 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
nDestTab );
bDoSize = pDestData->IsDoSize();
- // Test, ob Formeln aufgefuellt werden muessen (nFormulaCols):
+ // Test, ob Formeln aufgefuellt werden muessen (nFormulaCols):
if ( bDoSize && aOldDest.aEnd.Col() == aDestTotal.aEnd.Col() )
{
- SCCOL nTestCol = aOldDest.aEnd.Col() + 1; // neben dem Bereich
+ SCCOL nTestCol = aOldDest.aEnd.Col() + 1; // neben dem Bereich
SCROW nTestRow = rQueryParam.nDestRow +
( aLocalParam.bHasHeader ? 1 : 0 );
while ( nTestCol <= MAXCOL &&
@@ -745,21 +745,21 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
if ( bDoSize && !pDoc->CanFitBlock( aOldDest, aDestTotal ) )
{
if (!bApi)
- rDocShell.ErrorMessage(STR_MSSG_DOSUBTOTALS_2); // kann keine Zeilen einfuegen
+ rDocShell.ErrorMessage(STR_MSSG_DOSUBTOTALS_2); // kann keine Zeilen einfuegen
return FALSE;
}
}
}
- // ausfuehren
+ // ausfuehren
WaitObject aWait( rDocShell.GetActiveDialogParent() );
- BOOL bKeepSub = FALSE; // bestehende Teilergebnisse wiederholen?
+ BOOL bKeepSub = FALSE; // bestehende Teilergebnisse wiederholen?
ScSubTotalParam aSubTotalParam;
- if (rQueryParam.GetEntry(0).bDoQuery) // nicht beim Aufheben
+ if (rQueryParam.GetEntry(0).bDoQuery) // nicht beim Aufheben
{
- pDBData->GetSubTotalParam( aSubTotalParam ); // Teilergebnisse vorhanden?
+ pDBData->GetSubTotalParam( aSubTotalParam ); // Teilergebnisse vorhanden?
if ( aSubTotalParam.bGroupActive[0] && !aSubTotalParam.bRemoveOnly )
bKeepSub = TRUE;
@@ -778,7 +778,7 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
pDoc->CopyToDocument( aLocalParam.nCol1, aLocalParam.nRow1, nDestTab,
aLocalParam.nCol2, aLocalParam.nRow2, nDestTab,
IDF_ALL, FALSE, pUndoDoc );
- // Attribute sichern, falls beim Filtern mitkopiert
+ // Attribute sichern, falls beim Filtern mitkopiert
if (pDestData)
{
@@ -802,18 +802,18 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
ScDocument* pAttribDoc = NULL;
ScRange aAttribRange;
- if (pDestData) // Zielbereich loeschen
+ if (pDestData) // Zielbereich loeschen
{
if ( bKeepFmt )
{
- // kleinere der End-Spalten, Header+1 Zeile
+ // kleinere der End-Spalten, Header+1 Zeile
aAttribRange = aOldDest;
if ( aAttribRange.aEnd.Col() > aDestTotal.aEnd.Col() )
aAttribRange.aEnd.SetCol( aDestTotal.aEnd.Col() );
aAttribRange.aEnd.SetRow( aAttribRange.aStart.Row() +
( aLocalParam.bHasHeader ? 1 : 0 ) );
- // auch fuer aufgefuellte Formeln
+ // auch fuer aufgefuellte Formeln
aAttribRange.aEnd.SetCol( aAttribRange.aEnd.Col() + nFormulaCols );
pAttribDoc = new ScDocument( SCDOCMODE_UNDO );
@@ -824,10 +824,10 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
if ( bDoSize )
pDoc->FitBlock( aOldDest, aDestTotal );
else
- pDoc->DeleteAreaTab(aOldDest, IDF_ALL); // einfach loeschen
+ pDoc->DeleteAreaTab(aOldDest, IDF_ALL); // einfach loeschen
}
- // Filtern am Dokument ausfuehren
+ // Filtern am Dokument ausfuehren
SCSIZE nCount = pDoc->Query( nTab, rQueryParam, bKeepSub );
if (bCopy)
{
@@ -837,17 +837,17 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
if ( bDoSize )
{
- // auf wirklichen Ergebnis-Bereich anpassen
- // (das hier ist immer eine Verkleinerung)
+ // auf wirklichen Ergebnis-Bereich anpassen
+ // (das hier ist immer eine Verkleinerung)
ScRange aNewDest( aLocalParam.nCol1, aLocalParam.nRow1, nDestTab,
aLocalParam.nCol2, aLocalParam.nRow2, nDestTab );
- pDoc->FitBlock( aDestTotal, aNewDest, FALSE ); // FALSE - nicht loeschen
+ pDoc->FitBlock( aDestTotal, aNewDest, FALSE ); // FALSE - nicht loeschen
if ( nFormulaCols > 0 )
{
- // Formeln ausfuellen
- //! Undo (Query und Repeat) !!!
+ // Formeln ausfuellen
+ //! Undo (Query und Repeat) !!!
ScRange aNewForm( aLocalParam.nCol2+1, aLocalParam.nRow1, nDestTab,
aLocalParam.nCol2+nFormulaCols, aLocalParam.nRow2, nDestTab );
@@ -865,9 +865,9 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
}
}
- if ( pAttribDoc ) // gemerkte Attribute zurueckkopieren
+ if ( pAttribDoc ) // gemerkte Attribute zurueckkopieren
{
- // Header
+ // Header
if (aLocalParam.bHasHeader)
{
ScRange aHdrRange = aAttribRange;
@@ -875,7 +875,7 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
pAttribDoc->CopyToDocument( aHdrRange, IDF_ATTRIB, FALSE, pDoc );
}
- // Daten
+ // Daten
SCCOL nAttrEndCol = aAttribRange.aEnd.Col();
SCROW nAttrRow = aAttribRange.aStart.Row() + ( aLocalParam.bHasHeader ? 1 : 0 );
for (SCCOL nCol = aAttribRange.aStart.Col(); nCol<=nAttrEndCol; nCol++)
@@ -896,27 +896,27 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
}
}
- // speichern: Inplace immer, sonst je nach Einstellung
- // alter Inplace-Filter ist ggf. schon aufgehoben
+ // speichern: Inplace immer, sonst je nach Einstellung
+ // alter Inplace-Filter ist ggf. schon aufgehoben
BOOL bSave = rQueryParam.bInplace || rQueryParam.bDestPers;
- if (bSave) // merken
+ if (bSave) // merken
{
pDBData->SetQueryParam( rQueryParam );
- pDBData->SetHeader( rQueryParam.bHasHeader ); //! ???
- pDBData->SetAdvancedQuerySource( pAdvSource ); // after SetQueryParam
+ pDBData->SetHeader( rQueryParam.bHasHeader ); //! ???
+ pDBData->SetAdvancedQuerySource( pAdvSource ); // after SetQueryParam
}
- if (bCopy) // neuen DB-Bereich merken
+ if (bCopy) // neuen DB-Bereich merken
{
- // selektieren wird hinterher von aussen (dbfunc)
- // momentan ueber DB-Bereich an der Zielposition, darum muss dort
- // auf jeden Fall ein Bereich angelegt werden.
+ // selektieren wird hinterher von aussen (dbfunc)
+ // momentan ueber DB-Bereich an der Zielposition, darum muss dort
+ // auf jeden Fall ein Bereich angelegt werden.
ScDBData* pNewData;
if (pDestData)
- pNewData = pDestData; // Bereich vorhanden -> anpassen (immer!)
- else // Bereich anlegen
+ pNewData = pDestData; // Bereich vorhanden -> anpassen (immer!)
+ else // Bereich anlegen
pNewData = rDocShell.GetDBData(
ScRange( aLocalParam.nCol1, aLocalParam.nRow1, nDestTab,
aLocalParam.nCol2, aLocalParam.nRow2, nDestTab ),
@@ -927,8 +927,8 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
pNewData->SetArea( nDestTab, aLocalParam.nCol1, aLocalParam.nRow1,
aLocalParam.nCol2, aLocalParam.nRow2 );
- // Query-Param wird am Ziel nicht mehr eingestellt, fuehrt nur zu Verwirrung
- // und Verwechslung mit dem Query-Param am Quellbereich (#37187#)
+ // Query-Param wird am Ziel nicht mehr eingestellt, fuehrt nur zu Verwirrung
+ // und Verwechslung mit dem Query-Param am Quellbereich (#37187#)
}
else
{
@@ -938,7 +938,7 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
if (!bCopy)
{
- pDoc->InvalidatePageBreaks(nTab);
+ pDoc->InvalidatePageBreaks(nTab);
pDoc->UpdatePageBreaks( nTab );
}
@@ -985,12 +985,12 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
const ScSortParam* pForceNewSort, BOOL bRecord, BOOL bApi )
{
- //! auch fuer ScDBFunc::DoSubTotals benutzen!
- // dann bleibt aussen:
- // - neuen Bereich (aus DBData) markieren
- // - SelectionChanged (?)
+ //! auch fuer ScDBFunc::DoSubTotals benutzen!
+ // dann bleibt aussen:
+ // - neuen Bereich (aus DBData) markieren
+ // - SelectionChanged (?)
- BOOL bDo = !rParam.bRemoveOnly; // FALSE = nur loeschen
+ BOOL bDo = !rParam.bRemoveOnly; // FALSE = nur loeschen
BOOL bRet = FALSE;
ScDocument* pDoc = rDocShell.GetDocument();
@@ -1016,7 +1016,7 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
rParam.nCol2, rParam.nRow2, nTab, HASATTR_MERGED | HASATTR_OVERLAPPED ))
{
if (!bApi)
- rDocShell.ErrorMessage(STR_MSSG_INSERTCELLS_0); // nicht in zusammengefasste einfuegen
+ rDocShell.ErrorMessage(STR_MSSG_INSERTCELLS_0); // nicht in zusammengefasste einfuegen
return FALSE;
}
@@ -1038,14 +1038,14 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
WaitObject aWait( rDocShell.GetActiveDialogParent() );
ScDocShellModificator aModificator( rDocShell );
- ScSubTotalParam aNewParam( rParam ); // Bereichsende wird veraendert
- ScDocument* pUndoDoc = NULL;
- ScOutlineTable* pUndoTab = NULL;
- ScRangeName* pUndoRange = NULL;
+ ScSubTotalParam aNewParam( rParam ); // Bereichsende wird veraendert
+ ScDocument* pUndoDoc = NULL;
+ ScOutlineTable* pUndoTab = NULL;
+ ScRangeName* pUndoRange = NULL;
ScDBCollection* pUndoDB = NULL;
- SCTAB nTabCount = 0; // fuer Referenz-Undo
+ SCTAB nTabCount = 0; // fuer Referenz-Undo
- if (bRecord) // alte Daten sichern
+ if (bRecord) // alte Daten sichern
{
BOOL bOldFilter = bDo && rParam.bDoSort;
@@ -1069,15 +1069,15 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
else
pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, bOldFilter );
- // Datenbereich sichern - incl. Filter-Ergebnis
+ // Datenbereich sichern - incl. Filter-Ergebnis
pDoc->CopyToDocument( 0,rParam.nRow1+1,nTab, MAXCOL,rParam.nRow2,nTab,
IDF_ALL, FALSE, pUndoDoc );
- // alle Formeln wegen Referenzen
+ // alle Formeln wegen Referenzen
pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1,
IDF_FORMULA, FALSE, pUndoDoc );
- // DB- und andere Bereiche
+ // DB- und andere Bereiche
ScRangeName* pDocRange = pDoc->GetRangeName();
if (pDocRange->GetCount())
pUndoRange = new ScRangeName( *pDocRange );
@@ -1086,10 +1086,10 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
pUndoDB = new ScDBCollection( *pDocDB );
}
-// pDoc->SetOutlineTable( nTab, NULL );
- ScOutlineTable* pOut = pDoc->GetOutlineTable( nTab );
+// pDoc->SetOutlineTable( nTab, NULL );
+ ScOutlineTable* pOut = pDoc->GetOutlineTable( nTab );
if (pOut)
- pOut->GetRowArray()->RemoveAll(); // nur Zeilen-Outlines loeschen
+ pOut->GetRowArray()->RemoveAll(); // nur Zeilen-Outlines loeschen
if (rParam.bReplace)
pDoc->RemoveSubTotals( nTab, aNewParam );
@@ -1101,8 +1101,8 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
{
pDBData->SetArea( nTab, aNewParam.nCol1,aNewParam.nRow1, aNewParam.nCol2,aNewParam.nRow2 );
- // Teilergebnis-Felder vor die Sortierung setzen
- // (doppelte werden weggelassen, kann darum auch wieder aufgerufen werden)
+ // Teilergebnis-Felder vor die Sortierung setzen
+ // (doppelte werden weggelassen, kann darum auch wieder aufgerufen werden)
ScSortParam aOldSort;
pDBData->GetSortParam( aOldSort );
@@ -1118,7 +1118,7 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
if (bRecord)
{
-// ScDBData* pUndoDBData = pDBData ? new ScDBData( *pDBData ) : NULL;
+// ScDBData* pUndoDBData = pDBData ? new ScDBData( *pDBData ) : NULL;
rDocShell.GetUndoManager()->AddUndoAction(
new ScUndoSubTotals( &rDocShell, nTab,
rParam, aNewParam.nRow2,
@@ -1158,12 +1158,12 @@ BOOL lcl_EmptyExcept( ScDocument* pDoc, const ScRange& rRange, const ScRange& rE
if ( !pCell->IsBlank() ) // real content?
{
if ( !rExcept.In( ScAddress( aIter.GetCol(), aIter.GetRow(), aIter.GetTab() ) ) )
- return FALSE; // cell found
+ return FALSE; // cell found
}
pCell = aIter.GetNext();
}
- return TRUE; // nothing found - empty
+ return TRUE; // nothing found - empty
}
BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj,
@@ -1180,15 +1180,15 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
ScDocument* pNewUndoDoc = NULL;
ScDPObject* pUndoDPObj = NULL;
if ( bRecord && pOldObj )
- pUndoDPObj = new ScDPObject( *pOldObj ); // copy old settings for undo
+ pUndoDPObj = new ScDPObject( *pOldObj ); // copy old settings for undo
ScDocument* pDoc = rDocShell.GetDocument();
if (bRecord && !pDoc->IsUndoEnabled())
bRecord = FALSE;
if ( !rDocShell.IsEditable() || pDoc->GetChangeTrack() )
{
- // not recorded -> disallow
- //! different error messages?
+ // not recorded -> disallow
+ //! different error messages?
nErrId = STR_PROTECTIONERR;
}
@@ -1201,9 +1201,9 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
}
if ( pNewObj && !nErrId )
{
- // at least one cell at the output position must be editable
- // -> check in advance
- // (start of output range in pNewObj is valid)
+ // at least one cell at the output position must be editable
+ // -> check in advance
+ // (start of output range in pNewObj is valid)
ScRange aNewStart( pNewObj->GetOutRange().aStart );
ScEditableTester aTester( pDoc, aNewStart );
@@ -1216,7 +1216,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
{
if ( pOldObj && !pNewObj )
{
- // delete table
+ // delete table
ScRange aRange = pOldObj->GetOutRange();
SCTAB nTab = aRange.aStart.Tab();
@@ -1237,7 +1237,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
pDoc->GetDPCollection()->FreeTable( pOldObj ); // object is deleted here
- rDocShell.PostPaintGridAll(); //! only necessary parts
+ rDocShell.PostPaintGridAll(); //! only necessary parts
rDocShell.PostPaint( aRange.aStart.Col(), aRange.aStart.Row(), nTab,
aRange.aEnd.Col(), aRange.aEnd.Row(), nTab,
PAINT_GRID );
@@ -1258,16 +1258,16 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
if ( pNewObj == pOldObj )
{
- // refresh only - no settings modified
+ // refresh only - no settings modified
}
else
{
- pNewObj->WriteSourceDataTo( *pOldObj ); // copy source data
+ pNewObj->WriteSourceDataTo( *pOldObj ); // copy source data
ScDPSaveData* pData = pNewObj->GetSaveData();
DBG_ASSERT( pData, "no SaveData from living DPObject" );
if ( pData )
- pOldObj->SetSaveData( *pData ); // copy SaveData
+ pOldObj->SetSaveData( *pData ); // copy SaveData
}
pDestObj = pOldObj;
@@ -1275,7 +1275,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
}
else
{
- // output range must be set at pNewObj
+ // output range must be set at pNewObj
pDestObj = new ScDPObject( *pNewObj );
@@ -1300,18 +1300,18 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
if ( pNewObj == pOldObj && pDestObj->IsImportData() )
pDestObj->InvalidateSource();
- pDestObj->InvalidateData(); // before getting the new output area
+ pDestObj->InvalidateData(); // before getting the new output area
- // make sure the table has a name (not set by dialog)
+ // make sure the table has a name (not set by dialog)
if ( !pDestObj->GetName().Len() )
pDestObj->SetName( pDoc->GetDPCollection()->CreateNewName() );
BOOL bOverflow = FALSE;
ScRange aNewOut = pDestObj->GetNewOutputRange( bOverflow );
- //! test for overlap with other data pilot tables
+ //! test for overlap with other data pilot tables
if( pOldObj )
- {
+ {
const ScSheetSourceDesc* pSheetDesc = pOldObj->GetSheetDesc();
if( pSheetDesc && pSheetDesc->aSourceRange.Intersects( aNewOut ) )
{
@@ -1326,7 +1326,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
if ( bOverflow )
{
- // like with STR_PROTECTIONERR, use undo to reverse everything
+ // like with STR_PROTECTIONERR, use undo to reverse everything
DBG_ASSERT( bRecord, "DataPilotUpdate: can't undo" );
bUndoSelf = TRUE;
nErrId = STR_PIVOT_ERROR;
@@ -1336,22 +1336,22 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
ScEditableTester aTester( pDoc, aNewOut );
if ( !aTester.IsEditable() )
{
- // destination area isn't editable
- //! reverse everything done so far, don't proceed
+ // destination area isn't editable
+ //! reverse everything done so far, don't proceed
- // quick solution: proceed to end, use undo action
- // to reverse everything:
+ // quick solution: proceed to end, use undo action
+ // to reverse everything:
DBG_ASSERT( bRecord, "DataPilotUpdate: can't undo" );
bUndoSelf = TRUE;
nErrId = aTester.GetMessageId();
}
}
- // test if new output area is empty except for old area
+ // test if new output area is empty except for old area
if ( !bApi )
{
BOOL bEmpty;
- if ( pOldObj ) // OutRange of pOldObj (pDestObj) is still old area
+ if ( pOldObj ) // OutRange of pOldObj (pDestObj) is still old area
bEmpty = lcl_EmptyExcept( pDoc, aNewOut, pOldObj->GetOutRange() );
else
bEmpty = pDoc->IsBlockEmpty( aNewOut.aStart.Tab(),
@@ -1364,7 +1364,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
ScGlobal::GetRscString(STR_PIVOT_NOTEMPTY) );
if (aBox.Execute() == RET_NO)
{
- //! like above (not editable), use undo to reverse everything
+ //! like above (not editable), use undo to reverse everything
DBG_ASSERT( bRecord, "DataPilotUpdate: can't undo" );
bUndoSelf = TRUE;
}
@@ -1381,7 +1381,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
pDestObj->Output( aNewOut.aStart );
- rDocShell.PostPaintGridAll(); //! only necessary parts
+ rDocShell.PostPaintGridAll(); //! only necessary parts
bDone = TRUE;
}
}
@@ -1393,13 +1393,13 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
SfxUndoAction* pAction = new ScUndoDataPilot( &rDocShell,
pOldUndoDoc, pNewUndoDoc, pUndoDPObj, pDestObj, bAllowMove );
pOldUndoDoc = NULL;
- pNewUndoDoc = NULL; // pointers are used in undo action
+ pNewUndoDoc = NULL; // pointers are used in undo action
// pUndoDPObj is copied
if (bUndoSelf)
{
- // use undo action to restore original state
- //! prevent setting the document modified? (ScDocShellModificator)
+ // use undo action to restore original state
+ //! prevent setting the document modified? (ScDocShellModificator)
pAction->Undo();
delete pAction;
@@ -1409,7 +1409,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
rDocShell.GetUndoManager()->AddUndoAction( pAction );
}
- delete pOldUndoDoc; // if not used for undo
+ delete pOldUndoDoc; // if not used for undo
delete pNewUndoDoc;
delete pUndoDPObj;
@@ -1429,7 +1429,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb
//==================================================================
//
-// Datenbank-Import...
+// Datenbank-Import...
void ScDBDocFunc::UpdateImport( const String& rTarget, const String& rDBName,
const String& rTableName, const String& rStatement, BOOL bNative,
@@ -1437,7 +1437,7 @@ void ScDBDocFunc::UpdateImport( const String& rTarget, const String& rDBName,
::com::sun::star::sdbc::XResultSet >& xResultSet,
const SbaSelectionList* pSelection )
{
- // Target ist jetzt einfach der Bereichsname
+ // Target ist jetzt einfach der Bereichsname
ScDocument* pDoc = rDocShell.GetDocument();
ScDBCollection& rDBColl = *pDoc->GetDBCollection();
@@ -1467,31 +1467,31 @@ void ScDBDocFunc::UpdateImport( const String& rTarget, const String& rDBName,
BOOL bSql = ( rStatement.Len() != 0 );
- aImportParam.aDBName = rDBName;
- aImportParam.bSql = bSql;
+ aImportParam.aDBName = rDBName;
+ aImportParam.bSql = bSql;
aImportParam.aStatement = bSql ? rStatement : rTableName;
- aImportParam.bNative = bNative;
- aImportParam.nType = nType;
- aImportParam.bImport = TRUE;
+ aImportParam.bNative = bNative;
+ aImportParam.nType = nType;
+ aImportParam.bImport = TRUE;
BOOL bContinue = DoImport( nTab, aImportParam, xResultSet, pSelection, TRUE );
- // DB-Operationen wiederholen
+ // DB-Operationen wiederholen
ScTabViewShell* pViewSh = rDocShell.GetBestViewShell();
if (pViewSh)
{
ScRange aRange;
pData->GetArea(aRange);
- pViewSh->MarkRange(aRange); // selektieren
+ pViewSh->MarkRange(aRange); // selektieren
- if ( bContinue ) // #41905# Fehler beim Import -> Abbruch
+ if ( bContinue ) // #41905# Fehler beim Import -> Abbruch
{
- // interne Operationen, wenn welche gespeichert
+ // interne Operationen, wenn welche gespeichert
if ( pData->HasQueryParam() || pData->HasSortParam() || pData->HasSubTotalParam() )
pViewSh->RepeatDB();
- // Pivottabellen die den Bereich als Quelldaten haben
+ // Pivottabellen die den Bereich als Quelldaten haben
rDocShell.RefreshPivotTables(aRange);
}
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index a073e50d105c..6a91431c1a2e 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,20 +68,20 @@
using namespace com::sun::star;
-#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"
-#define SC_DBPROP_SELECTION "Selection"
-#define SC_DBPROP_CURSOR "Cursor"
+//! move to a header file?
+#define SC_DBPROP_DATASOURCENAME "DataSourceName"
+#define SC_DBPROP_COMMAND "Command"
+#define SC_DBPROP_COMMANDTYPE "CommandType"
+#define SC_DBPROP_SELECTION "Selection"
+#define SC_DBPROP_CURSOR "Cursor"
// static
void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFrame )
{
- // called after opening the database beamer
+ // called after opening the database beamer
if ( !pFrame || !rParam.bImport )
return;
@@ -179,21 +179,21 @@ BOOL ScDBDocFunc::DoImportUno( const ScAddress& rPos,
aList.Insert( (void*)nEntry, LIST_APPEND );
}
- BOOL bAddrInsert = FALSE; //!???
+ BOOL bAddrInsert = FALSE; //!???
if ( bAddrInsert )
{
bDone = DoImport( rPos.Tab(), aImParam, xResSet, &aList, TRUE, bAddrInsert );
}
else
{
- // create database range
- //! merge this with SID_SBA_IMPORT execute in docsh4.cxx
+ // create database range
+ //! merge this with SID_SBA_IMPORT execute in docsh4.cxx
ScDBData* pDBData = rDocShell.GetDBData( ScRange(rPos), SC_DB_IMPORT, SC_DBSEL_KEEP );
DBG_ASSERT(pDBData, "can't create DB data");
String sTarget = pDBData->GetName();
- //! change UpdateImport to use only one of rTableName, rStatement
+ //! change UpdateImport to use only one of rTableName, rStatement
String aTableName, aStatement;
if ( aImParam.bSql )
@@ -238,24 +238,24 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
ScDocShellModificator aModificator( rDocShell );
BOOL bSuccess = FALSE;
- BOOL bApi = FALSE; //! pass as argument
- BOOL bTruncated = FALSE; // for warning
+ BOOL bApi = FALSE; //! pass as argument
+ BOOL bTruncated = FALSE; // for warning
USHORT nErrStringId = 0;
String aErrorMessage;
SCCOL nCol = rParam.nCol1;
SCROW nRow = rParam.nRow1;
- SCCOL nEndCol = nCol; // end of resulting database area
+ SCCOL nEndCol = nCol; // end of resulting database area
SCROW nEndRow = nRow;
long i;
BOOL bDoSelection = FALSE;
- BOOL bRealSelection = FALSE; // TRUE if not everything is selected
+ BOOL bRealSelection = FALSE; // TRUE if not everything is selected
ULONG nListPos = 0;
ULONG nRowsRead = 0;
ULONG nListCount = 0;
- // -1 is special
+ // -1 is special
if ( pSelection && pSelection->Count() && (long)pSelection->GetObject(0) != -1L )
{
bDoSelection = TRUE;
@@ -268,13 +268,13 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
ScColumn::bDoubleAlloc = TRUE;
//
- // get data from database into import document
+ // get data from database into import document
//
try
{
- // progress bar
- // only text (title is still needed, for the cancel button)
+ // progress bar
+ // only text (title is still needed, for the cancel button)
ScProgress aProgress( &rDocShell, ScGlobal::GetRscString(STR_UNDO_IMPORTDATA), 0 );
USHORT nInserted = 0;
@@ -293,7 +293,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
if ( xRowProp.is() )
{
//
- // set source parameters
+ // set source parameters
//
sal_Int32 nType = rParam.bSql ? sdb::CommandType::COMMAND :
@@ -329,7 +329,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
if ( xRowSet.is() )
{
//
- // get column descriptions
+ // get column descriptions
//
long nColCount = 0;
@@ -338,12 +338,12 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
if ( xMetaSupp.is() )
xMeta = xMetaSupp->getMetaData();
if ( xMeta.is() )
- nColCount = xMeta->getColumnCount(); // this is the number of real columns
+ nColCount = xMeta->getColumnCount(); // this is the number of real columns
if ( rParam.nCol1 + nColCount - 1 > MAXCOL )
{
nColCount = 0;
- //! error message
+ //! error message
}
uno::Reference<sdbc::XRow> xRow( xRowSet, uno::UNO_QUERY );
@@ -351,8 +351,8 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
{
nEndCol = (SCCOL)( rParam.nCol1 + nColCount - 1 );
- uno::Sequence<sal_Int32> aColTypes( nColCount ); // column types
- uno::Sequence<sal_Bool> aColCurr( nColCount ); // currency flag is not in types
+ uno::Sequence<sal_Int32> aColTypes( nColCount ); // column types
+ uno::Sequence<sal_Bool> aColCurr( nColCount ); // currency flag is not in types
sal_Int32* pTypeArr = aColTypes.getArray();
sal_Bool* pCurrArr = aColCurr.getArray();
for (i=0; i<nColCount; i++)
@@ -361,7 +361,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
pCurrArr[i] = xMeta->isCurrency( i+1 );
}
- if ( !bAddrInsert ) // read column names
+ if ( !bAddrInsert ) // read column names
{
nCol = rParam.nCol1;
for (i=0; i<nColCount; i++)
@@ -378,7 +378,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
xRowSet->beforeFirst();
while ( !bEnd )
{
- // skip rows that are not selected
+ // skip rows that are not selected
if ( !bDoSelection )
{
if ( (bEnd = !xRowSet->next()) == FALSE )
@@ -415,7 +415,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
nEndRow = nRow;
++nRow;
- // progress bar
+ // progress bar
++nInserted;
if (!(nInserted & 15))
@@ -425,7 +425,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
aText += String::CreateFromInt32( nInserted );
aText += aPict.GetToken(1,'#');
- if (!aProgress.SetStateText( 0, aText )) // stopped by user?
+ if (!aProgress.SetStateText( 0, aText )) // stopped by user?
{
bEnd = TRUE;
bSuccess = FALSE;
@@ -433,10 +433,10 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
}
}
}
- else // past the end of the spreadsheet
+ else // past the end of the spreadsheet
{
- bEnd = TRUE; // don't continue
- bTruncated = TRUE; // warning flag
+ bEnd = TRUE; // don't continue
+ bTruncated = TRUE; // warning flag
}
}
}
@@ -461,19 +461,19 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
pImportDoc->DoColResize( nTab, rParam.nCol1,nEndCol, 0 );
//
- // test for cell protection
+ // test for cell protection
//
BOOL bKeepFormat = !bAddrInsert && pDBData->IsKeepFmt();
BOOL bMoveCells = !bAddrInsert && pDBData->IsDoSize();
- SCCOL nFormulaCols = 0; // columns to be filled with formulas
+ SCCOL nFormulaCols = 0; // columns to be filled with formulas
if (bMoveCells && nEndCol == rParam.nCol2)
{
- // if column count changes, formulas would become invalid anyway
- // -> only set nFormulaCols for unchanged column count
+ // if column count changes, formulas would become invalid anyway
+ // -> only set nFormulaCols for unchanged column count
- SCCOL nTestCol = rParam.nCol2 + 1; // right of the data
- SCROW nTestRow = rParam.nRow1 + 1; // below the title row
+ SCCOL nTestCol = rParam.nCol2 + 1; // right of the data
+ SCROW nTestRow = rParam.nRow1 + 1; // below the title row
while ( nTestCol <= MAXCOL &&
pDoc->GetCellType(ScAddress( nTestCol, nTestRow, nTab )) == CELLTYPE_FORMULA )
++nTestCol, ++nFormulaCols;
@@ -481,7 +481,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
if (bSuccess)
{
- // old and new range editable?
+ // old and new range editable?
ScEditableTester aTester;
aTester.TestBlock( pDoc, nTab, rParam.nCol1,rParam.nRow1,rParam.nCol2,rParam.nRow2 );
aTester.TestBlock( pDoc, nTab, rParam.nCol1,rParam.nRow1,nEndCol,nEndRow );
@@ -505,23 +505,23 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
nEndCol+nFormulaCols, nEndRow, nTab );
if (!pDoc->CanFitBlock( aOld, aNew ))
{
- nErrStringId = STR_MSSG_DOSUBTOTALS_2; // can't insert cells
+ nErrStringId = STR_MSSG_DOSUBTOTALS_2; // can't insert cells
bSuccess = FALSE;
}
}
//
- // copy data from import doc into real document
+ // copy data from import doc into real document
//
if ( bSuccess )
{
if (bKeepFormat)
{
- // keep formatting of title and first data row from the document
- // CopyToDocument also copies styles, Apply... needs separate calls
+ // keep formatting of title and first data row from the document
+ // CopyToDocument also copies styles, Apply... needs separate calls
- SCCOL nMinEndCol = Min( rParam.nCol2, nEndCol ); // not too much
+ SCCOL nMinEndCol = Min( rParam.nCol2, nEndCol ); // not too much
nMinEndCol = sal::static_int_cast<SCCOL>( nMinEndCol + nFormulaCols ); // only if column count unchanged
pImportDoc->DeleteAreaTab( 0,0, MAXCOL,MAXROW, nTab, IDF_ATTRIB );
pDoc->CopyToDocument( rParam.nCol1, rParam.nRow1, nTab,
@@ -542,7 +542,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
}
}
- // don't set cell protection attribute if table is protected
+ // don't set cell protection attribute if table is protected
if (pDoc->IsTabProtected(nTab))
{
ScPatternAttr aPattern(pImportDoc->GetPool());
@@ -551,10 +551,10 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
}
//
- // copy old data for undo
+ // copy old data for undo
//
- SCCOL nUndoEndCol = Max( nEndCol, rParam.nCol2 ); // rParam = old end
+ SCCOL nUndoEndCol = Max( nEndCol, rParam.nCol2 ); // rParam = old end
SCROW nUndoEndRow = Max( nEndRow, rParam.nRow2 );
ScDocument* pUndoDoc = NULL;
@@ -576,7 +576,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
// do not touch notes (ScUndoImportData does not support drawing undo)
sal_uInt16 nCopyFlags = IDF_ALL & ~IDF_NOTE;
- // nFormulaCols is set only if column count is unchanged
+ // nFormulaCols is set only if column count is unchanged
pDoc->CopyToDocument( rParam.nCol1, rParam.nRow1, nTab,
nEndCol+nFormulaCols, nEndRow, nTab,
nCopyFlags, FALSE, pUndoDoc );
@@ -591,13 +591,13 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
}
//
- // move new data
+ // move new data
//
if (bMoveCells)
{
- // clear only the range without the formulas,
- // so the formula title and first row are preserved
+ // clear only the range without the formulas,
+ // so the formula title and first row are preserved
ScRange aDelRange( rParam.nCol1, rParam.nRow1, nTab,
rParam.nCol2, rParam.nRow2, nTab );
@@ -607,18 +607,18 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
rParam.nCol2+nFormulaCols, rParam.nRow2, nTab );
ScRange aNew( rParam.nCol1, rParam.nRow1, nTab,
nEndCol+nFormulaCols, nEndRow, nTab );
- pDoc->FitBlock( aOld, aNew, FALSE ); // Formeln nicht loeschen
+ pDoc->FitBlock( aOld, aNew, FALSE ); // Formeln nicht loeschen
}
- else if ( nEndCol < rParam.nCol2 ) // DeleteArea calls PutInOrder
+ else if ( nEndCol < rParam.nCol2 ) // DeleteArea calls PutInOrder
pDoc->DeleteArea( nEndCol+1, rParam.nRow1, rParam.nCol2, rParam.nRow2,
aNewMark, IDF_CONTENTS & ~IDF_NOTE );
- // CopyToDocument doesn't remove contents
+ // CopyToDocument doesn't remove contents
pDoc->DeleteAreaTab( rParam.nCol1, rParam.nRow1, nEndCol, nEndRow, nTab, IDF_CONTENTS & ~IDF_NOTE );
- // #41216# remove each column from ImportDoc after copying to reduce memory usage
+ // #41216# remove each column from ImportDoc after copying to reduce memory usage
BOOL bOldAutoCalc = pDoc->GetAutoCalc();
- pDoc->SetAutoCalc( FALSE ); // outside of the loop
+ pDoc->SetAutoCalc( FALSE ); // outside of the loop
for (SCCOL nCopyCol = rParam.nCol1; nCopyCol <= nEndCol; nCopyCol++)
{
pImportDoc->CopyToDocument( nCopyCol, rParam.nRow1, nTab, nCopyCol, nEndRow, nTab,
@@ -628,9 +628,9 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
}
pDoc->SetAutoCalc( bOldAutoCalc );
- if (nFormulaCols > 0) // copy formulas
+ if (nFormulaCols > 0) // copy formulas
{
- if (bKeepFormat) // formats for formulas
+ if (bKeepFormat) // formats for formulas
pImportDoc->CopyToDocument( nEndCol+1, rParam.nRow1, nTab,
nEndCol+nFormulaCols, nEndRow, nTab,
IDF_ATTRIB, FALSE, pDoc );
@@ -641,9 +641,9 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
aMark, nEndRow-rParam.nRow1-1, FILL_TO_BOTTOM, FILL_SIMPLE );
}
- // if new range is smaller, clear old contents
+ // if new range is smaller, clear old contents
- if (!bMoveCells) // move has happened above
+ if (!bMoveCells) // move has happened above
{
if ( rParam.nCol2 > nEndCol )
pDoc->DeleteArea( nEndCol+1, rParam.nRow1, rParam.nCol2, rParam.nRow2,
@@ -653,7 +653,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
aNewMark, IDF_CONTENTS );
}
- if( !bAddrInsert ) // update database range
+ if( !bAddrInsert ) // update database range
{
pDBData->SetImportParam( rParam );
pDBData->SetHeader( TRUE );
@@ -668,7 +668,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
ScDocument* pRedoDoc = pImportDoc;
pImportDoc = NULL;
- if (nFormulaCols > 0) // include filled formulas for redo
+ if (nFormulaCols > 0) // include filled formulas for redo
pDoc->CopyToDocument( rParam.nCol1, rParam.nRow1, nTab,
nEndCol+nFormulaCols, nEndRow, nTab,
IDF_ALL & ~IDF_NOTE, FALSE, pRedoDoc );
@@ -692,7 +692,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
if (pWaitWin)
pWaitWin->LeaveWait();
- if ( bTruncated && !bApi ) // show warning
+ if ( bTruncated && !bApi ) // show warning
ErrorHandler::HandleError(SCWARN_IMPORT_RANGE_OVERFLOW);
}
else if ( !bApi )
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 36b6641d94a6..f6058b2aeb46 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "drwlayer.hxx"
#include "editutil.hxx"
#include "globstr.hrc"
-//CHINA001 #include "namecrea.hxx" // NAME_TOP etc.
+//CHINA001 #include "namecrea.hxx" // NAME_TOP etc.
#include "olinetab.hxx"
#include "patattr.hxx"
#include "rangenam.hxx"
@@ -133,14 +133,14 @@ IMPL_LINK( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction )
//------------------------------------------------------------------------
-// Zeile ueber dem Range painten (fuer Linien nach AdjustRowHeight)
+// Zeile ueber dem Range painten (fuer Linien nach AdjustRowHeight)
void lcl_PaintAbove( ScDocShell& rDocShell, const ScRange& rRange )
{
SCROW nRow = rRange.aStart.Row();
if ( nRow > 0 )
{
- SCTAB nTab = rRange.aStart.Tab(); //! alle?
+ SCTAB nTab = rRange.aStart.Tab(); //! alle?
--nRow;
rDocShell.PostPaint( ScRange(0,nRow,nTab, MAXCOL,nRow,nTab), PAINT_GRID );
}
@@ -153,7 +153,7 @@ BOOL ScDocFunc::AdjustRowHeight( const ScRange& rRange, BOOL bPaint )
ScDocument* pDoc = rDocShell.GetDocument();
if ( pDoc->IsImportingXML() )
{
- // for XML import, all row heights are updated together after importing
+ // for XML import, all row heights are updated together after importing
return FALSE;
}
if ( !pDoc->IsAdjustHeightEnabled() )
@@ -477,13 +477,13 @@ BOOL ScDocFunc::DetectiveRefresh( BOOL bAutomatic )
if (bUndo)
pModel->BeginCalcUndo();
- // Loeschen auf allen Tabellen
+ // Loeschen auf allen Tabellen
SCTAB nTabCount = pDoc->GetTableCount();
for (SCTAB nTab=0; nTab<nTabCount; nTab++)
- ScDetectiveFunc( pDoc,nTab ).DeleteAll( SC_DET_ARROWS ); // don't remove circles
+ ScDetectiveFunc( pDoc,nTab ).DeleteAll( SC_DET_ARROWS ); // don't remove circles
- // Wiederholen
+ // Wiederholen
USHORT nCount = pList->Count();
for (USHORT i=0; i<nCount; i++)
@@ -524,7 +524,7 @@ BOOL ScDocFunc::DetectiveRefresh( BOOL bAutomatic )
if (pUndo)
{
pUndo->SetComment( ScGlobal::GetRscString( STR_UNDO_DETREFRESH ) );
- // wenn automatisch, an letzte Aktion anhaengen
+ // wenn automatisch, an letzte Aktion anhaengen
rDocShell.GetUndoManager()->AddUndoAction(
new ScUndoDraw( pUndo, &rDocShell ),
bAutomatic );
@@ -566,7 +566,7 @@ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags,
BOOL bSimple = FALSE;
ScMarkData aMultiMark = rMark;
- aMultiMark.SetMarking(FALSE); // fuer MarkToMulti
+ aMultiMark.SetMarking(FALSE); // fuer MarkToMulti
ScDocument* pUndoDoc = NULL;
BOOL bMulti = !bSimple && aMultiMark.IsMultiMarked();
@@ -593,15 +593,15 @@ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags,
bObjects = FALSE;
}
- USHORT nExtFlags = 0; // extra flags are needed only if attributes are deleted
+ USHORT nExtFlags = 0; // extra flags are needed only if attributes are deleted
if ( nFlags & IDF_ATTRIB )
rDocShell.UpdatePaintExt( nExtFlags, aMarkRange );
- // Reihenfolge:
- // 1) BeginDrawUndo
- // 2) Objekte loeschen (DrawUndo wird gefuellt)
- // 3) Inhalte fuer Undo kopieren und Undo-Aktion anlegen
- // 4) Inhalte loeschen
+ // Reihenfolge:
+ // 1) BeginDrawUndo
+ // 2) Objekte loeschen (DrawUndo wird gefuellt)
+ // 3) Inhalte fuer Undo kopieren und Undo-Aktion anlegen
+ // 4) Inhalte loeschen
bool bDrawUndo = bObjects || (nFlags & IDF_NOTE);
if (bRecord && bDrawUndo)
@@ -622,21 +622,21 @@ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags,
pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
pUndoDoc->InitUndo( pDoc, aMarkRange.aStart.Tab(), aMarkRange.aEnd.Tab() );
- // bei "Format/Standard" alle Attribute kopieren, weil CopyToDocument
- // nur mit IDF_HARDATTR zu langsam ist:
+ // bei "Format/Standard" alle Attribute kopieren, weil CopyToDocument
+ // nur mit IDF_HARDATTR zu langsam ist:
USHORT nUndoDocFlags = nFlags;
if (nFlags & IDF_ATTRIB)
nUndoDocFlags |= IDF_ATTRIB;
- if (nFlags & IDF_EDITATTR) // Edit-Engine-Attribute
- nUndoDocFlags |= IDF_STRING; // -> Zellen werden geaendert
+ if (nFlags & IDF_EDITATTR) // Edit-Engine-Attribute
+ nUndoDocFlags |= IDF_STRING; // -> Zellen werden geaendert
if (nFlags & IDF_NOTE)
- nUndoDocFlags |= IDF_CONTENTS; // #68795# copy all cells with their notes
+ nUndoDocFlags |= IDF_CONTENTS; // #68795# copy all cells with their notes
// note captions are handled in drawing undo
nUndoDocFlags |= IDF_NOCAPTIONS;
pDoc->CopyToDocument( aExtendedRange, nUndoDocFlags, bMulti, pUndoDoc, &aMultiMark );
}
-//! HideAllCursors(); // falls Zusammenfassung aufgehoben wird
+//! HideAllCursors(); // falls Zusammenfassung aufgehoben wird
if (bSimple)
pDoc->DeleteArea( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(),
aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(),
@@ -656,21 +656,21 @@ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags,
if (!AdjustRowHeight( aExtendedRange ))
rDocShell.PostPaint( aExtendedRange, PAINT_GRID, nExtFlags );
else if (nExtFlags & SC_PF_LINES)
- lcl_PaintAbove( rDocShell, aExtendedRange ); // fuer Linien ueber dem Bereich
+ lcl_PaintAbove( rDocShell, aExtendedRange ); // fuer Linien ueber dem Bereich
-// rDocShell.UpdateOle(GetViewData()); //! an der View?
+// rDocShell.UpdateOle(GetViewData()); //! an der View?
aModificator.SetDocumentModified();
-//! CellContentChanged();
-//! ShowAllCursors();
+//! CellContentChanged();
+//! ShowAllCursors();
#if 0
- //! muss an der View bleiben !!!!
+ //! muss an der View bleiben !!!!
if ( nFlags & IDF_ATTRIB )
{
if ( nFlags & IDF_CONTENTS )
ForgetFormatArea();
else
- StartFormatArea(); // Attribute loeschen ist auch Attributierung
+ StartFormatArea(); // Attribute loeschen ist auch Attributierung
}
#endif
@@ -698,7 +698,7 @@ BOOL ScDocFunc::TransliterateText( const ScMarkData& rMark, sal_Int32 nType,
ScRange aMarkRange;
ScMarkData aMultiMark = rMark;
- aMultiMark.SetMarking(FALSE); // for MarkToMulti
+ aMultiMark.SetMarking(FALSE); // for MarkToMulti
aMultiMark.MarkToMulti();
aMultiMark.GetMultiMarkArea( aMarkRange );
@@ -758,7 +758,7 @@ BOOL ScDocFunc::SetNormalString( const ScAddress& rPos, const String& rText, BOO
{
pTabs = new SCTAB[1];
pTabs[0] = rPos.Tab();
- ppOldCells = new ScBaseCell*[1];
+ ppOldCells = new ScBaseCell*[1];
ppOldCells[0] = pDocCell ? pDocCell->CloneWithoutNote( *pDoc ) : 0;
pHasFormat = new BOOL[1];
@@ -779,7 +779,7 @@ BOOL ScDocFunc::SetNormalString( const ScAddress& rPos, const String& rText, BOO
if (bUndo)
{
- // wegen ChangeTracking darf UndoAction erst nach SetString angelegt werden
+ // wegen ChangeTracking darf UndoAction erst nach SetString angelegt werden
rDocShell.GetUndoManager()->AddUndoAction(new ScUndoEnterData( &rDocShell, rPos.Col(),rPos.Row(),rPos.Tab(), 1,pTabs,
ppOldCells, pHasFormat, pOldFormats, rText, NULL ) );
}
@@ -828,7 +828,7 @@ BOOL ScDocFunc::PutCell( const ScAddress& rPos, ScBaseCell* pNewCell, BOOL bApi
pDoc->PutCell( rPos, pNewCell );
- // wegen ChangeTracking darf UndoAction erst nach PutCell angelegt werden
+ // wegen ChangeTracking darf UndoAction erst nach PutCell angelegt werden
if (bUndo)
{
rDocShell.GetUndoManager()->AddUndoAction(
@@ -872,8 +872,8 @@ void ScDocFunc::NotifyInputHandler( const ScAddress& /* rPos */ )
struct ScMyRememberItem
{
- USHORT nIndex;
- SfxItemSet aItemSet;
+ USHORT nIndex;
+ SfxItemSet aItemSet;
ScMyRememberItem(const SfxItemSet& rItemSet, USHORT nTempIndex) :
nIndex(nTempIndex), aItemSet(rItemSet) {}
@@ -883,7 +883,7 @@ void ScDocFunc::NotifyInputHandler( const ScAddress& /* rPos */ )
BOOL ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, BOOL bInterpret, BOOL bApi )
{
- // PutData ruft PutCell oder SetNormalString
+ // PutData ruft PutCell oder SetNormalString
BOOL bRet = FALSE;
ScDocument* pDoc = rDocShell.GetDocument();
@@ -903,10 +903,10 @@ BOOL ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine,
ScMyRememberItemList aRememberItems;
ScMyRememberItem* pRememberItem = NULL;
- // All paragraph attributes must be removed before calling CreateTextObject,
- // not only alignment, so the object doesn't contain the cell attributes as
- // paragraph attributes. Before remove the attributes store they in a list to
- // set they back to the EditEngine.
+ // All paragraph attributes must be removed before calling CreateTextObject,
+ // not only alignment, so the object doesn't contain the cell attributes as
+ // paragraph attributes. Before remove the attributes store they in a list to
+ // set they back to the EditEngine.
USHORT nCount = rEngine.GetParagraphCount();
for (USHORT i=0; i<nCount; i++)
{
@@ -961,7 +961,7 @@ BOOL ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine,
ScPatternAttr aPattern( pDoc->GetPool() );
aPattern.GetFromEditItemSet( &rEditAttr );
aPattern.DeleteUnchanged( pDoc->GetPattern( rPos.Col(), rPos.Row(), rPos.Tab() ) );
- aPattern.GetItemSet().ClearItem( ATTR_HOR_JUSTIFY ); // wasn't removed above if no edit object
+ aPattern.GetItemSet().ClearItem( ATTR_HOR_JUSTIFY ); // wasn't removed above if no edit object
if ( aPattern.GetItemSet().Count() > 0 )
{
ScMarkData aMark;
@@ -995,7 +995,7 @@ ScBaseCell* ScDocFunc::InterpretEnglishString( const ScAddress& rPos,
{
ScTokenArray* pCode;
if ( pDoc->IsImportingXML() )
- { // temporary formula string as string tokens
+ { // temporary formula string as string tokens
pCode = lcl_ScDocFunc_CreateTokenArrayXML( rText, rFormulaNmsp, eGrammar );
pDoc->IncXMLImportedFormulaCount( rText.Len() );
}
@@ -1006,15 +1006,15 @@ ScBaseCell* ScDocFunc::InterpretEnglishString( const ScAddress& rPos,
pCode = aComp.CompileString( rText );
}
pNewCell = new ScFormulaCell( pDoc, rPos, pCode, eGrammar, MM_NONE );
- delete pCode; // Zell-ctor hat das TokenArray kopiert
+ delete pCode; // Zell-ctor hat das TokenArray kopiert
}
else if ( rText.Len() > 1 && rText.GetChar(0) == '\'' )
{
- // for bEnglish, "'" at the beginning is always interpreted as text
- // marker and stripped
+ // for bEnglish, "'" at the beginning is always interpreted as text
+ // marker and stripped
pNewCell = ScBaseCell::CreateTextCell( rText.Copy( 1 ), pDoc );
}
- else // (nur) auf englisches Zahlformat testen
+ else // (nur) auf englisches Zahlformat testen
{
SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
sal_uInt32 nEnglish = pFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US);
@@ -1024,8 +1024,8 @@ ScBaseCell* ScDocFunc::InterpretEnglishString( const ScAddress& rPos,
else if ( rText.Len() )
pNewCell = ScBaseCell::CreateTextCell( rText, pDoc );
- // das (englische) Zahlformat wird nicht gesetzt
- //! passendes lokales Format suchen und setzen???
+ // das (englische) Zahlformat wird nicht gesetzt
+ //! passendes lokales Format suchen und setzen???
}
return pNewCell;
@@ -1036,7 +1036,7 @@ BOOL ScDocFunc::SetCellText( const ScAddress& rPos, const String& rText,
BOOL bInterpret, BOOL bEnglish, BOOL bApi,
const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar )
{
- // SetCellText ruft PutCell oder SetNormalString
+ // SetCellText ruft PutCell oder SetNormalString
ScDocument* pDoc = rDocShell.GetDocument();
ScBaseCell* pNewCell = NULL;
@@ -1048,8 +1048,8 @@ BOOL ScDocFunc::SetCellText( const ScAddress& rPos, const String& rText,
if (bApi)
pExtRefGuard.reset(new ScExternalRefManager::ApiGuard(pDoc));
- // code moved to own method InterpretEnglishString because it is also used in
- // ScCellRangeObj::setFormulaArray
+ // code moved to own method InterpretEnglishString because it is also used in
+ // ScCellRangeObj::setFormulaArray
pNewCell = InterpretEnglishString( rPos, rText, rFormulaNmsp, eGrammar );
}
@@ -1058,7 +1058,7 @@ BOOL ScDocFunc::SetCellText( const ScAddress& rPos, const String& rText,
else if ( rText.Len() )
{
OSL_ENSURE( rFormulaNmsp.Len() == 0, "ScDocFunc::SetCellText - formula namespace, but do not interpret?" );
- pNewCell = ScBaseCell::CreateTextCell( rText, pDoc ); // immer Text
+ pNewCell = ScBaseCell::CreateTextCell( rText, pDoc ); // immer Text
}
if (pNewCell)
@@ -1104,12 +1104,12 @@ bool ScDocFunc::SetNoteText( const ScAddress& rPos, const String& rText, BOOL bA
}
String aNewText = rText;
- aNewText.ConvertLineEnd(); //! ist das noetig ???
+ aNewText.ConvertLineEnd(); //! ist das noetig ???
if( ScPostIt* pNote = (aNewText.Len() > 0) ? pDoc->GetOrCreateNote( rPos ) : pDoc->GetNote( rPos ) )
pNote->SetText( rPos, aNewText );
- //! Undo !!!
+ //! Undo !!!
if (pDoc->IsStreamValid(rPos.Tab()))
pDoc->SetStreamValid(rPos.Tab(), FALSE);
@@ -1205,7 +1205,7 @@ BOOL ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& r
ScDocShellModificator aModificator( rDocShell );
- //! Umrandung
+ //! Umrandung
ScRange aMultiRange;
BOOL bMulti = rMark.IsMultiMarked();
@@ -1231,15 +1231,15 @@ BOOL ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& r
// While loading XML it is not neccessary to ask HasAttrib. It needs too much time.
USHORT nExtFlags = 0;
if ( !bImportingXML )
- rDocShell.UpdatePaintExt( nExtFlags, aMultiRange ); // content before the change
+ rDocShell.UpdatePaintExt( nExtFlags, aMultiRange ); // content before the change
pDoc->ApplySelectionPattern( rPattern, rMark );
if ( !bImportingXML )
- rDocShell.UpdatePaintExt( nExtFlags, aMultiRange ); // content after the change
+ rDocShell.UpdatePaintExt( nExtFlags, aMultiRange ); // content after the change
if (!AdjustRowHeight( aMultiRange ))
rDocShell.PostPaint( aMultiRange, PAINT_GRID, nExtFlags );
else if (nExtFlags & SC_PF_LINES)
- lcl_PaintAbove( rDocShell, aMultiRange ); // fuer Linien ueber dem Bereich
+ lcl_PaintAbove( rDocShell, aMultiRange ); // fuer Linien ueber dem Bereich
aModificator.SetDocumentModified();
@@ -1301,19 +1301,19 @@ BOOL ScDocFunc::ApplyStyle( const ScMarkData& rMark, const String& rStyleName,
}
-// BOOL bPaintExt = pDoc->HasAttrib( aMultiRange, HASATTR_PAINTEXT );
-// pDoc->ApplySelectionPattern( rPattern, rMark );
+// BOOL bPaintExt = pDoc->HasAttrib( aMultiRange, HASATTR_PAINTEXT );
+// pDoc->ApplySelectionPattern( rPattern, rMark );
pDoc->ApplySelectionStyle( (ScStyleSheet&)*pStyleSheet, rMark );
-// if (!bPaintExt)
-// bPaintExt = pDoc->HasAttrib( aMultiRange, HASATTR_PAINTEXT );
-// USHORT nExtFlags = bPaintExt ? SC_PF_LINES : 0;
+// if (!bPaintExt)
+// bPaintExt = pDoc->HasAttrib( aMultiRange, HASATTR_PAINTEXT );
+// USHORT nExtFlags = bPaintExt ? SC_PF_LINES : 0;
USHORT nExtFlags = 0;
if (!AdjustRowHeight( aMultiRange ))
rDocShell.PostPaint( aMultiRange, PAINT_GRID, nExtFlags );
else if (nExtFlags & SC_PF_LINES)
- lcl_PaintAbove( rDocShell, aMultiRange ); // fuer Linien ueber dem Bereich
+ lcl_PaintAbove( rDocShell, aMultiRange ); // fuer Linien ueber dem Bereich
aModificator.SetDocumentModified();
@@ -1392,7 +1392,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
SCTAB nSelCount = aMark.GetSelectCount();
- // zugehoerige Szenarien auch anpassen
+ // zugehoerige Szenarien auch anpassen
// Test zusammengefasste
SCCOL nMergeTestStartX = nStartCol;
@@ -1439,7 +1439,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
return FALSE;
}
- WaitObject aWait( rDocShell.GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
+ WaitObject aWait( rDocShell.GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
ScDocument* pRefUndoDoc = NULL;
ScRefUndoData* pUndoData = NULL;
@@ -1707,7 +1707,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
AdjustRowHeight(ScRange(0, nPaintStartY, i, MAXCOL, nPaintEndY, i+nScenarioCount ));
if (bAdjusted)
{
- // paint only what is not done by AdjustRowHeight
+ // paint only what is not done by AdjustRowHeight
if (nPaintFlags & PAINT_TOP)
rDocShell.PostPaint( nPaintStartX, nPaintStartY, i, nPaintEndX, nPaintEndY, i+nScenarioCount, PAINT_TOP );
}
@@ -1742,7 +1742,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
delete pRefUndoDoc;
delete pUndoData;
if (!bApi)
- rDocShell.ErrorMessage(STR_INSERT_FULL); // Spalte/Zeile voll
+ rDocShell.ErrorMessage(STR_INSERT_FULL); // Spalte/Zeile voll
}
aModificator.SetDocumentModified();
@@ -2001,10 +2001,10 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
}
//
- // ausfuehren
+ // ausfuehren
//
- WaitObject aWait( rDocShell.GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
+ WaitObject aWait( rDocShell.GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
ScDocument* pUndoDoc = NULL;
ScDocument* pRefUndoDoc = NULL;
@@ -2075,7 +2075,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
break;
}
- //! Test, ob Outline in Groesse geaendert
+ //! Test, ob Outline in Groesse geaendert
if ( bRecord )
{
@@ -2083,10 +2083,10 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
if( aFullMark.GetTableSelect( i ) )
pRefUndoDoc->DeleteAreaTab(nUndoStartX,nUndoStartY,nUndoEndX,nUndoEndY, i, IDF_ALL);
- // alle Tabellen anlegen, damit Formeln kopiert werden koennen:
+ // alle Tabellen anlegen, damit Formeln kopiert werden koennen:
pUndoDoc->AddUndoTab( 0, nTabCount-1, FALSE, FALSE );
- // kopieren mit bColRowFlags=FALSE (#54194#)
+ // kopieren mit bColRowFlags=FALSE (#54194#)
pRefUndoDoc->CopyToDocument(0,0,0,MAXCOL,MAXROW,MAXTAB,IDF_FORMULA,FALSE,pUndoDoc,NULL,FALSE);
delete pRefUndoDoc;
@@ -2213,12 +2213,12 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
for( SCTAB j = i+1; j<nTabCount && pDoc->IsScenario(j); j++ )
nScenarioCount ++;
- // ganze Zeilen loeschen: nichts anpassen
+ // ganze Zeilen loeschen: nichts anpassen
if ( eCmd == DEL_DELROWS || !AdjustRowHeight(ScRange( 0, nPaintStartY, i, MAXCOL, nPaintEndY, i+nScenarioCount )) )
rDocShell.PostPaint( nPaintStartX, nPaintStartY, i, nPaintEndX, nPaintEndY, i+nScenarioCount, nPaintFlags, nExtFlags );
else
{
- // paint only what is not done by AdjustRowHeight
+ // paint only what is not done by AdjustRowHeight
if (nExtFlags & SC_PF_LINES)
lcl_PaintAbove( rDocShell, ScRange( nPaintStartX, nPaintStartY, i, nPaintEndX, nPaintEndY, i+nScenarioCount) );
if (nPaintFlags & PAINT_TOP)
@@ -2254,7 +2254,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
return FALSE;
}
- // zugehoerige Szenarien auch anpassen - nur wenn innerhalb einer Tabelle verschoben wird!
+ // zugehoerige Szenarien auch anpassen - nur wenn innerhalb einer Tabelle verschoben wird!
BOOL bScenariosAdded = FALSE;
ScDocument* pDoc = rDocShell.GetDocument();
if (bRecord && !pDoc->IsUndoEnabled())
@@ -2276,13 +2276,13 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
ScMarkData aSourceMark;
for (nTab=nStartTab; nTab<=nEndTab; nTab++)
- aSourceMark.SelectTable( nTab, TRUE ); // Source selektieren
+ aSourceMark.SelectTable( nTab, TRUE ); // Source selektieren
aSourceMark.SetMarkArea( rSource );
ScDocShellRef aDragShellRef;
if ( pDoc->HasOLEObjectsInArea( rSource ) )
{
- aDragShellRef = new ScDocShell; // DocShell needs a Ref immediately
+ aDragShellRef = new ScDocShell; // DocShell needs a Ref immediately
aDragShellRef->DoInitNew(NULL);
}
ScDrawLayer::SetGlobalDrawPersist(aDragShellRef);
@@ -2308,13 +2308,13 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
SCCOL nDestEndCol = nDestCol + ( nOldEndCol-nStartCol );
SCROW nDestEndRow = nDestRow + ( nOldEndRow-nStartRow );
- SCCOL nUndoEndCol = nDestCol + ( nEndCol-nStartCol ); // erweitert im Zielblock
+ SCCOL nUndoEndCol = nDestCol + ( nEndCol-nStartCol ); // erweitert im Zielblock
SCROW nUndoEndRow = nDestRow + ( nEndRow-nStartRow );
BOOL bIncludeFiltered = bCut;
if ( !bIncludeFiltered )
{
- // adjust sizes to include only non-filtered rows
+ // adjust sizes to include only non-filtered rows
SCCOL nClipX;
SCROW nClipY;
@@ -2332,7 +2332,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
return FALSE;
}
- // Test auf Zellschutz
+ // Test auf Zellschutz
ScEditableTester aTester;
for (nTab=nDestTab; nTab<=nDestEndTab; nTab++)
@@ -2349,19 +2349,19 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
return FALSE;
}
- // Test auf zusammengefasste - beim Verschieben erst nach dem Loeschen
+ // Test auf zusammengefasste - beim Verschieben erst nach dem Loeschen
if (bClipOver && !bCut)
if (pDoc->HasAttrib( nDestCol,nDestRow,nDestTab, nUndoEndCol,nUndoEndRow,nDestEndTab,
HASATTR_MERGED | HASATTR_OVERLAPPED ))
- { // "Zusammenfassen nicht verschachteln !"
+ { // "Zusammenfassen nicht verschachteln !"
if (!bApi)
rDocShell.ErrorMessage(STR_MSSG_MOVEBLOCKTO_0);
delete pClipDoc;
return FALSE;
}
- // Are there borders in the cells? (for painting)
+ // Are there borders in the cells? (for painting)
USHORT nSourceExt = 0;
rDocShell.UpdatePaintExt( nSourceExt, nStartCol,nStartRow,nStartTab, nEndCol,nEndRow,nEndTab );
@@ -2369,7 +2369,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
rDocShell.UpdatePaintExt( nDestExt, nDestCol,nDestRow,nDestTab, nDestEndCol,nDestEndRow,nDestEndTab );
//
- // ausfuehren
+ // ausfuehren
//
ScDocument* pUndoDoc = NULL;
@@ -2403,10 +2403,10 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
pDoc->BeginDrawUndo();
}
- BOOL bSourceHeight = FALSE; // Hoehen angepasst?
+ BOOL bSourceHeight = FALSE; // Hoehen angepasst?
if (bCut)
{
- ScMarkData aDelMark; // only for tables
+ ScMarkData aDelMark; // only for tables
for (nTab=nStartTab; nTab<=nEndTab; nTab++)
{
pDoc->DeleteAreaTab( nStartCol,nStartRow, nOldEndCol,nOldEndRow, nTab, IDF_ALL );
@@ -2414,7 +2414,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
}
pDoc->DeleteObjectsInArea( nStartCol,nStartRow, nOldEndCol,nOldEndRow, aDelMark );
- // Test auf zusammengefasste
+ // Test auf zusammengefasste
if (bClipOver)
if (pDoc->HasAttrib( nDestCol,nDestRow,nDestTab,
@@ -2429,8 +2429,8 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
pDoc->ExtendMerge( nStartCol, nStartRow, nTmpEndCol, nTmpEndRow, nTab, TRUE );
}
- // Fehlermeldung erst nach dem Wiederherstellen des Inhalts
- if (!bApi) // "Zusammenfassen nicht verschachteln !"
+ // Fehlermeldung erst nach dem Wiederherstellen des Inhalts
+ if (!bApi) // "Zusammenfassen nicht verschachteln !"
rDocShell.ErrorMessage(STR_MSSG_MOVEBLOCKTO_0);
delete pUndoDoc;
@@ -2447,7 +2447,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
ScMarkData aDestMark;
for (nTab=nDestTab; nTab<=nDestEndTab; nTab++)
- aDestMark.SelectTable( nTab, TRUE ); // Destination selektieren
+ aDestMark.SelectTable( nTab, TRUE ); // Destination selektieren
aDestMark.SetMarkArea( aPasteDest );
/* Do not copy cell notes and drawing objects here. While pasting, the
@@ -2482,11 +2482,11 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
{
if (pRefUndoDoc)
{
- // alle Tabellen anlegen, damit Formeln kopiert werden koennen:
+ // alle Tabellen anlegen, damit Formeln kopiert werden koennen:
pUndoDoc->AddUndoTab( 0, nTabCount-1, FALSE, FALSE );
pRefUndoDoc->DeleteArea( nDestCol, nDestRow, nDestEndCol, nDestEndRow, aSourceMark, IDF_ALL );
- // kopieren mit bColRowFlags=FALSE (#54194#)
+ // kopieren mit bColRowFlags=FALSE (#54194#)
pRefUndoDoc->CopyToDocument( 0, 0, 0, MAXCOL, MAXROW, MAXTAB,
IDF_FORMULA, FALSE, pUndoDoc, NULL, FALSE );
delete pRefUndoDoc;
@@ -2517,7 +2517,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
if (bPaint)
{
- // Zielbereich:
+ // Zielbereich:
SCCOL nPaintStartX = nDestCol;
SCROW nPaintStartY = nDestRow;
@@ -2525,7 +2525,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
SCROW nPaintEndY = nDestPaintEndRow;
USHORT nFlags = PAINT_GRID;
- if ( nStartRow==0 && nEndRow==MAXROW ) // Breiten mitkopiert?
+ if ( nStartRow==0 && nEndRow==MAXROW ) // Breiten mitkopiert?
{
nPaintEndX = MAXCOL;
nPaintStartY = 0;
@@ -2552,7 +2552,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
if ( bCut )
{
- // Quellbereich:
+ // Quellbereich:
nPaintStartX = nStartCol;
nPaintStartY = nStartRow;
@@ -2596,8 +2596,8 @@ uno::Reference< uno::XInterface > GetDocModuleObject( SfxObjectShell& rDocSh, St
uno::Reference< uno::XInterface > xDocModuleApiObject;
if ( xSF.is() )
{
- xVBACodeNamedObjectAccess.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), uno::UNO_QUERY );
- xDocModuleApiObject.set( xVBACodeNamedObjectAccess->getByName( sCodeName ), uno::UNO_QUERY );
+ xVBACodeNamedObjectAccess.set( xSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAObjectModuleObjectProvider"))), uno::UNO_QUERY );
+ xDocModuleApiObject.set( xVBACodeNamedObjectAccess->getByName( sCodeName ), uno::UNO_QUERY );
}
return xDocModuleApiObject;
@@ -2632,7 +2632,7 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, String& sModuleName, String
// if the Module with codename exists then find a new name
sal_Int32 nNum = 0;
String genModuleName;
- if ( sModuleName.Len() )
+ if ( sModuleName.Len() )
sModuleName = sModuleName;
else
{
@@ -2641,7 +2641,7 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, String& sModuleName, String
}
while( xLib->hasByName( genModuleName ) )
genModuleName = rtl::OUString::createFromAscii( "Sheet" ) + rtl::OUString::valueOf( ++nNum );
-
+
uno::Any aSourceAny;
rtl::OUString sTmpSource = sSource;
if ( sTmpSource.getLength() == 0 )
@@ -2700,7 +2700,7 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL
// Strange loop, also basic is loaded too early ( InsertTable )
- // is called via the xml import for sheets in described in odf
+ // is called via the xml import for sheets in described in odf
BOOL bInsertDocModule = false;
if( !rDocShell.GetDocument()->IsImportingXML() )
@@ -2711,12 +2711,12 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL
bRecord = FALSE;
if (bRecord)
- pDoc->BeginDrawUndo(); // InsertTab erzeugt ein SdrUndoNewPage
+ pDoc->BeginDrawUndo(); // InsertTab erzeugt ein SdrUndoNewPage
SCTAB nTabCount = pDoc->GetTableCount();
BOOL bAppend = ( nTab >= nTabCount );
if ( bAppend )
- nTab = nTabCount; // wichtig fuer Undo
+ nTab = nTabCount; // wichtig fuer Undo
if (pDoc->InsertTab( nTab, rName ))
{
@@ -2724,7 +2724,7 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL
if (bRecord)
rDocShell.GetUndoManager()->AddUndoAction(
new ScUndoInsertTab( &rDocShell, nTab, bAppend, rName));
- // Views updaten:
+ // Views updaten:
// Only insert vba modules if vba mode ( and not currently importing XML )
if( bInsertDocModule )
{
@@ -2765,8 +2765,8 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRecord, BOOL /* bApi */ )
pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
SCTAB nCount = pDoc->GetTableCount();
- pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, TRUE ); // nur nTab mit Flags
- pUndoDoc->AddUndoTab( 0, nCount-1 ); // alle Tabs fuer Referenzen
+ pUndoDoc->InitUndo( pDoc, nTab, nTab, TRUE, TRUE ); // nur nTab mit Flags
+ pUndoDoc->AddUndoTab( 0, nCount-1 ); // alle Tabs fuer Referenzen
pDoc->CopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,FALSE, pUndoDoc );
String aOldName;
@@ -2793,8 +2793,8 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRecord, BOOL /* bApi */ )
pUndoDoc->SetTabBgColor( nTab, pDoc->GetTabBgColor(nTab) );
pUndoDoc->SetSheetEvents( nTab, pDoc->GetSheetEvents( nTab ) );
- // Drawing-Layer muss sein Undo selbst in der Hand behalten !!!
- pDoc->BeginDrawUndo(); // DeleteTab erzeugt ein SdrUndoDelPage
+ // Drawing-Layer muss sein Undo selbst in der Hand behalten !!!
+ pDoc->BeginDrawUndo(); // DeleteTab erzeugt ein SdrUndoDelPage
pUndoData = new ScRefUndoData( pDoc );
}
@@ -2810,7 +2810,7 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRecord, BOOL /* bApi */ )
rDocShell.GetUndoManager()->AddUndoAction(
new ScUndoDeleteTab( &rDocShell, theTabs, pUndoDoc, pUndoData ));
}
- // Views updaten:
+ // Views updaten:
if( bVbaEnabled )
{
if( bHasCodeName )
@@ -2822,7 +2822,7 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRecord, BOOL /* bApi */ )
if (bWasLinked)
{
- rDocShell.UpdateLinks(); // Link-Manager updaten
+ rDocShell.UpdateLinks(); // Link-Manager updaten
SfxBindings* pBindings = rDocShell.GetViewBindings();
if (pBindings)
pBindings->Invalidate(SID_LINKS);
@@ -2851,7 +2851,7 @@ BOOL ScDocFunc::SetTableVisible( SCTAB nTab, BOOL bVisible, BOOL bApi )
ScDocument* pDoc = rDocShell.GetDocument();
BOOL bUndo(pDoc->IsUndoEnabled());
if ( pDoc->IsVisible( nTab ) == bVisible )
- return TRUE; // nichts zu tun - ok
+ return TRUE; // nichts zu tun - ok
if ( !pDoc->IsDocEditable() )
{
@@ -2864,7 +2864,7 @@ BOOL ScDocFunc::SetTableVisible( SCTAB nTab, BOOL bVisible, BOOL bApi )
if ( !bVisible && !pDoc->IsImportingXML() ) // #i57869# allow hiding in any order for loading
{
- // nicht alle Tabellen ausblenden
+ // nicht alle Tabellen ausblenden
USHORT nVisCount = 0;
SCTAB nCount = pDoc->GetTableCount();
@@ -2875,7 +2875,7 @@ BOOL ScDocFunc::SetTableVisible( SCTAB nTab, BOOL bVisible, BOOL bApi )
if (nVisCount <= 1)
{
if (!bApi)
- rDocShell.ErrorMessage(STR_PROTECTIONERR); //! eigene Meldung?
+ rDocShell.ErrorMessage(STR_PROTECTIONERR); //! eigene Meldung?
return FALSE;
}
}
@@ -2884,7 +2884,7 @@ BOOL ScDocFunc::SetTableVisible( SCTAB nTab, BOOL bVisible, BOOL bApi )
if (bUndo)
rDocShell.GetUndoManager()->AddUndoAction( new ScUndoShowHideTab( &rDocShell, nTab, bVisible ) );
- // Views updaten:
+ // Views updaten:
if (!bVisible)
rDocShell.Broadcast( ScTablesHint( SC_TAB_HIDDEN, nTab ) );
@@ -2900,9 +2900,9 @@ BOOL ScDocFunc::SetLayoutRTL( SCTAB nTab, BOOL bRTL, BOOL /* bApi */ )
ScDocument* pDoc = rDocShell.GetDocument();
BOOL bUndo(pDoc->IsUndoEnabled());
if ( pDoc->IsLayoutRTL( nTab ) == bRTL )
- return TRUE; // nothing to do - ok
+ return TRUE; // nothing to do - ok
- //! protection (sheet or document?)
+ //! protection (sheet or document?)
ScDocShellModificator aModificator( rDocShell );
@@ -2929,37 +2929,37 @@ BOOL ScDocFunc::SetLayoutRTL( SCTAB nTab, BOOL bRTL, BOOL /* bApi */ )
//UNUSED2009-05 BOOL ScDocFunc::SetGrammar( formula::FormulaGrammar::Grammar eGrammar )
//UNUSED2009-05 {
//UNUSED2009-05 ScDocument* pDoc = rDocShell.GetDocument();
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 if ( pDoc->GetGrammar() == eGrammar )
//UNUSED2009-05 return TRUE;
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 BOOL bUndo(pDoc->IsUndoEnabled());
//UNUSED2009-05 ScDocShellModificator aModificator( rDocShell );
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 pDoc->SetGrammar( eGrammar );
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 if (bUndo)
//UNUSED2009-05 {
//UNUSED2009-05 rDocShell.GetUndoManager()->AddUndoAction( new ScUndoSetGrammar( &rDocShell, eGrammar ) );
//UNUSED2009-05 }
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 rDocShell.PostPaint( 0,0,0,MAXCOL,MAXROW,MAXTAB, PAINT_ALL );
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
//UNUSED2009-05 if (NULL != pViewSh)
//UNUSED2009-05 {
//UNUSED2009-05 pViewSh->UpdateInputHandler( FALSE, FALSE );
//UNUSED2009-05 }
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 aModificator.SetDocumentModified();
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 SfxBindings* pBindings = rDocShell.GetViewBindings();
//UNUSED2009-05 if (pBindings)
//UNUSED2009-05 {
//UNUSED2009-05 // erAck: 2006-09-07T22:19+0200 commented out in CWS scr1c1
//UNUSED2009-05 //pBindings->Invalidate( FID_TAB_USE_R1C1 );
//UNUSED2009-05 }
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 return TRUE;
//UNUSED2009-05 }
@@ -3096,17 +3096,17 @@ bool ScDocFunc::SetTabBgColor(
//------------------------------------------------------------------------
-//! SetWidthOrHeight - noch doppelt zu ViewFunc !!!!!!
-//! Probleme:
-//! - Optimale Hoehe fuer Edit-Zellen ist unterschiedlich zwischen Drucker und Bildschirm
-//! - Optimale Breite braucht Selektion, um evtl. nur selektierte Zellen zu beruecksichtigen
+//! SetWidthOrHeight - noch doppelt zu ViewFunc !!!!!!
+//! Probleme:
+//! - Optimale Hoehe fuer Edit-Zellen ist unterschiedlich zwischen Drucker und Bildschirm
+//! - Optimale Breite braucht Selektion, um evtl. nur selektierte Zellen zu beruecksichtigen
USHORT lcl_GetOptimalColWidth( ScDocShell& rDocShell, SCCOL nCol, SCTAB nTab, BOOL bFormula )
{
USHORT nTwips = 0;
ScSizeDeviceProvider aProv(&rDocShell);
- OutputDevice* pDev = aProv.GetDevice(); // has pixel MapMode
+ OutputDevice* pDev = aProv.GetDevice(); // has pixel MapMode
double nPPTX = aProv.GetPPTX();
double nPPTY = aProv.GetPPTY();
@@ -3133,7 +3133,7 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
if ( !pDoc->IsChangeReadOnlyEnabled() && !rDocShell.IsEditable() )
{
if (!bApi)
- rDocShell.ErrorMessage(STR_PROTECTIONERR); //! eigene Meldung?
+ rDocShell.ErrorMessage(STR_PROTECTIONERR); //! eigene Meldung?
return FALSE;
}
@@ -3144,16 +3144,16 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
BOOL bFormula = FALSE;
if ( eMode == SC_SIZE_OPTIMAL )
{
- //! Option "Formeln anzeigen" - woher nehmen?
+ //! Option "Formeln anzeigen" - woher nehmen?
}
- ScDocument* pUndoDoc = NULL;
+ ScDocument* pUndoDoc = NULL;
ScOutlineTable* pUndoTab = NULL;
- SCCOLROW* pUndoRanges = NULL;
+ SCCOLROW* pUndoRanges = NULL;
if ( bRecord )
{
- pDoc->BeginDrawUndo(); // Drawing Updates
+ pDoc->BeginDrawUndo(); // Drawing Updates
pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
if (bWidth)
@@ -3178,21 +3178,21 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
BOOL bShow = nSizeTwips > 0 || eMode != SC_SIZE_DIRECT;
BOOL bOutline = FALSE;
- pDoc->IncSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln
+ pDoc->IncSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln
for (SCCOLROW nRangeNo=0; nRangeNo<nRangeCnt; nRangeNo++)
{
SCCOLROW nStartNo = *(pRanges++);
SCCOLROW nEndNo = *(pRanges++);
- if ( !bWidth ) // Hoehen immer blockweise
+ if ( !bWidth ) // Hoehen immer blockweise
{
if ( eMode==SC_SIZE_OPTIMAL || eMode==SC_SIZE_VISOPT )
{
BOOL bAll = ( eMode==SC_SIZE_OPTIMAL );
if (!bAll)
{
- // fuer alle eingeblendeten CR_MANUALSIZE loeschen,
- // dann SetOptimalHeight mit bShrink = FALSE
+ // fuer alle eingeblendeten CR_MANUALSIZE loeschen,
+ // dann SetOptimalHeight mit bShrink = FALSE
for (SCROW nRow=nStartNo; nRow<=nEndNo; nRow++)
{
BYTE nOld = pDoc->GetRowFlags(nRow,nTab);
@@ -3211,15 +3211,15 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
if (bAll)
pDoc->ShowRows( nStartNo, nEndNo, nTab, TRUE );
- // Manual-Flag wird bei bAll=TRUE schon in SetOptimalHeight gesetzt
- // (an bei Extra-Height, sonst aus).
+ // Manual-Flag wird bei bAll=TRUE schon in SetOptimalHeight gesetzt
+ // (an bei Extra-Height, sonst aus).
}
else if ( eMode==SC_SIZE_DIRECT || eMode==SC_SIZE_ORIGINAL )
{
if (nSizeTwips)
{
pDoc->SetRowHeightRange( nStartNo, nEndNo, nTab, nSizeTwips );
- pDoc->SetManualHeight( nStartNo, nEndNo, nTab, TRUE ); // height was set manually
+ pDoc->SetManualHeight( nStartNo, nEndNo, nTab, TRUE ); // height was set manually
}
if ( eMode != SC_SIZE_ORIGINAL )
pDoc->ShowRows( nStartNo, nEndNo, nTab, nSizeTwips != 0 );
@@ -3229,7 +3229,7 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
pDoc->ShowRows( nStartNo, nEndNo, nTab, TRUE );
}
}
- else // Spaltenbreiten
+ else // Spaltenbreiten
{
for (SCCOL nCol=static_cast<SCCOL>(nStartNo); nCol<=static_cast<SCCOL>(nEndNo); nCol++)
{
@@ -3250,7 +3250,7 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
}
}
- // adjust outlines
+ // adjust outlines
if ( eMode != SC_SIZE_ORIGINAL )
{
@@ -3264,7 +3264,7 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa
static_cast<SCROW>(nEndNo), nTab, bShow );
}
}
- pDoc->DecSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln
+ pDoc->DecSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln
if (!bOutline)
DELETEZ(pUndoTab);
@@ -3302,10 +3302,10 @@ BOOL ScDocFunc::InsertPageBreak( BOOL bColumn, const ScAddress& rPos,
SCCOLROW nPos = bColumn ? static_cast<SCCOLROW>(rPos.Col()) :
static_cast<SCCOLROW>(rPos.Row());
if (nPos == 0)
- return FALSE; // erste Spalte / Zeile
+ return FALSE; // erste Spalte / Zeile
- ScBreakType nBreak = bColumn ?
- pDoc->HasColBreak(static_cast<SCCOL>(nPos), nTab) :
+ ScBreakType nBreak = bColumn ?
+ pDoc->HasColBreak(static_cast<SCCOL>(nPos), nTab) :
pDoc->HasRowBreak(static_cast<SCROW>(nPos), nTab);
if (nBreak & BREAK_MANUAL)
return true;
@@ -3586,17 +3586,17 @@ BOOL ScDocFunc::ClearItems( const ScMarkData& rMark, const USHORT* pWhich, BOOL
return FALSE;
}
- // #i12940# ClearItems is called (from setPropertyToDefault) directly with uno object's cached
- // MarkData (GetMarkData), so rMark must be changed to multi selection for ClearSelectionItems
- // here.
+ // #i12940# ClearItems is called (from setPropertyToDefault) directly with uno object's cached
+ // MarkData (GetMarkData), so rMark must be changed to multi selection for ClearSelectionItems
+ // here.
ScRange aMarkRange;
ScMarkData aMultiMark = rMark;
- aMultiMark.SetMarking(FALSE); // for MarkToMulti
+ aMultiMark.SetMarking(FALSE); // for MarkToMulti
aMultiMark.MarkToMulti();
aMultiMark.GetMultiMarkArea( aMarkRange );
-// if (bRecord)
+// if (bRecord)
if (bUndo)
{
SCTAB nStartTab = aMarkRange.aStart.Tab();
@@ -3615,7 +3615,7 @@ BOOL ScDocFunc::ClearItems( const ScMarkData& rMark, const USHORT* pWhich, BOOL
rDocShell.PostPaint( aMarkRange, PAINT_GRID, SC_PF_LINES | SC_PF_TESTMERGE );
aModificator.SetDocumentModified();
- //! Bindings-Invalidate etc.?
+ //! Bindings-Invalidate etc.?
return TRUE;
}
@@ -3637,7 +3637,7 @@ BOOL ScDocFunc::ChangeIndent( const ScMarkData& rMark, BOOL bIncrement, BOOL bAp
ScRange aMarkRange;
rMark.GetMultiMarkArea( aMarkRange );
-// if (bRecord)
+// if (bRecord)
if (bUndo)
{
SCTAB nStartTab = aMarkRange.aStart.Tab();
@@ -3666,7 +3666,7 @@ BOOL ScDocFunc::ChangeIndent( const ScMarkData& rMark, BOOL bIncrement, BOOL bAp
SfxBindings* pBindings = rDocShell.GetViewBindings();
if (pBindings)
{
- pBindings->Invalidate( SID_ALIGNLEFT ); // ChangeIndent setzt auf links
+ pBindings->Invalidate( SID_ALIGNLEFT ); // ChangeIndent setzt auf links
pBindings->Invalidate( SID_ALIGNRIGHT );
pBindings->Invalidate( SID_ALIGNBLOCK );
pBindings->Invalidate( SID_ALIGNCENTERHOR );
@@ -3742,7 +3742,7 @@ BOOL ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
if (bSize)
{
-/* SCCOL nCols[2];
+/* SCCOL nCols[2];
nCols[0] = nStartCol;
nCols[1] = nEndCol;
SCROW nRows[2];
@@ -3777,7 +3777,7 @@ BOOL ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
}
}
- if ( bRecord ) // Draw-Undo erst jetzt verfuegbar
+ if ( bRecord ) // Draw-Undo erst jetzt verfuegbar
{
rDocShell.GetUndoManager()->AddUndoAction(
new ScUndoAutoFormat( &rDocShell, rRange, pUndoDoc, aMark, bSize, nFormatNo ) );
@@ -3825,10 +3825,10 @@ BOOL ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
WaitObject aWait( rDocShell.GetActiveDialogParent() );
ScDocument* pUndoDoc = NULL;
-// if (bRecord) // immer
+// if (bRecord) // immer
if (bUndo)
{
- //! auch bei Undo selektierte Tabellen beruecksichtigen
+ //! auch bei Undo selektierte Tabellen beruecksichtigen
pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
pUndoDoc->InitUndo( pDoc, nStartTab, nEndTab );
pDoc->CopyToDocument( rRange, IDF_ALL & ~IDF_NOTE, FALSE, pUndoDoc );
@@ -3861,15 +3861,15 @@ BOOL ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
pDoc->InsertMatrixFormula( nStartCol, nStartRow, nEndCol, nEndRow,
aMark, rString, NULL, eGrammar);
-// if (bRecord) // immer
+// if (bRecord) // immer
if (bUndo)
{
- //! auch bei Undo selektierte Tabellen beruecksichtigen
+ //! auch bei Undo selektierte Tabellen beruecksichtigen
rDocShell.GetUndoManager()->AddUndoAction(
new ScUndoEnterMatrix( &rDocShell, rRange, pUndoDoc, rString ) );
}
- // Err522 beim Paint von DDE-Formeln werden jetzt beim Interpretieren abgefangen
+ // Err522 beim Paint von DDE-Formeln werden jetzt beim Interpretieren abgefangen
rDocShell.PostPaint( nStartCol,nStartRow,nStartTab,nEndCol,nEndRow,nEndTab, PAINT_GRID );
aModificator.SetDocumentModified();
@@ -3916,7 +3916,7 @@ BOOL ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark,
pDoc->SetDirty( rRange );
if ( bRecord )
{
- //! auch bei Undo selektierte Tabellen beruecksichtigen
+ //! auch bei Undo selektierte Tabellen beruecksichtigen
ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
pUndoDoc->InitUndo( pDoc, nStartTab, nEndTab );
pDoc->CopyToDocument( rRange, IDF_ALL & ~IDF_NOTE, FALSE, pUndoDoc );
@@ -4034,7 +4034,7 @@ BOOL ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark,
nCount, eDir, FILL_SIMPLE );
AdjustRowHeight(rRange);
- if ( bRecord ) // Draw-Undo erst jetzt verfuegbar
+ if ( bRecord ) // Draw-Undo erst jetzt verfuegbar
{
rDocShell.GetUndoManager()->AddUndoAction(
new ScUndoAutoFill( &rDocShell, aDestArea, aSourceArea, pUndoDoc, aMark,
@@ -4043,7 +4043,7 @@ BOOL ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark,
}
rDocShell.PostPaintGridAll();
-// rDocShell.PostPaintDataChanged();
+// rDocShell.PostPaintDataChanged();
aModificator.SetDocumentModified();
bSuccess = TRUE;
@@ -4055,7 +4055,7 @@ BOOL ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark,
}
BOOL ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark,
- FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd,
+ FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd,
double fStart, double fStep, double fMax,
BOOL bRecord, BOOL bApi )
{
@@ -4095,7 +4095,7 @@ BOOL ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark,
aSourceArea.aEnd.Col(), aSourceArea.aEnd.Row(), aSourceArea.aEnd.Tab(),
DirFromFillDir(eDir) );
- // #27665# mindestens eine Zeile/Spalte als Quellbereich behalten:
+ // #27665# mindestens eine Zeile/Spalte als Quellbereich behalten:
SCSIZE nTotLines = ( eDir == FILL_TO_BOTTOM || eDir == FILL_TO_TOP ) ?
static_cast<SCSIZE>( aSourceArea.aEnd.Row() - aSourceArea.aStart.Row() + 1 ) :
static_cast<SCSIZE>( aSourceArea.aEnd.Col() - aSourceArea.aStart.Col() + 1 );
@@ -4152,11 +4152,11 @@ BOOL ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark,
AdjustRowHeight(rRange);
rDocShell.PostPaintGridAll();
-// rDocShell.PostPaintDataChanged();
+// rDocShell.PostPaintDataChanged();
aModificator.SetDocumentModified();
}
- if ( bRecord ) // Draw-Undo erst jetzt verfuegbar
+ if ( bRecord ) // Draw-Undo erst jetzt verfuegbar
{
rDocShell.GetUndoManager()->AddUndoAction(
new ScUndoAutoFill( &rDocShell, aDestArea, aSourceArea, pUndoDoc, aMark,
@@ -4200,10 +4200,10 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
ScRange aSourceArea = rRange;
ScRange aDestArea = rRange;
- FillCmd eCmd = FILL_AUTO;
- FillDateCmd eDateCmd = FILL_DAY;
- double fStep = 1.0;
- double fMax = MAXDOUBLE;
+ FillCmd eCmd = FILL_AUTO;
+ FillDateCmd eDateCmd = FILL_DAY;
+ double fStep = 1.0;
+ double fMax = MAXDOUBLE;
switch (eDir)
{
@@ -4234,9 +4234,9 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
break;
}
- // Zellschutz testen
- //! Quellbereich darf geschuetzt sein !!!
- //! aber kein Matrixfragment enthalten !!!
+ // Zellschutz testen
+ //! Quellbereich darf geschuetzt sein !!!
+ //! aber kein Matrixfragment enthalten !!!
ScEditableTester aTester( pDoc, aDestArea );
if ( !aTester.IsEditable() )
@@ -4281,7 +4281,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
AdjustRowHeight(aDestArea);
- if ( bRecord ) // Draw-Undo erst jetzt verfuegbar
+ if ( bRecord ) // Draw-Undo erst jetzt verfuegbar
{
rDocShell.GetUndoManager()->AddUndoAction(
new ScUndoAutoFill( &rDocShell, aDestArea, aSourceArea, pUndoDoc, aMark,
@@ -4290,10 +4290,10 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
}
rDocShell.PostPaintGridAll();
-// rDocShell.PostPaintDataChanged();
+// rDocShell.PostPaintDataChanged();
aModificator.SetDocumentModified();
- rRange = aDestArea; // Zielbereich zurueckgeben (zum Markieren)
+ rRange = aDestArea; // Zielbereich zurueckgeben (zum Markieren)
return TRUE;
}
@@ -4436,7 +4436,7 @@ BOOL ScDocFunc::UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi )
aModificator.SetDocumentModified();
}
else if (!bApi)
- Sound::Beep(); //! FALSE zurueck???
+ Sound::Beep(); //! FALSE zurueck???
return TRUE;
}
@@ -4471,10 +4471,10 @@ BOOL ScDocFunc::SetNewRangeNames( ScRangeName* pNewRanges, BOOL /* bApi */ )
BOOL bCompile = ( !pDoc->IsImportingXML() && pDoc->GetNamedRangesLockCount() == 0 );
if ( bCompile )
- pDoc->CompileNameFormula( TRUE ); // CreateFormulaString
+ pDoc->CompileNameFormula( TRUE ); // CreateFormulaString
pDoc->SetRangeName( pNewRanges ); // takes ownership
if ( bCompile )
- pDoc->CompileNameFormula( FALSE ); // CompileFormulaString
+ pDoc->CompileNameFormula( FALSE ); // CompileFormulaString
aModificator.SetDocumentModified();
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREAS_CHANGED ) );
@@ -4505,7 +4505,7 @@ void ScDocFunc::CreateOneName( ScRangeName& rList,
BOOL bInsert = FALSE;
USHORT nOldPos;
- if (rList.SearchName( aName, nOldPos )) // vorhanden ?
+ if (rList.SearchName( aName, nOldPos )) // vorhanden ?
{
ScRangeData* pOld = rList[nOldPos];
String aOldStr;
@@ -4513,7 +4513,7 @@ void ScDocFunc::CreateOneName( ScRangeName& rList,
if (aOldStr != aContent)
{
if (bApi)
- bInsert = TRUE; // per API nicht nachfragen
+ bInsert = TRUE; // per API nicht nachfragen
else
{
String aTemplate = ScGlobal::GetRscString( STR_CREATENAME_REPLACE );
@@ -4555,7 +4555,7 @@ void ScDocFunc::CreateOneName( ScRangeName& rList,
BOOL ScDocFunc::CreateNames( const ScRange& rRange, USHORT nFlags, BOOL bApi )
{
if (!nFlags)
- return FALSE; // war nix
+ return FALSE; // war nix
ScDocShellModificator aModificator( rDocShell );
@@ -4580,7 +4580,7 @@ BOOL ScDocFunc::CreateNames( const ScRange& rRange, USHORT nFlags, BOOL bApi )
ScDocument* pDoc = rDocShell.GetDocument();
ScRangeName* pNames = pDoc->GetRangeName();
if (!pNames)
- return FALSE; // soll nicht sein
+ return FALSE; // soll nicht sein
ScRangeName aNewRanges( *pNames );
BOOL bTop = ( ( nFlags & NAME_TOP ) != 0 );
@@ -4678,7 +4678,7 @@ BOOL ScDocFunc::InsertNameList( const ScAddress& rStartPos, BOOL bApi )
pDoc->CopyToDocument( nStartCol,nStartRow,nTab, nEndCol,nEndRow,nTab,
IDF_ALL, FALSE, pUndoDoc );
- pDoc->BeginDrawUndo(); // wegen Hoehenanpassung
+ pDoc->BeginDrawUndo(); // wegen Hoehenanpassung
}
ScRangeData** ppSortArray = new ScRangeData* [ nValidCount ];
@@ -4730,7 +4730,7 @@ BOOL ScDocFunc::InsertNameList( const ScAddress& rStartPos, BOOL bApi )
if (!AdjustRowHeight(ScRange(0,nStartRow,nTab,MAXCOL,nEndRow,nTab)))
rDocShell.PostPaint( nStartCol,nStartRow,nTab, nEndCol,nEndRow,nTab, PAINT_GRID );
-//! rDocShell.UpdateOle(GetViewData());
+//! rDocShell.UpdateOle(GetViewData());
aModificator.SetDocumentModified();
bDone = TRUE;
}
@@ -4775,7 +4775,7 @@ BOOL ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd
bRet = EnterMatrix( aNewRange, &aMark, NULL, aFormula, bApi, FALSE, EMPTY_STRING, formula::FormulaGrammar::GRAM_PODF_A1 );
if (!bRet)
{
- // versuchen, alten Zustand wiederherzustellen
+ // versuchen, alten Zustand wiederherzustellen
EnterMatrix( rOldRange, &aMark, NULL, aFormula, bApi, FALSE, EMPTY_STRING, formula::FormulaGrammar::GRAM_PODF_A1 );
}
}
@@ -4794,7 +4794,7 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
const ScRange& rDestRange, ULONG nRefresh,
BOOL bFitBlock, BOOL bApi )
{
- //! auch fuer ScViewFunc::InsertAreaLink benutzen!
+ //! auch fuer ScViewFunc::InsertAreaLink benutzen!
ScDocument* pDoc = rDocShell.GetDocument();
BOOL bUndo (pDoc->IsUndoEnabled());
@@ -4842,15 +4842,15 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
if (!aFilterName.Len())
ScDocumentLoader::GetFilterName( rFile, aFilterName, aNewOptions, TRUE, !bApi );
- // remove application prefix from filter name here, so the filter options
- // aren't reset when the filter name is changed in ScAreaLink::DataChanged
+ // remove application prefix from filter name here, so the filter options
+ // aren't reset when the filter name is changed in ScAreaLink::DataChanged
ScDocumentLoader::RemoveAppPrefix( aFilterName );
ScAreaLink* pLink = new ScAreaLink( &rDocShell, rFile, aFilterName,
aNewOptions, rSource, rDestRange, nRefresh );
pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, rFile, &aFilterName, &rSource );
- // Undo fuer den leeren Link
+ // Undo fuer den leeren Link
if (bUndo)
{
@@ -4861,17 +4861,17 @@ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
rDocShell.GetUndoManager()->LeaveListAction(); // undo for link update is still separate
}
- // Update hat sein eigenes Undo
+ // Update hat sein eigenes Undo
- pLink->SetDoInsert(bFitBlock); // beim ersten Update ggf. nichts einfuegen
- pLink->Update(); // kein SetInCreate -> Update ausfuehren
- pLink->SetDoInsert(TRUE); // Default = TRUE
+ pLink->SetDoInsert(bFitBlock); // beim ersten Update ggf. nichts einfuegen
+ pLink->Update(); // kein SetInCreate -> Update ausfuehren
+ pLink->SetDoInsert(TRUE); // Default = TRUE
SfxBindings* pBindings = rDocShell.GetViewBindings();
if (pBindings)
pBindings->Invalidate( SID_LINKS );
- SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
return TRUE;
}
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index d5d7f6e09292..7554e189a235 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "attrib.hxx"
#include "asciiopt.hxx"
#include "waitoff.hxx"
-#include "docpool.hxx" // LoadCompleted
+#include "docpool.hxx" // LoadCompleted
#include "progress.hxx"
#include "pntlock.hxx"
#include "collect.hxx"
@@ -136,39 +136,39 @@ using ::rtl::OUStringBuffer;
// STATIC DATA -----------------------------------------------------------
-// Stream-Namen im Storage
+// Stream-Namen im Storage
-const sal_Char __FAR_DATA ScDocShell::pStarCalcDoc[] = STRING_SCSTREAM; // "StarCalcDocument"
+const sal_Char __FAR_DATA ScDocShell::pStarCalcDoc[] = STRING_SCSTREAM; // "StarCalcDocument"
const sal_Char __FAR_DATA ScDocShell::pStyleName[] = "SfxStyleSheets";
-// Filter-Namen (wie in sclib.cxx)
-
-static const sal_Char __FAR_DATA pFilterSc50[] = "StarCalc 5.0";
-//static const sal_Char __FAR_DATA pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterSc40[] = "StarCalc 4.0";
-//static const sal_Char __FAR_DATA pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterSc30[] = "StarCalc 3.0";
-//static const sal_Char __FAR_DATA pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterSc10[] = "StarCalc 1.0";
-static const sal_Char __FAR_DATA pFilterXML[] = "StarOffice XML (Calc)";
-static const sal_Char __FAR_DATA pFilterAscii[] = "Text - txt - csv (StarCalc)";
-static const sal_Char __FAR_DATA pFilterLotus[] = "Lotus";
-static const sal_Char __FAR_DATA pFilterQPro6[] = "Quattro Pro 6.0";
-static const sal_Char __FAR_DATA pFilterExcel4[] = "MS Excel 4.0";
-static const sal_Char __FAR_DATA pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterExcel5[] = "MS Excel 5.0/95";
-static const sal_Char __FAR_DATA pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterExcel95[] = "MS Excel 95";
-static const sal_Char __FAR_DATA pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterExcel97[] = "MS Excel 97";
-static const sal_Char __FAR_DATA pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template";
+// Filter-Namen (wie in sclib.cxx)
+
+static const sal_Char __FAR_DATA pFilterSc50[] = "StarCalc 5.0";
+//static const sal_Char __FAR_DATA pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template";
+static const sal_Char __FAR_DATA pFilterSc40[] = "StarCalc 4.0";
+//static const sal_Char __FAR_DATA pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template";
+static const sal_Char __FAR_DATA pFilterSc30[] = "StarCalc 3.0";
+//static const sal_Char __FAR_DATA pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template";
+static const sal_Char __FAR_DATA pFilterSc10[] = "StarCalc 1.0";
+static const sal_Char __FAR_DATA pFilterXML[] = "StarOffice XML (Calc)";
+static const sal_Char __FAR_DATA pFilterAscii[] = "Text - txt - csv (StarCalc)";
+static const sal_Char __FAR_DATA pFilterLotus[] = "Lotus";
+static const sal_Char __FAR_DATA pFilterQPro6[] = "Quattro Pro 6.0";
+static const sal_Char __FAR_DATA pFilterExcel4[] = "MS Excel 4.0";
+static const sal_Char __FAR_DATA pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template";
+static const sal_Char __FAR_DATA pFilterExcel5[] = "MS Excel 5.0/95";
+static const sal_Char __FAR_DATA pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template";
+static const sal_Char __FAR_DATA pFilterExcel95[] = "MS Excel 95";
+static const sal_Char __FAR_DATA pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template";
+static const sal_Char __FAR_DATA pFilterExcel97[] = "MS Excel 97";
+static const sal_Char __FAR_DATA pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template";
static const sal_Char __FAR_DATA pFilterEx07Xml[] = "MS Excel 2007 XML";
-static const sal_Char __FAR_DATA pFilterDBase[] = "dBase";
-static const sal_Char __FAR_DATA pFilterDif[] = "DIF";
-static const sal_Char __FAR_DATA pFilterSylk[] = "SYLK";
-static const sal_Char __FAR_DATA pFilterHtml[] = "HTML (StarCalc)";
-static const sal_Char __FAR_DATA pFilterHtmlWebQ[] = "calc_HTML_WebQuery";
-static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCalc)";
+static const sal_Char __FAR_DATA pFilterDBase[] = "dBase";
+static const sal_Char __FAR_DATA pFilterDif[] = "DIF";
+static const sal_Char __FAR_DATA pFilterSylk[] = "SYLK";
+static const sal_Char __FAR_DATA pFilterHtml[] = "HTML (StarCalc)";
+static const sal_Char __FAR_DATA pFilterHtmlWebQ[] = "calc_HTML_WebQuery";
+static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCalc)";
//----------------------------------------------------------------------
@@ -181,10 +181,10 @@ SFX_IMPL_INTERFACE(ScDocShell,SfxObjectShell, ScResId(SCSTR_DOCSHELL))
SFX_CHILDWINDOW_REGISTRATION( SID_HYPERLINK_INSERT );
}
-// GlobalName der aktuellen Version:
+// GlobalName der aktuellen Version:
SFX_IMPL_OBJECTFACTORY( ScDocShell, SvGlobalName(SO3_SC_CLASSID), SFXOBJECTSHELL_STD_NORMAL, "scalc" )
-TYPEINIT1( ScDocShell, SfxObjectShell ); // SfxInPlaceObject: kein Type-Info ?
+TYPEINIT1( ScDocShell, SfxObjectShell ); // SfxInPlaceObject: kein Type-Info ?
//------------------------------------------------------------------
@@ -198,17 +198,17 @@ void __EXPORT ScDocShell::FillClass( SvGlobalName* pClassName,
{
if ( nFileFormat == SOFFICE_FILEFORMAT_60 )
{
- *pClassName = SvGlobalName( SO3_SC_CLASSID_60 );
- *pFormat = SOT_FORMATSTR_ID_STARCALC_60;
- *pFullTypeName = String( ScResId( SCSTR_LONG_SCDOC_NAME ) );
- *pShortTypeName = String( ScResId( SCSTR_SHORT_SCDOC_NAME ) );
+ *pClassName = SvGlobalName( SO3_SC_CLASSID_60 );
+ *pFormat = SOT_FORMATSTR_ID_STARCALC_60;
+ *pFullTypeName = String( ScResId( SCSTR_LONG_SCDOC_NAME ) );
+ *pShortTypeName = String( ScResId( SCSTR_SHORT_SCDOC_NAME ) );
}
else if ( nFileFormat == SOFFICE_FILEFORMAT_8 )
{
- *pClassName = SvGlobalName( SO3_SC_CLASSID_60 );
- *pFormat = bTemplate ? SOT_FORMATSTR_ID_STARCALC_8_TEMPLATE : SOT_FORMATSTR_ID_STARCALC_8;
- *pFullTypeName = String( RTL_CONSTASCII_USTRINGPARAM("calc8") );
- *pShortTypeName = String( ScResId( SCSTR_SHORT_SCDOC_NAME ) );
+ *pClassName = SvGlobalName( SO3_SC_CLASSID_60 );
+ *pFormat = bTemplate ? SOT_FORMATSTR_ID_STARCALC_8_TEMPLATE : SOT_FORMATSTR_ID_STARCALC_8;
+ *pFullTypeName = String( RTL_CONSTASCII_USTRINGPARAM("calc8") );
+ *pShortTypeName = String( ScResId( SCSTR_SHORT_SCDOC_NAME ) );
}
else
{
@@ -235,7 +235,7 @@ SCTAB ScDocShell::GetSaveTab()
if (pSh)
{
const ScMarkData& rMark = pSh->GetViewData()->GetMarkData();
- for ( nTab = 0; nTab <= MAXTAB; nTab++ ) // erste markierte Tabelle
+ for ( nTab = 0; nTab <= MAXTAB; nTab++ ) // erste markierte Tabelle
if ( rMark.GetTableSelect( nTab ) )
break;
}
@@ -324,14 +324,14 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet)
ScGlobal::UnicodeStrChr( pNameBuffer, SC_COMPILER_FILE_TAB_SEP ) )
{
rtl::OUStringBuffer aDocURLBuffer;
- BOOL bQuote = TRUE; // Dokumentenname ist immer quoted
+ BOOL bQuote = TRUE; // Dokumentenname ist immer quoted
++pNameBuffer;
while ( bQuote && *pNameBuffer )
{
if ( *pNameBuffer == '\'' && *(pNameBuffer-1) != '\\' )
bQuote = FALSE;
else if( !(*pNameBuffer == '\\' && *(pNameBuffer+1) == '\'') )
- aDocURLBuffer.append(*pNameBuffer); // falls escaped Quote: nur Quote in den Namen
+ aDocURLBuffer.append(*pNameBuffer); // falls escaped Quote: nur Quote in den Namen
++pNameBuffer;
}
@@ -340,7 +340,7 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet)
{
xub_StrLen nIndex = nNameLength - nLinkTabNameLength;
INetURLObject aINetURLObject(aDocURLBuffer.makeStringAndClear());
- if( aName.Equals(aLinkTabName, nIndex, nLinkTabNameLength) &&
+ if( aName.Equals(aLinkTabName, nIndex, nLinkTabNameLength) &&
(aName.GetChar(nIndex - 1) == '#') && // before the table name should be the # char
!aINetURLObject.HasError()) // the docname should be a valid URL
{
@@ -375,7 +375,7 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet)
}
else
aDocument.SetInsertingFromOtherDoc( FALSE );
-
+
aDocument.SetImportingXML( FALSE );
aDocument.EnableExecuteLink( true );
aDocument.EnableUndo( TRUE );
@@ -398,7 +398,7 @@ BOOL ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::uno::R
{
RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "sb99857", "ScDocShell::LoadXML" );
- // MacroCallMode is no longer needed, state is kept in SfxObjectShell now
+ // MacroCallMode is no longer needed, state is kept in SfxObjectShell now
// no Seek(0) here - always loading from storage, GetInStream must not be called
@@ -424,7 +424,7 @@ BOOL ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::uno::R
aDocument.SetXMLFromWrapper( FALSE );
AfterXMLLoading(bRet);
- //! row heights...
+ //! row heights...
return bRet;
}
@@ -453,8 +453,8 @@ BOOL __EXPORT ScDocShell::Load( SfxMedium& rMedium )
ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() );
- // only the latin script language is loaded
- // -> initialize the others from options (before loading)
+ // only the latin script language is loaded
+ // -> initialize the others from options (before loading)
InitOptions(true);
GetUndoManager()->Clear();
@@ -469,8 +469,8 @@ BOOL __EXPORT ScDocShell::Load( SfxMedium& rMedium )
}
{
- // prepare a valid document for XML filter
- // (for ConvertFrom, InitNew is called before)
+ // prepare a valid document for XML filter
+ // (for ConvertFrom, InitNew is called before)
aDocument.MakeTable(0);
aDocument.GetStyleSheetPool()->CreateStandardStyles();
aDocument.UpdStlShtPtrsFrmNms();
@@ -561,27 +561,27 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
}
- if (rHint.ISA(SfxSimpleHint)) // ohne Parameter
+ if (rHint.ISA(SfxSimpleHint)) // ohne Parameter
{
ULONG nSlot = ((const SfxSimpleHint&)rHint).GetId();
switch ( nSlot )
{
case SFX_HINT_TITLECHANGED:
aDocument.SetName( SfxShell::GetName() );
- // RegisterNewTargetNames gibts nicht mehr
- SFX_APP()->Broadcast(SfxSimpleHint( SC_HINT_DOCNAME_CHANGED )); // Navigator
+ // RegisterNewTargetNames gibts nicht mehr
+ SFX_APP()->Broadcast(SfxSimpleHint( SC_HINT_DOCNAME_CHANGED )); // Navigator
break;
}
}
- else if (rHint.ISA(SfxStyleSheetHint)) // Vorlagen geaendert
+ else if (rHint.ISA(SfxStyleSheetHint)) // Vorlagen geaendert
NotifyStyle((const SfxStyleSheetHint&) rHint);
else if (rHint.ISA(ScAutoStyleHint))
{
- //! direct call for AutoStyles
+ //! direct call for AutoStyles
- // this is called synchronously from ScInterpreter::ScStyle,
- // modifying the document must be asynchronous
- // (handled by AddInitial)
+ // this is called synchronously from ScInterpreter::ScStyle,
+ // modifying the document must be asynchronous
+ // (handled by AddInitial)
ScAutoStyleHint& rStlHint = (ScAutoStyleHint&)rHint;
ScRange aRange = rStlHint.GetRange();
@@ -624,7 +624,7 @@ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
if( aDocument.IsInVBAMode() ) try
{
uno::Reference< frame::XModel > xModel( GetModel(), uno::UNO_SET_THROW );
-
+
// create VBAGlobals object if not yet done (this also creates the "ThisExcelDoc" symbol)
uno::Reference< lang::XMultiServiceFactory > xFactory( xModel, uno::UNO_QUERY_THROW );
xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.VBAGlobals" ) ) );
@@ -1012,7 +1012,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
LoadMediumGuard aLoadGuard(&aDocument);
- BOOL bRet = FALSE; // FALSE heisst Benutzerabbruch !!
+ BOOL bRet = FALSE; // FALSE heisst Benutzerabbruch !!
// bei Fehler: Fehler am Stream setzen!!
ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() );
@@ -1030,10 +1030,10 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
aConvFilterName.Erase(); //@ #BugId 54198
- // Alle Filter brauchen die komplette Datei am Stueck (nicht asynchron),
- // darum vorher per CreateFileStream dafuer sorgen, dass die komplette
- // Datei uebertragen wird.
- rMedium.GetPhysicalName(); //! CreateFileStream direkt rufen, wenn verfuegbar
+ // Alle Filter brauchen die komplette Datei am Stueck (nicht asynchron),
+ // darum vorher per CreateFileStream dafuer sorgen, dass die komplette
+ // Datei uebertragen wird.
+ rMedium.GetPhysicalName(); //! CreateFileStream direkt rufen, wenn verfuegbar
SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False);
nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : com::sun::star::document::UpdateDocMode::NO_UPDATE;
@@ -1070,7 +1070,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
else if (aFltName.EqualsAscii(pFilterLotus))
{
String sItStr;
- SfxItemSet* pSet = rMedium.GetItemSet();
+ SfxItemSet* pSet = rMedium.GetItemSet();
const SfxPoolItem* pItem;
if ( pSet && SFX_ITEM_SET ==
pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) )
@@ -1080,8 +1080,8 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
if (sItStr.Len() == 0)
{
- // default for lotus import (from API without options):
- // IBM_437 encoding
+ // default for lotus import (from API without options):
+ // IBM_437 encoding
sItStr = ScGlobal::GetCharsetString( RTL_TEXTENCODING_IBM_437 );
}
@@ -1116,14 +1116,14 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
else if ( aFltName.EqualsAscii(pFilterExcel97) || aFltName.EqualsAscii(pFilterEx97Temp) )
eFormat = EIF_BIFF8;
- MakeDrawLayer(); //! im Filter
+ MakeDrawLayer(); //! im Filter
CalcOutputFactor(); // #93255# prepare update of row height
ScColumn::bDoubleAlloc = TRUE;
FltError eError = ScFormatFilter::Get().ScImportExcel( rMedium, &aDocument, eFormat );
ScColumn::bDoubleAlloc = FALSE;
aDocument.UpdateFontCharSet();
if ( aDocument.IsChartListenerCollectionNeedsUpdate() )
- aDocument.UpdateChartListenerCollection(); //! fuer alle Importe?
+ aDocument.UpdateChartListenerCollection(); //! fuer alle Importe?
// #75299# all graphics objects must have names
aDocument.EnsureGraphicNames();
@@ -1147,7 +1147,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
}
else if (aFltName.EqualsAscii(pFilterAscii))
{
- SfxItemSet* pSet = rMedium.GetItemSet();
+ SfxItemSet* pSet = rMedium.GetItemSet();
const SfxPoolItem* pItem;
ScAsciiOptions aOptions;
BOOL bOptInit = FALSE;
@@ -1161,8 +1161,8 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
if ( !bOptInit )
{
- // default for ascii import (from API without options):
- // ISO8859-1/MS_1252 encoding, comma, double quotes
+ // default for ascii import (from API without options):
+ // ISO8859-1/MS_1252 encoding, comma, double quotes
aOptions.SetCharSet( RTL_TEXTENCODING_MS_1252 );
aOptions.SetFieldSeps( (sal_Unicode) ',' );
@@ -1174,7 +1174,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
if( ! rMedium.IsStorage() )
{
- ScImportExport aImpEx( &aDocument );
+ ScImportExport aImpEx( &aDocument );
aImpEx.SetExtOptions( aOptions );
SvStream* pInStream = rMedium.GetInStream();
@@ -1210,7 +1210,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
else if (aFltName.EqualsAscii(pFilterDBase))
{
String sItStr;
- SfxItemSet* pSet = rMedium.GetItemSet();
+ SfxItemSet* pSet = rMedium.GetItemSet();
const SfxPoolItem* pItem;
if ( pSet && SFX_ITEM_SET ==
pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) )
@@ -1220,8 +1220,8 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
if (sItStr.Len() == 0)
{
- // default for dBase import (from API without options):
- // IBM_850 encoding
+ // default for dBase import (from API without options):
+ // IBM_850 encoding
sItStr = ScGlobal::GetCharsetString( RTL_TEXTENCODING_IBM_850 );
}
@@ -1238,7 +1238,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
else
bRet = TRUE;
- aColWidthRange.aStart.SetRow( 1 ); // Spaltenheader nicht
+ aColWidthRange.aStart.SetRow( 1 ); // Spaltenheader nicht
bSetColWidths = TRUE;
bSetSimpleTextColWidths = TRUE;
// Memo-Felder fuehren zu einem bSimpleColWidth[nCol]==FALSE
@@ -1255,7 +1255,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
{
FltError eError;
String sItStr;
- SfxItemSet* pSet = rMedium.GetItemSet();
+ SfxItemSet* pSet = rMedium.GetItemSet();
const SfxPoolItem* pItem;
if ( pSet && SFX_ITEM_SET ==
pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) )
@@ -1265,8 +1265,8 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
if (sItStr.Len() == 0)
{
- // default for DIF import (from API without options):
- // ISO8859-1/MS_1252 encoding
+ // default for DIF import (from API without options):
+ // ISO8859-1/MS_1252 encoding
sItStr = ScGlobal::GetCharsetString( RTL_TEXTENCODING_MS_1252 );
}
@@ -1382,7 +1382,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
{
LanguageType eLang = LANGUAGE_SYSTEM;
bool bDateConvert = false;
- SfxItemSet* pSet = rMedium.GetItemSet();
+ SfxItemSet* pSet = rMedium.GetItemSet();
const SfxPoolItem* pItem;
if ( pSet && SFX_ITEM_SET ==
pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) )
@@ -1437,13 +1437,13 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
InitItems();
CalcOutputFactor();
if ( bRet && (bSetColWidths || bSetRowHeights) )
- { // Spaltenbreiten/Zeilenhoehen anpassen, Basis 100% Zoom
+ { // Spaltenbreiten/Zeilenhoehen anpassen, Basis 100% Zoom
Fraction aZoom( 1, 1 );
double nPPTX = ScGlobal::nScreenPPTX * (double) aZoom
- / GetOutputFactor(); // Faktor ist Drucker zu Bildschirm
+ / GetOutputFactor(); // Faktor ist Drucker zu Bildschirm
double nPPTY = ScGlobal::nScreenPPTY * (double) aZoom;
VirtualDevice aVirtDev;
- // all sheets (for Excel import)
+ // all sheets (for Excel import)
SCTAB nTabCount = aDocument.GetTableCount();
for (SCTAB nTab=0; nTab<nTabCount; nTab++)
{
@@ -1467,15 +1467,15 @@ BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium )
nWidth + (USHORT)ScGlobal::nLastColWidthExtra );
}
}
-// if ( bSetRowHeights )
-// {
-// // nExtra must be 0
-// aDocument.SetOptimalHeight( 0, nEndRow, nTab, 0, &aVirtDev,
-// nPPTX, nPPTY, aZoom, aZoom, FALSE );
-// }
+// if ( bSetRowHeights )
+// {
+// // nExtra must be 0
+// aDocument.SetOptimalHeight( 0, nEndRow, nTab, 0, &aVirtDev,
+// nPPTX, nPPTY, aZoom, aZoom, FALSE );
+// }
}
if ( bSetRowHeights )
- UpdateAllRowHeights(); // with vdev or printer, depending on configuration
+ UpdateAllRowHeights(); // with vdev or printer, depending on configuration
}
FinishedLoading( SFX_LOADED_MAINDOCUMENT | SFX_LOADED_IMAGES );
@@ -1535,7 +1535,7 @@ BOOL __EXPORT ScDocShell::Save()
PrepareSaveGuard aPrepareGuard( *this);
- // wait cursor is handled with progress bar
+ // wait cursor is handled with progress bar
BOOL bRet = SfxObjectShell::Save();
if( bRet )
bRet = SaveXML( GetMedium(), NULL );
@@ -1561,7 +1561,7 @@ BOOL __EXPORT ScDocShell::SaveAs( SfxMedium& rMedium )
PrepareSaveGuard aPrepareGuard( *this);
- // wait cursor is handled with progress bar
+ // wait cursor is handled with progress bar
BOOL bRet = SfxObjectShell::SaveAs( rMedium );
if( bRet )
bRet = SaveXML( &rMedium, NULL );
@@ -1575,7 +1575,7 @@ BOOL __EXPORT ScDocShell::IsInformationLost()
/*
const SfxFilter *pFilt = GetMedium()->GetFilter();
BOOL bRet = pFilt && pFilt->IsAlienFormat() && bNoInformLost;
- if (bNoInformLost) // nur einmal!!
+ if (bNoInformLost) // nur einmal!!
bNoInformLost = FALSE;
return bRet;
*/
@@ -1589,7 +1589,7 @@ BOOL __EXPORT ScDocShell::IsInformationLost()
xub_StrLen lcl_ScDocShell_GetColWidthInChars( USHORT nWidth )
{
// double fColScale = 1.0;
- double f = nWidth;
+ double f = nWidth;
f *= 1328.0 / 25.0;
f += 90.0;
f *= 1.0 / 23.0;
@@ -1697,7 +1697,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
String aString;
- ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current());
+ ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current());
const ScViewOptions& rOpt = (pViewSh)
? pViewSh->GetViewData()->GetOptions()
: aDocument.GetViewOptions();
@@ -1717,7 +1717,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
ScBaseCell* pCell;
while ( ( pCell = aIter.GetNext( nCol, nRow ) ) != NULL )
{
- BOOL bProgress = FALSE; // only upon line change
+ BOOL bProgress = FALSE; // only upon line change
if ( nNextRow < nRow )
{ // empty rows or/and empty columns up to end of row
bProgress = TRUE;
@@ -1782,7 +1782,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
if ( pProtAttr->GetHideCell() ||
( eType == CELLTYPE_FORMULA && bShowFormulas &&
pProtAttr->GetHideFormula() ) )
- eType = CELLTYPE_NONE; // hide
+ eType = CELLTYPE_NONE; // hide
}
BOOL bString;
switch ( eType )
@@ -1995,7 +1995,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
if ( nNextRow <= nEndRow )
{
for ( nEmptyCol = nNextCol; nEmptyCol < nEndCol; nEmptyCol++ )
- { // remaining empty columns of last row
+ { // remaining empty columns of last row
if ( bFixedWidth )
lcl_ScDocShell_WriteEmptyFixedWidthString( rStream,
aDocument, nTab, nEmptyCol );
@@ -2006,7 +2006,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
nNextRow++;
}
for ( nEmptyRow = nNextRow; nEmptyRow <= nEndRow; nEmptyRow++ )
- { // entire empty rows
+ { // entire empty rows
for ( nEmptyCol = nStartCol; nEmptyCol < nEndCol; nEmptyCol++ )
{
if ( bFixedWidth )
@@ -2032,7 +2032,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
// it's already in ExecuteSave (as for Save and SaveAs)
if (pAutoStyleList)
- pAutoStyleList->ExecuteAllNow(); // Vorlagen-Timeouts jetzt ausfuehren
+ pAutoStyleList->ExecuteAllNow(); // Vorlagen-Timeouts jetzt ausfuehren
if (GetCreateMode()== SFX_CREATE_MODE_STANDARD)
SfxObjectShell::SetVisArea( Rectangle() ); // normal bearbeitet -> keine VisArea
@@ -2127,7 +2127,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
if (pStream)
{
String sItStr;
- SfxItemSet* pSet = rMed.GetItemSet();
+ SfxItemSet* pSet = rMed.GetItemSet();
const SfxPoolItem* pItem;
if ( pSet && SFX_ITEM_SET ==
pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) )
@@ -2137,8 +2137,8 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
if ( sItStr.Len() == 0 )
{
- // default for ascii export (from API without options):
- // ISO8859-1/MS_1252 encoding, comma, double quotes
+ // default for ascii export (from API without options):
+ // ISO8859-1/MS_1252 encoding, comma, double quotes
ScImportOptions aDefOptions( ',', '"', RTL_TEXTENCODING_MS_1252 );
sItStr = aDefOptions.BuildString();
@@ -2157,7 +2157,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
else if (aFltName.EqualsAscii(pFilterDBase))
{
String sCharSet;
- SfxItemSet* pSet = rMed.GetItemSet();
+ SfxItemSet* pSet = rMed.GetItemSet();
const SfxPoolItem* pItem;
if ( pSet && SFX_ITEM_SET ==
pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) )
@@ -2167,8 +2167,8 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
if (sCharSet.Len() == 0)
{
- // default for dBase export (from API without options):
- // IBM_850 encoding
+ // default for dBase export (from API without options):
+ // IBM_850 encoding
sCharSet = ScGlobal::GetCharsetString( RTL_TEXTENCODING_IBM_850 );
}
@@ -2183,12 +2183,12 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
if ( eError != eERR_OK && (eError & ERRCODE_WARNING_MASK) )
{
-//! if ( !rMed.GetError() )
-//! rMed.SetError( eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+//! if ( !rMed.GetError() )
+//! rMed.SetError( eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
eError = eERR_OK;
}
-//! else if ( aDocument.GetTableCount() > 1 && !rMed.GetError() )
-//! rMed.SetError( SCWARN_EXPORT_ASCII, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+//! else if ( aDocument.GetTableCount() > 1 && !rMed.GetError() )
+//! rMed.SetError( SCWARN_EXPORT_ASCII, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
INetURLObject aTmpFile( rMed.GetPhysicalName(), INET_PROT_FILE );
if ( bHasMemo )
@@ -2228,7 +2228,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
if (pStream)
{
String sItStr;
- SfxItemSet* pSet = rMed.GetItemSet();
+ SfxItemSet* pSet = rMed.GetItemSet();
const SfxPoolItem* pItem;
if ( pSet && SFX_ITEM_SET ==
pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem ) )
@@ -2238,8 +2238,8 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
if (sItStr.Len() == 0)
{
- // default for DIF export (from API without options):
- // ISO8859-1/MS_1252 encoding
+ // default for DIF export (from API without options):
+ // ISO8859-1/MS_1252 encoding
sItStr = ScGlobal::GetCharsetString( RTL_TEXTENCODING_MS_1252 );
}
@@ -2306,7 +2306,7 @@ BOOL __EXPORT ScDocShell::DoSaveCompleted( SfxMedium * pNewStor )
{
BOOL bRet = SfxObjectShell::DoSaveCompleted( pNewStor );
- // SC_HINT_DOC_SAVED fuer Wechsel ReadOnly -> Read/Write
+ // SC_HINT_DOC_SAVED fuer Wechsel ReadOnly -> Read/Write
Broadcast( SfxSimpleHint( SC_HINT_DOC_SAVED ) );
return bRet;
}
@@ -2315,7 +2315,7 @@ BOOL __EXPORT ScDocShell::DoSaveCompleted( SfxMedium * pNewStor )
sal_Bool ScDocShell::QuerySlotExecutable( USHORT nSlotId )
{
// #i112634# ask VBA event handlers whether to save or print the document
-
+
using namespace ::com::sun::star::script::vba;
sal_Int32 nVbaEventId = VBAEventId::NO_EVENT;
@@ -2398,27 +2398,27 @@ USHORT __EXPORT ScDocShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
// end handler code
USHORT nRet = SfxObjectShell::PrepareClose( bUI, bForBrowsing );
- if (nRet == TRUE) // TRUE = schliessen
- aDocument.DisableIdle(TRUE); // nicht mehr drin rumpfuschen !!!
+ if (nRet == TRUE) // TRUE = schliessen
+ aDocument.DisableIdle(TRUE); // nicht mehr drin rumpfuschen !!!
return nRet;
}
void ScDocShell::PrepareReload()
{
- SfxObjectShell::PrepareReload(); // tut nichts?
+ SfxObjectShell::PrepareReload(); // tut nichts?
- // Das Disconnect von DDE-Links kann Reschedule ausloesen.
- // Wenn die DDE-Links erst im Dokument-dtor geloescht werden, kann beim Reload
- // aus diesem Reschedule das DDE-Link-Update fuer das neue Dokument ausgeloest
- // werden. Dabei verklemmt sicht dann irgendwas.
- // -> Beim Reload die DDE-Links des alten Dokuments vorher disconnecten
+ // Das Disconnect von DDE-Links kann Reschedule ausloesen.
+ // Wenn die DDE-Links erst im Dokument-dtor geloescht werden, kann beim Reload
+ // aus diesem Reschedule das DDE-Link-Update fuer das neue Dokument ausgeloest
+ // werden. Dabei verklemmt sicht dann irgendwas.
+ // -> Beim Reload die DDE-Links des alten Dokuments vorher disconnecten
aDocument.DisconnectDdeLinks();
}
-String ScDocShell::GetOwnFilterName() // static
+String ScDocShell::GetOwnFilterName() // static
{
return String::CreateFromAscii(pFilterSc50);
}
@@ -2428,35 +2428,35 @@ String ScDocShell::GetHtmlFilterName()
return String::CreateFromAscii(pFilterHtml);
}
-String ScDocShell::GetWebQueryFilterName() // static
+String ScDocShell::GetWebQueryFilterName() // static
{
return String::CreateFromAscii(pFilterHtmlWebQ);
}
-String ScDocShell::GetAsciiFilterName() // static
+String ScDocShell::GetAsciiFilterName() // static
{
return String::CreateFromAscii(pFilterAscii);
}
-String ScDocShell::GetLotusFilterName() // static
+String ScDocShell::GetLotusFilterName() // static
{
return String::CreateFromAscii(pFilterLotus);
}
-String ScDocShell::GetDBaseFilterName() // static
+String ScDocShell::GetDBaseFilterName() // static
{
return String::CreateFromAscii(pFilterDBase);
}
-String ScDocShell::GetDifFilterName() // static
+String ScDocShell::GetDifFilterName() // static
{
return String::CreateFromAscii(pFilterDif);
}
-BOOL ScDocShell::HasAutomaticTableName( const String& rFilter ) // static
+BOOL ScDocShell::HasAutomaticTableName( const String& rFilter ) // static
{
- // TRUE for those filters that keep the default table name
- // (which is language specific)
+ // TRUE for those filters that keep the default table name
+ // (which is language specific)
return rFilter.EqualsAscii( pFilterAscii )
|| rFilter.EqualsAscii( pFilterLotus )
@@ -2472,24 +2472,24 @@ BOOL ScDocShell::HasAutomaticTableName( const String& rFilter ) // static
//==================================================================
#define __SCDOCSHELL_INIT \
- aDocument ( SCDOCMODE_DOCUMENT, this ), \
+ aDocument ( SCDOCMODE_DOCUMENT, this ), \
aDdeTextFmt(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("TEXT"))), \
nPrtToScreenFactor( 1.0 ), \
pImpl ( new DocShell_Impl ), \
- bHeaderOn ( TRUE ), \
- bFooterOn ( TRUE ), \
+ bHeaderOn ( TRUE ), \
+ bFooterOn ( TRUE ), \
bNoInformLost ( TRUE ), \
- bIsEmpty ( TRUE ), \
- bIsInUndo ( FALSE ), \
+ bIsEmpty ( TRUE ), \
+ bIsInUndo ( FALSE ), \
bDocumentModifiedPending( FALSE ), \
- nDocumentLock ( 0 ), \
+ nDocumentLock ( 0 ), \
nCanUpdate (com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG), \
bUpdateEnabled ( TRUE ), \
pOldAutoDBRange ( NULL ), \
- pDocHelper ( NULL ), \
- pAutoStyleList ( NULL ), \
- pPaintLockData ( NULL ), \
- pOldJobSetup ( NULL ), \
+ pDocHelper ( NULL ), \
+ pAutoStyleList ( NULL ), \
+ pPaintLockData ( NULL ), \
+ pOldJobSetup ( NULL ), \
pSolverSaveData ( NULL ), \
pSheetSaveData ( NULL ), \
pModificator ( NULL )
@@ -2511,7 +2511,7 @@ ScDocShell::ScDocShell( const ScDocShell& rShell )
pDocFunc = new ScDocFunc(*this);
- // SetBaseModel needs exception handling
+ // SetBaseModel needs exception handling
ScModelObj::CreateAndSet( this );
StartListening(*this);
@@ -2522,13 +2522,13 @@ ScDocShell::ScDocShell( const ScDocShell& rShell )
GetPageOnFromPageStyleSet( NULL, 0, bHeaderOn, bFooterOn );
SetHelpId( HID_SCSHELL_DOCSH );
- // InitItems und CalcOutputFactor werden jetzt nach bei Load/ConvertFrom/InitNew gerufen
+ // InitItems und CalcOutputFactor werden jetzt nach bei Load/ConvertFrom/InitNew gerufen
}
//------------------------------------------------------------------
ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags )
- : SfxObjectShell( i_nSfxCreationFlags )
+ : SfxObjectShell( i_nSfxCreationFlags )
, __SCDOCSHELL_INIT
{
RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ScDocShell" );
@@ -2536,11 +2536,11 @@ ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags )
SetPool( &SC_MOD()->GetPool() );
bIsInplace = (GetCreateMode() == SFX_CREATE_MODE_EMBEDDED);
- // wird zurueckgesetzt, wenn nicht inplace
+ // wird zurueckgesetzt, wenn nicht inplace
pDocFunc = new ScDocFunc(*this);
- // SetBaseModel needs exception handling
+ // SetBaseModel needs exception handling
ScModelObj::CreateAndSet( this );
StartListening(*this);
@@ -2552,14 +2552,14 @@ ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags )
aDocument.GetDBCollection()->SetRefreshHandler(
LINK( this, ScDocShell, RefreshDBDataHdl ) );
- // InitItems und CalcOutputFactor werden jetzt nach bei Load/ConvertFrom/InitNew gerufen
+ // InitItems und CalcOutputFactor werden jetzt nach bei Load/ConvertFrom/InitNew gerufen
}
//------------------------------------------------------------------
__EXPORT ScDocShell::~ScDocShell()
{
- ResetDrawObjectShell(); // #55570# falls der Drawing-Layer noch versucht, darauf zuzugreifen
+ ResetDrawObjectShell(); // #55570# falls der Drawing-Layer noch versucht, darauf zuzugreifen
SfxStyleSheetPool* pStlPool = aDocument.GetStyleSheetPool();
if (pStlPool)
@@ -2569,7 +2569,7 @@ __EXPORT ScDocShell::~ScDocShell()
delete pAutoStyleList;
SfxApplication *pSfxApp = SFX_APP();
- if ( pSfxApp->GetDdeService() ) // DDE vor Dokument loeschen
+ if ( pSfxApp->GetDdeService() ) // DDE vor Dokument loeschen
pSfxApp->RemoveDdeTopic( this );
delete pDocFunc;
@@ -2579,7 +2579,7 @@ __EXPORT ScDocShell::~ScDocShell()
delete pPaintLockData;
- delete pOldJobSetup; // gesetzt nur bei Fehler in StartJob()
+ delete pOldJobSetup; // gesetzt nur bei Fehler in StartJob()
delete pSolverSaveData;
delete pSheetSaveData;
@@ -2611,16 +2611,16 @@ void ScDocShell::SetModified( BOOL bModified )
void ScDocShell::SetDocumentModified( BOOL bIsModified /* = TRUE */ )
{
- // BroadcastUno muss auch mit pPaintLockData sofort passieren
- //! auch bei SetDrawModified, wenn Drawing angebunden ist
- //! dann eigener Hint???
+ // BroadcastUno muss auch mit pPaintLockData sofort passieren
+ //! auch bei SetDrawModified, wenn Drawing angebunden ist
+ //! dann eigener Hint???
if ( pPaintLockData && bIsModified )
{
//! BCA_BRDCST_ALWAYS etc. also needed here?
aDocument.BroadcastUno( SfxSimpleHint( SFX_HINT_DATACHANGED ) );
- pPaintLockData->SetModified(); // spaeter...
+ pPaintLockData->SetModified(); // spaeter...
return;
}
@@ -2641,18 +2641,18 @@ void ScDocShell::SetDocumentModified( BOOL bIsModified /* = TRUE */ )
aDocument.CalcFormulaTree( TRUE );
PostDataChanged();
- // Detective AutoUpdate:
- // Update if formulas were modified (DetectiveDirty) or the list contains
- // "Trace Error" entries (#75362# - Trace Error can look completely different
- // after changes to non-formula cells).
+ // Detective AutoUpdate:
+ // Update if formulas were modified (DetectiveDirty) or the list contains
+ // "Trace Error" entries (#75362# - Trace Error can look completely different
+ // after changes to non-formula cells).
ScDetOpList* pList = aDocument.GetDetOpList();
if ( pList && ( aDocument.IsDetectiveDirty() || pList->HasAddError() ) &&
pList->Count() && !IsInUndo() && SC_MOD()->GetAppOptions().GetDetectiveAuto() )
{
- GetDocFunc().DetectiveRefresh(TRUE); // TRUE = caused by automatic update
+ GetDocFunc().DetectiveRefresh(TRUE); // TRUE = caused by automatic update
}
- aDocument.SetDetectiveDirty(FALSE); // always reset, also if not refreshed
+ aDocument.SetDetectiveDirty(FALSE); // always reset, also if not refreshed
}
// #b6697848# notify UNO objects after BCA_BRDCST_ALWAYS etc.
@@ -2660,9 +2660,9 @@ void ScDocShell::SetDocumentModified( BOOL bIsModified /* = TRUE */ )
}
}
-// SetDrawModified - ohne Formel-Update
-// (Drawing muss auch beim normalen SetDocumentModified upgedated werden,
-// z.B. bei Tabelle loeschen etc.)
+// SetDrawModified - ohne Formel-Update
+// (Drawing muss auch beim normalen SetDocumentModified upgedated werden,
+// z.B. bei Tabelle loeschen etc.)
void ScDocShell::SetDrawModified( BOOL bIsModified /* = TRUE */ )
{
@@ -2695,7 +2695,7 @@ void ScDocShell::SetDrawModified( BOOL bIsModified /* = TRUE */ )
if ( aDocument.IsChartListenerCollectionNeedsUpdate() )
{
aDocument.UpdateChartListenerCollection();
- SFX_APP()->Broadcast(SfxSimpleHint( SC_HINT_DRAW_CHANGED )); // Navigator
+ SFX_APP()->Broadcast(SfxSimpleHint( SC_HINT_DRAW_CHANGED )); // Navigator
}
SC_MOD()->AnythingChanged();
}
@@ -2725,7 +2725,7 @@ SfxDocumentInfoDialog* __EXPORT ScDocShell::CreateDocumentInfoDialog(
Window *pParent, const SfxItemSet &rSet )
{
SfxDocumentInfoDialog* pDlg = new SfxDocumentInfoDialog( pParent, rSet );
- ScDocShell* pDocSh = PTR_CAST(ScDocShell,SfxObjectShell::Current());
+ ScDocShell* pDocSh = PTR_CAST(ScDocShell,SfxObjectShell::Current());
//nur mit Statistik, wenn dieses Doc auch angezeigt wird, nicht
//aus dem Doc-Manager
@@ -2734,23 +2734,23 @@ SfxDocumentInfoDialog* __EXPORT ScDocShell::CreateDocumentInfoDialog(
{
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
- ::CreateTabPage ScDocStatPageCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_STAT );
+ ::CreateTabPage ScDocStatPageCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_STAT );
DBG_ASSERT(ScDocStatPageCreate, "Tabpage create fail!");//CHINA001
pDlg->AddTabPage( 42,
ScGlobal::GetRscString( STR_DOC_STAT ),
ScDocStatPageCreate,
NULL);
-//CHINA001 pDlg->AddTabPage( 42,
-//CHINA001 ScGlobal::GetRscString( STR_DOC_STAT ),
-//CHINA001 ScDocStatPage::Create,
-//CHINA001 NULL );
+//CHINA001 pDlg->AddTabPage( 42,
+//CHINA001 ScGlobal::GetRscString( STR_DOC_STAT ),
+//CHINA001 ScDocStatPage::Create,
+//CHINA001 NULL );
}
return pDlg;
}
Window* ScDocShell::GetActiveDialogParent()
{
- ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
+ ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
if ( pViewSh )
return pViewSh->GetDialogParent();
else
@@ -2816,7 +2816,7 @@ ScDocShellModificator::~ScDocShellModificator()
ScDocument* pDoc = rDocShell.GetDocument();
pDoc->SetAutoCalcShellDisabled( bAutoCalcShellDisabled );
if ( !bAutoCalcShellDisabled && rDocShell.IsDocumentModifiedPending() )
- rDocShell.SetDocumentModified(); // last one shuts off the lights
+ rDocShell.SetDocumentModified(); // last one shuts off the lights
pDoc->DisableIdle( bIdleDisabled );
}
@@ -2860,7 +2860,7 @@ bool ScDocShell::IsChangeRecording() const
return pChangeTrack != NULL;
}
-
+
bool ScDocShell::HasChangeRecordProtection() const
{
bool bRes = false;
@@ -2870,7 +2870,7 @@ bool ScDocShell::HasChangeRecordProtection() const
return bRes;
}
-
+
void ScDocShell::SetChangeRecording( bool bActivate )
{
bool bOldChangeRecording = IsChangeRecording();
@@ -2896,9 +2896,9 @@ void ScDocShell::SetChangeRecording( bool bActivate )
if (pBindings)
pBindings->InvalidateAll(FALSE);
}
-}
-
+}
+
bool ScDocShell::SetProtectionPassword( const String &rNewPassword )
{
bool bRes = false;
@@ -2911,7 +2911,7 @@ bool ScDocShell::SetProtectionPassword( const String &rNewPassword )
{
// when password protection is applied change tracking must always be active
SetChangeRecording( true );
-
+
::com::sun::star::uno::Sequence< sal_Int8 > aProtectionHash;
SvPasswordHelper::GetHashPassword( aProtectionHash, rNewPassword );
pChangeTrack->SetProtection( aProtectionHash );
@@ -2930,9 +2930,9 @@ bool ScDocShell::SetProtectionPassword( const String &rNewPassword )
}
return bRes;
-}
-
+}
+
bool ScDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash )
{
bool bRes = false;
@@ -2943,6 +2943,6 @@ bool ScDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal
bRes = true;
}
return bRes;
-}
-
+}
+
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index 14ff7622818c..33bd6fbb15a0 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +79,12 @@ BOOL __EXPORT ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xSt
BOOL bRet = SfxObjectShell::InitNew( xStor );
aDocument.MakeTable(0);
- // zusaetzliche Tabellen werden von der ersten View angelegt,
- // wenn bIsEmpty dann noch TRUE ist
+ // zusaetzliche Tabellen werden von der ersten View angelegt,
+ // wenn bIsEmpty dann noch TRUE ist
if( bRet )
{
- Size aSize( (long) ( STD_COL_WIDTH * HMM_PER_TWIPS * OLE_STD_CELLS_X ),
+ Size aSize( (long) ( STD_COL_WIDTH * HMM_PER_TWIPS * OLE_STD_CELLS_X ),
(long) ( ScGlobal::nStdRowHeight * HMM_PER_TWIPS * OLE_STD_CELLS_Y ) );
// hier muss auch der Start angepasst werden
SetVisAreaOrSize( Rectangle( Point(), aSize ), TRUE );
@@ -98,7 +98,7 @@ BOOL __EXPORT ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xSt
aDocument.GetStyleSheetPool()->CreateStandardStyles();
aDocument.UpdStlShtPtrsFrmNms();
- // SetDocumentModified ist in Load/InitNew nicht mehr erlaubt!
+ // SetDocumentModified ist in Load/InitNew nicht mehr erlaubt!
InitItems();
CalcOutputFactor();
@@ -108,14 +108,14 @@ BOOL __EXPORT ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xSt
aArgs[ 0 ] <<= GetModel();
aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Globals" ) ), aArgs );
GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
- // Fake ThisComponent being setup by Activate ( which is a view
- // related thing ),
+ // Fake ThisComponent being setup by Activate ( which is a view
+ // related thing ),
// a) if another document is opened then in theory ThisComponent
- // will be reset as before,
+ // will be reset as before,
// b) when this document is 'really' Activated then ThisComponent
// again will be set as before
// The only wrinkle seems if this document is loaded 'InVisible'
- // but.. I don't see that this is possible from the vba API
+ // but.. I don't see that this is possible from the vba API
// I could be wrong though
// There may be implications setting the current component
// too early :-/ so I will just manually set the Basic Variables
@@ -149,7 +149,7 @@ void ScDocShell::InitItems()
// if ( pImpl->pFontList )
// delete pImpl->pFontList;
- // Druck-Optionen werden beim Drucken und evtl. in GetPrinter gesetzt
+ // Druck-Optionen werden beim Drucken und evtl. in GetPrinter gesetzt
// pImpl->pFontList = new FontList( GetPrinter(), Application::GetDefaultDevice() );
//PutItem( SvxFontListItem( pImpl->pFontList, SID_ATTR_CHAR_FONTLIST ) );
@@ -165,23 +165,23 @@ void ScDocShell::InitItems()
PutItem( SvxDashListItem ( pDrawLayer->GetDashList(), SID_DASH_LIST ) );
PutItem( SvxLineEndListItem ( pDrawLayer->GetLineEndList(), SID_LINEEND_LIST ) );
- // andere Anpassungen nach dem Anlegen des DrawLayers
+ // andere Anpassungen nach dem Anlegen des DrawLayers
pDrawLayer->SetNotifyUndoActionHdl( LINK( pDocFunc, ScDocFunc, NotifyDrawUndo ) );
//if (SfxObjectShell::HasSbxObject())
- pDrawLayer->UpdateBasic(); // DocShell-Basic in DrawPages setzen
+ pDrawLayer->UpdateBasic(); // DocShell-Basic in DrawPages setzen
}
else
{
- // always use global color table instead of local copy
+ // always use global color table instead of local copy
PutItem( SvxColorTableItem( XColorTable::GetStdColorTable(), SID_COLOR_TABLE ) );
}
if ( !aDocument.GetForbiddenCharacters().isValid() ||
!aDocument.IsValidAsianCompression() || !aDocument.IsValidAsianKerning() )
{
- // get settings from SvxAsianConfig
+ // get settings from SvxAsianConfig
SvxAsianConfig aAsian( sal_False );
if ( !aDocument.GetForbiddenCharacters().isValid() )
@@ -217,7 +217,7 @@ void ScDocShell::InitItems()
if ( !aDocument.IsValidAsianKerning() )
{
// set asian punctuation kerning from configuration if not already set (e.g. XML import)
- aDocument.SetAsianKerning( !aAsian.IsKerningWesternTextOnly() ); // reversed
+ aDocument.SetAsianKerning( !aAsian.IsKerningWesternTextOnly() ); // reversed
}
}
}
@@ -254,7 +254,7 @@ ScDrawLayer* ScDocShell::MakeDrawLayer()
aDocument.InitDrawLayer(this);
pDrawLayer = aDocument.GetDrawLayer();
- InitItems(); // incl. Undo und Basic
+ InitItems(); // incl. Undo und Basic
Broadcast( SfxSimpleHint( SC_HINT_DRWLAYER_NEW ) );
if (nDocumentLock)
pDrawLayer->setLock(TRUE);
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 233843935bbd..2567408bb401 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +87,15 @@
//------------------------------------------------------------------
//
-// Redraw - Benachrichtigungen
+// Redraw - Benachrichtigungen
//
void ScDocShell::PostEditView( ScEditEngineDefaulter* pEditEngine, const ScAddress& rCursorPos )
{
-// Broadcast( ScEditViewHint( pEditEngine, rCursorPos ) );
+// Broadcast( ScEditViewHint( pEditEngine, rCursorPos ) );
- // Test: nur aktive ViewShell
+ // Test: nur aktive ViewShell
ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
if (pViewSh && pViewSh->GetViewData()->GetDocShell() == this)
@@ -110,8 +110,8 @@ void ScDocShell::PostDataChanged()
Broadcast( SfxSimpleHint( FID_DATACHANGED ) );
aDocument.ResetChanged( ScRange(0,0,0,MAXCOL,MAXROW,MAXTAB) );
- SFX_APP()->Broadcast(SfxSimpleHint( FID_ANYDATACHANGED )); // Navigator
- //! Navigator direkt benachrichtigen!
+ SFX_APP()->Broadcast(SfxSimpleHint( FID_ANYDATACHANGED )); // Navigator
+ //! Navigator direkt benachrichtigen!
}
void ScDocShell::PostPaint( SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab,
@@ -156,10 +156,10 @@ void ScDocShell::PostPaint( SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab,
if ( nStartCol != 0 || nEndCol != MAXCOL )
{
- // Extend to whole rows if SC_PF_WHOLEROWS is set, or rotated or non-left
- // aligned cells are contained (see UpdatePaintExt).
- // Special handling for RTL text (#i9731#) is unnecessary now with full
- // support of right-aligned text.
+ // Extend to whole rows if SC_PF_WHOLEROWS is set, or rotated or non-left
+ // aligned cells are contained (see UpdatePaintExt).
+ // Special handling for RTL text (#i9731#) is unnecessary now with full
+ // support of right-aligned text.
if ( ( nExtFlags & SC_PF_WHOLEROWS ) ||
aDocument.HasAttrib( nStartCol,nStartRow,nStartTab,
@@ -208,8 +208,8 @@ void ScDocShell::UpdatePaintExt( USHORT& rExtFlags, const ScRange& rRange )
{
if ( ( rExtFlags & SC_PF_LINES ) == 0 && aDocument.HasAttrib( rRange, HASATTR_PAINTEXT ) )
{
- // If the range contains lines, shadow or conditional formats,
- // set SC_PF_LINES to include one extra cell in all directions.
+ // If the range contains lines, shadow or conditional formats,
+ // set SC_PF_LINES to include one extra cell in all directions.
rExtFlags |= SC_PF_LINES;
}
@@ -218,11 +218,11 @@ void ScDocShell::UpdatePaintExt( USHORT& rExtFlags, const ScRange& rRange )
( rRange.aStart.Col() != 0 || rRange.aEnd.Col() != MAXCOL ) &&
aDocument.HasAttrib( rRange, HASATTR_ROTATE | HASATTR_RIGHTORCENTER ) )
{
- // If the range contains (logically) right- or center-aligned cells,
- // or rotated cells, set SC_PF_WHOLEROWS to paint the whole rows.
- // This test isn't needed after the cell changes, because it's also
- // tested in PostPaint. UpdatePaintExt may later be changed to do this
- // only if called before the changes.
+ // If the range contains (logically) right- or center-aligned cells,
+ // or rotated cells, set SC_PF_WHOLEROWS to paint the whole rows.
+ // This test isn't needed after the cell changes, because it's also
+ // tested in PostPaint. UpdatePaintExt may later be changed to do this
+ // only if called before the changes.
rExtFlags |= SC_PF_WHOLEROWS;
}
@@ -239,7 +239,7 @@ void ScDocShell::UpdatePaintExt( USHORT& rExtFlags, SCCOL nStartCol, SCROW nStar
void ScDocShell::LockPaint_Impl(BOOL bDoc)
{
if ( !pPaintLockData )
- pPaintLockData = new ScPaintLockData(0); //! Modus...
+ pPaintLockData = new ScPaintLockData(0); //! Modus...
pPaintLockData->IncLevel(bDoc);
}
@@ -251,10 +251,10 @@ void ScDocShell::UnlockPaint_Impl(BOOL bDoc)
pPaintLockData->DecLevel(bDoc);
if (!pPaintLockData->GetLevel(!bDoc) && !pPaintLockData->GetLevel(bDoc))
{
- // Paint jetzt ausfuehren
+ // Paint jetzt ausfuehren
ScPaintLockData* pPaint = pPaintLockData;
- pPaintLockData = NULL; // nicht weitersammeln
+ pPaintLockData = NULL; // nicht weitersammeln
ScRangeListRef xRangeList = pPaint->GetRangeList();
if (xRangeList)
@@ -263,7 +263,7 @@ void ScDocShell::UnlockPaint_Impl(BOOL bDoc)
ULONG nCount = xRangeList->Count();
for ( ULONG i=0; i<nCount; i++ )
{
- //! nExtFlags ???
+ //! nExtFlags ???
ScRange aRange = *xRangeList->GetObject(i);
PostPaint( aRange.aStart.Col(), aRange.aStart.Row(), aRange.aStart.Tab(),
aRange.aEnd.Col(), aRange.aEnd.Row(), aRange.aEnd.Tab(),
@@ -312,17 +312,17 @@ USHORT ScDocShell::GetLockCount() const
void ScDocShell::SetLockCount(USHORT nNew)
{
- if (nNew) // setzen
+ if (nNew) // setzen
{
if ( !pPaintLockData )
- pPaintLockData = new ScPaintLockData(0); //! Modus...
+ pPaintLockData = new ScPaintLockData(0); //! Modus...
pPaintLockData->SetLevel(nNew-1, TRUE);
LockDocument_Impl(nNew);
}
- else if (pPaintLockData) // loeschen
+ else if (pPaintLockData) // loeschen
{
- pPaintLockData->SetLevel(0, TRUE); // bei Unlock sofort ausfuehren
- UnlockPaint_Impl(TRUE); // jetzt
+ pPaintLockData->SetLevel(0, TRUE); // bei Unlock sofort ausfuehren
+ UnlockPaint_Impl(TRUE); // jetzt
UnlockDocument_Impl(0);
}
}
@@ -371,7 +371,7 @@ void ScDocShell::CalcOutputFactor()
{
if (bIsInplace)
{
- nPrtToScreenFactor = 1.0; // passt sonst nicht zur inaktiven Darstellung
+ nPrtToScreenFactor = 1.0; // passt sonst nicht zur inaktiven Darstellung
return;
}
@@ -392,10 +392,10 @@ void ScDocShell::CalcOutputFactor()
Font aDefFont;
OutputDevice* pRefDev = GetRefDevice();
MapMode aOldMode = pRefDev->GetMapMode();
- Font aOldFont = pRefDev->GetFont();
+ Font aOldFont = pRefDev->GetFont();
pRefDev->SetMapMode(MAP_PIXEL);
- pPattern->GetFont(aDefFont, SC_AUTOCOL_BLACK, pRefDev); // font color doesn't matter here
+ pPattern->GetFont(aDefFont, SC_AUTOCOL_BLACK, pRefDev); // font color doesn't matter here
pRefDev->SetFont(aDefFont);
nPrinterWidth = pRefDev->PixelToLogic( Size( pRefDev->GetTextWidth(aTestString), 0 ), MAP_100TH_MM ).Width();
pRefDev->SetFont(aOldFont);
@@ -403,7 +403,7 @@ void ScDocShell::CalcOutputFactor()
VirtualDevice aVirtWindow( *Application::GetDefaultDevice() );
aVirtWindow.SetMapMode(MAP_PIXEL);
- pPattern->GetFont(aDefFont, SC_AUTOCOL_BLACK, &aVirtWindow); // font color doesn't matter here
+ pPattern->GetFont(aDefFont, SC_AUTOCOL_BLACK, &aVirtWindow); // font color doesn't matter here
aVirtWindow.SetFont(aDefFont);
nWindowWidth = aVirtWindow.GetTextWidth(aTestString);
nWindowWidth = (long) ( nWindowWidth / ScGlobal::nScreenPPTX * HMM_PER_TWIPS );
@@ -426,7 +426,7 @@ double ScDocShell::GetOutputFactor() const
void ScDocShell::InitOptions(bool bForLoading) // called from InitNew and Load
{
- // Einstellungen aus dem SpellCheckCfg kommen in Doc- und ViewOptions
+ // Einstellungen aus dem SpellCheckCfg kommen in Doc- und ViewOptions
USHORT nDefLang, nCjkLang, nCtlLang;
BOOL bAutoSpell;
@@ -451,14 +451,14 @@ void ScDocShell::InitOptions(bool bForLoading) // called from InitNew and L
aDocument.SetDocOptions( aDocOpt );
aDocument.SetViewOptions( aViewOpt );
- // Druck-Optionen werden jetzt direkt vor dem Drucken gesetzt
+ // Druck-Optionen werden jetzt direkt vor dem Drucken gesetzt
aDocument.SetLanguage( (LanguageType) nDefLang, (LanguageType) nCjkLang, (LanguageType) nCtlLang );
}
//---------------------------------------------------------------------
-Printer* ScDocShell::GetDocumentPrinter() // fuer OLE
+Printer* ScDocShell::GetDocumentPrinter() // fuer OLE
{
return aDocument.GetPrinter();
}
@@ -516,7 +516,7 @@ USHORT ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags )
SfxViewShell* pSh = pFrame->GetViewShell();
if (pSh && pSh->ISA(ScTabViewShell))
{
- ScTabViewShell* pViewSh = (ScTabViewShell*)pSh;
+ ScTabViewShell* pViewSh = (ScTabViewShell*)pSh;
ScInputHandler* pInputHdl = pScMod->GetInputHdl(pViewSh);
if (pInputHdl)
pInputHdl->UpdateRefDevice();
@@ -532,17 +532,17 @@ USHORT ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags )
{
pOldPrinter->SetJobSetup( pNewPrinter->GetJobSetup() );
- // #i6706# Call SetPrinter with the old printer again, so the drawing layer
- // RefDevice is set (calling ReformatAllTextObjects and rebuilding charts),
- // because the JobSetup (printer device settings) may affect text layout.
+ // #i6706# Call SetPrinter with the old printer again, so the drawing layer
+ // RefDevice is set (calling ReformatAllTextObjects and rebuilding charts),
+ // because the JobSetup (printer device settings) may affect text layout.
aDocument.SetPrinter( pOldPrinter );
- CalcOutputFactor(); // also with the new settings
+ CalcOutputFactor(); // also with the new settings
}
}
if (nDiffFlags & SFX_PRINTER_OPTIONS)
{
- aDocument.SetPrintOptions(); //! aus neuem Printer ???
+ aDocument.SetPrintOptions(); //! aus neuem Printer ???
}
if (nDiffFlags & (SFX_PRINTER_CHG_ORIENTATION | SFX_PRINTER_CHG_SIZE))
@@ -565,7 +565,7 @@ USHORT ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags )
aNewItem.SetLandscape( bNewLand );
rSet.Put( aNewItem );
- // Groesse umdrehen
+ // Groesse umdrehen
Size aOldSize = ((const SvxSizeItem&)rSet.Get(ATTR_PAGE_SIZE)).GetSize();
Size aNewSize(aOldSize.Height(),aOldSize.Width());
SvxSizeItem aNewSItem(ATTR_PAGE_SIZE,aNewSize);
@@ -574,7 +574,7 @@ USHORT ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags )
}
if (nDiffFlags & SFX_PRINTER_CHG_SIZE)
{
- SvxSizeItem aPaperSizeItem( ATTR_PAGE_SIZE, SvxPaperInfo::GetPaperSize(pNewPrinter) );
+ SvxSizeItem aPaperSizeItem( ATTR_PAGE_SIZE, SvxPaperInfo::GetPaperSize(pNewPrinter) );
rSet.Put( aPaperSizeItem );
}
}
@@ -603,7 +603,7 @@ ScChangeAction* ScDocShell::GetChangeAction( const ScAddress& rPos )
while (pAction)
{
ScChangeActionType eType = pAction->GetType();
- //! ScViewUtil::IsActionShown( *pAction, *pSettings, *pDoc )...
+ //! ScViewUtil::IsActionShown( *pAction, *pSettings, *pDoc )...
if ( pAction->IsVisible() && eType != SC_CAT_DELETE_TABS )
{
const ScBigRange& rBig = pAction->GetBigRange();
@@ -618,7 +618,7 @@ ScChangeAction* ScDocShell::GetChangeAction( const ScAddress& rPos )
if ( aRange.In( rPos ) )
{
- pFound = pAction; // der letzte gewinnt
+ pFound = pAction; // der letzte gewinnt
switch ( pAction->GetType() )
{
case SC_CAT_CONTENT :
@@ -658,10 +658,10 @@ void ScDocShell::SetChangeComment( ScChangeAction* pAction, const String& rComme
if (pAction)
{
pAction->SetComment( rComment );
- //! Undo ???
+ //! Undo ???
SetDocumentModified();
- // Dialog-Notify
+ // Dialog-Notify
ScChangeTrack* pTrack = GetDocument()->GetChangeTrack();
if (pTrack)
{
@@ -673,7 +673,7 @@ void ScDocShell::SetChangeComment( ScChangeAction* pAction, const String& rComme
void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pParent,BOOL bPrevNext)
{
- if (!pAction) return; // ohne Aktion ist nichts..
+ if (!pAction) return; // ohne Aktion ist nichts..
String aComment = pAction->GetComment();
String aAuthor = pAction->GetUser();
@@ -707,7 +707,7 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc )
ScChangeTrack* pTrack = aDocument.GetChangeTrack();
if ( pTrack && pTrack->GetFirst() )
{
- //! Changes vorhanden -> Nachfrage ob geloescht werden soll
+ //! Changes vorhanden -> Nachfrage ob geloescht werden soll
}
aDocument.EndChangeTracking();
@@ -719,7 +719,7 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc )
{
aOldUser = pTrack->GetUser();
- // check if comparing to same document
+ // check if comparing to same document
String aThisFile;
const SfxMedium* pThisMed = GetMedium();
@@ -736,9 +736,9 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc )
BOOL bSameDoc = ( aThisFile == aOtherFile && aThisFile.Len() );
if ( !bSameDoc )
{
- // create change actions from comparing with the name of the user
- // who last saved the document
- // (only if comparing different documents)
+ // create change actions from comparing with the name of the user
+ // who last saved the document
+ // (only if comparing different documents)
using namespace ::com::sun::star;
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
@@ -765,7 +765,7 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc )
//---------------------------------------------------------------------
//
-// Merge (Aenderungen zusammenfuehren)
+// Merge (Aenderungen zusammenfuehren)
//
//---------------------------------------------------------------------
@@ -773,12 +773,12 @@ inline BOOL lcl_Equal( const ScChangeAction* pA, const ScChangeAction* pB, BOOL
{
return pA && pB &&
pA->GetActionNumber() == pB->GetActionNumber() &&
- pA->GetType() == pB->GetType() &&
- pA->GetUser() == pB->GetUser() &&
+ pA->GetType() == pB->GetType() &&
+ pA->GetUser() == pB->GetUser() &&
(bIgnore100Sec ?
pA->GetDateTimeUTC().IsEqualIgnore100Sec( pB->GetDateTimeUTC() ) :
pA->GetDateTimeUTC() == pB->GetDateTimeUTC());
- // State nicht vergleichen, falls eine alte Aenderung akzeptiert wurde
+ // State nicht vergleichen, falls eine alte Aenderung akzeptiert wurde
}
bool lcl_FindAction( ScDocument* pDoc, const ScChangeAction* pAction, ScDocument* pSearchDoc, const ScChangeAction* pFirstSearchAction, const ScChangeAction* pLastSearchAction, BOOL bIgnore100Sec )
@@ -823,11 +823,11 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
ScChangeTrack* pSourceTrack = rOtherDoc.GetChangeTrack();
if (!pSourceTrack)
- return; //! nichts zu tun - Fehlermeldung?
+ return; //! nichts zu tun - Fehlermeldung?
ScChangeTrack* pThisTrack = aDocument.GetChangeTrack();
if ( !pThisTrack )
- { // anschalten
+ { // anschalten
aDocument.StartChangeTracking();
pThisTrack = aDocument.GetChangeTrack();
DBG_ASSERT(pThisTrack,"ChangeTracking nicht angeschaltet?");
@@ -844,7 +844,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
BOOL bIgnore100Sec = !pSourceTrack->IsTime100thSeconds() ||
!pThisTrack->IsTime100thSeconds();
- // gemeinsame Ausgangsposition suchen
+ // gemeinsame Ausgangsposition suchen
ULONG nFirstNewNumber = 0;
const ScChangeAction* pSourceAction = pSourceTrack->GetFirst();
const ScChangeAction* pThisAction = pThisTrack->GetFirst();
@@ -855,10 +855,10 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
pSourceAction = pSourceAction->GetNext();
pThisAction = pThisAction->GetNext();
}
- // pSourceAction und pThisAction zeigen jetzt auf die ersten "eigenen" Aktionen
- // Die gemeinsamen Aktionen davor interessieren ueberhaupt nicht
+ // pSourceAction und pThisAction zeigen jetzt auf die ersten "eigenen" Aktionen
+ // Die gemeinsamen Aktionen davor interessieren ueberhaupt nicht
- //! Abfrage, ob die Dokumente vor dem Change-Tracking gleich waren !!!
+ //! Abfrage, ob die Dokumente vor dem Change-Tracking gleich waren !!!
const ScChangeAction* pFirstMergeAction = pSourceAction;
@@ -867,7 +867,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
// #i94841# [Collaboration] When deleting rows is rejected, the content is sometimes wrong
const ScChangeAction* pLastSearchAction = pThisTrack->GetLast();
- // MergeChangeData aus den folgenden Aktionen erzeugen
+ // MergeChangeData aus den folgenden Aktionen erzeugen
ULONG nNewActionCount = 0;
const ScChangeAction* pCount = pSourceAction;
while ( pCount )
@@ -877,8 +877,8 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
pCount = pCount->GetNext();
}
if (!nNewActionCount)
- return; //! nichts zu tun - Fehlermeldung?
- // ab hier kein return mehr
+ return; //! nichts zu tun - Fehlermeldung?
+ // ab hier kein return mehr
ScProgress aProgress( this,
String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("...")),
@@ -888,8 +888,8 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
// UpdateReference-Undo, gueltige Referenzen fuer den letzten gemeinsamen Zustand
pSourceTrack->MergePrepare( (ScChangeAction*) pFirstMergeAction, bShared );
- // MergeChangeData an alle noch folgenden Aktionen in diesem Dokument anpassen
- // -> Referenzen gueltig fuer dieses Dokument
+ // MergeChangeData an alle noch folgenden Aktionen in diesem Dokument anpassen
+ // -> Referenzen gueltig fuer dieses Dokument
while ( pThisAction )
{
// #i87049# [Collaboration] Conflict between delete row and insert content is not merged correctly
@@ -909,7 +909,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
{
const ScChangeActionDel* pDel = (const ScChangeActionDel*) pThisAction;
if ( pDel->IsTopDelete() && !pDel->IsTabDeleteCol() )
- { // deleted Table enthaelt deleted Cols, die nicht
+ { // deleted Table enthaelt deleted Cols, die nicht
ULONG nStart, nEnd;
pSourceTrack->AppendDeleteRange(
pDel->GetOverAllRange().MakeRange(), NULL, nStart, nEnd );
@@ -934,7 +934,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
LockPaint(); // #i73877# no repainting after each action
- // MergeChangeData in das aktuelle Dokument uebernehmen
+ // MergeChangeData in das aktuelle Dokument uebernehmen
BOOL bHasRejected = FALSE;
String aOldUser = pThisTrack->GetUser();
pThisTrack->SetUseFixDateTime( TRUE );
@@ -967,10 +967,10 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
//! muss hier noch festgestellt werden, ob wirklich in
//! _diesem_ Dokument geloescht?
- // liegt in einem Bereich, der in diesem Dokument geloescht wurde
- // -> wird weggelassen
- //! ??? Loesch-Aktion rueckgaengig machen ???
- //! ??? Aktion irgendwo anders speichern ???
+ // liegt in einem Bereich, der in diesem Dokument geloescht wurde
+ // -> wird weggelassen
+ //! ??? Loesch-Aktion rueckgaengig machen ???
+ //! ??? Aktion irgendwo anders speichern ???
#ifdef DBG_UTIL
String aValue;
if ( eSourceType == SC_CAT_CONTENT )
@@ -982,7 +982,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
}
else
{
- //! Datum/Autor/Kommentar der Source-Aktion uebernehmen!
+ //! Datum/Autor/Kommentar der Source-Aktion uebernehmen!
pThisTrack->SetUser( pSourceAction->GetUser() );
pThisTrack->SetFixDateTimeUTC( pSourceAction->GetDateTimeUTC() );
@@ -1008,16 +1008,16 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
}
else
{
- // alte Aktion (aus den gemeinsamen) ablehnen
+ // alte Aktion (aus den gemeinsamen) ablehnen
ScChangeAction* pOldAction = pThisTrack->GetAction( nReject );
if (pOldAction && pOldAction->GetState() == SC_CAS_VIRGIN)
{
- //! was passiert bei Aktionen, die in diesem Dokument accepted worden sind???
- //! Fehlermeldung oder was???
- //! oder Reject-Aenderung normal ausfuehren
+ //! was passiert bei Aktionen, die in diesem Dokument accepted worden sind???
+ //! Fehlermeldung oder was???
+ //! oder Reject-Aenderung normal ausfuehren
pThisTrack->Reject(pOldAction);
- bHasRejected = TRUE; // fuer Paint
+ bHasRejected = TRUE; // fuer Paint
}
bExecute = false;
}
@@ -1025,15 +1025,15 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
if ( bExecute )
{
- // normal ausfuehren
+ // normal ausfuehren
ScRange aSourceRange = pSourceAction->GetBigRange().MakeRange();
rMarkData.SelectOneTable( aSourceRange.aStart.Tab() );
switch ( eSourceType )
{
case SC_CAT_CONTENT:
{
- //! Test, ob es ganz unten im Dokument war, dann automatisches
- //! Zeilen-Einfuegen ???
+ //! Test, ob es ganz unten im Dokument war, dann automatisches
+ //! Zeilen-Einfuegen ???
DBG_ASSERT( aSourceRange.aStart == aSourceRange.aEnd, "huch?" );
ScAddress aPos = aSourceRange.aStart;
@@ -1062,7 +1062,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
EMPTY_STRING, formula::FormulaGrammar::GRAM_DEFAULT );
}
break;
- case MM_REFERENCE : // do nothing
+ case MM_REFERENCE : // do nothing
break;
case MM_FAKE :
DBG_WARNING( "MergeDocument: MatrixFlag MM_FAKE" );
@@ -1113,7 +1113,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
{
const ScChangeActionDel* pDel = (const ScChangeActionDel*) pSourceAction;
if ( pDel->IsTopDelete() && !pDel->IsTabDeleteCol() )
- { // deleted Table enthaelt deleted Cols, die nicht
+ { // deleted Table enthaelt deleted Cols, die nicht
aSourceRange = pDel->GetOverAllRange().MakeRange();
GetDocFunc().DeleteCells( aSourceRange, NULL, DEL_DELCOLS, TRUE, FALSE );
}
@@ -1191,10 +1191,10 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
pThisTrack->SetUser(aOldUser);
pThisTrack->SetUseFixDateTime( FALSE );
- pSourceTrack->Clear(); //! der ist jetzt verhunzt
+ pSourceTrack->Clear(); //! der ist jetzt verhunzt
if (bHasRejected)
- PostPaintGridAll(); // Reject() paintet nicht selber
+ PostPaintGridAll(); // Reject() paintet nicht selber
UnlockPaint();
}
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index d50ce6f21c9c..938425ec7a3b 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using namespace ::com::sun::star;
// INCLUDE ---------------------------------------------------------------
#if STLPORT_VERSION>=321
-#include <math.h> // prevent conflict between exception and std::exception
+#include <math.h> // prevent conflict between exception and std::exception
#endif
#include "scitems.hxx"
@@ -110,7 +110,7 @@ using namespace ::com::sun::star;
#include "reffact.hxx"
#include "chartlis.hxx"
#include "waitoff.hxx"
-#include "tablink.hxx" // ScDocumentLoader statics
+#include "tablink.hxx" // ScDocumentLoader statics
#include "drwlayer.hxx"
#include "docoptio.hxx"
#include "undostyl.hxx"
@@ -140,17 +140,17 @@ using namespace ::com::sun::star;
#define IS_AVAILABLE(WhichId,ppItem) \
(pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
-#define SC_PREVIEW_SIZE_X 10000
-#define SC_PREVIEW_SIZE_Y 12400
+#define SC_PREVIEW_SIZE_X 10000
+#define SC_PREVIEW_SIZE_Y 12400
//------------------------------------------------------------------
void ScDocShell::Execute( SfxRequest& rReq )
{
- // SID_SC_RANGE (Range),
- // SID_SC_CELLTEXT (CellText),
- // SID_SC_CELLS (Cells) - removed (old Basic)
+ // SID_SC_RANGE (Range),
+ // SID_SC_CELLTEXT (CellText),
+ // SID_SC_CELLS (Cells) - removed (old Basic)
const SfxItemSet* pReqArgs = rReq.GetArgs();
SfxBindings* pBindings = GetViewBindings();
@@ -170,7 +170,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
IS_AVAILABLE( FN_PARAM_3, &pTabItem ) &&
IS_AVAILABLE( SID_SC_SETTEXT, &pTextItem ) )
{
- // Parameter sind 1-based !!!
+ // Parameter sind 1-based !!!
SCCOL nCol = ((SfxInt16Item*)pColItem)->GetValue() - 1;
SCROW nRow = ((SfxInt32Item*)pRowItem)->GetValue() - 1;
SCTAB nTab = ((SfxInt16Item*)pTabItem)->GetValue() - 1;
@@ -189,9 +189,9 @@ void ScDocShell::Execute( SfxRequest& rReq )
rReq.Done();
break;
}
- else // geschuetzte Zelle
+ else // geschuetzte Zelle
{
- SbxBase::SetError( SbxERR_BAD_PARAMETER ); //! welchen Fehler ?
+ SbxBase::SetError( SbxERR_BAD_PARAMETER ); //! welchen Fehler ?
break;
}
}
@@ -201,13 +201,13 @@ void ScDocShell::Execute( SfxRequest& rReq )
break;
- // SID_SBA_QRY_CHANGETARGET gibts nicht mehr - auch in idl raus
+ // SID_SBA_QRY_CHANGETARGET gibts nicht mehr - auch in idl raus
case SID_SBA_IMPORT:
{
if (pReqArgs)
{
- const sal_Unicode cSbaSep = 11; // Trennzeichen
+ const sal_Unicode cSbaSep = 11; // Trennzeichen
const SfxPoolItem* pItem;
String sSbaData, sTarget;
@@ -216,7 +216,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
if ( pReqArgs->GetItemState( FN_PARAM_1, TRUE, &pItem ) == SFX_ITEM_SET )
sTarget = ((const SfxStringItem*)pItem)->GetValue();
- BOOL bIsNewArea = TRUE; // Default TRUE (keine Nachfrage)
+ BOOL bIsNewArea = TRUE; // Default TRUE (keine Nachfrage)
if ( pReqArgs->GetItemState( FN_PARAM_2, TRUE, &pItem ) == SFX_ITEM_SET )
bIsNewArea = ((const SfxBoolItem*)pItem)->GetValue();
@@ -225,13 +225,13 @@ void ScDocShell::Execute( SfxRequest& rReq )
if ( pReqArgs->GetItemState( FN_PARAM_3, FALSE, &pItem ) == SFX_ITEM_SET && pItem )
xResultSet.set(((const SfxUsrAnyItem*)pItem)->GetValue(),::com::sun::star::uno::UNO_QUERY);
- String sDBName = sSbaData.GetToken(0,cSbaSep); // Datenbankname
- String sDBTable = sSbaData.GetToken(1,cSbaSep); // Tabellen- oder Query-Name
+ String sDBName = sSbaData.GetToken(0,cSbaSep); // Datenbankname
+ String sDBTable = sSbaData.GetToken(1,cSbaSep); // Tabellen- oder Query-Name
String sTabFlag = sSbaData.GetToken(2,cSbaSep);
- String sDBSql = sSbaData.GetToken(3,cSbaSep); // SQL im Klartext
+ String sDBSql = sSbaData.GetToken(3,cSbaSep); // SQL im Klartext
- BYTE nType = ScDbTable; // "0" oder "1"
- if ( sTabFlag.EqualsAscii("0") ) // "0" = Query, "1" = Table (Default)
+ BYTE nType = ScDbTable; // "0" oder "1"
+ if ( sTabFlag.EqualsAscii("0") ) // "0" = Query, "1" = Table (Default)
nType = ScDbQuery;
SbaSelectionListRef pSelectionList = new SbaSelectionList;
@@ -292,7 +292,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
pSelectionList );
rReq.Done();
- // UpdateImport aktualisiert auch die internen Operationen
+ // UpdateImport aktualisiert auch die internen Operationen
}
else
rReq.Ignore();
@@ -313,12 +313,12 @@ void ScDocShell::Execute( SfxRequest& rReq )
{
ScDocument* pDoc = GetDocument();
// BOOL bUndo (pDoc->IsUndoEnabled());
- const SfxPoolItem* pItem;
- String aChartName, aRangeName;
+ const SfxPoolItem* pItem;
+ String aChartName, aRangeName;
- ScRange aSingleRange;
- ScRangeListRef aRangeListRef;
- BOOL bMultiRange = FALSE;
+ ScRange aSingleRange;
+ ScRangeListRef aRangeListRef;
+ BOOL bMultiRange = FALSE;
BOOL bColHeaders = TRUE;
BOOL bRowHeaders = TRUE;
@@ -352,17 +352,17 @@ void ScDocShell::Execute( SfxRequest& rReq )
if ( aRangeListRef->Count() )
{
bMultiRange = TRUE;
- aSingleRange = *aRangeListRef->GetObject(0); // fuer Header
+ aSingleRange = *aRangeListRef->GetObject(0); // fuer Header
bValid = TRUE;
}
else
aRangeListRef.Clear();
}
- ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
+ ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
if (pViewSh && bValid && aChartName.Len() != 0 )
{
- Window* pParent = pViewSh->GetDialogParent();
+ Window* pParent = pViewSh->GetDialogParent();
SCCOL nCol1 = aSingleRange.aStart.Col();
SCROW nRow1 = aSingleRange.aStart.Row();
@@ -370,7 +370,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
SCROW nRow2 = aSingleRange.aEnd.Row();
SCTAB nTab = aSingleRange.aStart.Tab();
- //! immer oder gar nicht begrenzen ???
+ //! immer oder gar nicht begrenzen ???
if (!bMultiRange)
aDocument.LimitChartArea( nTab, nCol1,nRow1, nCol2,nRow2 );
@@ -400,7 +400,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
if ( pDlg->Execute() == RET_OK ) //CHINA001 if ( aDlg.Execute() == RET_OK )
{
- bColHeaders = pDlg->IsRow(); //CHINA001 bColHeaders = aDlg.IsRow(); // Spaltenkoepfe = 1. Zeile
+ bColHeaders = pDlg->IsRow(); //CHINA001 bColHeaders = aDlg.IsRow(); // Spaltenkoepfe = 1. Zeile
bRowHeaders = pDlg->IsCol(); //CHINA001 bRowHeaders = aDlg.IsCol();
rReq.AppendItem(SfxBoolItem(FN_PARAM_1, bColHeaders));
@@ -411,7 +411,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
delete pDlg; //CHINA001
}
- if (bOk) // ausfuehren
+ if (bOk) // ausfuehren
{
if (bMultiRange)
{
@@ -457,13 +457,13 @@ void ScDocShell::Execute( SfxRequest& rReq )
if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( nSlot, TRUE, &pItem ) )
bNewVal = ((const SfxBoolItem*)pItem)->GetValue();
else
- bNewVal = !aDocument.GetAutoCalc(); // Toggle fuer Menue
+ bNewVal = !aDocument.GetAutoCalc(); // Toggle fuer Menue
aDocument.SetAutoCalc( bNewVal );
SetDocumentModified();
if (pBindings)
{
pBindings->Invalidate( FID_AUTO_CALC );
-// pBindings->Invalidate( FID_RECALC ); // jetzt immer enabled
+// pBindings->Invalidate( FID_RECALC ); // jetzt immer enabled
}
rReq.AppendItem( SfxBoolItem( FID_AUTO_CALC, bNewVal ) );
rReq.Done();
@@ -523,8 +523,8 @@ void ScDocShell::Execute( SfxRequest& rReq )
case SID_REIMPORT_AFTER_LOAD:
{
- // wird nach dem Laden aufgerufen, wenn DB-Bereiche mit
- // weggelassenen Daten enthalten sind
+ // wird nach dem Laden aufgerufen, wenn DB-Bereiche mit
+ // weggelassenen Daten enthalten sind
BOOL bDone = FALSE;
ScDBCollection* pDBColl = aDocument.GetDBCollection();
@@ -550,27 +550,27 @@ void ScDocShell::Execute( SfxRequest& rReq )
pDBData->GetArea(aRange);
pViewSh->MarkRange(aRange);
- // Import und interne Operationen wie SID_REFRESH_DBAREA
- // (Abfrage auf Import hier nicht noetig)
+ // Import und interne Operationen wie SID_REFRESH_DBAREA
+ // (Abfrage auf Import hier nicht noetig)
ScImportParam aImportParam;
pDBData->GetImportParam( aImportParam );
BOOL bContinue = pViewSh->ImportData( aImportParam );
pDBData->SetImportParam( aImportParam );
- // markieren (Groesse kann sich geaendert haben)
+ // markieren (Groesse kann sich geaendert haben)
pDBData->GetArea(aRange);
pViewSh->MarkRange(aRange);
- if ( bContinue ) // #41905# Fehler beim Import -> Abbruch
+ if ( bContinue ) // #41905# Fehler beim Import -> Abbruch
{
- // interne Operationen, wenn welche gespeichert
+ // interne Operationen, wenn welche gespeichert
if ( pDBData->HasQueryParam() || pDBData->HasSortParam() ||
pDBData->HasSubTotalParam() )
pViewSh->RepeatDB();
- // Pivottabellen die den Bereich als Quelldaten haben
+ // Pivottabellen die den Bereich als Quelldaten haben
RefreshPivotTables(aRange);
}
@@ -583,10 +583,10 @@ void ScDocShell::Execute( SfxRequest& rReq )
if ( !bDone && pDBColl )
{
- // wenn nicht, dann aber die abhaengigen Formeln updaten
+ // wenn nicht, dann aber die abhaengigen Formeln updaten
//! auch fuer einzelne Bereiche, die nicht aktualisiert werden koennen
- aDocument.CalcAll(); //! nur die abhaengigen
+ aDocument.CalcAll(); //! nur die abhaengigen
PostDataChanged();
}
@@ -604,7 +604,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
case SID_GET_COLORTABLE:
{
- // passende ColorTable ist per PutItem gesetzt worden
+ // passende ColorTable ist per PutItem gesetzt worden
SvxColorTableItem* pColItem = (SvxColorTableItem*)GetItem(SID_COLOR_TABLE);
XColorTable* pTable = pColItem->GetColorTable();
rReq.SetReturnValue(OfaPtrItem(SID_GET_COLORTABLE, pTable));
@@ -749,12 +749,12 @@ void ScDocShell::Execute( SfxRequest& rReq )
nVersion = ((const SfxInt16Item*)pItem)->GetValue();
}
- // kein Filter angegeben -> Detection
+ // kein Filter angegeben -> Detection
if ( !aFilterName.Len() )
ScDocumentLoader::GetFilterName( aFileName, aFilterName, aOptions, TRUE, FALSE );
- // filter name from dialog contains application prefix,
- // GetFilter needs name without the prefix.
+ // filter name from dialog contains application prefix,
+ // GetFilter needs name without the prefix.
ScDocumentLoader::RemoveAppPrefix( aFilterName );
const SfxFilter* pFilter = ScDocShell::Factory().GetFilterContainer()->GetFilter4FilterName( aFilterName );
@@ -778,7 +778,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
return ;
}
- if ( pMed ) // nun wirklich ausfuehren...
+ if ( pMed ) // nun wirklich ausfuehren...
{
SfxErrorContext aEc( ERRCTX_SFX_OPENDOC, pMed->GetName() );
@@ -787,9 +787,9 @@ void ScDocShell::Execute( SfxRequest& rReq )
pOtherDocSh->DoLoad( pMed );
ULONG nErr = pOtherDocSh->GetErrorCode();
if (nErr)
- ErrorHandler::HandleError( nErr ); // auch Warnings
+ ErrorHandler::HandleError( nErr ); // auch Warnings
- if ( !pOtherDocSh->GetError() ) // nur Errors
+ if ( !pOtherDocSh->GetError() ) // nur Errors
{
BOOL bHadTrack = ( aDocument.GetChangeTrack() != NULL );
ULONG nStart = 0;
@@ -803,7 +803,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
else
MergeDocument( *pOtherDocSh->GetDocument() );
- // show "accept changes" dialog
+ // show "accept changes" dialog
//! get view for this document!
if ( !IsDocShared() )
{
@@ -818,10 +818,10 @@ void ScDocShell::Execute( SfxRequest& rReq )
}
}
- rReq.SetReturnValue( SfxInt32Item( nSlot, 0 ) ); //! ???????
+ rReq.SetReturnValue( SfxInt32Item( nSlot, 0 ) ); //! ???????
rReq.Done();
- if (!bHadTrack) // neu eingeschaltet -> auch anzeigen
+ if (!bHadTrack) // neu eingeschaltet -> auch anzeigen
{
ScChangeViewSettings* pOldSet = aDocument.GetChangeViewSettings();
if ( !pOldSet || !pOldSet->ShowChanges() )
@@ -850,7 +850,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
}
}
}
- pOtherDocSh->DoClose(); // delete passiert mit der Ref
+ pOtherDocSh->DoClose(); // delete passiert mit der Ref
}
}
break;
@@ -867,12 +867,12 @@ void ScDocShell::Execute( SfxRequest& rReq )
SCTAB nTab;
if (aDocument.GetTable( aName, nTab ))
{
- // DeleteTable von viewfunc nach docfunc verschieben!
+ // DeleteTable von viewfunc nach docfunc verschieben!
ScTabViewShell* pSh = GetBestViewShell();
if ( pSh )
{
- //! SetTabNo in DeleteTable weglassen?
+ //! SetTabNo in DeleteTable weglassen?
SCTAB nDispTab = pSh->GetViewData()->GetTabNo();
pSh->DeleteTable( nTab );
pSh->SetTabNo(nDispTab);
@@ -913,9 +913,9 @@ void ScDocShell::Execute( SfxRequest& rReq )
while(aDocument.IsScenario(nActualTab));
BOOL bSheetProtected = aDocument.IsTabProtected(nActualTab);
- //! anderen Titel am Dialog setzen
-//CHINA001 ScNewScenarioDlg* pNewDlg =
-//CHINA001 new ScNewScenarioDlg( GetActiveDialogParent(), aName, TRUE, bSheetProtected);
+ //! anderen Titel am Dialog setzen
+//CHINA001 ScNewScenarioDlg* pNewDlg =
+//CHINA001 new ScNewScenarioDlg( GetActiveDialogParent(), aName, TRUE, bSheetProtected);
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -1245,16 +1245,16 @@ void ScDocShell::DoRecalc( BOOL bApi )
ScInputHandler* pHdl = SC_MOD()->GetInputHdl(pSh);
if ( pHdl && pHdl->IsInputMode() && pHdl->IsFormulaMode() && !bApi )
{
- pHdl->FormulaPreview(); // Teilergebnis als QuickHelp
+ pHdl->FormulaPreview(); // Teilergebnis als QuickHelp
bDone = TRUE;
}
else
{
- pSh->UpdateInputLine(); // InputEnterHandler
+ pSh->UpdateInputLine(); // InputEnterHandler
pSh->UpdateInputHandler();
}
}
- if (!bDone) // sonst Dokument neu berechnen
+ if (!bDone) // sonst Dokument neu berechnen
{
WaitObject aWaitObj( GetActiveDialogParent() );
aDocument.CalcFormulaTree();
@@ -1263,9 +1263,9 @@ void ScDocShell::DoRecalc( BOOL bApi )
aDocument.BroadcastUno( SfxSimpleHint( SFX_HINT_DATACHANGED ) );
- // #47939# Wenn es Charts gibt, dann alles painten, damit nicht
- // PostDataChanged und die Charts nacheinander kommen und Teile
- // doppelt gepainted werden.
+ // #47939# Wenn es Charts gibt, dann alles painten, damit nicht
+ // PostDataChanged und die Charts nacheinander kommen und Teile
+ // doppelt gepainted werden.
ScChartListenerCollection* pCharts = aDocument.GetChartListenerCollection();
if ( pCharts && pCharts->GetCount() )
@@ -1281,11 +1281,11 @@ void ScDocShell::DoHardRecalc( BOOL /* bApi */ )
ScTabViewShell* pSh = GetBestViewShell();
if ( pSh )
{
- pSh->UpdateInputLine(); // InputEnterHandler
+ pSh->UpdateInputLine(); // InputEnterHandler
pSh->UpdateInputHandler();
}
aDocument.CalcAll();
- GetDocFunc().DetectiveRefresh(); // erzeugt eigenes Undo
+ GetDocFunc().DetectiveRefresh(); // erzeugt eigenes Undo
if ( pSh )
pSh->UpdateCharts(TRUE);
@@ -1353,7 +1353,7 @@ void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint )
String aNewName = pStyle->GetName();
String aOldName = aNewName;
- BOOL bExtended = rHint.ISA(SfxStyleSheetHintExtended); // Name geaendert?
+ BOOL bExtended = rHint.ISA(SfxStyleSheetHintExtended); // Name geaendert?
if (bExtended)
aOldName = ((SfxStyleSheetHintExtended&)rHint).GetOldName();
@@ -1362,7 +1362,7 @@ void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint )
SCTAB nTabCount = aDocument.GetTableCount();
for (SCTAB nTab=0; nTab<nTabCount; nTab++)
- if (aDocument.GetPageStyle(nTab) == aNewName) // schon auf neu angepasst
+ if (aDocument.GetPageStyle(nTab) == aNewName) // schon auf neu angepasst
{
aDocument.PageStyleModified( nTab, aNewName );
ScPrintFunc aPrintFunc( this, GetPrinter(), nTab );
@@ -1400,14 +1400,14 @@ void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint )
if (pList)
pList->RenameCellStyle( aOldName,aNewName );
}
- }
+ }
}
- // alles andere geht ueber Slots...
+ // alles andere geht ueber Slots...
}
-// wie in printfun.cxx
-#define ZOOM_MIN 10
+// wie in printfun.cxx
+#define ZOOM_MIN 10
void ScDocShell::SetPrintZoom( SCTAB nTab, USHORT nScale, USHORT nPages )
{
@@ -1460,7 +1460,7 @@ BOOL ScDocShell::AdjustPrintZoom( const ScRange& rRange )
const ScRange* pRepeatCol = aDocument.GetRepeatColRange( nTab );
const ScRange* pRepeatRow = aDocument.GetRepeatRowRange( nTab );
- // benoetigte Skalierung fuer Selektion ausrechnen
+ // benoetigte Skalierung fuer Selektion ausrechnen
USHORT nNewScale = nOldScale;
@@ -1502,7 +1502,7 @@ BOOL ScDocShell::AdjustPrintZoom( const ScRange& rRange )
aOldPrFunc.GetScaleData( aPhysPage, nHdr, nFtr );
nBlkTwipsY += nHdr + nFtr;
- if ( nBlkTwipsX == 0 ) // #100639# hidden columns/rows may lead to 0
+ if ( nBlkTwipsX == 0 ) // #100639# hidden columns/rows may lead to 0
nBlkTwipsX = 1;
if ( nBlkTwipsY == 0 )
nBlkTwipsY = 1;
@@ -1510,7 +1510,7 @@ BOOL ScDocShell::AdjustPrintZoom( const ScRange& rRange )
long nNeeded = Min( aPhysPage.Width() * 100 / nBlkTwipsX,
aPhysPage.Height() * 100 / nBlkTwipsY );
if ( nNeeded < ZOOM_MIN )
- nNeeded = ZOOM_MIN; // Begrenzung
+ nNeeded = ZOOM_MIN; // Begrenzung
if ( nNeeded < (long) nNewScale )
nNewScale = (USHORT) nNeeded;
@@ -1535,10 +1535,10 @@ void ScDocShell::PageStyleModified( const String& rStyleName, BOOL bApi )
nUseTab = nTab;
// bei bApi nur, wenn Umbrueche schon angezeigt
- if (ValidTab(nUseTab)) // nicht verwendet -> nichts zu tun
+ if (ValidTab(nUseTab)) // nicht verwendet -> nichts zu tun
{
- ScPrintFunc aPrintFunc( this, GetPrinter(), nUseTab ); //! ohne CountPages auskommen
- if (!aPrintFunc.UpdatePages()) // setzt Umbrueche auf allen Tabs
+ ScPrintFunc aPrintFunc( this, GetPrinter(), nUseTab ); //! ohne CountPages auskommen
+ if (!aPrintFunc.UpdatePages()) // setzt Umbrueche auf allen Tabs
bWarn = TRUE;
if (bWarn && !bApi)
@@ -1563,13 +1563,13 @@ void ScDocShell::PageStyleModified( const String& rStyleName, BOOL bApi )
void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller,
SfxRequest& rReq,
- SCTAB nCurTab )
+ SCTAB nCurTab )
{
const SfxItemSet* pReqArgs = rReq.GetArgs();
switch ( rReq.GetSlot() )
{
- case SID_STATUS_PAGESTYLE: // Click auf StatusBar-Control
+ case SID_STATUS_PAGESTYLE: // Click auf StatusBar-Control
case SID_FORMATPAGE:
{
if ( pReqArgs != NULL )
@@ -1591,11 +1591,11 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller,
if (bUndo)
aOldData.InitFromStyle( pStyleSheet );
- SfxItemSet& rStyleSet = pStyleSheet->GetItemSet();
+ SfxItemSet& rStyleSet = pStyleSheet->GetItemSet();
-//CHINA001 ScStyleDlg* pDlg = new ScStyleDlg( GetActiveDialogParent(),
-//CHINA001 *pStyleSheet,
-//CHINA001 RID_SCDLG_STYLES_PAGE );
+//CHINA001 ScStyleDlg* pDlg = new ScStyleDlg( GetActiveDialogParent(),
+//CHINA001 *pStyleSheet,
+//CHINA001 RID_SCDLG_STYLES_PAGE );
//CHINA001
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -1693,7 +1693,7 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller,
}
else
{
- // #69193a# respect "shared" setting
+ // #69193a# respect "shared" setting
if ( !bHeaderOn && bFooterOn )
nResId = bShareFooter ?
RID_SCDLG_HFEDIT_RIGHTFOOTER :
@@ -1752,12 +1752,12 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller,
}
}
-//CHINA001 ScHFEditDlg* pDlg
-//CHINA001 = new ScHFEditDlg( SFX_APP()->GetViewFrame(),
-//CHINA001 GetActiveDialogParent(),
-//CHINA001 rStyleSet,
-//CHINA001 aStr,
-//CHINA001 nResId );
+//CHINA001 ScHFEditDlg* pDlg
+//CHINA001 = new ScHFEditDlg( SFX_APP()->GetViewFrame(),
+//CHINA001 GetActiveDialogParent(),
+//CHINA001 rStyleSet,
+//CHINA001 aStr,
+//CHINA001 nResId );
//CHINA001
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -1790,8 +1790,8 @@ void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller,
}
void ScDocShell::GetStatePageStyle( SfxViewShell& /* rCaller */,
- SfxItemSet& rSet,
- SCTAB nCurTab )
+ SfxItemSet& rSet,
+ SCTAB nCurTab )
{
SfxWhichIter aIter(rSet);
USHORT nWhich = aIter.FirstWhich();
@@ -1805,9 +1805,9 @@ void ScDocShell::GetStatePageStyle( SfxViewShell& /* rCaller */,
case SID_HFEDIT:
{
- String aStr = aDocument.GetPageStyle( nCurTab );
- ScStyleSheetPool* pStylePool = aDocument.GetStyleSheetPool();
- SfxStyleSheetBase* pStyleSheet = pStylePool->Find( aStr, SFX_STYLE_FAMILY_PAGE );
+ String aStr = aDocument.GetPageStyle( nCurTab );
+ ScStyleSheetPool* pStylePool = aDocument.GetStyleSheetPool();
+ SfxStyleSheetBase* pStyleSheet = pStylePool->Find( aStr, SFX_STYLE_FAMILY_PAGE );
DBG_ASSERT( pStyleSheet, "PageStyle not found! :-/" );
@@ -1958,12 +1958,12 @@ void ScDocShell::PreparePrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData
return;
}
- delete pOldJobSetup; // gesetzt nur bei Fehler in StartJob()
- pOldJobSetup = new ScJobSetup( pPrinter ); // Einstellungen merken
+ delete pOldJobSetup; // gesetzt nur bei Fehler in StartJob()
+ pOldJobSetup = new ScJobSetup( pPrinter ); // Einstellungen merken
- // Einstellungen fuer die erste gedruckte Seite muessen hier (vor StartJob) gesetzt werden
- //! Selection etc. mit Print() zusammenfassen !!!
- //! Seiten nur einmal zaehlen
+ // Einstellungen fuer die erste gedruckte Seite muessen hier (vor StartJob) gesetzt werden
+ //! Selection etc. mit Print() zusammenfassen !!!
+ //! Seiten nur einmal zaehlen
bool bHasOptions = false;
ScPrintOptions aOptions;
@@ -1977,7 +1977,7 @@ void ScDocShell::PreparePrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData
pMarkData, bHasOptions, aOptions, bAllTabs, nTotalPages,
aPageArr, aPageRanges, &pMarkedRange );
- BOOL bFound = FALSE; // erste Seite gefunden
+ BOOL bFound = FALSE; // erste Seite gefunden
long nTabStart = 0;
SCTAB nTabCount = aDocument.GetTableCount();
for ( SCTAB nTab=0; nTab<nTabCount && !bFound; nTab++ )
@@ -1986,15 +1986,15 @@ void ScDocShell::PreparePrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData
{
long nNext = nTabStart + aPageArr[nTab];
BOOL bSelected = FALSE;
- for (long nP=nTabStart+1; nP<=nNext; nP++) // 1-basiert
- if (aPageRanges.IsSelected( nP )) // eine Seite von dieser Tabelle selektiert?
+ for (long nP=nTabStart+1; nP<=nNext; nP++) // 1-basiert
+ if (aPageRanges.IsSelected( nP )) // eine Seite von dieser Tabelle selektiert?
bSelected = TRUE;
if (bSelected)
{
ScPrintFunc aPrintFunc( this, pPrinter, nTab );
- aPrintFunc.ApplyPrintSettings(); // dann Settings fuer diese Tabelle
+ aPrintFunc.ApplyPrintSettings(); // dann Settings fuer diese Tabelle
bFound = TRUE;
}
nTabStart = nNext;
@@ -2068,7 +2068,7 @@ void ScDocShell::Print( SfxProgress& rProgress, PrintDialog* pPrintDialog,
if ( pPrintDialog && pPrintDialog->IsCollateEnabled() && pPrintDialog->IsCollateChecked() )
nCollateCopies = pPrintDialog->GetCopyCount();
- // test if printed range contains transparent objects
+ // test if printed range contains transparent objects
BOOL bHasTransp = FALSE;
BOOL bAnyPrintRanges = aDocument.HasPrintRange();
@@ -2122,7 +2122,7 @@ void ScDocShell::Print( SfxProgress& rProgress, PrintDialog* pPrintDialog,
Rectangle aFull( 0, 0, LONG_MAX, LONG_MAX );
// #114135#
- ScDrawLayer* pModel = aDocument.GetDrawLayer(); // ist nicht NULL
+ ScDrawLayer* pModel = aDocument.GetDrawLayer(); // ist nicht NULL
if(pModel)
{
@@ -2140,7 +2140,7 @@ void ScDocShell::Print( SfxProgress& rProgress, PrintDialog* pPrintDialog,
nDisplayStart = 0;
else
nDisplayStart += aPageArr[nTab];
- nAttrPage = aPrintFunc.GetFirstPageNo(); // behalten oder aus Vorlage
+ nAttrPage = aPrintFunc.GetFirstPageNo(); // behalten oder aus Vorlage
delete pDrawView;
}
@@ -2154,7 +2154,7 @@ void ScDocShell::Print( SfxProgress& rProgress, PrintDialog* pPrintDialog,
// an odd number of pages, print an empty page between copies, so the first page of
// the second copy isn't printed on the back of the last page of the first copy.
// (same as in Writer ViewShell::Prt)
-
+
// FIXME: needs to be adapted to XRenderable interface
#if 0
pPrinter->StartPage();
@@ -2169,8 +2169,8 @@ void ScDocShell::Print( SfxProgress& rProgress, PrintDialog* pPrintDialog,
if (pOldJobSetup)
{
pPrinter->SetOrientation( pOldJobSetup->eOrientation );
- pPrinter->SetPaperBin ( pOldJobSetup->nPaperBin );
- pPrinter->SetPaper ( pOldJobSetup->ePaper );
+ pPrinter->SetPaperBin ( pOldJobSetup->nPaperBin );
+ pPrinter->SetPaper ( pOldJobSetup->ePaper );
if ( PAPER_USER == pOldJobSetup->ePaper )
{
@@ -2184,15 +2184,15 @@ void ScDocShell::Print( SfxProgress& rProgress, PrintDialog* pPrintDialog,
if ( bHasOptions )
{
- // remove PrintOptions from printer ItemSet,
- // so next time the options from the configuration are used
+ // remove PrintOptions from printer ItemSet,
+ // so next time the options from the configuration are used
SfxItemSet aSet( pPrinter->GetOptions() );
aSet.ClearItem( SID_SCPRINTOPTIONS );
pPrinter->SetOptions( aSet );
}
- PostPaintGridAll(); //! nur wenn geaendert
+ PostPaintGridAll(); //! nur wenn geaendert
}
void ScDocShell::GetState( SfxItemSet &rSet )
@@ -2238,13 +2238,13 @@ void ScDocShell::GetState( SfxItemSet &rSet )
}
break;
- // Wenn eine Formel editiert wird, muss FID_RECALC auf jeden Fall enabled sein.
- // Recalc fuer das Doc war mal wegen #29898# disabled, wenn AutoCalc an war,
- // ist jetzt wegen #41540# aber auch immer enabled.
-// case FID_RECALC:
-// if ( aDocument.GetAutoCalc() )
-// rSet.DisableItem( nWhich );
-// break;
+ // Wenn eine Formel editiert wird, muss FID_RECALC auf jeden Fall enabled sein.
+ // Recalc fuer das Doc war mal wegen #29898# disabled, wenn AutoCalc an war,
+ // ist jetzt wegen #41540# aber auch immer enabled.
+// case FID_RECALC:
+// if ( aDocument.GetAutoCalc() )
+// rSet.DisableItem( nWhich );
+// break;
case SID_TABLES_COUNT:
rSet.Put( SfxInt16Item( nWhich, aDocument.GetTableCount() ) );
@@ -2276,25 +2276,25 @@ void ScDocShell::GetState( SfxItemSet &rSet )
void ScDocShell::GetSbxState( SfxItemSet &rSet )
{
- // SID_SC_SELECTION (Selection),
- // SID_SC_ACTIVECELL (ActiveCell),
- // SID_SC_ACTIVETAB (ActiveTable),
- // SID_TABLES_GET (Tables),
- // SID_PIVOT_GET (DataPilotTables) - removed (old Basic)
+ // SID_SC_SELECTION (Selection),
+ // SID_SC_ACTIVECELL (ActiveCell),
+ // SID_SC_ACTIVETAB (ActiveTable),
+ // SID_TABLES_GET (Tables),
+ // SID_PIVOT_GET (DataPilotTables) - removed (old Basic)
//
- // Wenn hier Slots von der View-Shell executed werden, muss auch der
- // GetState weitergeleitet werden!
+ // Wenn hier Slots von der View-Shell executed werden, muss auch der
+ // GetState weitergeleitet werden!
//
- ScTabViewShell* pVisibleSh = GetBestViewShell(); // sichtbare View
+ ScTabViewShell* pVisibleSh = GetBestViewShell(); // sichtbare View
if ( pVisibleSh )
pVisibleSh->GetState( rSet );
}
void __EXPORT ScDocShell::Draw( OutputDevice* pDev, const JobSetup & /* rSetup */, USHORT nAspect )
{
-// bIsOle = TRUE; // jetzt ueber den CreateMode
+// bIsOle = TRUE; // jetzt ueber den CreateMode
SCTAB nVisTab = aDocument.GetVisibleTab();
if (!aDocument.HasTable(nVisTab))
@@ -2330,14 +2330,14 @@ Rectangle __EXPORT ScDocShell::GetVisArea( USHORT nAspect ) const
SfxObjectCreateMode eShellMode = GetCreateMode();
if ( eShellMode == SFX_CREATE_MODE_ORGANIZER )
{
- // ohne Inhalte wissen wir auch nicht, wie gross die Inhalte sind
- // leeres Rechteck zurueckgeben, das wird dann nach dem Laden berechnet
+ // ohne Inhalte wissen wir auch nicht, wie gross die Inhalte sind
+ // leeres Rechteck zurueckgeben, das wird dann nach dem Laden berechnet
return Rectangle();
}
if( nAspect == ASPECT_THUMBNAIL )
{
-// Rectangle aArea( 0,0, 3175,3175 ); // 120x120 Pixel in 1:1
+// Rectangle aArea( 0,0, 3175,3175 ); // 120x120 Pixel in 1:1
Rectangle aArea( 0,0, SC_PREVIEW_SIZE_X,SC_PREVIEW_SIZE_Y );
BOOL bNegativePage = aDocument.IsNegativePage( aDocument.GetVisibleTab() );
if ( bNegativePage )
@@ -2347,7 +2347,7 @@ Rectangle __EXPORT ScDocShell::GetVisArea( USHORT nAspect ) const
}
else if( nAspect == ASPECT_CONTENT && eShellMode != SFX_CREATE_MODE_EMBEDDED )
{
- // Visarea holen wie nach Load
+ // Visarea holen wie nach Load
SCTAB nVisTab = aDocument.GetVisibleTab();
if (!aDocument.HasTable(nVisTab))
@@ -2376,9 +2376,9 @@ Rectangle __EXPORT ScDocShell::GetVisArea( USHORT nAspect ) const
}
void ScDocShell::GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet,
- SCTAB nCurTab,
- BOOL& rbHeader,
- BOOL& rbFooter )
+ SCTAB nCurTab,
+ BOOL& rbHeader,
+ BOOL& rbFooter )
{
if ( !pStyleSet )
{
@@ -2399,8 +2399,8 @@ void ScDocShell::GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet,
//--------------------------------------------------------------------
- const SvxSetItem* pSetItem = NULL;
- const SfxItemSet* pSet = NULL;
+ const SvxSetItem* pSetItem = NULL;
+ const SfxItemSet* pSet = NULL;
pSetItem = (const SvxSetItem*) &pStyleSet->Get( ATTR_PAGE_HEADERSET );
pSet = &pSetItem->GetItemSet();
@@ -2427,7 +2427,7 @@ long __EXPORT ScDocShell::DdeGetData( const String& rItem,
}
ScImportExport aObj( &aDocument, rItem );
if ( !aObj.IsRef() )
- return 0; // ungueltiger Bereich
+ return 0; // ungueltiger Bereich
if( aDdeTextFmt.GetChar(0) == 'F' )
aObj.SetFormulas( TRUE );
@@ -2501,7 +2501,7 @@ long __EXPORT ScDocShell::DdeSetData( const String& rItem,
::sfx2::SvLinkSource* __EXPORT ScDocShell::DdeCreateLinkSource( const String& rItem )
{
- // only check for valid item string - range is parsed again in ScServerObject ctor
+ // only check for valid item string - range is parsed again in ScServerObject ctor
// named range?
String aPos = rItem;
@@ -2515,11 +2515,11 @@ long __EXPORT ScDocShell::DdeSetData( const String& rItem,
if( pData->HasType( RT_REFAREA )
|| pData->HasType( RT_ABSAREA )
|| pData->HasType( RT_ABSPOS ) )
- pData->GetSymbol( aPos ); // continue with the name's contents
+ pData->GetSymbol( aPos ); // continue with the name's contents
}
}
- // Address in DDE function must be always parsed as CONV_OOO so that it
+ // Address in DDE function must be always parsed as CONV_OOO so that it
// would always work regardless of current address convension. We do this
// because the address item in a DDE entry is *not* normalized when saved
// into ODF.
@@ -2527,11 +2527,11 @@ long __EXPORT ScDocShell::DdeSetData( const String& rItem,
bool bValid = ( (aRange.Parse(aPos, &aDocument, formula::FormulaGrammar::CONV_OOO ) & SCA_VALID) ||
(aRange.aStart.Parse(aPos, &aDocument, formula::FormulaGrammar::CONV_OOO) & SCA_VALID) );
- ScServerObject* pObj = NULL; // NULL = error
+ ScServerObject* pObj = NULL; // NULL = error
if ( bValid )
pObj = new ScServerObject( this, rItem );
- // GetLinkManager()->InsertServer() is in the ScServerObject ctor
+ // GetLinkManager()->InsertServer() is in the ScServerObject ctor
return pObj;
}
@@ -2549,7 +2549,7 @@ ScViewData* ScDocShell::GetViewData()
SCTAB ScDocShell::GetCurTab()
{
- //! this must be made non-static and use a ViewShell from this document!
+ //! this must be made non-static and use a ViewShell from this document!
ScViewData* pViewData = GetViewData();
@@ -2577,7 +2577,7 @@ ScTabViewShell* ScDocShell::GetBestViewShell( BOOL bOnlyVisible )
SfxBindings* ScDocShell::GetViewBindings()
{
- // used to invalidate slots after changes to this document
+ // used to invalidate slots after changes to this document
SfxViewShell* pViewSh = GetBestViewShell();
if (pViewSh)
@@ -2588,10 +2588,10 @@ SfxBindings* ScDocShell::GetViewBindings()
//------------------------------------------------------------------
-ScDocShell* ScDocShell::GetShellByNum( USHORT nDocNo ) // static
+ScDocShell* ScDocShell::GetShellByNum( USHORT nDocNo ) // static
{
ScDocShell* pFound = NULL;
- SfxObjectShell* pShell = SfxObjectShell::GetFirst();
+ SfxObjectShell* pShell = SfxObjectShell::GetFirst();
USHORT nShellCnt = 0;
while ( pShell && !pFound )
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index 84979e3dbcdf..aa3ca3e66131 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -74,12 +74,12 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, String& sModuleName, String
// ---------------------------------------------------------------------------
//
-// ehemalige viewfunc/dbfunc Methoden
+// ehemalige viewfunc/dbfunc Methoden
//
void ScDocShell::ErrorMessage( USHORT nGlobStrId )
{
- //! StopMarking an der (aktiven) View?
+ //! StopMarking an der (aktiven) View?
Window* pParent = GetActiveDialogParent();
ScWaitCursorOff aWaitOff( pParent );
@@ -119,7 +119,7 @@ void ScDocShell::DBAreaDeleted( SCTAB nTab, SCCOL nX1, SCROW nY1, SCCOL nX2, SCR
ScDBData* lcl_GetDBNearCursor( ScDBCollection* pColl, SCCOL nCol, SCROW nRow, SCTAB nTab )
{
- //! nach document/dbcolect verschieben
+ //! nach document/dbcolect verschieben
if (!pColl)
return NULL;
@@ -143,15 +143,15 @@ ScDBData* lcl_GetDBNearCursor( ScDBCollection* pColl, SCCOL nCol, SCROW nRow, SC
else if ( nCol < nStartCol || nCol > nEndCol || nRow < nStartRow || nRow > nEndRow )
{
if (!pNearData)
- pNearData = pDB; // ersten angrenzenden Bereich merken
+ pNearData = pDB; // ersten angrenzenden Bereich merken
}
else
- return pDB; // nicht "unbenannt" und Cursor steht wirklich drin
+ return pDB; // nicht "unbenannt" und Cursor steht wirklich drin
}
}
if (pNearData)
- return pNearData; // angrenzender, wenn nichts direkt getroffen
- return pNoNameData; // "unbenannt" nur zurueck, wenn sonst nichts gefunden
+ return pNearData; // angrenzender, wenn nichts direkt getroffen
+ return pNoNameData; // "unbenannt" nur zurueck, wenn sonst nichts gefunden
}
ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGetDBSelection eSel )
@@ -167,9 +167,9 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
SCROW nEndRow = rMarked.aEnd.Row();
SCTAB nEndTab = rMarked.aEnd.Tab();
- // Wegen #49655# nicht einfach GetDBAtCursor: Der zusammenhaengende Datenbereich
- // fuer "unbenannt" (GetDataArea) kann neben dem Cursor legen, also muss auch ein
- // benannter DB-Bereich dort gesucht werden.
+ // Wegen #49655# nicht einfach GetDBAtCursor: Der zusammenhaengende Datenbereich
+ // fuer "unbenannt" (GetDataArea) kann neben dem Cursor legen, also muss auch ein
+ // benannter DB-Bereich dort gesucht werden.
ScDBData* pData = aDocument.GetDBAtArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow );
if (!pData)
@@ -182,7 +182,7 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
BOOL bUseThis = FALSE;
if (pData)
{
- // Bereich nehmen, wenn nichts anderes markiert
+ // Bereich nehmen, wenn nichts anderes markiert
SCTAB nDummy;
SCCOL nOldCol1;
@@ -197,7 +197,7 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
bUseThis = TRUE;
if ( bIsNoName && eMode == SC_DB_MAKE )
{
- // If nothing marked or only one row marked, adapt
+ // If nothing marked or only one row marked, adapt
// "unbenannt"/"unnamed" to contiguous area.
nStartCol = nCol;
nStartRow = nRow;
@@ -213,10 +213,10 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
}
aDocument.GetDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow, FALSE, bOnlyDown );
if ( nOldCol1 != nStartCol || nOldCol2 != nEndCol || nOldRow1 != nStartRow )
- bUseThis = FALSE; // passt gar nicht
+ bUseThis = FALSE; // passt gar nicht
else if ( nOldRow2 != nEndRow )
{
- // Bereich auf neue End-Zeile erweitern
+ // Bereich auf neue End-Zeile erweitern
pData->SetArea( nTab, nOldCol1,nOldRow1, nOldCol2,nEndRow );
}
}
@@ -224,13 +224,13 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
else
{
if ( nOldCol1 == nStartCol && nOldRow1 == nStartRow &&
- nOldCol2 == nEndCol && nOldRow2 == nEndRow ) // genau markiert?
+ nOldCol2 == nEndCol && nOldRow2 == nEndRow ) // genau markiert?
bUseThis = TRUE;
else
- bUseThis = FALSE; // immer Markierung nehmen (Bug 11964)
+ bUseThis = FALSE; // immer Markierung nehmen (Bug 11964)
}
- // fuer Import nie "unbenannt" nehmen
+ // fuer Import nie "unbenannt" nehmen
if ( bUseThis && eMode == SC_DB_IMPORT && bIsNoName )
bUseThis = FALSE;
@@ -243,20 +243,20 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
}
else if ( eMode == SC_DB_OLD )
{
- pData = NULL; // nichts gefunden
+ pData = NULL; // nichts gefunden
nStartCol = nEndCol = nCol;
nStartRow = nEndRow = nRow;
nStartTab = nEndTab = nTab;
-// bMark = FALSE; // nichts zu markieren
+// bMark = FALSE; // nichts zu markieren
}
else
{
if ( bSelected )
{
-// bMark = FALSE;
+// bMark = FALSE;
}
else
- { // zusammenhaengender Bereich
+ { // zusammenhaengender Bereich
nStartCol = nCol;
nStartRow = nRow;
if (bOnlyDown)
@@ -289,19 +289,19 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
pOldAutoDBRange = new ScDBData( *pNoNameData );
}
- SCCOL nOldX1; // alten Bereich sauber wegnehmen
- SCROW nOldY1; //! (UNDO ???)
+ SCCOL nOldX1; // alten Bereich sauber wegnehmen
+ SCROW nOldY1; //! (UNDO ???)
SCCOL nOldX2;
SCROW nOldY2;
SCTAB nOldTab;
pNoNameData->GetArea( nOldTab, nOldX1, nOldY1, nOldX2, nOldY2 );
DBAreaDeleted( nOldTab, nOldX1, nOldY1, nOldX2, nOldY2 );
- pNoNameData->SetSortParam( ScSortParam() ); // Parameter zuruecksetzen
+ pNoNameData->SetSortParam( ScSortParam() ); // Parameter zuruecksetzen
pNoNameData->SetQueryParam( ScQueryParam() );
pNoNameData->SetSubTotalParam( ScSubTotalParam() );
- pNoNameData->SetArea( nTab, nStartCol,nStartRow, nEndCol,nEndRow ); // neu setzen
+ pNoNameData->SetArea( nTab, nStartCol,nStartRow, nEndCol,nEndRow ); // neu setzen
pNoNameData->SetByRow( TRUE );
pNoNameData->SetHeader( bHasHeader );
pNoNameData->SetAutoFilter( FALSE );
@@ -313,8 +313,8 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
String aNewName;
if (eMode==SC_DB_IMPORT)
{
- aDocument.CompileDBFormula( TRUE ); // CreateFormulaString
- pUndoColl = new ScDBCollection( *pColl ); // Undo fuer Import1-Bereich
+ aDocument.CompileDBFormula( TRUE ); // CreateFormulaString
+ pUndoColl = new ScDBCollection( *pColl ); // Undo fuer Import1-Bereich
String aImport = ScGlobal::GetRscString( STR_DBNAME_IMPORT );
long nCount = 0;
@@ -336,23 +336,23 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
if ( pUndoColl )
{
- aDocument.CompileDBFormula( FALSE ); // CompileFormulaString
+ aDocument.CompileDBFormula( FALSE ); // CompileFormulaString
ScDBCollection* pRedoColl = new ScDBCollection( *pColl );
GetUndoManager()->AddUndoAction( new ScUndoDBData( this, pUndoColl, pRedoColl ) );
}
- // neuen Bereich am Sba anmelden nicht mehr noetig
+ // neuen Bereich am Sba anmelden nicht mehr noetig
- // "Import1" etc am Navigator bekanntmachen
+ // "Import1" etc am Navigator bekanntmachen
if (eMode==SC_DB_IMPORT)
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) );
}
pData = pNoNameData;
}
-// if (bMark)
-// MarkRange( ScRange( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab ), FALSE );
+// if (bMark)
+// MarkRange( ScRange( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab ), FALSE );
return pData;
}
@@ -400,8 +400,8 @@ void ScDocShell::CancelAutoDBRange()
}
- // Hoehen anpassen
- //! mit docfunc zusammenfassen
+ // Hoehen anpassen
+ //! mit docfunc zusammenfassen
BOOL ScDocShell::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab )
{
@@ -466,13 +466,13 @@ void ScDocShell::UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore )
void ScDocShell::RefreshPivotTables( const ScRange& rSource )
{
- //! rename to RefreshDataPilotTables?
+ //! rename to RefreshDataPilotTables?
ScDPCollection* pColl = aDocument.GetDPCollection();
if ( pColl )
{
- // DataPilotUpdate doesn't modify the collection order like PivotUpdate did,
- // so a simple loop can be used.
+ // DataPilotUpdate doesn't modify the collection order like PivotUpdate did,
+ // so a simple loop can be used.
USHORT nCount = pColl->GetCount();
for ( USHORT i=0; i<nCount; i++ )
@@ -486,7 +486,7 @@ void ScDocShell::RefreshPivotTables( const ScRange& rSource )
ScDPObject* pNew = new ScDPObject( *pOld );
ScDBDocFunc aFunc( *this );
aFunc.DataPilotUpdate( pOld, pNew, TRUE, FALSE );
- delete pNew; // DataPilotUpdate copies settings from "new" object
+ delete pNew; // DataPilotUpdate copies settings from "new" object
}
}
}
@@ -540,7 +540,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord )
return;
}
- // ausfuehren
+ // ausfuehren
WaitObject aWait( GetActiveDialogParent() );
ScDocShellModificator aModificator( *this );
@@ -631,7 +631,7 @@ void ScDocShell::DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord )
}
}
- if (pDestData) // Zielbereich loeschen / anpassen
+ if (pDestData) // Zielbereich loeschen / anpassen
{
aDocument.DeleteAreaTab(aOldDest, IDF_CONTENTS);
pDestData->SetArea( rParam.nTab, rParam.nCol, rParam.nRow,
@@ -673,23 +673,23 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, BOOL bRecord )
{
if (!aDocument.IsScenario(nTab))
{
- SCTAB nTabCount = aDocument.GetTableCount();
- SCTAB nSrcTab = SCTAB_MAX;
- SCTAB nEndTab = nTab;
+ SCTAB nTabCount = aDocument.GetTableCount();
+ SCTAB nSrcTab = SCTAB_MAX;
+ SCTAB nEndTab = nTab;
String aCompare;
while ( nEndTab+1 < nTabCount && aDocument.IsScenario(nEndTab+1) )
{
++nEndTab;
- if (nSrcTab > MAXTAB) // noch auf der Suche nach dem Szenario?
+ if (nSrcTab > MAXTAB) // noch auf der Suche nach dem Szenario?
{
aDocument.GetName( nEndTab, aCompare );
if (aCompare == rName)
- nSrcTab = nEndTab; // gefunden
+ nSrcTab = nEndTab; // gefunden
}
}
if (ValidTab(nSrcTab))
{
- if ( aDocument.TestCopyScenario( nSrcTab, nTab ) ) // Zellschutz testen
+ if ( aDocument.TestCopyScenario( nSrcTab, nTab ) ) // Zellschutz testen
{
ScDocShellModificator aModificator( *this );
ScMarkData aScenMark;
@@ -704,11 +704,11 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, BOOL bRecord )
if (bRecord)
{
ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
- pUndoDoc->InitUndo( &aDocument, nTab,nEndTab ); // auch alle Szenarien
- // angezeigte Tabelle:
+ pUndoDoc->InitUndo( &aDocument, nTab,nEndTab ); // auch alle Szenarien
+ // angezeigte Tabelle:
aDocument.CopyToDocument( nStartCol,nStartRow,nTab,
nEndCol,nEndRow,nTab, IDF_ALL,TRUE, pUndoDoc, &aScenMark );
- // Szenarien
+ // Szenarien
for (SCTAB i=nTab+1; i<=nEndTab; i++)
{
pUndoDoc->SetScenario( i, TRUE );
@@ -719,7 +719,7 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, BOOL bRecord )
pUndoDoc->SetScenarioData( i, aComment, aColor, nScenFlags );
BOOL bActive = aDocument.IsActiveScenario( i );
pUndoDoc->SetActiveScenario( i, bActive );
- // Bei Zurueckkopier-Szenarios auch Inhalte
+ // Bei Zurueckkopier-Szenarios auch Inhalte
if ( nScenFlags & SC_SCENARIO_TWOWAY )
aDocument.CopyToDocument( 0,0,i, MAXCOL,MAXROW,i,
IDF_ALL,FALSE, pUndoDoc );
@@ -734,9 +734,9 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, BOOL bRecord )
aDocument.CopyScenario( nSrcTab, nTab );
aDocument.SetDirty();
- // alles painten, weil in anderen Bereichen das aktive Szenario
- // geaendert sein kann
- //! nur, wenn sichtbare Rahmen vorhanden?
+ // alles painten, weil in anderen Bereichen das aktive Szenario
+ // geaendert sein kann
+ //! nur, wenn sichtbare Rahmen vorhanden?
PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID );
aModificator.SetDocumentModified();
}
@@ -763,7 +763,7 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, BOOL bRecord )
void ScDocShell::ModifyScenario( SCTAB nTab, const String& rName, const String& rComment,
const Color& rColor, USHORT nFlags )
{
- // Undo
+ // Undo
String aOldName;
aDocument.GetName( nTab, aOldName );
String aOldComment;
@@ -775,7 +775,7 @@ void ScDocShell::ModifyScenario( SCTAB nTab, const String& rName, const String&
aOldName, rName, aOldComment, rComment,
aOldColor, rColor, nOldFlags, nFlags ) );
- // ausfuehren
+ // ausfuehren
ScDocShellModificator aModificator( *this );
aDocument.RenameTab( nTab, rName );
aDocument.SetScenarioData( nTab, rComment, rColor, nFlags );
@@ -820,14 +820,14 @@ SCTAB ScDocShell::MakeScenario( SCTAB nTab, const String& rName, const String& r
rName, rComment, rColor, nFlags, rMark ));
}
- aDocument.RenameTab( nNewTab, rName, FALSE ); // ohne Formel-Update
+ aDocument.RenameTab( nNewTab, rName, FALSE ); // ohne Formel-Update
aDocument.SetScenario( nNewTab, TRUE );
aDocument.SetScenarioData( nNewTab, rComment, rColor, nFlags );
ScMarkData aDestMark = rMark;
aDestMark.SelectOneTable( nNewTab );
- //! auf Filter / Buttons / Merging testen !
+ //! auf Filter / Buttons / Merging testen !
ScPatternAttr aProtPattern( aDocument.GetPool() );
aProtPattern.GetItemSet().Put( ScProtectionAttr( TRUE ) );
@@ -841,12 +841,12 @@ SCTAB ScDocShell::MakeScenario( SCTAB nTab, const String& rName, const String& r
if (!bCopyAll)
aDocument.SetVisible( nNewTab, FALSE );
- // dies ist dann das aktive Szenario
- aDocument.CopyScenario( nNewTab, nTab, TRUE ); // TRUE - nicht aus Szenario kopieren
+ // dies ist dann das aktive Szenario
+ aDocument.CopyScenario( nNewTab, nTab, TRUE ); // TRUE - nicht aus Szenario kopieren
if (nFlags & SC_SCENARIO_SHOWFRAME)
- PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID ); // Rahmen painten
- PostPaintExtras(); // Tabellenreiter
+ PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID ); // Rahmen painten
+ PostPaintExtras(); // Tabellenreiter
aModificator.SetDocumentModified();
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
@@ -869,20 +869,20 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
if (bCopy)
{
if (bRecord)
- aDocument.BeginDrawUndo(); // drawing layer must do its own undo actions
+ aDocument.BeginDrawUndo(); // drawing layer must do its own undo actions
String sSrcCodeName;
aDocument.GetCodeName( nSrcTab, sSrcCodeName );
if (!aDocument.CopyTab( nSrcTab, nDestTab ))
{
- //! EndDrawUndo?
+ //! EndDrawUndo?
return FALSE;
}
else
{
SCTAB nAdjSource = nSrcTab;
if ( nDestTab <= nSrcTab )
- ++nAdjSource; // new position of source table after CopyTab
+ ++nAdjSource; // new position of source table after CopyTab
if ( aDocument.IsTabProtected( nAdjSource ) )
aDocument.CopyTabProtection(nAdjSource, nDestTab);
@@ -896,7 +896,7 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
GetUndoManager()->AddUndoAction(
new ScUndoCopyTab( this, aSrcList, aDestList ) );
}
-
+
BOOL bVbaEnabled = aDocument.IsInVBAMode();
if ( bVbaEnabled )
{
@@ -907,7 +907,7 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
aLibName = GetBasicManager()->GetName();
pStarBASIC = GetBasicManager()->GetLib( aLibName );
}
- SCTAB nTabToUse = nDestTab;
+ SCTAB nTabToUse = nDestTab;
if ( nDestTab == SC_TAB_APPEND )
nTabToUse = aDocument.GetMaxTableNumber() - 1;
String sCodeName;
@@ -924,7 +924,7 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
rtl::OUString sRTLSource;
xLib->getByName( sSrcCodeName ) >>= sRTLSource;
sSource = sRTLSource;
- }
+ }
VBA_InsertModule( aDocument, nTabToUse, sCodeName, sSource );
}
}
@@ -940,8 +940,8 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec
if ( nSrcTab == nDestTab )
{
- //! allow only for api calls?
- return TRUE; // nothing to do, but valid
+ //! allow only for api calls?
+ return TRUE; // nothing to do, but valid
}
if (!aDocument.MoveTab( nSrcTab, nDestTab ))
@@ -981,7 +981,7 @@ IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer )
ScRange aRange;
pDBData->GetArea( aRange );
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> xResultSet;
- bContinue = aFunc.DoImport( aRange.aStart.Tab(), aImportParam, xResultSet, NULL, TRUE, FALSE ); //! Api-Flag as parameter
+ bContinue = aFunc.DoImport( aRange.aStart.Tab(), aImportParam, xResultSet, NULL, TRUE, FALSE ); //! Api-Flag as parameter
// internal operations (sort, query, subtotal) only if no error
if (bContinue)
{
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index fbb6dc8ead35..5c6a411bcd66 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +66,13 @@ struct ScStylePair
//----------------------------------------------------------------------
//
-// Ole
+// Ole
//
void __EXPORT ScDocShell::SetVisArea( const Rectangle & rVisArea )
{
- // with the SnapVisArea call in SetVisAreaOrSize, it's safe to always
- // use both the size and position of the VisArea
+ // with the SnapVisArea call in SetVisAreaOrSize, it's safe to always
+ // use both the size and position of the VisArea
SetVisAreaOrSize( rVisArea, TRUE );
}
@@ -98,9 +98,9 @@ void ScDocShell::SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart
{
if ( ( bNegativePage ? (aArea.Right() > 0) : (aArea.Left() < 0) ) || aArea.Top() < 0 )
{
- // VisArea start position can't be negative.
- // Move the VisArea, otherwise only the upper left position would
- // be changed in SnapVisArea, and the size would be wrong.
+ // VisArea start position can't be negative.
+ // Move the VisArea, otherwise only the upper left position would
+ // be changed in SnapVisArea, and the size would be wrong.
Point aNewPos( 0, Max( aArea.Top(), (long) 0 ) );
if ( bNegativePage )
@@ -125,10 +125,10 @@ void ScDocShell::SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart
aArea.SetPos( aOldVisArea.TopLeft() );
}
- // hier Position anpassen!
+ // hier Position anpassen!
- // #92248# when loading an ole object, the VisArea is set from the document's
- // view settings and must be used as-is (document content may not be complete yet).
+ // #92248# when loading an ole object, the VisArea is set from the document's
+ // view settings and must be used as-is (document content may not be complete yet).
if ( !aDocument.IsImportingXML() )
aDocument.SnapVisArea( aArea );
@@ -145,7 +145,7 @@ void ScDocShell::SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart
//TODO/LATER: formerly in SvInplaceObject
SfxObjectShell::SetVisArea( aArea );
- if (bIsInplace) // Zoom in der InPlace View einstellen
+ if (bIsInplace) // Zoom in der InPlace View einstellen
{
ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
if (pViewSh)
@@ -154,7 +154,7 @@ void ScDocShell::SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart
pViewSh->UpdateOleZoom();
}
//else
- // DataChanged( SvDataType() ); // fuer Zuppeln wenn nicht IP-aktiv
+ // DataChanged( SvDataType() ); // fuer Zuppeln wenn nicht IP-aktiv
}
if (aDocument.IsEmbedded())
@@ -179,8 +179,8 @@ BOOL ScDocShell::IsOle()
void ScDocShell::UpdateOle( const ScViewData* pViewData, BOOL bSnapSize )
{
- // wenn's gar nicht Ole ist, kann man sich die Berechnungen sparen
- // (VisArea wird dann beim Save wieder zurueckgesetzt)
+ // wenn's gar nicht Ole ist, kann man sich die Berechnungen sparen
+ // (VisArea wird dann beim Save wieder zurueckgesetzt)
if (GetCreateMode() == SFX_CREATE_MODE_STANDARD)
return;
@@ -217,16 +217,16 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, BOOL bSnapSize )
if (aNewArea != aOldArea)
{
- SetVisAreaOrSize( aNewArea, TRUE ); // hier muss auch der Start angepasst werden
+ SetVisAreaOrSize( aNewArea, TRUE ); // hier muss auch der Start angepasst werden
bChange = TRUE;
}
-// if (bChange)
-// DataChanged( SvDataType() ); //! passiert auch bei SetModified
+// if (bChange)
+// DataChanged( SvDataType() ); //! passiert auch bei SetModified
}
//
-// Style-Krempel fuer Organizer etc.
+// Style-Krempel fuer Organizer etc.
//
SfxStyleSheetBasePool* __EXPORT ScDocShell::GetStyleSheetPool()
@@ -235,9 +235,9 @@ SfxStyleSheetBasePool* __EXPORT ScDocShell::GetStyleSheetPool()
}
-// nach dem Laden von Vorlagen aus einem anderen Dokment (LoadStyles, Insert)
-// muessen die SetItems (ATTR_PAGE_HEADERSET, ATTR_PAGE_FOOTERSET) auf den richtigen
-// Pool umgesetzt werden, bevor der Quell-Pool geloescht wird.
+// nach dem Laden von Vorlagen aus einem anderen Dokment (LoadStyles, Insert)
+// muessen die SetItems (ATTR_PAGE_HEADERSET, ATTR_PAGE_FOOTERSET) auf den richtigen
+// Pool umgesetzt werden, bevor der Quell-Pool geloescht wird.
void lcl_AdjustPool( SfxStyleSheetBasePool* pStylePool )
{
@@ -272,22 +272,22 @@ void __EXPORT ScDocShell::LoadStyles( SfxObjectShell &rSource )
aDocument.StylesToNames();
SfxObjectShell::LoadStyles(rSource);
- lcl_AdjustPool( GetStyleSheetPool() ); // SetItems anpassen
+ lcl_AdjustPool( GetStyleSheetPool() ); // SetItems anpassen
aDocument.UpdStlShtPtrsFrmNms();
UpdateAllRowHeights();
- // Paint
+ // Paint
PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID | PAINT_LEFT );
}
void ScDocShell::LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellStyles, BOOL bPageStyles )
{
- // similar to LoadStyles, but with selectable behavior for XStyleLoader::loadStylesFromURL call
+ // similar to LoadStyles, but with selectable behavior for XStyleLoader::loadStylesFromURL call
- if ( !bCellStyles && !bPageStyles ) // nothing to do
+ if ( !bCellStyles && !bPageStyles ) // nothing to do
return;
ScStyleSheetPool* pSourcePool = rSource.GetDocument()->GetStyleSheetPool();
@@ -299,12 +299,12 @@ void ScDocShell::LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellS
SfxStyleSheetIterator aIter( pSourcePool, eFamily );
USHORT nSourceCount = aIter.Count();
if ( nSourceCount == 0 )
- return; // no source styles
+ return; // no source styles
ScStylePair* pStyles = new ScStylePair[ nSourceCount ];
USHORT nFound = 0;
- // first create all new styles
+ // first create all new styles
SfxStyleSheetBase* pSourceStyle = aIter.First();
while (pSourceStyle)
@@ -331,7 +331,7 @@ void ScDocShell::LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellS
pSourceStyle = aIter.Next();
}
- // then copy contents (after inserting all styles, for parent etc.)
+ // then copy contents (after inserting all styles, for parent etc.)
for ( USHORT i = 0; i < nFound; ++i )
{
@@ -342,9 +342,9 @@ void ScDocShell::LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellS
// follow is never used
}
- lcl_AdjustPool( GetStyleSheetPool() ); // adjust SetItems
+ lcl_AdjustPool( GetStyleSheetPool() ); // adjust SetItems
UpdateAllRowHeights();
- PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID | PAINT_LEFT ); // Paint
+ PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID | PAINT_LEFT ); // Paint
delete[] pStyles;
}
@@ -357,7 +357,7 @@ BOOL __EXPORT ScDocShell::Insert( SfxObjectShell &rSource,
BOOL bRet = SfxObjectShell::Insert( rSource, nSourceIdx1, nSourceIdx2, nSourceIdx3,
nIdx1, nIdx2, nIdx3, rIdxDeleted );
if (bRet)
- lcl_AdjustPool( GetStyleSheetPool() ); // SetItems anpassen
+ lcl_AdjustPool( GetStyleSheetPool() ); // SetItems anpassen
return bRet;
}
@@ -383,7 +383,7 @@ void ScDocShell::UpdateLinks()
if (!aNames.Insert(pData))
delete pData;
}
- else // nicht mehr benutzt -> loeschen
+ else // nicht mehr benutzt -> loeschen
{
pTabLink->SetAddUndo(TRUE);
pLinkManager->Remove(k);
@@ -401,9 +401,9 @@ void ScDocShell::UpdateLinks()
String aDocName = aDocument.GetLinkDoc(i);
String aFltName = aDocument.GetLinkFlt(i);
String aOptions = aDocument.GetLinkOpt(i);
- ULONG nRefresh = aDocument.GetLinkRefreshDelay(i);
+ ULONG nRefresh = aDocument.GetLinkRefreshDelay(i);
BOOL bThere = FALSE;
- for (SCTAB j=0; j<i && !bThere; j++) // im Dokument mehrfach?
+ for (SCTAB j=0; j<i && !bThere; j++) // im Dokument mehrfach?
if (aDocument.IsLinked(j)
&& aDocument.GetLinkDoc(j) == aDocName
&& aDocument.GetLinkFlt(j) == aFltName
@@ -413,7 +413,7 @@ void ScDocShell::UpdateLinks()
// if it ain't.
bThere = TRUE;
- if (!bThere) // schon als Filter eingetragen?
+ if (!bThere) // schon als Filter eingetragen?
{
StrData* pData = new StrData(aDocName);
if (!aNames.Insert(pData))
@@ -445,25 +445,25 @@ BOOL ScDocShell::ReloadTabLinks()
if (pBase->ISA(ScTableLink))
{
ScTableLink* pTabLink = (ScTableLink*)pBase;
-// pTabLink->SetAddUndo(FALSE); //! Undo's zusammenfassen
- pTabLink->SetPaint(FALSE); // Paint nur einmal am Ende
+// pTabLink->SetAddUndo(FALSE); //! Undo's zusammenfassen
+ pTabLink->SetPaint(FALSE); // Paint nur einmal am Ende
pTabLink->Update();
pTabLink->SetPaint(TRUE);
-// pTabLink->SetAddUndo(TRUE);
+// pTabLink->SetAddUndo(TRUE);
bAny = TRUE;
}
}
if ( bAny )
{
- // Paint nur einmal
+ // Paint nur einmal
PostPaint( ScRange(0,0,0,MAXCOL,MAXROW,MAXTAB),
PAINT_GRID | PAINT_TOP | PAINT_LEFT );
SetDocumentModified();
}
- return TRUE; //! Fehler erkennen
+ return TRUE; //! Fehler erkennen
}
diff --git a/sc/source/ui/docshell/docsh7.cxx b/sc/source/ui/docshell/docsh7.cxx
index 89f082672b29..884803d1454a 100644
--- a/sc/source/ui/docshell/docsh7.cxx
+++ b/sc/source/ui/docshell/docsh7.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
void ScDocShell::GetDrawObjState( SfxItemSet & /* rSet */ )
{
- // SID_SC_ACTIVEOBJECT (SelectedObject) - removed (old Basic)
+ // SID_SC_ACTIVEOBJECT (SelectedObject) - removed (old Basic)
}
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index cb9d625da70c..589b0c67a4ae 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,24 +83,24 @@ using namespace com::sun::star;
// -----------------------------------------------------------------------
-#define SC_SERVICE_ROWSET "com.sun.star.sdb.RowSet"
-#define SC_SERVICE_DRVMAN "com.sun.star.sdbc.DriverManager"
+#define SC_SERVICE_ROWSET "com.sun.star.sdb.RowSet"
+#define SC_SERVICE_DRVMAN "com.sun.star.sdbc.DriverManager"
-//! move to a header file?
-//#define SC_DBPROP_DATASOURCENAME "DataSourceName"
-#define SC_DBPROP_ACTIVECONNECTION "ActiveConnection"
-#define SC_DBPROP_COMMAND "Command"
-#define SC_DBPROP_COMMANDTYPE "CommandType"
+//! move to a header file?
+//#define SC_DBPROP_DATASOURCENAME "DataSourceName"
+#define SC_DBPROP_ACTIVECONNECTION "ActiveConnection"
+#define SC_DBPROP_COMMAND "Command"
+#define SC_DBPROP_COMMANDTYPE "CommandType"
-#define SC_DBPROP_NAME "Name"
-#define SC_DBPROP_TYPE "Type"
-#define SC_DBPROP_PRECISION "Precision"
-#define SC_DBPROP_SCALE "Scale"
+#define SC_DBPROP_NAME "Name"
+#define SC_DBPROP_TYPE "Type"
+#define SC_DBPROP_PRECISION "Precision"
+#define SC_DBPROP_SCALE "Scale"
-#define SC_DBPROP_EXTENSION "Extension"
-#define SC_DBPROP_CHARSET "CharSet"
+#define SC_DBPROP_EXTENSION "Extension"
+#define SC_DBPROP_CHARSET "CharSet"
-#define SC_ROWCOUNT_ERROR (-1)
+#define SC_ROWCOUNT_ERROR (-1)
namespace
{
@@ -140,7 +140,7 @@ namespace
} // if ( aIter == aMap.end() )
rtl::OUString aCharSetStr;
if ( RTL_TEXTENCODING_DONTKNOW != *aIter )
- { // it's not the virtual "system charset"
+ { // it's not the virtual "system charset"
const char* pIanaName = rtl_getMimeCharsetFromTextEncoding( *aIter );
OSL_ENSURE( pIanaName, "invalid mime name!" );
if ( pIanaName )
@@ -261,7 +261,7 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet,
if ( !xConnection.is() || !xDrvMan.is() )
return nRet;
::utl::DisposableComponent aConnectionHelper(xConnection);
-
+
long nRowCount = 0;
if ( nRowCount < 0 )
{
@@ -302,12 +302,12 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet,
if ( xMetaSupp.is() )
xMeta = xMetaSupp->getMetaData();
if ( xMeta.is() )
- nColCount = xMeta->getColumnCount(); // this is the number of real columns
+ nColCount = xMeta->getColumnCount(); // this is the number of real columns
if ( nColCount > MAXCOL+1 )
{
nColCount = MAXCOL+1;
- nErr = SCWARN_IMPORT_RANGE_OVERFLOW; // warning
+ nErr = SCWARN_IMPORT_RANGE_OVERFLOW; // warning
}
if ( nColCount > 0 )
@@ -319,13 +319,13 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet,
if (!xRow.is()) return SCERR_IMPORT_CONNECT;
// currency flag is not needed for dBase
- uno::Sequence<sal_Int32> aColTypes( nColCount ); // column types
+ uno::Sequence<sal_Int32> aColTypes( nColCount ); // column types
sal_Int32* pTypeArr = aColTypes.getArray();
for (i=0; i<nColCount; i++)
pTypeArr[i] = xMeta->getColumnType( i+1 );
- // read column names
- //! add type descriptions
+ // read column names
+ //! add type descriptions
for (i=0; i<nColCount; i++)
{
@@ -363,7 +363,7 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet,
aDocument.SetString( static_cast<SCCOL>(i), 0, 0, aHeader );
}
- SCROW nRow = 1; // 0 is column titles
+ SCROW nRow = 1; // 0 is column titles
BOOL bEnd = FALSE;
while ( !bEnd && xRowSet->next() )
{
@@ -379,10 +379,10 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet,
}
++nRow;
}
- else // past the end of the spreadsheet
+ else // past the end of the spreadsheet
{
- bEnd = TRUE; // don't continue
- nErr = SCWARN_IMPORT_RANGE_OVERFLOW; // warning message
+ bEnd = TRUE; // don't continue
+ nErr = SCWARN_IMPORT_RANGE_OVERFLOW; // warning message
}
if ( nRowCount )
@@ -420,9 +420,9 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell,
sal_Int32* pColLengths, sal_Int32* pColScales,
BOOL& bHasMemo, CharSet eCharSet )
{
- // updating of column titles didn't work in 5.2 and isn't always wanted
- // (saving normally shouldn't modify the document)
- //! read flag from configuration
+ // updating of column titles didn't work in 5.2 and isn't always wanted
+ // (saving normally shouldn't modify the document)
+ //! read flag from configuration
BOOL bUpdateTitles = FALSE;
ScDocument* pDoc = rDocShell.GetDocument();
@@ -527,7 +527,7 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell,
aFieldName.Erase( 10 );
StrData* pStrData = new StrData( aFieldName );
if ( !aFieldNamesCollection.Insert( pStrData ) )
- { // doppelter Feldname, numerisch erweitern
+ { // doppelter Feldname, numerisch erweitern
USHORT nSub = 1;
String aFixPart( aFieldName );
do
@@ -549,7 +549,7 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell,
}
if ( !bTypeDefined )
- { // Feldtyp
+ { // Feldtyp
ScBaseCell* pCell;
pDoc->GetCell( nCol, nFirstDataRow, nTab, pCell );
if ( !pCell || pCell->HasStringData() )
@@ -588,14 +588,14 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell,
BOOL bSdbLenBad = FALSE;
// Feldlaenge
if ( nDbType == sdbc::DataType::VARCHAR && !nFieldLen )
- { // maximale Feldbreite bestimmen
+ { // maximale Feldbreite bestimmen
nFieldLen = pDoc->GetMaxStringLen( nTab, nCol, nFirstDataRow,
nLastRow, eCharSet );
if ( nFieldLen == 0 )
nFieldLen = 1;
}
else if ( nDbType == sdbc::DataType::DECIMAL )
- { // maximale Feldbreite und Nachkommastellen bestimmen
+ { // maximale Feldbreite und Nachkommastellen bestimmen
xub_StrLen nLen;
sal_uInt16 nPrec;
nLen = pDoc->GetMaxNumberStringLen( nPrec, nTab, nCol,
@@ -606,11 +606,11 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell,
if ( nPrec > 15 )
nPrec = 15;
if ( bPrecDefined && nPrecision != nPrec )
- { // Laenge auf vorgegebene Nachkommastellen anpassen
+ { // Laenge auf vorgegebene Nachkommastellen anpassen
if ( nPrecision )
nLen = sal::static_int_cast<xub_StrLen>( nLen + ( nPrecision - nPrec ) );
else
- nLen -= nPrec+1; // auch den . mit raus
+ nLen -= nPrec+1; // auch den . mit raus
}
if ( nLen > nFieldLen && !bTypeDefined )
nFieldLen = nLen;
@@ -619,9 +619,9 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell,
if ( nFieldLen == 0 )
nFieldLen = 1;
else if ( nFieldLen > 19 )
- nFieldLen = 19; // dBaseIII Limit Feldlaenge numerisch: 19
+ nFieldLen = 19; // dBaseIII Limit Feldlaenge numerisch: 19
if ( nPrecision && nFieldLen < nPrecision + 2 )
- nFieldLen = nPrecision + 2; // 0. muss mit reinpassen
+ nFieldLen = nPrecision + 2; // 0. muss mit reinpassen
// 538 MUST: Sdb internal representation adds 2 to the field length!
// To give the user what he wants we must substract it here.
//! CAVEAT! There is no way to define a numeric field with a length
@@ -634,13 +634,13 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell,
if ( nFieldLen > 254 )
{
if ( nDbType == sdbc::DataType::VARCHAR )
- { // zu lang fuer normales Textfeld => Memofeld
+ { // zu lang fuer normales Textfeld => Memofeld
nDbType = sdbc::DataType::LONGVARCHAR;
nFieldLen = 10;
bHasMemo = TRUE;
}
else
- nFieldLen = 254; // dumm gelaufen..
+ nFieldLen = 254; // dumm gelaufen..
}
pColNames[nField] = aFieldName;
@@ -653,10 +653,10 @@ void lcl_GetColumnTypes( ScDocShell& rDocShell,
{
nFieldLen = SvDbaseConverter::ConvertPrecisionToDbase( nFieldLen, nPrecision );
if ( bSdbLenBad && nFieldLen == 1 )
- nFieldLen = 2; // THIS is reality
+ nFieldLen = 2; // THIS is reality
}
if ( bUpdateTitles )
- { // Angabe anpassen und ausgeben
+ { // Angabe anpassen und ausgeben
String aOutString = aFieldName;
switch ( nDbType )
{
@@ -733,7 +733,7 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO
BOOL bHasFieldNames = TRUE;
for ( SCCOL nDocCol = nFirstCol; nDocCol <= nLastCol && bHasFieldNames; nDocCol++ )
- { // nur Strings in erster Zeile => sind Feldnamen
+ { // nur Strings in erster Zeile => sind Feldnamen
if ( !aDocument.HasStringData( nDocCol, nFirstRow, nTab ) )
bHasFieldNames = FALSE;
}
@@ -767,7 +767,7 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO
// get dBase driver
uno::Reference< sdbc::XDriverAccess> xAccess(xDrvMan,uno::UNO_QUERY);
uno::Reference< sdbcx::XDataDefinitionSupplier > xDDSup( xAccess->getDriverByURL( xConnection->getMetaData()->getURL() ), uno::UNO_QUERY );
- if ( !xDDSup.is() )
+ if ( !xDDSup.is() )
return SCERR_EXPORT_CONNECT;
// create table
@@ -842,9 +842,9 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO
xTablesAppend->appendByDescriptor( xTableDesc );
// re-open connection
-// xConnection = xDrvMan->getConnectionWithInfo( aConnUrl, aProps );
-// DBG_ASSERT( xConnection.is(), "can't get Connection" );
-// if (!xConnection.is()) return SCERR_EXPORT_CONNECT;
+// xConnection = xDrvMan->getConnectionWithInfo( aConnUrl, aProps );
+// DBG_ASSERT( xConnection.is(), "can't get Connection" );
+// if (!xConnection.is()) return SCERR_EXPORT_CONNECT;
// get row set for writing
uno::Reference<lang::XMultiServiceFactory> xFactory = comphelper::getProcessServiceFactory();
@@ -900,7 +900,7 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO
if ( pCell && pCell->GetCellType() != CELLTYPE_NOTE )
{
if ( pCell->GetCellType() == CELLTYPE_EDIT )
- { // #60761# Paragraphs erhalten
+ { // #60761# Paragraphs erhalten
lcl_getLongVarCharEditString( aString,
pCell, aEditEngine);
}
@@ -940,8 +940,8 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO
}
else
{
- Date aDate = *(pNumFmt->GetNullDate()); // tools date
- aDate += (long)fVal; //! approxfloor?
+ Date aDate = *(pNumFmt->GetNullDate()); // tools date
+ aDate += (long)fVal; //! approxfloor?
util::Date aUnoDate( aDate.GetDay(), aDate.GetMonth(), aDate.GetYear() );
xRowUpdate->updateDate( nCol+1, aUnoDate );
}
@@ -971,11 +971,11 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO
xResultUpdate->insertRow();
- //! error handling and recovery of old
- //! ScDocShell::SbaSdbExport is still missing!
+ //! error handling and recovery of old
+ //! ScDocShell::SbaSdbExport is still missing!
if ( !aProgress.SetStateOnPercent( nDocRow - nFirstRow ) )
- { // UserBreak
+ { // UserBreak
nErr = SCERR_EXPORT_DATA;
break;
}
diff --git a/sc/source/ui/docshell/docshimp.hxx b/sc/source/ui/docshell/docshimp.hxx
index 6532c46d0835..87c35dc5fc13 100644
--- a/sc/source/ui/docshell/docshimp.hxx
+++ b/sc/source/ui/docshell/docshimp.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/docshell/editable.cxx b/sc/source/ui/docshell/editable.cxx
index d381ff067a99..103889520fd6 100644
--- a/sc/source/ui/docshell/editable.cxx
+++ b/sc/source/ui/docshell/editable.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScEditableTester::ScEditableTester( ScDocument* pDoc, SCTAB nTab,
TestBlock( pDoc, nTab, nStartCol, nStartRow, nEndCol, nEndRow );
}
-ScEditableTester::ScEditableTester( ScDocument* pDoc,
+ScEditableTester::ScEditableTester( ScDocument* pDoc,
SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
const ScMarkData& rMark ) :
bIsEditable( TRUE ),
@@ -98,7 +98,7 @@ void ScEditableTester::TestBlock( ScDocument* pDoc, SCTAB nTab,
}
}
-void ScEditableTester::TestSelectedBlock( ScDocument* pDoc,
+void ScEditableTester::TestSelectedBlock( ScDocument* pDoc,
SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
const ScMarkData& rMark )
{
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 7fa31246275a..269c3d585cdc 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ public:
{
ScAddress aPos = pCell->aPos;
- // We don't check for empty cells because empty external cells are
+ // We don't check for empty cells because empty external cells are
// treated as having a value of 0.
if (pCell->IsValue())
@@ -587,7 +587,7 @@ ScExternalRefCache::TokenArrayRef ScExternalRefCache::getCellRangeData(
static_cast<SCSIZE>(nDataCol2-nDataCol1+1), static_cast<SCSIZE>(nDataRow2-nDataRow1+1));
#if 0
- // TODO: Switch to this code block once we have support for sparsely-filled
+ // TODO: Switch to this code block once we have support for sparsely-filled
// matrices in ScMatrix.
// Only fill non-empty cells, for better performance.
@@ -1613,7 +1613,7 @@ bool ScExternalRefManager::markUsedExternalRefCells()
RefCellSet::iterator itrCell = itr->second.begin(), itrCellEnd = itr->second.end();
for (; itrCell != itrCellEnd; ++itrCell)
{
- ScFormulaCell* pCell = *itrCell;
+ ScFormulaCell* pCell = *itrCell;
bool bUsed = pCell->MarkUsedExternalReferences();
if (bUsed)
// Return true when at least one cell references external docs.
@@ -1714,7 +1714,7 @@ ScExternalRefCache::TokenRef ScExternalRefManager::getSingleRefToken(
// requested cell is outside the data area. Don't even bother caching
// this data, but add it to the cached range to prevent accessing the
// source document time and time again.
- ScExternalRefCache::TableTypeRef pCacheTab =
+ ScExternalRefCache::TableTypeRef pCacheTab =
maRefCache.getCacheTable(nFileId, rTabName, true, NULL);
if (pCacheTab)
pCacheTab->setCachedCell(rCell.Col(), rCell.Row());
@@ -1761,7 +1761,7 @@ ScExternalRefCache::TokenArrayRef ScExternalRefManager::getDoubleRefTokens(
maybeLinkExternalFile(nFileId);
// Check if the given table name and the cell position is cached.
- ScExternalRefCache::TokenArrayRef pArray =
+ ScExternalRefCache::TokenArrayRef pArray =
maRefCache.getCellRangeData(nFileId, rTabName, rRange);
if (pArray)
// Cache hit !
@@ -1813,13 +1813,13 @@ ScExternalRefCache::TokenArrayRef ScExternalRefManager::getDoubleRefTokens(
// Cache these values.
maRefCache.setCellRangeData(nFileId, aRange, aCacheData, pArray);
else
- {
+ {
// Array is empty. Fill it with an empty matrix of the required size.
pArray.reset(lcl_fillEmptyMatrix(rRange));
- // Make sure to set this range 'cached', to prevent unnecessarily
+ // Make sure to set this range 'cached', to prevent unnecessarily
// accessing the src document time and time again.
- ScExternalRefCache::TableTypeRef pCacheTab =
+ ScExternalRefCache::TableTypeRef pCacheTab =
maRefCache.getCacheTable(nFileId, rTabName, true, NULL);
if (pCacheTab)
pCacheTab->setCachedCellRange(
diff --git a/sc/source/ui/docshell/hiranges.cxx b/sc/source/ui/docshell/hiranges.cxx
index af1226216a06..a4eb8d7b670b 100644
--- a/sc/source/ui/docshell/hiranges.cxx
+++ b/sc/source/ui/docshell/hiranges.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index a17279f409a9..1edfc2d2e843 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -111,7 +111,7 @@ enum SylkVersion
ScImportExport::ScImportExport( ScDocument* p )
: pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ),
- nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ),
+ nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ),
bFormulas( FALSE ), bIncludeFiltered( TRUE ),
bAll( TRUE ), bSingle( TRUE ), bUndo( FALSE ),
bOverflow( FALSE ), mbApi( true ), mExportTextOptions()
@@ -126,7 +126,7 @@ ScImportExport::ScImportExport( ScDocument* p )
ScImportExport::ScImportExport( ScDocument* p, const ScAddress& rPt )
: pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ),
aRange( rPt ),
- nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ),
+ nSizeLimit( 0 ), cSep( '\t' ), cStr( '"' ),
bFormulas( FALSE ), bIncludeFiltered( TRUE ),
bAll( FALSE ), bSingle( TRUE ), bUndo( BOOL( pDocSh != NULL ) ),
bOverflow( FALSE ), mbApi( true ), mExportTextOptions()
@@ -136,8 +136,8 @@ ScImportExport::ScImportExport( ScDocument* p, const ScAddress& rPt )
}
-// ctor with a range is only used for export
-//! ctor with a string (and bSingle=TRUE) is also used for DdeSetData
+// ctor with a range is only used for export
+//! ctor with a string (and bSingle=TRUE) is also used for DdeSetData
ScImportExport::ScImportExport( ScDocument* p, const ScRange& r )
: pDocSh( PTR_CAST(ScDocShell,p->GetDocumentShell()) ), pDoc( p ),
@@ -181,7 +181,7 @@ ScImportExport::ScImportExport( ScDocument* p, const String& rPos )
if( pData->HasType( RT_REFAREA )
|| pData->HasType( RT_ABSAREA )
|| pData->HasType( RT_ABSPOS ) )
- pData->GetSymbol( aPos ); // mit dem Inhalt weitertesten
+ pData->GetSymbol( aPos ); // mit dem Inhalt weitertesten
}
}
formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
@@ -210,7 +210,7 @@ void ScImportExport::SetExtOptions( const ScAsciiOptions& rOpt )
else
pExtOptions = new ScAsciiOptions( rOpt );
- // "normale" Optionen uebernehmen
+ // "normale" Optionen uebernehmen
cSep = rOpt.GetFieldSeps().GetChar(0);
cStr = rOpt.GetTextSep();
@@ -280,7 +280,7 @@ void ScImportExport::EndPaste()
if( pDocSh )
{
if (!bHeight)
- pDocSh->PostPaint( aRange, PAINT_GRID ); // AdjustRowHeight paintet evtl. selber
+ pDocSh->PostPaint( aRange, PAINT_GRID ); // AdjustRowHeight paintet evtl. selber
pDocSh->SetDocumentModified();
}
ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell();
@@ -317,7 +317,7 @@ BOOL ScImportExport::ImportData( SvData& rData )
|| nFmt == SOT_FORMATSTR_ID_HTML
|| nFmt == SOT_FORMATSTR_ID_DIF )
{
- //! String? Unicode??
+ //! String? Unicode??
// Stringende ermitteln!
sal_Char* pBegin = (sal_Char*) pMem;
@@ -379,7 +379,7 @@ BOOL ScImportExport::ImportString( const ::rtl::OUString& rText, ULONG nFmt )
::rtl::OString aTmp( rText.getStr(), rText.getLength(), eEnc );
SvMemoryStream aStrm( (void*)aTmp.getStr(), aTmp.getLength() * sizeof(sal_Char), STREAM_READ );
aStrm.SetStreamCharSet( eEnc );
- SetNoEndianSwap( aStrm ); //! no swapping in memory
+ SetNoEndianSwap( aStrm ); //! no swapping in memory
return ImportStream( aStrm, String(), nFmt );
}
}
@@ -397,11 +397,11 @@ BOOL ScImportExport::ExportString( ::rtl::OUString& rText, ULONG nFmt )
rText = UniString( aTmp, eEnc );
return bOk;
}
- // nSizeLimit not needed for OUString
+ // nSizeLimit not needed for OUString
SvMemoryStream aStrm;
aStrm.SetStreamCharSet( RTL_TEXTENCODING_UNICODE );
- SetNoEndianSwap( aStrm ); //! no swapping in memory
+ SetNoEndianSwap( aStrm ); //! no swapping in memory
// mba: no BaseURL for data exc
if( ExportStream( aStrm, String(), nFmt ) )
{
@@ -429,7 +429,7 @@ BOOL ScImportExport::ExportByteString( ByteString& rText, rtl_TextEncoding eEnc,
SvMemoryStream aStrm;
aStrm.SetStreamCharSet( eEnc );
- SetNoEndianSwap( aStrm ); //! no swapping in memory
+ SetNoEndianSwap( aStrm ); //! no swapping in memory
// mba: no BaseURL for data exchange
if( ExportStream( aStrm, String(), nFmt ) )
{
@@ -451,7 +451,7 @@ BOOL ScImportExport::ImportStream( SvStream& rStrm, const String& rBaseURL, ULON
{
if( nFmt == FORMAT_STRING )
{
- if( ExtText2Doc( rStrm ) ) // pExtOptions auswerten
+ if( ExtText2Doc( rStrm ) ) // pExtOptions auswerten
return TRUE;
}
if( nFmt == SOT_FORMATSTR_ID_SYLK )
@@ -470,7 +470,7 @@ BOOL ScImportExport::ImportStream( SvStream& rStrm, const String& rBaseURL, ULON
return TRUE;
}
if( nFmt == SOT_FORMATSTR_ID_LINK )
- return TRUE; // Link-Import?
+ return TRUE; // Link-Import?
if ( nFmt == SOT_FORMATSTR_ID_HTML )
{
if( HTML2Doc( rStrm, rBaseURL ) )
@@ -478,7 +478,7 @@ BOOL ScImportExport::ImportStream( SvStream& rStrm, const String& rBaseURL, ULON
}
if ( nFmt == SOT_FORMATSTR_ID_HTML_SIMPLE )
{
- MSE40HTMLClipFormatObj aMSE40ClpObj; // needed to skip the header data
+ MSE40HTMLClipFormatObj aMSE40ClpObj; // needed to skip the header data
SvStream* pHTML = aMSE40ClpObj.IsValid( rStrm );
if ( pHTML && HTML2Doc( *pHTML, rBaseURL ) )
return TRUE;
@@ -592,7 +592,7 @@ void ScImportExport::WriteUnicodeOrByteString( SvStream& rStrm, const String& rS
void ScImportExport::WriteUnicodeOrByteEndl( SvStream& rStrm )
{
if ( rStrm.GetStreamCharSet() == RTL_TEXTENCODING_UNICODE )
- { // same as endl() but unicode
+ { // same as endl() but unicode
switch ( rStrm.GetLineDelimiter() )
{
case LINEEND_CR :
@@ -612,16 +612,16 @@ void ScImportExport::WriteUnicodeOrByteEndl( SvStream& rStrm )
enum DoubledQuoteMode
{
- DQM_KEEP, // both are taken
- DQM_ESCAPE, // escaped quote, one is taken, one ignored
- DQM_CONCAT, // first is end, next is start, both ignored => strings combined
- DQM_SEPARATE // end one string and begin next
+ DQM_KEEP, // both are taken
+ DQM_ESCAPE, // escaped quote, one is taken, one ignored
+ DQM_CONCAT, // first is end, next is start, both ignored => strings combined
+ DQM_SEPARATE // end one string and begin next
};
static const sal_Unicode* lcl_ScanString( const sal_Unicode* p, String& rString,
sal_Unicode cStr, DoubledQuoteMode eMode )
{
- p++; //! jump over opening quote
+ p++; //! jump over opening quote
BOOL bCont;
do
{
@@ -639,16 +639,16 @@ static const sal_Unicode* lcl_ScanString( const sal_Unicode* p, String& rString,
switch ( eMode )
{
case DQM_KEEP :
- p++; // both for us (not breaking for-loop)
+ p++; // both for us (not breaking for-loop)
break;
case DQM_ESCAPE :
- p++; // one for us (breaking for-loop)
- bCont = TRUE; // and more
+ p++; // one for us (breaking for-loop)
+ bCont = TRUE; // and more
break;
case DQM_CONCAT :
if ( p0+1 < p )
rString.Append( p0, sal::static_int_cast<xub_StrLen>( (p-1) - p0 ) ); // first part
- p0 = ++p; // text of next part starts here
+ p0 = ++p; // text of next part starts here
break;
case DQM_SEPARATE :
// positioned on next opening quote
@@ -669,7 +669,7 @@ static const sal_Unicode* lcl_ScanString( const sal_Unicode* p, String& rString,
void lcl_UnescapeSylk( String & rString, SylkVersion eVersion )
{
// Older versions didn't escape the semicolon.
- // Older versions quoted the string and doubled embedded quotes, but not
+ // Older versions quoted the string and doubled embedded quotes, but not
// the semicolons, which was plain wrong.
if (eVersion >= SYLK_OOO32)
rString.SearchAndReplaceAll( DOUBLE_SEMICOLON, ';' );
@@ -743,18 +743,18 @@ static const sal_Unicode* lcl_ScanSylkFormula( const sal_Unicode* p,
}
else
{
- // Nasty. If in old versions the formula contained a semicolon, it was
- // quoted and embedded quotes were doubled, but semicolons were not. If
- // there was no semicolon, it could still contain quotes and doubled
- // embedded quotes if it was something like ="a""b", which was saved as
- // E"a""b" as is and has to be preserved, even if older versions
- // couldn't even load it correctly. However, theoretically another
- // field might follow and thus the line contain a semicolon again, such
+ // Nasty. If in old versions the formula contained a semicolon, it was
+ // quoted and embedded quotes were doubled, but semicolons were not. If
+ // there was no semicolon, it could still contain quotes and doubled
+ // embedded quotes if it was something like ="a""b", which was saved as
+ // E"a""b" as is and has to be preserved, even if older versions
+ // couldn't even load it correctly. However, theoretically another
+ // field might follow and thus the line contain a semicolon again, such
// as ...;E"a""b";...
bool bQuoted = false;
if (*p == '"')
{
- // May be a quoted expression or just a string constant expression
+ // May be a quoted expression or just a string constant expression
// with quotes.
while (*(++p))
{
@@ -875,8 +875,8 @@ BOOL ScImportExport::Text2Doc( SvStream& rStrm )
if( bData && nCol <= nEndCol && nRow <= nEndRow )
pDoc->SetString( nCol, nRow, aRange.aStart.Tab(), aCell );
}
- else // zuviele Spalten/Zeilen
- bOverflow = TRUE; // beim Import Warnung ausgeben
+ else // zuviele Spalten/Zeilen
+ bOverflow = TRUE; // beim Import Warnung ausgeben
++nCol;
}
++nRow;
@@ -898,11 +898,11 @@ BOOL ScImportExport::Text2Doc( SvStream& rStrm )
}
//
- // erweiterter Ascii-Import
+ // erweiterter Ascii-Import
//
-static bool lcl_PutString(
+static bool lcl_PutString(
ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rStr, BYTE nColFormat,
SvNumberFormatter* pFormatter, bool bDetectNumFormat,
::utl::TransliterationWrapper& rTransliteration, CalendarWrapper& rCalendar,
@@ -920,20 +920,20 @@ static bool lcl_PutString(
if ( nColFormat == SC_COL_ENGLISH )
{
- //! SetString mit Extra-Flag ???
+ //! SetString mit Extra-Flag ???
SvNumberFormatter* pDocFormatter = pDoc->GetFormatTable();
sal_uInt32 nEnglish = pDocFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US);
double fVal;
if ( pDocFormatter->IsNumberFormat( rStr, nEnglish, fVal ) )
{
- // Zahlformat wird nicht auf englisch gesetzt
+ // Zahlformat wird nicht auf englisch gesetzt
pDoc->SetValue( nCol, nRow, nTab, fVal );
return bMultiLine;
}
- // sonst weiter mit SetString
+ // sonst weiter mit SetString
}
- else if ( nColFormat != SC_COL_STANDARD ) // Datumsformate
+ else if ( nColFormat != SC_COL_STANDARD ) // Datumsformate
{
const USHORT nMaxNumberParts = 7; // Y-M-D h:m:s.t
xub_StrLen nLen = rStr.Len();
@@ -975,7 +975,7 @@ static bool lcl_PutString(
if ( nFound == 1 )
{
- // try to break one number (without separators) into date fields
+ // try to break one number (without separators) into date fields
xub_StrLen nDateStart = nStart[0];
xub_StrLen nDateLen = nEnd[0] + 1 - nDateStart;
@@ -983,9 +983,9 @@ static bool lcl_PutString(
if ( nDateLen >= 5 && nDateLen <= 8 &&
ScGlobal::pCharClass->isNumeric( rStr.Copy( nDateStart, nDateLen ) ) )
{
- // 6 digits: 2 each for day, month, year
- // 8 digits: 4 for year, 2 each for day and month
- // 5 or 7 digits: first field is shortened by 1
+ // 6 digits: 2 each for day, month, year
+ // 8 digits: 4 for year, 2 each for day and month
+ // 5 or 7 digits: first field is shortened by 1
BOOL bLongYear = ( nDateLen >= 7 );
BOOL bShortFirst = ( nDateLen == 5 || nDateLen == 7 );
@@ -993,11 +993,11 @@ static bool lcl_PutString(
USHORT nFieldStart = nDateStart;
for (USHORT nPos=0; nPos<3; nPos++)
{
- USHORT nFieldEnd = nFieldStart + 1; // default: 2 digits
+ USHORT nFieldEnd = nFieldStart + 1; // default: 2 digits
if ( bLongYear && nPos == nYP )
- nFieldEnd += 2; // 2 extra digits for long year
+ nFieldEnd += 2; // 2 extra digits for long year
if ( bShortFirst && nPos == 0 )
- --nFieldEnd; // first field shortened?
+ --nFieldEnd; // first field shortened?
nStart[nPos] = nFieldStart;
nEnd[nPos] = nFieldEnd;
@@ -1021,7 +1021,7 @@ static bool lcl_PutString(
static const String aSepShortened( RTL_CONSTASCII_USTRINGPARAM( "SEP" ) );
uno::Sequence< i18n::CalendarItem > xMonths;
sal_Int32 i, nMonthCount;
- // first test all month names from local international
+ // first test all month names from local international
xMonths = rCalendar.getMonths();
nMonthCount = xMonths.getLength();
for (i=0; i<nMonthCount && !nMonth; i++)
@@ -1037,7 +1037,7 @@ static bool lcl_PutString(
nMonth = sal::static_int_cast<sal_Int16>( i+1 );
}
}
- // if none found, then test english month names
+ // if none found, then test english month names
if ( !nMonth && pSecondCalendar && pSecondTransliteration )
{
xMonths = pSecondCalendar->getMonths();
@@ -1127,7 +1127,7 @@ static bool lcl_PutString(
// Standard or date not determined -> SetString / EditCell
if( rStr.Search( _LF ) == STRING_NOTFOUND )
pDoc->SetString( nCol, nRow, nTab, rStr, pFormatter, bDetectNumFormat );
- else
+ else
{
bMultiLine = true;
pDoc->PutCell( nCol, nRow, nTab, new ScEditCell( rStr, pDoc ) );
@@ -1178,14 +1178,14 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
SCROW nStartRow = aRange.aStart.Row();
SCTAB nTab = aRange.aStart.Tab();
- BOOL bFixed = pExtOptions->IsFixedLen();
+ BOOL bFixed = pExtOptions->IsFixedLen();
const String& rSeps = pExtOptions->GetFieldSeps();
const sal_Unicode* pSeps = rSeps.GetBuffer();
- BOOL bMerge = pExtOptions->IsMergeSeps();
- USHORT nInfoCount = pExtOptions->GetInfoCount();
+ BOOL bMerge = pExtOptions->IsMergeSeps();
+ USHORT nInfoCount = pExtOptions->GetInfoCount();
const xub_StrLen* pColStart = pExtOptions->GetColStart();
const BYTE* pColFormat = pExtOptions->GetColFormat();
- long nSkipLines = pExtOptions->GetStartRow();
+ long nSkipLines = pExtOptions->GetStartRow();
LanguageType eDocLang = pExtOptions->GetLanguage();
SvNumberFormatter aNumFormatter(pDoc->GetServiceManager(), eDocLang);
@@ -1224,7 +1224,7 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
// Determine range for Undo.
// TODO: we don't need this during import of a file to a new sheet or
// document, could set bDetermineRange=false then.
- bool bDetermineRange = true;
+ bool bDetermineRange = true;
// Row heights don't need to be adjusted on the fly if EndPaste() is called
// afterwards, which happens only if bDetermineRange. This variable also
@@ -1234,7 +1234,7 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
bool bQuotedAsText = pExtOptions && pExtOptions->IsQuotedAsText();
ULONG nOriginalStreamPos = rStrm.Tell();
-
+
do
{
for( ;; )
@@ -1246,7 +1246,7 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
xub_StrLen nLineLen = aLine.Len();
SCCOL nCol = nStartCol;
bool bMultiLine = false;
- if ( bFixed ) // Feste Satzlaenge
+ if ( bFixed ) // Feste Satzlaenge
{
// Yes, the check is nCol<=MAXCOL+1, +1 because it is only an
// overflow if there is really data following to be put behind
@@ -1268,7 +1268,7 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
if (bIsQuoted && bQuotedAsText)
nFmt = SC_COL_TEXT;
- bMultiLine |= lcl_PutString(
+ bMultiLine |= lcl_PutString(
pDoc, nCol, nRow, nTab, aCell, nFmt,
&aNumFormatter, bDetectNumFormat, aTransliteration, aCalendar,
pEnglishTransliteration, pEnglishCalendar);
@@ -1277,7 +1277,7 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
}
}
}
- else // Nach Trennzeichen suchen
+ else // Nach Trennzeichen suchen
{
SCCOL nSourceCol = 0;
USHORT nInfoStart = 0;
@@ -1294,11 +1294,11 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
BYTE nFmt = SC_COL_STANDARD;
for ( i=nInfoStart; i<nInfoCount; i++ )
{
- if ( pColStart[i] == nSourceCol + 1 ) // pColStart ist 1-basiert
+ if ( pColStart[i] == nSourceCol + 1 ) // pColStart ist 1-basiert
{
nFmt = pColFormat[i];
- nInfoStart = i + 1; // ColInfos sind in Reihenfolge
- break; // for
+ nInfoStart = i + 1; // ColInfos sind in Reihenfolge
+ break; // for
}
}
if ( nFmt != SC_COL_SKIP )
@@ -1310,8 +1310,8 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
if (bIsQuoted && bQuotedAsText)
nFmt = SC_COL_TEXT;
- bMultiLine |= lcl_PutString(
- pDoc, nCol, nRow, nTab, aCell, nFmt,
+ bMultiLine |= lcl_PutString(
+ pDoc, nCol, nRow, nTab, aCell, nFmt,
&aNumFormatter, bDetectNumFormat, aTransliteration,
aCalendar, pEnglishTransliteration, pEnglishCalendar);
}
@@ -1339,9 +1339,9 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
}
// so far nRow/nEndCol pointed to the next free
if (nRow > nStartRow)
- --nRow;
+ --nRow;
if (nEndCol > nStartCol)
- nEndCol = ::std::min( static_cast<SCCOL>(nEndCol - 1), MAXCOL);
+ nEndCol = ::std::min( static_cast<SCCOL>(nEndCol - 1), MAXCOL);
if (bDetermineRange)
{
@@ -1392,7 +1392,7 @@ const sal_Unicode* ScImportExport::ScanNextFieldFromString( const sal_Unicode* p
{
rbIsQuoted = false;
rField.Erase();
- if ( *p == cStr ) // String in Anfuehrungszeichen
+ if ( *p == cStr ) // String in Anfuehrungszeichen
{
rbIsQuoted = true;
const sal_Unicode* p1;
@@ -1406,7 +1406,7 @@ const sal_Unicode* ScImportExport::ScanNextFieldFromString( const sal_Unicode* p
if( *p )
p++;
}
- else // bis zum Trennzeichen
+ else // bis zum Trennzeichen
{
const sal_Unicode* p0 = p;
while ( *p && !ScGlobal::UnicodeStrChr( pSeps, *p ) )
@@ -1415,7 +1415,7 @@ const sal_Unicode* ScImportExport::ScanNextFieldFromString( const sal_Unicode* p
if( *p )
p++;
}
- if ( bMergeSeps ) // folgende Trennzeichen ueberspringen
+ if ( bMergeSeps ) // folgende Trennzeichen ueberspringen
{
while ( *p && ScGlobal::UnicodeStrChr( pSeps, *p ) )
p++;
@@ -1516,7 +1516,7 @@ BOOL ScImportExport::Doc2Text( SvStream& rStrm )
if( nCol < nEndCol )
lcl_WriteSimpleString( rStrm, String(cSep) );
}
-// if( nRow < nEndRow )
+// if( nRow < nEndRow )
WriteUnicodeOrByteEndl( rStrm );
if( rStrm.GetError() != SVSTREAM_OK )
break;
@@ -1562,7 +1562,7 @@ BOOL ScImportExport::Sylk2Doc( SvStream& rStrm )
rStrm.Seek( nOldPos );
for( ;; )
{
- //! allow unicode
+ //! allow unicode
rStrm.ReadLine( aByteLine );
aLine = String( aByteLine, rStrm.GetStreamCharSet() );
if( rStrm.IsEof() )
@@ -1622,7 +1622,7 @@ BOOL ScImportExport::Sylk2Doc( SvStream& rStrm )
{ // don't ignore value
if( bText )
{
- pDoc->PutCell( nCol, nRow, aRange.aStart.Tab(),
+ pDoc->PutCell( nCol, nRow, aRange.aStart.Tab(),
ScBaseCell::CreateTextCell( aText, pDoc),
(BOOL) TRUE);
}
@@ -1772,7 +1772,7 @@ BOOL ScImportExport::Sylk2Doc( SvStream& rStrm )
eVersion = SYLK_SCALC3;
bMyDoc = (eVersion <= SYLK_OWN);
}
- else if( cTag == 'E' ) // Ende
+ else if( cTag == 'E' ) // Ende
break;
}
if( !bData )
@@ -1945,7 +1945,7 @@ BOOL ScImportExport::Doc2HTML( SvStream& rStrm, const String& rBaseURL )
BOOL ScImportExport::Doc2RTF( SvStream& rStrm )
{
- // CharSet is ignored in ScExportRTF
+ // CharSet is ignored in ScExportRTF
ScFormatFilter::Get().ScExportRTF( rStrm, pDoc, aRange, RTL_TEXTENCODING_DONTKNOW );
return BOOL( rStrm.GetError() == SVSTREAM_OK );
}
diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx
index 822c74800ab2..105783b8c7d5 100644
--- a/sc/source/ui/docshell/olinefun.cxx
+++ b/sc/source/ui/docshell/olinefun.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +54,14 @@ void lcl_InvalidateOutliner( SfxBindings* pBindings )
pBindings->Invalidate( SID_OUTLINE_HIDE );
pBindings->Invalidate( SID_OUTLINE_REMOVE );
- pBindings->Invalidate( SID_STATUS_SUM ); // wegen ein-/ausblenden
+ pBindings->Invalidate( SID_STATUS_SUM ); // wegen ein-/ausblenden
pBindings->Invalidate( SID_ATTR_SIZE );
}
}
//------------------------------------------------------------------------
-//! PaintWidthHeight zur DocShell verschieben?
+//! PaintWidthHeight zur DocShell verschieben?
void lcl_PaintWidthHeight( ScDocShell& rDocShell, SCTAB nTab,
BOOL bColumns, SCCOLROW nStart, SCCOLROW nEnd )
@@ -71,7 +71,7 @@ void lcl_PaintWidthHeight( ScDocShell& rDocShell, SCTAB nTab,
USHORT nParts = PAINT_GRID;
SCCOL nStartCol = 0;
SCROW nStartRow = 0;
- SCCOL nEndCol = MAXCOL; // fuer Test auf Merge
+ SCCOL nEndCol = MAXCOL; // fuer Test auf Merge
SCROW nEndRow = MAXROW;
if ( bColumns )
{
@@ -137,7 +137,7 @@ BOOL ScOutlineDocFunc::MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL b
if (pDoc->IsStreamValid(nTab))
pDoc->SetStreamValid(nTab, FALSE);
- USHORT nParts = 0; // Datenbereich nicht geaendert
+ USHORT nParts = 0; // Datenbereich nicht geaendert
if ( bColumns )
nParts |= PAINT_TOP;
else
@@ -153,7 +153,7 @@ BOOL ScOutlineDocFunc::MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL b
else
{
if (!bApi)
- rDocShell.ErrorMessage(STR_MSSG_MAKEOUTLINE_0); // "Gruppierung nicht moeglich"
+ rDocShell.ErrorMessage(STR_MSSG_MAKEOUTLINE_0); // "Gruppierung nicht moeglich"
delete pUndoTab;
}
@@ -203,7 +203,7 @@ BOOL ScOutlineDocFunc::RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL
if (pDoc->IsStreamValid(nTab))
pDoc->SetStreamValid(nTab, FALSE);
- USHORT nParts = 0; // Datenbereich nicht geaendert
+ USHORT nParts = 0; // Datenbereich nicht geaendert
if ( bColumns )
nParts |= PAINT_TOP;
else
@@ -223,7 +223,7 @@ BOOL ScOutlineDocFunc::RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL
}
if (!bDone && !bApi)
- rDocShell.ErrorMessage(STR_MSSG_REMOVEOUTLINE_0); // "Aufheben nicht moeglich"
+ rDocShell.ErrorMessage(STR_MSSG_REMOVEOUTLINE_0); // "Aufheben nicht moeglich"
return bDone;
}
@@ -358,7 +358,7 @@ BOOL ScOutlineDocFunc::SelectLevel( SCTAB nTab, BOOL bColumns, USHORT nLevel,
if (bRecord && !pDoc->IsUndoEnabled())
bRecord = FALSE;
- ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab ); // ist schon da
+ ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab ); // ist schon da
if (!pTable)
return FALSE;
ScOutlineArray* pArray = bColumns ? pTable->GetColArray() : pTable->GetRowArray();
@@ -387,28 +387,28 @@ BOOL ScOutlineDocFunc::SelectLevel( SCTAB nTab, BOOL bColumns, USHORT nLevel,
rDocShell.GetUndoManager()->AddUndoAction(
new ScUndoOutlineLevel( &rDocShell,
- nStart, nEnd, nTab, //! start und end berechnen
+ nStart, nEnd, nTab, //! start und end berechnen
pUndoDoc, pUndoTab,
bColumns, nLevel ) );
}
- ScSubOutlineIterator aIter( pArray ); // alle Eintraege
+ ScSubOutlineIterator aIter( pArray ); // alle Eintraege
ScOutlineEntry* pEntry;
while ((pEntry=aIter.GetNext()) != NULL)
{
USHORT nThisLevel = aIter.LastLevel();
BOOL bShow = (nThisLevel < nLevel);
- if (bShow) // einblenden
+ if (bShow) // einblenden
{
pEntry->SetHidden( FALSE );
pEntry->SetVisible( TRUE );
}
- else if ( nThisLevel == nLevel ) // ausblenden
+ else if ( nThisLevel == nLevel ) // ausblenden
{
pEntry->SetHidden( TRUE );
pEntry->SetVisible( TRUE );
}
- else // verdeckt
+ else // verdeckt
{
pEntry->SetVisible( FALSE );
}
@@ -478,7 +478,7 @@ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord,
pUndoDoc, pUndoTab, TRUE ) );
}
- // Spalten
+ // Spalten
nMin=MAXCOL;
nMax=0;
@@ -499,7 +499,7 @@ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord,
for ( i=nMin; i<=nMax; i++ )
pDoc->ShowCol( static_cast<SCCOL>(i), nTab, TRUE );
- // Zeilen
+ // Zeilen
nMin=MAXROW;
nMax=0;
@@ -518,7 +518,7 @@ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord,
}
}
for ( i=nMin; i<=nMax; i++ )
- if ( !pDoc->RowFiltered( i,nTab ) ) // weggefilterte nicht einblenden
+ if ( !pDoc->RowFiltered( i,nTab ) ) // weggefilterte nicht einblenden
pDoc->ShowRow( i, nTab, TRUE );
pDoc->UpdatePageBreaks( nTab );
@@ -590,7 +590,7 @@ BOOL ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, BOOL bRecord,
pUndoDoc, pUndoTab, FALSE ) );
}
- // Spalten
+ // Spalten
nCount = pColArray->GetCount(nColLevel);
for ( i=0; i<nCount; i++ )
@@ -603,7 +603,7 @@ BOOL ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, BOOL bRecord,
HideOutline( nTab, TRUE, nColLevel, i, FALSE, FALSE, bApi );
}
- // Zeilen
+ // Zeilen
nCount = pRowArray->GetCount(nRowLevel);
for ( i=0; i<nCount; i++ )
@@ -665,11 +665,11 @@ BOOL ScOutlineDocFunc::ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US
rDocShell.GetUndoManager()->AddUndoAction(
new ScUndoDoOutline( &rDocShell,
- nStart, nEnd, nTab, pUndoDoc, //! start und end berechnen
+ nStart, nEnd, nTab, pUndoDoc, //! start und end berechnen
bColumns, nLevel, nEntry, TRUE ) );
}
-//! HideCursor();
+//! HideCursor();
pEntry->SetHidden(FALSE);
SCCOLROW i;
@@ -678,7 +678,7 @@ BOOL ScOutlineDocFunc::ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US
if ( bColumns )
pDoc->ShowCol( static_cast<SCCOL>(i), nTab, TRUE );
else
- if ( !pDoc->RowFiltered( i,nTab ) ) // weggefilterte nicht einblenden
+ if ( !pDoc->RowFiltered( i,nTab ) ) // weggefilterte nicht einblenden
pDoc->ShowRow( i, nTab, TRUE );
}
@@ -707,15 +707,15 @@ BOOL ScOutlineDocFunc::ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US
if (bPaint)
lcl_PaintWidthHeight( rDocShell, nTab, bColumns, nStart, nEnd );
-//! ShowCursor();
+//! ShowCursor();
rDocShell.SetDocumentModified();
-//! if (bPaint)
-//! UpdateScrollBars();
+//! if (bPaint)
+//! UpdateScrollBars();
lcl_InvalidateOutliner( rDocShell.GetViewBindings() );
- return TRUE; //! immer ???
+ return TRUE; //! immer ???
}
BOOL ScOutlineDocFunc::HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, USHORT nEntry,
@@ -729,7 +729,7 @@ BOOL ScOutlineDocFunc::HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US
ScOutlineArray* pArray = bColumns ? pTable->GetColArray() : pTable->GetRowArray();
ScOutlineEntry* pEntry = pArray->GetEntry( nLevel, nEntry );
SCCOLROW nStart = pEntry->GetStart();
- SCCOLROW nEnd = pEntry->GetEnd();
+ SCCOLROW nEnd = pEntry->GetEnd();
if ( bRecord )
{
@@ -753,7 +753,7 @@ BOOL ScOutlineDocFunc::HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US
bColumns, nLevel, nEntry, FALSE ) );
}
-//! HideCursor();
+//! HideCursor();
pEntry->SetHidden(TRUE);
SCCOLROW i;
@@ -773,15 +773,15 @@ BOOL ScOutlineDocFunc::HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US
if (bPaint)
lcl_PaintWidthHeight( rDocShell, nTab, bColumns, nStart, nEnd );
-//! ShowCursor();
+//! ShowCursor();
rDocShell.SetDocumentModified();
-//! if (bPaint)
-//! UpdateScrollBars();
+//! if (bPaint)
+//! UpdateScrollBars();
lcl_InvalidateOutliner( rDocShell.GetViewBindings() );
- return TRUE; //! immer ???
+ return TRUE; //! immer ???
}
diff --git a/sc/source/ui/docshell/pagedata.cxx b/sc/source/ui/docshell/pagedata.cxx
index db55c2364305..26721bb35748 100644
--- a/sc/source/ui/docshell/pagedata.cxx
+++ b/sc/source/ui/docshell/pagedata.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ BOOL ScPageBreakData::IsEqual( const ScPageBreakData& rOther ) const
if ( pData[i].GetPrintRange() != rOther.pData[i].GetPrintRange() )
return FALSE;
- //! ScPrintRangeData komplett vergleichen ??
+ //! ScPrintRangeData komplett vergleichen ??
return TRUE;
}
diff --git a/sc/source/ui/docshell/pntlock.cxx b/sc/source/ui/docshell/pntlock.cxx
index 764d431f3af0..2b8bc5b113d6 100644
--- a/sc/source/ui/docshell/pntlock.cxx
+++ b/sc/source/ui/docshell/pntlock.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx
index dabe38fb8c1d..1d69e2661db2 100644
--- a/sc/source/ui/docshell/servobj.cxx
+++ b/sc/source/ui/docshell/servobj.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +39,7 @@
#include "impex.hxx"
#include "brdcst.hxx"
#include "rangenam.hxx"
-#include "sc.hrc" // SC_HINT_AREAS_CHANGED
+#include "sc.hrc" // SC_HINT_AREAS_CHANGED
// -----------------------------------------------------------------------
@@ -84,15 +84,15 @@ ScServerObject::ScServerObject( ScDocShell* pShell, const String& rItem ) :
pDocSh( pShell ),
bRefreshListener( FALSE )
{
- // parse item string
+ // parse item string
if ( lcl_FillRangeFromName( aRange, pDocSh, rItem ) )
{
- aItemStr = rItem; // must be parsed again on ref update
+ aItemStr = rItem; // must be parsed again on ref update
}
else
{
- // parse ref
+ // parse ref
ScDocument* pDoc = pDocSh->GetDocument();
SCTAB nTab = pDocSh->GetCurTab();
aRange.aStart.SetTab( nTab );
@@ -115,8 +115,8 @@ ScServerObject::ScServerObject( ScDocShell* pShell, const String& rItem ) :
pDocSh->GetDocument()->GetLinkManager()->InsertServer( this );
pDocSh->GetDocument()->StartListeningArea( aRange, &aForwarder );
- StartListening(*pDocSh); // um mitzubekommen, wenn die DocShell geloescht wird
- StartListening(*SFX_APP()); // for SC_HINT_AREAS_CHANGED
+ StartListening(*pDocSh); // um mitzubekommen, wenn die DocShell geloescht wird
+ StartListening(*SFX_APP()); // for SC_HINT_AREAS_CHANGED
}
__EXPORT ScServerObject::~ScServerObject()
@@ -164,7 +164,7 @@ BOOL __EXPORT ScServerObject::GetData(
if ( bRefreshListener )
{
- // refresh the listeners now (this is called from a timer)
+ // refresh the listeners now (this is called from a timer)
EndListeningAll();
pDocSh->GetDocument()->StartListeningArea( aRange, &aForwarder );
@@ -212,15 +212,15 @@ void __EXPORT ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
{
BOOL bDataChanged = FALSE;
- // DocShell can't be tested via type info, because SFX_HINT_DYING comes from the dtor
+ // DocShell can't be tested via type info, because SFX_HINT_DYING comes from the dtor
if ( &rBC == pDocSh )
{
- // from DocShell, only SFX_HINT_DYING is interesting
+ // from DocShell, only SFX_HINT_DYING is interesting
if ( rHint.ISA(SfxSimpleHint) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
pDocSh = NULL;
EndListening(*SFX_APP());
- // don't access DocShell anymore for EndListening etc.
+ // don't access DocShell anymore for EndListening etc.
}
}
else if (rBC.ISA(SfxApplication))
@@ -228,7 +228,7 @@ void __EXPORT ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
if ( aItemStr.Len() && rHint.ISA(SfxSimpleHint) &&
((const SfxSimpleHint&)rHint).GetId() == SC_HINT_AREAS_CHANGED )
{
- // check if named range was modified
+ // check if named range was modified
ScRange aNew;
if ( lcl_FillRangeFromName( aNew, pDocSh, aItemStr ) && aNew != aRange )
bDataChanged = TRUE;
@@ -236,12 +236,12 @@ void __EXPORT ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
}
else
{
- // must be from Area broadcasters
+ // must be from Area broadcasters
const ScHint* pScHint = PTR_CAST( ScHint, &rHint );
if( pScHint && (pScHint->GetId() & (SC_HINT_DATACHANGED | SC_HINT_DYING)) )
bDataChanged = TRUE;
- else if (rHint.ISA(ScAreaChangedHint)) // position of broadcaster changed
+ else if (rHint.ISA(ScAreaChangedHint)) // position of broadcaster changed
{
ScRange aNewRange = ((const ScAreaChangedHint&)rHint).GetRange();
if ( aRange != aNewRange )
@@ -255,8 +255,8 @@ void __EXPORT ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
if (nId == SFX_HINT_DYING)
{
- // If the range is being deleted, listening must be restarted
- // after the deletion is complete (done in GetData)
+ // If the range is being deleted, listening must be restarted
+ // after the deletion is complete (done in GetData)
bRefreshListener = TRUE;
bDataChanged = TRUE;
}
diff --git a/sc/source/ui/docshell/sizedev.cxx b/sc/source/ui/docshell/sizedev.cxx
index d89009540156..a207f963f00f 100644
--- a/sc/source/ui/docshell/sizedev.cxx
+++ b/sc/source/ui/docshell/sizedev.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScSizeDeviceProvider::ScSizeDeviceProvider( ScDocShell* pDocSh )
bOwner = FALSE;
aOldMapMode = pDevice->GetMapMode();
- pDevice->SetMapMode( MAP_PIXEL ); // GetNeededSize needs pixel MapMode
+ pDevice->SetMapMode( MAP_PIXEL ); // GetNeededSize needs pixel MapMode
// printer has right DigitLanguage already
}
else
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index 697b39052b9f..a0a8ad759888 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +128,8 @@ __EXPORT ScTableLink::~ScTableLink()
void __EXPORT ScTableLink::Edit( Window* pParent, const Link& rEndEditHdl )
{
- // DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom
- // ein Optionen-Dialog kommt...
+ // DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom
+ // ein Optionen-Dialog kommt...
pImpl->m_aEndEditLink = rEndEditHdl;
pImpl->m_pOldParent = Application::GetDefDialogParent();
@@ -150,12 +150,12 @@ void __EXPORT ScTableLink::DataChanged( const String&,
String aFilter;
pLinkManager->GetDisplayNames( this,0,&aFile,NULL,&aFilter);
- // the file dialog returns the filter name with the application prefix
- // -> remove prefix
+ // the file dialog returns the filter name with the application prefix
+ // -> remove prefix
ScDocumentLoader::RemoveAppPrefix( aFilter );
if (!bInCreate)
- Refresh( aFile, aFilter, NULL, GetRefreshDelay() ); // don't load twice
+ Refresh( aFile, aFilter, NULL, GetRefreshDelay() ); // don't load twice
}
}
@@ -170,7 +170,7 @@ void __EXPORT ScTableLink::Closed()
pImpl->m_pDocSh->GetUndoManager()->AddUndoAction(
new ScUndoRemoveLink( pImpl->m_pDocSh, aFileName ) );
- bAddUndo = FALSE; // nur einmal
+ bAddUndo = FALSE; // nur einmal
}
// Verbindung wird im dtor aufgehoben
@@ -186,7 +186,7 @@ BOOL ScTableLink::IsUsed() const
BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
const String* pNewOptions, ULONG nNewRefresh )
{
- // Dokument laden
+ // Dokument laden
if (!rNewFile.Len() || !rNewFilter.Len())
return FALSE;
@@ -203,21 +203,21 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
BOOL bUndo(pDoc->IsUndoEnabled());
- // wenn neuer Filter ausgewaehlt wurde, Optionen vergessen
+ // wenn neuer Filter ausgewaehlt wurde, Optionen vergessen
if ( rNewFilter != aFilterName )
aOptions.Erase();
- if ( pNewOptions ) // Optionen hart angegeben?
+ if ( pNewOptions ) // Optionen hart angegeben?
aOptions = *pNewOptions;
- // ItemSet immer anlegen, damit die DocShell die Optionen setzen kann
+ // ItemSet immer anlegen, damit die DocShell die Optionen setzen kann
SfxItemSet* pSet = new SfxAllItemSet( SFX_APP()->GetPool() );
if ( aOptions.Len() )
pSet->Put( SfxStringItem( SID_FILE_FILTEROPTIONS, aOptions ) );
SfxMedium* pMed = new SfxMedium(aNewUrl, STREAM_STD_READ, FALSE, pFilter, pSet);
- if ( bInEdit ) // only if using the edit dialog,
- pMed->UseInteractionHandler( TRUE ); // enable the filter options dialog
+ if ( bInEdit ) // only if using the edit dialog,
+ pMed->UseInteractionHandler( TRUE ); // enable the filter options dialog
ScDocShell* pSrcShell = new ScDocShell(SFX_CREATE_MODE_INTERNAL);
SfxObjectShellRef aRef = pSrcShell;
@@ -228,22 +228,22 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
if (!aNewOpt.Len())
aNewOpt = aOptions;
- // Undo...
+ // Undo...
ScDocument* pUndoDoc = NULL;
BOOL bFirst = TRUE;
if (bAddUndo && bUndo)
pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
- // Tabellen kopieren
+ // Tabellen kopieren
ScDocShellModificator aModificator( *pImpl->m_pDocSh );
BOOL bNotFound = FALSE;
ScDocument* pSrcDoc = pSrcShell->GetDocument();
- // #74835# from text filters that don't set the table name,
- // use the one table regardless of link table name
+ // #74835# from text filters that don't set the table name,
+ // use the one table regardless of link table name
BOOL bAutoTab = (pSrcDoc->GetTableCount() == 1) &&
ScDocShell::HasAutomaticTableName( rNewFilter );
@@ -255,7 +255,7 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
{
String aTabName = pDoc->GetLinkTab(nTab);
- // Undo
+ // Undo
if (bAddUndo && bUndo)
{
@@ -271,7 +271,7 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
aOptions, aTabName, GetRefreshDelay() );
}
- // Tabellenname einer ExtDocRef anpassen
+ // Tabellenname einer ExtDocRef anpassen
if ( bNewUrlName && nMode == SC_LINK_VALUE )
{
@@ -282,11 +282,11 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
{
pDoc->RenameTab( nTab,
ScGlobal::GetDocTabName( aNewUrl, aTabName ),
- FALSE, TRUE ); // kein RefUpdate, kein ValidTabName
+ FALSE, TRUE ); // kein RefUpdate, kein ValidTabName
}
}
- // kopieren
+ // kopieren
SCTAB nSrcTab = 0;
bool bFound = false;
@@ -303,8 +303,8 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
}
if (bFound)
- pDoc->TransferTab( pSrcDoc, nSrcTab, nTab, FALSE, // nicht neu einfuegen
- (nMode == SC_LINK_VALUE) ); // nur Werte?
+ pDoc->TransferTab( pSrcDoc, nSrcTab, nTab, FALSE, // nicht neu einfuegen
+ (nMode == SC_LINK_VALUE) ); // nur Werte?
else
{
pDoc->DeleteAreaTab( 0,0,MAXCOL,MAXROW, nTab, IDF_ALL );
@@ -317,7 +317,7 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
ScRangeList aErrorCells; // cells on the linked sheets that need error values
- ScCellIterator aCellIter( pDoc, 0,0,0, MAXCOL,MAXROW,MAXTAB ); // all sheets
+ ScCellIterator aCellIter( pDoc, 0,0,0, MAXCOL,MAXROW,MAXTAB ); // all sheets
ScBaseCell* pCell = aCellIter.GetFirst();
while (pCell)
{
@@ -392,7 +392,7 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
}
}
- // neue Einstellungen merken
+ // neue Einstellungen merken
if ( bNewUrlName )
aFileName = aNewUrl;
@@ -401,18 +401,18 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
if ( aNewOpt != aOptions )
aOptions = aNewOpt;
- // aufraeumen
+ // aufraeumen
-// pSrcShell->DoClose();
+// pSrcShell->DoClose();
aRef->DoClose();
- // Undo
+ // Undo
if (bAddUndo && bUndo)
pImpl->m_pDocSh->GetUndoManager()->AddUndoAction(
new ScUndoRefreshLink( pImpl->m_pDocSh, pUndoDoc ) );
- // Paint (koennen mehrere Tabellen sein)
+ // Paint (koennen mehrere Tabellen sein)
if (bDoPaint)
{
@@ -423,13 +423,13 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter,
if (bNotFound)
{
- //! Fehler ausgeben ?
+ //! Fehler ausgeben ?
}
pDoc->SetInLinkUpdate( FALSE );
- // notify Uno objects (for XRefreshListener)
- //! also notify Uno objects if file name was changed!
+ // notify Uno objects (for XRefreshListener)
+ //! also notify Uno objects if file name was changed!
ScLinkRefreshedHint aHint;
aHint.SetSheetLink( aFileName );
pDoc->BroadcastUno( aHint );
@@ -454,7 +454,7 @@ IMPL_LINK( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink*, pLink )
// === ScDocumentLoader ==================================================
-String ScDocumentLoader::GetOptions( SfxMedium& rMedium ) // static
+String ScDocumentLoader::GetOptions( SfxMedium& rMedium ) // static
{
SfxItemSet* pSet = rMedium.GetItemSet();
const SfxPoolItem* pItem;
@@ -490,7 +490,7 @@ BOOL ScDocumentLoader::GetFilterName( const String& rFileName,
if ( eProt == INET_PROT_NOT_VALID ) // invalid URL?
return FALSE; // abort without creating a medium
- // Filter-Detection
+ // Filter-Detection
const SfxFilter* pSfxFilter = NULL;
SfxMedium* pMedium = new SfxMedium( rFileName, STREAM_STD_READ, FALSE );
@@ -512,7 +512,7 @@ BOOL ScDocumentLoader::GetFilterName( const String& rFileName,
if ( pSfxFilter )
rFilter = pSfxFilter->GetFilterName();
else
- rFilter = ScDocShell::GetOwnFilterName(); // sonst Calc-Datei
+ rFilter = ScDocShell::GetOwnFilterName(); // sonst Calc-Datei
bOK = (rFilter.Len()>0);
}
@@ -520,7 +520,7 @@ BOOL ScDocumentLoader::GetFilterName( const String& rFileName,
return bOK;
}
-void ScDocumentLoader::RemoveAppPrefix( String& rFilterName ) // static
+void ScDocumentLoader::RemoveAppPrefix( String& rFilterName ) // static
{
String aAppPrefix = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( STRING_SCAPP ));
aAppPrefix.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ": " ));
@@ -540,7 +540,7 @@ ScDocumentLoader::ScDocumentLoader( const String& rFileName,
const SfxFilter* pFilter = ScDocShell::Factory().GetFilterContainer()->GetFilter4FilterName( rFilterName );
- // ItemSet immer anlegen, damit die DocShell die Optionen setzen kann
+ // ItemSet immer anlegen, damit die DocShell die Optionen setzen kann
SfxItemSet* pSet = new SfxAllItemSet( SFX_APP()->GetPool() );
if ( rOptions.Len() )
pSet->Put( SfxStringItem( SID_FILE_FILTEROPTIONS, rOptions ) );
@@ -550,7 +550,7 @@ ScDocumentLoader::ScDocumentLoader( const String& rFileName,
return ;
if ( bWithInteraction )
- pMedium->UseInteractionHandler( TRUE ); // to enable the filter options dialog
+ pMedium->UseInteractionHandler( TRUE ); // to enable the filter options dialog
pDocShell = new ScDocShell( SFX_CREATE_MODE_INTERNAL );
aRef = pDocShell;
@@ -558,7 +558,7 @@ ScDocumentLoader::ScDocumentLoader( const String& rFileName,
ScDocument* pDoc = pDocShell->GetDocument();
if( pDoc )
{
- ScExtDocOptions* pExtDocOpt = pDoc->GetExtDocOptions();
+ ScExtDocOptions* pExtDocOpt = pDoc->GetExtDocOptions();
if( !pExtDocOpt )
{
pExtDocOpt = new ScExtDocOptions;
@@ -569,7 +569,7 @@ ScDocumentLoader::ScDocumentLoader( const String& rFileName,
pDocShell->DoLoad( pMedium );
- String aNew = GetOptions(*pMedium); // Optionen werden beim Laden per Dialog gesetzt
+ String aNew = GetOptions(*pMedium); // Optionen werden beim Laden per Dialog gesetzt
if (aNew.Len() && aNew != rOptions)
rOptions = aNew;
}
@@ -589,8 +589,8 @@ void ScDocumentLoader::ReleaseDocRef()
{
if ( aRef.Is() )
{
- // release reference without calling DoClose - caller must
- // have another reference to the doc and call DoClose later
+ // release reference without calling DoClose - caller must
+ // have another reference to the doc and call DoClose later
pDocShell = NULL;
pMedium = NULL;
diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx
index 1072af30c7a1..59af90ebc02d 100644
--- a/sc/source/ui/docshell/tpstat.cxx
+++ b/sc/source/ui/docshell/tpstat.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,17 +52,17 @@ SfxTabPage* __EXPORT ScDocStatPage::Create( Window *pParent, const SfxItemSet& r
//------------------------------------------------------------------------
ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet )
- : SfxTabPage( pParent, ScResId(RID_SCPAGE_STAT), rSet ),
+ : SfxTabPage( pParent, ScResId(RID_SCPAGE_STAT), rSet ),
aFlInfo ( this, ScResId( FL_INFO ) ),
- aFtTablesLbl ( this, ScResId( FT_TABLES_LBL ) ),
- aFtTables ( this, ScResId( FT_TABLES ) ),
- aFtCellsLbl ( this, ScResId( FT_CELLS_LBL ) ),
- aFtCells ( this, ScResId( FT_CELLS ) ),
- aFtPagesLbl ( this, ScResId( FT_PAGES_LBL ) ),
- aFtPages ( this, ScResId( FT_PAGES ) )
+ aFtTablesLbl ( this, ScResId( FT_TABLES_LBL ) ),
+ aFtTables ( this, ScResId( FT_TABLES ) ),
+ aFtCellsLbl ( this, ScResId( FT_CELLS_LBL ) ),
+ aFtCells ( this, ScResId( FT_CELLS ) ),
+ aFtPagesLbl ( this, ScResId( FT_PAGES_LBL ) ),
+ aFtPages ( this, ScResId( FT_PAGES ) )
{
ScDocShell* pDocSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() );
- ScDocStat aDocStat;
+ ScDocStat aDocStat;
if ( pDocSh )
pDocSh->GetDocStat( aDocStat );
@@ -70,9 +70,9 @@ ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet )
String aInfo = aFlInfo.GetText();
aInfo += aDocStat.aDocName;
aFlInfo .SetText( aInfo );
- aFtTables .SetText( String::CreateFromInt32( aDocStat.nTableCount ) );
- aFtCells .SetText( String::CreateFromInt32( aDocStat.nCellCount ) );
- aFtPages .SetText( String::CreateFromInt32( aDocStat.nPageCount ) );
+ aFtTables .SetText( String::CreateFromInt32( aDocStat.nTableCount ) );
+ aFtCells .SetText( String::CreateFromInt32( aDocStat.nCellCount ) );
+ aFtPages .SetText( String::CreateFromInt32( aDocStat.nPageCount ) );
FreeResource();
}
diff --git a/sc/source/ui/docshell/tpstat.hrc b/sc/source/ui/docshell/tpstat.hrc
index 2b57d20f1a26..67cbea380f9b 100644
--- a/sc/source/ui/docshell/tpstat.hrc
+++ b/sc/source/ui/docshell/tpstat.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,11 +26,11 @@
************************************************************************/
#include "sc.hrc"
-#define FT_TABLES 1
-#define FT_TABLES_LBL 2
-#define FT_CELLS 3
-#define FT_CELLS_LBL 4
-#define FT_PAGES 5
-#define FT_PAGES_LBL 6
+#define FT_TABLES 1
+#define FT_TABLES_LBL 2
+#define FT_CELLS 3
+#define FT_CELLS_LBL 4
+#define FT_PAGES 5
+#define FT_PAGES_LBL 6
#define FL_INFO 1
diff --git a/sc/source/ui/docshell/tpstat.src b/sc/source/ui/docshell/tpstat.src
index 7226da4642c3..b5e338ddc6a8 100644
--- a/sc/source/ui/docshell/tpstat.src
+++ b/sc/source/ui/docshell/tpstat.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
@@ -28,7 +28,7 @@
#include "tpstat.hrc"
TabPage RID_SCPAGE_STAT
{
- // HelpID = HID_DOC_STAT;
+ // HelpID = HID_DOC_STAT;
Hide = TRUE ;
Size = MAP_APPFONT ( 260 , 185 ) ;
FixedText FT_TABLES_LBL
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index 605611f2e309..e85642d9802f 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index e2f70432d679..d1ab807a14b4 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
#include <editeng/eeitem.hxx>
#include <svx/fontwork.hxx>
-//#include <svx/labdlg.hxx> CHINA001
+//#include <svx/labdlg.hxx> CHINA001
#include <svl/srchitem.hxx>
#include <svx/tabarea.hxx>
#include <svx/tabline.hxx>
@@ -113,11 +113,11 @@ void lcl_setModified( SfxObjectShell* pShell )
void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
{
- USHORT nSlot = rReq.GetSlot();
- Window* pWin = pViewData->GetActiveWin();
-// SfxViewFrame* pViewFrame = SfxViewShell::Current()->GetViewFrame(); //!!! koennte knallen
- ScDrawView* pView = pViewData->GetScDrawView();
- SdrModel* pDoc = pViewData->GetDocument()->GetDrawLayer();
+ USHORT nSlot = rReq.GetSlot();
+ Window* pWin = pViewData->GetActiveWin();
+// SfxViewFrame* pViewFrame = SfxViewShell::Current()->GetViewFrame(); //!!! koennte knallen
+ ScDrawView* pView = pViewData->GetScDrawView();
+ SdrModel* pDoc = pViewData->GetDocument()->GetDrawLayer();
const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
ULONG nMarkCount = rMarkList.GetMarkCount();
@@ -134,7 +134,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
}
break;
- case SID_TEXT_STANDARD: // Harte Textattributierung loeschen
+ case SID_TEXT_STANDARD: // Harte Textattributierung loeschen
{
SfxItemSet aEmptyAttr(GetPool(), EE_ITEMS_START, EE_ITEMS_END);
pView->SetAttributes(aEmptyAttr, TRUE);
@@ -372,24 +372,24 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin )
void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage )
{
- ScDrawView* pView = pViewData->GetScDrawView();
- BOOL bHasMarked = pView->AreObjectsMarked();
- const SdrObject* pObj = NULL;
- const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
+ ScDrawView* pView = pViewData->GetScDrawView();
+ BOOL bHasMarked = pView->AreObjectsMarked();
+ const SdrObject* pObj = NULL;
+ const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
if( rMarkList.GetMarkCount() == 1 )
pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
- SfxItemSet aNewAttr( pView->GetDefaultAttr() );
+ SfxItemSet aNewAttr( pView->GetDefaultAttr() );
if( bHasMarked )
pView->MergeAttrFromMarked( aNewAttr, FALSE );
-//CHINA001 SvxLineTabDialog* pDlg
-//CHINA001 = new SvxLineTabDialog( pViewData->GetDialogParent(),
-//CHINA001 &aNewAttr,
-//CHINA001 pViewData->GetDocument()->GetDrawLayer(),
-//CHINA001 pObj,
-//CHINA001 bHasMarked );
+//CHINA001 SvxLineTabDialog* pDlg
+//CHINA001 = new SvxLineTabDialog( pViewData->GetDialogParent(),
+//CHINA001 &aNewAttr,
+//CHINA001 pViewData->GetDocument()->GetDrawLayer(),
+//CHINA001 pObj,
+//CHINA001 bHasMarked );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet Factory fail!");//CHINA001
SfxAbstractTabDialog * pDlg = pFact->CreateSvxLineTabDialog( pViewData->GetDialogParent(),
@@ -417,18 +417,18 @@ void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage )
void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage )
{
- ScDrawView* pView = pViewData->GetScDrawView();
- BOOL bHasMarked = pView->AreObjectsMarked();
+ ScDrawView* pView = pViewData->GetScDrawView();
+ BOOL bHasMarked = pView->AreObjectsMarked();
- SfxItemSet aNewAttr( pView->GetDefaultAttr() );
+ SfxItemSet aNewAttr( pView->GetDefaultAttr() );
if( bHasMarked )
pView->MergeAttrFromMarked( aNewAttr, FALSE );
//CHINA001 SvxAreaTabDialog* pDlg
- //CHINA001 = new SvxAreaTabDialog( pViewData->GetDialogParent(),
-//CHINA001 &aNewAttr,
-//CHINA001 pViewData->GetDocument()->GetDrawLayer(),
-//CHINA001 pView );
+ //CHINA001 = new SvxAreaTabDialog( pViewData->GetDialogParent(),
+//CHINA001 &aNewAttr,
+//CHINA001 pViewData->GetDocument()->GetDrawLayer(),
+//CHINA001 pView );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet Factory fail!");//CHINA001
@@ -464,9 +464,9 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage )
void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq, USHORT /* nTabPage */ )
{
- ScDrawView* pView = pViewData->GetScDrawView();
- BOOL bHasMarked = pView->AreObjectsMarked();
- SfxItemSet aNewAttr ( pView->GetDefaultAttr() );
+ ScDrawView* pView = pViewData->GetScDrawView();
+ BOOL bHasMarked = pView->AreObjectsMarked();
+ SfxItemSet aNewAttr ( pView->GetDefaultAttr() );
if( bHasMarked )
pView->MergeAttrFromMarked( aNewAttr, FALSE );
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index 7da571fc05a7..7d1392ba0b93 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include <svx/svdoole2.hxx>
#include <svx/svdocapt.hxx>
-USHORT ScGetFontWorkId(); // in drtxtob
+USHORT ScGetFontWorkId(); // in drtxtob
using namespace com::sun::star;
@@ -82,10 +82,10 @@ ScDrawShell::~ScDrawShell()
{
}
-void ScDrawShell::GetState( SfxItemSet& rSet ) // Zustaende / Toggles
+void ScDrawShell::GetState( SfxItemSet& rSet ) // Zustaende / Toggles
{
- ScDrawView* pView = pViewData->GetScDrawView();
- SdrDragMode eMode = pView->GetDragMode();
+ ScDrawView* pView = pViewData->GetScDrawView();
+ SdrDragMode eMode = pView->GetDragMode();
rSet.Put( SfxBoolItem( SID_OBJECT_ROTATE, eMode == SDRDRAG_ROTATE ) );
rSet.Put( SfxBoolItem( SID_OBJECT_MIRROR, eMode == SDRDRAG_MIRROR ) );
@@ -132,12 +132,12 @@ void ScDrawShell::GetState( SfxItemSet& rSet ) // Zustaende / Toggles
}
}
-void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disablen
+void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disablen
{
ScDrawView* pView = pViewData->GetScDrawView();
- // #111711# call IsMirrorAllowed first to make sure ForcePossibilities (and thus CheckMarked)
- // is called before GetMarkCount, so the nMarkCount value is valid for the rest of this method.
+ // #111711# call IsMirrorAllowed first to make sure ForcePossibilities (and thus CheckMarked)
+ // is called before GetMarkCount, so the nMarkCount value is valid for the rest of this method.
if (!pView->IsMirrorAllowed(TRUE,TRUE))
{
rSet.DisableItem( SID_MIRROR_HORIZONTAL );
@@ -156,10 +156,10 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl
if ( !pView->IsGroupEntered() )
rSet.DisableItem( SID_LEAVE_GROUP );
- if ( nMarkCount <= 1 ) // nichts oder nur ein Objekt selektiert
+ if ( nMarkCount <= 1 ) // nichts oder nur ein Objekt selektiert
{
- // Ausrichtung
- rSet.DisableItem( SID_OBJECT_ALIGN_LEFT ); // keine Ausrichtung an der Seite
+ // Ausrichtung
+ rSet.DisableItem( SID_OBJECT_ALIGN_LEFT ); // keine Ausrichtung an der Seite
rSet.DisableItem( SID_OBJECT_ALIGN_CENTER );
rSet.DisableItem( SID_OBJECT_ALIGN_RIGHT );
rSet.DisableItem( SID_OBJECT_ALIGN_UP );
@@ -249,19 +249,19 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl
rSet.DisableItem( SID_TITLE_DESCRIPTION_OBJECT );
}
- if ( !nMarkCount ) // nichts selektiert
+ if ( !nMarkCount ) // nichts selektiert
{
- // Anordnung
+ // Anordnung
rSet.DisableItem( SID_FRAME_UP );
rSet.DisableItem( SID_FRAME_DOWN );
rSet.DisableItem( SID_FRAME_TO_TOP );
rSet.DisableItem( SID_FRAME_TO_BOTTOM );
- // Clipboard / loeschen
+ // Clipboard / loeschen
rSet.DisableItem( SID_DELETE );
rSet.DisableItem( SID_DELETE_CONTENTS );
rSet.DisableItem( SID_CUT );
rSet.DisableItem( SID_COPY );
- // sonstiges
+ // sonstiges
rSet.DisableItem( SID_ANCHOR_TOGGLE );
rSet.DisableItem( SID_ORIGINALSIZE );
rSet.DisableItem( SID_ATTR_TRANSFORM );
@@ -283,16 +283,16 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl
}
//
-// Attribute fuer Drawing-Objekte
+// Attribute fuer Drawing-Objekte
//
void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet )
{
- Point aMousePos = pViewData->GetMousePosPixel();
- Window* pWindow = pViewData->GetActiveWin();
- ScDrawView* pDrView = pViewData->GetScDrawView();
- Point aPos = pWindow->PixelToLogic(aMousePos);
- BOOL bHasMarked = pDrView->AreObjectsMarked();
+ Point aMousePos = pViewData->GetMousePosPixel();
+ Window* pWindow = pViewData->GetActiveWin();
+ ScDrawView* pDrView = pViewData->GetScDrawView();
+ Point aPos = pWindow->PixelToLogic(aMousePos);
+ BOOL bHasMarked = pDrView->AreObjectsMarked();
if( bHasMarked )
{
@@ -362,15 +362,15 @@ void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet )
void ScDrawShell::GetAttrFuncState(SfxItemSet &rSet)
{
- // Dialoge fuer Draw-Attribute disablen, wenn noetig
+ // Dialoge fuer Draw-Attribute disablen, wenn noetig
- ScDrawView* pDrView = pViewData->GetScDrawView();
+ ScDrawView* pDrView = pViewData->GetScDrawView();
SfxItemSet aViewSet = pDrView->GetAttrFromMarked(FALSE);
if ( aViewSet.GetItemState( XATTR_LINESTYLE ) == SFX_ITEM_DEFAULT )
{
rSet.DisableItem( SID_ATTRIBUTES_LINE );
- rSet.DisableItem( SID_ATTR_LINEEND_STYLE ); // Tbx-Controller
+ rSet.DisableItem( SID_ATTR_LINEEND_STYLE ); // Tbx-Controller
}
if ( aViewSet.GetItemState( XATTR_FILLSTYLE ) == SFX_ITEM_DEFAULT )
diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx
index 45b26584f29a..e613437d41ab 100644
--- a/sc/source/ui/drawfunc/drawsh4.cxx
+++ b/sc/source/ui/drawfunc/drawsh4.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +51,11 @@
void ScDrawShell::GetFormTextState(SfxItemSet& rSet)
{
- const SdrObject* pObj = NULL;
- SvxFontWorkDialog* pDlg = NULL;
- ScDrawView* pDrView = pViewData->GetScDrawView();
- const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList();
- USHORT nId = SvxFontWorkChildWindow::GetChildWindowId();
+ const SdrObject* pObj = NULL;
+ SvxFontWorkDialog* pDlg = NULL;
+ ScDrawView* pDrView = pViewData->GetScDrawView();
+ const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList();
+ USHORT nId = SvxFontWorkChildWindow::GetChildWindowId();
SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame();
if ( pViewFrm->HasChildWindow(nId) )
@@ -92,7 +92,7 @@ void ScDrawShell::GetFormTextState(SfxItemSet& rSet)
if ( pDocSh )
{
const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE );
- XColorTable* pColorTable = NULL;
+ XColorTable* pColorTable = NULL;
if ( pItem )
pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index e79097ef8874..2908af8ddfd2 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -536,8 +536,8 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
if(OBJ_GRAF == nObjType && 0L == aName.Len())
{
- // graphics objects must have names
- // (all graphics are supposed to be in the navigator)
+ // graphics objects must have names
+ // (all graphics are supposed to be in the navigator)
ScDrawLayer* pModel = pViewData->GetDocument()->GetDrawLayer();
if(pModel)
@@ -546,9 +546,9 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
}
}
- // An undo action for renaming is missing in svdraw (99363).
- // For OLE objects (which can be identified using the persist name),
- // ScUndoRenameObject can be used until there is a common action for all objects.
+ // An undo action for renaming is missing in svdraw (99363).
+ // For OLE objects (which can be identified using the persist name),
+ // ScUndoRenameObject can be used until there is a common action for all objects.
if(OBJ_OLE2 == nObjType)
{
const String aPersistName = static_cast<SdrOle2Obj*>(pSelected)->GetPersistName();
@@ -671,7 +671,7 @@ IMPL_LINK( ScDrawShell, NameObjectHdl, AbstractSvxNameDialog*, pDialog )
}
}
- return 1; // name is valid
+ return 1; // name is valid
}
//------------------------------------------------------------------
diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx
index 44b88738430a..3a83f18a5db4 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/drawfunc/drformsh.src b/sc/source/ui/drawfunc/drformsh.src
index 65e98eea7b2c..75100da513a2 100644
--- a/sc/source/ui/drawfunc/drformsh.src
+++ b/sc/source/ui/drawfunc/drformsh.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,7 +29,7 @@
#include "submenu.hrc"
#include <svx/globlmn.hrc>
//
- // Defines -------------------------------------------------------------------------------
+ // Defines -------------------------------------------------------------------------------
//
#define MN_LAYER\
ToolBoxItem\
@@ -133,7 +133,7 @@
};\
};
-#define MN_ALIGNSUB \
+#define MN_ALIGNSUB \
MenuItem\
{\
Identifier = SID_OBJECT_ALIGN ; \
@@ -176,7 +176,7 @@
};
- // Popup-Menues ---------------------------------------------------------------------
+ // Popup-Menues ---------------------------------------------------------------------
//
String RID_POPUP_DRAWFORM
{
@@ -184,7 +184,7 @@ String RID_POPUP_DRAWFORM
Text [ en-US ] = "Popup menu for form objects";
};
//
- // Popup-Menue fuer (Uno-) Controls
+ // Popup-Menue fuer (Uno-) Controls
//
Menu RID_POPUP_DRAWFORM
{
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index a5159d8a8043..7373142a9b1e 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -126,7 +126,7 @@ ScDrawTextObjectBar::ScDrawTextObjectBar(ScViewData* pData) :
{
SetPool( pViewData->GetScDrawView()->GetDefaultAttr().GetPool() );
- // UndoManager wird beim Umschalten in den Edit-Modus umgesetzt...
+ // UndoManager wird beim Umschalten in den Edit-Modus umgesetzt...
SfxUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager();
SetUndoManager( pMgr );
if ( !pViewData->GetDocument()->IsUndoEnabled() )
@@ -154,7 +154,7 @@ __EXPORT ScDrawTextObjectBar::~ScDrawTextObjectBar()
//========================================================================
//
-// Funktionen
+// Funktionen
//
//========================================================================
@@ -166,7 +166,7 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq )
if (!pOutView || !pOutliner)
{
- ExecuteGlobal( rReq ); // auf ganze Objekte
+ ExecuteGlobal( rReq ); // auf ganze Objekte
return;
}
@@ -249,14 +249,14 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq )
else
aNewItem = rItem;
}
- else
+ else
ScViewUtil::ExecuteCharMap( rItem, *pViewData->GetViewShell()->GetViewFrame(), aNewItem, aString );
if ( aString.Len() )
{
SfxItemSet aSet( pOutliner->GetEmptyItemSet() );
aSet.Put( aNewItem );
- // SetAttribs an der View selektiert ein Wort, wenn nichts selektiert ist
+ // SetAttribs an der View selektiert ein Wort, wenn nichts selektiert ist
pOutView->GetOutliner()->QuickSetAttribs( aSet, pOutView->GetSelection() );
pOutView->InsertText(aString);
}
@@ -272,21 +272,21 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq )
if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, TRUE, &pItem ) == SFX_ITEM_SET )
{
const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem;
- const String& rName = pHyper->GetName();
- const String& rURL = pHyper->GetURL();
- const String& rTarget = pHyper->GetTargetFrame();
+ const String& rName = pHyper->GetName();
+ const String& rURL = pHyper->GetURL();
+ const String& rTarget = pHyper->GetTargetFrame();
SvxLinkInsertMode eMode = pHyper->GetInsertMode();
BOOL bDone = FALSE;
if ( pOutView && ( eMode == HLINK_DEFAULT || eMode == HLINK_FIELD ) )
{
- const SvxFieldItem* pFieldItem = pOutView->GetFieldAtSelection();
+ const SvxFieldItem* pFieldItem = pOutView->GetFieldAtSelection();
if (pFieldItem)
{
const SvxFieldData* pField = pFieldItem->GetField();
if ( pField && pField->ISA(SvxURLField) )
{
- // altes Feld selektieren
+ // altes Feld selektieren
ESelection aSel = pOutView->GetSelection();
aSel.Adjust();
@@ -296,19 +296,19 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq )
}
}
- // neues Feld einfuegen
+ // neues Feld einfuegen
SvxURLField aURLField( rURL, rName, SVXURLFORMAT_REPR );
aURLField.SetTargetFrame( rTarget );
SvxFieldItem aURLItem( aURLField, EE_FEATURE_FIELD );
pOutView->InsertField( aURLItem );
- // select new field
+ // select new field
ESelection aSel = pOutView->GetSelection();
if ( aSel.nStartPos == aSel.nEndPos && aSel.nStartPos > 0 )
{
- // Cursor is behind the inserted field -> extend selection to the left
+ // Cursor is behind the inserted field -> extend selection to the left
--aSel.nStartPos;
pOutView->SetSelection( aSel );
@@ -318,9 +318,9 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq )
}
if (!bDone)
- ExecuteGlobal( rReq ); // normal an der View
+ ExecuteGlobal( rReq ); // normal an der View
- // InsertURL an der ViewShell schaltet bei "Text" die DrawShell ab !!!
+ // InsertURL an der ViewShell schaltet bei "Text" die DrawShell ab !!!
}
}
break;
@@ -356,7 +356,7 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq )
else
#endif
{
- pView->ScEndTextEdit(); // end text edit before switching direction
+ pView->ScEndTextEdit(); // end text edit before switching direction
ExecuteGlobal( rReq );
// restore consistent state between shells and functions:
pViewData->GetDispatcher().Execute(SID_OBJECT_SELECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
@@ -372,7 +372,7 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq )
ExecuteGlobal( rReq );
break;
#endif
-
+
case SID_THES:
{
String aReplaceText;
@@ -382,14 +382,14 @@ void __EXPORT ScDrawTextObjectBar::Execute( SfxRequest &rReq )
if (aReplaceText.Len() > 0)
ReplaceTextWithSynonym( pOutView->GetEditView(), aReplaceText );
}
- break;
-
+ break;
+
case SID_THESAURUS:
{
pOutView->StartThesaurus();
}
- break;
-
+ break;
+
}
}
@@ -406,7 +406,7 @@ void __EXPORT ScDrawTextObjectBar::GetState( SfxItemSet& rSet )
}
if ( bDisableFontWork )
- rSet.DisableItem( SID_FONTWORK );
+ rSet.DisableItem( SID_FONTWORK );
else
rSet.Put(SfxBoolItem(SID_FONTWORK, bHasFontWork));
@@ -418,7 +418,7 @@ void __EXPORT ScDrawTextObjectBar::GetState( SfxItemSet& rSet )
if ( pOutView )
{
BOOL bField = FALSE;
- const SvxFieldItem* pFieldItem = pOutView->GetFieldAtSelection();
+ const SvxFieldItem* pFieldItem = pOutView->GetFieldAtSelection();
if (pFieldItem)
{
const SvxFieldData* pField = pFieldItem->GetField();
@@ -482,12 +482,12 @@ void __EXPORT ScDrawTextObjectBar::GetState( SfxItemSet& rSet )
}
}
- if ( rSet.GetItemState( SID_THES ) != SFX_ITEM_UNKNOWN ||
+ if ( rSet.GetItemState( SID_THES ) != SFX_ITEM_UNKNOWN ||
rSet.GetItemState( SID_THESAURUS ) != SFX_ITEM_UNKNOWN )
{
SdrView * pView = pViewData->GetScDrawView();
OutlinerView* pOutView = pView->GetTextEditOutlinerView();
-
+
String aStatusVal;
LanguageType nLang = LANGUAGE_NONE;
bool bIsLookUpWord = false;
@@ -504,7 +504,7 @@ void __EXPORT ScDrawTextObjectBar::GetState( SfxItemSet& rSet )
rSet.DisableItem( SID_THES );
if (!bCanDoThesaurus)
rSet.DisableItem( SID_THESAURUS );
- }
+ }
}
IMPL_LINK( ScDrawTextObjectBar, ClipboardChanged, TransferableDataHelper*, pDataHelper )
@@ -578,13 +578,13 @@ void __EXPORT ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet )
//========================================================================
//
-// Attribute
+// Attribute
//
//========================================================================
void __EXPORT ScDrawTextObjectBar::ExecuteToggle( SfxRequest &rReq )
{
- // Unterstreichung
+ // Unterstreichung
SdrView* pView = pViewData->GetScDrawView();
@@ -595,7 +595,7 @@ void __EXPORT ScDrawTextObjectBar::ExecuteToggle( SfxRequest &rReq )
SfxItemSet aViewAttr(pView->GetModel()->GetItemPool());
pView->GetAttributes(aViewAttr);
- // Unterstreichung
+ // Unterstreichung
FontUnderline eOld = ((const SvxUnderlineItem&) aViewAttr.
Get(EE_CHAR_UNDERLINE)).GetLineStyle();
FontUnderline eNew = eOld;
@@ -625,7 +625,7 @@ void __EXPORT ScDrawTextObjectBar::ExecuteToggle( SfxRequest &rReq )
void lcl_RemoveFields( OutlinerView& rOutView )
{
- //! Outliner should have RemoveFields with a selection
+ //! Outliner should have RemoveFields with a selection
Outliner* pOutliner = rOutView.GetOutliner();
if (!pOutliner) return;
@@ -638,7 +638,7 @@ void lcl_RemoveFields( OutlinerView& rOutView )
BOOL bUpdate = pOutliner->GetUpdateMode();
BOOL bChanged = FALSE;
- //! GetPortions and GetAttribs should be const!
+ //! GetPortions and GetAttribs should be const!
EditEngine& rEditEng = (EditEngine&)pOutliner->GetEditEngine();
ULONG nParCount = pOutliner->GetParagraphCount();
@@ -647,7 +647,7 @@ void lcl_RemoveFields( OutlinerView& rOutView )
{
SvUShorts aPortions;
rEditEng.GetPortions( (USHORT)nPar, aPortions );
- //! GetPortions should use xub_StrLen instead of USHORT
+ //! GetPortions should use xub_StrLen instead of USHORT
for ( USHORT nPos = aPortions.Count(); nPos; )
{
@@ -690,30 +690,30 @@ void lcl_RemoveFields( OutlinerView& rOutView )
pOutliner->SetUpdateMode( TRUE );
}
- if ( aOldSel.IsEqual( aSel ) ) // aSel is adjusted
+ if ( aOldSel.IsEqual( aSel ) ) // aSel is adjusted
aOldSel.nEndPos = nNewEnd;
else
- aOldSel.nStartPos = nNewEnd; // if aOldSel is backwards
+ aOldSel.nStartPos = nNewEnd; // if aOldSel is backwards
rOutView.SetSelection( aOldSel );
}
void __EXPORT ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
{
- SdrView* pView = pViewData->GetScDrawView();
- const SfxItemSet* pArgs = rReq.GetArgs();
- USHORT nSlot = rReq.GetSlot();
+ SdrView* pView = pViewData->GetScDrawView();
+ const SfxItemSet* pArgs = rReq.GetArgs();
+ USHORT nSlot = rReq.GetSlot();
BOOL bArgsInReq = ( pArgs != NULL );
if ( !bArgsInReq )
{
SfxItemSet aEditAttr(pView->GetModel()->GetItemPool());
pView->GetAttributes(aEditAttr);
- SfxItemSet aNewAttr( *aEditAttr.GetPool(), aEditAttr.GetRanges() );
- BOOL bDone = TRUE;
+ SfxItemSet aNewAttr( *aEditAttr.GetPool(), aEditAttr.GetRanges() );
+ BOOL bDone = TRUE;
switch ( nSlot )
{
- case SID_TEXT_STANDARD: // Harte Textattributierung loeschen
+ case SID_TEXT_STANDARD: // Harte Textattributierung loeschen
{
OutlinerView* pOutView = pView->IsTextEdit() ?
pView->GetTextEditOutlinerView() : NULL;
@@ -735,8 +735,8 @@ void __EXPORT ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
}
break;
- case SID_CHAR_DLG: // Dialog-Button
- case SID_ATTR_CHAR_FONT: // Controller nicht angezeigt
+ case SID_CHAR_DLG: // Dialog-Button
+ case SID_ATTR_CHAR_FONT: // Controller nicht angezeigt
case SID_ATTR_CHAR_FONTHEIGHT:
bDone = ExecuteCharDlg( aEditAttr, aNewAttr );
break;
@@ -903,7 +903,7 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
// issue 21255 - Notes now support rich text formatting.
}
- SvtLanguageOptions aLangOpt;
+ SvtLanguageOptions aLangOpt;
BOOL bDisableCTLFont = !aLangOpt.IsCTLFontEnabled();
BOOL bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled();
@@ -911,11 +911,11 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
SfxItemSet aAttrSet(pView->GetModel()->GetItemPool());
pView->GetAttributes(aAttrSet);
- // direkte Attribute
+ // direkte Attribute
rDestSet.Put( aAttrSet );
- // choose font info according to selection script type
+ // choose font info according to selection script type
USHORT nScript = pView->GetScriptType();
@@ -939,7 +939,7 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
if ( rDestSet.GetItemState( EE_CHAR_ITALIC ) != SFX_ITEM_UNKNOWN )
ScViewUtil::PutItemScript( rDestSet, aAttrSet, EE_CHAR_ITALIC, nScript );
- // Ausrichtung
+ // Ausrichtung
SvxAdjust eAdj = ((const SvxAdjustItem&)aAttrSet.Get(EE_PARA_JUST)).GetAdjust();
switch( eAdj )
@@ -967,7 +967,7 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
rDestSet.Put( SfxBoolItem( SID_ALIGN_ANY_RIGHT, eAdj == SVX_ADJUST_RIGHT ) );
rDestSet.Put( SfxBoolItem( SID_ALIGN_ANY_JUSTIFIED, eAdj == SVX_ADJUST_BLOCK ) );
- // Zeilenabstand
+ // Zeilenabstand
USHORT nLineSpace = (USHORT)
((const SvxLineSpacingItem&)aAttrSet.
@@ -985,7 +985,7 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
break;
}
- // hoch-/tiefgestellt
+ // hoch-/tiefgestellt
SvxEscapement eEsc = (SvxEscapement) ( (const SvxEscapementItem&)
aAttrSet.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue();
@@ -994,7 +994,7 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
else if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT )
rDestSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, TRUE ) );
- // Unterstreichung
+ // Unterstreichung
SfxItemState eState = aAttrSet.GetItemState( EE_CHAR_UNDERLINE, TRUE );
if ( eState == SFX_ITEM_DONTCARE )
@@ -1011,16 +1011,16 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
USHORT nId = SID_ULINE_VAL_NONE;
switch (eUnderline)
{
- case UNDERLINE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break;
- case UNDERLINE_DOUBLE: nId = SID_ULINE_VAL_DOUBLE; break;
- case UNDERLINE_DOTTED: nId = SID_ULINE_VAL_DOTTED; break;
+ case UNDERLINE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break;
+ case UNDERLINE_DOUBLE: nId = SID_ULINE_VAL_DOUBLE; break;
+ case UNDERLINE_DOTTED: nId = SID_ULINE_VAL_DOTTED; break;
default:
break;
}
rDestSet.Put( SfxBoolItem( nId, TRUE ) );
}
- // horizontal / vertical
+ // horizontal / vertical
BOOL bLeftToRight = TRUE;
@@ -1044,11 +1044,11 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
rDestSet.Put( SfxBoolItem( SID_TEXTDIRECTION_TOP_TO_BOTTOM, !bLeftToRight ) );
}
- // left-to-right or right-to-left
+ // left-to-right or right-to-left
if ( !bLeftToRight || bDisableCTLFont )
{
- // disabled if vertical
+ // disabled if vertical
rDestSet.DisableItem( SID_ATTR_PARA_LEFT_TO_RIGHT );
rDestSet.DisableItem( SID_ATTR_PARA_RIGHT_TO_LEFT );
}
@@ -1063,7 +1063,7 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet )
aAttrSet.Get( EE_PARA_WRITINGDIR )).GetValue();
if ( eAttrDir == FRMDIR_ENVIRONMENT )
{
- // get "environment" direction from page style
+ // get "environment" direction from page style
if ( pViewData->GetDocument()->GetEditTextDirection( pViewData->GetTabNo() ) == EE_HTEXTDIR_R2L )
eAttrDir = FRMDIR_HORI_RIGHT_TOP;
else
@@ -1083,12 +1083,12 @@ void ScDrawTextObjectBar::ExecuteTrans( SfxRequest& rReq )
OutlinerView* pOutView = pView->GetTextEditOutlinerView();
if ( pOutView )
{
- // change selected text in object
+ // change selected text in object
pOutView->TransliterateText( nType );
}
else
{
- //! apply to whole objects?
+ //! apply to whole objects?
}
}
}
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx
index 61fbf3d0f96e..2a06767d5eef 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +59,9 @@
BOOL ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
SfxItemSet& rOutSet )
{
-//CHINA001 ScCharDlg* pDlg = new ScCharDlg( pViewData->GetDialogParent(),
-//CHINA001 &rArgs,
-//CHINA001 pViewData->GetSfxDocShell() );
+//CHINA001 ScCharDlg* pDlg = new ScCharDlg( pViewData->GetDialogParent(),
+//CHINA001 &rArgs,
+//CHINA001 pViewData->GetSfxDocShell() );
//CHINA001
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -106,8 +106,8 @@ BOOL ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& rArgs,
aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) );
aNewAttr.Put( SvxOrphansItem( 0, SID_ATTR_PARA_ORPHANS) );
-//CHINA001 ScParagraphDlg* pDlg = new ScParagraphDlg( pViewData->GetDialogParent(),
-//CHINA001 &aNewAttr );
+//CHINA001 ScParagraphDlg* pDlg = new ScParagraphDlg( pViewData->GetDialogParent(),
+//CHINA001 &aNewAttr );
//CHINA001
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -135,13 +135,13 @@ void ScDrawTextObjectBar::ExecutePasteContents( SfxRequest & /* rReq */ )
SfxAbstractPasteDialog* pDlg = pFact->CreatePasteDialog( pViewData->GetDialogParent() );
pDlg->Insert( SOT_FORMAT_STRING, EMPTY_STRING );
- pDlg->Insert( SOT_FORMAT_RTF, EMPTY_STRING );
+ pDlg->Insert( SOT_FORMAT_RTF, EMPTY_STRING );
TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) );
ULONG nFormat = pDlg->GetFormat( aDataHelper.GetTransferable() );
- //! test if outliner view is still valid
+ //! test if outliner view is still valid
if (nFormat > 0)
{
diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx
index 27f1a3dbb77f..7f21071b5d2d 100644
--- a/sc/source/ui/drawfunc/drtxtob2.cxx
+++ b/sc/source/ui/drawfunc/drtxtob2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +67,12 @@ BOOL ScDrawTextObjectBar::IsNoteEdit()
return ScDrawLayer::IsNoteCaption( pViewData->GetView()->GetSdrView()->GetTextEditObject() );
}
-// wenn kein Text editiert wird, Funktionen wie in drawsh
+// wenn kein Text editiert wird, Funktionen wie in drawsh
void __EXPORT ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq )
{
- ScTabView* pTabView = pViewData->GetView();
- ScDrawView* pView = pTabView->GetScDrawView();
+ ScTabView* pTabView = pViewData->GetView();
+ ScDrawView* pView = pTabView->GetScDrawView();
USHORT nSlot = rReq.GetSlot();
switch ( nSlot )
@@ -92,9 +92,9 @@ void __EXPORT ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq )
case SID_CLIPBOARD_FORMAT_ITEMS:
case SID_HYPERLINK_SETLINK:
{
- // cell methods are at cell shell, which is not available if
- // ScDrawTextObjectBar is active
- //! move paste etc. to view shell?
+ // cell methods are at cell shell, which is not available if
+ // ScDrawTextObjectBar is active
+ //! move paste etc. to view shell?
}
break;
@@ -111,7 +111,7 @@ void __EXPORT ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq )
com::sun::star::text::WritingMode_LR_TB : com::sun::star::text::WritingMode_TB_RL,
SDRATTR_TEXTDIRECTION ) );
pView->SetAttributes( aAttr );
- pViewData->GetScDrawView()->InvalidateDrawTextAttrs(); // Bidi slots may be disabled
+ pViewData->GetScDrawView()->InvalidateDrawTextAttrs(); // Bidi slots may be disabled
rReq.Done( aAttr );
}
break;
@@ -134,9 +134,9 @@ void __EXPORT ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq )
void ScDrawTextObjectBar::GetGlobalClipState( SfxItemSet& rSet )
{
- // cell methods are at cell shell, which is not available if
- // ScDrawTextObjectBar is active -> disable everything
- //! move paste etc. to view shell?
+ // cell methods are at cell shell, which is not available if
+ // ScDrawTextObjectBar is active -> disable everything
+ //! move paste etc. to view shell?
SfxWhichIter aIter(rSet);
USHORT nWhich = aIter.FirstWhich();
@@ -149,8 +149,8 @@ void ScDrawTextObjectBar::GetGlobalClipState( SfxItemSet& rSet )
void __EXPORT ScDrawTextObjectBar::ExecuteExtra( SfxRequest &rReq )
{
- ScTabView* pTabView = pViewData->GetView();
- ScDrawView* pView = pTabView->GetScDrawView();
+ ScTabView* pTabView = pViewData->GetView();
+ ScDrawView* pView = pTabView->GetScDrawView();
USHORT nSlot = rReq.GetSlot();
switch ( nSlot )
@@ -189,7 +189,7 @@ void __EXPORT ScDrawTextObjectBar::ExecuteExtra( SfxRequest &rReq )
EE_PARA_JUST ) );
pView->SetAttributes( aAttr );
pViewData->GetScDrawView()->InvalidateDrawTextAttrs();
- rReq.Done(); //! Done(aAttr) ?
+ rReq.Done(); //! Done(aAttr) ?
}
break;
@@ -198,9 +198,9 @@ void __EXPORT ScDrawTextObjectBar::ExecuteExtra( SfxRequest &rReq )
void ScDrawTextObjectBar::ExecFormText(SfxRequest& rReq)
{
- ScTabView* pTabView = pViewData->GetView();
- ScDrawView* pDrView = pTabView->GetScDrawView();
- const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList();
+ ScTabView* pTabView = pViewData->GetView();
+ ScDrawView* pDrView = pTabView->GetScDrawView();
+ const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList();
if ( rMarkList.GetMarkCount() == 1 && rReq.GetArgs() )
{
@@ -210,15 +210,15 @@ void ScDrawTextObjectBar::ExecFormText(SfxRequest& rReq)
if ( pDrView->IsTextEdit() )
pDrView->ScEndTextEdit();
- if ( SFX_ITEM_SET ==
+ if ( SFX_ITEM_SET ==
rSet.GetItemState(XATTR_FORMTXTSTDFORM, TRUE, &pItem)
&& XFTFORM_NONE !=
((const XFormTextStdFormItem*) pItem)->GetValue() )
{
- USHORT nId = SvxFontWorkChildWindow::GetChildWindowId();
- SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame();
- SvxFontWorkDialog* pDlg = (SvxFontWorkDialog*)
+ USHORT nId = SvxFontWorkChildWindow::GetChildWindowId();
+ SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame();
+ SvxFontWorkDialog* pDlg = (SvxFontWorkDialog*)
(pViewFrm->
GetChildWindow(nId)->GetWindow());
@@ -234,11 +234,11 @@ void ScDrawTextObjectBar::ExecFormText(SfxRequest& rReq)
void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet)
{
- const SdrObject* pObj = NULL;
- SvxFontWorkDialog* pDlg = NULL;
- ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
- const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList();
- USHORT nId = SvxFontWorkChildWindow::GetChildWindowId();
+ const SdrObject* pObj = NULL;
+ SvxFontWorkDialog* pDlg = NULL;
+ ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
+ const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList();
+ USHORT nId = SvxFontWorkChildWindow::GetChildWindowId();
SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame();
if ( pViewFrm->HasChildWindow(nId) )
@@ -275,7 +275,7 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet)
if ( pDocSh )
{
const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE );
- XColorTable* pColorTable = NULL;
+ XColorTable* pColorTable = NULL;
if ( pItem )
pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable();
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx
index 20daacffac0e..9af9aad2242c 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index 69a47f0584d0..96d1eb9e1edb 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -239,7 +239,7 @@ void FuConstCustomShape::SetAttributes( SdrObject* pObj )
if( pSourceObj )
{
const SfxItemSet& rSource = pSourceObj->GetMergedItemSet();
- SfxItemSet aDest( pObj->GetModel()->GetItemPool(), // ranges from SdrAttrObj
+ SfxItemSet aDest( pObj->GetModel()->GetItemPool(), // ranges from SdrAttrObj
SDRATTR_START, SDRATTR_SHADOW_LAST,
SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST,
SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION,
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx
index 440f49f41326..47c2c923406e 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/point/b2dpoint.hxx>
-// Pixelabstand zum Schliessen von Freihand-Zeichnungen
+// Pixelabstand zum Schliessen von Freihand-Zeichnungen
#ifndef CLOSE_PIXDIST
#define CLOSE_PIXDIST 5
#endif
@@ -134,7 +134,7 @@ BOOL __EXPORT FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt)
if (aVEvt.eEvent == SDREVENT_ENDCREATE)
{
bReturn = TRUE;
- bSimple = TRUE; // Doppelklick nicht weiterreichen
+ bSimple = TRUE; // Doppelklick nicht weiterreichen
}
BOOL bParent;
@@ -272,9 +272,9 @@ SdrObject* FuConstPolygon::CreateDefaultObject(const sal_uInt16 nID, const Recta
case SID_DRAW_BEZIER_NOFILL:
{
basegfx::B2DPolygon aInnerPoly;
-
+
aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left(), rRectangle.Bottom()));
-
+
const basegfx::B2DPoint aCenterBottom(rRectangle.Center().X(), rRectangle.Bottom());
aInnerPoly.appendBezierSegment(
aCenterBottom,
@@ -300,12 +300,12 @@ SdrObject* FuConstPolygon::CreateDefaultObject(const sal_uInt16 nID, const Recta
basegfx::B2DPoint(rRectangle.Left(), rRectangle.Top()),
basegfx::B2DPoint(rRectangle.Center().X(), rRectangle.Top()),
basegfx::B2DPoint(rRectangle.Center().X(), rRectangle.Center().Y()));
-
+
aInnerPoly.appendBezierSegment(
basegfx::B2DPoint(rRectangle.Center().X(), rRectangle.Bottom()),
basegfx::B2DPoint(rRectangle.Right(), rRectangle.Bottom()),
basegfx::B2DPoint(rRectangle.Right(), rRectangle.Top()));
-
+
aPoly.append(aInnerPoly);
break;
}
@@ -315,7 +315,7 @@ SdrObject* FuConstPolygon::CreateDefaultObject(const sal_uInt16 nID, const Recta
basegfx::B2DPolygon aInnerPoly;
const sal_Int32 nWdt(rRectangle.GetWidth());
const sal_Int32 nHgt(rRectangle.GetHeight());
-
+
aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left(), rRectangle.Bottom()));
aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left() + (nWdt * 30) / 100, rRectangle.Top() + (nHgt * 70) / 100));
aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left(), rRectangle.Top() + (nHgt * 15) / 100));
@@ -324,7 +324,7 @@ SdrObject* FuConstPolygon::CreateDefaultObject(const sal_uInt16 nID, const Recta
aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left() + (nWdt * 80) / 100, rRectangle.Top() + (nHgt * 50) / 100));
aInnerPoly.append(basegfx::B2DPoint(rRectangle.Left() + (nWdt * 80) / 100, rRectangle.Top() + (nHgt * 75) / 100));
aInnerPoly.append(basegfx::B2DPoint(rRectangle.Bottom(), rRectangle.Right()));
-
+
if(SID_DRAW_POLYGON_NOFILL == nID)
{
aInnerPoly.append(basegfx::B2DPoint(rRectangle.Center().X(), rRectangle.Bottom()));
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index 733c6fe08b45..61a35df310d1 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -131,13 +131,13 @@ BOOL __EXPORT FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
if (aSfxRequest.GetSlot() == SID_DRAW_CAPTION_VERTICAL)
{
- // set vertical flag for caption object
+ // set vertical flag for caption object
const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
if (rMarkList.GetMark(0))
{
SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
- // create OutlinerParaObject now so it can be set to vertical
+ // create OutlinerParaObject now so it can be set to vertical
if ( pObj->ISA(SdrTextObj) )
((SdrTextObj*)pObj)->ForceOutlinerParaObject();
OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject();
@@ -271,7 +271,7 @@ SdrObject* FuConstRectangle::CreateDefaultObject(const sal_uInt16 nID, const Rec
sal_Bool bIsVertical(SID_DRAW_CAPTION_VERTICAL == nID);
((SdrTextObj*)pObj)->SetVerticalWriting(bIsVertical);
-
+
if(bIsVertical)
{
SfxItemSet aSet(pObj->GetMergedItemSet());
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx
index bb918e9005ae..ca13780111d2 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +41,9 @@
#include "sc.hrc"
#include "drawview.hxx"
-// Maximal erlaubte Mausbewegung um noch Drag&Drop zu starten
-//! fusel,fuconstr,futext - zusammenfassen!
-#define SC_MAXDRAGMOVE 3
+// Maximal erlaubte Mausbewegung um noch Drag&Drop zu starten
+//! fusel,fuconstr,futext - zusammenfassen!
+#define SC_MAXDRAGMOVE 3
//------------------------------------------------------------------------
@@ -71,7 +71,7 @@ FuConstruct::~FuConstruct()
BYTE FuConstruct::Command(const CommandEvent& rCEvt)
{
- // special code for non-VCL OS2/UNX removed
+ // special code for non-VCL OS2/UNX removed
return FuDraw::Command( rCEvt );
}
@@ -183,7 +183,7 @@ BOOL __EXPORT FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
BOOL bReturn = SimpleMouseButtonUp( rMEvt );
- // Doppelklick auf Textobjekt? (->fusel)
+ // Doppelklick auf Textobjekt? (->fusel)
USHORT nClicks = rMEvt.GetClicks();
if ( nClicks == 2 && rMEvt.IsLeft() )
@@ -196,7 +196,7 @@ BOOL __EXPORT FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
SdrMark* pMark = rMarkList.GetMark(0);
SdrObject* pObj = pMark->GetMarkedSdrObj();
- // #49458# bei Uno-Controls nicht in Textmodus
+ // #49458# bei Uno-Controls nicht in Textmodus
if ( pObj->ISA(SdrTextObj) && !pObj->ISA(SdrUnoObj) )
{
OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject();
@@ -208,7 +208,7 @@ BOOL __EXPORT FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
// jetzt den erzeugten FuText holen und in den EditModus setzen
FuPoor* pPoor = pViewShell->GetViewData()->GetView()->GetDrawFuncPtr();
- if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // hat keine RTTI
+ if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // hat keine RTTI
{
FuText* pText = (FuText*)pPoor;
Point aMousePixel = rMEvt.GetPosPixel();
@@ -225,18 +225,18 @@ BOOL __EXPORT FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
return bReturn;
}
-// SimpleMouseButtonUp - ohne Test auf Doppelklick
+// SimpleMouseButtonUp - ohne Test auf Doppelklick
BOOL FuConstruct::SimpleMouseButtonUp(const MouseEvent& rMEvt)
{
- BOOL bReturn = TRUE;
+ BOOL bReturn = TRUE;
if (aDragTimer.IsActive() )
{
aDragTimer.Stop();
}
- Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
+ Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
if ( pView->IsDragObj() )
pView->EndDragObj( rMEvt.IsMod1() );
@@ -287,7 +287,7 @@ BOOL __EXPORT FuConstruct::KeyInput(const KeyEvent& rKEvt)
pWindow->ReleaseMouse();
bReturn = TRUE;
}
- else // Zeichenmodus beenden
+ else // Zeichenmodus beenden
{
pViewShell->GetViewData()->GetDispatcher().
Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx
index c1212d4d9699..0cbbb919909b 100644
--- a/sc/source/ui/drawfunc/fuconuno.cxx
+++ b/sc/source/ui/drawfunc/fuconuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -174,7 +174,7 @@ void FuConstUnoControl::Deactivate()
SdrObject* FuConstUnoControl::CreateDefaultObject(const sal_uInt16 /* nID */, const Rectangle& rRectangle)
{
// case SID_FM_CREATE_CONTROL:
-
+
SdrObject* pObj = SdrObjFactory::MakeNewObject(
pView->GetCurrentObjInventor(), pView->GetCurrentObjIdentifier(),
0L, pDrDoc);
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index bad23bf26ed1..4cbd08daebea 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 <editeng/editeng.hxx> // EditEngine::IsSimpleCharInput
+#include <editeng/editeng.hxx> // EditEngine::IsSimpleCharInput
#include <editeng/outlobj.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdoole2.hxx>
@@ -86,23 +86,23 @@ FuDraw::~FuDraw()
void FuDraw::DoModifiers(const MouseEvent& rMEvt)
{
- // Shift = Ortho und AngleSnap
- // Control = Snap (Toggle)
- // Alt = zentrisch
+ // Shift = Ortho und AngleSnap
+ // Control = Snap (Toggle)
+ // Alt = zentrisch
- BOOL bShift = rMEvt.IsShift();
+ BOOL bShift = rMEvt.IsShift();
// BOOL bCtrl = rMEvt.IsMod1();
- BOOL bAlt = rMEvt.IsMod2();
+ BOOL bAlt = rMEvt.IsMod2();
// ScViewData* pViewData = pViewShell->GetViewData();
// const ScViewOptions& rOpt = pViewData->GetOptions();
// const ScGridOptions& rGrid = rOpt.GetGridOptions();
// BOOL bGridOpt = rGrid.GetUseGridSnap();
- BOOL bOrtho = bShift;
- BOOL bAngleSnap = bShift;
+ BOOL bOrtho = bShift;
+ BOOL bAngleSnap = bShift;
// BOOL bGridSnap = ( bGridOpt != bCtrl ); // andere Snap's nicht unterstuetzt
- BOOL bCenter = bAlt;
+ BOOL bCenter = bAlt;
// #i33136#
if(doConstructOrthogonal())
@@ -115,7 +115,7 @@ void FuDraw::DoModifiers(const MouseEvent& rMEvt)
if (pView->IsAngleSnapEnabled() != bAngleSnap)
pView->SetAngleSnapEnabled(bAngleSnap);
-/* Control fuer Snap beisst sich beim Verschieben mit "kopieren" !!!
+/* Control fuer Snap beisst sich beim Verschieben mit "kopieren" !!!
if (pView->IsGridSnap() != bGridSnap)
pView->SetGridSnap(bGridSnap);
@@ -175,8 +175,8 @@ BOOL __EXPORT FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
BOOL __EXPORT FuDraw::MouseMove(const MouseEvent& rMEvt)
{
- // #106438# evaluate modifiers only if in a drawing layer action
- // (don't interfere with keyboard shortcut handling)
+ // #106438# evaluate modifiers only if in a drawing layer action
+ // (don't interfere with keyboard shortcut handling)
if (pView->IsAction())
DoModifiers( rMEvt );
@@ -229,7 +229,7 @@ BOOL lcl_KeyEditMode( SdrObject* pObj, ScTabViewShell* pViewShell, const KeyEven
// get the resulting FuText and set in edit mode
pPoor = pViewShell->GetViewData()->GetView()->GetDrawFuncPtr();
- if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // no RTTI
+ if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // no RTTI
{
FuText* pText = (FuText*)pPoor;
pText->SetInEditMode( pObj, NULL, TRUE, pInitialKey );
@@ -251,20 +251,20 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
/* 18.12.95: TextShell beibehalten nicht mehr gewuenscht...
*
- * if ( pView->IsAction() )
- * {
- * pView->BrkAction();
- * pWindow->ReleaseMouse();
- * bReturn = TRUE;
- * }
- * else if ( pView->IsTextEdit() )
- * {
- * pView->EndTextEdit();
- * pView->SetCreateMode();
- * pViewShell->GetScDrawView()->InvalidateDrawTextAttrs();
- * bReturn = TRUE;
- * }
- * else
+ * if ( pView->IsAction() )
+ * {
+ * pView->BrkAction();
+ * pWindow->ReleaseMouse();
+ * bReturn = TRUE;
+ * }
+ * else if ( pView->IsTextEdit() )
+ * {
+ * pView->EndTextEdit();
+ * pView->SetCreateMode();
+ * pViewShell->GetScDrawView()->InvalidateDrawTextAttrs();
+ * bReturn = TRUE;
+ * }
+ * else
*/
if ( pViewShell->IsDrawTextShell() || aSfxRequest.GetSlot() == SID_DRAW_NOTEEDIT )
@@ -288,7 +288,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
else
pView->UnmarkAll();
- // Beim Bezier-Editieren ist jetzt wieder das Objekt selektiert
+ // Beim Bezier-Editieren ist jetzt wieder das Objekt selektiert
if (!pView->AreObjectsMarked())
pViewShell->SetDrawShell( FALSE );
@@ -296,7 +296,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
}
break;
- case KEY_DELETE: //! ueber Accelerator
+ case KEY_DELETE: //! ueber Accelerator
pView->DeleteMarked();
bReturn = TRUE;
break;
@@ -320,7 +320,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
// consumed
bReturn = TRUE;
}
- else if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object
+ else if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object
bReturn = TRUE;
}
}
@@ -337,7 +337,7 @@ BOOL __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
if( !pView->IsTextEdit() && 1 == rMarkList.GetMarkCount() )
{
SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
- if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object
+ if ( lcl_KeyEditMode( pObj, pViewShell, NULL ) ) // start text edit for suitable object
bReturn = TRUE;
}
}
@@ -719,7 +719,7 @@ void FuDraw::SelectionHasChanged()
void FuDraw::ScrollStart()
{
-// HideShownXor in Gridwin
+// HideShownXor in Gridwin
}
/*************************************************************************
@@ -730,7 +730,7 @@ void FuDraw::ScrollStart()
void FuDraw::ScrollEnd()
{
-// ShowShownXor in Gridwin
+// ShowShownXor in Gridwin
}
/*************************************************************************
@@ -785,9 +785,9 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
if ( !pView->IsAction() )
{
Point aPosPixel = pWindow->GetPointerPosPixel();
- BOOL bAlt = pMEvt && pMEvt->IsMod2();
- Point aPnt = pWindow->PixelToLogic( aPosPixel );
- SdrHdl* pHdl = pView->PickHandle(aPnt);
+ BOOL bAlt = pMEvt && pMEvt->IsMod2();
+ Point aPnt = pWindow->PixelToLogic( aPosPixel );
+ SdrHdl* pHdl = pView->PickHandle(aPnt);
SdrObject* pObj;
SdrPageView* pPV;
@@ -805,7 +805,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
if ( pView->IsTextEdit() )
{
- pViewShell->SetActivePointer(Pointer(POINTER_TEXT)); // kann nicht sein ?
+ pViewShell->SetActivePointer(Pointer(POINTER_TEXT)); // kann nicht sein ?
}
else if ( pHdl )
{
@@ -819,13 +819,13 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
else if ( !bAlt && ( !pMEvt || !pMEvt->GetButtons() )
&& lcl_UrlHit( pView, aPosPixel, pWindow ) )
{
- // kann mit ALT unterdrueckt werden
- pWindow->SetPointer( Pointer( POINTER_REFHAND ) ); // Text-URL / ImageMap
+ // kann mit ALT unterdrueckt werden
+ pWindow->SetPointer( Pointer( POINTER_REFHAND ) ); // Text-URL / ImageMap
}
else if ( !bAlt && pView->PickObj(aPnt, pView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMACRO) )
{
- // kann mit ALT unterdrueckt werden
- SdrObjMacroHitRec aHitRec; //! muss da noch irgendwas gesetzt werden ????
+ // kann mit ALT unterdrueckt werden
+ SdrObjMacroHitRec aHitRec; //! muss da noch irgendwas gesetzt werden ????
pViewShell->SetActivePointer( pObj->GetMacroPointer(aHitRec) );
}
#ifdef ISSUE66550_HLINK_FOR_SHAPES
@@ -837,7 +837,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
else if ( IsDetectiveHit( aPnt ) )
pViewShell->SetActivePointer( Pointer( POINTER_DETECTIVE ) );
else
- pViewShell->SetActivePointer( aNewPointer ); //! in Gridwin?
+ pViewShell->SetActivePointer( aNewPointer ); //! in Gridwin?
}
}
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index ead135751cce..70243ac10aaa 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,48 +55,48 @@
////========================================================================
-//// class ImportProgress
+//// class ImportProgress
////
//// Bemerkung:
-//// Diese Klasse stellt lediglich den Handler fuer den ImportProgress des
-//// Grafikfilters bereit.
+//// Diese Klasse stellt lediglich den Handler fuer den ImportProgress des
+//// Grafikfilters bereit.
////========================================================================
//
//class ImportProgress
//{
//public:
-// ImportProgress( GraphicFilter& rFilter );
-// ~ImportProgress();
+// ImportProgress( GraphicFilter& rFilter );
+// ~ImportProgress();
//
-// DECL_LINK( Update, GraphicFilter* );
+// DECL_LINK( Update, GraphicFilter* );
//
//private:
-// ScProgress aProgress;
+// ScProgress aProgress;
//};
//
////------------------------------------------------------------------------
//
//ImportProgress::ImportProgress( GraphicFilter& rFilter )
-// : aProgress( NULL, // SfxViewFrame*, NULL == alle Docs locken
-// String( ScResId(STR_INSERTGRAPHIC) ),
-// 100 )
+// : aProgress( NULL, // SfxViewFrame*, NULL == alle Docs locken
+// String( ScResId(STR_INSERTGRAPHIC) ),
+// 100 )
//{
-// rFilter.SetUpdatePercentHdl( LINK( this, ImportProgress, Update) );
+// rFilter.SetUpdatePercentHdl( LINK( this, ImportProgress, Update) );
//}
//
////------------------------------------------------------------------------
//
//__EXPORT ImportProgress::~ImportProgress()
//{
-// aProgress.SetState( 100 );
+// aProgress.SetState( 100 );
//}
//
////------------------------------------------------------------------------
//
//IMPL_LINK( ImportProgress, Update, GraphicFilter*, pGraphicFilter )
//{
-// aProgress.SetState( pGraphicFilter->GetPercent() );
-// return 0;
+// aProgress.SetState( pGraphicFilter->GetPercent() );
+// return 0;
//}
@@ -111,7 +111,7 @@ void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& r
BOOL bNegative = aPageSize.Width() < 0;
if ( bNegative )
{
- // make everything positive temporarily
+ // make everything positive temporarily
aPageSize.Width() = -aPageSize.Width();
rPos.X() = -rPos.X() - rSize.Width();
}
@@ -144,18 +144,18 @@ void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& r
rPos.Y() = aPageSize.Height() - rSize.Height();
if ( bNegative )
- rPos.X() = -rPos.X() - rSize.Width(); // back to real position
+ rPos.X() = -rPos.X() - rSize.Width(); // back to real position
}
//------------------------------------------------------------------------
void lcl_InsertGraphic( const Graphic& rGraphic,
const String& rFileName, const String& rFilterName, BOOL bAsLink, BOOL bApi,
- ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView )
+ ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView )
{
- // #74778# set the size so the graphic has its original pixel size
- // at 100% view scale (as in SetMarkedOriginalSize),
- // instead of respecting the current view scale
+ // #74778# set the size so the graphic has its original pixel size
+ // at 100% view scale (as in SetMarkedOriginalSize),
+ // instead of respecting the current view scale
ScDrawView* pDrawView = pViewSh->GetScDrawView();
MapMode aSourceMap = rGraphic.GetPrefMapMode();
@@ -170,7 +170,7 @@ void lcl_InsertGraphic( const Graphic& rGraphic,
Size aLogicSize = pWindow->LogicToLogic(
rGraphic.GetPrefSize(), &aSourceMap, &aDestMap );
- // Limit size
+ // Limit size
SdrPageView* pPV = pView->GetSdrPageView();
SdrPage* pPage = pPV->GetPage();
@@ -178,7 +178,7 @@ void lcl_InsertGraphic( const Graphic& rGraphic,
ScViewData* pData = pViewSh->GetViewData();
if ( pData->GetDocument()->IsNegativePage( pData->GetTabNo() ) )
- aInsertPos.X() -= aLogicSize.Width(); // move position to left edge
+ aInsertPos.X() -= aLogicSize.Width(); // move position to left edge
ScLimitSizeOnDrawPage( aLogicSize, aInsertPos, pPage->GetSize() );
@@ -188,13 +188,13 @@ void lcl_InsertGraphic( const Graphic& rGraphic,
// #118522# calling SetGraphicLink here doesn't work
- // #49961# Path is no longer used as name for the graphics object
+ // #49961# Path is no longer used as name for the graphics object
ScDrawLayer* pLayer = (ScDrawLayer*) pView->GetModel();
- String aName = pLayer->GetNewGraphicName(); // "Grafik x"
+ String aName = pLayer->GetNewGraphicName(); // "Grafik x"
pObj->SetName(aName);
- // don't select if from (dispatch) API, to allow subsequent cell operations
+ // don't select if from (dispatch) API, to allow subsequent cell operations
ULONG nInsOptions = bApi ? SDRINSERT_DONTMARK : 0;
pView->InsertObjectAtView( pObj, *pPV, nInsOptions );
@@ -211,12 +211,12 @@ void lcl_InsertMedia( const ::rtl::OUString& rMediaURL, bool bApi,
ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView,
const Size& rPrefSize )
{
- SdrPageView* pPV = pView->GetSdrPageView();
- SdrPage* pPage = pPV->GetPage();
- ScViewData* pData = pViewSh->GetViewData();
- Point aInsertPos( pViewSh->GetInsertPos() );
- Size aSize;
-
+ SdrPageView* pPV = pView->GetSdrPageView();
+ SdrPage* pPage = pPV->GetPage();
+ ScViewData* pData = pViewSh->GetViewData();
+ Point aInsertPos( pViewSh->GetInsertPos() );
+ Size aSize;
+
if( rPrefSize.Width() && rPrefSize.Height() )
{
if( pWindow )
@@ -228,13 +228,13 @@ void lcl_InsertMedia( const ::rtl::OUString& rMediaURL, bool bApi,
aSize = Size( 5000, 5000 );
ScLimitSizeOnDrawPage( aSize, aInsertPos, pPage->GetSize() );
-
+
if( pData->GetDocument()->IsNegativePage( pData->GetTabNo() ) )
aInsertPos.X() -= aSize.Width();
SdrMediaObj* pObj = new SdrMediaObj( Rectangle( aInsertPos, aSize ) );
-
- pObj->setURL( rMediaURL );
+
+ pObj->setURL( rMediaURL );
pView->InsertObjectAtView( pObj, *pPV, bApi ? SDRINSERT_DONTMARK : 0 );
}
@@ -248,11 +248,11 @@ void lcl_InsertMedia( const ::rtl::OUString& rMediaURL, bool bApi,
#pragma optimize("",off)
#endif
-FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh,
- Window* pWin,
+FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh,
+ Window* pWin,
ScDrawView* pViewP,
- SdrModel* pDoc,
- SfxRequest& rReq )
+ SdrModel* pDoc,
+ SfxRequest& rReq )
: FuPoor(pViewSh, pWin, pViewP, pDoc, rReq)
{
const SfxItemSet* pReqArgs = rReq.GetArgs();
@@ -301,7 +301,7 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh,
lcl_InsertGraphic( aGraphic, aFileName, aFilterName, bAsLink, FALSE, pViewSh, pWindow, pView );
- // append items for recording
+ // append items for recording
rReq.AppendItem( SfxStringItem( SID_INSERT_GRAPHIC, aFileName ) );
rReq.AppendItem( SfxStringItem( FN_PARAM_FILTER, aFilterName ) );
rReq.AppendItem( SfxBoolItem( FN_PARAM_1, bAsLink ) );
@@ -309,18 +309,18 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh,
}
else
{
- // error is handled in SvxOpenGraphicDialog::GetGraphic
+ // error is handled in SvxOpenGraphicDialog::GetGraphic
#if 0
USHORT nRes = 0;
switch ( nError )
{
- case GRFILTER_OPENERROR: nRes = SCSTR_GRFILTER_OPENERROR; break;
- case GRFILTER_IOERROR: nRes = SCSTR_GRFILTER_IOERROR; break;
- case GRFILTER_FORMATERROR: nRes = SCSTR_GRFILTER_FORMATERROR; break;
- case GRFILTER_VERSIONERROR: nRes = SCSTR_GRFILTER_VERSIONERROR; break;
- case GRFILTER_FILTERERROR: nRes = SCSTR_GRFILTER_FILTERERROR; break;
- case GRFILTER_TOOBIG: nRes = SCSTR_GRFILTER_TOOBIG; break;
+ case GRFILTER_OPENERROR: nRes = SCSTR_GRFILTER_OPENERROR; break;
+ case GRFILTER_IOERROR: nRes = SCSTR_GRFILTER_IOERROR; break;
+ case GRFILTER_FORMATERROR: nRes = SCSTR_GRFILTER_FORMATERROR; break;
+ case GRFILTER_VERSIONERROR: nRes = SCSTR_GRFILTER_VERSIONERROR; break;
+ case GRFILTER_FILTERERROR: nRes = SCSTR_GRFILTER_FILTERERROR; break;
+ case GRFILTER_TOOBIG: nRes = SCSTR_GRFILTER_TOOBIG; break;
}
if ( nRes )
{
@@ -377,21 +377,21 @@ void FuInsertGraphic::Deactivate()
|*
\************************************************************************/
-FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh,
- Window* pWin,
+FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh,
+ Window* pWin,
ScDrawView* pViewP,
- SdrModel* pDoc,
- SfxRequest& rReq ) :
+ SdrModel* pDoc,
+ SfxRequest& rReq ) :
FuPoor(pViewSh, pWin, pViewP, pDoc, rReq)
{
- ::rtl::OUString aURL;
- const SfxItemSet* pReqArgs = rReq.GetArgs();
- bool bAPI = false;
+ ::rtl::OUString aURL;
+ const SfxItemSet* pReqArgs = rReq.GetArgs();
+ bool bAPI = false;
if( pReqArgs )
{
const SfxStringItem* pStringItem = PTR_CAST( SfxStringItem, &pReqArgs->Get( rReq.GetSlot() ) );
-
+
if( pStringItem )
{
aURL = pStringItem->GetValue();
@@ -405,19 +405,19 @@ FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh,
if( pWin )
pWin->EnterWait();
-
+
if( !::avmedia::MediaWindow::isMediaURL( aURL, true, &aPrefSize ) )
{
if( pWin )
pWin->LeaveWait();
-
+
if( !bAPI )
::avmedia::MediaWindow::executeFormatErrorBox( pWindow );
}
else
{
lcl_InsertMedia( aURL, bAPI, pViewSh, pWindow, pView, aPrefSize );
-
+
if( pWin )
pWin->LeaveWait();
}
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index f648a1484e8e..e5eb582a3404 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using namespace ::com::sun::star;
#include "globstr.hrc"
#include "drawview.hxx"
-extern SdrObject* pSkipPaintObj; // output.cxx - dieses Objekt nicht zeichnen
+extern SdrObject* pSkipPaintObj; // output.cxx - dieses Objekt nicht zeichnen
//------------------------------------------------------------------------
@@ -223,7 +223,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie
if( ! rReq.IsAPI() )
rReq.Done();
- //! hier DLL's initalisieren, damit die Factories existieren?
+ //! hier DLL's initalisieren, damit die Factories existieren?
uno::Reference < embed::XEmbeddedObject > xObj;
uno::Reference < embed::XStorage > xStorage = comphelper::OStorageHelper::GetTemporaryStorage();
@@ -327,7 +327,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie
}
}
- // SvInsertObjectDialog (alles in einem Dialog) wird nicht mehr benutzt
+ // SvInsertObjectDialog (alles in einem Dialog) wird nicht mehr benutzt
if (xObj.is())
{
pView->UnmarkAll();
@@ -378,7 +378,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie
MapMode( aMapUnit ), aMap100 );
}
- // Chart initialisieren ?
+ // Chart initialisieren ?
if ( SvtModuleOptions().IsChart() && SotExchange::IsChart( SvGlobalName( xObj->getClassID() ) ) )
lcl_ChartInit( xObj, pViewSh->GetViewData(), rtl::OUString() );
@@ -386,7 +386,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie
Point aPnt = pViewSh->GetInsertPos();
if ( pData->GetDocument()->IsNegativePage( pData->GetTabNo() ) )
- aPnt.X() -= aSize.Width(); // move position to left edge
+ aPnt.X() -= aSize.Width(); // move position to left edge
Rectangle aRect (aPnt, aSize);
SdrOle2Obj* pObj = new SdrOle2Obj( aObjRef, aName, aRect);
@@ -400,9 +400,9 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie
if ( nAspect != embed::Aspects::MSOLE_ICON )
{
- // #73279# Math objects change their object size during InsertObject.
- // New size must be set in SdrObject, or a wrong scale will be set at
- // ActivateObject.
+ // #73279# Math objects change their object size during InsertObject.
+ // New size must be set in SdrObject, or a wrong scale will be set at
+ // ActivateObject.
try
{
@@ -489,7 +489,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
SdrModel* pDoc, SfxRequest& rReq)
: FuPoor(pViewSh, pWin, pViewP, pDoc, rReq)
{
- const SfxItemSet* pReqArgs = rReq.GetArgs();
+ const SfxItemSet* pReqArgs = rReq.GetArgs();
if( ! rReq.IsAPI() )
rReq.Done();
@@ -568,7 +568,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
SCTAB nMarkTab;
BOOL bDrawRect = pViewShell->GetChartArea( aDummy, aMarkDest, nMarkTab );
- // Objekt-Groesse
+ // Objekt-Groesse
awt::Size aSz = xObj->getVisualAreaSize( nAspect );
Size aSize( aSz.Width, aSz.Height );
@@ -596,7 +596,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
ScViewData* pData = pViewSh->GetViewData();
ScDocShell* pScDocSh = pData->GetDocShell();
- ScDocument* pScDoc = pScDocSh->GetDocument();
+ ScDocument* pScDoc = pScDocSh->GetDocument();
BOOL bUndo (pScDoc->IsUndoEnabled());
if( pReqArgs )
@@ -610,8 +610,8 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
nToTable = ((const SfxUInt16Item*)pItem)->GetValue();
else if ( pItem->ISA( SfxBoolItem ) )
{
- // #46033# in der idl fuer Basic steht FN_PARAM_4 als SfxBoolItem
- // -> wenn gesetzt, neue Tabelle, sonst aktuelle Tabelle
+ // #46033# in der idl fuer Basic steht FN_PARAM_4 als SfxBoolItem
+ // -> wenn gesetzt, neue Tabelle, sonst aktuelle Tabelle
if ( ((const SfxBoolItem*)pItem)->GetValue() )
nToTable = static_cast<UINT16>(pScDoc->GetTableCount());
@@ -630,8 +630,8 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
if ( nToTable == pScDoc->GetTableCount() )
{
// dann los...
- String aTabName;
- SCTAB nNewTab = pScDoc->GetTableCount();
+ String aTabName;
+ SCTAB nNewTab = pScDoc->GetTableCount();
pScDoc->CreateValidTabName( aTabName );
@@ -648,7 +648,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
pScDocSh->Broadcast( ScTablesHint( SC_TAB_INSERTED, nNewTab ) );
pViewSh->SetTabNo( nNewTab, TRUE );
- pScDocSh->PostPaintExtras(); //! erst hinterher ???
+ pScDocSh->PostPaintExtras(); //! erst hinterher ???
}
else
{
@@ -663,11 +663,11 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
lcl_ChartInit( xObj, pData, aRangeString ); // set source range, auto-detect column/row headers
- // Objekt-Position
+ // Objekt-Position
Point aStart;
if ( bDrawRect )
- aStart = aMarkDest.TopLeft(); // marked by hand
+ aStart = aMarkDest.TopLeft(); // marked by hand
else
{
// get chart position (from window size and data range)
@@ -721,7 +721,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
if( xChartModel.is() && xInit.is() )
{
uno::Reference< awt::XWindow > xDialogParentWindow(0);
- // initialize dialog
+ // initialize dialog
uno::Sequence<uno::Any> aSeq(2);
uno::Any* pArray = aSeq.getArray();
beans::PropertyValue aParam1;
diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx
index 02554c495729..c3602ce0e0c3 100644
--- a/sc/source/ui/drawfunc/fumark.cxx
+++ b/sc/source/ui/drawfunc/fumark.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ BOOL FuMarkRect::MouseButtonDown(const MouseEvent& rMEvt)
SetMouseButtonCode(rMEvt.GetButtons());
pWindow->CaptureMouse();
- pView->UnmarkAll(); // der Einheitlichkeit halber und wegen #50558#
+ pView->UnmarkAll(); // der Einheitlichkeit halber und wegen #50558#
bStartDrag = TRUE;
aBeginPos = pWindow->PixelToLogic( rMEvt.GetPosPixel() );
@@ -139,7 +139,7 @@ BOOL FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt)
{
// Klick auf der Stelle
- aZoomRect.SetSize(Size()); // dann ganz leer
+ aZoomRect.SetSize(Size()); // dann ganz leer
}
bStartDrag = FALSE;
@@ -148,15 +148,15 @@ BOOL FuMarkRect::MouseButtonUp(const MouseEvent& rMEvt)
pViewShell->GetViewData()->GetDispatcher().
Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD);
- // Daten an der View merken
+ // Daten an der View merken
pViewShell->SetChartArea( aSourceRange, aZoomRect );
- // Chart-Dialog starten:
+ // Chart-Dialog starten:
-// USHORT nId = ScChartDlgWrapper::GetChildWindowId();
-// SfxChildWindow* pWnd = pViewShell->GetViewFrame()->GetChildWindow( nId );
-// SC_MOD()->SetRefDialog( nId, pWnd ? FALSE : TRUE );
+// USHORT nId = ScChartDlgWrapper::GetChildWindowId();
+// SfxChildWindow* pWnd = pViewShell->GetViewFrame()->GetChildWindow( nId );
+// SC_MOD()->SetRefDialog( nId, pWnd ? FALSE : TRUE );
return TRUE;
}
@@ -171,8 +171,8 @@ BYTE FuMarkRect::Command(const CommandEvent& rCEvt)
{
if ( COMMAND_STARTDRAG == rCEvt.GetCommand() )
{
- // #29877# nicht anfangen, auf der Tabelle rumzudraggen,
- // aber Maus-Status nicht zuruecksetzen
+ // #29877# nicht anfangen, auf der Tabelle rumzudraggen,
+ // aber Maus-Status nicht zuruecksetzen
return SC_CMD_IGNORE;
}
else
@@ -195,7 +195,7 @@ BOOL FuMarkRect::KeyInput(const KeyEvent& rKEvt)
switch ( rKEvt.GetKeyCode().GetCode() )
{
case KEY_ESCAPE:
- // beenden
+ // beenden
pViewShell->GetViewData()->GetDispatcher().
Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
bReturn = TRUE;
@@ -240,7 +240,7 @@ void FuMarkRect::Activate()
{
FuPoor::Activate();
- // Markierung merken, bevor evtl. Tabelle umgeschaltet wird
+ // Markierung merken, bevor evtl. Tabelle umgeschaltet wird
ScViewData* pViewData = pViewShell->GetViewData();
ScMarkData& rMark = pViewData->GetMarkData();
@@ -248,9 +248,9 @@ void FuMarkRect::Activate()
if ( !rMark.IsMultiMarked() && !rMark.IsMarked() )
pViewShell->MarkDataArea( TRUE );
- pViewData->GetMultiArea( aSourceRange ); // Mehrfachselektion erlaubt
+ pViewData->GetMultiArea( aSourceRange ); // Mehrfachselektion erlaubt
-// pViewShell->Unmark();
+// pViewShell->Unmark();
ForcePointer(NULL);
}
diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index 0bffdfe7ef84..314b16b2a249 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -127,9 +127,9 @@ void FuPoor::ForceScroll(const Point& aPixPos)
SCsCOL dx = 0;
SCsROW dy = 0;
- if ( aPixPos.X() <= 0 ) dx = -1;
+ if ( aPixPos.X() <= 0 ) dx = -1;
if ( aPixPos.X() >= aSize.Width() ) dx = 1;
- if ( aPixPos.Y() <= 0 ) dy = -1;
+ if ( aPixPos.Y() <= 0 ) dy = -1;
if ( aPixPos.Y() >= aSize.Height() ) dy = 1;
ScViewData* pViewData = pViewShell->GetViewData();
@@ -152,7 +152,7 @@ void FuPoor::ForceScroll(const Point& aPixPos)
if ( dx != 0 || dy != 0 )
{
- ScrollStart(); // Scrollaktion in abgeleiteter Klasse
+ ScrollStart(); // Scrollaktion in abgeleiteter Klasse
pViewShell->ScrollLines(2*dx, 4*dy);
ScrollEnd();
aScrollTimer.Start();
@@ -168,7 +168,7 @@ void FuPoor::ForceScroll(const Point& aPixPos)
IMPL_LINK_INLINE_START( FuPoor, ScrollHdl, Timer *, EMPTYARG )
{
Point aPosPixel = pWindow->GetPointerPosPixel();
-
+
// #95491# use remembered MouseButton state to create correct
// MouseEvents for this artifical MouseMove.
MouseMove(MouseEvent(aPosPixel, 1, 0, GetMouseButtonCode()));
@@ -179,20 +179,20 @@ IMPL_LINK_INLINE_END( FuPoor, ScrollHdl, Timer *, pTimer )
// #95491# moved from inline to *.cxx
BOOL FuPoor::MouseButtonUp(const MouseEvent& rMEvt)
-{
+{
// #95491# remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- return FALSE;
+ return FALSE;
}
// #95491# moved from inline to *.cxx
BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt)
-{
+{
// #95491# remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
- return FALSE;
+ return FALSE;
}
/*************************************************************************
@@ -201,7 +201,7 @@ BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-// WriteStatus gibt's nicht mehr
+// WriteStatus gibt's nicht mehr
/*************************************************************************
|*
@@ -248,7 +248,7 @@ void FuPoor::DoCut()
{
if (pView)
{
-//! pView->DoCut(pWindow);
+//! pView->DoCut(pWindow);
}
}
@@ -262,7 +262,7 @@ void FuPoor::DoCopy()
{
if (pView)
{
-//! pView->DoCopy(pWindow);
+//! pView->DoCopy(pWindow);
}
}
@@ -276,7 +276,7 @@ void FuPoor::DoPaste()
{
if (pView)
{
-//! pView->DoPaste(pWindow);
+//! pView->DoPaste(pWindow);
}
}
@@ -288,12 +288,12 @@ void FuPoor::DoPaste()
IMPL_LINK( FuPoor, DragTimerHdl, Timer *, EMPTYARG )
{
- // ExecuteDrag (und das damit verbundene Reschedule) direkt aus dem Timer
- // aufzurufen, bringt die VCL-Timer-Verwaltung durcheinander, wenn dabei
- // (z.B. im Drop) wieder ein Timer gestartet wird (z.B. ComeBack-Timer der
- // DrawView fuer Solid Handles / ModelHasChanged) - der neue Timer laeuft
- // dann um die Dauer des Drag&Drop zu spaet ab.
- // Darum Drag&Drop aus eigenem Event:
+ // ExecuteDrag (und das damit verbundene Reschedule) direkt aus dem Timer
+ // aufzurufen, bringt die VCL-Timer-Verwaltung durcheinander, wenn dabei
+ // (z.B. im Drop) wieder ein Timer gestartet wird (z.B. ComeBack-Timer der
+ // DrawView fuer Solid Handles / ModelHasChanged) - der neue Timer laeuft
+ // dann um die Dauer des Drag&Drop zu spaet ab.
+ // Darum Drag&Drop aus eigenem Event:
Application::PostUserEvent( LINK( this, FuPoor, DragHdl ) );
return 0;
@@ -308,13 +308,13 @@ IMPL_LINK( FuPoor, DragHdl, void *, EMPTYARG )
pWindow->ReleaseMouse();
bIsInDragMode = TRUE;
-// pView->BeginDrag(pWindow, aMDPos);
+// pView->BeginDrag(pWindow, aMDPos);
pViewShell->GetScDrawView()->BeginDrag(pWindow, aMDPos);
}
return 0;
}
-// Detektiv-Linie
+// Detektiv-Linie
BOOL FuPoor::IsDetectiveHit( const Point& rLogicPos )
{
@@ -365,13 +365,13 @@ void FuPoor::ImpForceQuadratic(Rectangle& rRect)
if(rRect.GetWidth() > rRect.GetHeight())
{
rRect = Rectangle(
- Point(rRect.Left() + ((rRect.GetWidth() - rRect.GetHeight()) / 2), rRect.Top()),
+ Point(rRect.Left() + ((rRect.GetWidth() - rRect.GetHeight()) / 2), rRect.Top()),
Size(rRect.GetHeight(), rRect.GetHeight()));
}
else
{
rRect = Rectangle(
- Point(rRect.Left(), rRect.Top() + ((rRect.GetHeight() - rRect.GetWidth()) / 2)),
+ Point(rRect.Left(), rRect.Top() + ((rRect.GetHeight() - rRect.GetWidth()) / 2)),
Size(rRect.GetWidth(), rRect.GetWidth()));
}
}
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 4a456522003c..2c284d3df489 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +59,9 @@
// -----------------------------------------------------------------------
-// Maximal erlaubte Mausbewegung um noch Drag&Drop zu starten
-//! fusel,fuconstr,futext - zusammenfassen!
-#define SC_MAXDRAGMOVE 3
+// Maximal erlaubte Mausbewegung um noch Drag&Drop zu starten
+//! fusel,fuconstr,futext - zusammenfassen!
+#define SC_MAXDRAGMOVE 3
// -----------------------------------------------------------------------
@@ -96,7 +96,7 @@ FuSelection::~FuSelection()
BYTE FuSelection::Command(const CommandEvent& rCEvt)
{
- // special code for non-VCL OS2/UNX removed
+ // special code for non-VCL OS2/UNX removed
return FuDraw::Command( rCEvt );
}
@@ -120,7 +120,7 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
}
bVCAction = FALSE;
- bIsInDragMode = FALSE; // irgendwo muss es ja zurueckgesetzt werden (#50033#)
+ bIsInDragMode = FALSE; // irgendwo muss es ja zurueckgesetzt werden (#50033#)
BOOL bReturn = FuDraw::MouseButtonDown(rMEvt);
@@ -230,14 +230,14 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
}
}
- // URL / ImageMap
+ // URL / ImageMap
SdrViewEvent aVEvt;
if ( !bAlt &&
pView->PickAnything( rMEvt, SDRMOUSEBUTTONDOWN, aVEvt ) != SDRHIT_NONE &&
aVEvt.pObj != NULL )
{
- if ( ScDrawLayer::GetIMapInfo( aVEvt.pObj ) ) // ImageMap
+ if ( ScDrawLayer::GetIMapInfo( aVEvt.pObj ) ) // ImageMap
{
const IMapObject* pIMapObj =
ScDrawLayer::GetHitIMapObject( aVEvt.pObj, aMDPos, *pWindow );
@@ -247,7 +247,7 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
sTarget = pIMapObj->GetTarget();
}
}
- if ( aVEvt.eEvent == SDREVENT_EXECUTEURL && aVEvt.pURLField ) // URL
+ if ( aVEvt.eEvent == SDREVENT_EXECUTEURL && aVEvt.pURLField ) // URL
{
sURL = aVEvt.pURLField->GetURL();
sTarget = aVEvt.pURLField->GetTargetFrame();
@@ -262,12 +262,12 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
return TRUE; // kein CaptureMouse etc.
}
- // Is another object being edited in this view?
- // (Editing is ended in MarkListHasChanged - test before UnmarkAll)
+ // Is another object being edited in this view?
+ // (Editing is ended in MarkListHasChanged - test before UnmarkAll)
SfxInPlaceClient* pClient = pViewShell->GetIPClient();
BOOL bWasOleActive = ( pClient && pClient->IsObjectInPlaceActive() );
- // Markieren
+ // Markieren
// do not allow multiselection with note caption
bool bCaptionClicked = IsNoteCaptionClicked( aMDPos );
@@ -287,10 +287,10 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
//********************************************************
if (pView->IsMarkedHit(aMDPos))
{
- // #95834# Don't start drag timer if inplace editing of an OLE object
- // was just ended with this mouse click - the view will be moved
- // (different tool bars) and the object that was clicked on would
- // be moved unintentionally.
+ // #95834# Don't start drag timer if inplace editing of an OLE object
+ // was just ended with this mouse click - the view will be moved
+ // (different tool bars) and the object that was clicked on would
+ // be moved unintentionally.
if ( !bWasOleActive )
aDragTimer.Start();
@@ -298,13 +298,13 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
pView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl);
bReturn = TRUE;
}
- else // Objekt am Rand getroffen
+ else // Objekt am Rand getroffen
if (pViewShell->IsDrawSelMode())
bReturn = TRUE;
}
else
{
- // nichts getroffen
+ // nichts getroffen
if (pViewShell->IsDrawSelMode())
{
@@ -322,7 +322,7 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
if (!bIsInDragMode)
{
- if (!bVCAction) // VC rufen selber CaptureMouse
+ if (!bVCAction) // VC rufen selber CaptureMouse
pWindow->CaptureMouse();
ForcePointer(&rMEvt);
}
@@ -363,9 +363,9 @@ BOOL __EXPORT FuSelection::MouseMove(const MouseEvent& rMEvt)
// Event an den Manager weiterleiten
if( bVCAction )
{
- // GetSbxForm gibts nicht mehr - Basic-Controls sind tot
+ // GetSbxForm gibts nicht mehr - Basic-Controls sind tot
//SdrPageView* pPgView = pView->GetPageViewByIndex(0);
- //ScDrawPage* pPage = (ScDrawPage*)pPgView->GetPage();
+ //ScDrawPage* pPage = (ScDrawPage*)pPgView->GetPage();
//VCSbxForm* pForm = (VCSbxForm*)(SbxObject*)(pPage->GetSbxForm());
//((VCManager*)(pForm->GetVCContainer()))->
// MouseMove( pWindow, rMEvt );
@@ -389,7 +389,7 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
SetMouseButtonCode(rMEvt.GetButtons());
BOOL bReturn = FuDraw::MouseButtonUp(rMEvt);
-// BOOL bOle = pViewShell->GetViewData()->IsOle();
+// BOOL bOle = pViewShell->GetViewData()->IsOle();
BOOL bOle = pViewShell->GetViewFrame()->GetFrame().IsInPlace();
if (aDragTimer.IsActive() )
@@ -455,7 +455,7 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
if ( pView->IsObjEdit() )
{
BOOL bShowCursor = TRUE;
-//! pOutlinerView = pView->GetOutlinerView(pWindow, bShowCursor);
+//! pOutlinerView = pView->GetOutlinerView(pWindow, bShowCursor);
bReturn = TRUE;
}
*/
@@ -484,8 +484,8 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
SdrMark* pMark = rMarkList.GetMark(0);
SdrObject* pObj = pMark->GetMarkedSdrObj();
- // #43984# aktivieren nur, wenn die Maus auch (noch) ueber dem
- // selektierten Objekt steht
+ // #43984# aktivieren nur, wenn die Maus auch (noch) ueber dem
+ // selektierten Objekt steht
SdrViewEvent aVEvt;
SdrHitKind eHit = pView->PickAnything( rMEvt, SDRMOUSEBUTTONDOWN, aVEvt );
@@ -494,7 +494,7 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
UINT16 nSdrObjKind = pObj->GetObjIdentifier();
//
- // OLE: aktivieren
+ // OLE: aktivieren
//
if (nSdrObjKind == OBJ_OLE2)
@@ -525,7 +525,7 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
// jetzt den erzeugten FuText holen und in den EditModus setzen
FuPoor* pPoor = pViewShell->GetViewData()->GetView()->GetDrawFuncPtr();
- if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // hat keine RTTI
+ if ( pPoor && pPoor->GetSlotID() == nTextSlotId ) // hat keine RTTI
{
FuText* pText = (FuText*)pPoor;
Point aMousePixel = rMEvt.GetPosPixel();
@@ -544,9 +544,9 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
// Event an den Manager weiterleiten
if( bVCAction )
{
- // GetSbxForm gibts nicht mehr - Basic-Controls sind tot
+ // GetSbxForm gibts nicht mehr - Basic-Controls sind tot
//SdrPageView* pPgView = pView->GetPageViewByIndex(0);
- //ScDrawPage* pPage = (ScDrawPage*)pPgView->GetPage();
+ //ScDrawPage* pPage = (ScDrawPage*)pPgView->GetPage();
//VCSbxForm* pForm = (VCSbxForm*)(SbxObject*)(pPage->GetSbxForm());
//((VCManager*)(pForm->GetVCContainer()))->
// MouseButtonUp( pWindow, rMEvt );
@@ -559,8 +559,8 @@ BOOL __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
pWindow->ReleaseMouse();
- // Command-Handler fuer Kontext-Menue kommt erst nach MouseButtonUp,
- // darum hier die harte IsLeft-Abfrage
+ // Command-Handler fuer Kontext-Menue kommt erst nach MouseButtonUp,
+ // darum hier die harte IsLeft-Abfrage
if ( !bReturn && rMEvt.IsLeft() )
if (pViewShell->IsDrawSelMode())
pViewShell->GetViewData()->GetDispatcher().
@@ -634,7 +634,7 @@ void FuSelection::Deactivate()
// BOOL bShowCursor = FALSE;
//! pOutlinerView = pView->GetOutlinerView(pWindow, bShowCursor);
-// pView->SetDragMode(SDRDRAG_MOVE);
+// pView->SetDragMode(SDRDRAG_MOVE);
FuDraw::Deactivate();
}
diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx
index 402143ac0a8c..36d2f1cbbe6f 100644
--- a/sc/source/ui/drawfunc/fusel2.cxx
+++ b/sc/source/ui/drawfunc/fusel2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index a13cfc61d1c6..11f7574f0262 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +52,9 @@
// #98185# Create default drawing objects via keyboard
#include "scresid.hxx"
-// Maximal erlaubte Mausbewegung um noch Drag&Drop zu starten
-//! fusel,fuconstr,futext - zusammenfassen!
-#define SC_MAXDRAGMOVE 3
+// Maximal erlaubte Mausbewegung um noch Drag&Drop zu starten
+//! fusel,fuconstr,futext - zusammenfassen!
+#define SC_MAXDRAGMOVE 3
//------------------------------------------------------------------
@@ -122,7 +122,7 @@ FuText::FuText(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP,
FuText::~FuText()
{
-// StopEditMode(); // in Deactivate !
+// StopEditMode(); // in Deactivate !
}
/*************************************************************************
@@ -137,12 +137,12 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
SetMouseButtonCode(rMEvt.GetButtons());
if ( pView->MouseButtonDown(rMEvt, pWindow) )
- return (TRUE); // Event von der SdrView ausgewertet
+ return (TRUE); // Event von der SdrView ausgewertet
if ( pView->IsTextEdit() )
{
if( !IsSizingOrMovingNote(rMEvt) )
- StopEditMode(); // Danebengeklickt, Ende mit Edit
+ StopEditMode(); // Danebengeklickt, Ende mit Edit
pView->SetCreateMode();
}
@@ -189,26 +189,26 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
if ( pHdl != NULL || pView->IsMarkedHit(aMDPos) )
{
if (pHdl == NULL &&
-// pView->TakeTextEditObject(aMDPos, pObj, pPV) )
+// pView->TakeTextEditObject(aMDPos, pObj, pPV) )
pView->PickObj(aMDPos, pView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKTEXTEDIT) )
{
SdrOutliner* pO = MakeOutliner();
lcl_UpdateHyphenator( *pO, pObj );
- // vertical flag:
- // deduced from slot ids only if text object has no content
+ // vertical flag:
+ // deduced from slot ids only if text object has no content
USHORT nSlotID = aSfxRequest.GetSlot();
BOOL bVertical = ( nSlotID == SID_DRAW_TEXT_VERTICAL );
OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject();
if ( pOPO )
- bVertical = pOPO->IsVertical(); // content wins
+ bVertical = pOPO->IsVertical(); // content wins
pO->SetVertical( bVertical );
- //!?? ohne uebergebenen Outliner stimmen die Defaults nicht ???!?
+ //!?? ohne uebergebenen Outliner stimmen die Defaults nicht ???!?
if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, sal_True, pO) )
{
- // EditEngine-UndoManager anmelden
+ // EditEngine-UndoManager anmelden
pViewShell->SetDrawTextUndo( &pO->GetUndoManager() );
OutlinerView* pOLV = pView->GetTextEditOutlinerView();
@@ -246,7 +246,7 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
{
BOOL bMacro = FALSE;
-// if (bMacro && pView->TakeMacroObject(aMDPos,pObj,pPV))
+// if (bMacro && pView->TakeMacroObject(aMDPos,pObj,pPV))
if (bMacro && pView->PickObj(aMDPos, pView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMACRO) )
{
@@ -304,8 +304,8 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
}
else if (aSfxRequest.GetSlot() == SID_DRAW_NOTEEDIT )
{
- // Notizen editieren -> keine neuen Textobjekte erzeugen,
- // stattdessen Textmodus verlassen
+ // Notizen editieren -> keine neuen Textobjekte erzeugen,
+ // stattdessen Textmodus verlassen
pViewShell->GetViewData()->GetDispatcher().
Execute(aSfxRequest.GetSlot(), SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
@@ -325,14 +325,14 @@ BOOL __EXPORT FuText::MouseButtonDown(const MouseEvent& rMEvt)
if (!bIsInDragMode)
{
pWindow->CaptureMouse();
-// ForcePointer(&rMEvt);
+// ForcePointer(&rMEvt);
lcl_InvalidateAttribs( pViewShell->GetViewFrame()->GetBindings() );
}
pViewShell->SetActivePointer(pView->GetPreferedPointer(
pWindow->PixelToLogic(rMEvt.GetPosPixel()), pWindow ));
-// return (bReturn);
+// return (bReturn);
return TRUE;
}
@@ -346,7 +346,7 @@ BOOL __EXPORT FuText::MouseMove(const MouseEvent& rMEvt)
{
BOOL bReturn = FALSE;
-// pViewShell->SetActivePointer(aNewPointer);
+// pViewShell->SetActivePointer(aNewPointer);
pViewShell->SetActivePointer(pView->GetPreferedPointer(
pWindow->PixelToLogic(rMEvt.GetPosPixel()), pWindow ));
@@ -365,7 +365,7 @@ BOOL __EXPORT FuText::MouseMove(const MouseEvent& rMEvt)
if ( pView->IsAction() )
{
-/* aNewPointer = Pointer(POINTER_TEXT);
+/* aNewPointer = Pointer(POINTER_TEXT);
pViewShell->SetActivePointer(aNewPointer);
*/
Point aPix(rMEvt.GetPosPixel());
@@ -375,7 +375,7 @@ BOOL __EXPORT FuText::MouseMove(const MouseEvent& rMEvt)
pView->MovAction(aPnt);
}
-// ForcePointer(&rMEvt);
+// ForcePointer(&rMEvt);
return (bReturn);
}
@@ -426,7 +426,7 @@ BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt)
pView->EndCreateObj(SDRCREATE_FORCEEND);
if (aSfxRequest.GetSlot() == SID_DRAW_TEXT_MARQUEE)
{
- // Lauftext-Objekt erzeugen?
+ // Lauftext-Objekt erzeugen?
const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
if (rMarkList.GetMark(0))
@@ -476,8 +476,8 @@ BOOL __EXPORT FuText::MouseButtonUp(const MouseEvent& rMEvt)
SetInEditMode();
- // Modus verlassen bei einzelnem Klick
- // (-> fuconstr)
+ // Modus verlassen bei einzelnem Klick
+ // (-> fuconstr)
if ( !pView->AreObjectsMarked() )
{
@@ -553,7 +553,7 @@ void FuText::ForcePointer(const MouseEvent* /* pMEvt */)
}
else
{
-// if ( pView->TakeMacroObject(aPnt, pObj, pPV) )
+// if ( pView->TakeMacroObject(aPnt, pObj, pPV) )
if ( pView->PickObj(aPnt, pObj, pPV, SDRSEARCH_PICKMACRO) )
{
pViewShell->SetActivePointer( pObj->GetMacroPointer() );
@@ -611,17 +611,17 @@ void FuText::Activate()
rBindings.Invalidate( SID_OBJECT_ROTATE );
rBindings.Invalidate( SID_OBJECT_MIRROR );
-// Sofort in den Edit Mode setzen
-// SetInEditMode();
+// Sofort in den Edit Mode setzen
+// SetInEditMode();
-// if (!pTextObj)
+// if (!pTextObj)
{
/**********************************************************************
* Kein Textobjekt im EditMode, daher CreateMode setzen
**********************************************************************/
USHORT nObj = OBJ_TEXT;
-/* UINT16 nIdent;
+/* UINT16 nIdent;
UINT32 nInvent;
pView->TakeCurrentObj(nIdent, nInvent);
*/
@@ -631,7 +631,7 @@ void FuText::Activate()
}
aNewPointer = Pointer(POINTER_TEXT);
-// aNewPointer = Pointer(POINTER_CROSS); //! ???
+// aNewPointer = Pointer(POINTER_CROSS); //! ???
aOldPointer = pWindow->GetPointer();
pViewShell->SetActivePointer( aNewPointer );
@@ -700,21 +700,21 @@ void FuText::SelectionHasChanged()
UINT32 nInvent;
pView->TakeCurrentObj(nIdent, nInvent);
-// if (! pView->IsEditMode() )
-// {
-// if (nIdent == OBJ_TEXT)
-// {
-// nObj = OBJ_TEXT;
-// }
-// else if (nIdent == OBJ_OUTLINETEXT)
-// {
-// nObj = OBJ_OUTLINETEXT;
-// }
-// else if (nIdent == OBJ_TITLETEXT)
-// {
-// nObj = OBJ_TITLETEXT;
-// }
-// }
+// if (! pView->IsEditMode() )
+// {
+// if (nIdent == OBJ_TEXT)
+// {
+// nObj = OBJ_TEXT;
+// }
+// else if (nIdent == OBJ_OUTLINETEXT)
+// {
+// nObj = OBJ_OUTLINETEXT;
+// }
+// else if (nIdent == OBJ_TITLETEXT)
+// {
+// nObj = OBJ_TITLETEXT;
+// }
+// }
pView->SetCurrentObj(nObj);
@@ -767,27 +767,27 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel,
SdrOutliner* pO = MakeOutliner();
lcl_UpdateHyphenator( *pO, pObj );
- // vertical flag:
- // deduced from slot ids only if text object has no content
+ // vertical flag:
+ // deduced from slot ids only if text object has no content
USHORT nSlotID = aSfxRequest.GetSlot();
BOOL bVertical = ( nSlotID == SID_DRAW_TEXT_VERTICAL );
OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject();
if ( pOPO )
- bVertical = pOPO->IsVertical(); // content wins
+ bVertical = pOPO->IsVertical(); // content wins
pO->SetVertical( bVertical );
- //!?? ohne uebergebenen Outliner stimmen die Defaults nicht ???!?
+ //!?? ohne uebergebenen Outliner stimmen die Defaults nicht ???!?
if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, sal_True, pO) )
{
- // EditEngine-UndoManager anmelden
+ // EditEngine-UndoManager anmelden
pViewShell->SetDrawTextUndo( &pO->GetUndoManager() );
pTextObj = (SdrTextObj*) pObj;
pView->SetEditMode();
- // set text cursor to click position or to end,
- // pass initial key event to outliner view
+ // set text cursor to click position or to end,
+ // pass initial key event to outliner view
if ( pMousePixel || bCursorToEnd || pInitialKey )
{
OutlinerView* pOLV = pView->GetTextEditOutlinerView();
@@ -869,7 +869,7 @@ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rR
pObj->SetMergedItemSetAndBroadcast(aSet);
}
- SetInEditMode( pObj ); // #105815# start edit mode
+ SetInEditMode( pObj ); // #105815# start edit mode
}
else
{
diff --git a/sc/source/ui/drawfunc/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxx
index 340e71faa71c..84763a922732 100644
--- a/sc/source/ui/drawfunc/futext2.cxx
+++ b/sc/source/ui/drawfunc/futext2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -291,11 +291,11 @@ SdrOutliner* FuText::MakeOutliner()
pViewData->UpdateOutlinerFlags(*pOutl);
- // Die EditEngine benutzt beim RTF Export (Clipboard / Drag&Drop)
- // den MapMode des RefDevices, um die Fontgroesse zu setzen
+ // Die EditEngine benutzt beim RTF Export (Clipboard / Drag&Drop)
+ // den MapMode des RefDevices, um die Fontgroesse zu setzen
- // #i10426# The ref device isn't set to the EditEngine before SdrBeginTextEdit now,
- // so the device must be taken from the model here.
+ // #i10426# The ref device isn't set to the EditEngine before SdrBeginTextEdit now,
+ // so the device must be taken from the model here.
OutputDevice* pRef = pDrDoc->GetRefDevice();
if (pRef && pRef != pWindow)
pRef->SetMapMode( MapMode(MAP_100TH_MM) );
diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx
index 534e68705fa8..dd6c80f17bec 100644
--- a/sc/source/ui/drawfunc/futext3.cxx
+++ b/sc/source/ui/drawfunc/futext3.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "global.hxx"
#include "drwlayer.hxx"
#include "userdat.hxx"
-#include "tabvwsh.hxx" // oder GetDocument irgendwo
+#include "tabvwsh.hxx" // oder GetDocument irgendwo
#include "document.hxx"
#include "editutil.hxx"
#include "futext.hxx"
@@ -55,10 +55,10 @@
#include "undocell.hxx"
// ------------------------------------------------------------------------------------
-// Editieren von Notiz-Legendenobjekten muss immer ueber StopEditMode beendet werden,
-// damit die Aenderungen ins Dokument uebernommen werden!
-// (Fontwork-Execute in drawsh und drtxtob passiert nicht fuer Legendenobjekte)
-// bTextDirection=TRUE means that this function is called from SID_TEXTDIRECTION_XXX(drtxtob.cxx).
+// Editieren von Notiz-Legendenobjekten muss immer ueber StopEditMode beendet werden,
+// damit die Aenderungen ins Dokument uebernommen werden!
+// (Fontwork-Execute in drawsh und drtxtob passiert nicht fuer Legendenobjekte)
+// bTextDirection=TRUE means that this function is called from SID_TEXTDIRECTION_XXX(drtxtob.cxx).
// ------------------------------------------------------------------------------------
void FuText::StopEditMode(BOOL /*bTextDirection*/)
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index 25cda28aaa9d..e38dba336764 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ void ScGraphicShell::ExecuteFilter( SfxRequest& rReq )
if( pPageView )
{
- SdrGrafObj* pFilteredObj = (SdrGrafObj*) pObj->Clone();
- String aStr( pView->GetDescriptionOfMarkedObjects() );
+ SdrGrafObj* pFilteredObj = (SdrGrafObj*) pObj->Clone();
+ String aStr( pView->GetDescriptionOfMarkedObjects() );
aStr.Append( sal_Unicode(' ') );
aStr.Append( String( ScResId( SCSTR_UNDO_GRAFFILTER ) ) );
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index 78948550aea6..92d8b6c5a785 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +73,15 @@ void ScMediaShell::GetMediaState( SfxItemSet& rSet )
if( pView )
{
- SfxWhichIter aIter( rSet );
- USHORT nWhich = aIter.FirstWhich();
+ SfxWhichIter aIter( rSet );
+ USHORT nWhich = aIter.FirstWhich();
while( nWhich )
{
if( SID_AVMEDIA_TOOLBOX == nWhich )
{
- SdrMarkList* pMarkList = new SdrMarkList( pView->GetMarkedObjectList() );
- bool bDisable = true;
+ SdrMarkList* pMarkList = new SdrMarkList( pView->GetMarkedObjectList() );
+ bool bDisable = true;
if( 1 == pMarkList->GetMarkCount() )
{
@@ -114,8 +114,8 @@ void ScMediaShell::ExecuteMedia( SfxRequest& rReq )
if( pView && SID_AVMEDIA_TOOLBOX == rReq.GetSlot() )
{
- const SfxItemSet* pArgs = rReq.GetArgs();
- const SfxPoolItem* pItem;
+ const SfxItemSet* pArgs = rReq.GetArgs();
+ const SfxPoolItem* pItem;
if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, FALSE, &pItem ) ) )
pItem = NULL;
diff --git a/sc/source/ui/drawfunc/objdraw.src b/sc/source/ui/drawfunc/objdraw.src
index 82649044b38c..81d1e2c7398f 100644
--- a/sc/source/ui/drawfunc/objdraw.src
+++ b/sc/source/ui/drawfunc/objdraw.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,7 +29,7 @@
#include "submenu.hrc"
#include <svx/globlmn.hrc>
//
- // Defines -------------------------------------------------------------------------------
+ // Defines -------------------------------------------------------------------------------
//
#define MN_RESET\
MenuItem\
@@ -40,8 +40,8 @@
Text [ x-comment ] = " ";\
};
- // Font (SID_ATTR_CHAR_FONT) und Groesse (SID_ATTR_CHAR_FONTHEIGHT) duerfen nicht im
- // Formatmenue auftauchen, weil die Controller im ExeEnv sonst im Container angelegt werden
+ // Font (SID_ATTR_CHAR_FONT) und Groesse (SID_ATTR_CHAR_FONTHEIGHT) duerfen nicht im
+ // Formatmenue auftauchen, weil die Controller im ExeEnv sonst im Container angelegt werden
#define MN_TEXT_ATTR\
MenuItem\
{\
@@ -118,7 +118,7 @@
HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \
RadioCheck = TRUE ; \
Text [ en-US ] = "~Left" ;\
- Text [ x-comment ] = " "; \
+ Text [ x-comment ] = " "; \
};\
MenuItem\
{\
@@ -358,7 +358,7 @@
Text [ x-comment ] = " ";\
};
-#define MN_ALIGNSUB \
+#define MN_ALIGNSUB \
MenuItem\
{\
Identifier = SID_OBJECT_ALIGN ; \
@@ -402,10 +402,10 @@
};
//
- // ------------------------------------------------------------------------------
+ // ------------------------------------------------------------------------------
//
//
- // Objekt-Leisten
+ // Objekt-Leisten
//
String RID_DRAW_OBJECTBAR
{
@@ -437,7 +437,7 @@ ToolBox RID_DRAW_OBJECTBAR
//---------------------------------------------
ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
//---------------------------------------------
- // Linien
+ // Linien
ToolBoxItem
{
Identifier = SID_ATTRIBUTES_LINE ;
@@ -485,7 +485,7 @@ ToolBox RID_DRAW_OBJECTBAR
//---------------------------------------------
ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
//---------------------------------------------
- // Rest
+ // Rest
ToolBoxItem
{
Identifier = SID_OBJECT_ROTATE ;
@@ -557,7 +557,7 @@ ToolBox RID_DRAW_OBJECTBAR
Scroll = TRUE ;
};
//
- // Text-Toolbox
+ // Text-Toolbox
//
String RID_TEXT_TOOLBOX
{
@@ -1063,7 +1063,7 @@ ToolBox RID_TEXT_TOOLBOX
};
};
//
- // Graphics toolbox
+ // Graphics toolbox
//
String RID_GRAPHIC_OBJECTBAR
{
@@ -1246,7 +1246,7 @@ ToolBox RID_GRAPHIC_OBJECTBAR
};
};
//
- // Popup-Menues ---------------------------------------------------------------------
+ // Popup-Menues ---------------------------------------------------------------------
//
String RID_POPUP_DRAW
{
@@ -1255,7 +1255,7 @@ String RID_POPUP_DRAW
Text [ x-comment ] = " ";
};
//
- // Popup-Menue fuer (allgemeine) Zeichenobjekte
+ // Popup-Menue fuer (allgemeine) Zeichenobjekte
//
Menu RID_POPUP_DRAW
{
@@ -1309,7 +1309,7 @@ Menu RID_POPUP_DRAW
};
//
- // Popup-Menue fuer (Uno-) Controls
+ // Popup-Menue fuer (Uno-) Controls
//
Menu RID_POPUP_CONTROL
@@ -1343,7 +1343,7 @@ Menu RID_POPUP_CONTROL
};
//
- // Grafik
+ // Grafik
//
Menu RID_POPUP_GRAPHIC
@@ -1386,7 +1386,7 @@ Menu RID_POPUP_GRAPHIC
};
//
- // Media
+ // Media
//
Menu RID_POPUP_MEDIA
@@ -1446,7 +1446,7 @@ ToolBox RID_MEDIA_OBJECTBAR
};
//
- // Ole-Objekt
+ // Ole-Objekt
//
Menu RID_POPUP_OLE
@@ -1476,7 +1476,7 @@ Menu RID_POPUP_OLE
};
//
- // Charts
+ // Charts
//
Menu RID_POPUP_CHART
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx
index f9346dd8da88..8b454012329a 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 1d522fb3211e..a19b3e984276 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +39,7 @@
#include <sfx2/viewsh.hxx>
#include "sc.hrc"
-#include "global.hxx" // ScAddress
+#include "global.hxx" // ScAddress
#include "scresid.hxx"
#include "reffact.hxx"
#include "document.hxx"
@@ -59,18 +59,18 @@
SFX_IMPL_DOCKINGWINDOW( ScFunctionChildWindow, FID_FUNCTION_BOX )
/*************************************************************************
-#* Member: ScFunctionChildWindow Datum:06.10.97
+#* Member: ScFunctionChildWindow Datum:06.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionChildWindow
+#* Klasse: ScFunctionChildWindow
#*
-#* Funktion: Konstruktor der Klasse ScFunctionChildWindow
-#* Ableitung vom SfxChildWindow als "Behaelter" fuer
-#* Funktions- Fenster in Clac
+#* Funktion: Konstruktor der Klasse ScFunctionChildWindow
+#* Ableitung vom SfxChildWindow als "Behaelter" fuer
+#* Funktions- Fenster in Clac
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -90,16 +90,16 @@ __EXPORT ScFunctionChildWindow::ScFunctionChildWindow( Window* pParentP,
}
/*************************************************************************
-#* Member: ScFunctionDockWin Datum:06.10.97
+#* Member: ScFunctionDockWin Datum:06.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Konstruktor der Klasse ScFunctionDockWin
+#* Funktion: Konstruktor der Klasse ScFunctionDockWin
#*
-#* Input: Sfx- Verknuepfungen, Fenster, Resource
+#* Input: Sfx- Verknuepfungen, Fenster, Resource
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -107,13 +107,13 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
SfxChildWindow *pCW, Window* pParent, const ResId& rResId ) :
SfxDockingWindow( pBindingsP, pCW, pParent, rResId ),
- aPrivatSplit ( this, ResId( FT_SPLIT, *rResId.GetResMgr() ),SC_SPLIT_VERT),
- aCatBox ( this, ResId( CB_CAT, *rResId.GetResMgr() ) ),
- aFuncList ( this, ResId( LB_FUNC, *rResId.GetResMgr() ) ),
- aDDFuncList ( this, ResId( DDLB_FUNC, *rResId.GetResMgr() ) ),
- aInsertButton ( this, ResId( IMB_INSERT, *rResId.GetResMgr() ) ),
- aFiFuncDesc ( this, ResId( FI_FUNCDESC, *rResId.GetResMgr() ) ),
- aOldSize (0,0)
+ aPrivatSplit ( this, ResId( FT_SPLIT, *rResId.GetResMgr() ),SC_SPLIT_VERT),
+ aCatBox ( this, ResId( CB_CAT, *rResId.GetResMgr() ) ),
+ aFuncList ( this, ResId( LB_FUNC, *rResId.GetResMgr() ) ),
+ aDDFuncList ( this, ResId( DDLB_FUNC, *rResId.GetResMgr() ) ),
+ aInsertButton ( this, ResId( IMB_INSERT, *rResId.GetResMgr() ) ),
+ aFiFuncDesc ( this, ResId( FI_FUNCDESC, *rResId.GetResMgr() ) ),
+ aOldSize (0,0)
{
FreeResource();
InitLRUList();
@@ -135,8 +135,8 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
Font aFont=aFiFuncDesc.GetFont();
aFont.SetColor(Color(COL_BLACK));
aFiFuncDesc.SetFont(aFont);
- aFiFuncDesc.SetBackground( GetBackground() ); //! never transparent?
-//? SetBackground();
+ aFiFuncDesc.SetBackground( GetBackground() ); //! never transparent?
+//? SetBackground();
Link aLink=LINK( this, ScFunctionDockWin, SelHdl);
aCatBox.SetSelectHdl(aLink);
@@ -169,16 +169,16 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
}
/*************************************************************************
-#* Member: ScFunctionDockWin Datum:06.10.97
+#* Member: ScFunctionDockWin Datum:06.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Destruktor der Klasse ScFunctionDockWin
+#* Funktion: Destruktor der Klasse ScFunctionDockWin
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -188,17 +188,17 @@ __EXPORT ScFunctionDockWin::~ScFunctionDockWin()
}
/*************************************************************************
-#* Member: UpdateFunctionList Datum:06.10.97
+#* Member: UpdateFunctionList Datum:06.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Aktualisiert die Liste der Funktionen ab-
-#* haengig von der eingestellten Kategorie.
+#* Funktion: Aktualisiert die Liste der Funktionen ab-
+#* haengig von der eingestellten Kategorie.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -206,7 +206,7 @@ void ScFunctionDockWin::InitLRUList()
{
const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions();
USHORT nLRUFuncCount = Min( rAppOpt.GetLRUFuncListCount(), (USHORT)LRU_MAX );
- USHORT* pLRUListIds = rAppOpt.GetLRUFuncList();
+ USHORT* pLRUListIds = rAppOpt.GetLRUFuncList();
USHORT i;
for ( i=0; i<LRU_MAX; i++ )
@@ -219,23 +219,23 @@ void ScFunctionDockWin::InitLRUList()
aLRUList[i] = pFuncMgr->Get( pLRUListIds[i] );
}
- USHORT nSelPos = aCatBox.GetSelectEntryPos();
+ USHORT nSelPos = aCatBox.GetSelectEntryPos();
if(nSelPos == 0)
UpdateFunctionList();
}
/*************************************************************************
-#* Member: UpdateFunctionList Datum:10.12.99
+#* Member: UpdateFunctionList Datum:10.12.99
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Aktualisiert die Liste der zuletzt verwendeten Funktionen.
+#* Funktion: Aktualisiert die Liste der zuletzt verwendeten Funktionen.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -250,16 +250,16 @@ void ScFunctionDockWin::UpdateLRUList()
/*************************************************************************
-#* Member: SetSize Datum:06.10.97
+#* Member: SetSize Datum:06.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Groesse fuer die einzelnen Controls einzustellen.
+#* Funktion: Groesse fuer die einzelnen Controls einzustellen.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -298,7 +298,7 @@ void ScFunctionDockWin::SetSize()
}
break;
- default: nNewDockMode=0;
+ default: nNewDockMode=0;
if(nDockMode!=nNewDockMode)
{
nDockMode=nNewDockMode;
@@ -327,17 +327,17 @@ void ScFunctionDockWin::SetSize()
}
}
/*************************************************************************
-#* Member: SetLeftRightSize Datum:15.10.97
+#* Member: SetLeftRightSize Datum:15.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Groesse fuer die einzelnen Controls einstellen,
-#* wenn Links oder Rechts angedockt wird.
+#* Funktion: Groesse fuer die einzelnen Controls einstellen,
+#* wenn Links oder Rechts angedockt wird.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -379,17 +379,17 @@ void ScFunctionDockWin::SetLeftRightSize()
}
/*************************************************************************
-#* Member: SetTopBottonSize Datum:15.10.97
+#* Member: SetTopBottonSize Datum:15.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Groesse fuer die einzelnen Controls einzustellen.
-#* wenn oben oder unten angedockt wird.
+#* Funktion: Groesse fuer die einzelnen Controls einzustellen.
+#* wenn oben oder unten angedockt wird.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -415,23 +415,23 @@ void ScFunctionDockWin::SetTopBottonSize()
}
/*************************************************************************
-#* Member: SetMyWidthLeRi Datum:15.10.97
+#* Member: SetMyWidthLeRi Datum:15.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Breite fuer die einzelnen Controls und
-#* das Fenster einstellen,wenn Li oder Re
+#* Funktion: Breite fuer die einzelnen Controls und
+#* das Fenster einstellen,wenn Li oder Re
#*
-#* Input: neue Fenstergroesse
+#* Input: neue Fenstergroesse
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
void ScFunctionDockWin::SetMyWidthLeRi(Size &aNewSize)
{
- if((ULONG)aNewSize.Width()<nMinWidth) aNewSize.Width()=nMinWidth;
+ if((ULONG)aNewSize.Width()<nMinWidth) aNewSize.Width()=nMinWidth;
Size aCDSize=aCatBox.GetSizePixel();
Size aFLSize=aFuncList.GetSizePixel();
@@ -455,17 +455,17 @@ void ScFunctionDockWin::SetMyWidthLeRi(Size &aNewSize)
}
/*************************************************************************
-#* Member: SetHeight Datum:06.10.97
+#* Member: SetHeight Datum:06.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Hoehe fuer die einzelnen Controls und
-#* das Fenster einstellen bei Li oder Re
+#* Funktion: Hoehe fuer die einzelnen Controls und
+#* das Fenster einstellen bei Li oder Re
#*
-#* Input: neue Fenstergroesse
+#* Input: neue Fenstergroesse
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -503,24 +503,24 @@ void ScFunctionDockWin::SetMyHeightLeRi(Size &aNewSize)
}
/*************************************************************************
-#* Member: SetMyWidthToBo Datum:16.10.97
+#* Member: SetMyWidthToBo Datum:16.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Breite fuer die einzelnen Controls und
-#* das Fenster einstellen, wenn oben oder
-#* unten angedockt werden soll.
+#* Funktion: Breite fuer die einzelnen Controls und
+#* das Fenster einstellen, wenn oben oder
+#* unten angedockt werden soll.
#*
-#* Input: neue Fenstergroesse
+#* Input: neue Fenstergroesse
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
void ScFunctionDockWin::SetMyWidthToBo(Size &aNewSize)
{
- if((ULONG)aNewSize.Width()<nMinWidth) aNewSize.Width()=nMinWidth;
+ if((ULONG)aNewSize.Width()<nMinWidth) aNewSize.Width()=nMinWidth;
Size aCDSize=aCatBox.GetSizePixel();
Size aDdFLSize=aDDFuncList.GetSizePixel();
@@ -544,18 +544,18 @@ void ScFunctionDockWin::SetMyWidthToBo(Size &aNewSize)
}
/*************************************************************************
-#* Member: SetHeight Datum:16.10.97
+#* Member: SetHeight Datum:16.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Hoehe fuer die einzelnen Controls und
-#* das Fenster einstellen, wenn oben oder
-#* unten angedockt werden soll.
+#* Funktion: Hoehe fuer die einzelnen Controls und
+#* das Fenster einstellen, wenn oben oder
+#* unten angedockt werden soll.
#*
-#* Input: neue Fenstergroesse
+#* Input: neue Fenstergroesse
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -573,16 +573,16 @@ void ScFunctionDockWin::SetMyHeightToBo(Size &aNewSize)
}
/*************************************************************************
-#* Member: SetDescription Datum:13.10.97
+#* Member: SetDescription Datum:13.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Erklaerungstext fuer die Funktion einstellen.
+#* Funktion: Erklaerungstext fuer die Funktion einstellen.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -596,7 +596,7 @@ void ScFunctionDockWin::SetDescription()
{
pDesc->initArgumentInfo(); // full argument info is needed
- String aString=pAllFuncList->GetSelectEntry();
+ String aString=pAllFuncList->GetSelectEntry();
if(nDockMode==0)
{
aString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ":\n\n" ));
@@ -628,17 +628,17 @@ void ScFunctionDockWin::SetDescription()
}
/*************************************************************************
-#* Member: Resizing Datum:06.10.97
+#* Member: Resizing Datum:06.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Ueberladene Funktion um die Groesse der
-#* einzelnen Controls einzustellen.
+#* Funktion: Ueberladene Funktion um die Groesse der
+#* einzelnen Controls einzustellen.
#*
-#* Input: neue Groesse
+#* Input: neue Groesse
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -650,16 +650,16 @@ void __EXPORT ScFunctionDockWin::Resizing( Size& rNewSize )
}
/*************************************************************************
-#* Member: Close Datum:07.10.97
+#* Member: Close Datum:07.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Schliessen des Fensters
+#* Funktion: Schliessen des Fensters
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: TRUE
+#* Output: TRUE
#*
#************************************************************************/
@@ -678,17 +678,17 @@ BOOL __EXPORT ScFunctionDockWin::Close()
/*************************************************************************
-#* Member: CheckAlignment Datum:16.10.97
+#* Member: CheckAlignment Datum:16.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Ueberprueft den Andockmodus und stellt die
-#* Groessen dementsprechend ein.
+#* Funktion: Ueberprueft den Andockmodus und stellt die
+#* Groessen dementsprechend ein.
#*
-#* Input: Das neue Alignment
+#* Input: Das neue Alignment
#*
-#* Output: Das uebergebene Alignment
+#* Output: Das uebergebene Alignment
#*
#************************************************************************/
SfxChildAlignment __EXPORT ScFunctionDockWin::CheckAlignment(SfxChildAlignment /* abla */,
@@ -732,7 +732,7 @@ SfxChildAlignment __EXPORT ScFunctionDockWin::CheckAlignment(SfxChildAlignment /
aTxtSize = Size( aFiFuncDesc.GetTextWidth(aString),
aFiFuncDesc.GetTextHeight() );
- default: Point aTopLeft=aCatBox.GetPosPixel();
+ default: Point aTopLeft=aCatBox.GetPosPixel();
nMinWidth=aTxtSize.Width()+aTopLeft.X()
+2*aFuncList.GetPosPixel().X();
nMinHeight=19*aTxtSize.Height();
@@ -744,16 +744,16 @@ SfxChildAlignment __EXPORT ScFunctionDockWin::CheckAlignment(SfxChildAlignment /
return aChildAlign;
}
/*************************************************************************
-#* Member: Close Datum:07.10.97
+#* Member: Close Datum:07.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Aenderungen erkennen
+#* Funktion: Aenderungen erkennen
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: TRUE
+#* Output: TRUE
#*
#************************************************************************/
void ScFunctionDockWin::Notify( SfxBroadcaster&, const SfxHint& /* rHint */ )
@@ -772,17 +772,17 @@ void ScFunctionDockWin::Notify( SfxBroadcaster&, const SfxHint& /* rHint */ )
/*************************************************************************
-#* Member: Resize Datum:06.10.97
+#* Member: Resize Datum:06.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Ueberladene Funktion um die Groesse der
-#* einzelnen Controls einzustellen.
+#* Funktion: Ueberladene Funktion um die Groesse der
+#* einzelnen Controls einzustellen.
#*
-#* Input: neue Groesse
+#* Input: neue Groesse
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -799,24 +799,24 @@ void __EXPORT ScFunctionDockWin::Resize()
}
/*************************************************************************
-#* Member: UpdateFunctionList Datum:06.10.97
+#* Member: UpdateFunctionList Datum:06.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Aktualisiert die Liste der Funktionen ab-
-#* haengig von der eingestellten Kategorie.
+#* Funktion: Aktualisiert die Liste der Funktionen ab-
+#* haengig von der eingestellten Kategorie.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
void ScFunctionDockWin::UpdateFunctionList()
{
- USHORT nSelPos = aCatBox.GetSelectEntryPos();
- USHORT nCategory = ( LISTBOX_ENTRY_NOTFOUND != nSelPos )
+ USHORT nSelPos = aCatBox.GetSelectEntryPos();
+ USHORT nCategory = ( LISTBOX_ENTRY_NOTFOUND != nSelPos )
? (nSelPos-1) : 0;
pAllFuncList->Clear();
@@ -862,18 +862,18 @@ void ScFunctionDockWin::UpdateFunctionList()
}
/*************************************************************************
-#* Member: DoEnter Datum:06.10.97
+#* Member: DoEnter Datum:06.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Eingabe ins Dokument uebernehmen. Wird aufgerufen
-#* nach betaetigen der Uebernehmen- Schaltflaeche
-#* oder einem Doppelklick in die Funktionsliste.
+#* Funktion: Eingabe ins Dokument uebernehmen. Wird aufgerufen
+#* nach betaetigen der Uebernehmen- Schaltflaeche
+#* oder einem Doppelklick in die Funktionsliste.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -917,7 +917,7 @@ void ScFunctionDockWin::DoEnter(BOOL /* bOk */) //@@ ???
aFirstArgStr.SearchAndReplaceAll(' ', '_');
aArgStr = aFirstArgStr;
if ( nArgs != VAR_ARGS )
- { // no VarArgs or Fix plus VarArgs, but not VarArgs only
+ { // no VarArgs or Fix plus VarArgs, but not VarArgs only
String aArgSep = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( "; " ));
USHORT nFix = ( nArgs < VAR_ARGS ? nArgs : nArgs - VAR_ARGS + 1 );
for ( USHORT nArg = 1;
@@ -949,7 +949,7 @@ void ScFunctionDockWin::DoEnter(BOOL /* bOk */) //@@ ???
{
pHdl->InsertFunction(aString);
pEdView->InsertText(aArgStr,TRUE);
- ESelection aESel=pEdView->GetSelection();
+ ESelection aESel=pEdView->GetSelection();
aESel.nEndPos=aESel.nStartPos+aFirstArgStr.Len();
pEdView->SetSelection(aESel);
pHdl->DataChanged();
@@ -978,17 +978,17 @@ void ScFunctionDockWin::DoEnter(BOOL /* bOk */) //@@ ???
/*************************************************************************
-#* Handle: SelHdl Datum:06.10.97
+#* Handle: SelHdl Datum:06.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Bei einer Aenderung der Kategorie wird die
-#* die Liste der Funktionen aktualisiert.
+#* Funktion: Bei einer Aenderung der Kategorie wird die
+#* die Liste der Funktionen aktualisiert.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -1011,17 +1011,17 @@ IMPL_LINK( ScFunctionDockWin, SelHdl, ListBox*, pLb )
}
/*************************************************************************
-#* Handle: SelHdl Datum:06.10.97
+#* Handle: SelHdl Datum:06.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Bei einer Aenderung der Kategorie wird die
-#* die Liste der Funktionen aktualisiert.
+#* Funktion: Bei einer Aenderung der Kategorie wird die
+#* die Liste der Funktionen aktualisiert.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -1030,7 +1030,7 @@ IMPL_LINK( ScFunctionDockWin, SetSelectionHdl, void*, pCtrl )
if ((ImageButton *)pCtrl == &aInsertButton ||
(ListBox *)pCtrl == &aFuncList)
{
- DoEnter(TRUE); // Uebernimmt die Eingabe
+ DoEnter(TRUE); // Uebernimmt die Eingabe
}
//...
@@ -1038,17 +1038,17 @@ IMPL_LINK( ScFunctionDockWin, SetSelectionHdl, void*, pCtrl )
}
/*************************************************************************
-#* Handle: SetSplitHdl Datum:13.10.97
+#* Handle: SetSplitHdl Datum:13.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScFunctionDockWin
+#* Klasse: ScFunctionDockWin
#*
-#* Funktion: Bei einer Aenderung des Split- Controls werden die
-#* einzelnen Controls an die neue Groesse angepasst.
+#* Funktion: Bei einer Aenderung des Split- Controls werden die
+#* einzelnen Controls an die neue Groesse angepasst.
#*
-#* Input: Zeiger auf Control
+#* Input: Zeiger auf Control
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -1140,8 +1140,8 @@ void ScFunctionDockWin::Initialize(SfxChildWinInfo *pInfo)
aCatBox.SelectEntryPos(nSelPos);
SelHdl(&aCatBox);
- // if the window has already been shown (from SfxDockingWindow::Initialize if docked),
- // set the splitter position now, otherwise it is set in StateChanged with type INITSHOW
+ // if the window has already been shown (from SfxDockingWindow::Initialize if docked),
+ // set the splitter position now, otherwise it is set in StateChanged with type INITSHOW
UseSplitterInitPos();
}
@@ -1165,7 +1165,7 @@ void ScFunctionDockWin::UseSplitterInitPos()
if ( IsVisible() && aPrivatSplit.IsEnabled() && aSplitterInitPos != Point() )
{
aPrivatSplit.MoveSplitTo(aSplitterInitPos);
- aSplitterInitPos = Point(); // use only once
+ aSplitterInitPos = Point(); // use only once
}
}
@@ -1175,7 +1175,7 @@ void ScFunctionDockWin::StateChanged( StateChangedType nStateChange )
if (nStateChange == STATE_CHANGE_INITSHOW)
{
- UseSplitterInitPos(); // set initial splitter position if necessary
+ UseSplitterInitPos(); // set initial splitter position if necessary
}
}
diff --git a/sc/source/ui/formdlg/dwfunctr.hrc b/sc/source/ui/formdlg/dwfunctr.hrc
index 388fea28b7ca..5daaa8a0a9a8 100644
--- a/sc/source/ui/formdlg/dwfunctr.hrc
+++ b/sc/source/ui/formdlg/dwfunctr.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,12 +25,12 @@
*
************************************************************************/
-#define CB_CAT 1
-#define LB_FUNC 2
-#define DDLB_FUNC 3
-#define IMB_INSERT 1
+#define CB_CAT 1
+#define LB_FUNC 2
+#define DDLB_FUNC 3
+#define IMB_INSERT 1
#define FI_FUNCDESC 1
-#define FT_SPLIT 2
+#define FT_SPLIT 2
// ********************************************************************** EOF
diff --git a/sc/source/ui/formdlg/dwfunctr.src b/sc/source/ui/formdlg/dwfunctr.src
index 6f8a054dd6ff..2f07ff5d1e30 100644
--- a/sc/source/ui/formdlg/dwfunctr.src
+++ b/sc/source/ui/formdlg/dwfunctr.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/source/ui/formdlg/formdata.cxx b/sc/source/ui/formdlg/formdata.cxx
index e493e3f7b00f..5fd792d12b41 100644
--- a/sc/source/ui/formdlg/formdata.cxx
+++ b/sc/source/ui/formdlg/formdata.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/formdlg/formdlgs.src b/sc/source/ui/formdlg/formdlgs.src
index e3550030c74e..3b76875e4e82 100644
--- a/sc/source/ui/formdlg/formdlgs.src
+++ b/sc/source/ui/formdlg/formdlgs.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/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 2d9cdef1b54e..a0847374bc6f 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -74,14 +74,14 @@
using namespace formula;
using namespace com::sun::star;
-ScDocument* ScFormulaDlg::pDoc = NULL;
+ScDocument* ScFormulaDlg::pDoc = NULL;
ScAddress ScFormulaDlg::aCursorPos;
-// --------------------------------------------------------------------------
-// Initialisierung / gemeinsame Funktionen fuer Dialog
-// --------------------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Initialisierung / gemeinsame Funktionen fuer Dialog
+// --------------------------------------------------------------------------
ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
Window* pParent, ScViewData* pViewData,formula::IFunctionManager* _pFunctionMgr )
@@ -112,10 +112,10 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
}
}
}
- //if ( !pParentDoc && pScViewShell ) // use current only if above fails
- // pParentDoc = pScViewShell->GetObjectShell();
+ //if ( !pParentDoc && pScViewShell ) // use current only if above fails
+ // pParentDoc = pScViewShell->GetObjectShell();
//if ( pParentDoc )
- // aDocName = pParentDoc->GetTitle();
+ // aDocName = pParentDoc->GetTitle();
if ( pDoc == NULL )
pDoc = pViewData->GetDocument();
@@ -125,7 +125,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
m_xOpCodeMapper.set(ScServiceProvider::MakeInstance(SC_SERVICE_OPCODEMAPPER,(ScDocShell*)pDoc->GetDocumentShell()),uno::UNO_QUERY);
- ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(pScViewShell);
+ ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(pScViewShell);
DBG_ASSERT( pInputHdl, "Missing input handler :-/" );
@@ -152,16 +152,16 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
SCTAB nTab = pViewData->GetTabNo();
aCursorPos = ScAddress( nCol, nRow, nTab );
- pScMod->InitFormEditData(); // neu anlegen
+ pScMod->InitFormEditData(); // neu anlegen
pData = pScMod->GetFormEditData();
pData->SetInputHandler(pScMod->GetInputHdl());
pData->SetDocShell(pViewData->GetDocShell());
DBG_ASSERT(pData,"FormEditData ist nicht da");
- formula::FormulaDlgMode eMode = FORMULA_FORMDLG_FORMULA; // Default...
+ formula::FormulaDlgMode eMode = FORMULA_FORMDLG_FORMULA; // Default...
- // Formel vorhanden? Dann editieren
+ // Formel vorhanden? Dann editieren
String aFormula;
pDoc->GetFormula( nCol, nRow, nTab, aFormula );
@@ -199,7 +199,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
pScMod->InputGetSelection( PrivStart, PrivEnd);
SetMeText(pScMod->InputGetFormulaStr(),PrivStart, PrivEnd,bMatrix,FALSE,FALSE);
- pData->SetFStart( 1 ); // hinter dem "="
+ pData->SetFStart( 1 ); // hinter dem "="
}
pData->SetMode( (USHORT) eMode );
@@ -216,7 +216,7 @@ void ScFormulaDlg::notifyChange()
{
ScModule* pScMod = SC_MOD();
- ScInputHandler* pInputHdl = pScMod->GetInputHdl();
+ ScInputHandler* pInputHdl = pScMod->GetInputHdl();
if ( pInputHdl )
pInputHdl->NotifyChange( NULL );
}
@@ -229,8 +229,8 @@ void ScFormulaDlg::fill()
String rStrExp;
if (pData)
{
- // Daten schon vorhanden -> Zustand wiederherstellen (nach Umschalten)
- // pDoc und aCursorPos nicht neu initialisieren
+ // Daten schon vorhanden -> Zustand wiederherstellen (nach Umschalten)
+ // pDoc und aCursorPos nicht neu initialisieren
//pDoc = pViewData->GetDocument();
if(IsInputHdl(pData->GetInputHandler()))
{
@@ -239,10 +239,10 @@ void ScFormulaDlg::fill()
else
{
PtrTabViewShell pTabViewShell;
- ScInputHandler* pInputHdl = GetNextInputHandler(pData->GetDocShell(),&pTabViewShell);
+ ScInputHandler* pInputHdl = GetNextInputHandler(pData->GetDocShell(),&pTabViewShell);
if ( pInputHdl == NULL ) //DocShell hat keinen InputHandler mehr,
- { //hat der Anwender halt Pech gehabt.
+ { //hat der Anwender halt Pech gehabt.
disableOk();
pInputHdl = pScMod->GetInputHdl();
}
@@ -288,7 +288,7 @@ BOOL ScFormulaDlg::IsInputHdl(ScInputHandler* pHdl)
{
BOOL bAlive = FALSE;
- // gehoert der InputHandler zu irgendeiner ViewShell ?
+ // gehoert der InputHandler zu irgendeiner ViewShell ?
TypeId aScType = TYPE(ScTabViewShell);
SfxViewShell* pSh = SfxViewShell::GetFirst( &aScType );
@@ -331,9 +331,9 @@ BOOL __EXPORT ScFormulaDlg::Close()
return TRUE;
}
-// --------------------------------------------------------------------------
-// Funktionen fuer rechte Seite
-// --------------------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Funktionen fuer rechte Seite
+// --------------------------------------------------------------------------
bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult )
{
BOOL bResult = TRUE;
@@ -349,7 +349,7 @@ bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult )
{
// ColRowName im RPN-Code?
if ( pCell->GetCode()->GetCodeLen() <= 1 )
- { // ==1: einzelner ist als Parameter immer Bereich
+ { // ==1: einzelner ist als Parameter immer Bereich
// ==0: es waere vielleicht einer, wenn..
String aBraced( '(' );
aBraced += rStrExp;
@@ -402,7 +402,7 @@ bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult )
-// virtuelle Methoden von ScAnyRefDlg:
+// virtuelle Methoden von ScAnyRefDlg:
void ScFormulaDlg::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton )
{
::std::pair<formula::RefButton*,formula::RefEdit*> aPair = RefInputStartBefore( pEdit, pButton );
@@ -428,16 +428,16 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, ScDocument* pRefDoc )
RefInputStart(GetActiveEdit());
}
- String aRefStr;
+ String aRefStr;
BOOL bOtherDoc = ( pRefDoc != pDoc && pRefDoc->GetDocumentShell()->HasName() );
if ( bOtherDoc )
{
- // Referenz auf anderes Dokument - wie inputhdl.cxx
+ // Referenz auf anderes Dokument - wie inputhdl.cxx
DBG_ASSERT(rRef.aStart.Tab()==rRef.aEnd.Tab(), "nStartTab!=nEndTab");
String aTmp;
- rRef.Format( aTmp, SCA_VALID|SCA_TAB_3D, pRefDoc ); // immer 3d
+ rRef.Format( aTmp, SCA_VALID|SCA_TAB_3D, pRefDoc ); // immer 3d
SfxObjectShell* pObjSh = pRefDoc->GetDocumentShell();
@@ -464,19 +464,19 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, ScDocument* pRefDoc )
BOOL ScFormulaDlg::IsRefInputMode() const
{
- const IFunctionDescription* pDesc = getCurrentFunctionDescription();
+ const IFunctionDescription* pDesc = getCurrentFunctionDescription();
BOOL bRef = (pDesc && (pDesc->getSuppressedArgumentCount() > 0)) && (pDoc!=NULL);
return bRef;
}
BOOL ScFormulaDlg::IsDocAllowed(SfxObjectShell* pDocSh) const
{
- // not allowed: different from this doc, and no name
- // pDocSh is always a ScDocShell
+ // not allowed: different from this doc, and no name
+ // pDocSh is always a ScDocShell
if ( pDocSh && ((ScDocShell*)pDocSh)->GetDocument() != pDoc && !pDocSh->HasName() )
return FALSE;
- return TRUE; // everything else is allowed
+ return TRUE; // everything else is allowed
}
void ScFormulaDlg::SetActive()
@@ -502,7 +502,7 @@ void ScFormulaDlg::doClose(BOOL /*_bOk*/)
{
m_aHelper.DoClose( ScFormulaDlgWrapper::GetChildWindowId() );
}
-void ScFormulaDlg::insertEntryToLRUList(const formula::IFunctionDescription* _pDesc)
+void ScFormulaDlg::insertEntryToLRUList(const formula::IFunctionDescription* _pDesc)
{
const ScFuncDesc* pDesc = dynamic_cast<const ScFuncDesc*>(_pDesc);
SaveLRUEntry(pDesc);
@@ -542,14 +542,14 @@ void ScFormulaDlg::ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pB
}
void ScFormulaDlg::dispatch(BOOL _bOK,BOOL _bMartixChecked)
{
- SfxBoolItem aRetItem( SID_DLG_RETOK, _bOK );
- SfxBoolItem aMatItem( SID_DLG_MATRIX, _bMartixChecked );
+ SfxBoolItem aRetItem( SID_DLG_RETOK, _bOK );
+ SfxBoolItem aMatItem( SID_DLG_MATRIX, _bMartixChecked );
SfxStringItem aStrItem( SCITEM_STRING, getCurrentFormula() );
// Wenn durch Dokument-Umschalterei die Eingabezeile weg war/ist,
// ist der String leer. Dann nicht die alte Formel loeschen.
if ( !aStrItem.GetValue().Len() )
- aRetItem.SetValue( FALSE ); // FALSE = Cancel
+ aRetItem.SetValue( FALSE ); // FALSE = Cancel
m_aHelper.SetDispatcherLock( FALSE ); // Modal-Modus ausschalten
@@ -572,7 +572,7 @@ void ScFormulaDlg::setReferenceInput(const formula::FormEditData* _pData)
void ScFormulaDlg::deleteFormData()
{
ScModule* pScMod = SC_MOD();
- pScMod->ClearFormEditData(); // pData wird ungueltig!
+ pScMod->ClearFormEditData(); // pData wird ungueltig!
}
void ScFormulaDlg::clear()
{
@@ -595,7 +595,7 @@ void ScFormulaDlg::switchBack()
ScInputHandler* pHdl = pScMod->GetInputHdl();
if ( pHdl )
{
- pHdl->ViewShellGone(NULL); // -> aktive View neu holen
+ pHdl->ViewShellGone(NULL); // -> aktive View neu holen
pHdl->ShowRefFrame();
}
diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx
index a3b27ba21b1d..8c8a970becf1 100644
--- a/sc/source/ui/formdlg/privsplt.cxx
+++ b/sc/source/ui/formdlg/privsplt.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +33,16 @@
#include "privsplt.hxx"
/*************************************************************************
-#* Member: ScPrivatSplit Datum:13.10.97
+#* Member: ScPrivatSplit Datum:13.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: MD_Test
+#* Klasse: MD_Test
#*
-#* Funktion: Konstruktor der Klasse ScPrivatSplit
+#* Funktion: Konstruktor der Klasse ScPrivatSplit
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -77,17 +77,17 @@ ScPrivatSplit::ScPrivatSplit( Window* pParent, const ResId& rResId,
/*************************************************************************
-#* Member: MouseButtonDown Datum:13.10.97
+#* Member: MouseButtonDown Datum:13.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScPrivatSplit
+#* Klasse: ScPrivatSplit
#*
-#* Funktion: Reagiert auf einen einzelnen Mouse-Event. Nach Aufruf
-#* werden alle Mauseingaben an dieses Control weitergeleitet.
+#* Funktion: Reagiert auf einen einzelnen Mouse-Event. Nach Aufruf
+#* werden alle Mauseingaben an dieses Control weitergeleitet.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -102,18 +102,18 @@ void ScPrivatSplit::MouseButtonDown( const MouseEvent& rMEvt )
}
/*************************************************************************
-#* Member: MouseButtonUp Datum:13.10.97
+#* Member: MouseButtonUp Datum:13.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScPrivatSplit
+#* Klasse: ScPrivatSplit
#*
-#* Funktion: Ende einer Benutzeraktion mit der Maus. Es werden
-#* die aktuelle Maus- Koordinaten ermittelt und fuer
-#* die Verschiebung des Fensters verwendet.
+#* Funktion: Ende einer Benutzeraktion mit der Maus. Es werden
+#* die aktuelle Maus- Koordinaten ermittelt und fuer
+#* die Verschiebung des Fensters verwendet.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -164,18 +164,18 @@ void ScPrivatSplit::MouseButtonUp( const MouseEvent& rMEvt )
}
/*************************************************************************
-#* Member: MouseMove Datum:13.10.97
+#* Member: MouseMove Datum:13.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScPrivatSplit
+#* Klasse: ScPrivatSplit
#*
-#* Funktion: Reagiert kontinuierlich auf Mausbewegungen. Es werden
-#* die aktuelle Maus- Koordinaten ermittelt und fuer
-#* die Verschiebung des Fensters verwendet.
+#* Funktion: Reagiert kontinuierlich auf Mausbewegungen. Es werden
+#* die aktuelle Maus- Koordinaten ermittelt und fuer
+#* die Verschiebung des Fensters verwendet.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -229,16 +229,16 @@ void ScPrivatSplit::MouseMove( const MouseEvent& rMEvt )
}
/*************************************************************************
-#* Member: SetYRange Datum:14.10.97
+#* Member: SetYRange Datum:14.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScPrivatSplit
+#* Klasse: ScPrivatSplit
#*
-#* Funktion: Setzt den Range fuer die Y- Verschiebung
+#* Funktion: Setzt den Range fuer die Y- Verschiebung
#*
-#* Input: neuer Bereich
+#* Input: neuer Bereich
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
void ScPrivatSplit::SetYRange(Range cRgeY)
@@ -249,16 +249,16 @@ void ScPrivatSplit::SetYRange(Range cRgeY)
/*************************************************************************
-#* Member: GetDeltaY Datum:13.10.97
+#* Member: GetDeltaY Datum:13.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScPrivatSplit
+#* Klasse: ScPrivatSplit
#*
-#* Funktion: Liefert die relative x-Verschiebung zurueck
+#* Funktion: Liefert die relative x-Verschiebung zurueck
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
short ScPrivatSplit::GetDeltaX()
@@ -267,16 +267,16 @@ short ScPrivatSplit::GetDeltaX()
}
/*************************************************************************
-#* Member: GetDeltaY Datum:13.10.97
+#* Member: GetDeltaY Datum:13.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScPrivatSplit
+#* Klasse: ScPrivatSplit
#*
-#* Funktion: Liefert die relative y-Verschiebung zurueck
+#* Funktion: Liefert die relative y-Verschiebung zurueck
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
short ScPrivatSplit::GetDeltaY()
@@ -285,17 +285,17 @@ short ScPrivatSplit::GetDeltaY()
}
/*************************************************************************
-#* Member: CtrModified Datum:13.10.97
+#* Member: CtrModified Datum:13.10.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScPrivatSplit
+#* Klasse: ScPrivatSplit
#*
-#* Funktion: Teilt einem installierten Handler mit, dass
-#* eine Veraenderung eingetreten ist.
+#* Funktion: Teilt einem installierten Handler mit, dass
+#* eine Veraenderung eingetreten ist.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
void ScPrivatSplit::CtrModified()
diff --git a/sc/source/ui/inc/AccessibilityHints.hxx b/sc/source/ui/inc/AccessibilityHints.hxx
index 8d966a78fa7f..f77e91efee3e 100644
--- a/sc/source/ui/inc/AccessibilityHints.hxx
+++ b/sc/source/ui/inc/AccessibilityHints.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 <svl/smplhint.hxx>
#include <svl/hint.hxx>
-#define SC_HINT_ACC_SIMPLE_START SFX_HINT_USER00
-#define SC_HINT_ACC_TABLECHANGED SC_HINT_ACC_SIMPLE_START + 1
-#define SC_HINT_ACC_CURSORCHANGED SC_HINT_ACC_SIMPLE_START + 2
-#define SC_HINT_ACC_VISAREACHANGED SC_HINT_ACC_SIMPLE_START + 3
+#define SC_HINT_ACC_SIMPLE_START SFX_HINT_USER00
+#define SC_HINT_ACC_TABLECHANGED SC_HINT_ACC_SIMPLE_START + 1
+#define SC_HINT_ACC_CURSORCHANGED SC_HINT_ACC_SIMPLE_START + 2
+#define SC_HINT_ACC_VISAREACHANGED SC_HINT_ACC_SIMPLE_START + 3
#define SC_HINT_ACC_ENTEREDITMODE SC_HINT_ACC_SIMPLE_START + 4
#define SC_HINT_ACC_LEAVEEDITMODE SC_HINT_ACC_SIMPLE_START + 5
#define SC_HINT_ACC_MAKEDRAWLAYER SC_HINT_ACC_SIMPLE_START + 6
@@ -48,7 +48,7 @@ class ScAccWinFocusLostHint : public SfxHint
xOldAccessible;
public:
TYPEINFO();
- ScAccWinFocusLostHint(
+ ScAccWinFocusLostHint(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xOld );
~ScAccWinFocusLostHint();
@@ -62,7 +62,7 @@ class ScAccWinFocusGotHint : public SfxHint
xNewAccessible;
public:
TYPEINFO();
- ScAccWinFocusGotHint(
+ ScAccWinFocusGotHint(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xNew );
~ScAccWinFocusGotHint();
@@ -72,26 +72,26 @@ public:
class ScAccGridWinFocusLostHint : public ScAccWinFocusLostHint
{
- ScSplitPos eOldGridWin;
+ ScSplitPos eOldGridWin;
public:
TYPEINFO();
- ScAccGridWinFocusLostHint( ScSplitPos eOldGridWin,
+ ScAccGridWinFocusLostHint( ScSplitPos eOldGridWin,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xOld );
~ScAccGridWinFocusLostHint();
- ScSplitPos GetOldGridWin() const { return eOldGridWin; }
+ ScSplitPos GetOldGridWin() const { return eOldGridWin; }
};
class ScAccGridWinFocusGotHint : public ScAccWinFocusGotHint
{
- ScSplitPos eNewGridWin;
+ ScSplitPos eNewGridWin;
public:
TYPEINFO();
ScAccGridWinFocusGotHint( ScSplitPos eNewGridWin,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xNew );
~ScAccGridWinFocusGotHint();
- ScSplitPos GetNewGridWin() const { return eNewGridWin; }
+ ScSplitPos GetNewGridWin() const { return eNewGridWin; }
};
#endif
diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx
index 38dfdc483886..dc639994e240 100644
--- a/sc/source/ui/inc/AccessibleCell.hxx
+++ b/sc/source/ui/inc/AccessibleCell.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
class ScTabViewShell;
class ScAccessibleDocument;
-/** @descr
+/** @descr
This base class provides an implementation of the
<code>AccessibleCell</code> service.
*/
class ScAccessibleCell
- : public ScAccessibleCellBase,
+ : public ScAccessibleCellBase,
public accessibility::AccessibleStaticTextBase
{
public:
@@ -89,31 +89,31 @@ public:
throw (::com::sun::star::uno::RuntimeException);
protected:
- /// Return the object's current bounding box relative to the desktop.
+ /// Return the object's current bounding box relative to the desktop.
virtual Rectangle GetBoundingBoxOnScreen(void) const
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current bounding box relative to the parent object.
+ /// Return the object's current bounding box relative to the parent object.
virtual Rectangle GetBoundingBox(void) const
throw (::com::sun::star::uno::RuntimeException);
public:
///===== XAccessibleContext ==============================================
- /// Return the number of currently visible children.
+ /// Return the number of currently visible children.
// is overloaded to calculate this on demand
virtual sal_Int32 SAL_CALL
getAccessibleChildCount(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the specified child or NULL if index is invalid.
+ /// Return the specified child or NULL if index is invalid.
// is overloaded to calculate this on demand
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);
- /// Return the set of current states.
+ /// Return the set of current states.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
getAccessibleStateSet(void)
@@ -126,7 +126,7 @@ public:
///===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName(void)
diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx
index 2bcef463480d..d0c82c0dfef7 100644
--- a/sc/source/ui/inc/AccessibleCellBase.hxx
+++ b/sc/source/ui/inc/AccessibleCellBase.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +41,7 @@ typedef cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleValue>
ScAccessibleCellBaseImpl;
class ScAccessibleCellBase
- : public ScAccessibleContextBase,
+ : public ScAccessibleContextBase,
public ScAccessibleCellBaseImpl
{
public:
@@ -58,12 +58,12 @@ public:
///===== 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 ();
-
+
virtual void SAL_CALL release() throw ();
///===== XAccessibleComponent ============================================
@@ -71,26 +71,26 @@ public:
virtual sal_Bool SAL_CALL isVisible( )
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getForeground( )
+ virtual sal_Int32 SAL_CALL getForeground( )
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getBackground( )
+ virtual sal_Int32 SAL_CALL getBackground( )
throw (::com::sun::star::uno::RuntimeException);
///===== XAccessibleContext ==============================================
- /// Return this objects index among the parents children.
- virtual sal_Int32 SAL_CALL
+ /// Return this objects index among the parents children.
+ virtual sal_Int32 SAL_CALL
getAccessibleIndexInParent(void)
throw (::com::sun::star::uno::RuntimeException);
protected:
- /// Return this object's description.
+ /// Return this object's description.
virtual ::rtl::OUString SAL_CALL
createAccessibleDescription(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current name.
+ /// Return the object's current name.
virtual ::rtl::OUString SAL_CALL
createAccessibleName(void)
throw (::com::sun::star::uno::RuntimeException);
@@ -116,7 +116,7 @@ public:
///===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName(void)
@@ -125,11 +125,11 @@ public:
///===== XTypeProvider ===================================================
/// returns the possible types
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL
- getTypes()
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL
+ getTypes()
throw (::com::sun::star::uno::RuntimeException);
- /** Returns a implementation id.
+ /** Returns a implementation id.
*/
virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
getImplementationId(void)
@@ -147,7 +147,7 @@ private:
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
};
-
+
#endif
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx
index ecfeff96af39..51313ba83788 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
class Rectangle;
-/** @descr
+/** @descr
This base class provides an implementation of the
<code>AccessibleContext</code> service.
*/
@@ -73,7 +73,7 @@ typedef cppu::ImplHelper1<
> ScAccessibleContextBaseImplEvent;
class ScAccessibleContextBase
- : public comphelper::OBaseMutex,
+ : public comphelper::OBaseMutex,
public ScAccessibleContextBaseWeakImpl,
public ScAccessibleContextBaseImplEvent,
public SfxListener
@@ -109,7 +109,7 @@ public:
///===== XAccessible =====================================================
- /// Return the XAccessibleContext.
+ /// Return the XAccessibleContext.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL
getAccessibleContext(void) throw (::com::sun::star::uno::RuntimeException);
@@ -145,62 +145,62 @@ public:
virtual void SAL_CALL grabFocus( )
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getForeground( )
+ virtual sal_Int32 SAL_CALL getForeground( )
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getBackground( )
+ virtual sal_Int32 SAL_CALL getBackground( )
throw (::com::sun::star::uno::RuntimeException);
///===== XAccessibleContext ==============================================
- /// Return the number of currently visible children.
+ /// Return the number of currently visible children.
virtual sal_Int32 SAL_CALL
getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException);
- /// Return the specified child or NULL if index is invalid.
+ /// Return the specified child or NULL if index is invalid.
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);
- /// Return a reference to the parent.
+ /// Return a reference to the parent.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleParent(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return this objects index among the parents children.
- virtual sal_Int32 SAL_CALL
+ /// Return this objects index among the parents children.
+ virtual sal_Int32 SAL_CALL
getAccessibleIndexInParent(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return this object's role.
+ /// Return this object's role.
virtual sal_Int16 SAL_CALL
getAccessibleRole(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return this object's description.
+ /// Return this object's description.
virtual ::rtl::OUString SAL_CALL
getAccessibleDescription(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current name.
+ /// Return the object's current name.
virtual ::rtl::OUString SAL_CALL
getAccessibleName(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return NULL to indicate that an empty relation set.
+ /// Return NULL to indicate that an empty relation set.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL
getAccessibleRelationSet(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the set of current states.
+ /// Return the set of current states.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
getAccessibleStateSet(void)
throw (::com::sun::star::uno::RuntimeException);
- /** Return the parents locale or throw exception if this object has no
+ /** Return the parents locale or throw exception if this object has no
parent yet/anymore.
*/
virtual ::com::sun::star::lang::Locale SAL_CALL
@@ -210,7 +210,7 @@ public:
///===== XAccessibleEventBroadcaster =====================================
- /** Add listener that is informed of future changes of name,
+ /** Add listener that is informed of future changes of name,
description and so on events.
*/
virtual void SAL_CALL
@@ -219,7 +219,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<
@@ -239,13 +239,13 @@ public:
///===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName(void)
throw (::com::sun::star::uno::RuntimeException);
- /** Return whether the specified service is supported by this class.
+ /** Return whether the specified service is supported by this class.
*/
virtual sal_Bool SAL_CALL
supportsService(const ::rtl::OUString& sServiceName)
@@ -265,28 +265,28 @@ public:
getTypes()
throw (::com::sun::star::uno::RuntimeException);
- /** Returns a implementation id.
+ /** Returns a implementation id.
*/
virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
getImplementationId(void)
throw (::com::sun::star::uno::RuntimeException);
protected:
- /// Return this object's description.
+ /// Return this object's description.
virtual ::rtl::OUString SAL_CALL
createAccessibleDescription(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current name.
+ /// Return the object's current name.
virtual ::rtl::OUString SAL_CALL
createAccessibleName(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current bounding box relative to the desktop.
+ /// Return the object's current bounding box relative to the desktop.
virtual Rectangle GetBoundingBoxOnScreen(void) const
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current bounding box relative to the parent object.
+ /// Return the object's current bounding box relative to the parent object.
virtual Rectangle GetBoundingBox(void) const
throw (::com::sun::star::uno::RuntimeException);
@@ -316,18 +316,18 @@ protected:
/// Use this method to set initial Description without notification
void SetDescription(const rtl::OUString& rDesc) { msDescription = rDesc; }
- /// Reference to the parent object.
+ /// Reference to the parent object.
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible> mxParent;
private:
- /** Description of this object. This is not a constant because it can
+ /** Description of this object. This is not a constant because it can
be set from the outside. Furthermore, it changes according the the
draw page's display mode.
*/
::rtl::OUString msDescription;
- /** Name of this object. It changes according the the draw page's
+ /** Name of this object. It changes according the the draw page's
display mode.
*/
::rtl::OUString msName;
diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx
index 14f48b51efc1..051e1b11c0fb 100644
--- a/sc/source/ui/inc/AccessibleCsvControl.hxx
+++ b/sc/source/ui/inc/AccessibleCsvControl.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/AccessibleDataPilotControl.hxx b/sc/source/ui/inc/AccessibleDataPilotControl.hxx
index c86d598b6e9c..c3be6d4096a0 100644
--- a/sc/source/ui/inc/AccessibleDataPilotControl.hxx
+++ b/sc/source/ui/inc/AccessibleDataPilotControl.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ class ScDPFieldWindow;
class ScAccessibleDataPilotButton;
class ScAccessibleDataPilotControl
- : public ScAccessibleContextBase
+ : public ScAccessibleContextBase
{
public:
//===== internal ========================================================
@@ -71,25 +71,25 @@ public:
virtual void SAL_CALL grabFocus( )
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getForeground( )
+ virtual sal_Int32 SAL_CALL getForeground( )
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getBackground( )
+ virtual sal_Int32 SAL_CALL getBackground( )
throw (::com::sun::star::uno::RuntimeException);
///===== XAccessibleContext ==============================================
- /// Return the number of currently visible children.
+ /// Return the number of currently visible children.
virtual sal_Int32 SAL_CALL
getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException);
- /// Return the specified child or NULL if index is invalid.
+ /// Return the specified child or NULL if index is invalid.
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);
- /// Return the set of current states.
+ /// Return the set of current states.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
getAccessibleStateSet(void)
@@ -97,7 +97,7 @@ public:
///===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName(void)
@@ -105,28 +105,28 @@ public:
///===== XTypeProvider ===================================================
- /** Returns a implementation id.
+ /** Returns a implementation id.
*/
virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
getImplementationId(void)
throw (::com::sun::star::uno::RuntimeException);
protected:
- /// Return this object's description.
+ /// Return this object's description.
virtual ::rtl::OUString SAL_CALL
createAccessibleDescription(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current name.
+ /// Return the object's current name.
virtual ::rtl::OUString SAL_CALL
createAccessibleName(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current bounding box relative to the desktop.
+ /// Return the object's current bounding box relative to the desktop.
virtual Rectangle GetBoundingBoxOnScreen(void) const
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current bounding box relative to the parent object.
+ /// Return the object's current bounding box relative to the parent object.
virtual Rectangle GetBoundingBox(void) const
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx
index 2ec612e0865b..ebb989b53ad0 100644
--- a/sc/source/ui/inc/AccessibleDocument.hxx
+++ b/sc/source/ui/inc/AccessibleDocument.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +50,7 @@ namespace utl
class AccessibleRelationSetHelper;
}
-/** @descr
+/** @descr
This base class provides an implementation of the
<code>AccessibleContext</code> service.
*/
@@ -60,7 +60,7 @@ typedef cppu::ImplHelper2< ::com::sun::star::accessibility::XAccessibleSelection
ScAccessibleDocumentImpl;
class ScAccessibleDocument
- : public ScAccessibleDocumentBase,
+ : public ScAccessibleDocumentBase,
public ScAccessibleDocumentImpl,
public accessibility::IAccessibleViewForwarder
{
@@ -71,7 +71,7 @@ public:
::com::sun::star::accessibility::XAccessible>& rxParent,
ScTabViewShell* pViewShell,
ScSplitPos eSplitPos);
-
+
virtual void Init();
@@ -91,12 +91,12 @@ public:
///===== 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 ();
-
+
virtual void SAL_CALL release() throw ();
///===== XAccessibleComponent ============================================
@@ -111,18 +111,18 @@ public:
///===== XAccessibleContext ==============================================
- /// Return the number of currently visible children.
+ /// Return the number of currently visible children.
virtual sal_Int32 SAL_CALL
getAccessibleChildCount(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the specified child or NULL if index is invalid.
+ /// Return the specified child or NULL if index is invalid.
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);
- /// Return the set of current states.
+ /// Return the set of current states.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
getAccessibleStateSet(void)
@@ -130,42 +130,42 @@ public:
///===== XAccessibleSelection ===========================================
- virtual void SAL_CALL
- selectAccessibleChild( sal_Int32 nChildIndex )
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
+ virtual void SAL_CALL
+ selectAccessibleChild( sal_Int32 nChildIndex )
+ throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL
- isAccessibleChildSelected( sal_Int32 nChildIndex )
+ virtual sal_Bool SAL_CALL
+ isAccessibleChildSelected( sal_Int32 nChildIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL
- clearAccessibleSelection( )
+ virtual void SAL_CALL
+ clearAccessibleSelection( )
throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL
- selectAllAccessibleChildren( )
+ virtual void SAL_CALL
+ selectAllAccessibleChildren( )
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL
- getSelectedAccessibleChildCount( )
+ virtual sal_Int32 SAL_CALL
+ getSelectedAccessibleChildCount( )
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible > SAL_CALL
- getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
+ ::com::sun::star::accessibility::XAccessible > SAL_CALL
+ getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL
- deselectAccessibleChild( sal_Int32 nChildIndex )
+ virtual void SAL_CALL
+ deselectAccessibleChild( sal_Int32 nChildIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException);
///===== XSelectionListener =============================================
- virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent )
+ virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent )
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
@@ -173,7 +173,7 @@ public:
///===== XServiceInfo ===================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName(void)
@@ -188,11 +188,11 @@ public:
///===== XTypeProvider ===================================================
/// returns the possible types
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL
- getTypes()
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL
+ getTypes()
throw (::com::sun::star::uno::RuntimeException);
- /** Returns a implementation id.
+ /** Returns a implementation id.
*/
virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
getImplementationId(void)
@@ -211,7 +211,7 @@ public:
/** Returns the area of the underlying document that is visible in the
* corresponding window.
- @return
+ @return
The rectangle of the visible part of the document. The values
are, contrary to the base class, in internal coordinates.
*/
@@ -223,7 +223,7 @@ public:
@param rPoint
Point in internal coordinates.
- @return
+ @return
The same point but in screen coordinates relative to the upper
left corner of the (current) screen.
*/
@@ -235,7 +235,7 @@ public:
@param rSize
Size in internal coordinates.
- @return
+ @return
The same size but in screen coordinates.
*/
virtual Size LogicToPixel (const Size& rSize) const;
@@ -247,7 +247,7 @@ public:
Point in screen coordinates relative to the upper left corner of
the (current) screen.
- @return
+ @return
The same point but in internal coordinates.
*/
virtual Point PixelToLogic (const Point& rPoint) const;
@@ -264,7 +264,7 @@ public:
virtual Size PixelToLogic (const Size& rSize) const;
///======== internal =====================================================
-
+
utl::AccessibleRelationSetHelper* GetRelationSet(const ScAddress* pAddress) const;
::com::sun::star::uno::Reference
@@ -272,27 +272,27 @@ public:
GetAccessibleSpreadsheet();
protected:
- /// Return this object's description.
+ /// Return this object's description.
virtual ::rtl::OUString SAL_CALL
createAccessibleDescription(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current name.
+ /// Return the object's current name.
virtual ::rtl::OUString SAL_CALL
createAccessibleName(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current bounding box relative to the desktop.
+ /// Return the object's current bounding box relative to the desktop.
virtual Rectangle GetBoundingBoxOnScreen(void) const
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current bounding box relative to the parent object.
+ /// Return the object's current bounding box relative to the parent object.
virtual Rectangle GetBoundingBox(void) const
throw (::com::sun::star::uno::RuntimeException);
private:
- ScTabViewShell* mpViewShell;
- ScSplitPos meSplitPos;
+ ScTabViewShell* mpViewShell;
+ ScSplitPos meSplitPos;
ScAccessibleSpreadsheet* mpAccessibleSpreadsheet;
ScChildrenShapes* mpChildrenShapes;
ScAccessibleEditObject* mpTempAccEdit;
diff --git a/sc/source/ui/inc/AccessibleDocumentBase.hxx b/sc/source/ui/inc/AccessibleDocumentBase.hxx
index fc76a8d771cf..a897485f0d46 100644
--- a/sc/source/ui/inc/AccessibleDocumentBase.hxx
+++ b/sc/source/ui/inc/AccessibleDocumentBase.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#endif
class ScAccessibleDocumentBase
- : public ScAccessibleContextBase
+ : public ScAccessibleContextBase
{
public:
//===== internal ========================================================
@@ -42,7 +42,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>& rxParent);
protected:
- virtual ~ScAccessibleDocumentBase (void);
+ virtual ~ScAccessibleDocumentBase (void);
};
diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
index 8ce9050c6094..eb7c5c32ddd5 100644
--- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
+++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 ScAccessiblePreviewTable;
class ScAccessiblePageHeader;
class ScAccessibleDocumentPagePreview
- : public ScAccessibleDocumentBase
+ : public ScAccessibleDocumentBase
{
public:
//===== internal ========================================================
@@ -72,18 +72,18 @@ public:
///===== XAccessibleContext ==============================================
- /// Return the number of currently visible children.
+ /// Return the number of currently visible children.
virtual sal_Int32 SAL_CALL
getAccessibleChildCount(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the specified child or NULL if index is invalid.
+ /// Return the specified child or NULL if index is invalid.
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);
- /// Return the set of current states.
+ /// Return the set of current states.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
getAccessibleStateSet(void)
@@ -91,7 +91,7 @@ public:
///===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName(void)
@@ -105,7 +105,7 @@ public:
///===== XTypeProvider ===================================================
- /** Returns a implementation id.
+ /** Returns a implementation id.
*/
virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
getImplementationId(void)
@@ -119,28 +119,28 @@ public:
//UNUSED2009-05 void ChildCountChanged();
protected:
- /// Return this object's description.
+ /// Return this object's description.
virtual ::rtl::OUString SAL_CALL
createAccessibleDescription(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current name.
+ /// Return the object's current name.
virtual ::rtl::OUString SAL_CALL
createAccessibleName(void)
throw (::com::sun::star::uno::RuntimeException);
public: // needed in ScShapeChilds
- /// Return the object's current bounding box relative to the desktop.
+ /// Return the object's current bounding box relative to the desktop.
virtual Rectangle GetBoundingBoxOnScreen(void) const
throw (::com::sun::star::uno::RuntimeException);
protected:
- /// Return the object's current bounding box relative to the parent object.
+ /// Return the object's current bounding box relative to the parent object.
virtual Rectangle GetBoundingBox(void) const
throw (::com::sun::star::uno::RuntimeException);
private:
- ScPreviewShell* mpViewShell;
+ ScPreviewShell* mpViewShell;
ScNotesChilds* mpNotesChilds;
ScShapeChilds* mpShapeChilds;
ScAccessiblePreviewTable* mpTable;
diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx
index 55bb92f13424..86fc05600b36 100644
--- a/sc/source/ui/inc/AccessibleEditObject.hxx
+++ b/sc/source/ui/inc/AccessibleEditObject.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,19 +45,19 @@ enum EditObjectType
EditControl
};
-/** @descr
+/** @descr
This base class provides an implementation of the
<code>AccessibleCell</code> service.
*/
class ScAccessibleEditObject
- : public ScAccessibleContextBase
+ : public ScAccessibleContextBase
{
public:
//===== internal ========================================================
ScAccessibleEditObject(
const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>& rxParent,
- EditView* pEditView, Window* pWin, const rtl::OUString& rName,
+ EditView* pEditView, Window* pWin, const rtl::OUString& rName,
const rtl::OUString& rDescription, EditObjectType eObjectType);
protected:
@@ -84,43 +84,43 @@ public:
throw (::com::sun::star::uno::RuntimeException);
protected:
- /// Return the object's current bounding box relative to the desktop.
+ /// Return the object's current bounding box relative to the desktop.
virtual Rectangle GetBoundingBoxOnScreen(void) const
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current bounding box relative to the parent object.
+ /// Return the object's current bounding box relative to the parent object.
virtual Rectangle GetBoundingBox(void) const
throw (::com::sun::star::uno::RuntimeException);
public:
///===== XAccessibleContext ==============================================
- /// Return the number of currently visible children.
+ /// Return the number of currently visible children.
// is overloaded to calculate this on demand
virtual sal_Int32 SAL_CALL
getAccessibleChildCount(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the specified child or NULL if index is invalid.
+ /// Return the specified child or NULL if index is invalid.
// is overloaded to calculate this on demand
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);
- /// Return the set of current states.
+ /// Return the set of current states.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
getAccessibleStateSet(void)
throw (::com::sun::star::uno::RuntimeException);
protected:
- /// Return this object's description.
+ /// Return this object's description.
virtual ::rtl::OUString SAL_CALL
createAccessibleDescription(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current name.
+ /// Return the object's current name.
virtual ::rtl::OUString SAL_CALL
createAccessibleName(void)
throw (::com::sun::star::uno::RuntimeException);
@@ -128,7 +128,7 @@ protected:
public:
///===== XAccessibleEventBroadcaster =====================================
- /** Add listener that is informed of future changes of name,
+ /** Add listener that is informed of future changes of name,
description and so on events.
*/
virtual void SAL_CALL
@@ -137,7 +137,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<
@@ -146,7 +146,7 @@ public:
///===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName(void)
@@ -154,7 +154,7 @@ public:
///===== XTypeProvider ===================================================
- /** Returns a implementation id.
+ /** Returns a implementation id.
*/
virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
getImplementationId(void)
diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx
index 1e28670419a4..859ed4692331 100644
--- a/sc/source/ui/inc/AccessiblePageHeader.hxx
+++ b/sc/source/ui/inc/AccessiblePageHeader.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL
getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint )
throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException);
//===== XAccessibleContext ==============================================
@@ -93,9 +93,9 @@ protected:
virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException);
private:
- ScPreviewShell* mpViewShell;
- sal_Int32 mnIndex;
- sal_Bool mbHeader;
+ ScPreviewShell* mpViewShell;
+ sal_Int32 mnIndex;
+ sal_Bool mbHeader;
typedef std::vector< ScAccessiblePageHeaderArea* > ScHFAreas;
ScHFAreas maAreas;
sal_Int32 mnChildCount;
diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
index dbf7c126b617..b40ad8d973f8 100644
--- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
+++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 accessibility
class ScPreviewShell;
class ScAccessiblePageHeaderArea
- : public ScAccessibleContextBase
+ : public ScAccessibleContextBase
{
public:
//===== internal ========================================================
@@ -54,7 +54,7 @@ public:
sal_Bool bHeader,
SvxAdjust eAdjust);
protected:
- virtual ~ScAccessiblePageHeaderArea (void);
+ virtual ~ScAccessiblePageHeaderArea (void);
public:
const EditTextObject* GetEditTextObject() const { return mpEditObj; }
@@ -74,20 +74,20 @@ public:
///===== XAccessibleContext ==============================================
- /// Return the number of currently visible children.
+ /// Return the number of currently visible children.
// is overloaded to calculate this on demand
virtual sal_Int32 SAL_CALL
getAccessibleChildCount(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the specified child or NULL if index is invalid.
+ /// Return the specified child or NULL if index is invalid.
// is overloaded to calculate this on demand
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);
- /// Return the set of current states.
+ /// Return the set of current states.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
getAccessibleStateSet(void)
@@ -95,7 +95,7 @@ public:
///===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName(void)
@@ -110,7 +110,7 @@ public:
///===== XTypeProvider ===================================================
- /** Returns a implementation id.
+ /** Returns a implementation id.
*/
virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
getImplementationId(void)
diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx
index 47a2be3b6713..10e234624b99 100644
--- a/sc/source/ui/inc/AccessiblePreviewCell.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL
getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint )
throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException);
//===== XAccessibleContext ==============================================
@@ -88,7 +88,7 @@ public:
///===== XTypeProvider ===================================================
- /** Returns a implementation id.
+ /** Returns a implementation id.
*/
virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
getImplementationId(void)
diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx
index 520abe7c53c3..95032e335309 100644
--- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +71,12 @@ public:
///===== 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 ();
-
+
virtual void SAL_CALL release() throw ();
//===== XAccessibleValue ================================================
@@ -92,7 +92,7 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL
getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint )
throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException);
//===== XAccessibleContext ==============================================
@@ -114,11 +114,11 @@ public:
///===== XTypeProvider ===================================================
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL
- getTypes()
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL
+ getTypes()
throw (::com::sun::star::uno::RuntimeException);
- /** Returns a implementation id.
+ /** Returns a implementation id.
*/
virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
getImplementationId(void)
@@ -132,20 +132,20 @@ protected:
virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException);
private:
- ScPreviewShell* mpViewShell;
+ ScPreviewShell* mpViewShell;
accessibility::AccessibleTextHelper* mpTextHelper;
- sal_Int32 mnIndex;
- ScAddress maCellPos;
- sal_Bool mbColumnHeader;
- sal_Bool mbRowHeader;
- mutable ScPreviewTableInfo* mpTableInfo;
+ sal_Int32 mnIndex;
+ ScAddress maCellPos;
+ sal_Bool mbColumnHeader;
+ sal_Bool mbRowHeader;
+ mutable ScPreviewTableInfo* mpTableInfo;
sal_Bool IsDefunc(
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
void CreateTextHelper();
- void FillTableInfo() const;
+ void FillTableInfo() const;
};
diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx
index 6d9ae3c3025f..54627008cda4 100644
--- a/sc/source/ui/inc/AccessiblePreviewTable.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -63,12 +63,12 @@ public:
///===== 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 ();
-
+
virtual void SAL_CALL release() throw ();
//===== XAccessibleTable ================================================
@@ -127,7 +127,7 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL
getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint )
throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException);
//===== XAccessibleContext ==============================================
@@ -149,8 +149,8 @@ public:
//===== XTypeProvider ===================================================
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL
- getTypes()
+ 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()
@@ -167,15 +167,15 @@ protected:
virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException);
private:
- ScPreviewShell* mpViewShell;
- sal_Int32 mnIndex;
- mutable ScPreviewTableInfo* mpTableInfo;
+ ScPreviewShell* mpViewShell;
+ sal_Int32 mnIndex;
+ mutable ScPreviewTableInfo* mpTableInfo;
sal_Bool IsDefunc(
const com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates);
- void FillTableInfo() const;
+ void FillTableInfo() const;
};
diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
index 87447285dea2..455685cb9dd8 100644
--- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx
+++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,19 +54,19 @@ class ScTabViewShell;
class ScAccessibleDocument;
class ScAccessibleCell;
-/** @descr
+/** @descr
This base class provides an implementation of the
<code>AccessibleTable</code> service.
*/
class ScAccessibleSpreadsheet
- : public ScAccessibleTableBase
+ : public ScAccessibleTableBase
{
public:
//===== internal ========================================================
ScAccessibleSpreadsheet(
ScAccessibleDocument* pAccDoc,
ScTabViewShell* pViewShell,
- SCTAB nTab,
+ SCTAB nTab,
ScSplitPos eSplitPos);
protected:
ScAccessibleSpreadsheet(
@@ -169,13 +169,13 @@ public:
///===== XAccessibleContext ==============================================
- /// Return NULL to indicate that an empty relation set.
+ /// Return NULL to indicate that an empty relation set.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL
getAccessibleRelationSet(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the set of current states.
+ /// Return the set of current states.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
getAccessibleStateSet(void)
@@ -213,7 +213,7 @@ public:
///===== XServiceInfo ====================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName(void)
@@ -227,7 +227,7 @@ public:
///===== XTypeProvider ===================================================
- /** Returns a implementation id.
+ /** Returns a implementation id.
*/
virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
getImplementationId(void)
@@ -235,7 +235,7 @@ public:
///===== XAccessibleEventBroadcaster =====================================
- /** Add listener that is informed of future changes of name,
+ /** Add listener that is informed of future changes of name,
description and so on events.
*/
virtual void SAL_CALL
@@ -245,26 +245,26 @@ public:
throw (com::sun::star::uno::RuntimeException);
protected:
- /// Return the object's current bounding box relative to the desktop.
+ /// Return the object's current bounding box relative to the desktop.
virtual Rectangle GetBoundingBoxOnScreen(void) const
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current bounding box relative to the parent object.
+ /// Return the object's current bounding box relative to the parent object.
virtual Rectangle GetBoundingBox(void) const
throw (::com::sun::star::uno::RuntimeException);
private:
ScTabViewShell* mpViewShell;
- ScRangeList* mpMarkedRanges;
+ ScRangeList* mpMarkedRanges;
std::vector<ScMyAddress>* mpSortedMarkedCells;
ScAccessibleDocument* mpAccDoc;
ScAccessibleCell* mpAccCell;
- Rectangle maVisCells;
- ScSplitPos meSplitPos;
- ScAddress maActiveCell;
+ Rectangle maVisCells;
+ ScSplitPos meSplitPos;
+ ScAddress maActiveCell;
SCTAB mnTab;
sal_Bool mbIsSpreadsheet;
- sal_Bool mbHasSelection;
- sal_Bool mbDelIns;
+ sal_Bool mbHasSelection;
+ sal_Bool mbDelIns;
sal_Bool mbIsFocusSend;
sal_Bool IsDefunc(
@@ -281,8 +281,8 @@ private:
void AddMarkedRange(const ScRange& rRange);
ScDocument* GetDocument(ScTabViewShell* pViewShell);
- Rectangle GetVisArea(ScTabViewShell* pViewShell, ScSplitPos eSplitPos);
- Rectangle GetVisCells(const Rectangle& rVisArea);
+ Rectangle GetVisArea(ScTabViewShell* pViewShell, ScSplitPos eSplitPos);
+ Rectangle GetVisCells(const Rectangle& rVisArea);
};
diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx
index 017ef4dfca3f..84f000f66b94 100644
--- a/sc/source/ui/inc/AccessibleTableBase.hxx
+++ b/sc/source/ui/inc/AccessibleTableBase.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 ScTabViewShell;
-/** @descr
+/** @descr
This base class provides an implementation of the
<code>AccessibleTable</code> service.
*/
@@ -191,13 +191,13 @@ public:
//===== XAccessibleContext ==============================================
- /// Return the number of currently visible children.
+ /// Return the number of currently visible children.
// is overloaded to calculate this on demand
virtual sal_Int32 SAL_CALL
getAccessibleChildCount(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the specified child or NULL if index is invalid.
+ /// Return the specified child or NULL if index is invalid.
// is overloaded to calculate this on demand
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleChild(sal_Int32 nIndex)
@@ -205,24 +205,24 @@ public:
::com::sun::star::lang::IndexOutOfBoundsException);
protected:
- /// Return this object's description.
+ /// Return this object's description.
virtual ::rtl::OUString SAL_CALL
createAccessibleDescription(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the object's current name.
+ /// Return the object's current name.
virtual ::rtl::OUString SAL_CALL
createAccessibleName(void)
throw (::com::sun::star::uno::RuntimeException);
public:
- /// Return NULL to indicate that an empty relation set.
+ /// Return NULL to indicate that an empty relation set.
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL
getAccessibleRelationSet(void)
throw (::com::sun::star::uno::RuntimeException);
- /// Return the set of current states.
+ /// Return the set of current states.
// perhaps sometimes to be implemented
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL
@@ -266,7 +266,7 @@ public:
///===== XServiceInfo ===================================================
- /** Returns an identifier for the implementation of this object.
+ /** Returns an identifier for the implementation of this object.
*/
virtual ::rtl::OUString SAL_CALL
getImplementationName(void)
@@ -279,7 +279,7 @@ public:
getTypes()
throw (::com::sun::star::uno::RuntimeException);
- /** Returns a implementation id.
+ /** Returns a implementation id.
*/
virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
getImplementationId(void)
@@ -289,7 +289,7 @@ protected:
/// contains the range of the table, because it could be a subrange of the complete table
ScRange maRange;
- ScDocument* mpDoc;
+ ScDocument* mpDoc;
void CommitTableModelChange(sal_Int32 nStartRow, sal_Int32 nStartCol, sal_Int32 nEndRow, sal_Int32 nEndCol, sal_uInt16 nId);
};
diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx
index 0a61280a574a..cc3d70af5cf7 100644
--- a/sc/source/ui/inc/AccessibleText.hxx
+++ b/sc/source/ui/inc/AccessibleText.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +52,9 @@ class ScAccessibleTextData : public SfxListener
{
public:
ScAccessibleTextData() {}
- virtual ~ScAccessibleTextData() {}
+ virtual ~ScAccessibleTextData() {}
- virtual ScAccessibleTextData* Clone() const = 0;
+ virtual ScAccessibleTextData* Clone() const = 0;
virtual void Notify( SfxBroadcaster& /* rBC */, const SfxHint& /* rHint */ ) {}
@@ -63,15 +63,15 @@ public:
virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate ) = 0;
virtual SfxBroadcaster& GetBroadcaster() const { return maBroadcaster; }
- virtual void UpdateData() = 0;
- virtual void SetDoUpdate(sal_Bool bValue) = 0;
- virtual sal_Bool IsDirty() const = 0;
+ virtual void UpdateData() = 0;
+ virtual void SetDoUpdate(sal_Bool bValue) = 0;
+ virtual sal_Bool IsDirty() const = 0;
private:
mutable SfxBroadcaster maBroadcaster;
// prevent the using of this method of the base class
- ScSharedCellEditSource* GetOriginalSource() { return NULL; }
+ ScSharedCellEditSource* GetOriginalSource() { return NULL; }
};
@@ -85,28 +85,28 @@ public:
const ScAddress& rP)
: ScCellTextData(pDocShellP, rP) {}
virtual ~ScAccessibleCellBaseTextData() {}
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { ScCellTextData::Notify(rBC, rHint); }
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { ScCellTextData::Notify(rBC, rHint); }
- virtual void UpdateData() { ScCellTextData::UpdateData(); }
- virtual void SetDoUpdate(sal_Bool bValue) { ScCellTextData::SetDoUpdate(bValue); }
- virtual sal_Bool IsDirty() const { return ScCellTextData::IsDirty(); }
+ virtual void UpdateData() { ScCellTextData::UpdateData(); }
+ virtual void SetDoUpdate(sal_Bool bValue) { ScCellTextData::SetDoUpdate(bValue); }
+ virtual sal_Bool IsDirty() const { return ScCellTextData::IsDirty(); }
};
// ============================================================================
-// ScAccessibleCellTextData: shared data between sub objects of a accessible cell text object
+// ScAccessibleCellTextData: shared data between sub objects of a accessible cell text object
class ScAccessibleCellTextData : public ScAccessibleCellBaseTextData
{
public:
ScAccessibleCellTextData(ScTabViewShell* pViewShell,
const ScAddress& rP, ScSplitPos eSplitPos, ScAccessibleCell* pAccCell);
- virtual ~ScAccessibleCellTextData();
+ virtual ~ScAccessibleCellTextData();
- virtual ScAccessibleTextData* Clone() const;
+ virtual ScAccessibleTextData* Clone() const;
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
@@ -118,13 +118,13 @@ protected:
private:
ScViewForwarder* mpViewForwarder;
ScEditViewForwarder* mpEditViewForwarder;
- ScTabViewShell* mpViewShell;
+ ScTabViewShell* mpViewShell;
ScSplitPos meSplitPos;
sal_Bool mbViewEditEngine;
ScAccessibleCell* mpAccessibleCell;
// prevent the using of this method of the base class
- ScSharedCellEditSource* GetOriginalSource() { return NULL; }
+ ScSharedCellEditSource* GetOriginalSource() { return NULL; }
using ScAccessibleCellBaseTextData::GetDocShell;
ScDocShell* GetDocShell(ScTabViewShell* pViewShell);
@@ -137,19 +137,19 @@ class ScAccessibleEditObjectTextData : public ScAccessibleTextData
{
public:
ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin);
- virtual ~ScAccessibleEditObjectTextData();
+ virtual ~ScAccessibleEditObjectTextData();
- virtual ScAccessibleTextData* Clone() const;
+ virtual ScAccessibleTextData* Clone() const;
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate );
- virtual void UpdateData() { }
- virtual void SetDoUpdate(sal_Bool /* bValue */) { }
- virtual sal_Bool IsDirty() const { return sal_False; }
+ virtual void UpdateData() { }
+ virtual void SetDoUpdate(sal_Bool /* bValue */) { }
+ virtual sal_Bool IsDirty() const { return sal_False; }
DECL_LINK( NotifyHdl, EENotify* );
protected:
@@ -157,7 +157,7 @@ protected:
ScEditViewForwarder* mpEditViewForwarder;
EditView* mpEditView;
EditEngine* mpEditEngine;
- SvxEditEngineForwarder* mpForwarder;
+ SvxEditEngineForwarder* mpForwarder;
Window* mpWindow;
};
@@ -193,11 +193,11 @@ class ScAccessiblePreviewCellTextData : public ScAccessibleCellBaseTextData
public:
ScAccessiblePreviewCellTextData(ScPreviewShell* pViewShell,
const ScAddress& rP);
- virtual ~ScAccessiblePreviewCellTextData();
+ virtual ~ScAccessiblePreviewCellTextData();
- virtual ScAccessibleTextData* Clone() const;
+ virtual ScAccessibleTextData* Clone() const;
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
@@ -206,10 +206,10 @@ public:
//UNUSED2008-05 DECL_LINK( NotifyHdl, EENotify* );
private:
ScPreviewViewForwarder* mpViewForwarder;
- ScPreviewShell* mpViewShell;
+ ScPreviewShell* mpViewShell;
// prevent the using of this method of the base class
- ScSharedCellEditSource* GetOriginalSource() { return NULL; }
+ ScSharedCellEditSource* GetOriginalSource() { return NULL; }
using ScAccessibleCellBaseTextData::GetDocShell;
ScDocShell* GetDocShell(ScPreviewShell* pViewShell);
@@ -223,11 +223,11 @@ class ScAccessiblePreviewHeaderCellTextData : public ScAccessibleCellBaseTextDat
public:
ScAccessiblePreviewHeaderCellTextData(ScPreviewShell* pViewShell,
const String& rText, const ScAddress& rP, sal_Bool bColHeader, sal_Bool bRowHeader);
- virtual ~ScAccessiblePreviewHeaderCellTextData();
+ virtual ~ScAccessiblePreviewHeaderCellTextData();
- virtual ScAccessibleTextData* Clone() const;
+ virtual ScAccessibleTextData* Clone() const;
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
@@ -236,13 +236,13 @@ public:
//UNUSED2008-05 DECL_LINK( NotifyHdl, EENotify* );
private:
ScPreviewViewForwarder* mpViewForwarder;
- ScPreviewShell* mpViewShell;
- String maText;
- sal_Bool mbColHeader;
- sal_Bool mbRowHeader;
+ ScPreviewShell* mpViewShell;
+ String maText;
+ sal_Bool mbColHeader;
+ sal_Bool mbRowHeader;
// prevent the using of this method of the base class
- ScSharedCellEditSource* GetOriginalSource() { return NULL; }
+ ScSharedCellEditSource* GetOriginalSource() { return NULL; }
using ScAccessibleCellBaseTextData::GetDocShell;
ScDocShell* GetDocShell(ScPreviewShell* pViewShell);
@@ -260,20 +260,20 @@ public:
virtual ScAccessibleTextData* Clone() const;
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool /* bCreate */ ) { return NULL; }
- virtual void UpdateData() { }
- virtual void SetDoUpdate(sal_Bool /* bValue */) { }
- virtual sal_Bool IsDirty() const { return sal_False; }
+ virtual void UpdateData() { }
+ virtual void SetDoUpdate(sal_Bool /* bValue */) { }
+ virtual sal_Bool IsDirty() const { return sal_False; }
private:
ScPreviewViewForwarder* mpViewForwarder;
ScPreviewShell* mpViewShell;
- ScEditEngineDefaulter* mpEditEngine;
- SvxEditEngineForwarder* mpForwarder;
+ ScEditEngineDefaulter* mpEditEngine;
+ SvxEditEngineForwarder* mpForwarder;
ScDocShell* mpDocSh;
const EditTextObject* mpEditObj;
sal_Bool mbHeader;
@@ -293,20 +293,20 @@ public:
virtual ScAccessibleTextData* Clone() const;
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
virtual SvxTextForwarder* GetTextForwarder();
virtual SvxViewForwarder* GetViewForwarder();
virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool /* bCreate */ ) { return NULL; }
- virtual void UpdateData() { }
- virtual void SetDoUpdate(sal_Bool /* bValue */) { }
- virtual sal_Bool IsDirty() const { return sal_False; }
+ virtual void UpdateData() { }
+ virtual void SetDoUpdate(sal_Bool /* bValue */) { }
+ virtual sal_Bool IsDirty() const { return sal_False; }
private:
ScPreviewViewForwarder* mpViewForwarder;
ScPreviewShell* mpViewShell;
- ScEditEngineDefaulter* mpEditEngine;
- SvxEditEngineForwarder* mpForwarder;
+ ScEditEngineDefaulter* mpEditEngine;
+ SvxEditEngineForwarder* mpForwarder;
ScDocShell* mpDocSh;
String msText;
ScAddress maCellPos;
diff --git a/sc/source/ui/inc/ChartRangeSelectionListener.hxx b/sc/source/ui/inc/ChartRangeSelectionListener.hxx
index 65c725da5675..a5f010f3199d 100644
--- a/sc/source/ui/inc/ChartRangeSelectionListener.hxx
+++ b/sc/source/ui/inc/ChartRangeSelectionListener.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/DrawModelBroadcaster.hxx b/sc/source/ui/inc/DrawModelBroadcaster.hxx
index 045e9bc86f41..7930a9cb26e3 100644
--- a/sc/source/ui/inc/DrawModelBroadcaster.hxx
+++ b/sc/source/ui/inc/DrawModelBroadcaster.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +45,15 @@ class ScDrawModelBroadcaster : public SfxListener,
public:
- ScDrawModelBroadcaster( SdrModel *pDrawModel );
+ ScDrawModelBroadcaster( SdrModel *pDrawModel );
virtual ~ScDrawModelBroadcaster();
- virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::document::XEventListener >& xListener )
+ virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::document::XEventListener >& xListener )
throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::document::XEventListener >& xListener )
+ virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::document::XEventListener >& xListener )
throw (::com::sun::star::uno::RuntimeException);
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
};
#endif
diff --git a/sc/source/ui/inc/IAnyRefDialog.hxx b/sc/source/ui/inc/IAnyRefDialog.hxx
index 70731ac8a1f7..05be4a01047d 100644
--- a/sc/source/ui/inc/IAnyRefDialog.hxx
+++ b/sc/source/ui/inc/IAnyRefDialog.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 SAL_NO_VTABLE IAnyRefDialog : public formula::IControlReferenceHandler
{
public:
virtual ~IAnyRefDialog(){}
-
+
//virtual void ShowReference(const String& _sRef) = 0;
//virtual void HideReference( BOOL bDoneRefMode = TRUE ) = 0;
//virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) = 0;
@@ -54,7 +54,7 @@ public:
virtual void RefInputDone( BOOL bForced = FALSE ) = 0;
virtual BOOL IsTableLocked() const = 0;
virtual BOOL IsRefInputMode() const = 0;
-
+
virtual BOOL IsDocAllowed( SfxObjectShell* pDocSh ) const = 0;
virtual void AddRefEntry() = 0;
virtual void SetActive() = 0;
diff --git a/sc/source/ui/inc/ScDevChart.hxx b/sc/source/ui/inc/ScDevChart.hxx
index a08a89da0570..c7e65332768f 100644
--- a/sc/source/ui/inc/ScDevChart.hxx
+++ b/sc/source/ui/inc/ScDevChart.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/acredlin.hrc b/sc/source/ui/inc/acredlin.hrc
index b21676ee6ae9..468c57333780 100644
--- a/sc/source/ui/inc/acredlin.hrc
+++ b/sc/source/ui/inc/acredlin.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
@@ -28,48 +28,48 @@
#include "sc.hrc" // -> RID_SCDLG_CHANGES
#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_HELP 5
+#define BTN_CANCEL 2
+#define BTN_HELP 5
//
-#define CTR_REDLINING 10
-#define TP_FILTER 11
-#define TP_VIEW 12
+#define CTR_REDLINING 10
+#define TP_FILTER 11
+#define TP_VIEW 12
-#define FT_ASSIGN 14
-#define ED_ASSIGN 15
-#define RB_ASSIGN 16
+#define FT_ASSIGN 14
+#define ED_ASSIGN 15
+#define RB_ASSIGN 16
#define STR_INSERT_COLS 20
-#define STR_INSERT_ROWS 21
-#define STR_INSERT_TABS 22
-#define STR_DELETE_COLS 23
-#define STR_DELETE_ROWS 24
-#define STR_DELETE_TABS 25
-#define STR_MOVE 26
-#define STR_CONTENT 27
-#define STR_REJECT 28
-#define STR_ACCEPTED 29
-#define STR_REJECTED 30
-#define STR_NO_ENTRY 31
-#define STR_CONTENT_WITH_CHILD 32
-#define STR_CHILD_CONTENT 33
-#define STR_CHILD_ORGCONTENT 34
-#define STR_EMPTY 35
+#define STR_INSERT_ROWS 21
+#define STR_INSERT_TABS 22
+#define STR_DELETE_COLS 23
+#define STR_DELETE_ROWS 24
+#define STR_DELETE_TABS 25
+#define STR_MOVE 26
+#define STR_CONTENT 27
+#define STR_REJECT 28
+#define STR_ACCEPTED 29
+#define STR_REJECTED 30
+#define STR_NO_ENTRY 31
+#define STR_CONTENT_WITH_CHILD 32
+#define STR_CHILD_CONTENT 33
+#define STR_CHILD_ORGCONTENT 34
+#define STR_EMPTY 35
// Bitmaps
-#define BMP_STR_CLOSE 41
-#define BMP_STR_OPEN 42
-#define BMP_STR_END 43
-#define BMP_STR_ERROR 44
+#define BMP_STR_CLOSE 41
+#define BMP_STR_OPEN 42
+#define BMP_STR_END 43
+#define BMP_STR_ERROR 44
-#define SC_CHANGES_COMMENT 49
-#define SC_SUB_SORT 50
-#define SC_SORT_ACTION 51
-#define SC_SORT_POSITION 52
-#define SC_SORT_AUTHOR 53
-#define SC_SORT_DATE 54
-#define SC_SORT_COMMENT 55
+#define SC_CHANGES_COMMENT 49
+#define SC_SUB_SORT 50
+#define SC_SORT_ACTION 51
+#define SC_SORT_POSITION 52
+#define SC_SORT_AUTHOR 53
+#define SC_SORT_DATE 54
+#define SC_SORT_COMMENT 55
//
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index a077129c374c..6593dc5638b0 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,39 +61,39 @@
class ScViewData;
class ScDocument;
-#define FLT_DATE_BEFORE 0
-#define FLT_DATE_SINCE 1
-#define FLT_DATE_EQUAL 2
-#define FLT_DATE_NOTEQUAL 3
-#define FLT_DATE_BETWEEN 4
-#define FLT_DATE_SAVE 5
+#define FLT_DATE_BEFORE 0
+#define FLT_DATE_SINCE 1
+#define FLT_DATE_EQUAL 2
+#define FLT_DATE_NOTEQUAL 3
+#define FLT_DATE_BETWEEN 4
+#define FLT_DATE_SAVE 5
class ScViewEntryPtr
{
private:
- String* pAction;
- String* pPos;
- String* pAuthor;
- String* pDate;
- String* pComment;
- void* pData;
+ String* pAction;
+ String* pPos;
+ String* pAuthor;
+ String* pDate;
+ String* pComment;
+ void* pData;
public:
- String* GetpAction() {return pAction; }
- String* GetpPos() {return pPos; }
- String* GetpAuthor() {return pAuthor; }
- String* GetpDate() {return pDate; }
- String* GetpComment() {return pComment;}
- void* GetpData() {return pData; }
-
- void SetpAction (String* pString) {pAction= pString;}
- void SetpPos (String* pString) {pPos = pString;}
- void SetpAuthor (String* pString) {pAuthor= pString;}
- void SetpDate (String* pString) {pDate = pString;}
- void SetpComment(String* pString) {pComment=pString;}
- void SetpData (void* pdata) {pData =pdata;}
+ String* GetpAction() {return pAction; }
+ String* GetpPos() {return pPos; }
+ String* GetpAuthor() {return pAuthor; }
+ String* GetpDate() {return pDate; }
+ String* GetpComment() {return pComment;}
+ void* GetpData() {return pData; }
+
+ void SetpAction (String* pString) {pAction= pString;}
+ void SetpPos (String* pString) {pPos = pString;}
+ void SetpAuthor (String* pString) {pAuthor= pString;}
+ void SetpDate (String* pString) {pDate = pString;}
+ void SetpComment(String* pString) {pComment=pString;}
+ void SetpData (void* pdata) {pData =pdata;}
};
class ScViewEntryPtrList
@@ -101,7 +101,7 @@ class ScViewEntryPtrList
ScViewEntryPtrList* pNext;
ScViewEntryPtrList* pLast;
- ScViewEntryPtr* pData;
+ ScViewEntryPtr* pData;
};
@@ -111,16 +111,16 @@ public:
ScRedlinData();
~ScRedlinData();
- SCTAB nTable;
- SCCOL nCol;
- SCROW nRow;
- ULONG nActionNo;
- ULONG nInfo;
- BOOL bIsRejectable;
- BOOL bIsAcceptable;
+ SCTAB nTable;
+ SCCOL nCol;
+ SCROW nRow;
+ ULONG nActionNo;
+ ULONG nInfo;
+ BOOL bIsRejectable;
+ BOOL bIsAcceptable;
};
-typedef long LExpNum;
+typedef long LExpNum;
//@ Expand-Entrys nicht eindeutig, daher gestrichen
//DECLARE_TABLE( ScChgTrackExps, LExpNum)
@@ -130,50 +130,50 @@ class ScAcceptChgDlg : public SfxModelessDialog
{
private:
- Timer aSelectionTimer;
- Timer aReOpenTimer;
- SvxAcceptChgCtr aAcceptChgCtr;
- ScViewData* pViewData;
- ScDocument* pDoc;
- ScRangeName aLocalRangeName;
- Selection theCurSel;
- SvxTPFilter* pTPFilter;
- SvxTPView* pTPView;
- SvxRedlinTable* pTheView; // PB 2006/02/02 #i48648 now SvHeaderTabListBox
- Size MinSize;
- ScRangeList aRangeList;
- ScChangeViewSettings aChangeViewSet;
- String aStrInsertCols;
- String aStrInsertRows;
- String aStrInsertTabs;
- String aStrDeleteCols;
- String aStrDeleteRows;
- String aStrDeleteTabs;
- String aStrMove;
- String aStrContent;
- String aStrReject;
- String aUnknown;
- String aStrAllAccepted;
- String aStrAllRejected;
- String aStrNoEntry;
- String aStrContentWithChild;
- String aStrChildContent;
- String aStrChildOrgContent;
- String aStrEmpty;
- ULONG nAcceptCount;
- ULONG nRejectCount;
- BOOL bAcceptEnableFlag;
- BOOL bRejectEnableFlag;
- BOOL bNeedsUpdate;
- BOOL bIgnoreMsg;
- BOOL bNoSelection;
- BOOL bHasFilterEntry;
- BOOL bUseColor;
- //ScChgTrackExps aExpandArray;
-
- void Init();
- void InitFilter();
-//UNUSED2008-05 void SetMyStaticData();
+ Timer aSelectionTimer;
+ Timer aReOpenTimer;
+ SvxAcceptChgCtr aAcceptChgCtr;
+ ScViewData* pViewData;
+ ScDocument* pDoc;
+ ScRangeName aLocalRangeName;
+ Selection theCurSel;
+ SvxTPFilter* pTPFilter;
+ SvxTPView* pTPView;
+ SvxRedlinTable* pTheView; // PB 2006/02/02 #i48648 now SvHeaderTabListBox
+ Size MinSize;
+ ScRangeList aRangeList;
+ ScChangeViewSettings aChangeViewSet;
+ String aStrInsertCols;
+ String aStrInsertRows;
+ String aStrInsertTabs;
+ String aStrDeleteCols;
+ String aStrDeleteRows;
+ String aStrDeleteTabs;
+ String aStrMove;
+ String aStrContent;
+ String aStrReject;
+ String aUnknown;
+ String aStrAllAccepted;
+ String aStrAllRejected;
+ String aStrNoEntry;
+ String aStrContentWithChild;
+ String aStrChildContent;
+ String aStrChildOrgContent;
+ String aStrEmpty;
+ ULONG nAcceptCount;
+ ULONG nRejectCount;
+ BOOL bAcceptEnableFlag;
+ BOOL bRejectEnableFlag;
+ BOOL bNeedsUpdate;
+ BOOL bIgnoreMsg;
+ BOOL bNoSelection;
+ BOOL bHasFilterEntry;
+ BOOL bUseColor;
+ //ScChgTrackExps aExpandArray;
+
+ void Init();
+ void InitFilter();
+//UNUSED2008-05 void SetMyStaticData();
DECL_LINK( FilterHandle, SvxTPFilter* );
DECL_LINK( RefHandle, SvxTPFilter* );
@@ -197,64 +197,64 @@ private:
protected:
- virtual void Resize();
- virtual BOOL Close();
+ virtual void Resize();
+ virtual BOOL Close();
- void RejectFiltered();
- void AcceptFiltered();
+ void RejectFiltered();
+ void AcceptFiltered();
- BOOL IsValidAction(const ScChangeAction* pScChangeAction);
+ BOOL IsValidAction(const ScChangeAction* pScChangeAction);
- String* MakeTypeString(ScChangeActionType eType);
+ String* MakeTypeString(ScChangeActionType eType);
- SvLBoxEntry* InsertChangeAction(const ScChangeAction* pScChangeAction,ScChangeActionState eState,
+ SvLBoxEntry* InsertChangeAction(const ScChangeAction* pScChangeAction,ScChangeActionState eState,
SvLBoxEntry* pParent=NULL,BOOL bDelMaster=FALSE,
BOOL bDisabled=FALSE,ULONG nPos=LIST_APPEND);
- SvLBoxEntry* InsertFilteredAction(const ScChangeAction* pScChangeAction,ScChangeActionState eState,
+ SvLBoxEntry* InsertFilteredAction(const ScChangeAction* pScChangeAction,ScChangeActionState eState,
SvLBoxEntry* pParent=NULL,BOOL bDelMaster=FALSE,
BOOL bDisabled=FALSE,ULONG nPos=LIST_APPEND);
- SvLBoxEntry* InsertChangeActionContent(const ScChangeActionContent* pScChangeAction,
+ SvLBoxEntry* InsertChangeActionContent(const ScChangeActionContent* pScChangeAction,
SvLBoxEntry* pParent,ULONG nSpecial);
- void GetDependents( const ScChangeAction* pScChangeAction,
+ void GetDependents( const ScChangeAction* pScChangeAction,
ScChangeActionTable& aActionTable,
SvLBoxEntry* pEntry);
- BOOL InsertContentChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent);
+ BOOL InsertContentChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent);
- BOOL InsertAcceptedORejected(SvLBoxEntry* pParent);
+ BOOL InsertAcceptedORejected(SvLBoxEntry* pParent);
- BOOL InsertDeletedChilds(const ScChangeAction *pChangeAction, ScChangeActionTable* pActionTable,
+ BOOL InsertDeletedChilds(const ScChangeAction *pChangeAction, ScChangeActionTable* pActionTable,
SvLBoxEntry* pParent);
- BOOL InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent);
+ BOOL InsertChilds(ScChangeActionTable* pActionTable,SvLBoxEntry* pParent);
- void AppendChanges(ScChangeTrack* pChanges,ULONG nStartAction, ULONG nEndAction,
+ void AppendChanges(ScChangeTrack* pChanges,ULONG nStartAction, ULONG nEndAction,
ULONG nPos=LIST_APPEND);
- void RemoveEntrys(ULONG nStartAction,ULONG nEndAction);
- void UpdateEntrys(ScChangeTrack* pChgTrack, ULONG nStartAction,ULONG nEndAction);
+ void RemoveEntrys(ULONG nStartAction,ULONG nEndAction);
+ void UpdateEntrys(ScChangeTrack* pChgTrack, ULONG nStartAction,ULONG nEndAction);
- void UpdateView();
- void ClearView();
+ void UpdateView();
+ void ClearView();
- BOOL Expand(ScChangeTrack* pChanges,const ScChangeAction* pScChangeAction,
+ BOOL Expand(ScChangeTrack* pChanges,const ScChangeAction* pScChangeAction,
SvLBoxEntry* pEntry, BOOL bFilter=FALSE);
public:
ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
- ScViewData* ptrViewData);
+ ScViewData* ptrViewData);
~ScAcceptChgDlg();
- void ReInit(ScViewData* ptrViewData);
+ void ReInit(ScViewData* ptrViewData);
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual long PreNotify( NotifyEvent& rNEvt );
- void Initialize (SfxChildWinInfo* pInfo);
+ void Initialize (SfxChildWinInfo* pInfo);
virtual void FillInfo(SfxChildWinInfo&) const;
};
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 0e7560fe0c50..a61add16b40e 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +58,8 @@ class ScRangeList;
class SfxShell;
#include "scmod.hxx"
-typedef formula::RefButton ScRefButton;
-typedef formula::RefEdit ScRefEdit;
+typedef formula::RefButton ScRefButton;
+typedef formula::RefEdit ScRefEdit;
//-->Added by PengYunQuan for Validity Cell Range Picker
class ScFormulaReferenceHelper
{
@@ -70,7 +70,7 @@ class ScFormulaReferenceHelper
formula::RefButton* pRefBtn; // Button dazu
Window* m_pWindow;
SfxBindings* m_pBindings;
- ::std::auto_ptr<Accelerator>
+ ::std::auto_ptr<Accelerator>
pAccel; // fuer Enter/Escape
BOOL* pHiddenMarks; // Merkfeld fuer versteckte Controls
SCTAB nRefTab; // used for ShowReference
@@ -84,9 +84,9 @@ class ScFormulaReferenceHelper
BOOL bEnableColorRef;
BOOL bHighLightRef;
BOOL bAccInserted;
-
+
DECL_LINK( AccelSelectHdl, Accelerator* );
-
+
public:
ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings);
~ScFormulaReferenceHelper();
@@ -112,10 +112,10 @@ public:
static void enableInput(BOOL _bInput);
//<!--Added by PengYunQuan for Validity Cell Range Picker
protected:
- Window * GetWindow(){ return m_pWindow; }
+ Window * GetWindow(){ return m_pWindow; }
public:
- bool CanInputStart( const ScRefEdit *pEdit ){ return !!pEdit; }
- bool CanInputDone( BOOL bForced ){ return pRefEdit && (bForced || !pRefBtn); }
+ bool CanInputStart( const ScRefEdit *pEdit ){ return !!pEdit; }
+ bool CanInputDone( BOOL bForced ){ return pRefEdit && (bForced || !pRefBtn); }
//<!--Added by PengYunQuan for Validity Cell Range Picker
};
//============================================================================
@@ -125,27 +125,27 @@ class SC_DLLPUBLIC ScRefHandler : //public SfxModelessDialog,
public IAnyRefDialog
{
//<!--Added by PengYunQuan for Validity Cell Range Picker
- Window & m_rWindow;
- bool m_bInRefMode;
+ Window & m_rWindow;
+ bool m_bInRefMode;
public:
- operator Window *(){ return &m_rWindow; }
- Window * operator ->() { return static_cast<Window *>(*this); }
+ operator Window *(){ return &m_rWindow; }
+ Window * operator ->() { return static_cast<Window *>(*this); }
template<class,bool> friend class ScRefHdlrImplBase;
//-->Added by PengYunQuan for Validity Cell Range Picker
friend class formula::RefButton;
friend class formula::RefEdit;
private:
- ScFormulaReferenceHelper
+ ScFormulaReferenceHelper
m_aHelper;
SfxBindings* pMyBindings;
-
+
Window* pActiveWin;
Timer aTimer;
String aDocName; // document on which the dialog was opened
DECL_LINK( UpdateFocusHdl, Timer* );
-
+
protected:
virtual BOOL DoClose( USHORT nId );
@@ -193,8 +193,8 @@ public:
public:
bool EnterRefMode();
bool LeaveRefMode();
- inline bool CanInputStart( const ScRefEdit *pEdit );
- inline bool CanInputDone( BOOL bForced );
+ inline bool CanInputStart( const ScRefEdit *pEdit );
+ inline bool CanInputDone( BOOL bForced );
//-->Added by PengYunQuan for Validity Cell Range Picker
};
@@ -265,7 +265,7 @@ inline bool ScRefHandler::CanInputStart( const ScRefEdit *pEdit )
return m_aHelper.CanInputStart( pEdit );
}
-inline bool ScRefHandler::CanInputDone( BOOL bForced )
+inline bool ScRefHandler::CanInputDone( BOOL bForced )
{
return m_aHelper.CanInputDone( bForced );
}
diff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxx
index 608f95a3bb51..27305dcdc323 100644
--- a/sc/source/ui/inc/areasave.hxx
+++ b/sc/source/ui/inc/areasave.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,24 +39,24 @@ class ScAreaLink;
class ScAreaLinkSaver : public ScDataObject
{
private:
- String aFileName;
- String aFilterName;
- String aOptions;
- String aSourceArea;
- ScRange aDestArea;
+ String aFileName;
+ String aFilterName;
+ String aOptions;
+ String aSourceArea;
+ ScRange aDestArea;
ULONG nRefresh;
public:
ScAreaLinkSaver( const ScAreaLink& rSource );
ScAreaLinkSaver( const ScAreaLinkSaver& rCopy );
- virtual ~ScAreaLinkSaver();
+ virtual ~ScAreaLinkSaver();
- virtual ScDataObject* Clone() const;
+ virtual ScDataObject* Clone() const;
- BOOL IsEqual( const ScAreaLink& rCompare ) const;
- BOOL IsEqualSource( const ScAreaLink& rCompare ) const;
+ BOOL IsEqual( const ScAreaLink& rCompare ) const;
+ BOOL IsEqualSource( const ScAreaLink& rCompare ) const;
- void WriteToLink( ScAreaLink& rLink ) const;
+ void WriteToLink( ScAreaLink& rLink ) const;
void InsertNewLink( ScDocument* pDoc ) const;
};
@@ -66,14 +66,14 @@ class ScAreaLinkSaveCollection : public ScCollection
public:
ScAreaLinkSaveCollection();
ScAreaLinkSaveCollection( const ScAreaLinkSaveCollection& rCopy );
- virtual ~ScAreaLinkSaveCollection();
+ virtual ~ScAreaLinkSaveCollection();
- virtual ScDataObject* Clone() const;
+ virtual ScDataObject* Clone() const;
- ScAreaLinkSaver* operator[](USHORT nIndex) const {return (ScAreaLinkSaver*)At(nIndex);}
+ ScAreaLinkSaver* operator[](USHORT nIndex) const {return (ScAreaLinkSaver*)At(nIndex);}
- BOOL IsEqual( const ScDocument* pDoc ) const;
- void Restore( ScDocument* pDoc ) const;
+ BOOL IsEqual( const ScDocument* pDoc ) const;
+ void Restore( ScDocument* pDoc ) const;
// returns NULL if empty
static ScAreaLinkSaveCollection* CreateFromDoc( const ScDocument* pDoc );
diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx
index 08c6e3cf0a91..0d4597a1c37c 100644
--- a/sc/source/ui/inc/areasdlg.hxx
+++ b/sc/source/ui/inc/areasdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,40 +52,40 @@ public:
ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent );
~ScPrintAreasDlg();
- virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual void AddRefEntry();
+ virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
+ virtual void AddRefEntry();
- virtual BOOL IsTableLocked() const;
+ virtual BOOL IsTableLocked() const;
- virtual void SetActive();
- virtual void Deactivate();
- virtual BOOL Close();
+ virtual void SetActive();
+ virtual void Deactivate();
+ virtual BOOL Close();
private:
- ListBox aLbPrintArea;
+ ListBox aLbPrintArea;
FixedLine aFlPrintArea;
- formula::RefEdit aEdPrintArea;
- formula::RefButton aRbPrintArea;
+ formula::RefEdit aEdPrintArea;
+ formula::RefButton aRbPrintArea;
- ListBox aLbRepeatRow;
+ ListBox aLbRepeatRow;
FixedLine aFlRepeatRow;
- formula::RefEdit aEdRepeatRow;
- formula::RefButton aRbRepeatRow;
+ formula::RefEdit aEdRepeatRow;
+ formula::RefButton aRbRepeatRow;
- ListBox aLbRepeatCol;
+ ListBox aLbRepeatCol;
FixedLine aFlRepeatCol;
- formula::RefEdit aEdRepeatCol;
- formula::RefButton aRbRepeatCol;
+ formula::RefEdit aEdRepeatCol;
+ formula::RefButton aRbRepeatCol;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
- BOOL bDlgLostFocus;
- formula::RefEdit* pRefInputEdit;
- ScDocument* pDoc;
- ScViewData* pViewData;
- SCTAB nCurTab;
+ BOOL bDlgLostFocus;
+ formula::RefEdit* pRefInputEdit;
+ ScDocument* pDoc;
+ ScViewData* pViewData;
+ SCTAB nCurTab;
#ifdef _AREASDLG_CXX
private:
@@ -95,10 +95,10 @@ private:
BOOL Impl_GetItem( Edit* pEd, SfxStringItem& rItem );
// Handler:
- DECL_LINK( Impl_SelectHdl, ListBox* );
- DECL_LINK( Impl_ModifyHdl, formula::RefEdit* );
- DECL_LINK( Impl_BtnHdl, PushButton* );
- DECL_LINK( Impl_GetFocusHdl, Control* );
+ DECL_LINK( Impl_SelectHdl, ListBox* );
+ DECL_LINK( Impl_ModifyHdl, formula::RefEdit* );
+ DECL_LINK( Impl_BtnHdl, PushButton* );
+ DECL_LINK( Impl_GetFocusHdl, Control* );
#endif
};
diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx
index a5c7a2b554b4..0c6df4b39e44 100644
--- a/sc/source/ui/inc/asciiopt.hxx
+++ b/sc/source/ui/inc/asciiopt.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,17 +59,17 @@
class ScAsciiOptions
{
private:
- BOOL bFixedLen;
- String aFieldSeps;
- BOOL bMergeFieldSeps;
+ BOOL bFixedLen;
+ String aFieldSeps;
+ BOOL bMergeFieldSeps;
bool bQuotedFieldAsText;
bool bDetectSpecialNumber;
- sal_Unicode cTextSep;
- CharSet eCharSet;
+ sal_Unicode cTextSep;
+ CharSet eCharSet;
LanguageType eLang;
- BOOL bCharSetSystem;
- long nStartRow;
- USHORT nInfoCount;
+ BOOL bCharSetSystem;
+ long nStartRow;
+ USHORT nInfoCount;
xub_StrLen* pColStart; //! TODO replace with vector
BYTE* pColFormat; //! TODO replace with vector
@@ -80,47 +80,47 @@ public:
static const sal_Unicode cDefaultTextSep = '"';
- ScAsciiOptions& operator=( const ScAsciiOptions& rCpy );
+ ScAsciiOptions& operator=( const ScAsciiOptions& rCpy );
- BOOL operator==( const ScAsciiOptions& rCmp ) const;
+ BOOL operator==( const ScAsciiOptions& rCmp ) const;
- void ReadFromString( const String& rString );
- String WriteToString() const;
+ void ReadFromString( const String& rString );
+ String WriteToString() const;
- void InterpretColumnList( const String& rString );
+ void InterpretColumnList( const String& rString );
- CharSet GetCharSet() const { return eCharSet; }
- BOOL GetCharSetSystem() const { return bCharSetSystem; }
- const String& GetFieldSeps() const { return aFieldSeps; }
- BOOL IsMergeSeps() const { return bMergeFieldSeps; }
+ CharSet GetCharSet() const { return eCharSet; }
+ BOOL GetCharSetSystem() const { return bCharSetSystem; }
+ const String& GetFieldSeps() const { return aFieldSeps; }
+ BOOL IsMergeSeps() const { return bMergeFieldSeps; }
bool IsQuotedAsText() const { return bQuotedFieldAsText; }
bool IsDetectSpecialNumber() const { return bDetectSpecialNumber; }
- sal_Unicode GetTextSep() const { return cTextSep; }
- BOOL IsFixedLen() const { return bFixedLen; }
- USHORT GetInfoCount() const { return nInfoCount; }
- const xub_StrLen* GetColStart() const { return pColStart; }
- const BYTE* GetColFormat() const { return pColFormat; }
- long GetStartRow() const { return nStartRow; }
+ sal_Unicode GetTextSep() const { return cTextSep; }
+ BOOL IsFixedLen() const { return bFixedLen; }
+ USHORT GetInfoCount() const { return nInfoCount; }
+ const xub_StrLen* GetColStart() const { return pColStart; }
+ const BYTE* GetColFormat() const { return pColFormat; }
+ long GetStartRow() const { return nStartRow; }
LanguageType GetLanguage() const { return eLang; }
- void SetCharSet( CharSet eNew ) { eCharSet = eNew; }
- void SetCharSetSystem( BOOL bSet ) { bCharSetSystem = bSet; }
- void SetFixedLen( BOOL bSet ) { bFixedLen = bSet; }
- void SetFieldSeps( const String& rStr ) { aFieldSeps = rStr; }
- void SetMergeSeps( BOOL bSet ) { bMergeFieldSeps = bSet; }
+ void SetCharSet( CharSet eNew ) { eCharSet = eNew; }
+ void SetCharSetSystem( BOOL bSet ) { bCharSetSystem = bSet; }
+ void SetFixedLen( BOOL bSet ) { bFixedLen = bSet; }
+ void SetFieldSeps( const String& rStr ) { aFieldSeps = rStr; }
+ void SetMergeSeps( BOOL bSet ) { bMergeFieldSeps = bSet; }
void SetQuotedAsText(bool bSet) { bQuotedFieldAsText = bSet; }
void SetDetectSpecialNumber(bool bSet) { bDetectSpecialNumber = bSet; }
- void SetTextSep( sal_Unicode c ) { cTextSep = c; }
- void SetStartRow( long nRow) { nStartRow= nRow; }
+ void SetTextSep( sal_Unicode c ) { cTextSep = c; }
+ void SetStartRow( long nRow) { nStartRow= nRow; }
void SetLanguage(LanguageType e) { eLang = e; }
- void SetColInfo( USHORT nCount, const xub_StrLen* pStart, const BYTE* pFormat );
+ void SetColInfo( USHORT nCount, const xub_StrLen* pStart, const BYTE* pFormat );
void SetColumnInfo( const ScCsvExpDataVec& rDataVec );
};
//CHINA001 // ============================================================================
-//CHINA001
+//CHINA001
//CHINA001 class ScImportAsciiDlg : public ModalDialog
//CHINA001 {
//CHINA001 SvStream* pDatStream;
@@ -131,18 +131,18 @@ public:
//CHINA001 ULONG nStreamPos;
//CHINA001 ULONG nStreamPosUnicode;
//CHINA001 BOOL bVFlag;
-//CHINA001
+//CHINA001
//CHINA001 FixedLine aFlFieldOpt;
//CHINA001 FixedText aFtCharSet;
//CHINA001 SvxTextEncodingBox aLbCharSet;
-//CHINA001
+//CHINA001
//CHINA001 FixedText aFtRow;
//CHINA001 NumericField aNfRow;
-//CHINA001
+//CHINA001
//CHINA001 FixedLine aFlSepOpt;
//CHINA001 RadioButton aRbFixed;
//CHINA001 RadioButton aRbSeparated;
-//CHINA001
+//CHINA001
//CHINA001 CheckBox aCkbTab;
//CHINA001 CheckBox aCkbSemicolon;
//CHINA001 CheckBox aCkbComma;
@@ -152,49 +152,49 @@ public:
//CHINA001 CheckBox aCkbAsOnce;
//CHINA001 FixedText aFtTextSep;
//CHINA001 ComboBox aCbTextSep;
-//CHINA001
+//CHINA001
//CHINA001 FixedLine aFlWidth;
//CHINA001 FixedText aFtType;
//CHINA001 ListBox aLbType;
-//CHINA001
+//CHINA001
//CHINA001 ScCsvTableBox maTableBox;
-//CHINA001
+//CHINA001
//CHINA001 OKButton aBtnOk;
//CHINA001 CancelButton aBtnCancel;
//CHINA001 HelpButton aBtnHelp;
-//CHINA001
+//CHINA001
//CHINA001 String aCharSetUser;
//CHINA001 String aColumnUser;
//CHINA001 String aFldSepList;
//CHINA001 String aTextSepList;
-//CHINA001
+//CHINA001
//CHINA001 // aPreviewLine contains the byte string as read from the file
//CHINA001 ByteString aPreviewLine[ CSV_PREVIEW_LINES ];
//CHINA001 // same for Unicode
//CHINA001 String aPreviewLineUnicode[ CSV_PREVIEW_LINES ];
-//CHINA001
+//CHINA001
//CHINA001 CharSet meCharSet; /// Selected char set.
//CHINA001 bool mbCharSetSystem; /// Is System char set selected?
-//CHINA001
+//CHINA001
//CHINA001 public:
//CHINA001 ScImportAsciiDlg(
//CHINA001 Window* pParent, String aDatName,
//CHINA001 SvStream* pInStream, sal_Unicode cSep = '\t' );
//CHINA001 ~ScImportAsciiDlg();
-//CHINA001
+//CHINA001
//CHINA001 void GetOptions( ScAsciiOptions& rOpt );
-//CHINA001
+//CHINA001
//CHINA001 private:
//CHINA001 /** Sets the selected char set data to meCharSet and mbCharSetSystem. */
//CHINA001 void SetSelectedCharSet();
//CHINA001 /** Returns all separator characters in a string. */
//CHINA001 String GetSeparators() const;
-//CHINA001
+//CHINA001
//CHINA001 /** Enables or disables all separator checkboxes and edit fields. */
//CHINA001 void SetupSeparatorCtrls();
-//CHINA001
+//CHINA001
//CHINA001 void UpdateVertical( bool bSwitchToFromUnicode = false );
-//CHINA001
+//CHINA001
//CHINA001 DECL_LINK( CharSetHdl, SvxTextEncodingBox* );
//CHINA001 DECL_LINK( FirstRowHdl, NumericField* );
//CHINA001 DECL_LINK( RbSepFixHdl, RadioButton* );
@@ -203,8 +203,8 @@ public:
//CHINA001 DECL_LINK( UpdateTextHdl, ScCsvTableBox* );
//CHINA001 DECL_LINK( ColTypeHdl, ScCsvTableBox* );
//CHINA001 };
-//CHINA001
-//CHINA001
+//CHINA001
+//CHINA001
// ============================================================================
#endif
diff --git a/sc/source/ui/inc/attrdlg.hrc b/sc/source/ui/inc/attrdlg.hrc
index f43c1cb30b86..5a2cb3af502c 100644
--- a/sc/source/ui/inc/attrdlg.hrc
+++ b/sc/source/ui/inc/attrdlg.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,23 +25,23 @@
*
************************************************************************/
-#include "sc.hrc" // -> SC_DLG_ATTR
+#include "sc.hrc" // -> SC_DLG_ATTR
-#define TP_NUMBER 1
-#define TP_FONT 2
-#define TP_ALIGNMENT 3
-#define TP_BORDER 4
-#define TP_BACKGROUND 5
-#define TP_PROTECTION 6
-#define TP_FONTEFF 7
-#define TP_ASIAN 8
+#define TP_NUMBER 1
+#define TP_FONT 2
+#define TP_ALIGNMENT 3
+#define TP_BORDER 4
+#define TP_BACKGROUND 5
+#define TP_PROTECTION 6
+#define TP_FONTEFF 7
+#define TP_ASIAN 8
//================================================
// Zellschutz-TabPage:
-#define BTN_PROTECTED 1
-#define BTN_HIDE_FORMULAR 2
-#define BTN_HIDE_ALL 3
+#define BTN_PROTECTED 1
+#define BTN_HIDE_FORMULAR 2
+#define BTN_HIDE_ALL 3
#define FT_HINT 4
#define FL_PROTECTION 5
#define BTN_HIDE_PRINT 6
diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx
index 752ee01ddd62..a450329a5091 100644
--- a/sc/source/ui/inc/attrdlg.hxx
+++ b/sc/source/ui/inc/attrdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 SfxItemSet;
class ScAttrDlg : public SfxTabDialog
{
public:
- ScAttrDlg( SfxViewFrame* pFrame,
- Window* pParent,
+ ScAttrDlg( SfxViewFrame* pFrame,
+ Window* pParent,
const SfxItemSet* pCellAttrs );
~ScAttrDlg();
protected:
- virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage );
+ virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage );
private:
DECL_LINK( OkHandler, void* ); // fuer DoppelClick-Beenden in TabPages
diff --git a/sc/source/ui/inc/auditsh.hxx b/sc/source/ui/inc/auditsh.hxx
index 75059f4f88cc..4e3e7956eaf5 100644
--- a/sc/source/ui/inc/auditsh.hxx
+++ b/sc/source/ui/inc/auditsh.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +38,8 @@ class ScViewData;
class ScAuditingShell : public SfxShell
{
private:
- ScViewData* pViewData;
- USHORT nFunction;
+ ScViewData* pViewData;
+ USHORT nFunction;
public:
TYPEINFO();
@@ -48,8 +48,8 @@ public:
ScAuditingShell(ScViewData* pData);
~ScAuditingShell();
- void Execute(SfxRequest& rReq);
- void GetState(SfxItemSet& rSet);
+ void Execute(SfxRequest& rReq);
+ void GetState(SfxItemSet& rSet);
};
diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx
index 52a033c202b2..b6eb80112644 100644
--- a/sc/source/ui/inc/autofmt.hxx
+++ b/sc/source/ui/inc/autofmt.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +69,8 @@ enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE };
//CHINA001 class ScAutoFormatDlg : public ModalDialog
//CHINA001 {
//CHINA001 public:
-//CHINA001 ScAutoFormatDlg( Window* pParent,
-//CHINA001 ScAutoFormat* pAutoFormat,
+//CHINA001 ScAutoFormatDlg( Window* pParent,
+//CHINA001 ScAutoFormat* pAutoFormat,
//CHINA001 const ScAutoFormatData* pSelFormatData,
//CHINA001 ScDocument* pDoc );
//CHINA001 ~ScAutoFormatDlg();
@@ -80,38 +80,38 @@ enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE };
//CHINA001
//CHINA001 private:
//CHINA001 FixedLine aFlFormat;
-//CHINA001 ListBox aLbFormat;
-//CHINA001 ScAutoFmtPreview* pWndPreview;
-//CHINA001 OKButton aBtnOk;
-//CHINA001 CancelButton aBtnCancel;
-//CHINA001 HelpButton aBtnHelp;
-//CHINA001 PushButton aBtnAdd;
-//CHINA001 PushButton aBtnRemove;
-//CHINA001 MoreButton aBtnMore;
+//CHINA001 ListBox aLbFormat;
+//CHINA001 ScAutoFmtPreview* pWndPreview;
+//CHINA001 OKButton aBtnOk;
+//CHINA001 CancelButton aBtnCancel;
+//CHINA001 HelpButton aBtnHelp;
+//CHINA001 PushButton aBtnAdd;
+//CHINA001 PushButton aBtnRemove;
+//CHINA001 MoreButton aBtnMore;
//CHINA001 FixedLine aFlFormatting;
-//CHINA001 CheckBox aBtnNumFormat;
-//CHINA001 CheckBox aBtnBorder;
-//CHINA001 CheckBox aBtnFont;
-//CHINA001 CheckBox aBtnPattern;
-//CHINA001 CheckBox aBtnAlignment;
-//CHINA001 CheckBox aBtnAdjust;
-//CHINA001 PushButton aBtnRename;
-//CHINA001 String aStrTitle;
-//CHINA001 String aStrLabel;
-//CHINA001 String aStrClose;
-//CHINA001 String aStrDelTitle;
-//CHINA001 String aStrDelMsg;
-//CHINA001 String aStrRename;
+//CHINA001 CheckBox aBtnNumFormat;
+//CHINA001 CheckBox aBtnBorder;
+//CHINA001 CheckBox aBtnFont;
+//CHINA001 CheckBox aBtnPattern;
+//CHINA001 CheckBox aBtnAlignment;
+//CHINA001 CheckBox aBtnAdjust;
+//CHINA001 PushButton aBtnRename;
+//CHINA001 String aStrTitle;
+//CHINA001 String aStrLabel;
+//CHINA001 String aStrClose;
+//CHINA001 String aStrDelTitle;
+//CHINA001 String aStrDelMsg;
+//CHINA001 String aStrRename;
//CHINA001
//CHINA001 //------------------------
-//CHINA001 ScAutoFormat* pFormat;
-//CHINA001 const ScAutoFormatData* pSelFmtData;
-//CHINA001 USHORT nIndex;
-//CHINA001 BOOL bCoreDataChanged;
-//CHINA001 BOOL bFmtInserted;
+//CHINA001 ScAutoFormat* pFormat;
+//CHINA001 const ScAutoFormatData* pSelFmtData;
+//CHINA001 USHORT nIndex;
+//CHINA001 BOOL bCoreDataChanged;
+//CHINA001 BOOL bFmtInserted;
//CHINA001
-//CHINA001 void Init ();
-//CHINA001 void UpdateChecks ();
+//CHINA001 void Init ();
+//CHINA001 void UpdateChecks ();
//CHINA001 //------------------------
//CHINA001 DECL_LINK( CheckHdl, Button * );
//CHINA001 DECL_LINK( AddHdl, void * );
@@ -158,11 +158,11 @@ private:
const String aStrSum;
SvNumberFormatter* pNumFmt;
//-------------------------------------------
- SC_DLLPRIVATE void Init ();
- SC_DLLPRIVATE void DoPaint ( const Rectangle& rRect );
- SC_DLLPRIVATE void CalcCellArray ( BOOL bFitWidth );
- SC_DLLPRIVATE void CalcLineMap ();
- SC_DLLPRIVATE void PaintCells ();
+ SC_DLLPRIVATE void Init ();
+ SC_DLLPRIVATE void DoPaint ( const Rectangle& rRect );
+ SC_DLLPRIVATE void CalcCellArray ( BOOL bFitWidth );
+ SC_DLLPRIVATE void CalcLineMap ();
+ SC_DLLPRIVATE void PaintCells ();
/* Usage of type size_t instead of SCCOL/SCROW is correct here - used in
conjunction with class svx::frame::Array (svx/framelinkarray.hxx), which
@@ -181,28 +181,28 @@ private:
Font& rCJKFont,
Font& rCTLFont );
- SC_DLLPRIVATE String MakeNumberString( String cellString, BOOL bAddDec );
- SC_DLLPRIVATE void DrawFrameLine ( const SvxBorderLine& rLineD,
- Point from,
- Point to,
- BOOL bHorizontal,
- const SvxBorderLine& rLineLT,
- const SvxBorderLine& rLineL,
- const SvxBorderLine& rLineLB,
- const SvxBorderLine& rLineRT,
- const SvxBorderLine& rLineR,
- const SvxBorderLine& rLineRB );
- SC_DLLPRIVATE void CheckPriority ( USHORT nCurLine,
- AutoFmtLine eLine,
- SvxBorderLine& rLine );
- SC_DLLPRIVATE void GetLines ( USHORT nIndex, AutoFmtLine eLine,
- SvxBorderLine& rLineD,
- SvxBorderLine& rLineLT,
- SvxBorderLine& rLineL,
- SvxBorderLine& rLineLB,
- SvxBorderLine& rLineRT,
- SvxBorderLine& rLineR,
- SvxBorderLine& rLineRB );
+ SC_DLLPRIVATE String MakeNumberString( String cellString, BOOL bAddDec );
+ SC_DLLPRIVATE void DrawFrameLine ( const SvxBorderLine& rLineD,
+ Point from,
+ Point to,
+ BOOL bHorizontal,
+ const SvxBorderLine& rLineLT,
+ const SvxBorderLine& rLineL,
+ const SvxBorderLine& rLineLB,
+ const SvxBorderLine& rLineRT,
+ const SvxBorderLine& rLineR,
+ const SvxBorderLine& rLineRB );
+ SC_DLLPRIVATE void CheckPriority ( USHORT nCurLine,
+ AutoFmtLine eLine,
+ SvxBorderLine& rLine );
+ SC_DLLPRIVATE void GetLines ( USHORT nIndex, AutoFmtLine eLine,
+ SvxBorderLine& rLineD,
+ SvxBorderLine& rLineLT,
+ SvxBorderLine& rLineL,
+ SvxBorderLine& rLineLB,
+ SvxBorderLine& rLineRT,
+ SvxBorderLine& rLineR,
+ SvxBorderLine& rLineRB );
};
#endif // SC_AUTOFMT_HXX
diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx
index 5540ecf87aac..f33f311142b1 100644
--- a/sc/source/ui/inc/autostyl.hxx
+++ b/sc/source/ui/inc/autostyl.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +38,16 @@ class ScRange;
class ScAutoStyleList
{
private:
- ScDocShell* pDocSh;
- Timer aTimer;
- Timer aInitTimer;
- ULONG nTimerStart;
- List aEntries;
- List aInitials;
+ ScDocShell* pDocSh;
+ Timer aTimer;
+ Timer aInitTimer;
+ ULONG nTimerStart;
+ List aEntries;
+ List aInitials;
- void ExecuteEntries();
- void AdjustEntries(ULONG nDiff);
- void StartTimer(ULONG nNow);
+ void ExecuteEntries();
+ void AdjustEntries(ULONG nDiff);
+ void StartTimer(ULONG nNow);
DECL_LINK( TimerHdl, Timer* );
DECL_LINK( InitHdl, Timer* );
@@ -55,11 +55,11 @@ public:
ScAutoStyleList(ScDocShell* pShell);
~ScAutoStyleList();
- void AddInitial( const ScRange& rRange, const String& rStyle1,
+ void AddInitial( const ScRange& rRange, const String& rStyle1,
ULONG nTimeout, const String& rStyle2 );
- void AddEntry( ULONG nTimeout, const ScRange& rRange, const String& rStyle );
+ void AddEntry( ULONG nTimeout, const ScRange& rRange, const String& rStyle );
- void ExecuteAllNow();
+ void ExecuteAllNow();
};
diff --git a/sc/source/ui/inc/cbutton.hxx b/sc/source/ui/inc/cbutton.hxx
index 8de5dafe7768..c9f2936d99b3 100644
--- a/sc/source/ui/inc/cbutton.hxx
+++ b/sc/source/ui/inc/cbutton.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,36 +46,36 @@ public:
void SetOutputDevice( OutputDevice* pOutputDevice );
- void Draw( const Point& rAt,
- const Size& rSize,
+ void Draw( const Point& rAt,
+ const Size& rSize,
BOOL bState,
- BOOL bBtnIn = FALSE );
+ BOOL bBtnIn = FALSE );
- void Draw( const Point& rAt,
+ void Draw( const Point& rAt,
BOOL bState,
- BOOL bBtnIn = FALSE )
+ BOOL bBtnIn = FALSE )
{ Draw( rAt, aBtnSize, bState, bBtnIn ); }
void Draw( BOOL bState,
BOOL bBtnIn = FALSE )
{ Draw( aBtnPos, aBtnSize, bState, bBtnIn ); }
- void SetOptSizePixel();
+ void SetOptSizePixel();
- void SetPosPixel( const Point& rNewPos ) { aBtnPos = rNewPos; }
- Point GetPosPixel() const { return aBtnPos; }
+ void SetPosPixel( const Point& rNewPos ) { aBtnPos = rNewPos; }
+ Point GetPosPixel() const { return aBtnPos; }
- void SetSizePixel( const Size& rNewSize ) { aBtnSize = rNewSize; }
- Size GetSizePixel() const { return aBtnSize; }
+ void SetSizePixel( const Size& rNewSize ) { aBtnSize = rNewSize; }
+ Size GetSizePixel() const { return aBtnSize; }
private:
- void ImpDrawArrow( const Rectangle& rRect,
+ void ImpDrawArrow( const Rectangle& rRect,
BOOL bState );
protected:
OutputDevice* pOut;
- Point aBtnPos;
- Size aBtnSize;
+ Point aBtnPos;
+ Size aBtnSize;
};
diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx
index 563e18d96656..9202c39e461d 100644
--- a/sc/source/ui/inc/cellsh.hxx
+++ b/sc/source/ui/inc/cellsh.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ private:
CellShell_Impl* pImpl;
BOOL bPastePossible;
- void GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats );
+ void GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats );
void ExecuteExternalSource(
const String& _rFile, const String& _rFilter, const String& _rOptions,
const String& _rSource, ULONG _nRefresh, SfxRequest& _rRequest );
@@ -73,32 +73,32 @@ public:
SFX_DECL_INTERFACE(SCID_CELL_SHELL)
ScCellShell(ScViewData* pData);
- virtual ~ScCellShell();
+ virtual ~ScCellShell();
- void Execute(SfxRequest &);
- void GetState(SfxItemSet &);
+ void Execute(SfxRequest &);
+ void GetState(SfxItemSet &);
- void ExecuteEdit( SfxRequest& rReq );
- void ExecuteTrans( SfxRequest& rReq );
+ void ExecuteEdit( SfxRequest& rReq );
+ void ExecuteTrans( SfxRequest& rReq );
- void GetBlockState( SfxItemSet& rSet );
- void GetCellState( SfxItemSet& rSet );
+ void GetBlockState( SfxItemSet& rSet );
+ void GetCellState( SfxItemSet& rSet );
- void ExecuteDB( SfxRequest& rReq );
- void GetDBState( SfxItemSet& rSet );
+ void ExecuteDB( SfxRequest& rReq );
+ void GetDBState( SfxItemSet& rSet );
- void ExecImageMap(SfxRequest& rReq); // ImageMap
- void GetImageMapState(SfxItemSet& rSet);
+ void ExecImageMap(SfxRequest& rReq); // ImageMap
+ void GetImageMapState(SfxItemSet& rSet);
- void GetClipState( SfxItemSet& rSet );
- void GetHLinkState( SfxItemSet& rSet );
+ void GetClipState( SfxItemSet& rSet );
+ void GetHLinkState( SfxItemSet& rSet );
- void ExecuteCursor( SfxRequest& rReq );
- void ExecuteCursorSel( SfxRequest& rReq );
- void ExecutePage( SfxRequest& rReq );
- void ExecutePageSel( SfxRequest& rReq );
- void ExecuteMove( SfxRequest& rReq );
- void GetStateCursor( SfxItemSet& rSet );
+ void ExecuteCursor( SfxRequest& rReq );
+ void ExecuteCursorSel( SfxRequest& rReq );
+ void ExecutePage( SfxRequest& rReq );
+ void ExecutePageSel( SfxRequest& rReq );
+ void ExecuteMove( SfxRequest& rReq );
+ void GetStateCursor( SfxItemSet& rSet );
static void PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, bool bShowDialog );
};
diff --git a/sc/source/ui/inc/chartsh.hxx b/sc/source/ui/inc/chartsh.hxx
index 95efd03f3b76..e9aaf0787eea 100644
--- a/sc/source/ui/inc/chartsh.hxx
+++ b/sc/source/ui/inc/chartsh.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ public:
SFX_DECL_INTERFACE(SCID_CHART_SHELL)
ScChartShell(ScViewData* pData);
- virtual ~ScChartShell();
+ virtual ~ScChartShell();
};
diff --git a/sc/source/ui/inc/client.hxx b/sc/source/ui/inc/client.hxx
index 1b13ee224d77..012ce4d0b36d 100644
--- a/sc/source/ui/inc/client.hxx
+++ b/sc/source/ui/inc/client.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,21 +41,21 @@ class SdrModel;
class ScClient : public SfxInPlaceClient
{
private:
- SdrModel* pModel;
- SdrGrafObj* pGrafEdit;
+ SdrModel* pModel;
+ SdrGrafObj* pGrafEdit;
virtual void ObjectAreaChanged();
virtual void RequestNewObjectArea( Rectangle& );
virtual void ViewChanged();
- virtual void MakeVisible();
+ virtual void MakeVisible();
public:
ScClient( ScTabViewShell* pViewShell, Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj );
- virtual ~ScClient();
+ virtual ~ScClient();
- SdrGrafObj* GetGrafEdit() const { return pGrafEdit; }
- void SetGrafEdit(SdrGrafObj* pNew) { pGrafEdit = pNew; }
- SdrOle2Obj* GetDrawObj();
+ SdrGrafObj* GetGrafEdit() const { return pGrafEdit; }
+ void SetGrafEdit(SdrGrafObj* pNew) { pGrafEdit = pNew; }
+ SdrOle2Obj* GetDrawObj();
};
diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx
index 587412defea2..28d5a6d3f285 100644
--- a/sc/source/ui/inc/colrowba.hxx
+++ b/sc/source/ui/inc/colrowba.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ class ScHeaderSelectionEngine;
class ScColBar : public ScHeaderControl
{
- ScViewData* pViewData;
- ScHSplitPos eWhich;
- ScHeaderFunctionSet* pFuncSet;
+ ScViewData* pViewData;
+ ScHSplitPos eWhich;
+ ScHeaderFunctionSet* pFuncSet;
ScHeaderSelectionEngine* pSelEngine;
public:
@@ -49,33 +49,33 @@ public:
ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng );
~ScColBar();
- virtual SCCOLROW GetPos();
- virtual USHORT GetEntrySize( SCCOLROW nEntryNo );
- virtual String GetEntryText( SCCOLROW nEntryNo );
+ virtual SCCOLROW GetPos();
+ virtual USHORT GetEntrySize( SCCOLROW nEntryNo );
+ virtual String GetEntryText( SCCOLROW nEntryNo );
- virtual BOOL IsLayoutRTL(); // only for columns
+ virtual BOOL IsLayoutRTL(); // only for columns
- virtual void SetEntrySize( SCCOLROW nPos, USHORT nNewSize );
- virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd );
+ virtual void SetEntrySize( SCCOLROW nPos, USHORT nNewSize );
+ virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd );
- virtual void SetMarking( BOOL bSet );
- virtual void SelectWindow();
- virtual BOOL IsDisabled();
- virtual BOOL ResizeAllowed();
+ virtual void SetMarking( BOOL bSet );
+ virtual void SelectWindow();
+ virtual BOOL IsDisabled();
+ virtual BOOL ResizeAllowed();
- virtual void DrawInvert( long nDragPos );
+ virtual void DrawInvert( long nDragPos );
- virtual String GetDragHelp( long nVal );
+ virtual String GetDragHelp( long nVal );
- BOOL UseNumericHeader() const;
+ BOOL UseNumericHeader() const;
};
class ScRowBar : public ScHeaderControl
{
- ScViewData* pViewData;
- ScVSplitPos eWhich;
- ScHeaderFunctionSet* pFuncSet;
+ ScViewData* pViewData;
+ ScVSplitPos eWhich;
+ ScHeaderFunctionSet* pFuncSet;
ScHeaderSelectionEngine* pSelEngine;
public:
@@ -83,24 +83,24 @@ public:
ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng );
~ScRowBar();
- virtual SCCOLROW GetPos();
- virtual USHORT GetEntrySize( SCCOLROW nEntryNo );
- virtual String GetEntryText( SCCOLROW nEntryNo );
+ virtual SCCOLROW GetPos();
+ virtual USHORT GetEntrySize( SCCOLROW nEntryNo );
+ virtual String GetEntryText( SCCOLROW nEntryNo );
- virtual BOOL IsMirrored(); // only for columns
- virtual SCROW GetHiddenCount( SCROW nEntryNo ); // only for columns
+ virtual BOOL IsMirrored(); // only for columns
+ virtual SCROW GetHiddenCount( SCROW nEntryNo ); // only for columns
- virtual void SetEntrySize( SCCOLROW nPos, USHORT nNewSize );
- virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd );
+ virtual void SetEntrySize( SCCOLROW nPos, USHORT nNewSize );
+ virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd );
- virtual void SetMarking( BOOL bSet );
- virtual void SelectWindow();
- virtual BOOL IsDisabled();
- virtual BOOL ResizeAllowed();
+ virtual void SetMarking( BOOL bSet );
+ virtual void SelectWindow();
+ virtual BOOL IsDisabled();
+ virtual BOOL ResizeAllowed();
- virtual void DrawInvert( long nDragPos );
+ virtual void DrawInvert( long nDragPos );
- virtual String GetDragHelp( long nVal );
+ virtual String GetDragHelp( long nVal );
};
diff --git a/sc/source/ui/inc/condfrmt.hrc b/sc/source/ui/inc/condfrmt.hrc
index 099d82b2fa85..67d587cf8ec9 100644
--- a/sc/source/ui/inc/condfrmt.hrc
+++ b/sc/source/ui/inc/condfrmt.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,45 +27,45 @@
#include "sc.hrc" // ->RID_SCDLG_SOLVER
-#define CBX_COND1 1
-#define LB_COND1_1 2
-#define LB_COND1_2 3
-#define EDT_COND1_1 4
-#define RB_COND1_1 5
-#define FT_COND1_AND 6
-#define EDT_COND1_2 7
-#define RB_COND1_2 8
-#define FT_COND1_TEMPLATE 9
-#define LB_COND1_TEMPLATE 10
+#define CBX_COND1 1
+#define LB_COND1_1 2
+#define LB_COND1_2 3
+#define EDT_COND1_1 4
+#define RB_COND1_1 5
+#define FT_COND1_AND 6
+#define EDT_COND1_2 7
+#define RB_COND1_2 8
+#define FT_COND1_TEMPLATE 9
+#define LB_COND1_TEMPLATE 10
-#define CBX_COND2 11
-#define LB_COND2_1 12
-#define LB_COND2_2 13
-#define EDT_COND2_1 14
-#define RB_COND2_1 15
-#define FT_COND2_AND 16
-#define EDT_COND2_2 17
-#define RB_COND2_2 18
-#define FT_COND2_TEMPLATE 19
-#define LB_COND2_TEMPLATE 20
+#define CBX_COND2 11
+#define LB_COND2_1 12
+#define LB_COND2_2 13
+#define EDT_COND2_1 14
+#define RB_COND2_1 15
+#define FT_COND2_AND 16
+#define EDT_COND2_2 17
+#define RB_COND2_2 18
+#define FT_COND2_TEMPLATE 19
+#define LB_COND2_TEMPLATE 20
-#define CBX_COND3 21
-#define LB_COND3_1 22
-#define LB_COND3_2 23
-#define EDT_COND3_1 24
-#define RB_COND3_1 25
-#define FT_COND3_AND 26
-#define EDT_COND3_2 27
-#define RB_COND3_2 28
-#define FT_COND3_TEMPLATE 29
-#define LB_COND3_TEMPLATE 30
+#define CBX_COND3 21
+#define LB_COND3_1 22
+#define LB_COND3_2 23
+#define EDT_COND3_1 24
+#define RB_COND3_1 25
+#define FT_COND3_AND 26
+#define EDT_COND3_2 27
+#define RB_COND3_2 28
+#define FT_COND3_TEMPLATE 29
+#define LB_COND3_TEMPLATE 30
#define FL_SEP1 41
#define FL_SEP2 42
#define BTN_OK 31
-#define BTN_CANCEL 32
-#define BTN_HELP 33
+#define BTN_CANCEL 32
+#define BTN_HELP 33
#define BTN_COND1_NEW 34
#define BTN_COND2_NEW 35
diff --git a/sc/source/ui/inc/condfrmt.hxx b/sc/source/ui/inc/condfrmt.hxx
index ecd4c529d57a..fe4f38d4a264 100644
--- a/sc/source/ui/inc/condfrmt.hxx
+++ b/sc/source/ui/inc/condfrmt.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +39,7 @@ class ScConditionalFormat;
//============================================================================
-// class ScConditionalFormat
+// class ScConditionalFormat
//
// Dialog zum Festlegen von bedingten Formaten
@@ -51,85 +51,85 @@ public:
const ScConditionalFormat* pCurrentFormat );
~ScConditionalFormatDlg();
- virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual void AddRefEntry();
+ virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
+ virtual void AddRefEntry();
virtual BOOL IsRefInputMode() const;
- virtual void SetActive();
- virtual BOOL Close();
+ virtual void SetActive();
+ virtual BOOL Close();
private:
- CheckBox aCbxCond1;
- ListBox aLbCond11;
- ListBox aLbCond12;
- formula::RefEdit aEdtCond11;
- formula::RefButton aRbCond11;
- FixedText aFtCond1And;
- formula::RefEdit aEdtCond12;
- formula::RefButton aRbCond12;
- FixedText aFtCond1Template;
- ListBox aLbCond1Template;
+ CheckBox aCbxCond1;
+ ListBox aLbCond11;
+ ListBox aLbCond12;
+ formula::RefEdit aEdtCond11;
+ formula::RefButton aRbCond11;
+ FixedText aFtCond1And;
+ formula::RefEdit aEdtCond12;
+ formula::RefButton aRbCond12;
+ FixedText aFtCond1Template;
+ ListBox aLbCond1Template;
PushButton aBtnNew1;
FixedLine aFlSep1;
CheckBox aCbxCond2;
- ListBox aLbCond21;
- ListBox aLbCond22;
- formula::RefEdit aEdtCond21;
- formula::RefButton aRbCond21;
- FixedText aFtCond2And;
- formula::RefEdit aEdtCond22;
- formula::RefButton aRbCond22;
- FixedText aFtCond2Template;
- ListBox aLbCond2Template;
+ ListBox aLbCond21;
+ ListBox aLbCond22;
+ formula::RefEdit aEdtCond21;
+ formula::RefButton aRbCond21;
+ FixedText aFtCond2And;
+ formula::RefEdit aEdtCond22;
+ formula::RefButton aRbCond22;
+ FixedText aFtCond2Template;
+ ListBox aLbCond2Template;
PushButton aBtnNew2;
FixedLine aFlSep2;
- CheckBox aCbxCond3;
- ListBox aLbCond31;
- ListBox aLbCond32;
- formula::RefEdit aEdtCond31;
- formula::RefButton aRbCond31;
- FixedText aFtCond3And;
- formula::RefEdit aEdtCond32;
- formula::RefButton aRbCond32;
- FixedText aFtCond3Template;
- ListBox aLbCond3Template;
+ CheckBox aCbxCond3;
+ ListBox aLbCond31;
+ ListBox aLbCond32;
+ formula::RefEdit aEdtCond31;
+ formula::RefButton aRbCond31;
+ FixedText aFtCond3And;
+ formula::RefEdit aEdtCond32;
+ formula::RefButton aRbCond32;
+ FixedText aFtCond3Template;
+ ListBox aLbCond3Template;
PushButton aBtnNew3;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
-
- Point aCond1Pos1;
- Point aCond1Pos2;
- Point aRBtn1Pos1;
- Point aRBtn1Pos2;
- Size aCond1Size1;
- Size aCond1Size2;
- Size aCond1Size3;
-
- Point aCond2Pos1;
- Point aCond2Pos2;
- Point aRBtn2Pos1;
- Point aRBtn2Pos2;
- Size aCond2Size1;
- Size aCond2Size2;
- Size aCond2Size3;
-
- Point aCond3Pos1;
- Point aCond3Pos2;
- Point aRBtn3Pos1;
- Point aRBtn3Pos2;
- Size aCond3Size1;
- Size aCond3Size2;
- Size aCond3Size3;
-
- formula::RefEdit* pEdActive;
- BOOL bDlgLostFocus;
- ScDocument* pDoc;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
+
+ Point aCond1Pos1;
+ Point aCond1Pos2;
+ Point aRBtn1Pos1;
+ Point aRBtn1Pos2;
+ Size aCond1Size1;
+ Size aCond1Size2;
+ Size aCond1Size3;
+
+ Point aCond2Pos1;
+ Point aCond2Pos2;
+ Point aRBtn2Pos1;
+ Point aRBtn2Pos2;
+ Size aCond2Size1;
+ Size aCond2Size2;
+ Size aCond2Size3;
+
+ Point aCond3Pos1;
+ Point aCond3Pos2;
+ Point aRBtn3Pos1;
+ Point aRBtn3Pos2;
+ Size aCond3Size1;
+ Size aCond3Size2;
+ Size aCond3Size3;
+
+ formula::RefEdit* pEdActive;
+ BOOL bDlgLostFocus;
+ ScDocument* pDoc;
#ifdef _CONDFRMT_CXX
- void GetConditionalFormat( ScConditionalFormat& rCndFmt );
+ void GetConditionalFormat( ScConditionalFormat& rCndFmt );
DECL_LINK( ClickCond1Hdl, void * );
DECL_LINK( ChangeCond11Hdl, void * );
diff --git a/sc/source/ui/inc/conflictsdlg.hrc b/sc/source/ui/inc/conflictsdlg.hrc
index 7935a6ee21d7..cfd864d5ec0a 100644
--- a/sc/source/ui/inc/conflictsdlg.hrc
+++ b/sc/source/ui/inc/conflictsdlg.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/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx
index faeecb370c78..454ef702809d 100644
--- a/sc/source/ui/inc/conflictsdlg.hxx
+++ b/sc/source/ui/inc/conflictsdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx
index e82e2619cce0..9048a03bac58 100644
--- a/sc/source/ui/inc/consdlg.hxx
+++ b/sc/source/ui/inc/consdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,78 +55,78 @@ class ScConsolidateDlg : public ScAnyRefDlg
{
public:
ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
- const SfxItemSet& rArgSet );
+ const SfxItemSet& rArgSet );
~ScConsolidateDlg();
- virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
+ virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual BOOL IsRefInputMode() const { return TRUE; }
- virtual void SetActive();
+ virtual BOOL IsRefInputMode() const { return TRUE; }
+ virtual void SetActive();
- virtual BOOL Close();
+ virtual BOOL Close();
protected:
- virtual void Deactivate();
+ virtual void Deactivate();
private:
- FixedText aFtFunc;
- ListBox aLbFunc;
+ FixedText aFtFunc;
+ ListBox aLbFunc;
- FixedText aFtConsAreas;
- MultiListBox aLbConsAreas;
+ FixedText aFtConsAreas;
+ MultiListBox aLbConsAreas;
- ListBox aLbDataArea;
- FixedText aFtDataArea;
- formula::RefEdit aEdDataArea;
- formula::RefButton aRbDataArea;
+ ListBox aLbDataArea;
+ FixedText aFtDataArea;
+ formula::RefEdit aEdDataArea;
+ formula::RefButton aRbDataArea;
- ListBox aLbDestArea;
- FixedText aFtDestArea;
- formula::RefEdit aEdDestArea;
- formula::RefButton aRbDestArea;
+ ListBox aLbDestArea;
+ FixedText aFtDestArea;
+ formula::RefEdit aEdDestArea;
+ formula::RefButton aRbDestArea;
FixedLine aFlConsBy;
- CheckBox aBtnByRow;
- CheckBox aBtnByCol;
+ CheckBox aBtnByRow;
+ CheckBox aBtnByCol;
FixedLine aFlSep;
FixedLine aFlOptions;
- CheckBox aBtnRefs;
+ CheckBox aBtnRefs;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
- PushButton aBtnAdd;
- PushButton aBtnRemove;
- MoreButton aBtnMore;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
+ PushButton aBtnAdd;
+ PushButton aBtnRemove;
+ MoreButton aBtnMore;
- String aStrUndefined;
+ String aStrUndefined;
- ScConsolidateParam theConsData;
- ScViewData* pViewData;
- ScDocument* pDoc;
- ScRangeUtil* pRangeUtil;
- ScAreaData* pAreaData;
- USHORT nAreaDataCount;
- USHORT nWhichCons;
+ ScConsolidateParam theConsData;
+ ScViewData* pViewData;
+ ScDocument* pDoc;
+ ScRangeUtil* pRangeUtil;
+ ScAreaData* pAreaData;
+ USHORT nAreaDataCount;
+ USHORT nWhichCons;
- formula::RefEdit* pRefInputEdit;
- BOOL bDlgLostFocus;
+ formula::RefEdit* pRefInputEdit;
+ BOOL bDlgLostFocus;
#ifdef _CONSDLG_CXX
private:
- void Init ();
- void FillAreaLists ();
- BOOL VerifyEdit ( formula::RefEdit* pEd );
+ void Init ();
+ void FillAreaLists ();
+ BOOL VerifyEdit ( formula::RefEdit* pEd );
- DECL_LINK( OkHdl, void* );
- DECL_LINK( ClickHdl, PushButton* );
+ DECL_LINK( OkHdl, void* );
+ DECL_LINK( ClickHdl, PushButton* );
DECL_LINK( GetFocusHdl, Control* );
- DECL_LINK( ModifyHdl, formula::RefEdit* );
- DECL_LINK( SelectHdl, ListBox* );
+ DECL_LINK( ModifyHdl, formula::RefEdit* );
+ DECL_LINK( SelectHdl, ListBox* );
- ScSubTotalFunc LbPosToFunc( USHORT nPos );
- USHORT FuncToLbPos( ScSubTotalFunc eFunc );
+ ScSubTotalFunc LbPosToFunc( USHORT nPos );
+ USHORT FuncToLbPos( ScSubTotalFunc eFunc );
#endif // _CONSDLG_CXX
};
diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx
index b7d4d292c406..929df0f9861a 100644
--- a/sc/source/ui/inc/content.hxx
+++ b/sc/source/ui/inc/content.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,61 +39,61 @@ class ScDocument;
class ScDocShell;
class ScAreaLink;
-#define SC_CONTENT_ROOT 0
-#define SC_CONTENT_TABLE 1
-#define SC_CONTENT_RANGENAME 2
-#define SC_CONTENT_DBAREA 3
-#define SC_CONTENT_GRAPHIC 4
-#define SC_CONTENT_OLEOBJECT 5
-#define SC_CONTENT_NOTE 6
-#define SC_CONTENT_AREALINK 7
-#define SC_CONTENT_DRAWING 8
-#define SC_CONTENT_COUNT 9
+#define SC_CONTENT_ROOT 0
+#define SC_CONTENT_TABLE 1
+#define SC_CONTENT_RANGENAME 2
+#define SC_CONTENT_DBAREA 3
+#define SC_CONTENT_GRAPHIC 4
+#define SC_CONTENT_OLEOBJECT 5
+#define SC_CONTENT_NOTE 6
+#define SC_CONTENT_AREALINK 7
+#define SC_CONTENT_DRAWING 8
+#define SC_CONTENT_COUNT 9
const ULONG SC_CONTENT_NOCHILD = ~0UL;
//
-// TreeListBox fuer Inhalte
+// TreeListBox fuer Inhalte
//
class ScContentTree : public SvTreeListBox
{
- ScNavigatorDlg* pParentWindow;
- ImageList aEntryImages;
- ImageList aHCEntryImages;
- SvLBoxEntry* pRootNodes[SC_CONTENT_COUNT];
- USHORT nRootType; // als Root eingestellt
- String aManualDoc; // im Navigator umgeschaltet (Title)
- BOOL bHiddenDoc; // verstecktes aktiv?
- String aHiddenName; // URL zum Laden
- String aHiddenTitle; // fuer Anzeige
- ScDocument* pHiddenDocument; // temporaer
+ ScNavigatorDlg* pParentWindow;
+ ImageList aEntryImages;
+ ImageList aHCEntryImages;
+ SvLBoxEntry* pRootNodes[SC_CONTENT_COUNT];
+ USHORT nRootType; // als Root eingestellt
+ String aManualDoc; // im Navigator umgeschaltet (Title)
+ BOOL bHiddenDoc; // verstecktes aktiv?
+ String aHiddenName; // URL zum Laden
+ String aHiddenTitle; // fuer Anzeige
+ ScDocument* pHiddenDocument; // temporaer
- USHORT pPosList[SC_CONTENT_COUNT]; // fuer die Reihenfolge
+ USHORT pPosList[SC_CONTENT_COUNT]; // fuer die Reihenfolge
- static BOOL bIsInDrag; // static, falls der Navigator im ExecuteDrag geloescht wird
+ static BOOL bIsInDrag; // static, falls der Navigator im ExecuteDrag geloescht wird
ScDocShell* GetManualOrCurrent();
- void InitRoot(USHORT nType);
- void ClearType(USHORT nType);
- void ClearAll();
- void InsertContent( USHORT nType, const String& rValue );
+ void InitRoot(USHORT nType);
+ void ClearType(USHORT nType);
+ void ClearAll();
+ void InsertContent( USHORT nType, const String& rValue );
void GetDrawNames( USHORT nType );
- void GetTableNames();
- void GetAreaNames();
- void GetDbNames();
- void GetLinkNames();
- void GetGraphicNames();
- void GetOleNames();
- void GetDrawingNames();
- void GetNoteStrings();
+ void GetTableNames();
+ void GetAreaNames();
+ void GetDbNames();
+ void GetLinkNames();
+ void GetGraphicNames();
+ void GetOleNames();
+ void GetDrawingNames();
+ void GetNoteStrings();
static bool IsPartOfType( USHORT nContentType, USHORT nObjIdentifier );
- BOOL DrawNamesChanged( USHORT nType );
- BOOL NoteStringsChanged();
+ BOOL DrawNamesChanged( USHORT nType );
+ BOOL NoteStringsChanged();
ScAddress GetNotePos( ULONG nIndex );
const ScAreaLink* GetLink( ULONG nIndex );
@@ -109,8 +109,8 @@ class ScContentTree : public SvTreeListBox
@return Index of the entry inside its root or SC_CONTENT_NOCHILD if entry is root. */
ULONG GetChildIndex( SvLBoxEntry* pEntry ) const;
- void DoDrag();
-//UNUSED2008-05 void AdjustTitle();
+ void DoDrag();
+//UNUSED2008-05 void AdjustTitle();
ScDocument* GetSourceDocument();
@@ -118,18 +118,18 @@ class ScContentTree : public SvTreeListBox
DECL_STATIC_LINK( ScContentTree, ExecDragHdl, void* );
protected:
-// virtual BOOL Drop( const DropEvent& rEvt );
-// virtual BOOL QueryDrop( DropEvent& rEvt );
+// virtual BOOL Drop( const DropEvent& rEvt );
+// virtual BOOL QueryDrop( DropEvent& rEvt );
using SvTreeListBox::ExecuteDrop;
- virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
+ virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
- virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
- virtual void DragFinished( sal_Int8 nAction );
+ virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
+ virtual void DragFinished( sal_Int8 nAction );
- virtual void Command( const CommandEvent& rCEvt );
- virtual void RequestHelp( const HelpEvent& rHEvt );
+ virtual void Command( const CommandEvent& rCEvt );
+ virtual void RequestHelp( const HelpEvent& rHEvt );
public:
ScContentTree( Window* pParent, const ResId& rResId );
@@ -138,28 +138,28 @@ public:
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void KeyInput( const KeyEvent& rKEvt );
- void InitWindowBits( BOOL bButtons );
+ void InitWindowBits( BOOL bButtons );
void Refresh( USHORT nType = 0 );
- void ToggleRoot();
- void SetRootType( USHORT nNew );
- USHORT GetRootType() const { return nRootType; }
+ void ToggleRoot();
+ void SetRootType( USHORT nNew );
+ USHORT GetRootType() const { return nRootType; }
- void ActiveDocChanged();
- void ResetManualDoc();
- void SetManualDoc(const String& rName);
- BOOL LoadFile(const String& rUrl);
- void SelectDoc(const String& rName);
+ void ActiveDocChanged();
+ void ResetManualDoc();
+ void SetManualDoc(const String& rName);
+ BOOL LoadFile(const String& rUrl);
+ void SelectDoc(const String& rName);
- const String& GetHiddenTitle() const { return aHiddenTitle; }
+ const String& GetHiddenTitle() const { return aHiddenTitle; }
/** Applies the navigator settings to the listbox. */
void ApplySettings();
/** Stores the current listbox state in the navigator settings. */
void StoreSettings() const;
- static BOOL IsInDrag() { return bIsInDrag; }
+ static BOOL IsInDrag() { return bIsInDrag; }
};
diff --git a/sc/source/ui/inc/corodlg.hxx b/sc/source/ui/inc/corodlg.hxx
index 424326565619..36d1e123600f 100644
--- a/sc/source/ui/inc/corodlg.hxx
+++ b/sc/source/ui/inc/corodlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +51,9 @@ public:
BOOL bRow = FALSE )
: ModalDialog( pParent, ScResId( RID_SCDLG_CHARTCOLROW ) ),
aFlColRow ( this, ScResId(6) ),
- aBtnRow ( this, ScResId(2) ),
- aBtnCol ( this, ScResId(1) ),
- aBtnOk ( this, ScResId(3) ),
+ aBtnRow ( this, ScResId(2) ),
+ aBtnCol ( this, ScResId(1) ),
+ aBtnOk ( this, ScResId(3) ),
aBtnCancel ( this, ScResId(4) ),
aBtnHelp ( this, ScResId(5) )
{
@@ -67,11 +67,11 @@ public:
private:
FixedLine aFlColRow;
- CheckBox aBtnRow;
- CheckBox aBtnCol;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ CheckBox aBtnRow;
+ CheckBox aBtnCol;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
};
diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx
index 20dd79f359ad..a19d7b41a841 100644
--- a/sc/source/ui/inc/crdlg.hxx
+++ b/sc/source/ui/inc/crdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 <vcl/dialog.hxx>
#include <vcl/imagebtn.hxx>
#include <vcl/fixed.hxx>
-#include "scui_def.hxx" //CHINA001
+#include "scui_def.hxx" //CHINA001
//CHINA001 #define SCRET_COLS 0x42
//CHINA001 #define SCRET_ROWS 0x43
@@ -42,19 +42,19 @@
class ScColOrRowDlg : public ModalDialog
{
public:
- ScColOrRowDlg( Window* pParent,
- const String& rStrTitle,
- const String& rStrLabel,
- BOOL bColDefault = TRUE );
+ ScColOrRowDlg( Window* pParent,
+ const String& rStrTitle,
+ const String& rStrLabel,
+ BOOL bColDefault = TRUE );
~ScColOrRowDlg();
private:
FixedLine aFlFrame;
- RadioButton aBtnRows;
- RadioButton aBtnCols;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ RadioButton aBtnRows;
+ RadioButton aBtnCols;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
DECL_LINK( OkHdl, OKButton * );
};
diff --git a/sc/source/ui/inc/crnrdlg.hrc b/sc/source/ui/inc/crnrdlg.hrc
index 1d27531f9bc1..8e8de3fe32bd 100644
--- a/sc/source/ui/inc/crnrdlg.hrc
+++ b/sc/source/ui/inc/crnrdlg.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
@@ -28,19 +28,19 @@
#include "sc.hrc" // -> RID_SCDLG_COLROWNAMERANGES
#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_ADD 3
-#define BTN_REMOVE 4
-#define BTN_HELP 5
+#define BTN_CANCEL 2
+#define BTN_ADD 3
+#define BTN_REMOVE 4
+#define BTN_HELP 5
//
-#define LB_RANGE 11
+#define LB_RANGE 11
//
#define FL_ASSIGN 12
-#define ED_AREA 13
-#define RB_AREA 14
-#define BTN_COLHEAD 15
-#define BTN_ROWHEAD 16
-#define ED_DATA 17
-#define RB_DATA 18
-#define FT_DATA_LABEL 19
+#define ED_AREA 13
+#define RB_AREA 14
+#define BTN_COLHEAD 15
+#define BTN_ROWHEAD 16
+#define ED_DATA 17
+#define RB_DATA 18
+#define FT_DATA_LABEL 19
//
diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx
index e45ff4403633..5cee52d5a516 100644
--- a/sc/source/ui/inc/crnrdlg.hxx
+++ b/sc/source/ui/inc/crnrdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,51 +45,51 @@ class ScColRowNameRangesDlg : public ScAnyRefDlg
{
public:
ScColRowNameRangesDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
- ScViewData* ptrViewData );
+ ScViewData* ptrViewData );
~ScColRowNameRangesDlg();
- virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
+ virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual BOOL IsRefInputMode() const;
- virtual void SetActive();
- virtual BOOL Close();
+ virtual BOOL IsRefInputMode() const;
+ virtual void SetActive();
+ virtual BOOL Close();
private:
FixedLine aFlAssign;
- ListBox aLbRange;
+ ListBox aLbRange;
- formula::RefEdit aEdAssign;
- formula::RefButton aRbAssign;
- RadioButton aBtnColHead;
- RadioButton aBtnRowHead;
- FixedText aFtAssign2;
- formula::RefEdit aEdAssign2;
- formula::RefButton aRbAssign2;
+ formula::RefEdit aEdAssign;
+ formula::RefButton aRbAssign;
+ RadioButton aBtnColHead;
+ RadioButton aBtnRowHead;
+ FixedText aFtAssign2;
+ formula::RefEdit aEdAssign2;
+ formula::RefButton aRbAssign2;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
- PushButton aBtnAdd;
- PushButton aBtnRemove;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
+ PushButton aBtnAdd;
+ PushButton aBtnRemove;
- ScRange theCurArea;
- ScRange theCurData;
+ ScRange theCurArea;
+ ScRange theCurData;
- ScRangePairListRef xColNameRanges;
- ScRangePairListRef xRowNameRanges;
+ ScRangePairListRef xColNameRanges;
+ ScRangePairListRef xRowNameRanges;
typedef ::std::hash_map< String, ScRange, ScStringHashCode, ::std::equal_to<String> > NameRangeMap;
NameRangeMap aRangeMap;
- ScViewData* pViewData;
- ScDocument* pDoc;
- formula::RefEdit* pEdActive;
- BOOL bDlgLostFocus;
+ ScViewData* pViewData;
+ ScDocument* pDoc;
+ formula::RefEdit* pEdActive;
+ BOOL bDlgLostFocus;
#ifdef _CRNRDLG_CXX
private:
- void Init ();
- void UpdateNames ();
- void UpdateRangeData ( const ScRange& rRange, BOOL bColName );
+ void Init ();
+ void UpdateNames ();
+ void UpdateRangeData ( const ScRange& rRange, BOOL bColName );
void SetColRowData( const ScRange& rLabelRange,BOOL bRef=FALSE);
void AdjustColRowData( const ScRange& rDataRange,BOOL bRef=FALSE);
DECL_LINK( CancelBtnHdl, void * );
diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx
index c38abfb83598..a4c98ce64cd4 100644
--- a/sc/source/ui/inc/csvcontrol.hxx
+++ b/sc/source/ui/inc/csvcontrol.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx
index fb6d687533e6..816b772e81c9 100644
--- a/sc/source/ui/inc/csvgrid.hxx
+++ b/sc/source/ui/inc/csvgrid.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx
index 52be4b4ebd8c..33af9f9d24a9 100644
--- a/sc/source/ui/inc/csvruler.hxx
+++ b/sc/source/ui/inc/csvruler.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/csvsplits.hxx b/sc/source/ui/inc/csvsplits.hxx
index 4685269936d5..2a009f23cd5c 100644
--- a/sc/source/ui/inc/csvsplits.hxx
+++ b/sc/source/ui/inc/csvsplits.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx
index 205e8b50cad1..a0a1e206a22c 100644
--- a/sc/source/ui/inc/csvtablebox.hxx
+++ b/sc/source/ui/inc/csvtablebox.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx
index 13d7e91bdceb..a4379bb70a03 100644
--- a/sc/source/ui/inc/dapidata.hxx
+++ b/sc/source/ui/inc/dapidata.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,17 +45,17 @@ class ScDataPilotDatabaseDlg : public ModalDialog
{
private:
FixedLine aFlFrame;
- FixedText aFtDatabase;
- ListBox aLbDatabase;
- FixedText aFtObject;
- ComboBox aCbObject;
- FixedText aFtType;
- ListBox aLbType;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ FixedText aFtDatabase;
+ ListBox aLbDatabase;
+ FixedText aFtObject;
+ ComboBox aCbObject;
+ FixedText aFtType;
+ ListBox aLbType;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
- void FillObjects();
+ void FillObjects();
DECL_LINK( SelectHdl, ListBox* );
@@ -63,7 +63,7 @@ public:
ScDataPilotDatabaseDlg( Window* pParent );
~ScDataPilotDatabaseDlg();
- void GetValues( ScImportSourceDesc& rDesc );
+ void GetValues( ScImportSourceDesc& rDesc );
};
diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx
index 07659b1dbc59..2962df9fdcc1 100644
--- a/sc/source/ui/inc/dapitype.hxx
+++ b/sc/source/ui/inc/dapitype.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,19 +43,19 @@ class ScDataPilotSourceTypeDlg : public ModalDialog
{
private:
FixedLine aFlFrame;
- RadioButton aBtnSelection;
- RadioButton aBtnDatabase;
- RadioButton aBtnExternal;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ RadioButton aBtnSelection;
+ RadioButton aBtnDatabase;
+ RadioButton aBtnExternal;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
public:
ScDataPilotSourceTypeDlg( Window* pParent, BOOL bEnableExternal );
~ScDataPilotSourceTypeDlg();
- BOOL IsDatabase() const;
- BOOL IsExternal() const;
+ BOOL IsDatabase() const;
+ BOOL IsExternal() const;
};
@@ -63,30 +63,30 @@ class ScDataPilotServiceDlg : public ModalDialog
{
private:
FixedLine aFlFrame;
- FixedText aFtService;
- ListBox aLbService;
- FixedText aFtSource;
- Edit aEdSource;
- FixedText aFtName;
- Edit aEdName;
- FixedText aFtUser;
- Edit aEdUser;
- FixedText aFtPasswd;
- Edit aEdPasswd;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ FixedText aFtService;
+ ListBox aLbService;
+ FixedText aFtSource;
+ Edit aEdSource;
+ FixedText aFtName;
+ Edit aEdName;
+ FixedText aFtUser;
+ Edit aEdUser;
+ FixedText aFtPasswd;
+ Edit aEdPasswd;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
public:
ScDataPilotServiceDlg( Window* pParent,
const com::sun::star::uno::Sequence<rtl::OUString>& rServices );
~ScDataPilotServiceDlg();
- String GetServiceName() const;
- String GetParSource() const;
- String GetParName() const;
- String GetParUser() const;
- String GetParPass() const;
+ String GetServiceName() const;
+ String GetParSource() const;
+ String GetParName() const;
+ String GetParUser() const;
+ String GetParPass() const;
};
diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx
index efdd29b44738..4346d2a85bab 100644
--- a/sc/source/ui/inc/dbdocfun.hxx
+++ b/sc/source/ui/inc/dbdocfun.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,49 +73,49 @@ class ScDBDocFunc
friend class ScDBFunc;
private:
- ScDocShell& rDocShell;
+ ScDocShell& rDocShell;
public:
ScDBDocFunc( ScDocShell& rDocSh ): rDocShell(rDocSh) {}
~ScDBDocFunc() {}
- void UpdateImport( const String& rTarget, const String& rDBName,
+ void UpdateImport( const String& rTarget, const String& rDBName,
const String& rTableName, const String& rStatement,
BOOL bNative, BYTE nType,
const ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XResultSet >& xResultSet,
const SbaSelectionList* pSelection );
- BOOL DoImport( SCTAB nTab, const ScImportParam& rParam,
+ BOOL DoImport( SCTAB nTab, const ScImportParam& rParam,
const ::com::sun::star::uno::Reference<
::com::sun::star::sdbc::XResultSet >& xResultSet,
const SbaSelectionList* pSelection, BOOL bRecord,
BOOL bAddrInsert = FALSE );
- BOOL DoImportUno( const ScAddress& rPos,
+ BOOL DoImportUno( const ScAddress& rPos,
const com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue>& aArgs );
- static void ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFrame );
+ static void ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFrame );
- BOOL Sort( SCTAB nTab, const ScSortParam& rSortParam,
+ BOOL Sort( SCTAB nTab, const ScSortParam& rSortParam,
BOOL bRecord, BOOL bPaint, BOOL bApi );
- SC_DLLPUBLIC BOOL Query( SCTAB nTab, const ScQueryParam& rQueryParam,
+ SC_DLLPUBLIC BOOL Query( SCTAB nTab, const ScQueryParam& rQueryParam,
const ScRange* pAdvSource, BOOL bRecord, BOOL bApi );
- BOOL DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
+ BOOL DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
const ScSortParam* pForceNewSort,
BOOL bRecord, BOOL bApi );
- BOOL AddDBRange( const String& rName, const ScRange& rRange, BOOL bApi );
- BOOL DeleteDBRange( const String& rName, BOOL bApi );
- BOOL RenameDBRange( const String& rOld, const String& rNew, BOOL bApi );
- BOOL ModifyDBData( const ScDBData& rNewData, BOOL bApi ); // Name unveraendert
+ BOOL AddDBRange( const String& rName, const ScRange& rRange, BOOL bApi );
+ BOOL DeleteDBRange( const String& rName, BOOL bApi );
+ BOOL RenameDBRange( const String& rOld, const String& rNew, BOOL bApi );
+ BOOL ModifyDBData( const ScDBData& rNewData, BOOL bApi ); // Name unveraendert
- BOOL RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi );
+ BOOL RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi );
- BOOL DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj,
+ BOOL DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj,
BOOL bRecord, BOOL bApi, BOOL bAllowMove = FALSE );
};
diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx
index baadae0a64dc..65805c84f68a 100644
--- a/sc/source/ui/inc/dbfunc.hxx
+++ b/sc/source/ui/inc/dbfunc.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,39 +53,39 @@ private:
public:
ScDBFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell );
//UNUSED2008-05 ScDBFunc( Window* pParent, const ScDBFunc& rDBFunc, ScTabViewShell* pViewShell );
- virtual ~ScDBFunc();
+ virtual ~ScDBFunc();
- // nur UISort wiederholt bei Bedarf die Teilergebnisse
+ // nur UISort wiederholt bei Bedarf die Teilergebnisse
- void UISort( const ScSortParam& rSortParam,
+ void UISort( const ScSortParam& rSortParam,
BOOL bRecord = TRUE );
- void Sort( const ScSortParam& rSortParam,
+ void Sort( const ScSortParam& rSortParam,
BOOL bRecord = TRUE, BOOL bPaint = TRUE );
- SC_DLLPUBLIC void Query( const ScQueryParam& rQueryParam,
+ SC_DLLPUBLIC void Query( const ScQueryParam& rQueryParam,
const ScRange* pAdvSource, BOOL bRecord );
- void DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord = TRUE,
+ void DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord = TRUE,
const ScSortParam* pForceNewSort = NULL );
- void ToggleAutoFilter();
- void HideAutoFilter();
+ void ToggleAutoFilter();
+ void HideAutoFilter();
- void RepeatDB( BOOL bRecord = TRUE );
+ void RepeatDB( BOOL bRecord = TRUE );
- BOOL ImportData( const ScImportParam& rParam, BOOL bRecord = TRUE );
+ BOOL ImportData( const ScImportParam& rParam, BOOL bRecord = TRUE );
- void GotoDBArea( const String& rDBName );
+ void GotoDBArea( const String& rDBName );
// DB-Bereich vom Cursor
- ScDBData* GetDBData( BOOL bMarkArea = TRUE, ScGetDBMode eMode = SC_DB_MAKE, ScGetDBSelection eSel = SC_DBSEL_KEEP );
+ ScDBData* GetDBData( BOOL bMarkArea = TRUE, ScGetDBMode eMode = SC_DB_MAKE, ScGetDBSelection eSel = SC_DBSEL_KEEP );
- void NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rDelAreaList );
+ void NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rDelAreaList );
- void Consolidate( const ScConsolidateParam& rParam, BOOL bRecord = TRUE );
+ void Consolidate( const ScConsolidateParam& rParam, BOOL bRecord = TRUE );
bool MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest, BOOL bNewTable,
const ScDPObject& rSource, BOOL bApi = FALSE );
- void DeletePivotTable();
+ void DeletePivotTable();
// Wang Xu Ming -- 2009-6-17
// DataPilot Migration
ULONG RecalcPivotTable();
@@ -107,25 +107,25 @@ public:
void ShowDataPilotSourceData( ScDPObject& rDPObj,
const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters );
- void MakeOutline( BOOL bColumns, BOOL bRecord = TRUE );
- void RemoveOutline( BOOL bColumns, BOOL bRecord = TRUE );
- void RemoveAllOutlines( BOOL bRecord = TRUE );
- void TestRemoveOutline( BOOL& rCol, BOOL& rRow );
+ void MakeOutline( BOOL bColumns, BOOL bRecord = TRUE );
+ void RemoveOutline( BOOL bColumns, BOOL bRecord = TRUE );
+ void RemoveAllOutlines( BOOL bRecord = TRUE );
+ void TestRemoveOutline( BOOL& rCol, BOOL& rRow );
- void AutoOutline( BOOL bRecord = TRUE );
+ void AutoOutline( BOOL bRecord = TRUE );
- void SelectLevel( BOOL bColumns, USHORT nLevel,
+ void SelectLevel( BOOL bColumns, USHORT nLevel,
BOOL bRecord = TRUE, BOOL bPaint = TRUE );
- void ShowOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry,
+ void ShowOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry,
BOOL bRecord = TRUE, BOOL bPaint = TRUE );
- void HideOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry,
+ void HideOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry,
BOOL bRecord = TRUE, BOOL bPaint = TRUE );
- void ShowMarkedOutlines( BOOL bRecord = TRUE );
- void HideMarkedOutlines( BOOL bRecord = TRUE );
- BOOL OutlinePossible(BOOL bHide);
+ void ShowMarkedOutlines( BOOL bRecord = TRUE );
+ void HideMarkedOutlines( BOOL bRecord = TRUE );
+ BOOL OutlinePossible(BOOL bHide);
- void UpdateCharts(BOOL bAllCharts = FALSE); // Default: am Cursor
+ void UpdateCharts(BOOL bAllCharts = FALSE); // Default: am Cursor
static USHORT DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, BOOL bAllCharts );
};
diff --git a/sc/source/ui/inc/dbnamdlg.hrc b/sc/source/ui/inc/dbnamdlg.hrc
index fd0205e3bbed..8062656a10c5 100644
--- a/sc/source/ui/inc/dbnamdlg.hrc
+++ b/sc/source/ui/inc/dbnamdlg.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
@@ -28,15 +28,15 @@
#include "sc.hrc" // -> RID_SCDLG_DBNAMES
#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_ADD 3
-#define BTN_REMOVE 4
-#define BTN_HELP 5
+#define BTN_CANCEL 2
+#define BTN_ADD 3
+#define BTN_REMOVE 4
+#define BTN_HELP 5
#define FL_NAME 10
-#define ED_NAME 11
+#define ED_NAME 11
#define FL_ASSIGN 12
-#define ED_DBAREA 13
-#define RB_DBAREA 14
+#define ED_DBAREA 13
+#define RB_DBAREA 14
#define FL_OPTIONS 20
#define BTN_HEADER 21
#define BTN_SIZE 22
diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx
index cd878c651d6c..4e72c12d3791 100644
--- a/sc/source/ui/inc/dbnamdlg.hxx
+++ b/sc/source/ui/inc/dbnamdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,64 +53,64 @@ class ScDbNameDlg : public ScAnyRefDlg
{
public:
ScDbNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
- ScViewData* ptrViewData );
+ ScViewData* ptrViewData );
~ScDbNameDlg();
- virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
+ virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual BOOL IsRefInputMode() const;
- virtual void SetActive();
- virtual BOOL Close();
+ virtual BOOL IsRefInputMode() const;
+ virtual void SetActive();
+ virtual BOOL Close();
private:
FixedLine aFlName;
- ComboBox aEdName;
+ ComboBox aEdName;
FixedLine aFlAssign;
- formula::RefEdit aEdAssign;
- formula::RefButton aRbAssign;
+ formula::RefEdit aEdAssign;
+ formula::RefButton aRbAssign;
FixedLine aFlOptions;
- CheckBox aBtnHeader;
- CheckBox aBtnDoSize;
- CheckBox aBtnKeepFmt;
- CheckBox aBtnStripData;
- ScExpandedFixedText aFTSource; //@18.09.97 erweiterter FixedText
- FixedText aFTOperations;
-
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
- PushButton aBtnAdd;
- PushButton aBtnRemove;
- MoreButton aBtnMore;
-
- BOOL bSaved;
-
-
- const String aStrAdd; // "Hinzufuegen"
- const String aStrModify; // "Aendern"
- const String aStrNoName; // "unbenannt"
- const String aStrInvalid;
-
- String aStrSource;
- String aStrOperations;
-
- ScViewData* pViewData;
- ScDocument* pDoc;
- BOOL bRefInputMode;
+ CheckBox aBtnHeader;
+ CheckBox aBtnDoSize;
+ CheckBox aBtnKeepFmt;
+ CheckBox aBtnStripData;
+ ScExpandedFixedText aFTSource; //@18.09.97 erweiterter FixedText
+ FixedText aFTOperations;
+
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
+ PushButton aBtnAdd;
+ PushButton aBtnRemove;
+ MoreButton aBtnMore;
+
+ BOOL bSaved;
+
+
+ const String aStrAdd; // "Hinzufuegen"
+ const String aStrModify; // "Aendern"
+ const String aStrNoName; // "unbenannt"
+ const String aStrInvalid;
+
+ String aStrSource;
+ String aStrOperations;
+
+ ScViewData* pViewData;
+ ScDocument* pDoc;
+ BOOL bRefInputMode;
ScAddress::Details aAddrDetails;
- ScDBCollection aLocalDbCol;
- ScRange theCurArea;
- List aRemoveList;
+ ScDBCollection aLocalDbCol;
+ ScRange theCurArea;
+ List aRemoveList;
#ifdef _DBNAMDLG_CXX
private:
- void Init();
- void UpdateNames();
- void UpdateDBData( const String& rStrName );
- void SetInfoStrings( const ScDBData* pDBData );
+ void Init();
+ void UpdateNames();
+ void UpdateDBData( const String& rStrName );
+ void SetInfoStrings( const ScDBData* pDBData );
DECL_LINK( CancelBtnHdl, void * );
DECL_LINK( OkBtnHdl, void * );
diff --git a/sc/source/ui/inc/delcldlg.hxx b/sc/source/ui/inc/delcldlg.hxx
index e1a816e78c0f..e9775fc8ce36 100644
--- a/sc/source/ui/inc/delcldlg.hxx
+++ b/sc/source/ui/inc/delcldlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +42,13 @@ class ScDeleteCellDlg : public ModalDialog
{
private:
FixedLine aFlFrame;
- RadioButton aBtnCellsUp;
- RadioButton aBtnCellsLeft;
- RadioButton aBtnDelRows;
- RadioButton aBtnDelCols;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ RadioButton aBtnCellsUp;
+ RadioButton aBtnCellsLeft;
+ RadioButton aBtnDelRows;
+ RadioButton aBtnDelCols;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
public:
diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx
index 8773b9c78f3a..64428e538905 100644
--- a/sc/source/ui/inc/delcodlg.hxx
+++ b/sc/source/ui/inc/delcodlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,22 +39,22 @@ class ScDeleteContentsDlg : public ModalDialog
{
private:
FixedLine aFlFrame;
- CheckBox aBtnDelAll;
- CheckBox aBtnDelStrings;
- CheckBox aBtnDelNumbers;
- CheckBox aBtnDelDateTime;
- CheckBox aBtnDelFormulas;
- CheckBox aBtnDelNotes;
- CheckBox aBtnDelAttrs;
- CheckBox aBtnDelObjects;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ CheckBox aBtnDelAll;
+ CheckBox aBtnDelStrings;
+ CheckBox aBtnDelNumbers;
+ CheckBox aBtnDelDateTime;
+ CheckBox aBtnDelFormulas;
+ CheckBox aBtnDelNotes;
+ CheckBox aBtnDelAttrs;
+ CheckBox aBtnDelObjects;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
- BOOL bObjectsDisabled;
+ BOOL bObjectsDisabled;
- static BOOL bPreviousAllCheck;
- static USHORT nPreviousChecks;
+ static BOOL bPreviousAllCheck;
+ static USHORT nPreviousChecks;
void DisableChecks( BOOL bDelAllChecked = TRUE );
DECL_LINK( DelAllHdl, void * );
@@ -63,9 +63,9 @@ public:
ScDeleteContentsDlg( Window* pParent,
USHORT nCheckDefaults = 0 );
~ScDeleteContentsDlg();
- void DisableObjects();
+ void DisableObjects();
- USHORT GetDelContentsCmdBits() const;
+ USHORT GetDelContentsCmdBits() const;
};
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index c92cc082986d..8158707f24d4 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +51,14 @@ class ScTableProtection;
class ScDocFunc
{
private:
- ScDocShell& rDocShell;
+ ScDocShell& rDocShell;
- BOOL AdjustRowHeight( const ScRange& rRange, BOOL bPaint = TRUE );
- void CreateOneName( ScRangeName& rList,
+ BOOL AdjustRowHeight( const ScRange& rRange, BOOL bPaint = TRUE );
+ void CreateOneName( ScRangeName& rList,
SCCOL nPosX, SCROW nPosY, SCTAB nTab,
SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
BOOL& rCancel, BOOL bApi );
- void NotifyInputHandler( const ScAddress& rPos );
+ void NotifyInputHandler( const ScAddress& rPos );
public:
ScDocFunc( ScDocShell& rDocSh ): rDocShell(rDocSh) {}
@@ -66,118 +66,118 @@ public:
DECL_LINK( NotifyDrawUndo, SdrUndoAction* );
- BOOL DetectiveAddPred(const ScAddress& rPos);
- BOOL DetectiveDelPred(const ScAddress& rPos);
- BOOL DetectiveAddSucc(const ScAddress& rPos);
- BOOL DetectiveDelSucc(const ScAddress& rPos);
- BOOL DetectiveAddError(const ScAddress& rPos);
- BOOL DetectiveMarkInvalid(SCTAB nTab);
- BOOL DetectiveDelAll(SCTAB nTab);
- BOOL DetectiveRefresh(BOOL bAutomatic = FALSE);
+ BOOL DetectiveAddPred(const ScAddress& rPos);
+ BOOL DetectiveDelPred(const ScAddress& rPos);
+ BOOL DetectiveAddSucc(const ScAddress& rPos);
+ BOOL DetectiveDelSucc(const ScAddress& rPos);
+ BOOL DetectiveAddError(const ScAddress& rPos);
+ BOOL DetectiveMarkInvalid(SCTAB nTab);
+ BOOL DetectiveDelAll(SCTAB nTab);
+ BOOL DetectiveRefresh(BOOL bAutomatic = FALSE);
- BOOL DeleteContents( const ScMarkData& rMark, USHORT nFlags,
+ BOOL DeleteContents( const ScMarkData& rMark, USHORT nFlags,
BOOL bRecord, BOOL bApi );
- BOOL TransliterateText( const ScMarkData& rMark, sal_Int32 nType,
+ BOOL TransliterateText( const ScMarkData& rMark, sal_Int32 nType,
BOOL bRecord, BOOL bApi );
- BOOL SetNormalString( const ScAddress& rPos, const String& rText, BOOL bApi );
- BOOL PutCell( const ScAddress& rPos, ScBaseCell* pNewCell, BOOL bApi );
- BOOL PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine,
+ BOOL SetNormalString( const ScAddress& rPos, const String& rText, BOOL bApi );
+ BOOL PutCell( const ScAddress& rPos, ScBaseCell* pNewCell, BOOL bApi );
+ BOOL PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine,
BOOL bInterpret, BOOL bApi );
- BOOL SetCellText( const ScAddress& rPos, const String& rText,
+ BOOL SetCellText( const ScAddress& rPos, const String& rText,
BOOL bInterpret, BOOL bEnglish, BOOL bApi,
const String& rFormulaNmsp,
const formula::FormulaGrammar::Grammar eGrammar );
// creates a new cell for use with PutCell
- ScBaseCell* InterpretEnglishString( const ScAddress& rPos, const String& rText,
+ ScBaseCell* InterpretEnglishString( const ScAddress& rPos, const String& rText,
const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar );
- bool ShowNote( const ScAddress& rPos, bool bShow = true );
- inline bool HideNote( const ScAddress& rPos ) { return ShowNote( rPos, false ); }
+ bool ShowNote( const ScAddress& rPos, bool bShow = true );
+ inline bool HideNote( const ScAddress& rPos ) { return ShowNote( rPos, false ); }
bool SetNoteText( const ScAddress& rPos, const String& rNoteText, BOOL bApi );
bool ReplaceNote( const ScAddress& rPos, const String& rNoteText, const String* pAuthor, const String* pDate, BOOL bApi );
- BOOL ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern,
+ BOOL ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern,
BOOL bRecord, BOOL bApi );
- BOOL ApplyStyle( const ScMarkData& rMark, const String& rStyleName,
+ BOOL ApplyStyle( const ScMarkData& rMark, const String& rStyleName,
BOOL bRecord, BOOL bApi );
- BOOL InsertCells( const ScRange& rRange,const ScMarkData* pTabMark,
+ BOOL InsertCells( const ScRange& rRange,const ScMarkData* pTabMark,
InsCellCmd eCmd, BOOL bRecord, BOOL bApi,
BOOL bPartOfPaste = FALSE );
- BOOL DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
+ BOOL DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
DelCellCmd eCmd, BOOL bRecord, BOOL bApi );
- BOOL MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
+ BOOL MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
BOOL bCut, BOOL bRecord, BOOL bPaint, BOOL bApi );
- BOOL InsertTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL bApi );
- BOOL RenameTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL bApi );
- BOOL DeleteTable( SCTAB nTab, BOOL bRecord, BOOL bApi );
+ BOOL InsertTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL bApi );
+ BOOL RenameTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL bApi );
+ BOOL DeleteTable( SCTAB nTab, BOOL bRecord, BOOL bApi );
bool SetTabBgColor( SCTAB nTab, const Color& rColor, bool bRecord, bool bApi );
bool SetTabBgColor( ScUndoTabColorInfo::List& rUndoTabColorList, bool bRecord, bool bApi );
- BOOL SetTableVisible( SCTAB nTab, BOOL bVisible, BOOL bApi );
+ BOOL SetTableVisible( SCTAB nTab, BOOL bVisible, BOOL bApi );
- BOOL SetLayoutRTL( SCTAB nTab, BOOL bRTL, BOOL bApi );
+ BOOL SetLayoutRTL( SCTAB nTab, BOOL bRTL, BOOL bApi );
-//UNUSED2009-05 BOOL SetGrammar( formula::FormulaGrammar::Grammar eGrammar );
+//UNUSED2009-05 BOOL SetGrammar( formula::FormulaGrammar::Grammar eGrammar );
- SC_DLLPUBLIC BOOL SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges,
+ SC_DLLPUBLIC BOOL SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges,
SCTAB nTab, ScSizeMode eMode, USHORT nSizeTwips,
BOOL bRecord, BOOL bApi );
- BOOL InsertPageBreak( BOOL bColumn, const ScAddress& rPos,
+ BOOL InsertPageBreak( BOOL bColumn, const ScAddress& rPos,
BOOL bRecord, BOOL bSetModified, BOOL bApi );
- BOOL RemovePageBreak( BOOL bColumn, const ScAddress& rPos,
+ BOOL RemovePageBreak( BOOL bColumn, const ScAddress& rPos,
BOOL bRecord, BOOL bSetModified, BOOL bApi );
void ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect );
- BOOL Protect( SCTAB nTab, const String& rPassword, BOOL bApi );
- BOOL Unprotect( SCTAB nTab, const String& rPassword, BOOL bApi );
+ BOOL Protect( SCTAB nTab, const String& rPassword, BOOL bApi );
+ BOOL Unprotect( SCTAB nTab, const String& rPassword, BOOL bApi );
- BOOL ClearItems( const ScMarkData& rMark, const USHORT* pWhich, BOOL bApi );
- BOOL ChangeIndent( const ScMarkData& rMark, BOOL bIncrement, BOOL bApi );
- BOOL AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
+ BOOL ClearItems( const ScMarkData& rMark, const USHORT* pWhich, BOOL bApi );
+ BOOL ChangeIndent( const ScMarkData& rMark, BOOL bIncrement, BOOL bApi );
+ BOOL AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
USHORT nFormatNo, BOOL bRecord, BOOL bApi );
- BOOL EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
+ BOOL EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
const ScTokenArray* pTokenArray,
const String& rString, BOOL bApi, BOOL bEnglish,
const String& rFormulaNmsp,
const formula::FormulaGrammar::Grammar );
- BOOL TabOp( const ScRange& rRange, const ScMarkData* pTabMark,
+ BOOL TabOp( const ScRange& rRange, const ScMarkData* pTabMark,
const ScTabOpParam& rParam, BOOL bRecord, BOOL bApi );
- BOOL FillSimple( const ScRange& rRange, const ScMarkData* pTabMark,
+ BOOL FillSimple( const ScRange& rRange, const ScMarkData* pTabMark,
FillDir eDir, BOOL bRecord, BOOL bApi );
- BOOL FillSeries( const ScRange& rRange, const ScMarkData* pTabMark,
- FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd,
+ BOOL FillSeries( const ScRange& rRange, const ScMarkData* pTabMark,
+ FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd,
double fStart, double fStep, double fMax,
BOOL bRecord, BOOL bApi );
// FillAuto: rRange wird von Source-Range auf Dest-Range angepasst
- BOOL FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
+ BOOL FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
FillDir eDir, ULONG nCount, BOOL bRecord, BOOL bApi );
- BOOL ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd, BOOL bApi );
+ BOOL ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd, BOOL bApi );
- BOOL MergeCells( const ScRange& rRange, BOOL bContents,
+ BOOL MergeCells( const ScRange& rRange, BOOL bContents,
BOOL bRecord, BOOL bApi );
- BOOL UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi );
+ BOOL UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi );
BOOL SetNewRangeNames( ScRangeName* pNewRanges, BOOL bApi ); // takes ownership of pNewRanges
- BOOL ModifyRangeNames( const ScRangeName& rNewRanges, BOOL bApi );
+ BOOL ModifyRangeNames( const ScRangeName& rNewRanges, BOOL bApi );
- BOOL CreateNames( const ScRange& rRange, USHORT nFlags, BOOL bApi );
- BOOL InsertNameList( const ScAddress& rStartPos, BOOL bApi );
+ BOOL CreateNames( const ScRange& rRange, USHORT nFlags, BOOL bApi );
+ BOOL InsertNameList( const ScAddress& rStartPos, BOOL bApi );
- BOOL InsertAreaLink( const String& rFile, const String& rFilter,
+ BOOL InsertAreaLink( const String& rFile, const String& rFilter,
const String& rOptions, const String& rSource,
const ScRange& rDestRange, ULONG nRefresh,
BOOL bFitBlock, BOOL bApi );
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 19147cfaf61f..b1b1b0b8bfcb 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,49 +90,49 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener
ScDocument aDocument;
- String aDdeTextFmt;
- String aConvFilterName; //@ #BugId 54198
+ String aDdeTextFmt;
+ String aConvFilterName; //@ #BugId 54198
- double nPrtToScreenFactor;
+ double nPrtToScreenFactor;
//! FontList* pFontList;
DocShell_Impl* pImpl;
- ScDocFunc* pDocFunc;
-
- //SfxObjectCreateMode eShellMode;
-
- BOOL bIsInplace; // wird von der View gesetzt
- BOOL bHeaderOn;
- BOOL bFooterOn;
- BOOL bNoInformLost;
- BOOL bIsEmpty;
- BOOL bIsInUndo;
- BOOL bDocumentModifiedPending;
- USHORT nDocumentLock;
+ ScDocFunc* pDocFunc;
+
+ //SfxObjectCreateMode eShellMode;
+
+ BOOL bIsInplace; // wird von der View gesetzt
+ BOOL bHeaderOn;
+ BOOL bFooterOn;
+ BOOL bNoInformLost;
+ BOOL bIsEmpty;
+ BOOL bIsInUndo;
+ BOOL bDocumentModifiedPending;
+ USHORT nDocumentLock;
sal_Int16 nCanUpdate; // stores the UpdateDocMode from loading a document till update links
BOOL bUpdateEnabled;
ScDBData* pOldAutoDBRange;
- ScSbxDocHelper* pDocHelper;
+ ScSbxDocHelper* pDocHelper;
- ScAutoStyleList* pAutoStyleList;
- ScPaintLockData* pPaintLockData;
- ScJobSetup* pOldJobSetup;
+ ScAutoStyleList* pAutoStyleList;
+ ScPaintLockData* pPaintLockData;
+ ScJobSetup* pOldJobSetup;
ScOptSolverSave* pSolverSaveData;
ScSheetSaveData* pSheetSaveData;
ScDocShellModificator* pModificator; // #109979#; is used to load XML (created in BeforeXMLLoading and destroyed in AfterXMLLoading)
- SC_DLLPRIVATE void InitItems();
- SC_DLLPRIVATE void DoEnterHandler();
+ SC_DLLPRIVATE void InitItems();
+ SC_DLLPRIVATE void DoEnterHandler();
SC_DLLPRIVATE void InitOptions(bool bForLoading);
- SC_DLLPRIVATE void ResetDrawObjectShell();
+ SC_DLLPRIVATE void ResetDrawObjectShell();
// SUNWS needs a forward declared friend, otherwise types and members
// of the outer class are not accessible.
class PrepareSaveGuard;
friend class ScDocShell::PrepareSaveGuard;
- /** Do things that need to be done before saving to our own format and
+ /** Do things that need to be done before saving to our own format and
necessary clean ups in dtor. */
class PrepareSaveGuard
{
@@ -145,21 +145,21 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener
SC_DLLPRIVATE BOOL LoadXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );
SC_DLLPRIVATE BOOL SaveXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& );
- SC_DLLPRIVATE SCTAB GetSaveTab();
+ SC_DLLPRIVATE SCTAB GetSaveTab();
- SC_DLLPRIVATE ULONG DBaseImport( const String& rFullFileName, CharSet eCharSet,
+ SC_DLLPRIVATE ULONG DBaseImport( const String& rFullFileName, CharSet eCharSet,
BOOL bSimpleColWidth[MAXCOLCOUNT] );
- SC_DLLPRIVATE ULONG DBaseExport( const String& rFullFileName, CharSet eCharSet,
+ SC_DLLPRIVATE ULONG DBaseExport( const String& rFullFileName, CharSet eCharSet,
BOOL& bHasMemo );
- SC_DLLPRIVATE static BOOL MoveFile( const INetURLObject& rSource, const INetURLObject& rDest );
- SC_DLLPRIVATE static BOOL KillFile( const INetURLObject& rURL );
- SC_DLLPRIVATE static BOOL IsDocument( const INetURLObject& rURL );
+ SC_DLLPRIVATE static BOOL MoveFile( const INetURLObject& rSource, const INetURLObject& rDest );
+ SC_DLLPRIVATE static BOOL KillFile( const INetURLObject& rURL );
+ SC_DLLPRIVATE static BOOL IsDocument( const INetURLObject& rURL );
- SC_DLLPRIVATE void LockPaint_Impl(BOOL bDoc);
- SC_DLLPRIVATE void UnlockPaint_Impl(BOOL bDoc);
- SC_DLLPRIVATE void LockDocument_Impl(USHORT nNew);
- SC_DLLPRIVATE void UnlockDocument_Impl(USHORT nNew);
+ SC_DLLPRIVATE void LockPaint_Impl(BOOL bDoc);
+ SC_DLLPRIVATE void UnlockPaint_Impl(BOOL bDoc);
+ SC_DLLPRIVATE void LockDocument_Impl(USHORT nNew);
+ SC_DLLPRIVATE void UnlockDocument_Impl(USHORT nNew);
SC_DLLPRIVATE void EnableSharedSettings( bool bEnable );
SC_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > LoadSharedDocument();
@@ -190,7 +190,7 @@ public:
virtual SfxUndoManager* GetUndoManager();
- virtual void FillClass( SvGlobalName * pClassName,
+ virtual void FillClass( SvGlobalName * pClassName,
sal_uInt32 * pFormat,
String * pAppName,
String * pFullTypeName,
@@ -205,19 +205,19 @@ public:
virtual BOOL Save();
virtual BOOL SaveAs( SfxMedium& rMedium );
virtual BOOL ConvertTo( SfxMedium &rMedium );
- virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE );
- virtual void PrepareReload();
- virtual BOOL IsInformationLost();
- virtual void LoadStyles( SfxObjectShell &rSource );
- virtual BOOL Insert( SfxObjectShell &rSource,
+ virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE );
+ virtual void PrepareReload();
+ virtual BOOL IsInformationLost();
+ virtual void LoadStyles( SfxObjectShell &rSource );
+ virtual BOOL Insert( SfxObjectShell &rSource,
USHORT nSourceIdx1, USHORT nSourceIdx2, USHORT nSourceIdx3,
USHORT &nIdx1, USHORT &nIdx2, USHORT &nIdx3, USHORT &rIdxDeleted );
virtual BOOL SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); // SfxInPlaceObject
- virtual BOOL DoSaveCompleted( SfxMedium * pNewStor); // SfxObjectShell
+ virtual BOOL DoSaveCompleted( SfxMedium * pNewStor); // SfxObjectShell
virtual sal_Bool QuerySlotExecutable( USHORT nSlotId );
- virtual void Draw( OutputDevice *, const JobSetup & rSetup,
+ virtual void Draw( OutputDevice *, const JobSetup & rSetup,
USHORT nAspect = ASPECT_CONTENT );
virtual void SetVisArea( const Rectangle & rVisArea );
@@ -227,44 +227,44 @@ public:
virtual Printer* GetDocumentPrinter();
- virtual void SetModified( BOOL = TRUE );
+ virtual void SetModified( BOOL = TRUE );
- void SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart );
+ void SetVisAreaOrSize( const Rectangle& rVisArea, BOOL bModifyStart );
virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( Window *pParent,
const SfxItemSet &rSet );
- void GetDocStat( ScDocStat& rDocStat );
+ void GetDocStat( ScDocStat& rDocStat );
- ScDocument* GetDocument() { return &aDocument; }
- ScDocFunc& GetDocFunc() { return *pDocFunc; }
+ ScDocument* GetDocument() { return &aDocument; }
+ ScDocFunc& GetDocFunc() { return *pDocFunc; }
- SfxPrinter* GetPrinter( BOOL bCreateIfNotExist = TRUE );
- USHORT SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL );
+ SfxPrinter* GetPrinter( BOOL bCreateIfNotExist = TRUE );
+ USHORT SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL );
- void UpdateFontList();
+ void UpdateFontList();
- String CreateObjectName( const String& rPrefix );
+ String CreateObjectName( const String& rPrefix );
- ScDrawLayer* MakeDrawLayer();
+ ScDrawLayer* MakeDrawLayer();
- void AsciiSave( SvStream& rStream, const ScImportOptions& rOpt );
+ void AsciiSave( SvStream& rStream, const ScImportOptions& rOpt );
- void GetSbxState( SfxItemSet &rSet );
- void GetDrawObjState( SfxItemSet &rSet );
+ void GetSbxState( SfxItemSet &rSet );
+ void GetDrawObjState( SfxItemSet &rSet );
void Execute( SfxRequest& rReq );
void GetState( SfxItemSet &rSet );
- void ExecutePageStyle ( SfxViewShell& rCaller, SfxRequest& rReq, SCTAB nCurTab );
- void GetStatePageStyle( SfxViewShell& rCaller, SfxItemSet& rSet, SCTAB nCurTab );
+ void ExecutePageStyle ( SfxViewShell& rCaller, SfxRequest& rReq, SCTAB nCurTab );
+ void GetStatePageStyle( SfxViewShell& rCaller, SfxItemSet& rSet, SCTAB nCurTab );
- void CompareDocument( ScDocument& rOtherDoc );
+ void CompareDocument( ScDocument& rOtherDoc );
void MergeDocument( ScDocument& rOtherDoc, bool bShared = false, bool bCheckDuplicates = false, ULONG nOffset = 0, ScChangeActionMergeMap* pMergeMap = NULL, bool bInverseMap = false );
bool MergeSharedDocument( ScDocShell* pSharedDocShell );
- ScChangeAction* GetChangeAction( const ScAddress& rPos );
- void SetChangeComment( ScChangeAction* pAction, const String& rComment );
- void ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pParent,BOOL bPrevNext=TRUE );
+ ScChangeAction* GetChangeAction( const ScAddress& rPos );
+ void SetChangeComment( ScChangeAction* pAction, const String& rComment );
+ void ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pParent,BOOL bPrevNext=TRUE );
/// Protect/unprotect ChangeTrack and return <TRUE/> if
/// protection was successfully changed.
/// If bJustQueryIfProtected==TRUE protection is not
@@ -272,54 +272,54 @@ public:
/// password was entered correctly.
BOOL ExecuteChangeProtectionDialog( Window* _pParent, BOOL bJustQueryIfProtected = FALSE );
- void SetPrintZoom( SCTAB nTab, USHORT nScale, USHORT nPages );
- BOOL AdjustPrintZoom( const ScRange& rRange );
+ void SetPrintZoom( SCTAB nTab, USHORT nScale, USHORT nPages );
+ BOOL AdjustPrintZoom( const ScRange& rRange );
- void LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellStyles, BOOL bPageStyles );
+ void LoadStylesArgs( ScDocShell& rSource, BOOL bReplace, BOOL bCellStyles, BOOL bPageStyles );
- void PageStyleModified( const String& rStyleName, BOOL bApi );
+ void PageStyleModified( const String& rStyleName, BOOL bApi );
- void NotifyStyle( const SfxStyleSheetHint& rHint );
- void DoAutoStyle( const ScRange& rRange, const String& rStyle );
+ void NotifyStyle( const SfxStyleSheetHint& rHint );
+ void DoAutoStyle( const ScRange& rRange, const String& rStyle );
- Window* GetActiveDialogParent();
- void ErrorMessage( USHORT nGlobStrId );
- BOOL IsEditable() const;
+ Window* GetActiveDialogParent();
+ void ErrorMessage( USHORT nGlobStrId );
+ BOOL IsEditable() const;
- BOOL AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab );
+ BOOL AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab );
void UpdateAllRowHeights( const ScMarkData* pTabMark = NULL );
void UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore = false );
- void RefreshPivotTables( const ScRange& rSource );
- void DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord = TRUE );
- void UseScenario( SCTAB nTab, const String& rName, BOOL bRecord = TRUE );
- SCTAB MakeScenario( SCTAB nTab, const String& rName, const String& rComment,
+ void RefreshPivotTables( const ScRange& rSource );
+ void DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord = TRUE );
+ void UseScenario( SCTAB nTab, const String& rName, BOOL bRecord = TRUE );
+ SCTAB MakeScenario( SCTAB nTab, const String& rName, const String& rComment,
const Color& rColor, USHORT nFlags,
ScMarkData& rMark, BOOL bRecord = TRUE );
- void ModifyScenario( SCTAB nTab, const String& rName, const String& rComment,
+ void ModifyScenario( SCTAB nTab, const String& rName, const String& rComment,
const Color& rColor, USHORT nFlags );
- BOOL MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRecord );
+ BOOL MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRecord );
- void DoRecalc( BOOL bApi );
- void DoHardRecalc( BOOL bApi );
+ void DoRecalc( BOOL bApi );
+ void DoHardRecalc( BOOL bApi );
bool CheckPrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData,
bool bForceSelected, bool bIsAPI );
- void PreparePrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData );
- void Print( SfxProgress& rProgress, PrintDialog* pPrintDialog,
+ void PreparePrint( PrintDialog* pPrintDialog, ScMarkData* pMarkData );
+ void Print( SfxProgress& rProgress, PrintDialog* pPrintDialog,
ScMarkData* pMarkData, Window* pDialogParent,
BOOL bForceSelected, BOOL bIsAPI );
- void UpdateOle( const ScViewData* pViewData, BOOL bSnapSize = FALSE );
- BOOL IsOle();
+ void UpdateOle( const ScViewData* pViewData, BOOL bSnapSize = FALSE );
+ BOOL IsOle();
- void DBAreaDeleted( SCTAB nTab, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 );
- ScDBData* GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGetDBSelection eSel );
+ void DBAreaDeleted( SCTAB nTab, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 );
+ ScDBData* GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGetDBSelection eSel );
ScDBData* GetOldAutoDBRange(); // has to be deleted by caller!
void CancelAutoDBRange(); // called when dialog is cancelled
- void UpdateLinks(); // Link-Eintraege aktuallisieren
- BOOL ReloadTabLinks(); // Links ausfuehren (Inhalt aktualisieren)
+ void UpdateLinks(); // Link-Eintraege aktuallisieren
+ BOOL ReloadTabLinks(); // Links ausfuehren (Inhalt aktualisieren)
void PostEditView( ScEditEngineDefaulter* pEditEngine, const ScAddress& rCursorPos );
@@ -335,38 +335,38 @@ public:
void PostDataChanged();
- void UpdatePaintExt( USHORT& rExtFlags, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab,
+ void UpdatePaintExt( USHORT& rExtFlags, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab,
SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab );
- void UpdatePaintExt( USHORT& rExtFlags, const ScRange& rRange );
+ void UpdatePaintExt( USHORT& rExtFlags, const ScRange& rRange );
- void SetDocumentModified( BOOL bIsModified = TRUE );
- void SetDrawModified( BOOL bIsModified = TRUE );
+ void SetDocumentModified( BOOL bIsModified = TRUE );
+ void SetDrawModified( BOOL bIsModified = TRUE );
- void LockPaint();
- void UnlockPaint();
- USHORT GetLockCount() const;
- void SetLockCount(USHORT nNew);
+ void LockPaint();
+ void UnlockPaint();
+ USHORT GetLockCount() const;
+ void SetLockCount(USHORT nNew);
- void LockDocument();
- void UnlockDocument();
+ void LockDocument();
+ void UnlockDocument();
DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* );
- virtual SfxStyleSheetBasePool* GetStyleSheetPool();
+ virtual SfxStyleSheetBasePool* GetStyleSheetPool();
- void SetInplace( BOOL bInplace );
- BOOL IsEmpty() const;
- void SetEmpty(BOOL bSet);
+ void SetInplace( BOOL bInplace );
+ BOOL IsEmpty() const;
+ void SetEmpty(BOOL bSet);
- BOOL IsInUndo() const { return bIsInUndo; }
- void SetInUndo(BOOL bSet);
+ BOOL IsInUndo() const { return bIsInUndo; }
+ void SetInUndo(BOOL bSet);
- void CalcOutputFactor();
- double GetOutputFactor() const;
- void GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet,
- SCTAB nCurTab,
- BOOL& rbHeader,
- BOOL& rbFooter );
+ void CalcOutputFactor();
+ double GetOutputFactor() const;
+ void GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet,
+ SCTAB nCurTab,
+ BOOL& rbHeader,
+ BOOL& rbFooter );
virtual long DdeGetData( const String& rItem, const String& rMimeType,
::com::sun::star::uno::Any & rValue );
@@ -376,14 +376,14 @@ public:
const String& GetDdeTextFmt() const { return aDdeTextFmt; }
- SfxBindings* GetViewBindings();
+ SfxBindings* GetViewBindings();
ScTabViewShell* GetBestViewShell( BOOL bOnlyVisible = TRUE );
ScSbxDocHelper* GetDocHelperObject() { return pDocHelper; }
- void SetDocumentModifiedPending( BOOL bVal )
+ void SetDocumentModifiedPending( BOOL bVal )
{ bDocumentModifiedPending = bVal; }
- BOOL IsDocumentModifiedPending() const
+ BOOL IsDocumentModifiedPending() const
{ return bDocumentModifiedPending; }
BOOL IsUpdateEnabled() const
@@ -391,20 +391,20 @@ public:
void SetUpdateEnabled(BOOL bValue)
{ bUpdateEnabled = bValue; }
- OutputDevice* GetRefDevice(); // WYSIWYG: Printer, otherwise VirtualDevice...
+ OutputDevice* GetRefDevice(); // WYSIWYG: Printer, otherwise VirtualDevice...
static ScViewData* GetViewData();
- static SCTAB GetCurTab();
+ static SCTAB GetCurTab();
static ScDocShell* GetShellByNum( USHORT nDocNo );
- static String GetOwnFilterName();
+ static String GetOwnFilterName();
static String GetHtmlFilterName();
- static String GetWebQueryFilterName();
- static String GetAsciiFilterName();
- static String GetLotusFilterName();
- static String GetDBaseFilterName();
- static String GetDifFilterName();
- static BOOL HasAutomaticTableName( const String& rFilter );
+ static String GetWebQueryFilterName();
+ static String GetAsciiFilterName();
+ static String GetLotusFilterName();
+ static String GetDBaseFilterName();
+ static String GetDifFilterName();
+ static BOOL HasAutomaticTableName( const String& rFilter );
DECL_LINK( RefreshDBDataHdl, ScRefreshTimer* );
@@ -416,7 +416,7 @@ public:
const ScOptSolverSave* GetSolverSaveData() const { return pSolverSaveData; } // may be null
void SetSolverSaveData( const ScOptSolverSave& rData );
//<!--Added by PengYunQuan for Validity Cell Range Picker
- sal_Bool AcceptStateUpdate() const;
+ sal_Bool AcceptStateUpdate() const;
//-->Added by PengYunQuan for Validity Cell Range Picker
ScSheetSaveData* GetSheetSaveData();
@@ -446,19 +446,19 @@ SO2_IMPL_REF(ScDocShell)
// bAutoCalcShellDisabled nicht gesetzt ist ein SetDocumentModified gerufen.
class SC_DLLPUBLIC ScDocShellModificator
{
- ScDocShell& rDocShell;
- ScRefreshTimerProtector aProtector;
- BOOL bAutoCalcShellDisabled;
- BOOL bIdleDisabled;
+ ScDocShell& rDocShell;
+ ScRefreshTimerProtector aProtector;
+ BOOL bAutoCalcShellDisabled;
+ BOOL bIdleDisabled;
// not implemented
ScDocShellModificator( const ScDocShellModificator& );
- ScDocShellModificator& operator=( const ScDocShellModificator& );
+ ScDocShellModificator& operator=( const ScDocShellModificator& );
public:
ScDocShellModificator( ScDocShell& );
~ScDocShellModificator();
- void SetDocumentModified();
+ void SetDocumentModified();
};
diff --git a/sc/source/ui/inc/dpcontrol.hrc b/sc/source/ui/inc/dpcontrol.hrc
index 687f999970ad..9cea30e99d4f 100644
--- a/sc/source/ui/inc/dpcontrol.hrc
+++ b/sc/source/ui/inc/dpcontrol.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/source/ui/inc/dpcontrol.hxx b/sc/source/ui/inc/dpcontrol.hxx
index 45badf0c88fd..f44155a964c4 100644
--- a/sc/source/ui/inc/dpcontrol.hxx
+++ b/sc/source/ui/inc/dpcontrol.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 Window;
class ScDocument;
class ScAccessibleFilterMenu;
-/**
- * This class takes care of physically drawing field button controls inside
- * data pilot tables.
+/**
+ * This class takes care of physically drawing field button controls inside
+ * data pilot tables.
*/
class ScDPFieldButton
{
@@ -102,9 +102,9 @@ class ScMenuFloatingWindow : public PopupMenuFloatingWindow
{
public:
static size_t MENU_NOT_SELECTED;
- /**
- * Action to perform when an event takes place. Create a sub-class of
- * this to implement the desired action.
+ /**
+ * Action to perform when an event takes place. Create a sub-class of
+ * this to implement the desired action.
*/
class Action
{
@@ -167,34 +167,34 @@ private:
size_t getEnclosingMenuItem(const Point& rPos) const;
size_t getSubMenuPos(ScMenuFloatingWindow* pSubMenu);
- /**
- * Fire a menu highlight event since the accessibility framework needs
- * this to track focus on menu items.
+ /**
+ * Fire a menu highlight event since the accessibility framework needs
+ * this to track focus on menu items.
*/
- void fireMenuHighlightedEvent();
+ void fireMenuHighlightedEvent();
- /**
- * Make sure that the specified submenu is permanently up, the submenu
- * close timer is not active, and the correct menu item associated with
+ /**
+ * Make sure that the specified submenu is permanently up, the submenu
+ * close timer is not active, and the correct menu item associated with
* the submenu is highlighted.
*/
void setSubMenuFocused(ScMenuFloatingWindow* pSubMenu);
- /**
- * When a menu item of an invisible submenu is selected, we need to make
- * sure that all its parent menu(s) are visible, with the right menu item
- * highlighted in each of the parents. Calling this method ensures it.
+ /**
+ * When a menu item of an invisible submenu is selected, we need to make
+ * sure that all its parent menu(s) are visible, with the right menu item
+ * highlighted in each of the parents. Calling this method ensures it.
*/
void ensureSubMenuVisible(ScMenuFloatingWindow* pSubMenu);
- /**
- * Dismiss any visible child submenus when a menu item of a parent menu is
+ /**
+ * Dismiss any visible child submenus when a menu item of a parent menu is
* selected.
*/
void ensureSubMenuNotVisible();
- /**
- * Dismiss all visible popup menus and set focus back to the application
+ /**
+ * Dismiss all visible popup menus and set focus back to the application
* window. This method is called e.g. when a menu action is fired.
*/
void terminateAllPopupMenus();
@@ -251,17 +251,17 @@ private:
// ============================================================================
-/**
- * This class implements a popup window for field button, for quick access
- * of hide-item list, and possibly more stuff related to field options.
+/**
+ * This class implements a popup window for field button, for quick access
+ * of hide-item list, and possibly more stuff related to field options.
*/
class ScDPFieldPopupWindow : public ScMenuFloatingWindow
{
public:
- /**
- * Extended data that the client code may need to store. Create a
- * sub-class of this and store data there.
- */
+ /**
+ * Extended data that the client code may need to store. Create a
+ * sub-class of this and store data there.
+ */
struct ExtendedData {};
explicit ScDPFieldPopupWindow(Window* pParent, ScDocument* pDoc);
@@ -282,14 +282,14 @@ public:
void getResult(::std::hash_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rResult);
void close(bool bOK);
- /**
- * Set auxiliary data that the client code might need. Note that this
- * popup window class manages its life time; no explicit deletion of the
+ /**
+ * Set auxiliary data that the client code might need. Note that this
+ * popup window class manages its life time; no explicit deletion of the
* instance is needed in the client code.
*/
void setExtendedData(ExtendedData* p);
- /**
+ /**
* Get the store auxiliary data, or NULL if no such data is stored.
*/
ExtendedData* getExtendedData();
diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx
index 52f2e7c8f592..5afc2452c469 100644
--- a/sc/source/ui/inc/dpgroupdlg.hxx
+++ b/sc/source/ui/inc/dpgroupdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx
index d417d1427dda..47ea4ce1c892 100644
--- a/sc/source/ui/inc/drawsh.hxx
+++ b/sc/source/ui/inc/drawsh.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ class ScDrawView;
class ScDrawShell : public SfxShell
{
- ScViewData* pViewData;
+ ScViewData* pViewData;
DECL_LINK( NameObjectHdl, AbstractSvxNameDialog* );
@@ -49,7 +49,7 @@ class ScDrawShell : public SfxShell
#endif
protected:
- ScViewData* GetViewData() { return pViewData; }
+ ScViewData* GetViewData() { return pViewData; }
public:
TYPEINFO();
@@ -58,33 +58,33 @@ public:
ScDrawShell(ScViewData* pData);
~ScDrawShell();
- void StateDisableItems( SfxItemSet &rSet );
+ void StateDisableItems( SfxItemSet &rSet );
- void ExecDrawAttr(SfxRequest& rReq);
- void GetDrawAttrState(SfxItemSet &rSet);
- void GetAttrFuncState(SfxItemSet &rSet);
+ void ExecDrawAttr(SfxRequest& rReq);
+ void GetDrawAttrState(SfxItemSet &rSet);
+ void GetAttrFuncState(SfxItemSet &rSet);
- void ExecDrawFunc(SfxRequest& rReq);
- void GetDrawFuncState(SfxItemSet &rSet);
- void GetState(SfxItemSet &rSet);
+ void ExecDrawFunc(SfxRequest& rReq);
+ void GetDrawFuncState(SfxItemSet &rSet);
+ void GetState(SfxItemSet &rSet);
- void ExecFormText(SfxRequest& rReq); // StarFontWork
- void GetFormTextState(SfxItemSet& rSet);
+ void ExecFormText(SfxRequest& rReq); // StarFontWork
+ void GetFormTextState(SfxItemSet& rSet);
- void ExecuteHLink(SfxRequest& rReq); // Hyperlink
- void GetHLinkState(SfxItemSet& rSet);
+ void ExecuteHLink(SfxRequest& rReq); // Hyperlink
+ void GetHLinkState(SfxItemSet& rSet);
void ExecFormatPaintbrush(SfxRequest& rReq);
void StateFormatPaintbrush(SfxItemSet& rSet);
void ExecuteMacroAssign( SdrObject* pObj, Window* pWin );
- void ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff );
- void ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff );
- void ExecuteTextAttrDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff );
+ void ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff );
+ void ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff );
+ void ExecuteTextAttrDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff );
ScDrawView* GetDrawView();
- BOOL AreAllObjectsOnLayer(USHORT nLayerNo,const SdrMarkList& rMark);
+ BOOL AreAllObjectsOnLayer(USHORT nLayerNo,const SdrMarkList& rMark);
};
diff --git a/sc/source/ui/inc/drawutil.hxx b/sc/source/ui/inc/drawutil.hxx
index 67e1c0ba836f..9f493491e0b1 100644
--- a/sc/source/ui/inc/drawutil.hxx
+++ b/sc/source/ui/inc/drawutil.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 ScDocument;
class ScDrawUtil
{
public:
- static void CalcScale( ScDocument* pDoc, SCTAB nTab,
+ static void CalcScale( ScDocument* pDoc, SCTAB nTab,
SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
OutputDevice* pDev, const Fraction& rZoomX, const Fraction& rZoomY,
double nPPTX, double nPPTY,
diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx
index fa6b03638551..b86c8d178b32 100644
--- a/sc/source/ui/inc/drawview.hxx
+++ b/sc/source/ui/inc/drawview.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,22 +40,22 @@ class ScDrawObjData;
class ScDrawView: public FmFormView
{
- ScViewData* pViewData;
- OutputDevice* pDev; //! noetig ?
- ScDocument* pDoc;
- SCTAB nTab;
- Fraction aScaleX; // Faktor fuer Drawing-MapMode
- Fraction aScaleY;
- SdrDropMarkerOverlay* pDropMarker;
- SdrObject* pDropMarkObj;
- BOOL bInConstruct;
- //HMHBOOL bDisableHdl;
-
- void Construct();
- void UpdateBrowser();
+ ScViewData* pViewData;
+ OutputDevice* pDev; //! noetig ?
+ ScDocument* pDoc;
+ SCTAB nTab;
+ Fraction aScaleX; // Faktor fuer Drawing-MapMode
+ Fraction aScaleY;
+ SdrDropMarkerOverlay* pDropMarker;
+ SdrObject* pDropMarkObj;
+ BOOL bInConstruct;
+ //HMHBOOL bDisableHdl;
+
+ void Construct();
+ void UpdateBrowser();
protected:
- virtual void ModelHasChanged();
+ virtual void ModelHasChanged();
// add custom handles (used by other apps, e.g. AnchorPos)
virtual void AddCustomHdl();
@@ -64,58 +64,58 @@ protected:
public:
ScDrawView( OutputDevice* pOut, ScViewData* pData );
- virtual ~ScDrawView();
+ virtual ~ScDrawView();
- virtual void MarkListHasChanged();
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void MarkListHasChanged();
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
virtual void DoConnect(SdrOle2Obj* pOleObj);
- virtual void MakeVisible( const Rectangle& rRect, Window& rWin );
+ virtual void MakeVisible( const Rectangle& rRect, Window& rWin );
virtual void DeleteMarked();
- void DrawMarks( OutputDevice* pOut ) const;
+ void DrawMarks( OutputDevice* pOut ) const;
- void MarkDropObj( SdrObject* pObj );
+ void MarkDropObj( SdrObject* pObj );
- //HMHBOOL IsDisableHdl() const { return bDisableHdl; }
+ //HMHBOOL IsDisableHdl() const { return bDisableHdl; }
- void SetMarkedToLayer( BYTE nLayerNo );
+ void SetMarkedToLayer( BYTE nLayerNo );
- void InvalidateAttribs();
- void InvalidateDrawTextAttrs();
+ void InvalidateAttribs();
+ void InvalidateDrawTextAttrs();
- BOOL BeginDrag( Window* pWindow, const Point& rStartPos );
- void DoCut();
- void DoCopy();
+ BOOL BeginDrag( Window* pWindow, const Point& rStartPos );
+ void DoCut();
+ void DoCopy();
- void GetScale( Fraction& rFractX, Fraction& rFractY ) const;
- void RecalcScale();
- void UpdateWorkArea();
- SCTAB GetTab() const { return nTab; }
+ void GetScale( Fraction& rFractX, Fraction& rFractY ) const;
+ void RecalcScale();
+ void UpdateWorkArea();
+ SCTAB GetTab() const { return nTab; }
- void CalcNormScale( Fraction& rFractX, Fraction& rFractY ) const;
+ void CalcNormScale( Fraction& rFractX, Fraction& rFractY ) const;
- void SetAnchor( ScAnchorType );
- ScAnchorType GetAnchor() const;
+ void SetAnchor( ScAnchorType );
+ ScAnchorType GetAnchor() const;
- void VCAddWin( Window* pWin );
- void VCRemoveWin( Window* pWin );
+ void VCAddWin( Window* pWin );
+ void VCRemoveWin( Window* pWin );
- void UpdateIMap( SdrObject* pObj );
+ void UpdateIMap( SdrObject* pObj );
- USHORT GetPopupMenuId();
- void UpdateUserViewOptions();
+ USHORT GetPopupMenuId();
+ void UpdateUserViewOptions();
- void SetMarkedOriginalSize();
+ void SetMarkedOriginalSize();
- BOOL SelectObject( const String& rName );
-//UNUSED2008-05 String GetSelectedChartName() const;
+ BOOL SelectObject( const String& rName );
+//UNUSED2008-05 String GetSelectedChartName() const;
bool HasMarkedControl() const;
bool HasMarkedInternal() const;
- FASTBOOL InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions=0);
+ FASTBOOL InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions=0);
/** Returns the selected object, if it is the caption object of a cell note.
@param ppCaptData (out-param) If not null, returns the pointer to the caption object data. */
@@ -139,7 +139,7 @@ public:
/** Unlocks the internal layer that contains caption objects of cell notes. */
inline void UnlockInternalLayer() { LockInternalLayer( false ); }
- SdrEndTextEditKind ScEndTextEdit(); // ruft SetDrawTextUndo(0)
+ SdrEndTextEditKind ScEndTextEdit(); // ruft SetDrawTextUndo(0)
//UNUSED2009-05 void CaptionTextDirection(USHORT nSlot);
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > CopyToTransferable();
};
diff --git a/sc/source/ui/inc/drformsh.hxx b/sc/source/ui/inc/drformsh.hxx
index 7f7473eb7519..1e53792fdff4 100644
--- a/sc/source/ui/inc/drformsh.hxx
+++ b/sc/source/ui/inc/drformsh.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +46,10 @@ public:
SFX_DECL_INTERFACE(SCID_FORM_SHELL)
ScDrawFormShell(ScViewData* pData);
- virtual ~ScDrawFormShell();
+ virtual ~ScDrawFormShell();
-// void Execute(SfxRequest &);
-// void GetState(SfxItemSet &);
+// void Execute(SfxRequest &);
+// void GetState(SfxItemSet &);
};
#endif
diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx
index 5c493df2f769..49c2f93a5810 100644
--- a/sc/source/ui/inc/drtxtob.hxx
+++ b/sc/source/ui/inc/drtxtob.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 "shellids.hxx"
-USHORT ScGetFontWorkId(); // statt SvxFontWorkChildWindow::GetChildWindowId()
+USHORT ScGetFontWorkId(); // statt SvxFontWorkChildWindow::GetChildWindowId()
class ScViewData;
class TransferableDataHelper;
@@ -45,9 +45,9 @@ class TransferableClipboardListener;
class ScDrawTextObjectBar : public SfxShell
{
- ScViewData* pViewData;
+ ScViewData* pViewData;
TransferableClipboardListener* pClipEvtLstnr;
- BOOL bPastePossible;
+ BOOL bPastePossible;
DECL_LINK( ClipboardChanged, TransferableDataHelper* );
@@ -73,11 +73,11 @@ public:
BOOL ExecuteParaDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet );
void ExecuteExtra( SfxRequest &rReq );
- void ExecFormText(SfxRequest& rReq); // StarFontWork
+ void ExecFormText(SfxRequest& rReq); // StarFontWork
void GetFormTextState(SfxItemSet& rSet);
private:
- void ExecuteGlobal( SfxRequest &rReq ); // von Execute gerufen fuer ganze Objekte
+ void ExecuteGlobal( SfxRequest &rReq ); // von Execute gerufen fuer ganze Objekte
void GetGlobalClipState( SfxItemSet& rSet );
void ExecutePasteContents( SfxRequest &rReq );
BOOL IsNoteEdit();
diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx
index 9a1175d3310d..bccbce553693 100644
--- a/sc/source/ui/inc/drwtrans.hxx
+++ b/sc/source/ui/inc/drwtrans.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,31 +47,31 @@ class SdrOle2Obj;
class ScDrawTransferObj : public TransferableHelper
{
private:
- SdrModel* pModel;
- TransferableDataHelper aOleData;
- TransferableObjectDescriptor aObjDesc;
-//REMOVE SvEmbeddedObjectRef aDocShellRef;
-//REMOVE SvEmbeddedObjectRef aDrawPersistRef;
- SfxObjectShellRef aDocShellRef;
- SfxObjectShellRef aDrawPersistRef;
+ SdrModel* pModel;
+ TransferableDataHelper aOleData;
+ TransferableObjectDescriptor aObjDesc;
+//REMOVE SvEmbeddedObjectRef aDocShellRef;
+//REMOVE SvEmbeddedObjectRef aDrawPersistRef;
+ SfxObjectShellRef aDocShellRef;
+ SfxObjectShellRef aDrawPersistRef;
// extracted from model in ctor:
- Size aSrcSize;
- INetBookmark* pBookmark;
- BOOL bGraphic;
- BOOL bGrIsBit;
- BOOL bOleObj;
+ Size aSrcSize;
+ INetBookmark* pBookmark;
+ BOOL bGraphic;
+ BOOL bGrIsBit;
+ BOOL bOleObj;
// source information for drag&drop:
// (view is needed to handle drawing obejcts)
- SdrView* pDragSourceView;
- USHORT nDragSourceFlags;
- BOOL bDragWasInternal;
+ SdrView* pDragSourceView;
+ USHORT nDragSourceFlags;
+ BOOL bDragWasInternal;
sal_uInt32 nSourceDocID;
- void InitDocShell();
-//REMOVE SvInPlaceObjectRef GetSingleObject();
+ void InitDocShell();
+//REMOVE SvInPlaceObjectRef GetSingleObject();
SdrOle2Obj* GetSingleObject();
public:
@@ -79,23 +79,23 @@ public:
const TransferableObjectDescriptor& rDesc );
virtual ~ScDrawTransferObj();
- virtual void AddSupportedFormats();
- virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
- virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId,
+ virtual void AddSupportedFormats();
+ virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+ virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId,
const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
- virtual void ObjectReleased();
- virtual void DragFinished( sal_Int8 nDropAction );
+ virtual void ObjectReleased();
+ virtual void DragFinished( sal_Int8 nDropAction );
- SdrModel* GetModel() { return pModel; }
+ SdrModel* GetModel() { return pModel; }
- void SetDrawPersist( const SfxObjectShellRef& rRef );
- void SetDragSource( ScDrawView* pView );
- void SetDragSourceObj( SdrObject* pObj, SCTAB nTab );
- void SetDragSourceFlags( USHORT nFlags );
- void SetDragWasInternal();
+ void SetDrawPersist( const SfxObjectShellRef& rRef );
+ void SetDragSource( ScDrawView* pView );
+ void SetDragSourceObj( SdrObject* pObj, SCTAB nTab );
+ void SetDragSourceFlags( USHORT nFlags );
+ void SetDragWasInternal();
- SdrView* GetDragSourceView() { return pDragSourceView; }
- USHORT GetDragSourceFlags() const { return nDragSourceFlags; }
+ SdrView* GetDragSourceView() { return pDragSourceView; }
+ USHORT GetDragSourceFlags() const { return nDragSourceFlags; }
void SetSourceDocID( sal_uInt32 nVal )
{ nSourceDocID = nVal; }
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index 800696970fbd..1e9b34d7abae 100644
--- a/sc/source/ui/inc/dwfunctr.hxx
+++ b/sc/source/ui/inc/dwfunctr.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +44,11 @@
#include <vcl/combobox.hxx>
#endif
#include "anyrefdg.hxx"
-#include "global.hxx" // ScAddress
+#include "global.hxx" // ScAddress
#include "privsplt.hxx"
#include "funcdesc.hxx"
-#ifndef LRU_MAX
+#ifndef LRU_MAX
#define LRU_MAX 10
#endif
/*************************************************************************
@@ -76,44 +76,44 @@ class ScFunctionDockWin : public SfxDockingWindow, public SfxListener
{
private:
- Timer aTimer;
- ScPrivatSplit aPrivatSplit;
- ListBox aCatBox;
- ListBox aFuncList;
- ListBox aDDFuncList;
- ListBox* pAllFuncList;
-
- SfxChildAlignment eSfxNewAlignment;
- SfxChildAlignment eSfxOldAlignment;
- ImageButton aInsertButton;
- FixedText aFiFuncDesc;
- USHORT nLeftSlot;
- USHORT nRightSlot;
- ULONG nMinWidth;
- ULONG nMinHeight;
- Size aOldSize;
- BOOL bSizeFlag;
- BOOL bInit;
- short nDockMode;
- Point aSplitterInitPos;
- const ScFuncDesc* pFuncDesc;
- USHORT nArgs;
- String** pArgArr;
+ Timer aTimer;
+ ScPrivatSplit aPrivatSplit;
+ ListBox aCatBox;
+ ListBox aFuncList;
+ ListBox aDDFuncList;
+ ListBox* pAllFuncList;
+
+ SfxChildAlignment eSfxNewAlignment;
+ SfxChildAlignment eSfxOldAlignment;
+ ImageButton aInsertButton;
+ FixedText aFiFuncDesc;
+ USHORT nLeftSlot;
+ USHORT nRightSlot;
+ ULONG nMinWidth;
+ ULONG nMinHeight;
+ Size aOldSize;
+ BOOL bSizeFlag;
+ BOOL bInit;
+ short nDockMode;
+ Point aSplitterInitPos;
+ const ScFuncDesc* pFuncDesc;
+ USHORT nArgs;
+ String** pArgArr;
const ScFuncDesc* aLRUList[LRU_MAX];
- void UpdateFunctionList();
- void UpdateLRUList();
- void DoEnter(BOOL bOk); //@@ ???
- void SetDescription();
- void SetLeftRightSize();
- void SetTopBottonSize();
- void SetMyWidthLeRi(Size &aNewSize);
- void SetMyHeightLeRi(Size &aNewSize);
- void SetMyWidthToBo(Size &aNewSize);
- void SetMyHeightToBo(Size &aNewSize);
- void UseSplitterInitPos();
+ void UpdateFunctionList();
+ void UpdateLRUList();
+ void DoEnter(BOOL bOk); //@@ ???
+ void SetDescription();
+ void SetLeftRightSize();
+ void SetTopBottonSize();
+ void SetMyWidthLeRi(Size &aNewSize);
+ void SetMyHeightLeRi(Size &aNewSize);
+ void SetMyWidthToBo(Size &aNewSize);
+ void SetMyHeightToBo(Size &aNewSize);
+ void UseSplitterInitPos();
DECL_LINK( SetSelectionHdl, void* );
DECL_LINK( SelHdl, ListBox* );
@@ -122,19 +122,19 @@ private:
protected:
- virtual BOOL Close();
- virtual void Resize();
- virtual void Resizing( Size& rSize );
- virtual void SetSize();
- virtual void ToggleFloatingMode();
- virtual void StateChanged( StateChangedType nStateChange );
+ virtual BOOL Close();
+ virtual void Resize();
+ virtual void Resizing( Size& rSize );
+ virtual void SetSize();
+ virtual void ToggleFloatingMode();
+ virtual void StateChanged( StateChangedType nStateChange );
virtual SfxChildAlignment CheckAlignment(SfxChildAlignment,
SfxChildAlignment eAlign);
public:
- ScFunctionDockWin( SfxBindings* pBindings,
+ ScFunctionDockWin( SfxBindings* pBindings,
SfxChildWindow *pCW,
Window* pParent,
const ResId& rResId );
@@ -142,14 +142,14 @@ public:
~ScFunctionDockWin();
using SfxDockingWindow::Notify;
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
- void SetSlotIDs( USHORT nLeft, USHORT nRight )
+ void SetSlotIDs( USHORT nLeft, USHORT nRight )
{ nLeftSlot = nLeft; nRightSlot = nRight; }
- void InitLRUList();
-
- void Initialize (SfxChildWinInfo* pInfo);
+ void InitLRUList();
+
+ void Initialize (SfxChildWinInfo* pInfo);
virtual void FillInfo(SfxChildWinInfo&) const;
};
diff --git a/sc/source/ui/inc/editable.hxx b/sc/source/ui/inc/editable.hxx
index 4b6e8d0596bc..025ffff4ed4a 100644
--- a/sc/source/ui/inc/editable.hxx
+++ b/sc/source/ui/inc/editable.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +39,8 @@ class ScRange;
class ScEditableTester
{
- BOOL bIsEditable;
- BOOL bOnlyMatrix;
+ BOOL bIsEditable;
+ BOOL bOnlyMatrix;
public:
// no test in ctor
@@ -51,7 +51,7 @@ public:
SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
// calls TestSelectedBlock
- ScEditableTester( ScDocument* pDoc,
+ ScEditableTester( ScDocument* pDoc,
SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
const ScMarkData& rMark );
@@ -68,18 +68,18 @@ public:
// Several calls to the Test... methods check if *all* of the ranges
// are editable. For several independent checks, Reset() has to be used.
- void TestBlock( ScDocument* pDoc, SCTAB nTab,
+ void TestBlock( ScDocument* pDoc, SCTAB nTab,
SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
- void TestSelectedBlock( ScDocument* pDoc,
+ void TestSelectedBlock( ScDocument* pDoc,
SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
const ScMarkData& rMark );
- void TestRange( ScDocument* pDoc, const ScRange& rRange );
- void TestSelection( ScDocument* pDoc, const ScMarkData& rMark );
- void TestView( ScViewFunc* pView );
+ void TestRange( ScDocument* pDoc, const ScRange& rRange );
+ void TestSelection( ScDocument* pDoc, const ScMarkData& rMark );
+ void TestView( ScViewFunc* pView );
- BOOL IsEditable() const { return bIsEditable; }
- BOOL IsFormatEditable() const { return bIsEditable || bOnlyMatrix; }
- USHORT GetMessageId() const;
+ BOOL IsEditable() const { return bIsEditable; }
+ BOOL IsFormatEditable() const { return bIsEditable || bOnlyMatrix; }
+ USHORT GetMessageId() const;
};
#endif
diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx
index 9836e94aa215..f42e46705cc9 100644
--- a/sc/source/ui/inc/editfield.hxx
+++ b/sc/source/ui/inc/editfield.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/editsh.hxx b/sc/source/ui/inc/editsh.hxx
index ebada82a32fb..ce08dea6391a 100644
--- a/sc/source/ui/inc/editsh.hxx
+++ b/sc/source/ui/inc/editsh.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +45,11 @@ class TransferableClipboardListener;
class ScEditShell : public SfxShell
{
private:
- EditView* pEditView;
- ScViewData* pViewData;
+ EditView* pEditView;
+ ScViewData* pViewData;
TransferableClipboardListener* pClipEvtLstnr;
- BOOL bPastePossible;
- BOOL bIsInsertMode;
+ BOOL bPastePossible;
+ BOOL bIsInsertMode;
const SvxURLField* GetURLField();
ScInputHandler* GetMyInputHdl();
@@ -63,19 +63,19 @@ public:
ScEditShell(EditView* pView, ScViewData* pData);
~ScEditShell();
- void SetEditView(EditView* pView);
+ void SetEditView(EditView* pView);
EditView* GetEditView() {return pEditView;}
- void Execute(SfxRequest& rReq);
- void ExecuteTrans(SfxRequest& rReq);
- void GetState(SfxItemSet &rSet);
- void GetClipState(SfxItemSet& rSet);
+ void Execute(SfxRequest& rReq);
+ void ExecuteTrans(SfxRequest& rReq);
+ void GetState(SfxItemSet &rSet);
+ void GetClipState(SfxItemSet& rSet);
- void ExecuteAttr(SfxRequest& rReq);
- void GetAttrState(SfxItemSet &rSet);
+ void ExecuteAttr(SfxRequest& rReq);
+ void GetAttrState(SfxItemSet &rSet);
- void ExecuteUndo(SfxRequest& rReq);
- void GetUndoState(SfxItemSet &rSet);
+ void ExecuteUndo(SfxRequest& rReq);
+ void GetUndoState(SfxItemSet &rSet);
String GetSelectionText( BOOL bWholeWord );
};
diff --git a/sc/source/ui/inc/expftext.hxx b/sc/source/ui/inc/expftext.hxx
index 170deba5b403..0bd2413cea51 100644
--- a/sc/source/ui/inc/expftext.hxx
+++ b/sc/source/ui/inc/expftext.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +26,7 @@
************************************************************************/
#ifndef _SC_EXPFTEXT_HXX
-#define _SC_EXPFTEXT_HXX
+#define _SC_EXPFTEXT_HXX
#include <vcl/fixed.hxx>
#include "scdllapi.h"
diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx
index 539dbe54e275..4fe56d6f15de 100755
--- a/sc/source/ui/inc/fieldwnd.hxx
+++ b/sc/source/ui/inc/fieldwnd.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx
index 7f2fb046093c..e270b341a50d 100644
--- a/sc/source/ui/inc/filldlg.hxx
+++ b/sc/source/ui/inc/filldlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,85 +46,85 @@ class ScDocument;
//----------------------------------------------------------------------------
-//CHINA001 #define FDS_OPT_NONE 0
-//CHINA001 #define FDS_OPT_HORZ 1
-//CHINA001 #define FDS_OPT_VERT 2
-//CHINA001
-#include "scui_def.hxx" //CHINA001
+//CHINA001 #define FDS_OPT_NONE 0
+//CHINA001 #define FDS_OPT_HORZ 1
+//CHINA001 #define FDS_OPT_VERT 2
+//CHINA001
+#include "scui_def.hxx" //CHINA001
//============================================================================
class ScFillSeriesDlg : public ModalDialog
{
public:
- ScFillSeriesDlg( Window* pParent,
- ScDocument& rDocument,
- FillDir eFillDir,
- FillCmd eFillCmd,
- FillDateCmd eFillDateCmd,
- String aStartStr,
- double fStep,
- double fMax,
- USHORT nPossDir );
+ ScFillSeriesDlg( Window* pParent,
+ ScDocument& rDocument,
+ FillDir eFillDir,
+ FillCmd eFillCmd,
+ FillDateCmd eFillDateCmd,
+ String aStartStr,
+ double fStep,
+ double fMax,
+ USHORT nPossDir );
~ScFillSeriesDlg();
- FillDir GetFillDir() const { return theFillDir; }
- FillCmd GetFillCmd() const { return theFillCmd; }
- FillDateCmd GetFillDateCmd() const { return theFillDateCmd; }
- double GetStart() const { return fStartVal; }
- double GetStep() const { return fIncrement; }
- double GetMax() const { return fEndVal; }
+ FillDir GetFillDir() const { return theFillDir; }
+ FillCmd GetFillCmd() const { return theFillCmd; }
+ FillDateCmd GetFillDateCmd() const { return theFillDateCmd; }
+ double GetStart() const { return fStartVal; }
+ double GetStep() const { return fIncrement; }
+ double GetMax() const { return fEndVal; }
- String GetStartStr() const { return aEdStartVal.GetText(); }
+ String GetStartStr() const { return aEdStartVal.GetText(); }
- void SetEdStartValEnabled(BOOL bFlag=FALSE);
+ void SetEdStartValEnabled(BOOL bFlag=FALSE);
private:
FixedLine aFlDirection;
- RadioButton aBtnDown;
- RadioButton aBtnRight;
- RadioButton aBtnUp;
- RadioButton aBtnLeft;
+ RadioButton aBtnDown;
+ RadioButton aBtnRight;
+ RadioButton aBtnUp;
+ RadioButton aBtnLeft;
FixedLine aFlSep1;
FixedLine aFlType;
- RadioButton aBtnArithmetic;
- RadioButton aBtnGeometric;
- RadioButton aBtnDate;
- RadioButton aBtnAutoFill;
+ RadioButton aBtnArithmetic;
+ RadioButton aBtnGeometric;
+ RadioButton aBtnDate;
+ RadioButton aBtnAutoFill;
FixedLine aFlSep2;
FixedLine aFlTimeUnit;
- RadioButton aBtnDay;
- RadioButton aBtnDayOfWeek;
- RadioButton aBtnMonth;
- RadioButton aBtnYear;
+ RadioButton aBtnDay;
+ RadioButton aBtnDayOfWeek;
+ RadioButton aBtnMonth;
+ RadioButton aBtnYear;
- BOOL bStartValFlag;
- FixedText aFtStartVal;
- Edit aEdStartVal;
- String aStartStrVal;
+ BOOL bStartValFlag;
+ FixedText aFtStartVal;
+ Edit aEdStartVal;
+ String aStartStrVal;
- FixedText aFtEndVal;
- Edit aEdEndVal;
+ FixedText aFtEndVal;
+ Edit aEdEndVal;
- FixedText aFtIncrement;
- Edit aEdIncrement;
+ FixedText aFtIncrement;
+ Edit aEdIncrement;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
- const String errMsgInvalidVal;
+ const String errMsgInvalidVal;
//----------------------------------------------------------
- ScDocument& rDoc;
- FillDir theFillDir;
- FillCmd theFillCmd;
- FillDateCmd theFillDateCmd;
- double fStartVal;
- double fIncrement;
- double fEndVal;
+ ScDocument& rDoc;
+ FillDir theFillDir;
+ FillCmd theFillCmd;
+ FillDateCmd theFillDateCmd;
+ double fStartVal;
+ double fIncrement;
+ double fEndVal;
#ifdef _FILLDLG_CXX
private:
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 31e0e3a5d4b1..2e5cd9762e03 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,37 +56,37 @@ class TypedScStrCollection;
// Gemeinsame Resource-Objekte:
#define _COMMON_FILTER_RSCOBJS \
- CheckBox aBtnCase; \
- CheckBox aBtnRegExp; \
- CheckBox aBtnHeader; \
- CheckBox aBtnUnique; \
- CheckBox aBtnCopyResult; \
- ListBox aLbCopyArea; \
- formula::RefEdit aEdCopyArea; \
- formula::RefButton aRbCopyArea; \
- CheckBox aBtnDestPers; \
- FixedText aFtDbAreaLabel; \
- FixedInfo aFtDbArea; \
- const String aStrUndefined; \
- const String aStrNoName; \
- const String aStrNone;
+ CheckBox aBtnCase; \
+ CheckBox aBtnRegExp; \
+ CheckBox aBtnHeader; \
+ CheckBox aBtnUnique; \
+ CheckBox aBtnCopyResult; \
+ ListBox aLbCopyArea; \
+ formula::RefEdit aEdCopyArea; \
+ formula::RefButton aRbCopyArea; \
+ CheckBox aBtnDestPers; \
+ FixedText aFtDbAreaLabel; \
+ FixedInfo aFtDbArea; \
+ const String aStrUndefined; \
+ const String aStrNoName; \
+ const String aStrNone;
#define _INIT_COMMON_FILTER_RSCOBJS \
- aBtnCase ( this, ScResId( BTN_CASE ) ), \
- aBtnRegExp ( this, ScResId( BTN_REGEXP ) ), \
- aBtnHeader ( this, ScResId( BTN_HEADER ) ), \
- aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), \
- aBtnCopyResult ( this, ScResId( BTN_COPY_RESULT ) ), \
- aLbCopyArea ( this, ScResId( LB_COPY_AREA ) ), \
+ aBtnCase ( this, ScResId( BTN_CASE ) ), \
+ aBtnRegExp ( this, ScResId( BTN_REGEXP ) ), \
+ aBtnHeader ( this, ScResId( BTN_HEADER ) ), \
+ aBtnUnique ( this, ScResId( BTN_UNIQUE ) ), \
+ aBtnCopyResult ( this, ScResId( BTN_COPY_RESULT ) ), \
+ aLbCopyArea ( this, ScResId( LB_COPY_AREA ) ), \
aEdCopyArea ( this, this, ScResId( ED_COPY_AREA ) ), \
- aRbCopyArea ( this, ScResId( RB_COPY_AREA ), &aEdCopyArea, this ), \
- aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ), \
- aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ), \
- aFtDbArea ( this, ScResId( FT_DBAREA ) ), \
- aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), \
- aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), \
- aStrNone ( ScResId( SCSTR_NONE ) ),
+ aRbCopyArea ( this, ScResId( RB_COPY_AREA ), &aEdCopyArea, this ), \
+ aBtnDestPers ( this, ScResId( BTN_DEST_PERS ) ), \
+ aFtDbAreaLabel ( this, ScResId( FT_DBAREA_LABEL ) ), \
+ aFtDbArea ( this, ScResId( FT_DBAREA ) ), \
+ aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ), \
+ aStrNoName ( ScGlobal::GetRscString(STR_DB_NONAME) ), \
+ aStrNone ( ScResId( SCSTR_NONE ) ),
//============================================================================
@@ -94,46 +94,46 @@ class ScFilterDlg : public ScAnyRefDlg
{
public:
ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
- const SfxItemSet& rArgSet );
+ const SfxItemSet& rArgSet );
~ScFilterDlg();
- virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
+ virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual BOOL IsRefInputMode() const;
- virtual void SetActive();
+ virtual BOOL IsRefInputMode() const;
+ virtual void SetActive();
- virtual BOOL Close();
- void SliderMoved();
- USHORT GetSliderPos();
- void RefreshEditRow( USHORT nOffset );
+ virtual BOOL Close();
+ void SliderMoved();
+ USHORT GetSliderPos();
+ void RefreshEditRow( USHORT nOffset );
private:
FixedLine aFlCriteria;
//----------------------------
- ListBox aLbConnect1;
- ListBox aLbField1;
- ListBox aLbCond1;
- ComboBox aEdVal1;
+ ListBox aLbConnect1;
+ ListBox aLbField1;
+ ListBox aLbCond1;
+ ComboBox aEdVal1;
//----------------------------
- ListBox aLbConnect2;
- ListBox aLbField2;
- ListBox aLbCond2;
- ComboBox aEdVal2;
+ ListBox aLbConnect2;
+ ListBox aLbField2;
+ ListBox aLbCond2;
+ ComboBox aEdVal2;
//----------------------------
- ListBox aLbConnect3;
- ListBox aLbField3;
- ListBox aLbCond3;
- ComboBox aEdVal3;
+ ListBox aLbConnect3;
+ ListBox aLbField3;
+ ListBox aLbCond3;
+ ComboBox aEdVal3;
//----------------------------
- ListBox aLbConnect4;
- ListBox aLbField4;
- ListBox aLbCond4;
- ComboBox aEdVal4;
+ ListBox aLbConnect4;
+ ListBox aLbField4;
+ ListBox aLbCond4;
+ ComboBox aEdVal4;
//----------------------------
- FixedText aFtConnect;
- FixedText aFtField;
- FixedText aFtCond;
- FixedText aFtVal;
+ FixedText aFtConnect;
+ FixedText aFtField;
+ FixedText aFtCond;
+ FixedText aFtVal;
FixedLine aFlSeparator;
ScrollBar aScrollBar;
@@ -146,56 +146,56 @@ private:
_COMMON_FILTER_RSCOBJS
- const String aStrEmpty;
- const String aStrNotEmpty;
- const String aStrRow;
- const String aStrColumn;
+ const String aStrEmpty;
+ const String aStrNotEmpty;
+ const String aStrRow;
+ const String aStrColumn;
- ScFilterOptionsMgr* pOptionsMgr;
+ ScFilterOptionsMgr* pOptionsMgr;
- const USHORT nWhichQuery;
- const ScQueryParam theQueryData;
- ScQueryItem* pOutItem;
- ScViewData* pViewData;
- ScDocument* pDoc;
- SCTAB nSrcTab;
+ const USHORT nWhichQuery;
+ const ScQueryParam theQueryData;
+ ScQueryItem* pOutItem;
+ ScViewData* pViewData;
+ ScDocument* pDoc;
+ SCTAB nSrcTab;
- ComboBox* aValueEdArr[4];
- ListBox* aFieldLbArr[4];
- ListBox* aCondLbArr[4];
- ListBox* aConnLbArr[4];
+ ComboBox* aValueEdArr[4];
+ ListBox* aFieldLbArr[4];
+ ListBox* aCondLbArr[4];
+ ListBox* aConnLbArr[4];
bool mbHasDates[MAXQUERY];
BOOL bRefreshExceptQuery[MAXQUERY];
- USHORT nFieldCount;
- BOOL bRefInputMode;
+ USHORT nFieldCount;
+ BOOL bRefInputMode;
- TypedScStrCollection* pEntryLists[MAXCOLCOUNT];
- USHORT nHeaderPos[MAXCOLCOUNT];
+ TypedScStrCollection* pEntryLists[MAXCOLCOUNT];
+ USHORT nHeaderPos[MAXCOLCOUNT];
// Hack: RefInput-Kontrolle
- Timer* pTimer;
+ Timer* pTimer;
#ifdef _FILTDLG_CXX
private:
- void Init ( const SfxItemSet& rArgSet );
- void FillFieldLists ();
- void FillAreaList ();
- void UpdateValueList ( USHORT nList );
- void UpdateHdrInValueList( USHORT nList );
- void ClearValueList ( USHORT nList );
- USHORT GetFieldSelPos ( SCCOL nField );
- ScQueryItem* GetOutputItem ();
+ void Init ( const SfxItemSet& rArgSet );
+ void FillFieldLists ();
+ void FillAreaList ();
+ void UpdateValueList ( USHORT nList );
+ void UpdateHdrInValueList( USHORT nList );
+ void ClearValueList ( USHORT nList );
+ USHORT GetFieldSelPos ( SCCOL nField );
+ ScQueryItem* GetOutputItem ();
// Handler:
- DECL_LINK( LbSelectHdl, ListBox* );
+ DECL_LINK( LbSelectHdl, ListBox* );
DECL_LINK( ValModifyHdl, ComboBox* );
- DECL_LINK( CheckBoxHdl, CheckBox* );
- DECL_LINK( EndDlgHdl, Button* );
+ DECL_LINK( CheckBoxHdl, CheckBox* );
+ DECL_LINK( EndDlgHdl, Button* );
DECL_LINK( MoreClickHdl, MoreButton* );
DECL_LINK( ScrollHdl, ScrollBar* );
// Hack: RefInput-Kontrolle
- DECL_LINK( TimeOutHdl, Timer* );
+ DECL_LINK( TimeOutHdl, Timer* );
#endif
};
@@ -205,21 +205,21 @@ class ScSpecialFilterDlg : public ScAnyRefDlg
{
public:
ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
- const SfxItemSet& rArgSet );
+ const SfxItemSet& rArgSet );
~ScSpecialFilterDlg();
- virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
+ virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual BOOL IsRefInputMode() const;
- virtual void SetActive();
+ virtual BOOL IsRefInputMode() const;
+ virtual void SetActive();
- virtual BOOL Close();
+ virtual BOOL Close();
private:
- ListBox aLbFilterArea;
- FixedText aFtFilterArea;
- formula::RefEdit aEdFilterArea;
- formula::RefButton aRbFilterArea;
+ ListBox aLbFilterArea;
+ FixedText aFtFilterArea;
+ formula::RefEdit aEdFilterArea;
+ formula::RefButton aRbFilterArea;
FixedLine aFlOptions;
@@ -230,34 +230,34 @@ private:
HelpButton aBtnHelp;
MoreButton aBtnMore;
- ScFilterOptionsMgr* pOptionsMgr;
+ ScFilterOptionsMgr* pOptionsMgr;
- const USHORT nWhichQuery;
- const ScQueryParam theQueryData;
- ScQueryItem* pOutItem;
- ScViewData* pViewData;
- ScDocument* pDoc;
+ const USHORT nWhichQuery;
+ const ScQueryParam theQueryData;
+ ScQueryItem* pOutItem;
+ ScViewData* pViewData;
+ ScDocument* pDoc;
- formula::RefEdit* pRefInputEdit;
- BOOL bRefInputMode;
+ formula::RefEdit* pRefInputEdit;
+ BOOL bRefInputMode;
// Hack: RefInput-Kontrolle
- Timer* pTimer;
+ Timer* pTimer;
#ifdef _SFILTDLG_CXX
private:
- void Init( const SfxItemSet& rArgSet );
- ScQueryItem* GetOutputItem( const ScQueryParam& rParam,
+ void Init( const SfxItemSet& rArgSet );
+ ScQueryItem* GetOutputItem( const ScQueryParam& rParam,
const ScRange& rSource );
// Handler
DECL_LINK( FilterAreaSelHdl, ListBox* );
DECL_LINK( FilterAreaModHdl, formula::RefEdit* );
- DECL_LINK( EndDlgHdl, Button* );
+ DECL_LINK( EndDlgHdl, Button* );
DECL_LINK( ScrollHdl, ScrollBar* );
// Hack: RefInput-Kontrolle
- DECL_LINK( TimeOutHdl, Timer* );
+ DECL_LINK( TimeOutHdl, Timer* );
#endif
};
diff --git a/sc/source/ui/inc/filter.hrc b/sc/source/ui/inc/filter.hrc
index 508c5af9aab5..9d708c9799c5 100644
--- a/sc/source/ui/inc/filter.hrc
+++ b/sc/source/ui/inc/filter.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
@@ -24,59 +24,59 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include "sc.hrc" // -> RID_SCDLG_FILTER
+#include "sc.hrc" // -> RID_SCDLG_FILTER
// -> RID_SCDLG_SPEC_FILTER
// -> RID_SCDLG_PIVOTFILTER
// allgemein
-#define BTN_OK 1
-#define BTN_CANCEL 1
-#define BTN_HELP 1
+#define BTN_OK 1
+#define BTN_CANCEL 1
+#define BTN_HELP 1
#define BTN_MORE 1
-#define BTN_UNIQUE 1
-#define BTN_CASE 2
-#define BTN_REGEXP 3
-#define BTN_HEADER 4
-#define BTN_COPY_RESULT 5
-#define LB_COPY_AREA 6
-#define ED_COPY_AREA 7
-#define RB_COPY_AREA 8
+#define BTN_UNIQUE 1
+#define BTN_CASE 2
+#define BTN_REGEXP 3
+#define BTN_HEADER 4
+#define BTN_COPY_RESULT 5
+#define LB_COPY_AREA 6
+#define ED_COPY_AREA 7
+#define RB_COPY_AREA 8
#define FL_OPTIONS 9
-#define FT_DBAREA_LABEL 10
-#define FT_DBAREA 11
-#define BTN_DEST_PERS 12
+#define FT_DBAREA_LABEL 10
+#define FT_DBAREA 11
+#define BTN_DEST_PERS 12
// Filter:
-#define FT_OP 20
-#define FT_FIELD 21
-#define FT_COND 22
-#define FT_VAL 23
-#define LB_FIELD1 24
-#define LB_FIELD2 25
-#define LB_FIELD3 26
-#define LB_OP1 27
-#define LB_OP2 28
-#define LB_COND1 29
-#define LB_COND2 30
-#define LB_COND3 31
-#define ED_VAL1 32
-#define ED_VAL2 33
-#define ED_VAL3 34
+#define FT_OP 20
+#define FT_FIELD 21
+#define FT_COND 22
+#define FT_VAL 23
+#define LB_FIELD1 24
+#define LB_FIELD2 25
+#define LB_FIELD3 26
+#define LB_OP1 27
+#define LB_OP2 28
+#define LB_COND1 29
+#define LB_COND2 30
+#define LB_COND3 31
+#define ED_VAL1 32
+#define ED_VAL2 33
+#define ED_VAL3 34
#define FL_CRITERIA 35
#define FL_SEPARATOR 36
-#define LB_OP3 37
-#define LB_FIELD4 38
-#define LB_COND4 39
-#define ED_VAL4 40
+#define LB_OP3 37
+#define LB_FIELD4 38
+#define LB_COND4 39
+#define ED_VAL4 40
#define LB_SCROLL 41
-#define LB_OP4 42
+#define LB_OP4 42
// Spezialfilter
-#define FT_CRITERIA_AREA 50
-#define LB_CRITERIA_AREA 51
-#define ED_CRITERIA_AREA 52
-#define RB_CRITERIA_AREA 53
+#define FT_CRITERIA_AREA 50
+#define LB_CRITERIA_AREA 51
+#define ED_CRITERIA_AREA 52
+#define RB_CRITERIA_AREA 53
diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx
index 92e3833dff7d..9e1129f265f7 100644
--- a/sc/source/ui/inc/foptmgr.hxx
+++ b/sc/source/ui/inc/foptmgr.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,60 +59,60 @@ class ScViewData;
class ScFilterOptionsMgr
{
public:
- ScFilterOptionsMgr( Dialog* ptrDlg,
- ScViewData* ptrViewData,
- const ScQueryParam& refQueryData,
- MoreButton& refBtnMore,
- CheckBox& refBtnCase,
- CheckBox& refBtnRegExp,
- CheckBox& refBtnHeader,
- CheckBox& refBtnUnique,
- CheckBox& refBtnCopyResult,
- CheckBox& refBtnDestPers,
- ListBox& refLbCopyArea,
- Edit& refEdCopyArea,
- formula::RefButton& refRbCopyArea,
- FixedText& refFtDbAreaLabel,
- FixedInfo& refFtDbArea,
+ ScFilterOptionsMgr( Dialog* ptrDlg,
+ ScViewData* ptrViewData,
+ const ScQueryParam& refQueryData,
+ MoreButton& refBtnMore,
+ CheckBox& refBtnCase,
+ CheckBox& refBtnRegExp,
+ CheckBox& refBtnHeader,
+ CheckBox& refBtnUnique,
+ CheckBox& refBtnCopyResult,
+ CheckBox& refBtnDestPers,
+ ListBox& refLbCopyArea,
+ Edit& refEdCopyArea,
+ formula::RefButton& refRbCopyArea,
+ FixedText& refFtDbAreaLabel,
+ FixedInfo& refFtDbArea,
FixedLine& refFlOptions,
- const String& refStrNoName,
- const String& refStrUndefined );
+ const String& refStrNoName,
+ const String& refStrUndefined );
~ScFilterOptionsMgr();
- BOOL VerifyPosStr ( const String& rPosStr ) const;
+ BOOL VerifyPosStr ( const String& rPosStr ) const;
private:
- Dialog* pDlg;
- ScViewData* pViewData;
- ScDocument* pDoc;
-
- MoreButton& rBtnMore;
- CheckBox& rBtnCase;
- CheckBox& rBtnRegExp;
- CheckBox& rBtnHeader;
- CheckBox& rBtnUnique;
- CheckBox& rBtnCopyResult;
- CheckBox& rBtnDestPers;
- ListBox& rLbCopyPos;
- Edit& rEdCopyPos;
- formula::RefButton& rRbCopyPos;
- FixedText& rFtDbAreaLabel;
- FixedInfo& rFtDbArea;
+ Dialog* pDlg;
+ ScViewData* pViewData;
+ ScDocument* pDoc;
+
+ MoreButton& rBtnMore;
+ CheckBox& rBtnCase;
+ CheckBox& rBtnRegExp;
+ CheckBox& rBtnHeader;
+ CheckBox& rBtnUnique;
+ CheckBox& rBtnCopyResult;
+ CheckBox& rBtnDestPers;
+ ListBox& rLbCopyPos;
+ Edit& rEdCopyPos;
+ formula::RefButton& rRbCopyPos;
+ FixedText& rFtDbAreaLabel;
+ FixedInfo& rFtDbArea;
FixedLine& rFlOptions;
- const String& rStrNoName;
- const String& rStrUndefined;
+ const String& rStrNoName;
+ const String& rStrUndefined;
- const ScQueryParam& rQueryData;
+ const ScQueryParam& rQueryData;
#ifdef _FOPTMGR_CXX
private:
void Init();
// Handler:
- DECL_LINK( EdPosModifyHdl, Edit* );
- DECL_LINK( LbPosSelHdl, ListBox* );
- DECL_LINK( BtnCopyResultHdl, CheckBox* );
+ DECL_LINK( EdPosModifyHdl, Edit* );
+ DECL_LINK( LbPosSelHdl, ListBox* );
+ DECL_LINK( BtnCopyResultHdl, CheckBox* );
#endif
};
diff --git a/sc/source/ui/inc/formatsh.hxx b/sc/source/ui/inc/formatsh.hxx
index e45fb99c54ef..e22d492da0ea 100644
--- a/sc/source/ui/inc/formatsh.hxx
+++ b/sc/source/ui/inc/formatsh.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +41,7 @@ class ScFormatShell: public SfxShell
protected:
- ScViewData* GetViewData(){return pViewData;}
+ ScViewData* GetViewData(){return pViewData;}
const ScViewData* GetViewData() const {return pViewData;}
public:
@@ -50,24 +50,24 @@ public:
SFX_DECL_INTERFACE(SCID_FORMAT_SHELL)
ScFormatShell(ScViewData* pData);
- virtual ~ScFormatShell();
+ virtual ~ScFormatShell();
- void ExecuteNumFormat( SfxRequest& rReq );
- void GetNumFormatState( SfxItemSet& rSet );
+ void ExecuteNumFormat( SfxRequest& rReq );
+ void GetNumFormatState( SfxItemSet& rSet );
- void ExecuteAttr( SfxRequest& rReq );
- void GetAttrState( SfxItemSet& rSet );
+ void ExecuteAttr( SfxRequest& rReq );
+ void GetAttrState( SfxItemSet& rSet );
- void ExecuteAlignment( SfxRequest& rReq );
+ void ExecuteAlignment( SfxRequest& rReq );
- void ExecuteTextAttr( SfxRequest& rReq );
- void GetTextAttrState( SfxItemSet& rSet );
+ void ExecuteTextAttr( SfxRequest& rReq );
+ void GetTextAttrState( SfxItemSet& rSet );
- void GetAlignState( SfxItemSet& rSet );
- void GetBorderState( SfxItemSet& rSet );
+ void GetAlignState( SfxItemSet& rSet );
+ void GetBorderState( SfxItemSet& rSet );
- void ExecuteStyle( SfxRequest& rReq );
- void GetStyleState( SfxItemSet& rSet );
+ void ExecuteStyle( SfxRequest& rReq );
+ void GetStyleState( SfxItemSet& rSet );
void ExecuteTextDirection( SfxRequest& rReq );
void GetTextDirectionState( SfxItemSet& rSet );
diff --git a/sc/source/ui/inc/formdata.hxx b/sc/source/ui/inc/formdata.hxx
index 72c7862a007b..6da17c3bc591 100644
--- a/sc/source/ui/inc/formdata.hxx
+++ b/sc/source/ui/inc/formdata.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -42,22 +42,22 @@ public:
ScFormEditData();
virtual ~ScFormEditData();
- ScInputHandler* GetInputHandler() { return pInputHandler;}
- ScDocShell* GetDocShell() { return pScDocShell;}
+ ScInputHandler* GetInputHandler() { return pInputHandler;}
+ ScDocShell* GetDocShell() { return pScDocShell;}
- void SetInputHandler(ScInputHandler* pHdl) { pInputHandler=pHdl;}
- void SetDocShell(ScDocShell* pSds) { pScDocShell=pSds;}
+ void SetInputHandler(ScInputHandler* pHdl) { pInputHandler=pHdl;}
+ void SetDocShell(ScDocShell* pSds) { pScDocShell=pSds;}
- virtual void SaveValues();
+ virtual void SaveValues();
private:
ScFormEditData( const ScFormEditData& );
-// const ScFormEditData& operator=( const ScFormEditData& r );
+// const ScFormEditData& operator=( const ScFormEditData& r );
- ScInputHandler* pInputHandler;
- ScDocShell* pScDocShell;
+ ScInputHandler* pInputHandler;
+ ScDocShell* pScDocShell;
};
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index f863662f7cd0..9896dd0a2aa4 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 SC_FORMULA_HXX
#include "anyrefdg.hxx"
-#include "global.hxx" // ScAddress
+#include "global.hxx" // ScAddress
#include <svtools/stdctrl.hxx>
#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
@@ -68,12 +68,12 @@ class ScFormulaDlg : public formula::FormulaDlg,
public formula::IFormulaEditorHelper
{
ScFormulaReferenceHelper m_aHelper;
- ScFormulaCell* pCell;
+ ScFormulaCell* pCell;
::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser> m_xParser;
::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> m_xOpCodeMapper;
- static ScDocument* pDoc;
- static ScAddress aCursorPos;
+ static ScDocument* pDoc;
+ static ScAddress aCursorPos;
public:
ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
Window* pParent, ScViewData* pViewData ,formula::IFunctionManager* _pFunctionMgr);
@@ -84,7 +84,7 @@ public:
virtual void fill();
virtual bool calculateValue(const String& _sExpression,String& _rResult);
virtual void doClose(BOOL _bOk);
- virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc);
+ virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc);
virtual void showReference(const String& _sFormula);
virtual void dispatch(BOOL _bOK,BOOL _bMartixChecked);
virtual void setDispatcherLock( BOOL bLock );
@@ -104,7 +104,7 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const;
virtual ::com::sun::star::table::CellAddress getReferencePosition() const;
- virtual BOOL Close();
+ virtual BOOL Close();
// sc::IAnyRefDialog
virtual void ShowReference(const String& _sRef);
@@ -124,9 +124,9 @@ public:
protected:
virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
- ULONG FindFocusWin(Window *pWin);
- void SaveLRUEntry(const ScFuncDesc* pFuncDesc);
- void HighlightFunctionParas(const String& aFormula);
+ ULONG FindFocusWin(Window *pWin);
+ void SaveLRUEntry(const ScFuncDesc* pFuncDesc);
+ void HighlightFunctionParas(const String& aFormula);
BOOL IsInputHdl(ScInputHandler* pHdl);
ScInputHandler* GetNextInputHandler(ScDocShell* pDocShell,PtrTabViewShell* ppViewSh);
diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx
index 686f2a00ae5b..de0918618c45 100644
--- a/sc/source/ui/inc/fuconarc.hxx
+++ b/sc/source/ui/inc/fuconarc.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -49,8 +49,8 @@ class FuConstArc : public FuConstruct
virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate(); // Function aktivieren
+ virtual void Deactivate(); // Function deaktivieren
// #98185# Create default drawing objects via keyboard
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
@@ -58,5 +58,5 @@ class FuConstArc : public FuConstruct
-#endif // _SD_FUCONARC_HXX
+#endif // _SD_FUCONARC_HXX
diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx
index e6ecbfb2e2c3..b20043a91ec8 100644
--- a/sc/source/ui/inc/fuconcustomshape.hxx
+++ b/sc/source/ui/inc/fuconcustomshape.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +47,8 @@ public:
virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate(); // Function aktivieren
+ virtual void Deactivate(); // Function deaktivieren
// #98185# Create default drawing objects via keyboard
virtual SdrObject* CreateDefaultObject( const sal_uInt16 nID, const Rectangle& rRectangle );
diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx
index 3a27ffcc2f69..b96c20562233 100644
--- a/sc/source/ui/inc/fuconpol.hxx
+++ b/sc/source/ui/inc/fuconpol.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +51,13 @@ class FuConstPolygon : public FuConstruct
virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate(); // Function aktivieren
+ virtual void Deactivate(); // Function deaktivieren
// #98185# Create default drawing objects via keyboard
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
};
-#endif // _FUCONPOL_HXX
+#endif // _FUCONPOL_HXX
diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx
index fb609e4a7681..ab8770ab079b 100644
--- a/sc/source/ui/inc/fuconrec.hxx
+++ b/sc/source/ui/inc/fuconrec.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -49,8 +49,8 @@ class FuConstRectangle : public FuConstruct
virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate(); // Function aktivieren
+ virtual void Deactivate(); // Function deaktivieren
// #98185# Create default drawing objects via keyboard
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
@@ -58,5 +58,5 @@ class FuConstRectangle : public FuConstruct
-#endif // _SD_FUCONREC_HXX
+#endif // _SD_FUCONREC_HXX
diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx
index 28b20c7a94df..b0cca7238546 100644
--- a/sc/source/ui/inc/fuconstr.hxx
+++ b/sc/source/ui/inc/fuconstr.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
/************************************************************************/
-#define MIN_FREEHAND_DISTANCE 10
+#define MIN_FREEHAND_DISTANCE 10
/*************************************************************************
@@ -58,10 +58,10 @@ class FuConstruct : public FuDraw
BOOL SimpleMouseButtonUp(const MouseEvent& rMEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate(); // Function aktivieren
+ virtual void Deactivate(); // Function deaktivieren
};
-#endif // _SD_FUCONSTR_HXX
+#endif // _SD_FUCONSTR_HXX
diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx
index ffe2c1e9722b..b9f148f2f1c5 100644
--- a/sc/source/ui/inc/fuconuno.hxx
+++ b/sc/source/ui/inc/fuconuno.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +54,8 @@ public:
virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate(); // Function aktivieren
+ virtual void Deactivate(); // Function deaktivieren
// #98185# Create default drawing objects via keyboard
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
@@ -63,5 +63,5 @@ public:
-#endif // _SD_FUCONCTL_HXX
+#endif // _SD_FUCONCTL_HXX
diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx
index 2344ca629c2f..5333b0d13ce0 100644
--- a/sc/source/ui/inc/fudraw.hxx
+++ b/sc/source/ui/inc/fudraw.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ class FuDraw : public FuPoor
BOOL IsSizingOrMovingNote( const MouseEvent& rMEvt ) const;
private:
- void DoModifiers(const MouseEvent& rMEvt);
- void ResetModifiers();
+ void DoModifiers(const MouseEvent& rMEvt);
+ void ResetModifiers();
};
-#endif // _SD_FUDRAW_HXX
+#endif // _SD_FUDRAW_HXX
diff --git a/sc/source/ui/inc/fuedipo.hxx b/sc/source/ui/inc/fuedipo.hxx
index 5138a134cc2e..49acc7cd40dd 100644
--- a/sc/source/ui/inc/fuedipo.hxx
+++ b/sc/source/ui/inc/fuedipo.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +50,11 @@ class FuEditPoints : public FuDraw
virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate(); // Function aktivieren
+ virtual void Deactivate(); // Function deaktivieren
};
-#endif // _SD_FUEDIPO_HXX
+#endif // _SD_FUEDIPO_HXX
diff --git a/sc/source/ui/inc/fuinsert.hxx b/sc/source/ui/inc/fuinsert.hxx
index 4dda7cb2b5ba..9580ef400a25 100644
--- a/sc/source/ui/inc/fuinsert.hxx
+++ b/sc/source/ui/inc/fuinsert.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +38,8 @@ class FuInsertGraphic : public FuPoor
SdrModel* pDoc, SfxRequest& rReq);
virtual ~FuInsertGraphic();
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate(); // Function aktivieren
+ virtual void Deactivate(); // Function deaktivieren
};
/************************************************************************/
@@ -51,8 +51,8 @@ class FuInsertOLE : public FuPoor
SdrModel* pDoc, SfxRequest& rReq);
virtual ~FuInsertOLE();
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate(); // Function aktivieren
+ virtual void Deactivate(); // Function deaktivieren
};
/************************************************************************/
@@ -64,8 +64,8 @@ class FuInsertChart : public FuPoor
SdrModel* pDoc, SfxRequest& rReq);
virtual ~FuInsertChart();
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate(); // Function aktivieren
+ virtual void Deactivate(); // Function deaktivieren
};
/************************************************************************/
@@ -77,9 +77,9 @@ class FuInsertMedia : public FuPoor
SdrModel* pDoc, SfxRequest& rReq);
virtual ~FuInsertMedia();
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate(); // Function aktivieren
+ virtual void Deactivate(); // Function deaktivieren
};
-#endif // _SD_FUINSERT_HXX
+#endif // _SD_FUINSERT_HXX
diff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxx
index fcadc54768e8..0bfa32631e60 100644
--- a/sc/source/ui/inc/fumark.hxx
+++ b/sc/source/ui/inc/fumark.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 SC_FUMARK_HXX
#include "fupoor.hxx"
-#include "rangelst.hxx" // ScRangeListRef
+#include "rangelst.hxx" // ScRangeListRef
/*************************************************************************
@@ -41,11 +41,11 @@
class FuMarkRect : public FuPoor
{
protected:
- Point aBeginPos;
- Rectangle aZoomRect;
- BOOL bVisible;
- BOOL bStartDrag;
- ScRangeListRef aSourceRange;
+ Point aBeginPos;
+ Rectangle aZoomRect;
+ BOOL bVisible;
+ BOOL bStartDrag;
+ ScRangeListRef aSourceRange;
public:
FuMarkRect(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx
index d8b5c7796971..f9a24438aced 100644
--- a/sc/source/ui/inc/funcpage.hxx
+++ b/sc/source/ui/inc/funcpage.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 SC_FUNCPAGE_HXX
#include "funcutl.hxx"
-#include "global.hxx" // ScAddress
+#include "global.hxx" // ScAddress
#include <svtools/stdctrl.hxx>
#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
@@ -65,8 +65,8 @@ class ScListBox : public ListBox
{
protected:
- virtual void KeyInput( const KeyEvent& rKEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual void KeyInput( const KeyEvent& rKEvt );
+ virtual long PreNotify( NotifyEvent& rNEvt );
public:
ScListBox( Window* pParent, const ResId& rResId );
@@ -80,15 +80,15 @@ class ScFuncPage : public TabPage
{
private:
- Link aDoubleClickLink;
- Link aSelectionLink;
- FixedText aFtCategory;
- ListBox aLbCategory;
- FixedText aFtFunction;
- ScListBox aLbFunction;
- ImageButton aIBFunction;
+ Link aDoubleClickLink;
+ Link aSelectionLink;
+ FixedText aFtCategory;
+ ListBox aLbCategory;
+ FixedText aFtFunction;
+ ScListBox aLbFunction;
+ ImageButton aIBFunction;
- const ScFuncDesc* aLRUList[LRU_MAX];
+ const ScFuncDesc* aLRUList[LRU_MAX];
DECL_LINK( SelHdl, ListBox* );
@@ -96,24 +96,24 @@ private:
protected:
- void UpdateFunctionList();
- void InitLRUList();
+ void UpdateFunctionList();
+ void InitLRUList();
public:
ScFuncPage( Window* pParent);
- void SetCategory(USHORT nCat);
- void SetFunction(USHORT nFunc);
- void SetFocus();
- USHORT GetCategory();
- USHORT GetFunction();
- USHORT GetFunctionEntryCount();
+ void SetCategory(USHORT nCat);
+ void SetFunction(USHORT nFunc);
+ void SetFocus();
+ USHORT GetCategory();
+ USHORT GetFunction();
+ USHORT GetFunctionEntryCount();
- USHORT GetFuncPos(const ScFuncDesc*);
- const ScFuncDesc* GetFuncDesc( USHORT nPos ) const;
- String GetSelFunctionName() const;
+ USHORT GetFuncPos(const ScFuncDesc*);
+ const ScFuncDesc* GetFuncDesc( USHORT nPos ) const;
+ String GetSelFunctionName() const;
void SetDoubleClickHdl( const Link& rLink ) { aDoubleClickLink = rLink; }
const Link& GetDoubleClickHdl() const { return aDoubleClickLink; }
diff --git a/sc/source/ui/inc/funcutl.hxx b/sc/source/ui/inc/funcutl.hxx
index 715c9d36a101..b5fd76f55628 100644
--- a/sc/source/ui/inc/funcutl.hxx
+++ b/sc/source/ui/inc/funcutl.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
#include <vcl/fixed.hxx>
#endif
#include <svtools/svmedit.hxx>
-#include "anyrefdg.hxx" // formula::RefButton
+#include "anyrefdg.hxx" // formula::RefButton
//============================================================================
@@ -46,14 +46,14 @@ class ValWnd : public Window
public:
ValWnd( Window* pParent, const ResId& rId );
- void SetValue( const String& rStrVal );
+ void SetValue( const String& rStrVal );
protected:
- virtual void Paint( const Rectangle& rRect );
+ virtual void Paint( const Rectangle& rRect );
private:
- String aStrValue;
- Rectangle aRectOut;
+ String aStrValue;
+ Rectangle aRectOut;
};
@@ -64,18 +64,18 @@ class ScEditBox : public Control
{
private:
- MultiLineEdit* pMEdit;
- Link aSelChangedLink;
- Selection aOldSel;
- BOOL bMouseFlag;
+ MultiLineEdit* pMEdit;
+ Link aSelChangedLink;
+ Selection aOldSel;
+ BOOL bMouseFlag;
DECL_LINK( ChangedHdl, ScEditBox* );
protected:
- virtual long PreNotify( NotifyEvent& rNEvt );
- virtual void SelectionChanged();
- virtual void Resize();
- virtual void GetFocus();
+ virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual void SelectionChanged();
+ virtual void Resize();
+ virtual void GetFocus();
public:
@@ -83,12 +83,12 @@ public:
~ScEditBox();
- MultiLineEdit* GetEdit() {return pMEdit;}
+ MultiLineEdit* GetEdit() {return pMEdit;}
void SetSelChangedHdl( const Link& rLink ) { aSelChangedLink = rLink; }
const Link& GetSelChangedHdl() const { return aSelChangedLink; }
- void UpdateOldSel();
+ void UpdateOldSel();
};
@@ -101,17 +101,17 @@ class ArgEdit : public formula::RefEdit
public:
ArgEdit( Window* pParent, const ResId& rResId );
- void Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit,
+ void Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit,
ScrollBar& rArgSlider, USHORT nArgCount );
protected:
- virtual void KeyInput( const KeyEvent& rKEvt );
+ virtual void KeyInput( const KeyEvent& rKEvt );
private:
- ArgEdit* pEdPrev;
- ArgEdit* pEdNext;
- ScrollBar* pSlider;
- USHORT nArgs;
+ ArgEdit* pEdPrev;
+ ArgEdit* pEdNext;
+ ScrollBar* pSlider;
+ USHORT nArgs;
};
@@ -122,53 +122,53 @@ class ArgInput
{
private:
- Link aFxClickLink;
- Link aRefClickLink;
- Link aFxFocusLink;
- Link aRefFocusLink;
- Link aEdFocusLink;
- Link aEdModifyLink;
-
- FixedText* pFtArg;
- ImageButton* pBtnFx;
- ArgEdit* pEdArg;
- formula::RefButton* pRefBtn;
-
- DECL_LINK( FxBtnClickHdl, ImageButton* );
- DECL_LINK( RefBtnClickHdl,formula::RefButton* );
- DECL_LINK( FxBtnFocusHdl, ImageButton* );
- DECL_LINK( RefBtnFocusHdl,formula::RefButton* );
- DECL_LINK( EdFocusHdl, ArgEdit* );
- DECL_LINK( EdModifyHdl,ArgEdit* );
+ Link aFxClickLink;
+ Link aRefClickLink;
+ Link aFxFocusLink;
+ Link aRefFocusLink;
+ Link aEdFocusLink;
+ Link aEdModifyLink;
+
+ FixedText* pFtArg;
+ ImageButton* pBtnFx;
+ ArgEdit* pEdArg;
+ formula::RefButton* pRefBtn;
+
+ DECL_LINK( FxBtnClickHdl, ImageButton* );
+ DECL_LINK( RefBtnClickHdl,formula::RefButton* );
+ DECL_LINK( FxBtnFocusHdl, ImageButton* );
+ DECL_LINK( RefBtnFocusHdl,formula::RefButton* );
+ DECL_LINK( EdFocusHdl, ArgEdit* );
+ DECL_LINK( EdModifyHdl,ArgEdit* );
protected:
- virtual void FxClick();
- virtual void RefClick();
- virtual void FxFocus();
- virtual void RefFocus();
- virtual void EdFocus();
- virtual void EdModify();
+ virtual void FxClick();
+ virtual void RefClick();
+ virtual void FxFocus();
+ virtual void RefFocus();
+ virtual void EdFocus();
+ virtual void EdModify();
public:
ArgInput();
- void InitArgInput ( FixedText* pftArg,
- ImageButton* pbtnFx,
- ArgEdit* pedArg,
- formula::RefButton* prefBtn);
+ void InitArgInput ( FixedText* pftArg,
+ ImageButton* pbtnFx,
+ ArgEdit* pedArg,
+ formula::RefButton* prefBtn);
- void SetArgName(const String &aArg);
- String GetArgName();
- void SetArgNameFont(const Font&);
+ void SetArgName(const String &aArg);
+ String GetArgName();
+ void SetArgNameFont(const Font&);
- void SetArgVal(const String &aVal);
- String GetArgVal();
+ void SetArgVal(const String &aVal);
+ String GetArgVal();
- void SetArgSelection (const Selection& rSel );
+ void SetArgSelection (const Selection& rSel );
- ArgEdit* GetArgEdPtr() {return pEdArg;}
+ ArgEdit* GetArgEdPtr() {return pEdArg;}
void SetFxClickHdl( const Link& rLink ) { aFxClickLink = rLink; }
diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx
index 6d9b7ae2af5a..96d27913fae5 100644
--- a/sc/source/ui/inc/fupoor.hxx
+++ b/sc/source/ui/inc/fupoor.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +41,10 @@ class Dialog;
// #98185# Create default drawing objects via keyboard
class SdrObject;
-// Return-Werte fuer Command
-#define SC_CMD_NONE 0
-#define SC_CMD_USED 1
-#define SC_CMD_IGNORE 2
+// Return-Werte fuer Command
+#define SC_CMD_NONE 0
+#define SC_CMD_USED 1
+#define SC_CMD_IGNORE 2
/*************************************************************************
|*
@@ -55,28 +55,28 @@ class SdrObject;
class FuPoor
{
protected:
- ScDrawView* pView;
- ScTabViewShell* pViewShell;
- Window* pWindow;
- SdrModel* pDrDoc;
+ ScDrawView* pView;
+ ScTabViewShell* pViewShell;
+ Window* pWindow;
+ SdrModel* pDrDoc;
- SfxRequest aSfxRequest;
- Dialog* pDialog;
+ SfxRequest aSfxRequest;
+ Dialog* pDialog;
- Timer aScrollTimer; // fuer Autoscrolling
+ Timer aScrollTimer; // fuer Autoscrolling
DECL_LINK( ScrollHdl, Timer * );
void ForceScroll(const Point& aPixPos);
- Timer aDragTimer; // fuer Drag&Drop
+ Timer aDragTimer; // fuer Drag&Drop
DECL_LINK( DragTimerHdl, Timer * );
DECL_LINK( DragHdl, void * );
- BOOL bIsInDragMode;
- Point aMDPos; // Position von MouseButtonDown
+ BOOL bIsInDragMode;
+ Point aMDPos; // Position von MouseButtonDown
// #95491# member to hold state of the mouse buttons for creation
// of own MouseEvents (like in ScrollHdl)
private:
- sal_uInt16 mnCode;
+ sal_uInt16 mnCode;
public:
FuPoor(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
@@ -105,19 +105,19 @@ public:
virtual BYTE Command(const CommandEvent& rCEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate(); // Function aktivieren
+ virtual void Deactivate(); // Function deaktivieren
- virtual void ScrollStart() {} // diese Funktionen werden von
- virtual void ScrollEnd() {} // ForceScroll aufgerufen
+ virtual void ScrollStart() {} // diese Funktionen werden von
+ virtual void ScrollEnd() {} // ForceScroll aufgerufen
void SetWindow(Window* pWin) { pWindow = pWin; }
USHORT GetSlotID() const { return( aSfxRequest.GetSlot() ); }
- BOOL IsDetectiveHit( const Point& rLogicPos );
+ BOOL IsDetectiveHit( const Point& rLogicPos );
- void StopDragTimer();
+ void StopDragTimer();
// #98185# Create default drawing objects via keyboard
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
@@ -132,5 +132,5 @@ public:
-#endif // _SD_FUPOOR_HXX
+#endif // _SD_FUPOOR_HXX
diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx
index c12b5739d61c..c168d025e383 100644
--- a/sc/source/ui/inc/fusel.hxx
+++ b/sc/source/ui/inc/fusel.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,18 +58,18 @@ public:
virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
virtual BYTE Command(const CommandEvent& rCEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate(); // Function aktivieren
+ virtual void Deactivate(); // Function deaktivieren
void ActivateNoteHandles(SdrObject* pObj);
protected:
-// Outliner* pOutliner;
-// OutlinerView* pOutlinerView;
- BOOL bVCAction;
+// Outliner* pOutliner;
+// OutlinerView* pOutlinerView;
+ BOOL bVCAction;
private:
- BOOL TestDetective( SdrPageView* pPV, const Point& rPos ); // -> fusel2
+ BOOL TestDetective( SdrPageView* pPV, const Point& rPos ); // -> fusel2
bool IsNoteCaptionMarked() const;
bool IsNoteCaptionClicked( const Point& rPos ) const;
@@ -77,5 +77,5 @@ private:
-#endif // _SD_FUSEL_HXX
+#endif // _SD_FUSEL_HXX
diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx
index 41a41b054554..1a01abcf59f6 100644
--- a/sc/source/ui/inc/futext.hxx
+++ b/sc/source/ui/inc/futext.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 SdrOutliner;
class FuText : public FuConstruct
{
protected:
-// USHORT nOldObjectBar;
- SdrTextObj* pTextObj;
+// USHORT nOldObjectBar;
+ SdrTextObj* pTextObj;
public:
FuText(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView,
@@ -56,17 +56,17 @@ public:
virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate(); // Function aktivieren
+ virtual void Deactivate(); // Function deaktivieren
virtual void ForcePointer(const MouseEvent* pMEvt);
virtual void SelectionHasChanged();
- void SetInEditMode( SdrObject* pObj = NULL, const Point* pMousePixel = NULL,
+ void SetInEditMode( SdrObject* pObj = NULL, const Point* pMousePixel = NULL,
BOOL bCursorToEnd = FALSE, const KeyEvent* pInitialKey = NULL );
- void StopEditMode(BOOL bTextDirection = FALSE);
- void StopDragMode(SdrObject* pObject);
+ void StopEditMode(BOOL bTextDirection = FALSE);
+ void StopDragMode(SdrObject* pObject);
// #98185# Create default drawing objects via keyboard
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
diff --git a/sc/source/ui/inc/graphsh.hxx b/sc/source/ui/inc/graphsh.hxx
index db9d04096142..5886eee44931 100644
--- a/sc/source/ui/inc/graphsh.hxx
+++ b/sc/source/ui/inc/graphsh.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +45,13 @@ public:
SFX_DECL_INTERFACE(SCID_GRAPHIC_SHELL)
ScGraphicShell(ScViewData* pData);
- virtual ~ScGraphicShell();
+ virtual ~ScGraphicShell();
- void Execute(SfxRequest& rReq);
- void GetAttrState(SfxItemSet &rSet);
+ void Execute(SfxRequest& rReq);
+ void GetAttrState(SfxItemSet &rSet);
- void ExecuteFilter(SfxRequest& rReq);
- void GetFilterState(SfxItemSet &rSet);
+ void ExecuteFilter(SfxRequest& rReq);
+ void GetFilterState(SfxItemSet &rSet);
};
#endif
diff --git a/sc/source/ui/inc/gridmerg.hxx b/sc/source/ui/inc/gridmerg.hxx
index dd656b948a6b..c18532e265ff 100644
--- a/sc/source/ui/inc/gridmerg.hxx
+++ b/sc/source/ui/inc/gridmerg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,26 +35,26 @@ class OutputDevice;
class ScGridMerger
{
private:
- OutputDevice* pDev;
- long nOneX;
- long nOneY;
- long nFixStart;
- long nFixEnd;
- long nVarStart;
- long nVarDiff;
- long nCount;
- BOOL bVertical;
- BOOL bOptimize;
+ OutputDevice* pDev;
+ long nOneX;
+ long nOneY;
+ long nFixStart;
+ long nFixEnd;
+ long nVarStart;
+ long nVarDiff;
+ long nCount;
+ BOOL bVertical;
+ BOOL bOptimize;
- void AddLine( long nStart, long nEnd, long nPos );
+ void AddLine( long nStart, long nEnd, long nPos );
public:
ScGridMerger( OutputDevice* pOutDev, long nOnePixelX, long nOnePixelY );
~ScGridMerger();
- void AddHorLine( long nX1, long nX2, long nY );
- void AddVerLine( long nX, long nY1, long nY2 );
- void Flush();
+ void AddHorLine( long nX1, long nX2, long nY );
+ void AddVerLine( long nX, long nY1, long nY2 );
+ void Flush();
};
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index a2283bf2b7de..368db6bbf78f 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,36 +59,36 @@ class SdrHdlList;
class ScTransferObj;
struct SpellCallbackInfo;
- // Maus-Status (nMouseStatus)
+ // Maus-Status (nMouseStatus)
-#define SC_GM_NONE 0
-#define SC_GM_TABDOWN 1
-#define SC_GM_DBLDOWN 2
-#define SC_GM_FILTER 3
-#define SC_GM_IGNORE 4
-#define SC_GM_WATERUNDO 5
-#define SC_GM_URLDOWN 6
+#define SC_GM_NONE 0
+#define SC_GM_TABDOWN 1
+#define SC_GM_DBLDOWN 2
+#define SC_GM_FILTER 3
+#define SC_GM_IGNORE 4
+#define SC_GM_WATERUNDO 5
+#define SC_GM_URLDOWN 6
- // Page-Drag-Modus
+ // Page-Drag-Modus
-#define SC_PD_NONE 0
-#define SC_PD_RANGE_L 1
-#define SC_PD_RANGE_R 2
-#define SC_PD_RANGE_T 4
-#define SC_PD_RANGE_B 8
-#define SC_PD_RANGE_TL (SC_PD_RANGE_T|SC_PD_RANGE_L)
-#define SC_PD_RANGE_TR (SC_PD_RANGE_T|SC_PD_RANGE_R)
-#define SC_PD_RANGE_BL (SC_PD_RANGE_B|SC_PD_RANGE_L)
-#define SC_PD_RANGE_BR (SC_PD_RANGE_B|SC_PD_RANGE_R)
-#define SC_PD_BREAK_H 16
-#define SC_PD_BREAK_V 32
+#define SC_PD_NONE 0
+#define SC_PD_RANGE_L 1
+#define SC_PD_RANGE_R 2
+#define SC_PD_RANGE_T 4
+#define SC_PD_RANGE_B 8
+#define SC_PD_RANGE_TL (SC_PD_RANGE_T|SC_PD_RANGE_L)
+#define SC_PD_RANGE_TR (SC_PD_RANGE_T|SC_PD_RANGE_R)
+#define SC_PD_RANGE_BL (SC_PD_RANGE_B|SC_PD_RANGE_L)
+#define SC_PD_RANGE_BR (SC_PD_RANGE_B|SC_PD_RANGE_R)
+#define SC_PD_BREAK_H 16
+#define SC_PD_BREAK_V 32
class ScHideTextCursor
{
private:
- ScViewData* pViewData;
- ScSplitPos eWhich;
+ ScViewData* pViewData;
+ ScSplitPos eWhich;
public:
ScHideTextCursor( ScViewData* pData, ScSplitPos eW );
@@ -101,12 +101,12 @@ namespace sdr { namespace overlay { class OverlayObjectList; }}
class ScGridWindow : public Window, public DropTargetHelper, public DragSourceHelper
{
- // ScFilterListBox wird immer fuer Auswahlliste benutzt
+ // ScFilterListBox wird immer fuer Auswahlliste benutzt
friend class ScFilterListBox;
private:
// #114409#
- ::sdr::overlay::OverlayObjectList* mpOOCursors;
+ ::sdr::overlay::OverlayObjectList* mpOOCursors;
::sdr::overlay::OverlayObjectList* mpOOSelection;
::sdr::overlay::OverlayObjectList* mpOOAutoFill;
::sdr::overlay::OverlayObjectList* mpOODragRect;
@@ -115,9 +115,9 @@ private:
::boost::shared_ptr<Rectangle> mpAutoFillRect;
- /**
- * Stores current visible column and row ranges, used to avoid expensive
- * operations on objects that are outside visible area.
+ /**
+ * Stores current visible column and row ranges, used to avoid expensive
+ * operations on objects that are outside visible area.
*/
struct VisibleRange
{
@@ -133,185 +133,185 @@ private:
VisibleRange maVisibleRange;
private:
- ScViewData* pViewData;
- ScSplitPos eWhich;
- ScHSplitPos eHWhich;
- ScVSplitPos eVWhich;
+ ScViewData* pViewData;
+ ScSplitPos eWhich;
+ ScHSplitPos eHWhich;
+ ScVSplitPos eVWhich;
- ScNoteMarker* pNoteMarker;
+ ScNoteMarker* pNoteMarker;
- ScFilterListBox* pFilterBox;
- FloatingWindow* pFilterFloat;
+ ScFilterListBox* pFilterBox;
+ FloatingWindow* pFilterFloat;
::std::auto_ptr<ScDPFieldPopupWindow> mpDPFieldPopup;
::std::auto_ptr<ScDPFieldButton> mpFilterButton;
- USHORT nCursorHideCount;
+ USHORT nCursorHideCount;
- BOOL bMarking;
+ BOOL bMarking;
- USHORT nButtonDown;
- BOOL bEEMouse; // Edit-Engine hat Maus
- BYTE nMouseStatus;
+ USHORT nButtonDown;
+ BOOL bEEMouse; // Edit-Engine hat Maus
+ BYTE nMouseStatus;
BYTE nNestedButtonState; // track nested button up/down calls
- BOOL bDPMouse; // DataPilot-D&D (neue Pivottabellen)
- long nDPField;
- ScDPObject* pDragDPObj; //! name?
-
- BOOL bRFMouse; // RangeFinder-Drag
- BOOL bRFSize;
- USHORT nRFIndex;
- SCsCOL nRFAddX;
- SCsROW nRFAddY;
-
- USHORT nPagebreakMouse; // Pagebreak-Modus Drag
- SCCOLROW nPagebreakBreak;
- SCCOLROW nPagebreakPrev;
- ScRange aPagebreakSource;
- ScRange aPagebreakDrag;
- BOOL bPagebreakDrawn;
-
- BYTE nPageScript;
-
- long nLastClickX;
- long nLastClickY;
-
- BOOL bDragRect;
- SCCOL nDragStartX;
- SCROW nDragStartY;
- SCCOL nDragEndX;
- SCROW nDragEndY;
+ BOOL bDPMouse; // DataPilot-D&D (neue Pivottabellen)
+ long nDPField;
+ ScDPObject* pDragDPObj; //! name?
+
+ BOOL bRFMouse; // RangeFinder-Drag
+ BOOL bRFSize;
+ USHORT nRFIndex;
+ SCsCOL nRFAddX;
+ SCsROW nRFAddY;
+
+ USHORT nPagebreakMouse; // Pagebreak-Modus Drag
+ SCCOLROW nPagebreakBreak;
+ SCCOLROW nPagebreakPrev;
+ ScRange aPagebreakSource;
+ ScRange aPagebreakDrag;
+ BOOL bPagebreakDrawn;
+
+ BYTE nPageScript;
+
+ long nLastClickX;
+ long nLastClickY;
+
+ BOOL bDragRect;
+ SCCOL nDragStartX;
+ SCROW nDragStartY;
+ SCCOL nDragEndX;
+ SCROW nDragEndY;
InsCellCmd meDragInsertMode;
- USHORT nCurrentPointer;
+ USHORT nCurrentPointer;
- BOOL bIsInScroll;
- BOOL bIsInPaint;
+ BOOL bIsInScroll;
+ BOOL bIsInPaint;
- ScDDComboBoxButton aComboButton;
+ ScDDComboBoxButton aComboButton;
- Point aCurMousePos;
+ Point aCurMousePos;
- USHORT nPaintCount;
- Rectangle aRepaintPixel;
- BOOL bNeedsRepaint;
+ USHORT nPaintCount;
+ Rectangle aRepaintPixel;
+ BOOL bNeedsRepaint;
- BOOL bAutoMarkVisible;
- ScAddress aAutoMarkPos;
+ BOOL bAutoMarkVisible;
+ ScAddress aAutoMarkPos;
- BOOL bListValButton;
- ScAddress aListValPos;
+ BOOL bListValButton;
+ ScAddress aListValPos;
- Rectangle aInvertRect;
+ Rectangle aInvertRect;
DECL_LINK( PopupModeEndHdl, FloatingWindow* );
DECL_LINK( PopupSpellingHdl, SpellCallbackInfo* );
- BOOL TestMouse( const MouseEvent& rMEvt, BOOL bAction );
+ BOOL TestMouse( const MouseEvent& rMEvt, BOOL bAction );
- BOOL DoPageFieldSelection( SCCOL nCol, SCROW nRow );
+ BOOL DoPageFieldSelection( SCCOL nCol, SCROW nRow );
bool DoAutoFilterButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt );
- void DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt );
+ void DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt );
- void DPMouseMove( const MouseEvent& rMEvt );
- void DPMouseButtonUp( const MouseEvent& rMEvt );
- void DPTestMouse( const MouseEvent& rMEvt, BOOL bMove );
+ void DPMouseMove( const MouseEvent& rMEvt );
+ void DPMouseButtonUp( const MouseEvent& rMEvt );
+ void DPTestMouse( const MouseEvent& rMEvt, BOOL bMove );
- /**
- * Check if the mouse click is on a field popup button.
- *
- * @return bool true if the field popup menu has been launched and no
+ /**
+ * Check if the mouse click is on a field popup button.
+ *
+ * @return bool true if the field popup menu has been launched and no
* further mouse event handling is necessary, false otherwise.
*/
bool DPTestFieldPopupArrow(const MouseEvent& rMEvt, const ScAddress& rPos, ScDPObject* pDPObj);
void DPLaunchFieldPopupMenu(
const Point& rScrPos, const Size& rScrSize, const ScAddress& rPos, ScDPObject* pDPObj);
- void RFMouseMove( const MouseEvent& rMEvt, BOOL bUp );
+ void RFMouseMove( const MouseEvent& rMEvt, BOOL bUp );
- void PagebreakMove( const MouseEvent& rMEvt, BOOL bUp );
+ void PagebreakMove( const MouseEvent& rMEvt, BOOL bUp );
- void UpdateDragRect( BOOL bShowRange, const Rectangle& rPosRect );
+ void UpdateDragRect( BOOL bShowRange, const Rectangle& rPosRect );
- BOOL IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab );
- void ExecFilter( ULONG nSel, SCCOL nCol, SCROW nRow,
+ BOOL IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab );
+ void ExecFilter( ULONG nSel, SCCOL nCol, SCROW nRow,
const String& aValue, bool bCheckForDates );
- void FilterSelect( ULONG nSel );
+ void FilterSelect( ULONG nSel );
- void ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr );
+ void ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr );
- void ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelection, const String& rStr );
+ void ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelection, const String& rStr );
- BOOL HasScenarioButton( const Point& rPosPixel, ScRange& rScenRange );
+ BOOL HasScenarioButton( const Point& rPosPixel, ScRange& rScenRange );
- BOOL DropScroll( const Point& rMousePos );
+ BOOL DropScroll( const Point& rMousePos );
- sal_Int8 AcceptPrivateDrop( const AcceptDropEvent& rEvt );
- sal_Int8 ExecutePrivateDrop( const ExecuteDropEvent& rEvt );
- sal_Int8 DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPosX, SCROW nDestPosY,
+ sal_Int8 AcceptPrivateDrop( const AcceptDropEvent& rEvt );
+ sal_Int8 ExecutePrivateDrop( const ExecuteDropEvent& rEvt );
+ sal_Int8 DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPosX, SCROW nDestPosY,
const Point& rLogicPos, sal_Int8 nDndAction );
void HandleMouseButtonDown( const MouseEvent& rMEvt );
- BOOL DrawMouseButtonDown(const MouseEvent& rMEvt);
- BOOL DrawMouseButtonUp(const MouseEvent& rMEvt);
- BOOL DrawMouseMove(const MouseEvent& rMEvt);
- BOOL DrawKeyInput(const KeyEvent& rKEvt);
- BOOL DrawCommand(const CommandEvent& rCEvt);
- BOOL DrawHasMarkedObj();
- void DrawEndAction();
- void DrawMarkDropObj( SdrObject* pObj );
- SdrObject* GetEditObject();
- BOOL IsMyModel(SdrEditView* pSdrView);
- //void DrawStartTimer();
-
- void DrawRedraw( ScOutputData& rOutputData, ScUpdateMode eMode, ULONG nLayer );
+ BOOL DrawMouseButtonDown(const MouseEvent& rMEvt);
+ BOOL DrawMouseButtonUp(const MouseEvent& rMEvt);
+ BOOL DrawMouseMove(const MouseEvent& rMEvt);
+ BOOL DrawKeyInput(const KeyEvent& rKEvt);
+ BOOL DrawCommand(const CommandEvent& rCEvt);
+ BOOL DrawHasMarkedObj();
+ void DrawEndAction();
+ void DrawMarkDropObj( SdrObject* pObj );
+ SdrObject* GetEditObject();
+ BOOL IsMyModel(SdrEditView* pSdrView);
+ //void DrawStartTimer();
+
+ void DrawRedraw( ScOutputData& rOutputData, ScUpdateMode eMode, ULONG nLayer );
void DrawSdrGrid( const Rectangle& rDrawingRect, OutputDevice* pContentDev );
- //BOOL DrawBeforeScroll();
- void DrawAfterScroll(/*BOOL bVal*/);
- //void DrawMarks();
- //BOOL NeedDrawMarks();
- void DrawComboButton( const Point& rCellPos,
- long nCellSizeX,
- long nCellSizeY,
+ //BOOL DrawBeforeScroll();
+ void DrawAfterScroll(/*BOOL bVal*/);
+ //void DrawMarks();
+ //BOOL NeedDrawMarks();
+ void DrawComboButton( const Point& rCellPos,
+ long nCellSizeX,
+ long nCellSizeY,
BOOL bArrowState,
- BOOL bBtnIn = FALSE );
- Rectangle GetListValButtonRect( const ScAddress& rButtonPos );
+ BOOL bBtnIn = FALSE );
+ Rectangle GetListValButtonRect( const ScAddress& rButtonPos );
void DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, OutputDevice* pContentDev );
- BOOL GetEditUrl( const Point& rPos,
+ BOOL GetEditUrl( const Point& rPos,
String* pName=0, String* pUrl=0, String* pTarget=0 );
- BOOL GetEditUrlOrError( BOOL bSpellErr, const Point& rPos,
+ BOOL GetEditUrlOrError( BOOL bSpellErr, const Point& rPos,
String* pName=0, String* pUrl=0, String* pTarget=0 );
- BOOL HitRangeFinder( const Point& rMouse, BOOL& rCorner, USHORT* pIndex = NULL,
+ BOOL HitRangeFinder( const Point& rMouse, BOOL& rCorner, USHORT* pIndex = NULL,
SCsCOL* pAddX = NULL, SCsROW* pAddY = NULL );
- USHORT HitPageBreak( const Point& rMouse, ScRange* pSource = NULL,
+ USHORT HitPageBreak( const Point& rMouse, ScRange* pSource = NULL,
SCCOLROW* pBreak = NULL, SCCOLROW* pPrev = NULL );
- void PasteSelection( const Point& rPosPixel );
+ void PasteSelection( const Point& rPosPixel );
- void SelectForContextMenu( const Point& rPosPixel, SCsCOL nCellX, SCsROW nCellY );
+ void SelectForContextMenu( const Point& rPosPixel, SCsCOL nCellX, SCsROW nCellY );
void GetSelectionRects( ::std::vector< Rectangle >& rPixelRects );
protected:
using Window::Resize;
- virtual void Resize( const Size& rSize );
- virtual void PrePaint();
- virtual void Paint( const Rectangle& rRect );
- virtual void KeyInput(const KeyEvent& rKEvt);
- virtual void GetFocus();
- virtual void LoseFocus();
+ virtual void Resize( const Size& rSize );
+ virtual void PrePaint();
+ virtual void Paint( const Rectangle& rRect );
+ virtual void KeyInput(const KeyEvent& rKEvt);
+ virtual void GetFocus();
+ virtual void LoseFocus();
- virtual void RequestHelp( const HelpEvent& rEvt );
- virtual void Command( const CommandEvent& rCEvt );
+ virtual void RequestHelp( const HelpEvent& rEvt );
+ virtual void Command( const CommandEvent& rCEvt );
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
- virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
+ virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
public:
ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhichPos );
@@ -321,77 +321,77 @@ public:
::sdr::overlay::OverlayManager* getOverlayManager();
void flushOverlayManager();
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
+ virtual void DataChanged( const DataChangedEvent& rDCEvt );
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void MouseButtonUp( const MouseEvent& rMEvt );
- virtual void MouseMove( const MouseEvent& rMEvt );
+ virtual void MouseButtonDown( const MouseEvent& rMEvt );
+ virtual void MouseButtonUp( const MouseEvent& rMEvt );
+ virtual void MouseMove( const MouseEvent& rMEvt );
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual void Tracking( const TrackingEvent& rTEvt );
+ virtual void Tracking( const TrackingEvent& rTEvt );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
- void FakeButtonUp();
+ void FakeButtonUp();
- Point GetMousePosPixel() const;
- void UpdateStatusPosSize();
+ Point GetMousePosPixel() const;
+ void UpdateStatusPosSize();
- void ClickExtern();
+ void ClickExtern();
- void SetPointer( const Pointer& rPointer );
+ void SetPointer( const Pointer& rPointer );
- void MoveMouseStatus( ScGridWindow &rDestWin );
+ void MoveMouseStatus( ScGridWindow &rDestWin );
- void ScrollPixel( long nDifX, long nDifY );
- void UpdateEditViewPos();
+ void ScrollPixel( long nDifX, long nDifY );
+ void UpdateEditViewPos();
- void UpdateFormulas();
+ void UpdateFormulas();
- void DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect );
- void DoScenarioMenue( const ScRange& rScenRange );
+ void DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect );
+ void DoScenarioMenue( const ScRange& rScenRange );
void LaunchPageFieldMenu( SCCOL nCol, SCROW nRow );
void LaunchDPFieldMenu( SCCOL nCol, SCROW nRow );
::com::sun::star::sheet::DataPilotFieldOrientation GetDPFieldOrientation( SCCOL nCol, SCROW nRow ) const;
- void DrawButtons( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
+ void DrawButtons( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
ScTableInfo& rTabInfo, OutputDevice* pContentDev );
using Window::Draw;
- void Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
+ void Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
ScUpdateMode eMode = SC_UPDATE_ALL );
- void InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
+ void InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
BOOL bTestMerge = FALSE, BOOL bRepeat = FALSE );
-//UNUSED2008-05 void DrawDragRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 );
+//UNUSED2008-05 void DrawDragRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 );
- void CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddress);
+ void CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddress);
- void HideCursor();
- void ShowCursor();
- void DrawCursor();
- void DrawAutoFillMark();
- void UpdateAutoFillMark(BOOL bMarked, const ScRange& rMarkRange);
+ void HideCursor();
+ void ShowCursor();
+ void DrawCursor();
+ void DrawAutoFillMark();
+ void UpdateAutoFillMark(BOOL bMarked, const ScRange& rMarkRange);
- void UpdateListValPos( BOOL bVisible, const ScAddress& rPos );
+ void UpdateListValPos( BOOL bVisible, const ScAddress& rPos );
- BOOL ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard );
- void HideNoteMarker();
+ BOOL ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard );
+ void HideNoteMarker();
- MapMode GetDrawMapMode( BOOL bForce = FALSE );
+ MapMode GetDrawMapMode( BOOL bForce = FALSE );
- void ContinueDrag();
+ void ContinueDrag();
- void StopMarking();
- void UpdateInputContext();
+ void StopMarking();
+ void UpdateInputContext();
- void CheckInverted() { if (nPaintCount) bNeedsRepaint = TRUE; }
+ void CheckInverted() { if (nPaintCount) bNeedsRepaint = TRUE; }
- void DoInvertRect( const Rectangle& rPixel );
+ void DoInvertRect( const Rectangle& rPixel );
- void CheckNeedsRepaint();
+ void CheckNeedsRepaint();
void UpdateDPFromFieldPopupMenu();
diff --git a/sc/source/ui/inc/groupdlg.hxx b/sc/source/ui/inc/groupdlg.hxx
index 38b96f21e90e..63697683d94b 100644
--- a/sc/source/ui/inc/groupdlg.hxx
+++ b/sc/source/ui/inc/groupdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,20 +39,20 @@ class ScGroupDlg : public ModalDialog
{
public:
ScGroupDlg( Window* pParent,
- USHORT nResId,
- BOOL bUnGroup = FALSE,
- BOOL bRows = TRUE );
+ USHORT nResId,
+ BOOL bUnGroup = FALSE,
+ BOOL bRows = TRUE );
~ScGroupDlg();
BOOL GetColsChecked() const;
private:
FixedLine aFlFrame;
- RadioButton aBtnRows;
- RadioButton aBtnCols;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ RadioButton aBtnRows;
+ RadioButton aBtnCols;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
};
diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx
index ec4dd49705d1..502b036e5c7c 100644
--- a/sc/source/ui/inc/hdrcont.hxx
+++ b/sc/source/ui/inc/hdrcont.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,102 +37,102 @@
// ---------------------------------------------------------------------------
-#define HDR_HORIZONTAL 0
-#define HDR_VERTICAL 1
+#define HDR_HORIZONTAL 0
+#define HDR_VERTICAL 1
-#define HDR_SIZE_OPTIMUM 0xFFFF
+#define HDR_SIZE_OPTIMUM 0xFFFF
// Groesse des Sliders
-#define HDR_SLIDERSIZE 2
+#define HDR_SLIDERSIZE 2
class ScHeaderControl : public Window
{
private:
- SelectionEngine* pSelEngine;
- Font aNormFont;
- Font aBoldFont;
- BOOL bBoldSet;
+ SelectionEngine* pSelEngine;
+ Font aNormFont;
+ Font aBoldFont;
+ BOOL bBoldSet;
- USHORT nFlags;
- BOOL bVertical; // Vertikal = Zeilenheader
+ USHORT nFlags;
+ BOOL bVertical; // Vertikal = Zeilenheader
- long nWidth;
- long nSmallWidth;
- long nBigWidth;
+ long nWidth;
+ long nSmallWidth;
+ long nBigWidth;
- SCCOLROW nSize;
+ SCCOLROW nSize;
- SCCOLROW nMarkStart;
- SCCOLROW nMarkEnd;
- BOOL bMarkRange;
+ SCCOLROW nMarkStart;
+ SCCOLROW nMarkEnd;
+ BOOL bMarkRange;
- BOOL bDragging; // Groessen aendern
- SCCOLROW nDragNo;
- long nDragStart;
- long nDragPos;
- BOOL bDragMoved;
+ BOOL bDragging; // Groessen aendern
+ SCCOLROW nDragNo;
+ long nDragStart;
+ long nDragPos;
+ BOOL bDragMoved;
- BOOL bIgnoreMove;
+ BOOL bIgnoreMove;
- long GetScrPos( SCCOLROW nEntryNo );
- SCCOLROW GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder );
+ long GetScrPos( SCCOLROW nEntryNo );
+ SCCOLROW GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder );
bool IsSelectionAllowed(SCCOLROW nPos) const;
- void ShowDragHelp();
+ void ShowDragHelp();
- void DoPaint( SCCOLROW nStart, SCCOLROW nEnd );
+ void DoPaint( SCCOLROW nStart, SCCOLROW nEnd );
void DrawShadedRect( long nStart, long nEnd, const Color& rBaseColor );
protected:
- // von Window ueberladen
+ // von Window ueberladen
- virtual void Paint( const Rectangle& rRect );
+ virtual void Paint( const Rectangle& rRect );
- virtual void MouseMove( const MouseEvent& rMEvt );
- virtual void MouseButtonUp( const MouseEvent& rMEvt );
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void Tracking( const TrackingEvent& rTEvt );
+ virtual void MouseMove( const MouseEvent& rMEvt );
+ virtual void MouseButtonUp( const MouseEvent& rMEvt );
+ virtual void MouseButtonDown( const MouseEvent& rMEvt );
+ virtual void Tracking( const TrackingEvent& rTEvt );
- virtual void RequestHelp( const HelpEvent& rHEvt );
+ virtual void RequestHelp( const HelpEvent& rHEvt );
- // neue Methoden
+ // neue Methoden
- virtual SCCOLROW GetPos() = 0; // aktuelle Position (Scrolling)
- virtual USHORT GetEntrySize( SCCOLROW nEntryNo ) = 0; // Breite / Hoehe (Pixel)
- virtual String GetEntryText( SCCOLROW nEntryNo ) = 0;
+ virtual SCCOLROW GetPos() = 0; // aktuelle Position (Scrolling)
+ virtual USHORT GetEntrySize( SCCOLROW nEntryNo ) = 0; // Breite / Hoehe (Pixel)
+ virtual String GetEntryText( SCCOLROW nEntryNo ) = 0;
virtual SCCOLROW GetHiddenCount( SCCOLROW nEntryNo );
- virtual BOOL IsLayoutRTL();
- virtual BOOL IsMirrored();
+ virtual BOOL IsLayoutRTL();
+ virtual BOOL IsMirrored();
- virtual void SetEntrySize( SCCOLROW nPos, USHORT nNewWidth ) = 0;
- virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ) = 0;
+ virtual void SetEntrySize( SCCOLROW nPos, USHORT nNewWidth ) = 0;
+ virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ) = 0;
- virtual void SetMarking( BOOL bSet );
- virtual void SelectWindow();
- virtual BOOL IsDisabled();
- virtual BOOL ResizeAllowed();
- virtual String GetDragHelp( long nVal );
+ virtual void SetMarking( BOOL bSet );
+ virtual void SelectWindow();
+ virtual BOOL IsDisabled();
+ virtual BOOL ResizeAllowed();
+ virtual String GetDragHelp( long nVal );
- virtual void DrawInvert( long nDragPos );
- virtual void Command( const CommandEvent& rCEvt );
+ virtual void DrawInvert( long nDragPos );
+ virtual void Command( const CommandEvent& rCEvt );
public:
ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEngine,
SCCOLROW nNewSize, USHORT nNewFlags );
~ScHeaderControl();
- void SetIgnoreMove(BOOL bSet) { bIgnoreMove = bSet; }
+ void SetIgnoreMove(BOOL bSet) { bIgnoreMove = bSet; }
- void StopMarking();
+ void StopMarking();
- void SetMark( BOOL bNewSet, SCCOLROW nNewStart, SCCOLROW nNewEnd );
+ void SetMark( BOOL bNewSet, SCCOLROW nNewStart, SCCOLROW nNewEnd );
- long GetWidth() const { return nWidth; }
- long GetSmallWidth() const { return nSmallWidth; }
- long GetBigWidth() const { return nBigWidth; }
- void SetWidth( long nNew );
+ long GetWidth() const { return nWidth; }
+ long GetSmallWidth() const { return nSmallWidth; }
+ long GetBigWidth() const { return nBigWidth; }
+ void SetWidth( long nNew );
};
diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx
index 1f1ea7242b17..b690d03f0057 100644
--- a/sc/source/ui/inc/hfedtdlg.hxx
+++ b/sc/source/ui/inc/hfedtdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +41,11 @@ class ScHFEditDlg : public SfxTabDialog
{
SvxNumType eNumType;
public:
- ScHFEditDlg( SfxViewFrame* pFrame,
- Window* pParent,
- const SfxItemSet& rCoreSet,
- const String& rPageStyle,
- USHORT nResId = RID_SCDLG_HFEDIT );
+ ScHFEditDlg( SfxViewFrame* pFrame,
+ Window* pParent,
+ const SfxItemSet& rCoreSet,
+ const String& rPageStyle,
+ USHORT nResId = RID_SCDLG_HFEDIT );
~ScHFEditDlg();
diff --git a/sc/source/ui/inc/highred.hrc b/sc/source/ui/inc/highred.hrc
index 426c9ba29ee2..726c9a870fb8 100644
--- a/sc/source/ui/inc/highred.hrc
+++ b/sc/source/ui/inc/highred.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,22 +27,22 @@
#include "sc.hrc" // -> RID_SCDLG_CHANGES
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_HELP 5
+#define BTN_OK 1
+#define BTN_CANCEL 2
+#define BTN_HELP 5
-#define CB_HIGHLIGHT_ACCEPT 6
-#define CB_HIGHLIGHT_REJECT 7
+#define CB_HIGHLIGHT_ACCEPT 6
+#define CB_HIGHLIGHT_REJECT 7
//
#define FL_FILTER 10
-#define TP_FILTER 11
-#define TP_VIEW 12
-#define CB_HIGHLIGHT 13
+#define TP_FILTER 11
+#define TP_VIEW 12
+#define CB_HIGHLIGHT 13
-#define FT_ASSIGN 14
-#define ED_ASSIGN 15
-#define RB_ASSIGN 16
+#define FT_ASSIGN 14
+#define ED_ASSIGN 15
+#define RB_ASSIGN 16
@@ -51,20 +51,20 @@
#define STR_INSERT_COLS 20
-#define STR_INSERT_ROWS 21
-#define STR_INSERT_TABS 22
-#define STR_DELETE_COLS 23
-#define STR_DELETE_ROWS 24
-#define STR_DELETE_TABS 25
-#define STR_MOVE 26
-#define STR_CONTENT 27
-#define STR_REJECT 28
+#define STR_INSERT_ROWS 21
+#define STR_INSERT_TABS 22
+#define STR_DELETE_COLS 23
+#define STR_DELETE_ROWS 24
+#define STR_DELETE_TABS 25
+#define STR_MOVE 26
+#define STR_CONTENT 27
+#define STR_REJECT 28
// Bitmaps
-#define BMP_STR_CLOSE 31
-#define BMP_STR_OPEN 32
-#define BMP_STR_END 33
-#define BMP_STR_ERROR 34
+#define BMP_STR_CLOSE 31
+#define BMP_STR_OPEN 32
+#define BMP_STR_END 33
+#define BMP_STR_ERROR 34
//
diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx
index b500473b2071..cd406ddd2310 100644
--- a/sc/source/ui/inc/highred.hxx
+++ b/sc/source/ui/inc/highred.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +59,13 @@
class ScViewData;
class ScDocument;
-#ifndef FLT_DATE_BEFORE
-#define FLT_DATE_BEFORE 0
-#define FLT_DATE_SINCE 1
-#define FLT_DATE_EQUAL 2
-#define FLT_DATE_NOTEQUAL 3
-#define FLT_DATE_BETWEEN 4
-#define FLT_DATE_SAVE 5
+#ifndef FLT_DATE_BEFORE
+#define FLT_DATE_BEFORE 0
+#define FLT_DATE_SINCE 1
+#define FLT_DATE_EQUAL 2
+#define FLT_DATE_NOTEQUAL 3
+#define FLT_DATE_BETWEEN 4
+#define FLT_DATE_SAVE 5
#endif
//==================================================================
@@ -74,28 +74,28 @@ class ScHighlightChgDlg : public ScAnyRefDlg
{
private:
- CheckBox aHighlightBox;
+ CheckBox aHighlightBox;
FixedLine aFlFilter;
- SvxTPFilter aFilterCtr;
- CheckBox aCbAccept;
- CheckBox aCbReject;
+ SvxTPFilter aFilterCtr;
+ CheckBox aCbAccept;
+ CheckBox aCbReject;
- OKButton aOkButton;
- CancelButton aCancelButton;
- HelpButton aHelpButton;
+ OKButton aOkButton;
+ CancelButton aCancelButton;
+ HelpButton aHelpButton;
- formula::RefEdit aEdAssign;
- formula::RefButton aRbAssign;
+ formula::RefEdit aEdAssign;
+ formula::RefButton aRbAssign;
- ScViewData* pViewData;
- ScDocument* pDoc;
- ScRangeName aLocalRangeName;
- Selection theCurSel;
- Size MinSize;
- ScRangeList aRangeList;
- ScChangeViewSettings aChangeViewSet;
+ ScViewData* pViewData;
+ ScDocument* pDoc;
+ ScRangeName aLocalRangeName;
+ Selection theCurSel;
+ Size MinSize;
+ ScRangeList aRangeList;
+ ScChangeViewSettings aChangeViewSet;
- void Init();
+ void Init();
DECL_LINK( RefHandle, SvxTPFilter* );
DECL_LINK(HighLightHandle, CheckBox*);
@@ -104,18 +104,18 @@ private:
protected:
- virtual void RefInputDone( BOOL bForced = FALSE );
+ virtual void RefInputDone( BOOL bForced = FALSE );
public:
ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
- ScViewData* ptrViewData);
+ ScViewData* ptrViewData);
~ScHighlightChgDlg();
- virtual void SetActive();
- virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual BOOL Close();
- virtual BOOL IsRefInputMode() const;
+ virtual void SetActive();
+ virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
+ virtual BOOL Close();
+ virtual BOOL IsRefInputMode() const;
};
diff --git a/sc/source/ui/inc/hintwin.hxx b/sc/source/ui/inc/hintwin.hxx
index 2fd9e7897ab6..737ac780273d 100644
--- a/sc/source/ui/inc/hintwin.hxx
+++ b/sc/source/ui/inc/hintwin.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +33,15 @@
class ScHintWindow : public Window
{
private:
- String aTitle;
- String aMessage;
- Point aTextStart;
- long nTextHeight;
- Font aTextFont;
- Font aHeadFont;
+ String aTitle;
+ String aMessage;
+ Point aTextStart;
+ long nTextHeight;
+ Font aTextFont;
+ Font aHeadFont;
protected:
- virtual void Paint( const Rectangle& rRect );
+ virtual void Paint( const Rectangle& rRect );
public:
ScHintWindow( Window* pParent, const String& rTit, const String& rMsg );
diff --git a/sc/source/ui/inc/hiranges.hxx b/sc/source/ui/inc/hiranges.hxx
index 6182d30dc96e..30861388712a 100644
--- a/sc/source/ui/inc/hiranges.hxx
+++ b/sc/source/ui/inc/hiranges.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +36,8 @@
struct ScHighlightEntry
{
- ScRange aRef;
- Color aColor;
+ ScRange aRef;
+ Color aColor;
ScHighlightEntry( const ScRange& rR, const Color& rC ) :
aRef(rR), aColor(rC) {}
@@ -45,14 +45,14 @@ struct ScHighlightEntry
class ScHighlightRanges
{
- List aEntries;
+ List aEntries;
public:
ScHighlightRanges();
~ScHighlightRanges();
- ULONG Count() const { return aEntries.Count(); }
- void Insert( ScHighlightEntry* pNew ) { aEntries.Insert(pNew, LIST_APPEND); }
+ ULONG Count() const { return aEntries.Count(); }
+ void Insert( ScHighlightEntry* pNew ) { aEntries.Insert(pNew, LIST_APPEND); }
ScHighlightEntry* GetObject( ULONG nIndex ) const
{ return (ScHighlightEntry*)aEntries.GetObject(nIndex); }
};
diff --git a/sc/source/ui/inc/imoptdlg.hxx b/sc/source/ui/inc/imoptdlg.hxx
index 01e10f9a3983..4d4bd25271f5 100644
--- a/sc/source/ui/inc/imoptdlg.hxx
+++ b/sc/source/ui/inc/imoptdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,38 +60,38 @@ public:
{ SetTextEncoding( nEnc ); }
ScImportOptions( const ScImportOptions& rCpy )
- : nFieldSepCode (rCpy.nFieldSepCode),
- nTextSepCode (rCpy.nTextSepCode),
- aStrFont (rCpy.aStrFont),
- eCharSet (rCpy.eCharSet),
- bFixedWidth (rCpy.bFixedWidth),
- bSaveAsShown (rCpy.bSaveAsShown)
+ : nFieldSepCode (rCpy.nFieldSepCode),
+ nTextSepCode (rCpy.nTextSepCode),
+ aStrFont (rCpy.aStrFont),
+ eCharSet (rCpy.eCharSet),
+ bFixedWidth (rCpy.bFixedWidth),
+ bSaveAsShown (rCpy.bSaveAsShown)
{}
ScImportOptions& operator=( const ScImportOptions& rCpy )
{
- nFieldSepCode = rCpy.nFieldSepCode;
- nTextSepCode = rCpy.nTextSepCode;
- aStrFont = rCpy.aStrFont;
- eCharSet = rCpy.eCharSet;
- bFixedWidth = rCpy.bFixedWidth;
+ nFieldSepCode = rCpy.nFieldSepCode;
+ nTextSepCode = rCpy.nTextSepCode;
+ aStrFont = rCpy.aStrFont;
+ eCharSet = rCpy.eCharSet;
+ bFixedWidth = rCpy.bFixedWidth;
bSaveAsShown = rCpy.bSaveAsShown;
return *this;
}
- BOOL operator==( const ScImportOptions& rCmp )
+ BOOL operator==( const ScImportOptions& rCmp )
{
return
- nFieldSepCode == rCmp.nFieldSepCode
- && nTextSepCode == rCmp.nTextSepCode
- && eCharSet == rCmp.eCharSet
- && aStrFont == rCmp.aStrFont
- && bFixedWidth == rCmp.bFixedWidth
+ nFieldSepCode == rCmp.nFieldSepCode
+ && nTextSepCode == rCmp.nTextSepCode
+ && eCharSet == rCmp.eCharSet
+ && aStrFont == rCmp.aStrFont
+ && bFixedWidth == rCmp.bFixedWidth
&& bSaveAsShown == rCmp.bSaveAsShown;
}
- String BuildString() const;
+ String BuildString() const;
- void SetTextEncoding( rtl_TextEncoding nEnc );
+ void SetTextEncoding( rtl_TextEncoding nEnc );
sal_Unicode nFieldSepCode;
sal_Unicode nTextSepCode;
diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx
index 86a91216edcc..e28b34e89681 100644
--- a/sc/source/ui/inc/impex.hxx
+++ b/sc/source/ui/inc/impex.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 ScAsciiOptions;
struct ScExportTextOptions
{
enum NewlineConversion { ToSystem, ToSpace, None };
- ScExportTextOptions( NewlineConversion eNewlineConversion = ToSystem, sal_Unicode cSeparatorConvertTo = 0, bool bAddQuotes = false ) :
+ ScExportTextOptions( NewlineConversion eNewlineConversion = ToSystem, sal_Unicode cSeparatorConvertTo = 0, bool bAddQuotes = false ) :
meNewlineConversion( eNewlineConversion ), mcSeparatorConvertTo( cSeparatorConvertTo ), mbAddQuotes( bAddQuotes ) {}
NewlineConversion meNewlineConversion;
@@ -56,24 +56,24 @@ class ScImportExport
ScDocument* pDoc;
ScDocument* pUndoDoc;
ScRange aRange;
- String aStreamPath;
+ String aStreamPath;
String aNonConvertibleChars;
- ULONG nSizeLimit;
- sal_Unicode cSep; // Separator
- sal_Unicode cStr; // String Delimiter
- BOOL bFormulas; // Formeln im Text?
- BOOL bIncludeFiltered; // include filtered rows? (default true)
- BOOL bAll; // keine Selektion
- BOOL bSingle; // Einfachselektion
- BOOL bUndo; // Mit Undo?
- BOOL bOverflow; // zuviele Zeilen/Spalten
+ ULONG nSizeLimit;
+ sal_Unicode cSep; // Separator
+ sal_Unicode cStr; // String Delimiter
+ BOOL bFormulas; // Formeln im Text?
+ BOOL bIncludeFiltered; // include filtered rows? (default true)
+ BOOL bAll; // keine Selektion
+ BOOL bSingle; // Einfachselektion
+ BOOL bUndo; // Mit Undo?
+ BOOL bOverflow; // zuviele Zeilen/Spalten
bool mbApi;
ScExportTextOptions mExportTextOptions;
- ScAsciiOptions* pExtOptions; // erweiterte Optionen
+ ScAsciiOptions* pExtOptions; // erweiterte Optionen
- BOOL StartPaste(); // Protect-Check, Undo einrichten
- void EndPaste(); // Undo/Redo-Aktionen, Repaint
+ BOOL StartPaste(); // Protect-Check, Undo einrichten
+ void EndPaste(); // Undo/Redo-Aktionen, Repaint
BOOL Doc2Text( SvStream& );
BOOL Text2Doc( SvStream& );
BOOL Doc2Sylk( SvStream& );
@@ -82,13 +82,13 @@ class ScImportExport
BOOL Doc2RTF( SvStream& );
BOOL Doc2Dif( SvStream& );
BOOL Dif2Doc( SvStream& );
- BOOL ExtText2Doc( SvStream& ); // mit pExtOptions
+ BOOL ExtText2Doc( SvStream& ); // mit pExtOptions
BOOL RTF2Doc( SvStream&, const String& rBaseURL );
BOOL HTML2Doc( SvStream&, const String& rBaseURL );
public:
- ScImportExport( ScDocument* ); // Gesamtdokument
- ScImportExport( ScDocument*, const String& ); // Bereichs/Zellangabe
+ ScImportExport( ScDocument* ); // Gesamtdokument
+ ScImportExport( ScDocument*, const String& ); // Bereichs/Zellangabe
ScImportExport( ScDocument*, const ScAddress& );
ScImportExport( ScDocument*, const ScRange& );
~ScImportExport();
@@ -97,20 +97,20 @@ public:
BOOL IsDoubleRef() const { return BOOL( !( bAll || bSingle ) ); }
BOOL IsSingleRef() const { return bSingle; }
- BOOL IsNoRef() const { return bAll; }
- BOOL IsRef() const { return BOOL( !bAll ); }
+ BOOL IsNoRef() const { return bAll; }
+ BOOL IsRef() const { return BOOL( !bAll ); }
const ScRange& GetRange() const { return aRange; }
- BOOL IsUndo() const { return bUndo; }
- void SetUndo( BOOL b ) { bUndo = b; }
+ BOOL IsUndo() const { return bUndo; }
+ void SetUndo( BOOL b ) { bUndo = b; }
static BOOL IsFormatSupported( ULONG nFormat );
static const sal_Unicode* ScanNextFieldFromString( const sal_Unicode* p,
String& rField, sal_Unicode cStr, const sal_Unicode* pSeps, bool bMergeSeps, bool& rbIsQuoted );
- static void WriteUnicodeOrByteString( SvStream& rStrm, const String& rString, BOOL bZero = FALSE );
- static void WriteUnicodeOrByteEndl( SvStream& rStrm );
- static inline BOOL IsEndianSwap( const SvStream& rStrm );
+ static void WriteUnicodeOrByteString( SvStream& rStrm, const String& rString, BOOL bZero = FALSE );
+ static void WriteUnicodeOrByteEndl( SvStream& rStrm );
+ static inline BOOL IsEndianSwap( const SvStream& rStrm );
//! only if stream is only used in own (!) memory
static inline void SetNoEndianSwap( SvStream& rStrm );
@@ -124,10 +124,10 @@ public:
BOOL IsIncludeFiltered() const { return bIncludeFiltered; }
void SetIncludeFiltered( BOOL b ) { bIncludeFiltered = b; }
- void SetSizeLimit( ULONG nNew ) { nSizeLimit = nNew; } // momentan nur fuer Ascii
+ void SetSizeLimit( ULONG nNew ) { nSizeLimit = nNew; } // momentan nur fuer Ascii
- void SetStreamPath( const String& rPath ) { aStreamPath = rPath; }
- const String& GetStreamPath() const { return aStreamPath; }
+ void SetStreamPath( const String& rPath ) { aStreamPath = rPath; }
+ const String& GetStreamPath() const { return aStreamPath; }
BOOL ImportString( const ::rtl::OUString&, ULONG=FORMAT_STRING );
BOOL ExportString( ::rtl::OUString&, ULONG=FORMAT_STRING );
@@ -141,7 +141,7 @@ public:
BOOL ExportData( const String& rMimeType,
::com::sun::star::uno::Any & rValue );
- BOOL IsOverflow() const { return bOverflow; } // nach dem Importieren
+ BOOL IsOverflow() const { return bOverflow; } // nach dem Importieren
const String& GetNonConvertibleChars() const { return aNonConvertibleChars; }
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 61974cf7464d..d90a3d71690b 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,103 +53,103 @@ class CommandEvent;
struct ESelection;
//========================================================================
-// ScInputHandler
+// ScInputHandler
//========================================================================
class ScInputHandler
{
private:
- ScInputWindow* pInputWin;
-
- ScEditEngineDefaulter* pEngine; // editierte Daten in der Tabelle
- EditView* pTableView; // aktive EditView dazu
- EditView* pTopView; // EditView in der Eingabezeile
-
- TypedScStrCollection* pColumnData;
- TypedScStrCollection* pFormulaData;
- TypedScStrCollection* pFormulaDataPara;
- Window* pTipVisibleParent;
- ULONG nTipVisible;
- Window* pTipVisibleSecParent;
+ ScInputWindow* pInputWin;
+
+ ScEditEngineDefaulter* pEngine; // editierte Daten in der Tabelle
+ EditView* pTableView; // aktive EditView dazu
+ EditView* pTopView; // EditView in der Eingabezeile
+
+ TypedScStrCollection* pColumnData;
+ TypedScStrCollection* pFormulaData;
+ TypedScStrCollection* pFormulaDataPara;
+ Window* pTipVisibleParent;
+ ULONG nTipVisible;
+ Window* pTipVisibleSecParent;
ULONG nTipVisibleSec;
- String aManualTip;
- String aAutoSearch;
- USHORT nAutoPos;
- BOOL bUseTab; // Blaettern moeglich
-
- BOOL bTextValid; // Text noch nicht in Edit-Engine
- String aCurrentText;
-
- String aFormText; // fuer Funktions-Autopilot
- xub_StrLen nFormSelStart; // Selektion fuer Funktions-Autopilot
- xub_StrLen nFormSelEnd;
-
- USHORT nAutoPar; // autom.parentheses than can be overwritten
-
- ScAddress aCursorPos;
- ScInputMode eMode;
- BOOL bModified;
- BOOL bSelIsRef;
- BOOL bFormulaMode;
- BOOL bInRangeUpdate;
- BOOL bParenthesisShown;
- BOOL bCreatingFuncView;
- BOOL bInEnterHandler;
- BOOL bCommandErrorShown;
- BOOL bInOwnChange;
-
- BOOL bProtected;
- BOOL bCellHasPercentFormat;
- ULONG nValidation;
+ String aManualTip;
+ String aAutoSearch;
+ USHORT nAutoPos;
+ BOOL bUseTab; // Blaettern moeglich
+
+ BOOL bTextValid; // Text noch nicht in Edit-Engine
+ String aCurrentText;
+
+ String aFormText; // fuer Funktions-Autopilot
+ xub_StrLen nFormSelStart; // Selektion fuer Funktions-Autopilot
+ xub_StrLen nFormSelEnd;
+
+ USHORT nAutoPar; // autom.parentheses than can be overwritten
+
+ ScAddress aCursorPos;
+ ScInputMode eMode;
+ BOOL bModified;
+ BOOL bSelIsRef;
+ BOOL bFormulaMode;
+ BOOL bInRangeUpdate;
+ BOOL bParenthesisShown;
+ BOOL bCreatingFuncView;
+ BOOL bInEnterHandler;
+ BOOL bCommandErrorShown;
+ BOOL bInOwnChange;
+
+ BOOL bProtected;
+ BOOL bCellHasPercentFormat;
+ ULONG nValidation;
SvxCellHorJustify eAttrAdjust;
- Fraction aScaleX; // fuer Ref-MapMode
- Fraction aScaleY;
+ Fraction aScaleX; // fuer Ref-MapMode
+ Fraction aScaleY;
- ScTabViewShell* pRefViewSh;
- ScTabViewShell* pActiveViewSh;
+ ScTabViewShell* pRefViewSh;
+ ScTabViewShell* pActiveViewSh;
- const ScPatternAttr* pLastPattern;
- SfxItemSet* pEditDefaults;
- BOOL bLastIsSymbol;
+ const ScPatternAttr* pLastPattern;
+ SfxItemSet* pEditDefaults;
+ BOOL bLastIsSymbol;
- ScInputHdlState* pLastState;
- Timer* pDelayTimer;
+ ScInputHdlState* pLastState;
+ Timer* pDelayTimer;
- ScRangeFindList* pRangeFindList;
+ ScRangeFindList* pRangeFindList;
- static BOOL bAutoComplete; // aus App-Optionen
- static BOOL bOptLoaded;
+ static BOOL bAutoComplete; // aus App-Optionen
+ static BOOL bOptLoaded;
#ifdef _INPUTHDL_CXX
private:
- void UpdateActiveView();
- void SyncViews( EditView* pSourceView = NULL );
- BOOL StartTable( sal_Unicode cTyped, BOOL bFromCommand );
- void RemoveSelection();
- void UpdateFormulaMode();
- void InvalidateAttribs();
- void ImplCreateEditEngine();
- DECL_LINK( DelayTimer, Timer* );
- void GetColData();
- void UseColData();
- void NextAutoEntry( BOOL bBack );
- void UpdateAdjust( sal_Unicode cTyped );
- void GetFormulaData();
- void UseFormulaData();
- void NextFormulaEntry( BOOL bBack );
- void PasteFunctionData();
- void PasteManualTip();
- EditView* GetFuncEditView();
- void RemoveAdjust();
- void RemoveRangeFinder();
- void DeleteRangeFinder();
- void UpdateParenthesis();
- void UpdateAutoCorrFlag();
- void ResetAutoPar();
- void AutoParAdded();
- BOOL CursorAtClosingPar();
- void SkipClosingPar();
+ void UpdateActiveView();
+ void SyncViews( EditView* pSourceView = NULL );
+ BOOL StartTable( sal_Unicode cTyped, BOOL bFromCommand );
+ void RemoveSelection();
+ void UpdateFormulaMode();
+ void InvalidateAttribs();
+ void ImplCreateEditEngine();
+ DECL_LINK( DelayTimer, Timer* );
+ void GetColData();
+ void UseColData();
+ void NextAutoEntry( BOOL bBack );
+ void UpdateAdjust( sal_Unicode cTyped );
+ void GetFormulaData();
+ void UseFormulaData();
+ void NextFormulaEntry( BOOL bBack );
+ void PasteFunctionData();
+ void PasteManualTip();
+ EditView* GetFuncEditView();
+ void RemoveAdjust();
+ void RemoveRangeFinder();
+ void DeleteRangeFinder();
+ void UpdateParenthesis();
+ void UpdateAutoCorrFlag();
+ void ResetAutoPar();
+ void AutoParAdded();
+ BOOL CursorAtClosingPar();
+ void SkipClosingPar();
DECL_LINK( ModifyHdl, void* );
DECL_LINK( ShowHideTipVisibleParentListener, VclWindowEvent* );
DECL_LINK( ShowHideTipVisibleSecParentListener, VclWindowEvent* );
@@ -157,105 +157,105 @@ private:
public:
ScInputHandler();
- virtual ~ScInputHandler();
+ virtual ~ScInputHandler();
- void SetMode( ScInputMode eNewMode );
- BOOL IsInputMode() const { return (eMode != SC_INPUT_NONE); }
- BOOL IsEditMode() const { return (eMode != SC_INPUT_NONE &&
+ void SetMode( ScInputMode eNewMode );
+ BOOL IsInputMode() const { return (eMode != SC_INPUT_NONE); }
+ BOOL IsEditMode() const { return (eMode != SC_INPUT_NONE &&
eMode != SC_INPUT_TYPE); }
- BOOL IsTopMode() const { return (eMode == SC_INPUT_TOP); }
+ BOOL IsTopMode() const { return (eMode == SC_INPUT_TOP); }
- const String& GetEditString();
- const String& GetFormString() const { return aFormText; }
+ const String& GetEditString();
+ const String& GetFormString() const { return aFormText; }
- BOOL GetTextAndFields( ScEditEngineDefaulter& rDestEngine );
+ BOOL GetTextAndFields( ScEditEngineDefaulter& rDestEngine );
- BOOL KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit = FALSE );
- void EnterHandler( BYTE nBlockMode = 0 );
- void CancelHandler();
- void SetReference( const ScRange& rRef, ScDocument* pDoc );
- void AddRefEntry();
+ BOOL KeyInput( const KeyEvent& rKEvt, BOOL bStartEdit = FALSE );
+ void EnterHandler( BYTE nBlockMode = 0 );
+ void CancelHandler();
+ void SetReference( const ScRange& rRef, ScDocument* pDoc );
+ void AddRefEntry();
- BOOL InputCommand( const CommandEvent& rCEvt, BOOL bForce );
+ BOOL InputCommand( const CommandEvent& rCEvt, BOOL bForce );
- void InsertFunction( const String& rFuncName, BOOL bAddPar = TRUE );
- void ClearText();
+ void InsertFunction( const String& rFuncName, BOOL bAddPar = TRUE );
+ void ClearText();
- void InputSelection( EditView* pView );
- void InputChanged( EditView* pView, BOOL bFromNotify = FALSE );
+ void InputSelection( EditView* pView );
+ void InputChanged( EditView* pView, BOOL bFromNotify = FALSE );
- void ViewShellGone(ScTabViewShell* pViewSh);
- void SetRefViewShell(ScTabViewShell* pRefVsh) {pRefViewSh=pRefVsh;}
+ void ViewShellGone(ScTabViewShell* pViewSh);
+ void SetRefViewShell(ScTabViewShell* pRefVsh) {pRefViewSh=pRefVsh;}
- void NotifyChange( const ScInputHdlState* pState, BOOL bForce = FALSE,
+ void NotifyChange( const ScInputHdlState* pState, BOOL bForce = FALSE,
ScTabViewShell* pSourceSh = NULL,
BOOL bStopEditing = TRUE);
void UpdateCellAdjust( SvxCellHorJustify eJust );
- void ResetDelayTimer(); //BugId 54702
+ void ResetDelayTimer(); //BugId 54702
- void HideTip();
+ void HideTip();
void HideTipBelow();
void ShowTipCursor();
- void ShowTip( const String& rText ); // am Cursor
- void ShowTipBelow( const String& rText );
+ void ShowTip( const String& rText ); // am Cursor
+ void ShowTipBelow( const String& rText );
- void SetRefScale( const Fraction& rX, const Fraction& rY );
- void UpdateRefDevice();
+ void SetRefScale( const Fraction& rX, const Fraction& rY );
+ void UpdateRefDevice();
- EditView* GetActiveView();
- EditView* GetTableView() { return pTableView; }
- EditView* GetTopView() { return pTopView; }
+ EditView* GetActiveView();
+ EditView* GetTableView() { return pTableView; }
+ EditView* GetTopView() { return pTopView; }
- BOOL DataChanging( sal_Unicode cTyped = 0, BOOL bFromCommand = FALSE );
- void DataChanged( BOOL bFromTopNotify = FALSE );
+ BOOL DataChanging( sal_Unicode cTyped = 0, BOOL bFromCommand = FALSE );
+ void DataChanged( BOOL bFromTopNotify = FALSE );
- BOOL TakesReturn() const { return ( nTipVisible != 0 ); }
+ BOOL TakesReturn() const { return ( nTipVisible != 0 ); }
- void SetModified() { bModified = TRUE; }
+ void SetModified() { bModified = TRUE; }
- BOOL GetSelIsRef() const { return bSelIsRef; }
- void SetSelIsRef(BOOL bSet) { bSelIsRef = bSet; }
+ BOOL GetSelIsRef() const { return bSelIsRef; }
+ void SetSelIsRef(BOOL bSet) { bSelIsRef = bSet; }
- void ShowRefFrame();
+ void ShowRefFrame();
- ScRangeFindList* GetRangeFindList() { return pRangeFindList; }
+ ScRangeFindList* GetRangeFindList() { return pRangeFindList; }
- void UpdateRange( USHORT nIndex, const ScRange& rNew );
+ void UpdateRange( USHORT nIndex, const ScRange& rNew );
// 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 InputGetSelection ( xub_StrLen& rStart, xub_StrLen& rEnd );
+ void InputSetSelection ( xub_StrLen nStart, xub_StrLen nEnd );
+ void InputReplaceSelection ( const String& rStr );
+ String InputGetFormulaStr ();
- BOOL IsFormulaMode() const { return bFormulaMode; }
- ScInputWindow* GetInputWindow() { return pInputWin; }
- void SetInputWindow( ScInputWindow* pNew ) { pInputWin = pNew; }
- void StopInputWinEngine( BOOL bAll );
+ BOOL IsFormulaMode() const { return bFormulaMode; }
+ ScInputWindow* GetInputWindow() { return pInputWin; }
+ void SetInputWindow( ScInputWindow* pNew ) { pInputWin = pNew; }
+ void StopInputWinEngine( BOOL bAll );
- BOOL IsInEnterHandler() const { return bInEnterHandler; }
- BOOL IsInOwnChange() const { return bInOwnChange; }
+ BOOL IsInEnterHandler() const { return bInEnterHandler; }
+ BOOL IsInOwnChange() const { return bInOwnChange; }
- BOOL IsModalMode( SfxObjectShell* pDocSh );
+ BOOL IsModalMode( SfxObjectShell* pDocSh );
- void ForgetLastPattern();
+ void ForgetLastPattern();
- void UpdateSpellSettings( BOOL bFromStartTab = FALSE );
+ void UpdateSpellSettings( BOOL bFromStartTab = FALSE );
- void FormulaPreview();
+ void FormulaPreview();
- Size GetTextSize(); // in 1/100mm
+ Size GetTextSize(); // in 1/100mm
// eigentlich private, fuer SID_INPUT_SUM public
- void InitRangeFinder( const String& rFormula );
+ void InitRangeFinder( const String& rFormula );
- static void SetAutoComplete(BOOL bSet) { bAutoComplete = bSet; }
+ static void SetAutoComplete(BOOL bSet) { bAutoComplete = bSet; }
};
//========================================================================
-// ScInputHdlState
+// ScInputHdlState
//========================================================================
class ScInputHdlState
{
@@ -270,22 +270,22 @@ public:
ScInputHdlState( const ScInputHdlState& rCpy );
~ScInputHdlState();
- ScInputHdlState& operator= ( const ScInputHdlState& r );
- int operator==( const ScInputHdlState& r ) const;
- int operator!=( const ScInputHdlState& r ) const
+ ScInputHdlState& operator= ( const ScInputHdlState& r );
+ int operator==( const ScInputHdlState& r ) const;
+ int operator!=( const ScInputHdlState& r ) const
{ return !operator==( r ); }
- const ScAddress& GetPos() const { return aCursorPos; }
- const ScAddress& GetStartPos() const { return aStartPos; }
- const ScAddress& GetEndPos() const { return aEndPos; }
- const String& GetString() const { return aString; }
- const EditTextObject* GetEditData() const { return pEditData; }
+ const ScAddress& GetPos() const { return aCursorPos; }
+ const ScAddress& GetStartPos() const { return aStartPos; }
+ const ScAddress& GetEndPos() const { return aEndPos; }
+ const String& GetString() const { return aString; }
+ const EditTextObject* GetEditData() const { return pEditData; }
private:
- ScAddress aCursorPos;
- ScAddress aStartPos;
- ScAddress aEndPos;
- String aString;
+ ScAddress aCursorPos;
+ ScAddress aStartPos;
+ ScAddress aEndPos;
+ String aString;
EditTextObject* pEditData;
};
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 236d34a8254f..856a97250bae 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,27 +46,27 @@ class ScRangeList;
//========================================================================
-class ScTextWnd : public Window, public DragSourceHelper // edit window
+class ScTextWnd : public Window, public DragSourceHelper // edit window
{
public:
ScTextWnd( Window* pParent );
- virtual ~ScTextWnd();
+ virtual ~ScTextWnd();
- void SetTextString( const String& rString );
- const String& GetTextString() const;
+ void SetTextString( const String& rString );
+ const String& GetTextString() const;
- BOOL IsInputActive();
- EditView* GetEditView();
+ BOOL IsInputActive();
+ EditView* GetEditView();
// fuer FunktionsAutopiloten
- void MakeDialogEditView();
+ void MakeDialogEditView();
- void StartEditEngine();
- void StopEditEngine( BOOL bAll );
+ void StartEditEngine();
+ void StopEditEngine( BOOL bAll );
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
+ virtual void DataChanged( const DataChangedEvent& rDCEvt );
- void SetFormulaMode( BOOL bSet );
+ void SetFormulaMode( BOOL bSet );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
@@ -76,36 +76,36 @@ public:
DECL_LINK( NotifyHdl, EENotify* );
protected:
- virtual void Paint( const Rectangle& rRec );
- virtual void Resize();
+ virtual void Paint( const Rectangle& rRec );
+ virtual void Resize();
- virtual void MouseMove( const MouseEvent& rMEvt );
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void MouseButtonUp( const MouseEvent& rMEvt );
- virtual void Command( const CommandEvent& rCEvt );
- virtual void KeyInput(const KeyEvent& rKEvt);
- virtual void GetFocus();
- virtual void LoseFocus();
+ virtual void MouseMove( const MouseEvent& rMEvt );
+ virtual void MouseButtonDown( const MouseEvent& rMEvt );
+ virtual void MouseButtonUp( const MouseEvent& rMEvt );
+ virtual void Command( const CommandEvent& rCEvt );
+ virtual void KeyInput(const KeyEvent& rKEvt);
+ virtual void GetFocus();
+ virtual void LoseFocus();
- virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
+ virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
- virtual String GetText() const;
+ virtual String GetText() const;
private:
- void ImplInitSettings();
- void UpdateAutoCorrFlag();
+ void ImplInitSettings();
+ void UpdateAutoCorrFlag();
private:
typedef ::std::vector< ScAccessibleEditLineTextData* > AccTextDataVector;
- String aString;
- Font aTextFont;
- ScEditEngineDefaulter* pEditEngine; // erst bei Bedarf angelegt
- EditView* pEditView;
+ String aString;
+ Font aTextFont;
+ ScEditEngineDefaulter* pEditEngine; // erst bei Bedarf angelegt
+ EditView* pEditView;
AccTextDataVector maAccTextDatas; // #i105267# text datas may be cloned, remember all copies
- BOOL bIsRTL;
- BOOL bIsInsertMode;
- BOOL bFormulaMode;
+ BOOL bIsRTL;
+ BOOL bIsInsertMode;
+ BOOL bFormulaMode;
// #102710#; this flag should be true if a key input or a command is handled
// it prevents the call of InputChanged in the ModifyHandler of the EditEngine
@@ -114,100 +114,100 @@ private:
//========================================================================
-class ScPosWnd : public ComboBox, public SfxListener // Positionsanzeige
+class ScPosWnd : public ComboBox, public SfxListener // Positionsanzeige
{
private:
- String aPosStr;
- Accelerator* pAccel;
+ String aPosStr;
+ Accelerator* pAccel;
ULONG nTipVisible;
- BOOL bFormulaMode;
- BOOL bTopHadFocus;
+ BOOL bFormulaMode;
+ BOOL bTopHadFocus;
public:
ScPosWnd( Window* pParent );
- virtual ~ScPosWnd();
+ virtual ~ScPosWnd();
- void SetPos( const String& rPosStr ); // angezeigter Text
- void SetFormulaMode( BOOL bSet );
+ void SetPos( const String& rPosStr ); // angezeigter Text
+ void SetFormulaMode( BOOL bSet );
protected:
- virtual void Select();
+ virtual void Select();
virtual void Modify();
- virtual long Notify( NotifyEvent& rNEvt );
+ virtual long Notify( NotifyEvent& rNEvt );
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
private:
- void FillRangeNames();
- void FillFunctions();
- void DoEnter();
+ void FillRangeNames();
+ void FillFunctions();
+ void DoEnter();
void HideTip();
- void ReleaseFocus_Impl();
+ void ReleaseFocus_Impl();
};
//========================================================================
-class ScInputWindow : public ToolBox // Parent-Toolbox
+class ScInputWindow : public ToolBox // Parent-Toolbox
{
public:
ScInputWindow( Window* pParent, SfxBindings* pBind );
- virtual ~ScInputWindow();
+ virtual ~ScInputWindow();
- virtual void Resize();
+ virtual void Resize();
virtual void Select();
- void SetFuncString( const String& rString, BOOL bDoEdit = TRUE );
- void SetPosString( const String& rStr );
- void SetTextString( const String& rString );
+ void SetFuncString( const String& rString, BOOL bDoEdit = TRUE );
+ void SetPosString( const String& rStr );
+ void SetTextString( const String& rString );
- void SetOkCancelMode();
- void SetSumAssignMode();
- void EnableButtons( BOOL bEnable = TRUE );
+ void SetOkCancelMode();
+ void SetSumAssignMode();
+ void EnableButtons( BOOL bEnable = TRUE );
- void SetFormulaMode( BOOL bSet );
+ void SetFormulaMode( BOOL bSet );
- BOOL IsInputActive();
- EditView* GetEditView();
-//UNUSED2008-05 EditView* ActivateEdit( const String& rText,
+ BOOL IsInputActive();
+ EditView* GetEditView();
+//UNUSED2008-05 EditView* ActivateEdit( const String& rText,
//UNUSED2008-05 const ESelection& rSel );
- void TextGrabFocus();
- void TextInvalidate();
- void SwitchToTextWin();
+ void TextGrabFocus();
+ void TextInvalidate();
+ void SwitchToTextWin();
- void PosGrabFocus();
+ void PosGrabFocus();
// Fuer FunktionsAutopiloten
- void MakeDialogEditView();
+ void MakeDialogEditView();
- void StopEditEngine( BOOL bAll );
+ void StopEditEngine( BOOL bAll );
- void SetInputHandler( ScInputHandler* pNew );
+ void SetInputHandler( ScInputHandler* pNew );
- ScInputHandler* GetInputHandler(){ return pInputHdl;}
+ ScInputHandler* GetInputHandler(){ return pInputHdl;}
- void StateChanged( StateChangedType nType );
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
+ void StateChanged( StateChangedType nType );
+ virtual void DataChanged( const DataChangedEvent& rDCEvt );
protected:
- virtual void SetText( const String& rString );
- virtual String GetText() const;
+ virtual void SetText( const String& rString );
+ virtual String GetText() const;
sal_Bool UseSubTotal( ScRangeList* pRangeList ) const;
private:
- ScPosWnd aWndPos;
- ScTextWnd aTextWindow;
- ScInputHandler* pInputHdl;
+ ScPosWnd aWndPos;
+ ScTextWnd aTextWindow;
+ ScInputHandler* pInputHdl;
SfxBindings* pBindings;
- String aTextOk;
- String aTextCancel;
- String aTextSum;
- String aTextEqual;
- BOOL bIsOkCancelMode;
+ String aTextOk;
+ String aTextCancel;
+ String aTextSum;
+ String aTextEqual;
+ BOOL bIsOkCancelMode;
};
//==================================================================
@@ -215,10 +215,10 @@ private:
class ScInputWindowWrapper : public SfxChildWindow
{
public:
- ScInputWindowWrapper( Window* pParent,
- USHORT nId,
- SfxBindings* pBindings,
- SfxChildWinInfo* pInfo );
+ ScInputWindowWrapper( Window* pParent,
+ USHORT nId,
+ SfxBindings* pBindings,
+ SfxChildWinInfo* pInfo );
SFX_DECL_CHILDWINDOW(ScInputWindowWrapper);
};
diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx
index fd8c090cfd33..55480d22db74 100644
--- a/sc/source/ui/inc/inscldlg.hxx
+++ b/sc/source/ui/inc/inscldlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +41,13 @@ class ScInsertCellDlg : public ModalDialog
{
private:
FixedLine aFlFrame;
- RadioButton aBtnCellsDown;
- RadioButton aBtnCellsRight;
- RadioButton aBtnInsRows;
- RadioButton aBtnInsCols;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ RadioButton aBtnCellsDown;
+ RadioButton aBtnCellsRight;
+ RadioButton aBtnInsRows;
+ RadioButton aBtnInsCols;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
public:
ScInsertCellDlg( Window* pParent,BOOL bDisallowCellMove = FALSE );
diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx
index ffdccaba6a10..90f3ecb3d65b 100644
--- a/sc/source/ui/inc/inscodlg.hxx
+++ b/sc/source/ui/inc/inscodlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,79 +34,79 @@
#include "global.hxx"
//------------------------------------------------------------------------
-//CHINA001 #define INS_CONT_NOEMPTY 0x0100
-//CHINA001 #define INS_CONT_TRANS 0x0200
-//CHINA001 #define INS_CONT_LINK 0x0400
-//CHINA001
-//CHINA001 #define SC_CELL_SHIFT_DISABLE_DOWN 0x01
-//CHINA001 #define SC_CELL_SHIFT_DISABLE_RIGHT 0x02
+//CHINA001 #define INS_CONT_NOEMPTY 0x0100
+//CHINA001 #define INS_CONT_TRANS 0x0200
+//CHINA001 #define INS_CONT_LINK 0x0400
+//CHINA001
+//CHINA001 #define SC_CELL_SHIFT_DISABLE_DOWN 0x01
+//CHINA001 #define SC_CELL_SHIFT_DISABLE_RIGHT 0x02
#include "scui_def.hxx"
class ScInsertContentsDlg : public ModalDialog
{
public:
- ScInsertContentsDlg( Window* pParent,
- USHORT nCheckDefaults = 0,
- const String* pStrTitle = NULL );
+ ScInsertContentsDlg( Window* pParent,
+ USHORT nCheckDefaults = 0,
+ const String* pStrTitle = NULL );
~ScInsertContentsDlg();
- USHORT GetInsContentsCmdBits() const;
- USHORT GetFormulaCmdBits() const;
- BOOL IsSkipEmptyCells() const {return aBtnSkipEmptyCells.IsChecked();}
- BOOL IsTranspose() const {return aBtnTranspose.IsChecked();}
- BOOL IsLink() const {return aBtnLink.IsChecked();}
- InsCellCmd GetMoveMode();
+ USHORT GetInsContentsCmdBits() const;
+ USHORT GetFormulaCmdBits() const;
+ BOOL IsSkipEmptyCells() const {return aBtnSkipEmptyCells.IsChecked();}
+ BOOL IsTranspose() const {return aBtnTranspose.IsChecked();}
+ BOOL IsLink() const {return aBtnLink.IsChecked();}
+ InsCellCmd GetMoveMode();
- void SetOtherDoc( BOOL bSet );
- void SetFillMode( BOOL bSet );
- void SetChangeTrack( BOOL bSet );
- void SetCellShiftDisabled( int nDisable );
+ void SetOtherDoc( BOOL bSet );
+ void SetFillMode( BOOL bSet );
+ void SetChangeTrack( BOOL bSet );
+ void SetCellShiftDisabled( int nDisable );
private:
FixedLine aFlFrame;
- CheckBox aBtnInsAll;
- CheckBox aBtnInsStrings;
- CheckBox aBtnInsNumbers;
- CheckBox aBtnInsDateTime;
- CheckBox aBtnInsFormulas;
- CheckBox aBtnInsNotes;
- CheckBox aBtnInsAttrs;
- CheckBox aBtnInsObjects;
+ CheckBox aBtnInsAll;
+ CheckBox aBtnInsStrings;
+ CheckBox aBtnInsNumbers;
+ CheckBox aBtnInsDateTime;
+ CheckBox aBtnInsFormulas;
+ CheckBox aBtnInsNotes;
+ CheckBox aBtnInsAttrs;
+ CheckBox aBtnInsObjects;
FixedLine aFlSep1;
FixedLine aFlOptions;
- CheckBox aBtnSkipEmptyCells;
- CheckBox aBtnTranspose;
- CheckBox aBtnLink;
+ CheckBox aBtnSkipEmptyCells;
+ CheckBox aBtnTranspose;
+ CheckBox aBtnLink;
FixedLine aFlOperation;
- RadioButton aRbNoOp;
- RadioButton aRbAdd;
- RadioButton aRbSub;
- RadioButton aRbMul;
- RadioButton aRbDiv;
+ RadioButton aRbNoOp;
+ RadioButton aRbAdd;
+ RadioButton aRbSub;
+ RadioButton aRbMul;
+ RadioButton aRbDiv;
FixedLine aFlSep2;
FixedLine aFlMove;
- RadioButton aRbMoveNone;
- RadioButton aRbMoveDown;
- RadioButton aRbMoveRight;
-
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
-
- BOOL bOtherDoc;
- BOOL bFillMode;
- BOOL bChangeTrack;
- BOOL bMoveDownDisabled;
- BOOL bMoveRightDisabled;
-
- static BOOL bPreviousAllCheck;
- static USHORT nPreviousChecks;
- static USHORT nPreviousChecks2;
- static USHORT nPreviousFormulaChecks;
- static USHORT nPreviousMoveMode; // enum InsCellCmd
+ RadioButton aRbMoveNone;
+ RadioButton aRbMoveDown;
+ RadioButton aRbMoveRight;
+
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
+
+ BOOL bOtherDoc;
+ BOOL bFillMode;
+ BOOL bChangeTrack;
+ BOOL bMoveDownDisabled;
+ BOOL bMoveRightDisabled;
+
+ static BOOL bPreviousAllCheck;
+ static USHORT nPreviousChecks;
+ static USHORT nPreviousChecks2;
+ static USHORT nPreviousFormulaChecks;
+ static USHORT nPreviousMoveMode; // enum InsCellCmd
void DisableChecks( BOOL bInsAllChecked = TRUE );
void TestModes();
diff --git a/sc/source/ui/inc/instbdlg.hrc b/sc/source/ui/inc/instbdlg.hrc
index 08bff85388dd..1b3388761029 100644
--- a/sc/source/ui/inc/instbdlg.hrc
+++ b/sc/source/ui/inc/instbdlg.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,24 +29,24 @@
//#define RID_SCDLG_INSERT_TABLE 300
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_HELP 3
+#define BTN_OK 1
+#define BTN_CANCEL 2
+#define BTN_HELP 3
-#define FL_POSITION 10
-#define RB_BEFORE 11
-#define RB_BEHIND 12
+#define FL_POSITION 10
+#define RB_BEFORE 11
+#define RB_BEHIND 12
-#define FL_TABLE 20
-#define RB_NEW 21
-#define FT_COUNT 22
-#define NF_COUNT 23
-#define FT_NAME 24
-#define ED_TABNAME 25
-#define RB_FROMFILE 26
-#define LB_TABLES 27
-#define BTN_BROWSE 28
-#define CB_LINK 29
-#define FT_PATH 30
+#define FL_TABLE 20
+#define RB_NEW 21
+#define FT_COUNT 22
+#define NF_COUNT 23
+#define FT_NAME 24
+#define ED_TABNAME 25
+#define RB_FROMFILE 26
+#define LB_TABLES 27
+#define BTN_BROWSE 28
+#define CB_LINK 29
+#define FT_PATH 30
diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx
index 660d16b62cca..814fd23443cd 100644
--- a/sc/source/ui/inc/instbdlg.hxx
+++ b/sc/source/ui/inc/instbdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,35 +71,35 @@ public:
ScInsertTableDlg( Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile );
~ScInsertTableDlg();
- virtual short Execute(); // ueberladen, um Dialog-Parent zu setzen
+ virtual short Execute(); // ueberladen, um Dialog-Parent zu setzen
- BOOL GetTablesFromFile() { return aBtnFromFile.IsChecked(); }
- BOOL GetTablesAsLink() { return aBtnLink.IsChecked(); }
+ BOOL GetTablesFromFile() { return aBtnFromFile.IsChecked(); }
+ BOOL GetTablesAsLink() { return aBtnLink.IsChecked(); }
- const String* GetFirstTable( USHORT* pN = NULL );
- const String* GetNextTable( USHORT* pN = NULL );
- ScDocShell* GetDocShellTables() { return pDocShTables; }
- BOOL IsTableBefore() { return aBtnBefore.IsChecked(); }
- SCTAB GetTableCount() { return nTableCount;}
+ const String* GetFirstTable( USHORT* pN = NULL );
+ const String* GetNextTable( USHORT* pN = NULL );
+ ScDocShell* GetDocShellTables() { return pDocShTables; }
+ BOOL IsTableBefore() { return aBtnBefore.IsChecked(); }
+ SCTAB GetTableCount() { return nTableCount;}
private:
- RadioButton aBtnBefore;
- RadioButton aBtnBehind;
- FixedLine aFlPos;
- RadioButton aBtnNew;
- RadioButton aBtnFromFile;
- FixedText aFtCount;
- NumericField aNfCount;
- FixedText aFtName;
- Edit aEdName;
- MultiListBox aLbTables;
- ScExpandedFixedText aFtPath;
- PushButton aBtnBrowse;
- CheckBox aBtnLink;
- FixedLine aFlTable;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ RadioButton aBtnBefore;
+ RadioButton aBtnBehind;
+ FixedLine aFlPos;
+ RadioButton aBtnNew;
+ RadioButton aBtnFromFile;
+ FixedText aFtCount;
+ NumericField aNfCount;
+ FixedText aFtName;
+ Edit aEdName;
+ MultiListBox aLbTables;
+ ScExpandedFixedText aFtPath;
+ PushButton aBtnBrowse;
+ CheckBox aBtnLink;
+ FixedLine aFlTable;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
Timer aBrowseTimer;
ScViewData& rViewData;
@@ -109,16 +109,16 @@ private:
SfxObjectShellRef aDocShTablesRef;
bool bMustClose;
- USHORT nSelTabIndex; // fuer GetFirstTable() / GetNextTable()
- String aStrCurSelTable;
- SCTAB nTableCount;
+ USHORT nSelTabIndex; // fuer GetFirstTable() / GetNextTable()
+ String aStrCurSelTable;
+ SCTAB nTableCount;
#ifdef SC_INSTBDLG_CXX
void Init_Impl( bool bFromFile );
- void SetNewTable_Impl();
- void SetFromTo_Impl();
- void FillTables_Impl( ScDocument* pSrcDoc );
- void DoEnable_Impl();
+ void SetNewTable_Impl();
+ void SetFromTo_Impl();
+ void FillTables_Impl( ScDocument* pSrcDoc );
+ void DoEnable_Impl();
DECL_LINK( BrowseHdl_Impl, PushButton* );
DECL_LINK( ChoiceHdl_Impl, RadioButton* );
diff --git a/sc/source/ui/inc/invmerge.hxx b/sc/source/ui/inc/invmerge.hxx
index 49dfbc730fee..5c6c9adf632e 100644
--- a/sc/source/ui/inc/invmerge.hxx
+++ b/sc/source/ui/inc/invmerge.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,21 +37,21 @@ class Window;
class ScInvertMerger
{
private:
- Window* pWin;
+ Window* pWin;
::std::vector< Rectangle >* pRects;
- Rectangle aTotalRect;
- Rectangle aLineRect;
+ Rectangle aTotalRect;
+ Rectangle aLineRect;
- void FlushLine();
- void FlushTotal();
+ void FlushLine();
+ void FlushTotal();
public:
ScInvertMerger( Window* pWindow );
ScInvertMerger( ::std::vector< Rectangle >* pRectangles );
~ScInvertMerger();
- void AddRect( const Rectangle& rRect );
- void Flush();
+ void AddRect( const Rectangle& rRect );
+ void Flush();
};
diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx
index fa288c609070..6b420430ce17 100644
--- a/sc/source/ui/inc/lbseldlg.hxx
+++ b/sc/source/ui/inc/lbseldlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,19 +45,19 @@ class ScSelEntryDlg : public ModalDialog
{
private:
FixedLine aFlLbTitle;
- ListBox aLb;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ ListBox aLb;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
DECL_LINK( DblClkHdl, void * );
public:
- ScSelEntryDlg( Window* pParent,
- USHORT nResId,
+ ScSelEntryDlg( Window* pParent,
+ USHORT nResId,
const String& aTitle,
const String& aLbTitle,
- List& aEntryList );
+ List& aEntryList );
~ScSelEntryDlg();
String GetSelectEntry() const;
diff --git a/sc/source/ui/inc/linkarea.hrc b/sc/source/ui/inc/linkarea.hrc
index bc906fdb14ad..f0e9ae7120f2 100644
--- a/sc/source/ui/inc/linkarea.hrc
+++ b/sc/source/ui/inc/linkarea.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,16 +27,16 @@
#include <sc.hrc>
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_HELP 3
-#define FL_LOCATION 4
-#define CB_URL 5
-#define BTN_BROWSE 6
-#define FT_HINT 7
-#define FT_RANGES 8
-#define LB_RANGES 9
-#define BTN_RELOAD 10
-#define NF_DELAY 11
-#define FT_SECONDS 12
+#define BTN_OK 1
+#define BTN_CANCEL 2
+#define BTN_HELP 3
+#define FL_LOCATION 4
+#define CB_URL 5
+#define BTN_BROWSE 6
+#define FT_HINT 7
+#define FT_RANGES 8
+#define LB_RANGES 9
+#define BTN_RELOAD 10
+#define NF_DELAY 11
+#define FT_SECONDS 12
diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx
index c90e1ea47e94..cbcba4f8af8f 100644
--- a/sc/source/ui/inc/linkarea.hxx
+++ b/sc/source/ui/inc/linkarea.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include <svtools/stdctrl.hxx>
#include <svtools/inettbc.hxx>
-//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
namespace sfx2 { class DocumentInserter; }
namespace sfx2 { class FileDialogHelper; }
@@ -55,18 +55,18 @@ class ScDocShell;
class ScLinkedAreaDlg : public ModalDialog
{
private:
- FixedLine aFlLocation;
- SvtURLBox aCbUrl;
- PushButton aBtnBrowse;
- FixedInfo aTxtHint;
- FixedText aFtRanges;
- MultiListBox aLbRanges;
- CheckBox aBtnReload;
- NumericField aNfDelay;
- FixedText aFtSeconds;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ FixedLine aFlLocation;
+ SvtURLBox aCbUrl;
+ PushButton aBtnBrowse;
+ FixedInfo aTxtHint;
+ FixedText aFtRanges;
+ MultiListBox aLbRanges;
+ CheckBox aBtnReload;
+ NumericField aNfDelay;
+ FixedText aFtSeconds;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
ScDocShell* pSourceShell;
sfx2::DocumentInserter* pDocInserter;
@@ -80,26 +80,26 @@ private:
DECL_LINK( ReloadHdl, CheckBox* );
DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* );
- void UpdateSourceRanges();
- void UpdateEnable();
- void LoadDocument( const String& rFile, const String& rFilter,
+ void UpdateSourceRanges();
+ void UpdateEnable();
+ void LoadDocument( const String& rFile, const String& rFilter,
const String& rOptions );
public:
ScLinkedAreaDlg( Window* pParent );
~ScLinkedAreaDlg();
- void InitFromOldLink( const String& rFile, const String& rFilter,
+ void InitFromOldLink( const String& rFile, const String& rFilter,
const String& rOptions, const String& rSource,
ULONG nRefresh );
- virtual short Execute(); // overwritten to set dialog parent
+ virtual short Execute(); // overwritten to set dialog parent
- String GetURL();
- String GetFilter(); // may be empty
- String GetOptions(); // filter options
- String GetSource(); // separated by ";"
- ULONG GetRefresh(); // 0 if disabled
+ String GetURL();
+ String GetFilter(); // may be empty
+ String GetOptions(); // filter options
+ String GetSource(); // separated by ";"
+ ULONG GetRefresh(); // 0 if disabled
};
#endif
diff --git a/sc/source/ui/inc/lnktrans.hxx b/sc/source/ui/inc/lnktrans.hxx
index 7e37c6cce554..e21973d48839 100644
--- a/sc/source/ui/inc/lnktrans.hxx
+++ b/sc/source/ui/inc/lnktrans.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,19 +34,19 @@
class ScLinkTransferObj : public TransferableHelper
{
private:
- String aLinkURL;
- String aLinkText;
+ String aLinkURL;
+ String aLinkText;
public:
ScLinkTransferObj();
virtual ~ScLinkTransferObj();
- void SetLinkURL( const String& rURL, const String& rText );
+ void SetLinkURL( const String& rURL, const String& rText );
- virtual void AddSupportedFormats();
- virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
- virtual void ObjectReleased();
- virtual void DragFinished( sal_Int8 nDropAction );
+ virtual void AddSupportedFormats();
+ virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+ virtual void ObjectReleased();
+ virtual void DragFinished( sal_Int8 nDropAction );
};
#endif
diff --git a/sc/source/ui/inc/mediash.hxx b/sc/source/ui/inc/mediash.hxx
index e297dc11777a..a94e1558fbc9 100644
--- a/sc/source/ui/inc/mediash.hxx
+++ b/sc/source/ui/inc/mediash.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +45,10 @@ public:
SFX_DECL_INTERFACE(SCID_MEDIA_SHELL)
ScMediaShell(ScViewData* pData);
- virtual ~ScMediaShell();
+ virtual ~ScMediaShell();
- void ExecuteMedia(SfxRequest& rReq);
- void GetMediaState(SfxItemSet &rSet);
+ void ExecuteMedia(SfxRequest& rReq);
+ void GetMediaState(SfxItemSet &rSet);
};
#endif
diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc
index 00b1658849d6..160c7b026ec1 100644
--- a/sc/source/ui/inc/miscdlgs.hrc
+++ b/sc/source/ui/inc/miscdlgs.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 "sc.hrc" // -> RID_SCDLG_DELCELL
+#include "sc.hrc" // -> RID_SCDLG_DELCELL
// -> RID_SCDLG_INSCELL
// -> RID_SCDLG_DELCONT
// -> RID_SCDLG_INSCONT
@@ -52,41 +52,41 @@
// allgemein
#define BTN_OK 100
-#define BTN_CANCEL 102
+#define BTN_CANCEL 102
#define BTN_HELP 103
-#define BTN_MORE 104
-#define BTN_ADD 105
-#define BTN_REMOVE 106
-#define FT_LABEL 110
+#define BTN_MORE 104
+#define BTN_ADD 105
+#define BTN_REMOVE 106
+#define FT_LABEL 110
#define FL_FRAME 112
-#define STR_BTN_CLOSE 200
+#define STR_BTN_CLOSE 200
// Zellen loeschen/einfuegen Dialog
#define BTN_CELLSUP 10
#define BTN_CELLSDOWN 11
#define BTN_CELLSRIGHT 12
-#define BTN_CELLSLEFT 13
+#define BTN_CELLSLEFT 13
#define BTN_DELROWS 14
#define BTN_DELCOLS 15
#define BTN_INSROWS 16
#define BTN_INSCOLS 17
// Inhalte loeschen/einfuegen Dialog
-#define BTN_DELALL 10
-#define BTN_DELSTRINGS 11
-#define BTN_DELNUMBERS 12
-#define BTN_DELDATETIME 13
-#define BTN_DELFORMULAS 14
-#define BTN_DELATTRS 15
-#define BTN_DELNOTES 16
-#define BTN_DELOBJECTS 17
-#define BTN_INSALL 20
-#define BTN_INSSTRINGS 21
-#define BTN_INSNUMBERS 22
-#define BTN_INSDATETIME 23
-#define BTN_INSFORMULAS 24
-#define BTN_INSATTRS 25
-#define BTN_INSNOTES 26
+#define BTN_DELALL 10
+#define BTN_DELSTRINGS 11
+#define BTN_DELNUMBERS 12
+#define BTN_DELDATETIME 13
+#define BTN_DELFORMULAS 14
+#define BTN_DELATTRS 15
+#define BTN_DELNOTES 16
+#define BTN_DELOBJECTS 17
+#define BTN_INSALL 20
+#define BTN_INSSTRINGS 21
+#define BTN_INSNUMBERS 22
+#define BTN_INSDATETIME 23
+#define BTN_INSFORMULAS 24
+#define BTN_INSATTRS 25
+#define BTN_INSNOTES 26
#define BTN_OP_NOOP 27
#define BTN_OP_ADD 28
#define BTN_OP_SUB 29
@@ -97,28 +97,28 @@
#define BTN_TRANSPOSE 34
#define BTN_LINK 35
#define FL_OPTIONS 36
-#define BTN_MV_NONE 37
-#define BTN_MV_DOWN 38
-#define BTN_MV_RIGHT 39
+#define BTN_MV_NONE 37
+#define BTN_MV_DOWN 38
+#define BTN_MV_RIGHT 39
#define FL_MOVE 40
#define BTN_INSOBJECTS 41
#define FL_SEP1 51
#define FL_SEP2 52
// Tabelle einfuegen/loeschen
-#define FT_DEST 1
-#define LB_DEST 2
-#define FT_INSERT 3
-#define LB_INSERT 4
-#define BTN_COPY 5
+#define FT_DEST 1
+#define LB_DEST 2
+#define FT_INSERT 3
+#define LB_INSERT 4
+#define BTN_COPY 5
#define STR_NEWDOC 6
// Eingabe eines Strings
-#define ED_INPUT 10
+#define ED_INPUT 10
// Eingabe einer Metrik
-#define ED_VALUE 1
-#define BTN_DEFVAL 1
+#define ED_VALUE 1
+#define BTN_DEFVAL 1
// Auswahl aus einer (String-)ListBox
#define FL_ENTRYLIST 10
@@ -143,44 +143,44 @@
#define BTN_MONTH 24
#define BTN_YEAR 25
#define FT_INCREMENT 30
-#define ED_INCREMENT 39
-#define FT_END_VALUE 40
-#define ED_END_VALUES 49
-#define STR_VALERR 50
-#define FT_START_VALUE 51
-#define ED_START_VALUES 52
+#define ED_INCREMENT 39
+#define FT_END_VALUE 40
+#define ED_END_VALUES 49
+#define STR_VALERR 50
+#define FT_START_VALUE 51
+#define ED_START_VALUES 52
// Autoformat
-#define LB_FORMAT 1
+#define LB_FORMAT 1
#define FL_FORMAT 9
-#define WND_PREVIEW 19
-#define BTN_NUMFORMAT 20
-#define BTN_BORDER 21
-#define BTN_FONT 23
-#define BTN_PATTERN 24
-#define BTN_ALIGNMENT 25
-#define BTN_ADJUST 26
-#define BTN_RENAME 27
+#define WND_PREVIEW 19
+#define BTN_NUMFORMAT 20
+#define BTN_BORDER 21
+#define BTN_FONT 23
+#define BTN_PATTERN 24
+#define BTN_ALIGNMENT 25
+#define BTN_ADJUST 26
+#define BTN_RENAME 27
#define FL_FORMATTING 29
-#define STR_ADD_TITLE 100
-#define STR_ADD_LABEL 101
-#define STR_DEL_TITLE 102
-#define STR_DEL_MSG 103
-#define STR_RENAME_TITLE 104
+#define STR_ADD_TITLE 100
+#define STR_ADD_LABEL 101
+#define STR_DEL_TITLE 102
+#define STR_DEL_MSG 103
+#define STR_RENAME_TITLE 104
// Autoformat-Preview:
-#define STR_JAN 121
-#define STR_FEB 122
-#define STR_MAR 123
-#define STR_NORTH 124
-#define STR_MID 125
-#define STR_SOUTH 126
-#define STR_SUM 127
+#define STR_JAN 121
+#define STR_FEB 122
+#define STR_MAR 123
+#define STR_NORTH 124
+#define STR_MID 125
+#define STR_SOUTH 126
+#define STR_SUM 127
// Gruppierung setzen/aufheben:
-#define BTN_GROUP_COLS 1
-#define BTN_GROUP_ROWS 3
-#define STR_GROUP 1
-#define STR_UNGROUP 2
+#define BTN_GROUP_COLS 1
+#define BTN_GROUP_ROWS 3
+#define STR_GROUP 1
+#define STR_UNGROUP 2
// Tab Bg Color
#define TAB_BG_COLOR_CT_BORDER 1
diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx
index 7bc33b3af96b..7fe407abc5b1 100644
--- a/sc/source/ui/inc/msgpool.hxx
+++ b/sc/source/ui/inc/msgpool.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,20 +48,20 @@ class ScDocumentPool;
class ScMessagePool: public SfxItemPool
{
- SfxStringItem aGlobalStringItem;
- SvxSearchItem aGlobalSearchItem;
- ScSortItem aGlobalSortItem;
- ScQueryItem aGlobalQueryItem;
- ScSubTotalItem aGlobalSubTotalItem;
- ScConsolidateItem aGlobalConsolidateItem;
- ScPivotItem aGlobalPivotItem;
- ScSolveItem aGlobalSolveItem;
- ScUserListItem aGlobalUserListItem;
+ SfxStringItem aGlobalStringItem;
+ SvxSearchItem aGlobalSearchItem;
+ ScSortItem aGlobalSortItem;
+ ScQueryItem aGlobalQueryItem;
+ ScSubTotalItem aGlobalSubTotalItem;
+ ScConsolidateItem aGlobalConsolidateItem;
+ ScPivotItem aGlobalPivotItem;
+ ScSolveItem aGlobalSolveItem;
+ ScUserListItem aGlobalUserListItem;
- SfxBoolItem aPrintWarnItem;
+ SfxBoolItem aPrintWarnItem;
- SfxPoolItem** ppPoolDefaults;
- ScDocumentPool* pDocPool;
+ SfxPoolItem** ppPoolDefaults;
+ ScDocumentPool* pDocPool;
public:
ScMessagePool();
@@ -69,7 +69,7 @@ protected:
virtual ~ScMessagePool();
public:
- virtual SfxMapUnit GetMetric( USHORT nWhich ) const;
+ virtual SfxMapUnit GetMetric( USHORT nWhich ) const;
};
diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx
index f88f57a74e58..18110d512853 100644
--- a/sc/source/ui/inc/mtrindlg.hxx
+++ b/sc/source/ui/inc/mtrindlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,29 +39,29 @@
class ScMetricInputDlg : public ModalDialog
{
public:
- ScMetricInputDlg( Window* pParent,
- USHORT nResId, // Ableitung fuer jeden Dialog!
- long nCurrent,
- long nDefault,
- FieldUnit eFUnit = FUNIT_MM,
- USHORT nDecimals = 2,
- long nMaximum = 1000,
- long nMinimum = 0,
- long nFirst = 1,
+ ScMetricInputDlg( Window* pParent,
+ USHORT nResId, // Ableitung fuer jeden Dialog!
+ long nCurrent,
+ long nDefault,
+ FieldUnit eFUnit = FUNIT_MM,
+ USHORT nDecimals = 2,
+ long nMaximum = 1000,
+ long nMinimum = 0,
+ long nFirst = 1,
long nLast = 100 );
~ScMetricInputDlg();
long GetInputValue( FieldUnit eUnit = FUNIT_TWIP ) const;
private:
- FixedText aFtEditTitle;
- MetricField aEdValue;
- CheckBox aBtnDefVal;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
- long nDefaultValue;
- long nCurrentValue;
+ FixedText aFtEditTitle;
+ MetricField aEdValue;
+ CheckBox aBtnDefVal;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
+ long nDefaultValue;
+ long nCurrentValue;
void CalcPositions();
DECL_LINK( SetDefValHdl, CheckBox * );
diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx
index d5ce7726243f..3881497ec1f4 100644
--- a/sc/source/ui/inc/mvtabdlg.hxx
+++ b/sc/source/ui/inc/mvtabdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,28 +46,28 @@ public:
ScMoveTableDlg( Window* pParent );
~ScMoveTableDlg();
- USHORT GetSelectedDocument () const;
- SCTAB GetSelectedTable () const;
- BOOL GetCopyTable () const;
- void SetCopyTable (BOOL bFlag=TRUE);
- void EnableCopyTable (BOOL bFlag=TRUE);
+ USHORT GetSelectedDocument () const;
+ SCTAB GetSelectedTable () const;
+ BOOL GetCopyTable () const;
+ void SetCopyTable (BOOL bFlag=TRUE);
+ void EnableCopyTable (BOOL bFlag=TRUE);
private:
- FixedText aFtDoc;
- ListBox aLbDoc;
- FixedText aFtTable;
- ListBox aLbTable;
- CheckBox aBtnCopy;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ FixedText aFtDoc;
+ ListBox aLbDoc;
+ FixedText aFtTable;
+ ListBox aLbTable;
+ CheckBox aBtnCopy;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
- USHORT nDocument;
- SCTAB nTable;
- BOOL bCopyTable;
+ USHORT nDocument;
+ SCTAB nTable;
+ BOOL bCopyTable;
//--------------------------------------
- void Init ();
- void InitDocListBox ();
+ void Init ();
+ void InitDocListBox ();
DECL_LINK( OkHdl, void * );
DECL_LINK( SelHdl, ListBox * );
};
diff --git a/sc/source/ui/inc/namecrea.hxx b/sc/source/ui/inc/namecrea.hxx
index e4e053fe0bcf..b89fe079730b 100644
--- a/sc/source/ui/inc/namecrea.hxx
+++ b/sc/source/ui/inc/namecrea.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,28 +31,28 @@
#include <vcl/dialog.hxx>
#include <vcl/imagebtn.hxx>
#include <vcl/fixed.hxx>
-#include "scui_def.hxx" //CHINA001
+#include "scui_def.hxx" //CHINA001
-//CHINA001 #define NAME_TOP 1
-//CHINA001 #define NAME_LEFT 2
-//CHINA001 #define NAME_BOTTOM 4
-//CHINA001 #define NAME_RIGHT 8
+//CHINA001 #define NAME_TOP 1
+//CHINA001 #define NAME_LEFT 2
+//CHINA001 #define NAME_BOTTOM 4
+//CHINA001 #define NAME_RIGHT 8
class ScNameCreateDlg : public ModalDialog
{
protected:
FixedLine aFixedLine;
- CheckBox aTopBox;
- CheckBox aLeftBox;
- CheckBox aBottomBox;
- CheckBox aRightBox;
- OKButton aOKButton;
- CancelButton aCancelButton;
- HelpButton aHelpButton;
+ CheckBox aTopBox;
+ CheckBox aLeftBox;
+ CheckBox aBottomBox;
+ CheckBox aRightBox;
+ OKButton aOKButton;
+ CancelButton aCancelButton;
+ HelpButton aHelpButton;
public:
ScNameCreateDlg( Window * pParent, USHORT nFlags );
- USHORT GetFlags() const;
+ USHORT GetFlags() const;
};
diff --git a/sc/source/ui/inc/namedlg.hrc b/sc/source/ui/inc/namedlg.hrc
index b2eec6879ec3..5381df425e90 100644
--- a/sc/source/ui/inc/namedlg.hrc
+++ b/sc/source/ui/inc/namedlg.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
@@ -28,25 +28,25 @@
#include "sc.hrc" // -> RID_SCDLG_NAMES
#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_ADD 3
-#define BTN_REMOVE 4
-#define BTN_HELP 5
-#define BTN_MORE 6
+#define BTN_CANCEL 2
+#define BTN_ADD 3
+#define BTN_REMOVE 4
+#define BTN_HELP 5
+#define BTN_MORE 6
//
#define FL_NAME 11
-#define ED_NAME 12
+#define ED_NAME 12
#define FL_ASSIGN 13
-#define ED_ASSIGN 15
-#define RB_ASSIGN 16
+#define ED_ASSIGN 15
+#define RB_ASSIGN 16
//
-#define STR_ADD 21
-#define STR_MODIFY 22
+#define STR_ADD 21
+#define STR_MODIFY 22
#define STR_INVALIDSYMBOL 23
//
-#define BTN_CRITERIA 31
-#define BTN_PRINTAREA 32
-#define BTN_COLHEADER 33
-#define BTN_ROWHEADER 34
-#define FL_TYPE 35
+#define BTN_CRITERIA 31
+#define BTN_PRINTAREA 32
+#define BTN_COLHEADER 33
+#define BTN_ROWHEADER 34
+#define FL_TYPE 35
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index b122c57a19fd..66976c69f547 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,35 +51,35 @@ class ScNameDlg : public ScAnyRefDlg
{
private:
FixedLine aFlName;
- ComboBox aEdName;
+ ComboBox aEdName;
FixedLine aFlAssign;
- formula::RefEdit aEdAssign;
- formula::RefButton aRbAssign;
-
- FixedLine aFlType;
- CheckBox aBtnPrintArea;
- CheckBox aBtnColHeader;
- CheckBox aBtnCriteria;
- CheckBox aBtnRowHeader;
-
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
- PushButton aBtnAdd;
- PushButton aBtnRemove;
- MoreButton aBtnMore;
- BOOL bSaved;
-
- const String aStrAdd; // "Hinzufuegen"
- const String aStrModify; // "Aendern"
- const String errMsgInvalidSym;
-
- ScViewData* pViewData;
- ScDocument* pDoc;
- ScRangeName aLocalRangeName;
- const ScAddress theCursorPos;
- Selection theCurSel;
+ formula::RefEdit aEdAssign;
+ formula::RefButton aRbAssign;
+
+ FixedLine aFlType;
+ CheckBox aBtnPrintArea;
+ CheckBox aBtnColHeader;
+ CheckBox aBtnCriteria;
+ CheckBox aBtnRowHeader;
+
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
+ PushButton aBtnAdd;
+ PushButton aBtnRemove;
+ MoreButton aBtnMore;
+ BOOL bSaved;
+
+ const String aStrAdd; // "Hinzufuegen"
+ const String aStrModify; // "Aendern"
+ const String errMsgInvalidSym;
+
+ ScViewData* pViewData;
+ ScDocument* pDoc;
+ ScRangeName aLocalRangeName;
+ const ScAddress theCursorPos;
+ Selection theCurSel;
#ifdef _NAMEDLG_CXX
private:
@@ -100,20 +100,20 @@ private:
protected:
- virtual void RefInputDone( BOOL bForced = FALSE );
+ virtual void RefInputDone( BOOL bForced = FALSE );
public:
ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
- ScViewData* ptrViewData,
- const ScAddress& aCursorPos );
+ ScViewData* ptrViewData,
+ const ScAddress& aCursorPos );
~ScNameDlg();
- virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual BOOL IsRefInputMode() const;
+ virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
+ virtual BOOL IsRefInputMode() const;
- virtual void SetActive();
- virtual BOOL Close();
+ virtual void SetActive();
+ virtual BOOL Close();
};
diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx
index 3286af7b81bc..7fc73e9d66ed 100644
--- a/sc/source/ui/inc/namepast.hxx
+++ b/sc/source/ui/inc/namepast.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
-#include "scui_def.hxx" //CHINA001
-//CHINA001 #define BTN_PASTE_NAME 100
-//CHINA001 #define BTN_PASTE_LIST 101
-//CHINA001
+#include "scui_def.hxx" //CHINA001
+//CHINA001 #define BTN_PASTE_NAME 100
+//CHINA001 #define BTN_PASTE_LIST 101
+//CHINA001
class ScRangeName;
class ScNamePasteDlg : public ModalDialog
@@ -46,16 +46,16 @@ class ScNamePasteDlg : public ModalDialog
DECL_LINK( ListDblClickHdl, ListBox * );
protected:
- FixedText aLabelText;
- ListBox aNameList;
- OKButton aOKButton;
- CancelButton aCancelButton;
- HelpButton aHelpButton;
- PushButton aInsListButton;
+ FixedText aLabelText;
+ ListBox aNameList;
+ OKButton aOKButton;
+ CancelButton aCancelButton;
+ HelpButton aHelpButton;
+ PushButton aInsListButton;
public:
ScNamePasteDlg( Window * pParent, const ScRangeName* pList, BOOL bInsList=TRUE );
- String GetSelectedName() const;
+ String GetSelectedName() const;
};
diff --git a/sc/source/ui/inc/navcitem.hxx b/sc/source/ui/inc/navcitem.hxx
index b464bd6cc9ad..2801c7d697ec 100644
--- a/sc/source/ui/inc/navcitem.hxx
+++ b/sc/source/ui/inc/navcitem.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ public:
ScNavigatorDlg& rDlg,
SfxBindings& rBindings );
protected:
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( USHORT nSID, SfxItemState eState,
const SfxPoolItem* pItem );
private:
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index 8d53742b6f1e..a19ec51dd242 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +52,15 @@ class ScRange;
//========================================================================
-#define SC_DROPMODE_URL 0
-#define SC_DROPMODE_LINK 1
-#define SC_DROPMODE_COPY 2
+#define SC_DROPMODE_URL 0
+#define SC_DROPMODE_LINK 1
+#define SC_DROPMODE_COPY 2
-enum NavListMode { NAV_LMODE_NONE = 0x4000,
- NAV_LMODE_AREAS = 0x2000,
- NAV_LMODE_DBAREAS = 0x1000,
- NAV_LMODE_DOCS = 0x800,
- NAV_LMODE_SCENARIOS = 0x400 };
+enum NavListMode { NAV_LMODE_NONE = 0x4000,
+ NAV_LMODE_AREAS = 0x2000,
+ NAV_LMODE_DBAREAS = 0x1000,
+ NAV_LMODE_DOCS = 0x800,
+ NAV_LMODE_SCENARIOS = 0x400 };
//========================================================================
// class ScScenarioListBox -----------------------------------------------
@@ -112,23 +112,23 @@ public:
ScScenarioWindow( Window* pParent,const String& aQH_List,const String& aQH_Comment);
~ScScenarioWindow();
- void NotifyState( const SfxPoolItem* pState );
- void SetComment( const String& rComment )
+ void NotifyState( const SfxPoolItem* pState );
+ void SetComment( const String& rComment )
{ aEdComment.SetText( rComment ); }
- void SetSizePixel( const Size& rNewSize );
+ void SetSizePixel( const Size& rNewSize );
protected:
- virtual void Paint( const Rectangle& rRec );
+ virtual void Paint( const Rectangle& rRec );
private:
- ScScenarioListBox aLbScenario;
- MultiLineEdit aEdComment;
+ ScScenarioListBox aLbScenario;
+ MultiLineEdit aEdComment;
};
//==================================================================
-// class ColumnEdit
+// class ColumnEdit
//==================================================================
class ColumnEdit : public SpinField
{
@@ -136,32 +136,32 @@ public:
ColumnEdit( ScNavigatorDlg* pParent, const ResId& rResId );
~ColumnEdit();
- SCCOL GetCol() { return nCol; }
- void SetCol( SCCOL nColNo );
+ SCCOL GetCol() { return nCol; }
+ void SetCol( SCCOL nColNo );
protected:
- virtual long Notify( NotifyEvent& rNEvt );
- virtual void LoseFocus();
- virtual void Up();
- virtual void Down();
- virtual void First();
- virtual void Last();
+ virtual long Notify( NotifyEvent& rNEvt );
+ virtual void LoseFocus();
+ virtual void Up();
+ virtual void Down();
+ virtual void First();
+ virtual void Last();
private:
ScNavigatorDlg& rDlg;
- SCCOL nCol;
- USHORT nKeyGroup;
-
- void EvalText ();
- void ExecuteCol ();
- SCCOL AlphaToNum ( String& rStr );
- SCCOL NumStrToAlpha ( String& rStr );
- SCCOL NumToAlpha ( SCCOL nColNo, String& rStr );
+ SCCOL nCol;
+ USHORT nKeyGroup;
+
+ void EvalText ();
+ void ExecuteCol ();
+ SCCOL AlphaToNum ( String& rStr );
+ SCCOL NumStrToAlpha ( String& rStr );
+ SCCOL NumToAlpha ( SCCOL nColNo, String& rStr );
};
//==================================================================
-// class RowEdit
+// class RowEdit
//==================================================================
class RowEdit : public NumericField
{
@@ -169,22 +169,22 @@ public:
RowEdit( ScNavigatorDlg* pParent, const ResId& rResId );
~RowEdit();
- SCROW GetRow() { return (SCROW)GetValue(); }
- void SetRow( SCROW nRow ){ SetValue( nRow ); }
+ SCROW GetRow() { return (SCROW)GetValue(); }
+ void SetRow( SCROW nRow ){ SetValue( nRow ); }
protected:
- virtual long Notify( NotifyEvent& rNEvt );
- virtual void LoseFocus();
+ virtual long Notify( NotifyEvent& rNEvt );
+ virtual void LoseFocus();
private:
ScNavigatorDlg& rDlg;
- void ExecuteRow();
+ void ExecuteRow();
};
//==================================================================
-// class ScDocListBox
+// class ScDocListBox
//==================================================================
class ScDocListBox : public ListBox
{
@@ -193,7 +193,7 @@ public:
~ScDocListBox();
protected:
- virtual void Select();
+ virtual void Select();
private:
ScNavigatorDlg& rDlg;
@@ -201,7 +201,7 @@ private:
//==================================================================
-// class CommandToolBox
+// class CommandToolBox
//==================================================================
class CommandToolBox : public ToolBox
{
@@ -213,20 +213,20 @@ public:
void UpdateButtons();
void InitImageList();
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
+ virtual void DataChanged( const DataChangedEvent& rDCEvt );
DECL_LINK( ToolBoxDropdownClickHdl, ToolBox* );
protected:
- virtual void Select();
- virtual void Click();
+ virtual void Select();
+ virtual void Click();
private:
ScNavigatorDlg& rDlg;
};
//==================================================================
-// class ScNavigatorDlg
+// class ScNavigatorDlg
//==================================================================
class ScNavigatorDlg : public Window, public SfxListener
@@ -240,28 +240,28 @@ friend class CommandToolBox;
friend class ScContentTree;
private:
- SfxBindings& rBindings; // must be first member
+ SfxBindings& rBindings; // must be first member
- ImageList aCmdImageList; // must be before aTbxCmd
+ ImageList aCmdImageList; // must be before aTbxCmd
ImageList aCmdImageListH;
- FixedInfo aFtCol;
- ColumnEdit aEdCol;
- FixedInfo aFtRow;
- RowEdit aEdRow;
- CommandToolBox aTbxCmd;
- ScContentTree aLbEntries;
+ FixedInfo aFtCol;
+ ColumnEdit aEdCol;
+ FixedInfo aFtRow;
+ RowEdit aEdRow;
+ CommandToolBox aTbxCmd;
+ ScContentTree aLbEntries;
ScScenarioWindow aWndScenarios;
- ScDocListBox aLbDocuments;
+ ScDocListBox aLbDocuments;
- Timer aContentTimer;
+ Timer aContentTimer;
- String aTitleBase;
- String aStrDragMode;
- String aStrDisplay;
- String aStrActive;
- String aStrNotActive;
- String aStrHidden;
- String aStrActiveWin;
+ String aTitleBase;
+ String aStrDragMode;
+ String aStrDisplay;
+ String aStrActive;
+ String aStrNotActive;
+ String aStrHidden;
+ String aStrActiveWin;
SfxChildWindowContext* pContextWin;
Size aInitSize;
@@ -269,77 +269,77 @@ private:
ScViewData* pViewData;
long nBorderOffset;
- long nListModeHeight;
- long nInitListHeight;
- NavListMode eListMode;
- USHORT nDropMode;
- SCCOL nCurCol;
- SCROW nCurRow;
- SCTAB nCurTab;
- BOOL bFirstBig;
+ long nListModeHeight;
+ long nInitListHeight;
+ NavListMode eListMode;
+ USHORT nDropMode;
+ SCCOL nCurCol;
+ SCROW nCurRow;
+ SCTAB nCurTab;
+ BOOL bFirstBig;
ScNavigatorControllerItem** ppBoundItems;
DECL_LINK( TimeHdl, Timer* );
- void DoResize();
+ void DoResize();
SfxBindings& GetBindings()
{ return rBindings; }
- void SetCurrentCell( SCCOL nCol, SCROW Row );
- void SetCurrentCellStr( const String rName );
- void SetCurrentTable( SCTAB nTab );
- void SetCurrentTableStr( const String rName );
- void SetCurrentObject( const String rName );
- void SetCurrentDoc( const String& rDocName );
+ void SetCurrentCell( SCCOL nCol, SCROW Row );
+ void SetCurrentCellStr( const String rName );
+ void SetCurrentTable( SCTAB nTab );
+ void SetCurrentTableStr( const String rName );
+ void SetCurrentObject( const String rName );
+ void SetCurrentDoc( const String& rDocName );
ScTabViewShell* GetTabViewShell() const;
ScNavigatorSettings* GetNavigatorSettings();
BOOL GetViewData();
- void UpdateColumn ( const SCCOL* pCol = NULL );
- void UpdateRow ( const SCROW* pRow = NULL );
- void UpdateTable ( const SCTAB* pTab = NULL );
- void UpdateAll ();
+ void UpdateColumn ( const SCCOL* pCol = NULL );
+ void UpdateRow ( const SCROW* pRow = NULL );
+ void UpdateTable ( const SCTAB* pTab = NULL );
+ void UpdateAll ();
- void GetDocNames(const String* pSelEntry = NULL);
+ void GetDocNames(const String* pSelEntry = NULL);
- void SetListMode ( NavListMode eMode, BOOL bSetSize = TRUE );
- void ShowList ( BOOL bShow, BOOL bSetSize );
- void ShowScenarios ( BOOL bShow, BOOL bSetSize );
+ void SetListMode ( NavListMode eMode, BOOL bSetSize = TRUE );
+ void ShowList ( BOOL bShow, BOOL bSetSize );
+ void ShowScenarios ( BOOL bShow, BOOL bSetSize );
- void SetDropMode(USHORT nNew);
- USHORT GetDropMode() const { return nDropMode; }
+ void SetDropMode(USHORT nNew);
+ USHORT GetDropMode() const { return nDropMode; }
- const String& GetStrDragMode() const { return aStrDragMode; }
- const String& GetStrDisplay() const { return aStrDisplay; }
+ const String& GetStrDragMode() const { return aStrDragMode; }
+ const String& GetStrDisplay() const { return aStrDisplay; }
- void CheckDataArea ();
- void MarkDataArea ();
- void UnmarkDataArea ();
- void StartOfDataArea ();
- void EndOfDataArea ();
+ void CheckDataArea ();
+ void MarkDataArea ();
+ void UnmarkDataArea ();
+ void StartOfDataArea ();
+ void EndOfDataArea ();
static void ReleaseFocus();
protected:
- virtual void Resize();
- virtual void Paint( const Rectangle& rRec );
- virtual void Resizing( Size& rSize );
+ virtual void Resize();
+ virtual void Paint( const Rectangle& rRec );
+ virtual void Resizing( Size& rSize );
public:
ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Window* pParent );
~ScNavigatorDlg();
using Window::Notify;
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
- void CursorPosChanged();
+ void CursorPosChanged();
virtual SfxChildAlignment
CheckAlignment(SfxChildAlignment,SfxChildAlignment);
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
+ virtual void DataChanged( const DataChangedEvent& rDCEvt );
};
//==================================================================
@@ -347,14 +347,14 @@ public:
class ScNavigatorDialogWrapper: public SfxChildWindowContext
{
public:
- ScNavigatorDialogWrapper( Window* pParent,
- USHORT nId,
- SfxBindings* pBindings,
- SfxChildWinInfo* pInfo );
+ ScNavigatorDialogWrapper( Window* pParent,
+ USHORT nId,
+ SfxBindings* pBindings,
+ SfxChildWinInfo* pInfo );
SFX_DECL_CHILDWINDOWCONTEXT(ScNavigatorDialogWrapper)
- virtual void Resizing( Size& rSize );
+ virtual void Resizing( Size& rSize );
private:
ScNavigatorDlg* pNavigator;
diff --git a/sc/source/ui/inc/navsett.hxx b/sc/source/ui/inc/navsett.hxx
index 896c64606646..28fcd8ecb6e3 100644
--- a/sc/source/ui/inc/navsett.hxx
+++ b/sc/source/ui/inc/navsett.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx
index 65e36565ceb8..02a1835bc182 100644
--- a/sc/source/ui/inc/notemark.hxx
+++ b/sc/source/ui/inc/notemark.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,23 +41,23 @@ class SdrObject;
class ScNoteMarker
{
private:
- Window* pWindow;
- Window* pRightWin;
- Window* pBottomWin;
- Window* pDiagWin;
- ScDocument* pDoc;
- ScAddress aDocPos;
- String aUserText;
+ Window* pWindow;
+ Window* pRightWin;
+ Window* pBottomWin;
+ Window* pDiagWin;
+ ScDocument* pDoc;
+ ScAddress aDocPos;
+ String aUserText;
Rectangle aVisRect;
- Timer aTimer;
- MapMode aMapMode;
- BOOL bLeft;
- BOOL bByKeyboard;
+ Timer aTimer;
+ MapMode aMapMode;
+ BOOL bLeft;
+ BOOL bByKeyboard;
- Rectangle aRect;
- SdrModel* pModel;
- SdrObject* pObject;
- BOOL bVisible;
+ Rectangle aRect;
+ SdrModel* pModel;
+ SdrObject* pObject;
+ BOOL bVisible;
DECL_LINK( TimeHdl, Timer* );
@@ -67,11 +67,11 @@ public:
const MapMode& rMap, BOOL bLeftEdge, BOOL bForce, BOOL bKeyboard );
~ScNoteMarker();
- void Draw();
- void InvalidateWin();
+ void Draw();
+ void InvalidateWin();
- ScAddress GetDocPos() const { return aDocPos; }
- BOOL IsByKeyboard() const { return bByKeyboard; }
+ ScAddress GetDocPos() const { return aDocPos; }
+ BOOL IsByKeyboard() const { return bByKeyboard; }
};
diff --git a/sc/source/ui/inc/oleobjsh.hxx b/sc/source/ui/inc/oleobjsh.hxx
index fa4f71729c97..5116637333b4 100644
--- a/sc/source/ui/inc/oleobjsh.hxx
+++ b/sc/source/ui/inc/oleobjsh.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ public:
SFX_DECL_INTERFACE(SCID_OLEOBJECT_SHELL)
ScOleObjectShell(ScViewData* pData);
- virtual ~ScOleObjectShell();
+ virtual ~ScOleObjectShell();
};
diff --git a/sc/source/ui/inc/olinefun.hxx b/sc/source/ui/inc/olinefun.hxx
index 444774ed2068..f1b75ea82163 100644
--- a/sc/source/ui/inc/olinefun.hxx
+++ b/sc/source/ui/inc/olinefun.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,26 +39,26 @@ class ScRange;
class ScOutlineDocFunc
{
private:
- ScDocShell& rDocShell;
+ ScDocShell& rDocShell;
public:
ScOutlineDocFunc( ScDocShell& rDocSh ): rDocShell(rDocSh) {}
~ScOutlineDocFunc() {}
- BOOL MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi );
- BOOL RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi );
- BOOL RemoveAllOutlines( SCTAB nTab, BOOL bRecord, BOOL bApi );
- BOOL AutoOutline( const ScRange& rRange, BOOL bRecord, BOOL bApi );
+ BOOL MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi );
+ BOOL RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi );
+ BOOL RemoveAllOutlines( SCTAB nTab, BOOL bRecord, BOOL bApi );
+ BOOL AutoOutline( const ScRange& rRange, BOOL bRecord, BOOL bApi );
- BOOL SelectLevel( SCTAB nTab, BOOL bColumns, USHORT nLevel,
+ BOOL SelectLevel( SCTAB nTab, BOOL bColumns, USHORT nLevel,
BOOL bRecord, BOOL bPaint, BOOL bApi );
- BOOL ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi );
- BOOL HideMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi );
+ BOOL ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi );
+ BOOL HideMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi );
- BOOL ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, USHORT nEntry,
+ BOOL ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, USHORT nEntry,
BOOL bRecord, BOOL bPaint, BOOL bApi );
- BOOL HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, USHORT nEntry,
+ BOOL HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, USHORT nEntry,
BOOL bRecord, BOOL bPaint, BOOL bApi );
};
diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx
index 104f9e8f11da..b8a0623b8960 100644
--- a/sc/source/ui/inc/olinewin.hxx
+++ b/sc/source/ui/inc/olinewin.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/opredlin.hrc b/sc/source/ui/inc/opredlin.hrc
index 2b52d8b46118..212ee87878bf 100644
--- a/sc/source/ui/inc/opredlin.hrc
+++ b/sc/source/ui/inc/opredlin.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
@@ -24,15 +24,15 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include "sc.hrc" // -> RID_SCPAGE_OPREDLINE
+#include "sc.hrc" // -> RID_SCPAGE_OPREDLINE
-#define FT_CONTENT 1
-#define FT_REMOVE 2
-#define FT_INSERT 3
-#define FT_MOVE 4
-#define GB_COLORCHGS 1
-#define CLB_CONTENT 1
-#define CLB_REMOVE 2
-#define CLB_INSERT 3
-#define CLB_MOVE 4
-#define STR_AUTHOR 1
+#define FT_CONTENT 1
+#define FT_REMOVE 2
+#define FT_INSERT 3
+#define FT_MOVE 4
+#define GB_COLORCHGS 1
+#define CLB_CONTENT 1
+#define CLB_REMOVE 2
+#define CLB_INSERT 3
+#define CLB_MOVE 4
+#define STR_AUTHOR 1
diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx
index 0573ecb86f1e..7dd48677017a 100644
--- a/sc/source/ui/inc/opredlin.hxx
+++ b/sc/source/ui/inc/opredlin.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +58,16 @@
class ScRedlineOptionsTabPage : public SfxTabPage
{
- FixedText aContentFT;
- ColorListBox aContentColorLB;
- FixedText aRemoveFT;
- ColorListBox aRemoveColorLB;
- FixedText aInsertFT;
- ColorListBox aInsertColorLB;
- FixedText aMoveFT;
- ColorListBox aMoveColorLB;
+ FixedText aContentFT;
+ ColorListBox aContentColorLB;
+ FixedText aRemoveFT;
+ ColorListBox aRemoveColorLB;
+ FixedText aInsertFT;
+ ColorListBox aInsertColorLB;
+ FixedText aMoveFT;
+ ColorListBox aMoveColorLB;
FixedLine aChangedGB;
- String aAuthorStr;
+ String aAuthorStr;
DECL_LINK( ColorHdl, ColorListBox *pColorLB );
@@ -76,10 +76,10 @@ public:
ScRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet );
~ScRedlineOptionsTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
};
#endif
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index 27b8976e3541..e5a7e80c6afa 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.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,13 +29,13 @@
/*
#define RID_SCDLG_OPTIONS 256
-#define RID_SCPAGE_VIEW 256
+#define RID_SCPAGE_VIEW 256
#define RID_SCPAGE_USERLISTS 257
-#define RID_SCPAGE_CALC 258
-#define RID_SCPAGE_PRINT 259
+#define RID_SCPAGE_CALC 258
+#define RID_SCPAGE_PRINT 259
*/
-#define TP_GENERAL 1
+#define TP_GENERAL 1
#define TP_SAVE 2
#define TP_PATH 3
#define TP_SPELL 4
@@ -48,67 +48,67 @@
#define TP_CONTENT 11
#define TP_LAYOUT 12
#define TP_INPUT 13
-#define TP_CHANGES 14
+#define TP_CHANGES 14
// TP_CALC:
-#define BTN_ITERATE 1
-#define FT_STEPS 2
-#define FT_EPS 3
-#define ED_STEPS 4
-#define ED_EPS 5
-#define GB_ZREFS 6
-#define ED_PREC 7
-#define FT_PREC 8
-#define BTN_DATESTD 9
-#define BTN_DATESC10 10
-#define BTN_DATE1904 11
-#define FT_VALUE 13
-#define GB_DATE 14
+#define BTN_ITERATE 1
+#define FT_STEPS 2
+#define FT_EPS 3
+#define ED_STEPS 4
+#define ED_EPS 5
+#define GB_ZREFS 6
+#define ED_PREC 7
+#define FT_PREC 8
+#define BTN_DATESTD 9
+#define BTN_DATESC10 10
+#define BTN_DATE1904 11
+#define FT_VALUE 13
+#define GB_DATE 14
#define BTN_CASE 15
#define FT_CASE 16
-#define BTN_CALC 17
-#define BTN_MATCH 18
-#define BTN_LOOKUP 19
+#define BTN_CALC 17
+#define BTN_MATCH 18
+#define BTN_LOOKUP 19
#define BTN_REGEX 20
#define BTN_GENERAL_PREC 21
// TP_VIEW:
-#define BTN_VSCROLL 1
-#define BTN_HSCROLL 2
-#define BTN_REGISTER 3
-#define BTN_OUTLINER 4
-#define BTN_HEADERFOOTER 5
-#define BTN_GRID 6
+#define BTN_VSCROLL 1
+#define BTN_HSCROLL 2
+#define BTN_REGISTER 3
+#define BTN_OUTLINER 4
+#define BTN_HEADERFOOTER 5
+#define BTN_GRID 6
#define BTN_SYNTAX 7
-#define LB_GRIDCOLOR 9
-#define GB_ELEMENTS 10
+#define LB_GRIDCOLOR 9
+#define GB_ELEMENTS 10
#define BTN_HELPLINES 11
#define BTN_FORMULAS 20
#define BTN_NULLVALS 21
#define BTN_NOTES 22
-#define GB_CONTENTS 23
+#define GB_CONTENTS 23
-//#define FT_OLE 31
-//#define FT_CHARTS 32
-//#define FT_DRAWINGS 33
-//#define LB_OLE 34
-//#define LB_CHARTS 35
-//#define LB_DRAWINGS 36
-//#define GB_OBJECTS 37
+//#define FT_OLE 31
+//#define FT_CHARTS 32
+//#define FT_DRAWINGS 33
+//#define LB_OLE 34
+//#define LB_CHARTS 35
+//#define LB_DRAWINGS 36
+//#define GB_OBJECTS 37
// TP_USERLISTS:
-#define FT_LISTS 1
-#define LB_LISTS 1
-#define FT_ENTRIES 2
-#define ED_ENTRIES 2
-#define FT_COPYFROM 3
-#define ED_COPYFROM 3
-#define BTN_NEW 1
-#define BTN_ADD 2
-#define BTN_REMOVE 3
-#define BTN_COPY 4
+#define FT_LISTS 1
+#define LB_LISTS 1
+#define FT_ENTRIES 2
+#define ED_ENTRIES 2
+#define FT_COPYFROM 3
+#define ED_COPYFROM 3
+#define BTN_NEW 1
+#define BTN_ADD 2
+#define BTN_REMOVE 3
+#define BTN_COPY 4
#define STR_QUERYREMOVE 5
#define STR_DISMISS 6
#define STR_COPYLIST 7
@@ -116,61 +116,61 @@
#define STR_COPYERR 9
// TP_PRINT:
-#define FL_PAGES 1
-#define BTN_SKIPEMPTYPAGES 2
-#define FL_SHEETS 2
-#define BTN_SELECTEDSHEETS 4
+#define FL_PAGES 1
+#define BTN_SKIPEMPTYPAGES 2
+#define FL_SHEETS 2
+#define BTN_SELECTEDSHEETS 4
// TP_LCONTENT
-#define GB_DISPLAY 20
+#define GB_DISPLAY 20
#define CB_FORMULA 21
-#define CB_NIL 22
-#define CB_ANNOT 23
-#define CB_VALUE 24
-#define CB_ANCHOR 25
-#define GB_OBJECT 26
-#define FT_OBJGRF 27
-#define LB_OBJGRF 28
+#define CB_NIL 22
+#define CB_ANNOT 23
+#define CB_VALUE 24
+#define CB_ANCHOR 25
+#define GB_OBJECT 26
+#define FT_OBJGRF 27
+#define LB_OBJGRF 28
#define FT_DIAGRAM 29
#define LB_DIAGRAM 30
-#define FT_DRAW 31
-#define LB_DRAW 32
-#define CB_CLIP 33
+#define FT_DRAW 31
+#define LB_DRAW 32
+#define CB_CLIP 33
#define GB_ZOOM 34
#define CB_SYNCZOOM 35
// TP_LAYOUT
#define GB_LINK 1
-#define RB_ALWAYS 2
-#define RB_REQUEST 3
-#define RB_NEVER 4
-#define CB_DOCONLY 5
-#define CB_MERGE_PARA_DIST 6
-#define GB_COMPAT 7
-#define CB_AUTO_UPDATE_FIELDS 8
-#define CB_AUTO_UPDATE_CHARTS 9
-#define FT_UPDATE_LINKS 10
+#define RB_ALWAYS 2
+#define RB_REQUEST 3
+#define RB_NEVER 4
+#define CB_DOCONLY 5
+#define CB_MERGE_PARA_DIST 6
+#define GB_COMPAT 7
+#define CB_AUTO_UPDATE_FIELDS 8
+#define CB_AUTO_UPDATE_CHARTS 9
+#define FT_UPDATE_LINKS 10
#define GB_WINDOW 50
-#define CB_ROWCOLHEADER 51
-#define CB_HSCROLL 52
-#define CB_VSCROLL 53
-#define CB_TBLREG 54
-#define CB_OUTLINE 55
-#define GB_LINES 56
-#define CB_GRID 57
-#define FT_COLOR 58
-#define LB_COLOR 59
-#define CB_GUIDELINE 60
-#define GB_UNIT 61
-#define LB_UNIT 62
-#define ST_UNIT 63
-#define GB_TAB 64
-#define MF_TAB 65
-#define CB_PAGEBREAKS 66
-#define CB_HANDLES 67
-#define CB_BIGHANDLES 68
+#define CB_ROWCOLHEADER 51
+#define CB_HSCROLL 52
+#define CB_VSCROLL 53
+#define CB_TBLREG 54
+#define CB_OUTLINE 55
+#define GB_LINES 56
+#define CB_GRID 57
+#define FT_COLOR 58
+#define LB_COLOR 59
+#define CB_GUIDELINE 60
+#define GB_UNIT 61
+#define LB_UNIT 62
+#define ST_UNIT 63
+#define GB_TAB 64
+#define MF_TAB 65
+#define CB_PAGEBREAKS 66
+#define CB_HANDLES 67
+#define CB_BIGHANDLES 68
#define FT_TAB 69
#define FT_UNIT 70
#define FL_SEPARATOR1 71
@@ -179,14 +179,14 @@
#define FL_H_SEPARATOR 74
// TP_INPUT
-#define GB_OPTIONS 70
-#define CB_ALIGN 71
-#define LB_ALIGN 72
-#define CB_EDITMODE 73
-#define CB_FORMAT 74
-#define CB_RFIND 75
-#define CB_EXPREF 76
-#define CB_MARKHDR 77
-#define CB_TEXTFMT 78
+#define GB_OPTIONS 70
+#define CB_ALIGN 71
+#define LB_ALIGN 72
+#define CB_EDITMODE 73
+#define CB_FORMAT 74
+#define CB_RFIND 75
+#define CB_EXPREF 76
+#define CB_MARKHDR 77
+#define CB_TEXTFMT 78
#define CB_REPLWARN 79
diff --git a/sc/source/ui/inc/optload.hrc b/sc/source/ui/inc/optload.hrc
index 992bb8c737e4..e43e10284da7 100644
--- a/sc/source/ui/inc/optload.hrc
+++ b/sc/source/ui/inc/optload.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
@@ -24,17 +24,17 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include "sc.hrc" // -> RID_SCPAGE_OPREDLINE
+#include "sc.hrc" // -> RID_SCPAGE_OPREDLINE
-#define GB_LINK 1
-#define RB_ALWAYS 2
-#define RB_REQUEST 3
-#define RB_NEVER 4
-#define CB_DOCONLY 5
-#define CB_MERGE_PARA_DIST 6
-#define GB_COMPAT 7
-#define CB_AUTO_UPDATE_FIELDS 8
-#define CB_AUTO_UPDATE_CHARTS 9
-#define FT_UPDATE_LINKS 10
+#define GB_LINK 1
+#define RB_ALWAYS 2
+#define RB_REQUEST 3
+#define RB_NEVER 4
+#define CB_DOCONLY 5
+#define CB_MERGE_PARA_DIST 6
+#define GB_COMPAT 7
+#define CB_AUTO_UPDATE_FIELDS 8
+#define CB_AUTO_UPDATE_CHARTS 9
+#define FT_UPDATE_LINKS 10
diff --git a/sc/source/ui/inc/optload.hxx b/sc/source/ui/inc/optload.hxx
index 93d5fefa8358..0eed9f6fcec9 100644
--- a/sc/source/ui/inc/optload.hxx
+++ b/sc/source/ui/inc/optload.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,28 +39,28 @@ class ScDocument;
class ScLoadOptPage : public SfxTabPage
{
private:
- FixedText aLinkFT;
- RadioButton aAlwaysRB;
- RadioButton aRequestRB;
- RadioButton aNeverRB;
- CheckBox aDocOnlyCB;
- GroupBox aLinkGB;
+ FixedText aLinkFT;
+ RadioButton aAlwaysRB;
+ RadioButton aRequestRB;
+ RadioButton aNeverRB;
+ CheckBox aDocOnlyCB;
+ GroupBox aLinkGB;
ScDocument *pDoc;
- DECL_LINK( UpdateHdl, CheckBox* );
+ DECL_LINK( UpdateHdl, CheckBox* );
public:
ScLoadOptPage( Window* pParent,
const SfxItemSet& rSet );
~ScLoadOptPage();
- static SfxTabPage* Create( Window* pParent,
+ static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- void SetDocument(ScDocument*);
+ void SetDocument(ScDocument*);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
+ virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual void Reset( const SfxItemSet& rSet );
};
#endif
diff --git a/sc/source/ui/inc/optsolver.hrc b/sc/source/ui/inc/optsolver.hrc
index 9df8eea1d7f4..88051bacdc64 100644
--- a/sc/source/ui/inc/optsolver.hrc
+++ b/sc/source/ui/inc/optsolver.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,30 +57,30 @@
#define FL_CONDITIONS 1
#define FL_BUTTONS 2
-#define IB_OBJECTIVECELL 1
-#define IB_TARGET 2
-#define IB_VARIABLECELLS 3
-#define IB_LEFT1 4
-#define IB_LEFT2 5
-#define IB_LEFT3 6
-#define IB_LEFT4 7
-#define IB_RIGHT1 8
-#define IB_RIGHT2 9
-#define IB_RIGHT3 10
-#define IB_RIGHT4 11
-#define IB_DELETE1 12
-#define IB_DELETE2 13
-#define IB_DELETE3 14
-#define IB_DELETE4 15
+#define IB_OBJECTIVECELL 1
+#define IB_TARGET 2
+#define IB_VARIABLECELLS 3
+#define IB_LEFT1 4
+#define IB_LEFT2 5
+#define IB_LEFT3 6
+#define IB_LEFT4 7
+#define IB_RIGHT1 8
+#define IB_RIGHT2 9
+#define IB_RIGHT3 10
+#define IB_RIGHT4 11
+#define IB_DELETE1 12
+#define IB_DELETE2 13
+#define IB_DELETE3 14
+#define IB_DELETE4 15
#define LB_OP1 1
#define LB_OP2 2
#define LB_OP3 3
#define LB_OP4 4
-#define RB_MAX 1
-#define RB_MIN 2
-#define RB_VALUE 3
+#define RB_MAX 1
+#define RB_MIN 2
+#define RB_VALUE 3
#define SB_SCROLL 1
diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx
index bbd98f1d1818..cffb4f1d8dec 100644
--- a/sc/source/ui/inc/optsolver.hxx
+++ b/sc/source/ui/inc/optsolver.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index 42844513af92..1e2716200e42 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +56,16 @@ class SdrPaintWindow;
// ---------------------------------------------------------------------------
-#define SC_SCENARIO_HSPACE 60
-#define SC_SCENARIO_VSPACE 50
+#define SC_SCENARIO_HSPACE 60
+#define SC_SCENARIO_VSPACE 50
// ---------------------------------------------------------------------------
-#define SC_OBJECTS_NONE 0
-#define SC_OBJECTS_DRAWING 1
-#define SC_OBJECTS_OLE 2
-#define SC_OBJECTS_CHARTS 4
-#define SC_OBJECTS_ALL ( SC_OBJECTS_DRAWING | SC_OBJECTS_OLE | SC_OBJECTS_CHARTS )
+#define SC_OBJECTS_NONE 0
+#define SC_OBJECTS_DRAWING 1
+#define SC_OBJECTS_OLE 2
+#define SC_OBJECTS_CHARTS 4
+#define SC_OBJECTS_ALL ( SC_OBJECTS_DRAWING | SC_OBJECTS_OLE | SC_OBJECTS_CHARTS )
enum ScOutputType { OUTTYPE_WINDOW, OUTTYPE_PRINTER };
@@ -82,87 +82,87 @@ private:
bool mbRightClip;
};
- OutputDevice* pDev; // Device
- OutputDevice* pRefDevice; // printer if used for preview
- OutputDevice* pFmtDevice; // reference for text formatting
+ OutputDevice* pDev; // Device
+ OutputDevice* pRefDevice; // printer if used for preview
+ OutputDevice* pFmtDevice; // reference for text formatting
ScTableInfo& mrTabInfo;
- RowInfo* pRowInfo; // Info-Block
- SCSIZE nArrCount; // belegte Zeilen im Info-Block
- ScDocument* pDoc; // Dokument
- SCTAB nTab; // Tabelle
- long nScrX; // Ausgabe Startpos. (Pixel)
+ RowInfo* pRowInfo; // Info-Block
+ SCSIZE nArrCount; // belegte Zeilen im Info-Block
+ ScDocument* pDoc; // Dokument
+ SCTAB nTab; // Tabelle
+ long nScrX; // Ausgabe Startpos. (Pixel)
long nScrY;
- long nScrW; // Ausgabe Groesse (Pixel)
+ long nScrW; // Ausgabe Groesse (Pixel)
long nScrH;
- long nMirrorW; // Visible output width for mirroring (default: nScrW)
- SCCOL nX1; // Start-/Endkoordinaten
- SCROW nY1; // ( incl. versteckte )
+ long nMirrorW; // Visible output width for mirroring (default: nScrW)
+ SCCOL nX1; // Start-/Endkoordinaten
+ SCROW nY1; // ( incl. versteckte )
SCCOL nX2;
SCROW nY2;
- SCCOL nVisX1; // Start-/Endkoordinaten
- SCROW nVisY1; // ( sichtbarer Bereich )
+ SCCOL nVisX1; // Start-/Endkoordinaten
+ SCROW nVisY1; // ( sichtbarer Bereich )
SCCOL nVisX2;
SCROW nVisY2;
- ScOutputType eType; // Bildschirm/Drucker ...
- double nPPTX; // Pixel per Twips
+ ScOutputType eType; // Bildschirm/Drucker ...
+ double nPPTX; // Pixel per Twips
double nPPTY;
-// USHORT nZoom; // Zoom-Faktor (Prozent) - fuer GetFont
+// USHORT nZoom; // Zoom-Faktor (Prozent) - fuer GetFont
Fraction aZoomX;
Fraction aZoomY;
- SdrObject* pEditObj; // beim Painten auslassen
+ SdrObject* pEditObj; // beim Painten auslassen
- ScTabViewShell* pViewShell; // zum Connecten von sichtbaren Plug-Ins
+ ScTabViewShell* pViewShell; // zum Connecten von sichtbaren Plug-Ins
// #114135#
- FmFormView* pDrawView; // SdrView to paint to
+ FmFormView* pDrawView; // SdrView to paint to
- BOOL bEditMode; // InPlace editierte Zelle - nicht ausgeben
+ BOOL bEditMode; // InPlace editierte Zelle - nicht ausgeben
SCCOL nEditCol;
SCROW nEditRow;
- BOOL bMetaFile; // Ausgabe auf Metafile (nicht in Pixeln!)
- BOOL bSingleGrid; // beim Gitter bChanged auswerten
+ BOOL bMetaFile; // Ausgabe auf Metafile (nicht in Pixeln!)
+ BOOL bSingleGrid; // beim Gitter bChanged auswerten
- BOOL bPagebreakMode; // Seitenumbruch-Vorschau
- BOOL bSolidBackground; // weiss statt transparent
+ BOOL bPagebreakMode; // Seitenumbruch-Vorschau
+ BOOL bSolidBackground; // weiss statt transparent
BOOL bUseStyleColor;
BOOL bForceAutoColor;
- BOOL bSyntaxMode; // Syntax-Highlighting
+ BOOL bSyntaxMode; // Syntax-Highlighting
Color* pValueColor;
Color* pTextColor;
Color* pFormulaColor;
- Color aGridColor;
+ Color aGridColor;
- BOOL bShowNullValues;
- BOOL bShowFormulas;
- BOOL bShowSpellErrors; // Spell-Errors in EditObjekten anzeigen
- BOOL bMarkClipped;
+ BOOL bShowNullValues;
+ BOOL bShowFormulas;
+ BOOL bShowSpellErrors; // Spell-Errors in EditObjekten anzeigen
+ BOOL bMarkClipped;
- BOOL bSnapPixel;
+ BOOL bSnapPixel;
- BOOL bAnyRotated; // intern
- BOOL bAnyClipped; // intern
- BOOL bTabProtected;
- BYTE nTabTextDirection; // EEHorizontalTextDirection values
- BOOL bLayoutRTL;
+ BOOL bAnyRotated; // intern
+ BOOL bAnyClipped; // intern
+ BOOL bTabProtected;
+ BYTE nTabTextDirection; // EEHorizontalTextDirection values
+ BOOL bLayoutRTL;
// #i74769# use SdrPaintWindow direct, remember it during BeginDrawLayers/EndDrawLayers
- SdrPaintWindow* mpTargetPaintWindow;
+ SdrPaintWindow* mpTargetPaintWindow;
// private methods
- BOOL GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
+ BOOL GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
SCCOL& rOverX, SCROW& rOverY, BOOL bVisRowChanged );
- BOOL IsEmptyCellText( RowInfo* pThisRowInfo, SCCOL nX, SCROW nY );
- void GetVisibleCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*& rpCell );
+ BOOL IsEmptyCellText( RowInfo* pThisRowInfo, SCCOL nX, SCROW nY );
+ void GetVisibleCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*& rpCell );
- BOOL IsAvailable( SCCOL nX, SCROW nY );
+ BOOL IsAvailable( SCCOL nX, SCROW nY );
- void GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY,
+ void GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY,
SCCOL nCellX, SCROW nCellY, long nNeeded,
const ScPatternAttr& rPattern,
USHORT nHorJustify, bool bCellIsValue,
@@ -175,12 +175,12 @@ private:
long& rEngineWidth, long& rEngineHeight, long& rNeededPixel,
bool& rLeftClip, bool& rRightClip );
- void SetSyntaxColor( Font* pFont, ScBaseCell* pCell );
- void SetEditSyntaxColor( EditEngine& rEngine, ScBaseCell* pCell );
+ void SetSyntaxColor( Font* pFont, ScBaseCell* pCell );
+ void SetEditSyntaxColor( EditEngine& rEngine, ScBaseCell* pCell );
- double GetStretch();
+ double GetStretch();
- void DrawRotatedFrame( const Color* pForceColor ); // pixel
+ void DrawRotatedFrame( const Color* pForceColor ); // pixel
public:
ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType,
@@ -195,46 +195,46 @@ public:
void SetContentDevice( OutputDevice* pContentDev );
- void SetRefDevice( OutputDevice* pRDev ) { pRefDevice = pFmtDevice = pRDev; }
- void SetFmtDevice( OutputDevice* pRDev ) { pFmtDevice = pRDev; }
- void SetEditObject( SdrObject* pObj ) { pEditObj = pObj; }
- void SetViewShell( ScTabViewShell* pSh ) { pViewShell = pSh; }
+ void SetRefDevice( OutputDevice* pRDev ) { pRefDevice = pFmtDevice = pRDev; }
+ void SetFmtDevice( OutputDevice* pRDev ) { pFmtDevice = pRDev; }
+ void SetEditObject( SdrObject* pObj ) { pEditObj = pObj; }
+ void SetViewShell( ScTabViewShell* pSh ) { pViewShell = pSh; }
// #114135#
- void SetDrawView( FmFormView* pNew ) { pDrawView = pNew; }
-
- void SetSolidBackground( BOOL bSet ) { bSolidBackground = bSet; }
- void SetUseStyleColor( BOOL bSet ) { bUseStyleColor = bSet; }
-
- void SetEditCell( SCCOL nCol, SCROW nRow );
- void SetSyntaxMode( BOOL bNewMode );
- void SetMetaFileMode( BOOL bNewMode );
- void SetSingleGrid( BOOL bNewMode );
- void SetGridColor( const Color& rColor );
- void SetMarkClipped( BOOL bSet );
- void SetShowNullValues ( BOOL bSet = TRUE );
- void SetShowFormulas ( BOOL bSet = TRUE );
- void SetShowSpellErrors( BOOL bSet = TRUE );
- void SetMirrorWidth( long nNew );
- long GetScrW() const { return nScrW; }
- long GetScrH() const { return nScrH; }
-
- void SetSnapPixel( BOOL bSet = TRUE );
-
- void DrawGrid( BOOL bGrid, BOOL bPage );
- void DrawStrings( BOOL bPixelToLogic = FALSE );
- void DrawBackground();
- void DrawShadow();
- void DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBottom);
- void DrawFrame();
+ void SetDrawView( FmFormView* pNew ) { pDrawView = pNew; }
+
+ void SetSolidBackground( BOOL bSet ) { bSolidBackground = bSet; }
+ void SetUseStyleColor( BOOL bSet ) { bUseStyleColor = bSet; }
+
+ void SetEditCell( SCCOL nCol, SCROW nRow );
+ void SetSyntaxMode( BOOL bNewMode );
+ void SetMetaFileMode( BOOL bNewMode );
+ void SetSingleGrid( BOOL bNewMode );
+ void SetGridColor( const Color& rColor );
+ void SetMarkClipped( BOOL bSet );
+ void SetShowNullValues ( BOOL bSet = TRUE );
+ void SetShowFormulas ( BOOL bSet = TRUE );
+ void SetShowSpellErrors( BOOL bSet = TRUE );
+ void SetMirrorWidth( long nNew );
+ long GetScrW() const { return nScrW; }
+ long GetScrH() const { return nScrH; }
+
+ void SetSnapPixel( BOOL bSet = TRUE );
+
+ void DrawGrid( BOOL bGrid, BOOL bPage );
+ void DrawStrings( BOOL bPixelToLogic = FALSE );
+ void DrawBackground();
+ void DrawShadow();
+ void DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBottom);
+ void DrawFrame();
// with logic MapMode set!
- void DrawEdit(BOOL bPixelToLogic);
+ void DrawEdit(BOOL bPixelToLogic);
- void FindRotated();
- void DrawRotated(BOOL bPixelToLogic); // logisch
+ void FindRotated();
+ void DrawRotated(BOOL bPixelToLogic); // logisch
- void DrawClear();
+ void DrawClear();
// #i72502# printer only command set
Point PrePrintDrawingLayer(long nLogStX, long nLogStY );
@@ -242,27 +242,27 @@ public:
void PrintDrawingLayer(const sal_uInt16 nLayer, const Point& rMMOffset);
// nur Bildschirm:
- void DrawingSingle(const sal_uInt16 nLayer);
- void DrawSelectiveObjects(const sal_uInt16 nLayer);
+ void DrawingSingle(const sal_uInt16 nLayer);
+ void DrawSelectiveObjects(const sal_uInt16 nLayer);
- BOOL SetChangedClip(); // FALSE = nix
+ BOOL SetChangedClip(); // FALSE = nix
PolyPolygon GetChangedArea();
- void FindChanged();
- void SetPagebreakMode( ScPageBreakData* pPageData );
+ void FindChanged();
+ void SetPagebreakMode( ScPageBreakData* pPageData );
#ifdef OLD_SELECTION_PAINT
void DrawMark( Window* pWin );
-#endif
- void DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
+#endif
+ void DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
SCCOL nRefEndX, SCROW nRefEndY,
const Color& rColor, BOOL bHandle );
- void DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
+ void DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
SCCOL nRefEndX, SCROW nRefEndY,
const Color& rColor, USHORT nType );
- void DrawChangeTrack();
- void DrawClipMarks();
+ void DrawChangeTrack();
+ void DrawClipMarks();
- void DrawNoteMarks();
+ void DrawNoteMarks();
void AddPDFNotes();
};
diff --git a/sc/source/ui/inc/pagedata.hxx b/sc/source/ui/inc/pagedata.hxx
index bcd85c8f5a96..1fa4abb190f4 100644
--- a/sc/source/ui/inc/pagedata.hxx
+++ b/sc/source/ui/inc/pagedata.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,55 +38,55 @@ class ScDocShell;
class ScPrintRangeData
{
private:
- ScRange aPrintRange;
- size_t nPagesX;
- SCCOL* pPageEndX;
- size_t nPagesY;
- SCROW* pPageEndY;
- long nFirstPage;
- BOOL bTopDown;
- BOOL bAutomatic;
+ ScRange aPrintRange;
+ size_t nPagesX;
+ SCCOL* pPageEndX;
+ size_t nPagesY;
+ SCROW* pPageEndY;
+ long nFirstPage;
+ BOOL bTopDown;
+ BOOL bAutomatic;
public:
ScPrintRangeData();
~ScPrintRangeData();
- void SetPrintRange( const ScRange& rNew ) { aPrintRange = rNew; }
- const ScRange& GetPrintRange() const { return aPrintRange; }
+ void SetPrintRange( const ScRange& rNew ) { aPrintRange = rNew; }
+ const ScRange& GetPrintRange() const { return aPrintRange; }
- void SetPagesX( size_t nCount, const SCCOL* pEnd );
- void SetPagesY( size_t nCount, const SCROW* pEnd );
+ void SetPagesX( size_t nCount, const SCCOL* pEnd );
+ void SetPagesY( size_t nCount, const SCROW* pEnd );
- size_t GetPagesX() const { return nPagesX; }
- const SCCOL* GetPageEndX() const { return pPageEndX; }
- size_t GetPagesY() const { return nPagesY; }
- const SCROW* GetPageEndY() const { return pPageEndY; }
+ size_t GetPagesX() const { return nPagesX; }
+ const SCCOL* GetPageEndX() const { return pPageEndX; }
+ size_t GetPagesY() const { return nPagesY; }
+ const SCROW* GetPageEndY() const { return pPageEndY; }
- void SetFirstPage( long nNew ) { nFirstPage = nNew; }
- long GetFirstPage() const { return nFirstPage; }
- void SetTopDown( BOOL bSet ) { bTopDown = bSet; }
- BOOL IsTopDown() const { return bTopDown; }
- void SetAutomatic( BOOL bSet ) { bAutomatic = bSet; }
- BOOL IsAutomatic() const { return bAutomatic; }
+ void SetFirstPage( long nNew ) { nFirstPage = nNew; }
+ long GetFirstPage() const { return nFirstPage; }
+ void SetTopDown( BOOL bSet ) { bTopDown = bSet; }
+ BOOL IsTopDown() const { return bTopDown; }
+ void SetAutomatic( BOOL bSet ) { bAutomatic = bSet; }
+ BOOL IsAutomatic() const { return bAutomatic; }
};
class ScPageBreakData
{
private:
- size_t nAlloc;
- size_t nUsed;
- ScPrintRangeData* pData; // Array
+ size_t nAlloc;
+ size_t nUsed;
+ ScPrintRangeData* pData; // Array
public:
ScPageBreakData(size_t nMax);
~ScPageBreakData();
- size_t GetCount() const { return nUsed; }
- ScPrintRangeData& GetData(size_t i);
+ size_t GetCount() const { return nUsed; }
+ ScPrintRangeData& GetData(size_t i);
- BOOL IsEqual( const ScPageBreakData& rOther ) const;
+ BOOL IsEqual( const ScPageBreakData& rOther ) const;
- void AddPages();
+ void AddPages();
};
diff --git a/sc/source/ui/inc/parawin.hxx b/sc/source/ui/inc/parawin.hxx
index ae02fdb38114..74324bb95dca 100644
--- a/sc/source/ui/inc/parawin.hxx
+++ b/sc/source/ui/inc/parawin.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 SC_PARAWIN_HXX
#include "funcutl.hxx"
-#include "global.hxx" // ScAddress
+#include "global.hxx" // ScAddress
#include <svtools/stdctrl.hxx>
#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
@@ -51,53 +51,53 @@
class ScFuncDesc;
//============================================================================
-#define NOT_FOUND 0xffff
+#define NOT_FOUND 0xffff
//============================================================================
class ScParaWin : public TabPage
{
private:
- Link aScrollLink;
- Link aFxLink;
- Link aArgModifiedLink;
+ Link aScrollLink;
+ Link aFxLink;
+ Link aArgModifiedLink;
::std::vector<USHORT> aVisibleArgMapping;
- const ScFuncDesc* pFuncDesc;
- ScAnyRefDlg* pMyParent;
- USHORT nArgs; // unsuppressed arguments
- Font aFntBold;
- Font aFntLight;
-
- FixedInfo aFtEditDesc;
- FixedText aFtArgName;
- FixedInfo aFtArgDesc;
-
- ImageButton aBtnFx1;
- FixedText aFtArg1;
- ArgEdit aEdArg1;
- formula::RefButton aRefBtn1;
- ImageButton aBtnFx2;
- FixedText aFtArg2;
- ArgEdit aEdArg2;
- formula::RefButton aRefBtn2;
- ImageButton aBtnFx3;
- FixedText aFtArg3;
- ArgEdit aEdArg3;
- formula::RefButton aRefBtn3;
- ImageButton aBtnFx4;
- FixedText aFtArg4;
- ArgEdit aEdArg4;
- formula::RefButton aRefBtn4;
- ScrollBar aSlider;
- BOOL bRefMode;
-
- USHORT nEdFocus;
- USHORT nActiveLine;
-
- ArgInput aArgInput[4];
- String aDefaultString;
- SvStrings aParaArray;
+ const ScFuncDesc* pFuncDesc;
+ ScAnyRefDlg* pMyParent;
+ USHORT nArgs; // unsuppressed arguments
+ Font aFntBold;
+ Font aFntLight;
+
+ FixedInfo aFtEditDesc;
+ FixedText aFtArgName;
+ FixedInfo aFtArgDesc;
+
+ ImageButton aBtnFx1;
+ FixedText aFtArg1;
+ ArgEdit aEdArg1;
+ formula::RefButton aRefBtn1;
+ ImageButton aBtnFx2;
+ FixedText aFtArg2;
+ ArgEdit aEdArg2;
+ formula::RefButton aRefBtn2;
+ ImageButton aBtnFx3;
+ FixedText aFtArg3;
+ ArgEdit aEdArg3;
+ formula::RefButton aRefBtn3;
+ ImageButton aBtnFx4;
+ FixedText aFtArg4;
+ ArgEdit aEdArg4;
+ formula::RefButton aRefBtn4;
+ ScrollBar aSlider;
+ BOOL bRefMode;
+
+ USHORT nEdFocus;
+ USHORT nActiveLine;
+
+ ArgInput aArgInput[4];
+ String aDefaultString;
+ SvStrings aParaArray;
DECL_LINK( ScrollHdl, ScrollBar* );
DECL_LINK( ModifyHdl, ArgInput* );
DECL_LINK( GetEdFocusHdl, ArgInput* );
@@ -106,52 +106,52 @@ private:
protected:
- virtual void SliderMoved();
- virtual void ArgumentModified();
- virtual void FxClick();
+ virtual void SliderMoved();
+ virtual void ArgumentModified();
+ virtual void FxClick();
- void InitArgInput( USHORT nPos, FixedText& rFtArg, ImageButton& rBtnFx,
+ void InitArgInput( USHORT nPos, FixedText& rFtArg, ImageButton& rBtnFx,
ArgEdit& rEdArg, formula::RefButton& rRefBtn);
- void DelParaArray();
- void SetArgumentDesc(const String& aText);
- void SetArgumentText(const String& aText);
+ void DelParaArray();
+ void SetArgumentDesc(const String& aText);
+ void SetArgumentText(const String& aText);
- void SetArgName (USHORT no,const String &aArg);
- void SetArgNameFont (USHORT no,const Font&);
- void SetArgVal (USHORT no,const String &aArg);
+ void SetArgName (USHORT no,const String &aArg);
+ void SetArgNameFont (USHORT no,const Font&);
+ void SetArgVal (USHORT no,const String &aArg);
- void HideParaLine(USHORT no);
- void ShowParaLine(USHORT no);
- void UpdateArgDesc( USHORT nArg );
- void UpdateArgInput( USHORT nOffset, USHORT i );
+ void HideParaLine(USHORT no);
+ void ShowParaLine(USHORT no);
+ void UpdateArgDesc( USHORT nArg );
+ void UpdateArgInput( USHORT nOffset, USHORT i );
public:
ScParaWin(ScAnyRefDlg* pParent,Point aPos);
~ScParaWin();
- void SetFunctionDesc(const ScFuncDesc* pFDesc);
- void SetArgumentOffset(USHORT nOffset);
- void SetEditDesc(const String& aText);
- void UpdateParas();
- void ClearAll();
+ void SetFunctionDesc(const ScFuncDesc* pFDesc);
+ void SetArgumentOffset(USHORT nOffset);
+ void SetEditDesc(const String& aText);
+ void UpdateParas();
+ void ClearAll();
- BOOL IsRefMode() {return bRefMode;}
- void SetRefMode(BOOL bFlag) {bRefMode=bFlag;}
+ BOOL IsRefMode() {return bRefMode;}
+ void SetRefMode(BOOL bFlag) {bRefMode=bFlag;}
- USHORT GetActiveLine();
- void SetActiveLine(USHORT no);
- formula::RefEdit* GetActiveEdit();
- String GetActiveArgName();
+ USHORT GetActiveLine();
+ void SetActiveLine(USHORT no);
+ formula::RefEdit* GetActiveEdit();
+ String GetActiveArgName();
- String GetArgument(USHORT no);
- void SetArgument(USHORT no, const String& aString);
- void SetArgumentFonts(const Font&aBoldFont,const Font&aLightFont);
+ String GetArgument(USHORT no);
+ void SetArgument(USHORT no, const String& aString);
+ void SetArgumentFonts(const Font&aBoldFont,const Font&aLightFont);
- void SetEdFocus(USHORT nEditLine); //Sichtbare Editzeilen
- USHORT GetSliderPos();
- void SetSliderPos(USHORT nSliderPos);
+ void SetEdFocus(USHORT nEditLine); //Sichtbare Editzeilen
+ USHORT GetSliderPos();
+ void SetSliderPos(USHORT nSliderPos);
void SetScrollHdl( const Link& rLink ) { aScrollLink = rLink; }
const Link& GetScrollHdl() const { return aScrollLink; }
diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx
index 426f95399b33..096bb53d9b76 100644
--- a/sc/source/ui/inc/pfiltdlg.hxx
+++ b/sc/source/ui/inc/pfiltdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,77 +66,77 @@ class ScPivotFilterDlg : public ModalDialog
{
public:
ScPivotFilterDlg( Window* pParent,
- const SfxItemSet& rArgSet, SCTAB nSourceTab );
+ const SfxItemSet& rArgSet, SCTAB nSourceTab );
~ScPivotFilterDlg();
- const ScQueryItem& GetOutputItem();
+ const ScQueryItem& GetOutputItem();
private:
FixedLine aFlCriteria;
//----------------------------
- ListBox aLbField1;
- ListBox aLbCond1;
- ComboBox aEdVal1;
+ ListBox aLbField1;
+ ListBox aLbCond1;
+ ComboBox aEdVal1;
//----------------------------
- ListBox aLbConnect1;
- ListBox aLbField2;
- ListBox aLbCond2;
- ComboBox aEdVal2;
+ ListBox aLbConnect1;
+ ListBox aLbField2;
+ ListBox aLbCond2;
+ ComboBox aEdVal2;
//----------------------------
- ListBox aLbConnect2;
- ListBox aLbField3;
- ListBox aLbCond3;
- ComboBox aEdVal3;
+ ListBox aLbConnect2;
+ ListBox aLbField3;
+ ListBox aLbCond3;
+ ComboBox aEdVal3;
//----------------------------
- FixedText aFtConnect;
- FixedText aFtField;
- FixedText aFtCond;
- FixedText aFtVal;
+ FixedText aFtConnect;
+ FixedText aFtField;
+ FixedText aFtCond;
+ FixedText aFtVal;
FixedLine aFlOptions;
- CheckBox aBtnCase;
- CheckBox aBtnRegExp;
- CheckBox aBtnUnique;
- FixedText aFtDbAreaLabel;
- FixedInfo aFtDbArea;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
- MoreButton aBtnMore;
- const String aStrUndefined;
- const String aStrNoName;
- const String aStrNone;
- const String aStrEmpty;
- const String aStrNotEmpty;
- const String aStrRow;
- const String aStrColumn;
-
- const USHORT nWhichQuery;
- const ScQueryParam theQueryData;
- ScQueryItem* pOutItem;
- ScViewData* pViewData;
- ScDocument* pDoc;
- SCTAB nSrcTab;
-
- USHORT nFieldCount;
- ComboBox* aValueEdArr[3];
- ListBox* aFieldLbArr[3];
- ListBox* aCondLbArr[3];
-
- TypedScStrCollection* pEntryLists[MAXCOLCOUNT];
+ CheckBox aBtnCase;
+ CheckBox aBtnRegExp;
+ CheckBox aBtnUnique;
+ FixedText aFtDbAreaLabel;
+ FixedInfo aFtDbArea;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
+ MoreButton aBtnMore;
+ const String aStrUndefined;
+ const String aStrNoName;
+ const String aStrNone;
+ const String aStrEmpty;
+ const String aStrNotEmpty;
+ const String aStrRow;
+ const String aStrColumn;
+
+ const USHORT nWhichQuery;
+ const ScQueryParam theQueryData;
+ ScQueryItem* pOutItem;
+ ScViewData* pViewData;
+ ScDocument* pDoc;
+ SCTAB nSrcTab;
+
+ USHORT nFieldCount;
+ ComboBox* aValueEdArr[3];
+ ListBox* aFieldLbArr[3];
+ ListBox* aCondLbArr[3];
+
+ TypedScStrCollection* pEntryLists[MAXCOLCOUNT];
#ifdef _PFILTDLG_CXX
private:
- void Init ( const SfxItemSet& rArgSet );
- void FillFieldLists ();
- void UpdateValueList ( USHORT nList );
- void ClearValueList ( USHORT nList );
- USHORT GetFieldSelPos ( SCCOL nField );
+ void Init ( const SfxItemSet& rArgSet );
+ void FillFieldLists ();
+ void UpdateValueList ( USHORT nList );
+ void ClearValueList ( USHORT nList );
+ USHORT GetFieldSelPos ( SCCOL nField );
// Handler:
DECL_LINK( LbSelectHdl, ListBox* );
DECL_LINK( ValModifyHdl, ComboBox* );
- DECL_LINK( CheckBoxHdl, CheckBox* );
+ DECL_LINK( CheckBoxHdl, CheckBox* );
#endif
};
diff --git a/sc/source/ui/inc/pfuncache.hxx b/sc/source/ui/inc/pfuncache.hxx
index 365df0acc38b..bf26bf08550f 100644
--- a/sc/source/ui/inc/pfuncache.hxx
+++ b/sc/source/ui/inc/pfuncache.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,19 +54,19 @@ enum ScPrintSelectionMode
class ScPrintSelectionStatus
{
- ScPrintSelectionMode eMode;
- ScRangeList aRanges;
+ ScPrintSelectionMode eMode;
+ ScRangeList aRanges;
ScPrintOptions aOptions;
public:
ScPrintSelectionStatus() : eMode(SC_PRINTSEL_INVALID) {}
~ScPrintSelectionStatus() {}
- void SetMode(ScPrintSelectionMode eNew) { eMode = eNew; }
- void SetRanges(const ScRangeList& rNew) { aRanges = rNew; }
+ void SetMode(ScPrintSelectionMode eNew) { eMode = eNew; }
+ void SetRanges(const ScRangeList& rNew) { aRanges = rNew; }
void SetOptions(const ScPrintOptions& rNew) { aOptions = rNew; }
- BOOL operator==(const ScPrintSelectionStatus& rOther) const
+ BOOL operator==(const ScPrintSelectionStatus& rOther) const
{ return eMode == rOther.eMode && aRanges == rOther.aRanges && aOptions == rOther.aOptions; }
ScPrintSelectionMode GetMode() const { return eMode; }
@@ -96,11 +96,11 @@ struct ScPrintPageLocation
class ScPrintFuncCache
{
- ScPrintSelectionStatus aSelection;
- ScDocShell* pDocSh;
- long nTotalPages;
- long nPages[MAXTABCOUNT];
- long nFirstAttr[MAXTABCOUNT];
+ ScPrintSelectionStatus aSelection;
+ ScDocShell* pDocSh;
+ long nTotalPages;
+ long nPages[MAXTABCOUNT];
+ long nFirstAttr[MAXTABCOUNT];
std::vector<ScPrintPageLocation> aLocations;
bool bLocInitialized;
@@ -109,16 +109,16 @@ public:
const ScPrintSelectionStatus& rStatus );
~ScPrintFuncCache();
- BOOL IsSameSelection( const ScPrintSelectionStatus& rStatus ) const;
+ BOOL IsSameSelection( const ScPrintSelectionStatus& rStatus ) const;
void InitLocations( const ScMarkData& rMark, OutputDevice* pDev );
bool FindLocation( const ScAddress& rCell, ScPrintPageLocation& rLocation ) const;
- long GetPageCount() const { return nTotalPages; }
- long GetFirstAttr( SCTAB nTab ) const { return nFirstAttr[nTab]; }
- SCTAB GetTabForPage( long nPage ) const;
- long GetTabStart( SCTAB nTab ) const;
- long GetDisplayStart( SCTAB nTab ) const;
+ long GetPageCount() const { return nTotalPages; }
+ long GetFirstAttr( SCTAB nTab ) const { return nFirstAttr[nTab]; }
+ SCTAB GetTabForPage( long nPage ) const;
+ long GetTabStart( SCTAB nTab ) const;
+ long GetDisplayStart( SCTAB nTab ) const;
};
#endif
diff --git a/sc/source/ui/inc/pgbrksh.hxx b/sc/source/ui/inc/pgbrksh.hxx
index f367b4cc4f1f..2ad74275b9d5 100644
--- a/sc/source/ui/inc/pgbrksh.hxx
+++ b/sc/source/ui/inc/pgbrksh.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/pivotsh.hxx b/sc/source/ui/inc/pivotsh.hxx
index 2d3a21fa9756..1e89bba78506 100644
--- a/sc/source/ui/inc/pivotsh.hxx
+++ b/sc/source/ui/inc/pivotsh.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +45,11 @@ public:
ScPivotShell( ScTabViewShell* pView );
~ScPivotShell();
- void Execute ( SfxRequest& rReq );
- void GetState( SfxItemSet& rSet );
+ void Execute ( SfxRequest& rReq );
+ void GetState( SfxItemSet& rSet );
private:
- ScTabViewShell* pViewShell;
+ ScTabViewShell* pViewShell;
ScDPObject* GetCurrDPObject();
};
diff --git a/sc/source/ui/inc/pntlock.hxx b/sc/source/ui/inc/pntlock.hxx
index 60a7502c9734..11afb42fb6a9 100644
--- a/sc/source/ui/inc/pntlock.hxx
+++ b/sc/source/ui/inc/pntlock.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,33 +33,33 @@
class ScPaintLockData
{
private:
- ScRangeListRef xRangeList;
- USHORT nMode;
- USHORT nLevel;
- USHORT nDocLevel;
- USHORT nParts;
- BOOL bModified;
+ ScRangeListRef xRangeList;
+ USHORT nMode;
+ USHORT nLevel;
+ USHORT nDocLevel;
+ USHORT nParts;
+ BOOL bModified;
public:
ScPaintLockData(USHORT nNewMode);
~ScPaintLockData();
- void AddRange( const ScRange& rRange, USHORT nP );
+ void AddRange( const ScRange& rRange, USHORT nP );
- void SetModified() { bModified = TRUE; }
- void IncLevel(sal_Bool bDoc)
+ void SetModified() { bModified = TRUE; }
+ void IncLevel(sal_Bool bDoc)
{ if (bDoc) ++nDocLevel; else ++nLevel; }
- void DecLevel(sal_Bool bDoc)
+ void DecLevel(sal_Bool bDoc)
{ if (bDoc) --nDocLevel; else --nLevel; }
- const ScRangeListRef& GetRangeList() const { return xRangeList; }
- USHORT GetParts() const { return nParts; }
- USHORT GetLevel(sal_Bool bDoc) const
+ const ScRangeListRef& GetRangeList() const { return xRangeList; }
+ USHORT GetParts() const { return nParts; }
+ USHORT GetLevel(sal_Bool bDoc) const
{ return bDoc ? nDocLevel : nLevel; }
- BOOL GetModified() const { return bModified; }
+ BOOL GetModified() const { return bModified; }
// fuer Wiederherstellen nach Reset
- void SetLevel(USHORT nNew, sal_Bool bDoc)
+ void SetLevel(USHORT nNew, sal_Bool bDoc)
{ if (bDoc) nDocLevel = nNew; else nLevel = nNew; }
};
diff --git a/sc/source/ui/inc/popmenu.hxx b/sc/source/ui/inc/popmenu.hxx
index 8ac0fba4e80d..e4c611f520da 100644
--- a/sc/source/ui/inc/popmenu.hxx
+++ b/sc/source/ui/inc/popmenu.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +36,15 @@
class SC_DLLPUBLIC ScPopupMenu : public PopupMenu
{
private:
- USHORT nSel;
- BOOL bHit;
+ USHORT nSel;
+ BOOL bHit;
protected:
virtual void Select();
public:
ScPopupMenu() : nSel(0),bHit(FALSE) {}
ScPopupMenu(const ResId& rRes) : PopupMenu(rRes),nSel(0),bHit(FALSE) {}
- USHORT GetSelected() const { return nSel; }
- BOOL WasHit() const { return bHit; }
+ USHORT GetSelected() const { return nSel; }
+ BOOL WasHit() const { return bHit; }
};
diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx
index 87d15dcdaf86..51370b605dc6 100644
--- a/sc/source/ui/inc/preview.hxx
+++ b/sc/source/ui/inc/preview.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include <vcl/window.hxx>
-#include "printfun.hxx" // ScPrintState
+#include "printfun.hxx" // ScPrintState
class ScDocShell;
class ScPreviewShell;
@@ -39,35 +39,35 @@ class ScPreview : public Window
{
private:
// eingestellt:
- long nPageNo; // Seite im Dokument
- USHORT nZoom; // eingestellter Zoom
- Point aOffset; // positiv
+ long nPageNo; // Seite im Dokument
+ USHORT nZoom; // eingestellter Zoom
+ Point aOffset; // positiv
// berechnet:
- BOOL bValid; // folgende Werte gueltig
- SCTAB nTabCount;
- SCTAB nTabsTested; // fuer wieviele Tabellen ist nPages gueltig?
- long nPages[MAXTABCOUNT];
- long nFirstAttr[MAXTABCOUNT];
- SCTAB nTab; // Tabelle
- long nTabPage; // Seite von Tabelle
- long nTabStart; // erste Seite der Tabelle (wirklich)
- long nDisplayStart; // dito, relativ zum Anfang der Zaehlung
- Date aDate;
- Time aTime;
- long nTotalPages;
- Size aPageSize; // fuer GetOptimalZoom
- BOOL bStateValid;
- BOOL bLocationValid;
- ScPrintState aState;
- ScPreviewLocationData* pLocationData; // stores table layout for accessibility API
- FmFormView* pDrawView;
+ BOOL bValid; // folgende Werte gueltig
+ SCTAB nTabCount;
+ SCTAB nTabsTested; // fuer wieviele Tabellen ist nPages gueltig?
+ long nPages[MAXTABCOUNT];
+ long nFirstAttr[MAXTABCOUNT];
+ SCTAB nTab; // Tabelle
+ long nTabPage; // Seite von Tabelle
+ long nTabStart; // erste Seite der Tabelle (wirklich)
+ long nDisplayStart; // dito, relativ zum Anfang der Zaehlung
+ Date aDate;
+ Time aTime;
+ long nTotalPages;
+ Size aPageSize; // fuer GetOptimalZoom
+ BOOL bStateValid;
+ BOOL bLocationValid;
+ ScPrintState aState;
+ ScPreviewLocationData* pLocationData; // stores table layout for accessibility API
+ FmFormView* pDrawView;
// intern:
- BOOL bInPaint;
- BOOL bInGetState;
- ScDocShell* pDocShell;
- ScPreviewShell* pViewShell;
+ BOOL bInPaint;
+ BOOL bInGetState;
+ ScDocShell* pDocShell;
+ ScPreviewShell* pViewShell;
BOOL bLeftRulerMove;
BOOL bRightRulerMove;
@@ -75,7 +75,7 @@ private:
BOOL bBottomRulerMove;
BOOL bHeaderRulerMove;
BOOL bFooterRulerMove;
-
+
BOOL bLeftRulerChange;
BOOL bRightRulerChange;
BOOL bTopRulerChange;
@@ -95,13 +95,13 @@ private:
long nHeaderHeight;
long nFooterHeight;
- void TestLastPage();
- void CalcPages( SCTAB nToWhichTab );
- void RecalcPages();
- void UpdateDrawView();
- void DoPrint( ScPreviewLocationData* pFillLocation );
+ void TestLastPage();
+ void CalcPages( SCTAB nToWhichTab );
+ void RecalcPages();
+ void UpdateDrawView();
+ void DoPrint( ScPreviewLocationData* pFillLocation );
- void InvalidateLocationData( ULONG nId );
+ void InvalidateLocationData( ULONG nId );
using Window::SetZoom;
@@ -124,13 +124,13 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- void DataChanged(BOOL bNewTime = FALSE); // statt Invalidate rufen
- void DoInvalidate();
+ void DataChanged(BOOL bNewTime = FALSE); // statt Invalidate rufen
+ void DoInvalidate();
- void SetXOffset( long nX );
- void SetYOffset( long nY );
- void SetZoom(USHORT nNewZoom);
- void SetPageNo( long nPage );
+ void SetXOffset( long nX );
+ void SetYOffset( long nY );
+ void SetZoom(USHORT nNewZoom);
+ void SetPageNo( long nPage );
BOOL GetPageMargins()const { return bPageMargin; }
void SetPageMargins( BOOL bVal ) { bPageMargin = bVal; }
@@ -140,22 +140,22 @@ public:
const ScPreviewLocationData& GetLocationData();
- String GetPosString();
+ String GetPosString();
- long GetPageNo() const { return nPageNo; }
- USHORT GetZoom() const { return nZoom; }
- Point GetOffset() const { return aOffset; }
+ long GetPageNo() const { return nPageNo; }
+ USHORT GetZoom() const { return nZoom; }
+ Point GetOffset() const { return aOffset; }
- SCTAB GetTab() { if (!bValid) { CalcPages(0); RecalcPages(); } return nTab; }
- long GetTotalPages() { if (!bValid) { CalcPages(0); RecalcPages(); } return nTotalPages; }
+ SCTAB GetTab() { if (!bValid) { CalcPages(0); RecalcPages(); } return nTab; }
+ long GetTotalPages() { if (!bValid) { CalcPages(0); RecalcPages(); } return nTotalPages; }
- BOOL AllTested() const { return bValid && nTabsTested >= nTabCount; }
+ BOOL AllTested() const { return bValid && nTabsTested >= nTabCount; }
- USHORT GetOptimalZoom(BOOL bWidthOnly);
- long GetFirstPage(SCTAB nTab);
+ USHORT GetOptimalZoom(BOOL bWidthOnly);
+ long GetFirstPage(SCTAB nTab);
- void CalcAll() { CalcPages(MAXTAB); }
- void SetInGetState(BOOL bSet) { bInGetState = bSet; }
+ void CalcAll() { CalcPages(MAXTAB); }
+ void SetInGetState(BOOL bSet) { bInGetState = bSet; }
DECL_STATIC_LINK( ScPreview, InvalidateHdl, void* );
static void StaticInvalidate();
diff --git a/sc/source/ui/inc/prevloc.hxx b/sc/source/ui/inc/prevloc.hxx
index 15b477abad3c..1e34d96d7aa2 100644
--- a/sc/source/ui/inc/prevloc.hxx
+++ b/sc/source/ui/inc/prevloc.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 <sal/types.h>
-#define SC_PREVIEW_MAXRANGES 4
+#define SC_PREVIEW_MAXRANGES 4
#define SC_PREVIEW_RANGE_EDGE 0
#define SC_PREVIEW_RANGE_REPCOL 1
#define SC_PREVIEW_RANGE_REPROW 2
@@ -50,10 +50,10 @@ class ScDocument;
struct ScPreviewColRowInfo
{
- BOOL bIsHeader;
+ BOOL bIsHeader;
SCCOLROW nDocIndex;
- long nPixelStart;
- long nPixelEnd;
+ long nPixelStart;
+ long nPixelEnd;
void Set( BOOL bHeader, SCCOLROW nIndex, long nStart, long nEnd )
{
@@ -66,82 +66,82 @@ struct ScPreviewColRowInfo
class ScPreviewTableInfo
{
- SCTAB nTab;
- SCCOL nCols;
- SCROW nRows;
- ScPreviewColRowInfo* pColInfo;
- ScPreviewColRowInfo* pRowInfo;
+ SCTAB nTab;
+ SCCOL nCols;
+ SCROW nRows;
+ ScPreviewColRowInfo* pColInfo;
+ ScPreviewColRowInfo* pRowInfo;
public:
ScPreviewTableInfo();
~ScPreviewTableInfo();
- SCTAB GetTab() const { return nTab; }
- SCCOL GetCols() const { return nCols; }
- SCROW GetRows() const { return nRows; }
- const ScPreviewColRowInfo* GetColInfo() const { return pColInfo; }
- const ScPreviewColRowInfo* GetRowInfo() const { return pRowInfo; }
+ SCTAB GetTab() const { return nTab; }
+ SCCOL GetCols() const { return nCols; }
+ SCROW GetRows() const { return nRows; }
+ const ScPreviewColRowInfo* GetColInfo() const { return pColInfo; }
+ const ScPreviewColRowInfo* GetRowInfo() const { return pRowInfo; }
- void SetTab( SCTAB nNewTab );
- void SetColInfo( SCCOL nCount, ScPreviewColRowInfo* pNewInfo );
- void SetRowInfo( SCROW nCount, ScPreviewColRowInfo* pNewInfo );
- void LimitToArea( const Rectangle& rPixelArea );
+ void SetTab( SCTAB nNewTab );
+ void SetColInfo( SCCOL nCount, ScPreviewColRowInfo* pNewInfo );
+ void SetRowInfo( SCROW nCount, ScPreviewColRowInfo* pNewInfo );
+ void LimitToArea( const Rectangle& rPixelArea );
};
class ScPreviewLocationData
{
OutputDevice* pWindow;
- ScDocument* pDoc;
- MapMode aCellMapMode;
- MapMode aDrawMapMode[SC_PREVIEW_MAXRANGES];
- Rectangle aDrawRectangle[SC_PREVIEW_MAXRANGES];
- sal_uInt8 aDrawRangeId[SC_PREVIEW_MAXRANGES];
- USHORT nDrawRanges;
- SCTAB nPrintTab;
- List aEntries;
-
-//UNUSED2008-05 ScAddress GetCellFromRange( const Size& rOffsetPixel, const ScRange& rRange ) const;
- Rectangle GetOffsetPixel( const ScAddress& rCellPos, const ScRange& rRange ) const;
+ ScDocument* pDoc;
+ MapMode aCellMapMode;
+ MapMode aDrawMapMode[SC_PREVIEW_MAXRANGES];
+ Rectangle aDrawRectangle[SC_PREVIEW_MAXRANGES];
+ sal_uInt8 aDrawRangeId[SC_PREVIEW_MAXRANGES];
+ USHORT nDrawRanges;
+ SCTAB nPrintTab;
+ List aEntries;
+
+//UNUSED2008-05 ScAddress GetCellFromRange( const Size& rOffsetPixel, const ScRange& rRange ) const;
+ Rectangle GetOffsetPixel( const ScAddress& rCellPos, const ScRange& rRange ) const;
public:
ScPreviewLocationData( ScDocument* pDocument, OutputDevice* pWin );
~ScPreviewLocationData();
- void SetCellMapMode( const MapMode& rMapMode );
- void SetPrintTab( SCTAB nNew );
- void Clear();
- void AddCellRange( const Rectangle& rRect, const ScRange& rRange, BOOL bRepCol, BOOL bRepRow,
+ void SetCellMapMode( const MapMode& rMapMode );
+ void SetPrintTab( SCTAB nNew );
+ void Clear();
+ void AddCellRange( const Rectangle& rRect, const ScRange& rRange, BOOL bRepCol, BOOL bRepRow,
const MapMode& rDrawMap );
- void AddColHeaders( const Rectangle& rRect, SCCOL nStartCol, SCCOL nEndCol, BOOL bRepCol );
- void AddRowHeaders( const Rectangle& rRect, SCROW nStartRow, SCROW nEndRow, BOOL bRepRow );
- void AddHeaderFooter( const Rectangle& rRect, BOOL bHeader, BOOL bLeft );
- void AddNoteMark( const Rectangle& rRect, const ScAddress& rPos );
- void AddNoteText( const Rectangle& rRect, const ScAddress& rPos );
+ void AddColHeaders( const Rectangle& rRect, SCCOL nStartCol, SCCOL nEndCol, BOOL bRepCol );
+ void AddRowHeaders( const Rectangle& rRect, SCROW nStartRow, SCROW nEndRow, BOOL bRepRow );
+ void AddHeaderFooter( const Rectangle& rRect, BOOL bHeader, BOOL bLeft );
+ void AddNoteMark( const Rectangle& rRect, const ScAddress& rPos );
+ void AddNoteText( const Rectangle& rRect, const ScAddress& rPos );
- SCTAB GetPrintTab() const { return nPrintTab; }
+ SCTAB GetPrintTab() const { return nPrintTab; }
- // Get info on visible columns/rows in the visible area
- void GetTableInfo( const Rectangle& rVisiblePixel, ScPreviewTableInfo& rInfo ) const;
+ // Get info on visible columns/rows in the visible area
+ void GetTableInfo( const Rectangle& rVisiblePixel, ScPreviewTableInfo& rInfo ) const;
- USHORT GetDrawRanges() const { return nDrawRanges; }
- void GetDrawRange( USHORT nPos, Rectangle& rPixelRect, MapMode& rMapMode, sal_uInt8& rRangeId ) const;
+ USHORT GetDrawRanges() const { return nDrawRanges; }
+ void GetDrawRange( USHORT nPos, Rectangle& rPixelRect, MapMode& rMapMode, sal_uInt8& rRangeId ) const;
- BOOL GetHeaderPosition( Rectangle& rHeaderRect ) const;
- BOOL GetFooterPosition( Rectangle& rFooterRect ) const;
- BOOL IsHeaderLeft() const;
- BOOL IsFooterLeft() const;
+ BOOL GetHeaderPosition( Rectangle& rHeaderRect ) const;
+ BOOL GetFooterPosition( Rectangle& rFooterRect ) const;
+ BOOL IsHeaderLeft() const;
+ BOOL IsFooterLeft() const;
- long GetNoteCountInRange( const Rectangle& rVisiblePixel, BOOL bNoteMarks ) const;
- BOOL GetNoteInRange( const Rectangle& rVisiblePixel, long nIndex, BOOL bNoteMarks,
+ long GetNoteCountInRange( const Rectangle& rVisiblePixel, BOOL bNoteMarks ) const;
+ BOOL GetNoteInRange( const Rectangle& rVisiblePixel, long nIndex, BOOL bNoteMarks,
ScAddress& rCellPos, Rectangle& rNoteRect ) const;
- Rectangle GetNoteInRangeOutputRect(const Rectangle& rVisiblePixel, BOOL bNoteMarks,
+ Rectangle GetNoteInRangeOutputRect(const Rectangle& rVisiblePixel, BOOL bNoteMarks,
const ScAddress& aCellPos) const;
- // Check if any cells (including column/row headers) are in the visible area
- BOOL HasCellsInRange( const Rectangle& rVisiblePixel ) const;
+ // Check if any cells (including column/row headers) are in the visible area
+ BOOL HasCellsInRange( const Rectangle& rVisiblePixel ) const;
- BOOL GetCellPosition( const ScAddress& rCellPos, Rectangle& rCellRect ) const;
+ BOOL GetCellPosition( const ScAddress& rCellPos, Rectangle& rCellRect ) const;
// returns the rectangle where the EditEngine draws the text of a Header Cell
// if bColHeader is true it returns the rectangle of the header of the column in rCellPos
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 7ff97f8d0152..eb533079a2f6 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ class CommandEvent;
class ScPreviewShell: public SfxViewShell
{
- ScDocShell* pDocShell;
+ ScDocShell* pDocShell;
- ScPreview* pPreview; // Ausgabe-Fenster
- ScrollBar* pHorScroll;
- ScrollBar* pVerScroll;
- Window* pCorner;
+ ScPreview* pPreview; // Ausgabe-Fenster
+ ScrollBar* pHorScroll;
+ ScrollBar* pVerScroll;
+ Window* pCorner;
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSourceData; // ViewData
- BYTE nSourceDesignMode; // form design mode from TabView
- SvxZoomType eZoom;
+ BYTE nSourceDesignMode; // form design mode from TabView
+ SvxZoomType eZoom;
long nMaxVertPos;
- SfxBroadcaster* pAccessibilityBroadcaster;
+ SfxBroadcaster* pAccessibilityBroadcaster;
private:
- void Construct( Window* pParent );
+ void Construct( Window* pParent );
DECL_LINK(ScrollHandler, ScrollBar* );
- void DoScroll( USHORT nMode );
+ void DoScroll( USHORT nMode );
protected:
- virtual void Activate(BOOL bMDI);
- virtual void Deactivate(BOOL bMDI);
+ virtual void Activate(BOOL bMDI);
+ virtual void Deactivate(BOOL bMDI);
- virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize );
+ virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize );
- virtual void InnerResizePixel( const Point &rOfs, const Size &rSize );
- virtual void OuterResizePixel( const Point &rOfs, const Size &rSize );
+ virtual void InnerResizePixel( const Point &rOfs, const Size &rSize );
+ virtual void OuterResizePixel( const Point &rOfs, const Size &rSize );
- virtual Size GetOptimalSizePixel() const;
+ virtual Size GetOptimalSizePixel() const;
virtual String GetDescription() const;
- virtual void WriteUserData(String &, BOOL bBrowse = FALSE);
- virtual void ReadUserData(const String &, BOOL bBrowse = FALSE);
+ virtual void WriteUserData(String &, BOOL bBrowse = FALSE);
+ virtual void ReadUserData(const String &, BOOL bBrowse = FALSE);
virtual void WriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False );
virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False );
@@ -93,43 +93,43 @@ public:
SFX_DECL_INTERFACE(SCID_PREVIEW_SHELL)
SFX_DECL_VIEWFACTORY(ScPreviewShell);
- ScPreviewShell( SfxViewFrame* pViewFrame,
- SfxViewShell* pOldSh );
+ ScPreviewShell( SfxViewFrame* pViewFrame,
+ SfxViewShell* pOldSh );
- virtual ~ScPreviewShell();
+ virtual ~ScPreviewShell();
- void InitStartTable(SCTAB nTab);
+ void InitStartTable(SCTAB nTab);
- void UpdateScrollBars();
- BOOL ScrollCommand( const CommandEvent& rCEvt );
+ void UpdateScrollBars();
+ BOOL ScrollCommand( const CommandEvent& rCEvt );
- void Execute( SfxRequest& rReq );
- void GetState( SfxItemSet& rSet );
+ void Execute( SfxRequest& rReq );
+ void GetState( SfxItemSet& rSet );
- void FillFieldData( ScHeaderFieldData& rData );
+ void FillFieldData( ScHeaderFieldData& rData );
::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >
GetSourceData() const { return aSourceData; }
- BYTE GetSourceDesignMode() const { return nSourceDesignMode; }
+ BYTE GetSourceDesignMode() const { return nSourceDesignMode; }
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
- virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE );
+ virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE );
virtual USHORT SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
- virtual PrintDialog* CreatePrintDialog( Window* pParent );
+ virtual PrintDialog* CreatePrintDialog( Window* pParent );
virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions );
- virtual void PreparePrint( PrintDialog* pPrintDialog = NULL );
+ virtual void PreparePrint( PrintDialog* pPrintDialog = NULL );
virtual ErrCode DoPrint( SfxPrinter *pPrinter, PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI );
virtual USHORT Print( SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pPrintDialog = NULL );
- void AddAccessibilityObject( SfxListener& rObject );
- void RemoveAccessibilityObject( SfxListener& rObject );
- void BroadcastAccessibility( const SfxHint &rHint );
- BOOL HasAccessibilityObjects();
+ void AddAccessibilityObject( SfxListener& rObject );
+ void RemoveAccessibilityObject( SfxListener& rObject );
+ void BroadcastAccessibility( const SfxHint &rHint );
+ BOOL HasAccessibilityObjects();
const ScPreviewLocationData& GetLocationData();
- ScDocument* GetDocument();
- ScPreview* GetPreview() { return pPreview; }
+ ScDocument* GetDocument();
+ ScPreview* GetPreview() { return pPreview; }
};
diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx
index e3966bdc3d37..a4cb1645f0a9 100644
--- a/sc/source/ui/inc/printfun.hxx
+++ b/sc/source/ui/inc/printfun.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,27 +54,27 @@ class SvxBrushItem;
class SvxShadowItem;
class FmFormView;
-#define RANGENO_NORANGE USHRT_MAX
+#define RANGENO_NORANGE USHRT_MAX
-#define PRINT_HEADER_WIDTH (1.0 * TWIPS_PER_CM)
-#define PRINT_HEADER_HEIGHT (12.8 * TWIPS_PER_POINT)
-#define PRINT_HEADER_FONTHEIGHT 200
+#define PRINT_HEADER_WIDTH (1.0 * TWIPS_PER_CM)
+#define PRINT_HEADER_HEIGHT (12.8 * TWIPS_PER_POINT)
+#define PRINT_HEADER_FONTHEIGHT 200
- // Einstellungen fuer Kopf-/Fusszeilen
+ // Einstellungen fuer Kopf-/Fusszeilen
struct ScPrintHFParam
{
- BOOL bEnable;
- BOOL bDynamic;
- BOOL bShared;
- long nHeight; // insgesamt (Hoehe+Abstand+Rahmen)
- long nManHeight; // eingestellte Groesse (Min. bei dynamisch)
- USHORT nDistance;
- USHORT nLeft; // Raender
- USHORT nRight;
+ BOOL bEnable;
+ BOOL bDynamic;
+ BOOL bShared;
+ long nHeight; // insgesamt (Hoehe+Abstand+Rahmen)
+ long nManHeight; // eingestellte Groesse (Min. bei dynamisch)
+ USHORT nDistance;
+ USHORT nLeft; // Raender
+ USHORT nRight;
const ScPageHFItem* pLeft;
const ScPageHFItem* pRight;
- const SvxBoxItem* pBorder;
+ const SvxBoxItem* pBorder;
const SvxBrushItem* pBack;
const SvxShadowItem* pShadow;
};
@@ -87,147 +87,147 @@ class ScJobSetup
public:
ScJobSetup( SfxPrinter* pPrinter );
- Size aUserSize;
- MapMode aUserMapMode;
- Paper ePaper;
+ Size aUserSize;
+ MapMode aUserMapMode;
+ Paper ePaper;
Orientation eOrientation;
- USHORT nPaperBin;
+ USHORT nPaperBin;
};
-struct ScPrintState // Variablen aus ScPrintFunc retten
+struct ScPrintState // Variablen aus ScPrintFunc retten
{
- SCTAB nPrintTab;
- SCCOL nStartCol;
- SCROW nStartRow;
- SCCOL nEndCol;
- SCROW nEndRow;
- USHORT nZoom;
- size_t nPagesX;
- size_t nPagesY;
- long nTabPages;
- long nTotalPages;
- long nPageStart;
- long nDocPages;
+ SCTAB nPrintTab;
+ SCCOL nStartCol;
+ SCROW nStartRow;
+ SCCOL nEndCol;
+ SCROW nEndRow;
+ USHORT nZoom;
+ size_t nPagesX;
+ size_t nPagesY;
+ long nTabPages;
+ long nTotalPages;
+ long nPageStart;
+ long nDocPages;
};
class ScPageRowEntry
{
private:
- SCROW nStartRow;
- SCROW nEndRow;
- size_t nPagesX;
- BOOL* pHidden;
- //! Anzahl wirklich sichtbarer cachen???
+ SCROW nStartRow;
+ SCROW nEndRow;
+ size_t nPagesX;
+ BOOL* pHidden;
+ //! Anzahl wirklich sichtbarer cachen???
public:
- ScPageRowEntry() { nStartRow = nEndRow = 0; nPagesX = 0; pHidden = NULL; }
- ~ScPageRowEntry() { delete[] pHidden; }
+ ScPageRowEntry() { nStartRow = nEndRow = 0; nPagesX = 0; pHidden = NULL; }
+ ~ScPageRowEntry() { delete[] pHidden; }
ScPageRowEntry(const ScPageRowEntry& r);
const ScPageRowEntry& operator=(const ScPageRowEntry& r);
- SCROW GetStartRow() const { return nStartRow; }
- SCROW GetEndRow() const { return nEndRow; }
- size_t GetPagesX() const { return nPagesX; }
- void SetStartRow(SCROW n) { nStartRow = n; }
- void SetEndRow(SCROW n) { nEndRow = n; }
+ SCROW GetStartRow() const { return nStartRow; }
+ SCROW GetEndRow() const { return nEndRow; }
+ size_t GetPagesX() const { return nPagesX; }
+ void SetStartRow(SCROW n) { nStartRow = n; }
+ void SetEndRow(SCROW n) { nEndRow = n; }
- void SetPagesX(size_t nNew);
- void SetHidden(size_t nX);
- BOOL IsHidden(size_t nX) const;
+ void SetPagesX(size_t nNew);
+ void SetHidden(size_t nX);
+ BOOL IsHidden(size_t nX) const;
- size_t CountVisible() const;
+ size_t CountVisible() const;
};
class ScPrintFunc
{
private:
- ScDocShell* pDocShell;
- ScDocument* pDoc;
- SfxPrinter* pPrinter;
- OutputDevice* pDev;
- FmFormView* pDrawView;
-
- MapMode aOldPrinterMode; // MapMode vor dem Aufruf
-
- Point aSrcOffset; // Papier-1/100 mm
- Point aOffset; // mit Faktor aus Seitenformat skaliert
- USHORT nManualZoom; // Zoom in Preview (Prozent)
- BOOL bClearWin; // Ausgabe vorher loeschen
- BOOL bUseStyleColor;
- BOOL bIsRender;
-
- SCTAB nPrintTab;
- long nPageStart; // Offset fuer erste Seite
- long nDocPages; // Seiten im Dokument
-
- const ScRange* pUserArea; // Selektion, wenn im Dialog eingestellt
-
- const SfxItemSet* pParamSet; // eingestellte Vorlage
- BOOL bState; // aus State-struct erzeugt
-
- // Parameter aus Vorlage:
- USHORT nLeftMargin;
- USHORT nTopMargin;
- USHORT nRightMargin;
- USHORT nBottomMargin;
- BOOL bCenterHor;
- BOOL bCenterVer;
- BOOL bLandscape;
- BOOL bSourceRangeValid;
-
- USHORT nPageUsage;
- Size aPageSize; // Drucker-Twips
- const SvxBoxItem* pBorderItem;
+ ScDocShell* pDocShell;
+ ScDocument* pDoc;
+ SfxPrinter* pPrinter;
+ OutputDevice* pDev;
+ FmFormView* pDrawView;
+
+ MapMode aOldPrinterMode; // MapMode vor dem Aufruf
+
+ Point aSrcOffset; // Papier-1/100 mm
+ Point aOffset; // mit Faktor aus Seitenformat skaliert
+ USHORT nManualZoom; // Zoom in Preview (Prozent)
+ BOOL bClearWin; // Ausgabe vorher loeschen
+ BOOL bUseStyleColor;
+ BOOL bIsRender;
+
+ SCTAB nPrintTab;
+ long nPageStart; // Offset fuer erste Seite
+ long nDocPages; // Seiten im Dokument
+
+ const ScRange* pUserArea; // Selektion, wenn im Dialog eingestellt
+
+ const SfxItemSet* pParamSet; // eingestellte Vorlage
+ BOOL bState; // aus State-struct erzeugt
+
+ // Parameter aus Vorlage:
+ USHORT nLeftMargin;
+ USHORT nTopMargin;
+ USHORT nRightMargin;
+ USHORT nBottomMargin;
+ BOOL bCenterHor;
+ BOOL bCenterVer;
+ BOOL bLandscape;
+ BOOL bSourceRangeValid;
+
+ USHORT nPageUsage;
+ Size aPageSize; // Drucker-Twips
+ const SvxBoxItem* pBorderItem;
const SvxBrushItem* pBackgroundItem;
const SvxShadowItem* pShadowItem;
- ScRange aLastSourceRange;
- ScPrintHFParam aHdr;
- ScPrintHFParam aFtr;
- ScPageTableParam aTableParam;
- ScPageAreaParam aAreaParam;
-
- // berechnete Werte:
- USHORT nZoom;
- BOOL bPrintCurrentTable;
- BOOL bMultiArea;
- long nTabPages;
- long nTotalPages;
-
- Rectangle aPageRect; // Dokument-Twips
-
- MapMode aLogicMode; // in DoPrint gesetzt
- MapMode aOffsetMode;
- MapMode aTwipMode;
- double nScaleX;
- double nScaleY;
-
- SCCOL nRepeatStartCol;
- SCCOL nRepeatEndCol;
- SCROW nRepeatStartRow;
- SCROW nRepeatEndRow;
-
- SCCOL nStartCol;
- SCROW nStartRow;
- SCCOL nEndCol;
- SCROW nEndRow;
-
- SCCOL* pPageEndX; // Seitenaufteilung
+ ScRange aLastSourceRange;
+ ScPrintHFParam aHdr;
+ ScPrintHFParam aFtr;
+ ScPageTableParam aTableParam;
+ ScPageAreaParam aAreaParam;
+
+ // berechnete Werte:
+ USHORT nZoom;
+ BOOL bPrintCurrentTable;
+ BOOL bMultiArea;
+ long nTabPages;
+ long nTotalPages;
+
+ Rectangle aPageRect; // Dokument-Twips
+
+ MapMode aLogicMode; // in DoPrint gesetzt
+ MapMode aOffsetMode;
+ MapMode aTwipMode;
+ double nScaleX;
+ double nScaleY;
+
+ SCCOL nRepeatStartCol;
+ SCCOL nRepeatEndCol;
+ SCROW nRepeatStartRow;
+ SCROW nRepeatEndRow;
+
+ SCCOL nStartCol;
+ SCROW nStartRow;
+ SCCOL nEndCol;
+ SCROW nEndRow;
+
+ SCCOL* pPageEndX; // Seitenaufteilung
SCROW* pPageEndY;
- ScPageRowEntry* pPageRows;
- size_t nPagesX;
- size_t nPagesY;
- size_t nTotalY;
+ ScPageRowEntry* pPageRows;
+ size_t nPagesX;
+ size_t nPagesY;
+ size_t nTotalY;
- ScHeaderEditEngine* pEditEngine;
- SfxItemSet* pEditDefaults;
+ ScHeaderEditEngine* pEditEngine;
+ SfxItemSet* pEditDefaults;
- ScHeaderFieldData aFieldData;
+ ScHeaderFieldData aFieldData;
- List aNotePosList; // Reihenfolge der Notizen
+ List aNotePosList; // Reihenfolge der Notizen
- ScPageBreakData* pPageData; // zum Eintragen der Umbrueche etc.
+ ScPageBreakData* pPageData; // zum Eintragen der Umbrueche etc.
public:
ScPrintFunc( ScDocShell* pShell, SfxPrinter* pNewPrinter, SCTAB nTab,
@@ -257,48 +257,48 @@ public:
const ScPrintOptions* pOptions );
~ScPrintFunc();
- static void DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double nPrintFactor,
+ static void DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double nPrintFactor,
const Rectangle& rBound, ScViewData* pViewData, BOOL bMetaFile );
- void SetDrawView( FmFormView* pNew );
+ void SetDrawView( FmFormView* pNew );
- void SetOffset( const Point& rOfs );
- void SetManualZoom( USHORT nNewZoom );
- void SetDateTime( const Date& rDate, const Time& rTime );
+ void SetOffset( const Point& rOfs );
+ void SetManualZoom( USHORT nNewZoom );
+ void SetDateTime( const Date& rDate, const Time& rTime );
- void SetClearFlag( BOOL bFlag );
- void SetUseStyleColor( BOOL bFlag );
- void SetRenderFlag( BOOL bFlag );
+ void SetClearFlag( BOOL bFlag );
+ void SetUseStyleColor( BOOL bFlag );
+ void SetRenderFlag( BOOL bFlag );
void SetExclusivelyDrawOleAndDrawObjects();//for printing selected objects without surrounding cell contents
- BOOL UpdatePages();
+ BOOL UpdatePages();
- void ApplyPrintSettings(); // aus DoPrint() schon gerufen
- long DoPrint( const MultiSelection& rPageRanges,
+ void ApplyPrintSettings(); // aus DoPrint() schon gerufen
+ long DoPrint( const MultiSelection& rPageRanges,
/*long nStartPage, long nDisplayStart, BOOL bDoPrint,
SfxProgress* pProgress, ScPreviewLocationData* pLocationData );*/
long nStartPage, long nDisplayStart, BOOL bDoPrint = TRUE,
SfxProgress* pProgress = NULL, ScPreviewLocationData* pLocationData = NULL);
- // Werte abfragen - sofort
+ // Werte abfragen - sofort
- Size GetPageSize() const { return aPageSize; }
- Size GetDataSize() const;
- void GetScaleData( Size& rPhysSize, long& rDocHdr, long& rDocFtr );
- long GetFirstPageNo() const { return aTableParam.nFirstPageNo; }
+ Size GetPageSize() const { return aPageSize; }
+ Size GetDataSize() const;
+ void GetScaleData( Size& rPhysSize, long& rDocHdr, long& rDocFtr );
+ long GetFirstPageNo() const { return aTableParam.nFirstPageNo; }
- // letzte Werte abfragen - nach DoPrint !!!
+ // letzte Werte abfragen - nach DoPrint !!!
- double GetScaleX() const { return nScaleX; }
- double GetScaleY() const { return nScaleY; }
- long GetTotalPages() const { return nTotalPages; }
- USHORT GetZoom() const { return nZoom; }
+ double GetScaleX() const { return nScaleX; }
+ double GetScaleY() const { return nScaleY; }
+ long GetTotalPages() const { return nTotalPages; }
+ USHORT GetZoom() const { return nZoom; }
- void ResetBreaks( SCTAB nTab );
+ void ResetBreaks( SCTAB nTab );
- void GetPrintState( ScPrintState& rState );
- BOOL GetLastSourceRange( ScRange& rRange ) const;
+ void GetPrintState( ScPrintState& rState );
+ BOOL GetLastSourceRange( ScRange& rRange ) const;
USHORT GetLeftMargin() const{return nLeftMargin;}
USHORT GetRightMargin() const{return nRightMargin;}
USHORT GetTopMargin() const{return nTopMargin;}
@@ -311,55 +311,55 @@ public:
ScPrintHFParam GetFooter(){return aFtr;}
private:
- void Construct( const ScPrintOptions* pOptions );
- void InitParam( const ScPrintOptions* pOptions );
- void CalcZoom( USHORT nRangeNo );
- void CalcPages();
- long CountPages();
- long CountNotePages();
+ void Construct( const ScPrintOptions* pOptions );
+ void InitParam( const ScPrintOptions* pOptions );
+ void CalcZoom( USHORT nRangeNo );
+ void CalcPages();
+ long CountPages();
+ long CountNotePages();
- BOOL AdjustPrintArea( BOOL bNew );
+ BOOL AdjustPrintArea( BOOL bNew );
- Size GetDocPageSize();
+ Size GetDocPageSize();
- long TextHeight( const EditTextObject* pObject );
- void MakeEditEngine();
- void UpdateHFHeight( ScPrintHFParam& rParam );
+ long TextHeight( const EditTextObject* pObject );
+ void MakeEditEngine();
+ void UpdateHFHeight( ScPrintHFParam& rParam );
- void InitModes();
+ void InitModes();
- BOOL IsLeft( long nPageNo );
- BOOL IsMirror( long nPageNo );
- void ReplaceFields( long nPageNo ); // aendert Text in pEditEngine
- void MakeTableString(); // setzt aTableStr
+ BOOL IsLeft( long nPageNo );
+ BOOL IsMirror( long nPageNo );
+ void ReplaceFields( long nPageNo ); // aendert Text in pEditEngine
+ void MakeTableString(); // setzt aTableStr
- void PrintPage( long nPageNo,
+ void PrintPage( long nPageNo,
SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
BOOL bDoPrint, ScPreviewLocationData* pLocationData );
- void PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
+ void PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
long nScrX, long nScrY,
BOOL bShLeft, BOOL bShTop, BOOL bShRight, BOOL bShBottom );
- void LocateArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
+ void LocateArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
long nScrX, long nScrY, BOOL bRepCol, BOOL bRepRow,
ScPreviewLocationData& rLocationData );
- void PrintColHdr( SCCOL nX1, SCCOL nX2, long nScrX, long nScrY );
- void PrintRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY );
- void LocateColHdr( SCCOL nX1, SCCOL nX2, long nScrX, long nScrY,
+ void PrintColHdr( SCCOL nX1, SCCOL nX2, long nScrX, long nScrY );
+ void PrintRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY );
+ void LocateColHdr( SCCOL nX1, SCCOL nX2, long nScrX, long nScrY,
BOOL bRepCol, ScPreviewLocationData& rLocationData );
- void LocateRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY,
+ void LocateRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY,
BOOL bRepRow, ScPreviewLocationData& rLocationData );
- void PrintHF( long nPageNo, BOOL bHeader, long nStartY,
+ void PrintHF( long nPageNo, BOOL bHeader, long nStartY,
BOOL bDoPrint, ScPreviewLocationData* pLocationData );
- long PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPreviewLocationData* pLocationData );
- long DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData* pLocationData );
+ long PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPreviewLocationData* pLocationData );
+ long DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData* pLocationData );
- void DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH,
+ void DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH,
const SvxBoxItem* pBorderData,
const SvxBrushItem* pBackground,
const SvxShadowItem* pShadow );
- void FillPageData();
+ void FillPageData();
};
diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx
index 6194a4342849..369db1191cb4 100644
--- a/sc/source/ui/inc/privsplt.hxx
+++ b/sc/source/ui/inc/privsplt.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +26,7 @@
************************************************************************/
#ifndef SC_PRIVSPLT_HXX
-#define SC_PRIVSPLT_HXX
+#define SC_PRIVSPLT_HXX
#include <vcl/ctrl.hxx>
@@ -36,47 +36,47 @@ class ScPrivatSplit : public Control
{
private:
- Link aCtrModifiedLink;
- BOOL aMovingFlag;
- Pointer aWinPointer;
- SC_SPLIT_DIRECTION eScSplit;
- short nOldX;
- short nOldY;
- short nNewX;
- short nNewY;
- short nMinPos;
- short nMaxPos;
- Range aXMovingRange;
- Range aYMovingRange;
- short nDeltaX;
- short nDeltaY;
+ Link aCtrModifiedLink;
+ BOOL aMovingFlag;
+ Pointer aWinPointer;
+ SC_SPLIT_DIRECTION eScSplit;
+ short nOldX;
+ short nOldY;
+ short nNewX;
+ short nNewY;
+ short nMinPos;
+ short nMaxPos;
+ Range aXMovingRange;
+ Range aYMovingRange;
+ short nDeltaX;
+ short nDeltaY;
using Control::ImplInitSettings;
- void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+ void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
protected:
- virtual void MouseMove( const MouseEvent& rMEvt );
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void MouseButtonUp( const MouseEvent& rMEvt);
+ virtual void MouseMove( const MouseEvent& rMEvt );
+ virtual void MouseButtonDown( const MouseEvent& rMEvt );
+ virtual void MouseButtonUp( const MouseEvent& rMEvt);
public:
ScPrivatSplit( Window* pWindow, const ResId& rResId,
SC_SPLIT_DIRECTION eScSplit);
- virtual short GetDeltaX();
- virtual short GetDeltaY();
+ virtual short GetDeltaX();
+ virtual short GetDeltaY();
virtual void CtrModified();
- void SetYRange(Range cRgeY);
+ void SetYRange(Range cRgeY);
- void MoveSplitTo(Point aPos);
+ void MoveSplitTo(Point aPos);
- virtual void StateChanged( StateChangedType nType );
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
+ virtual void StateChanged( StateChangedType nType );
+ virtual void DataChanged( const DataChangedEvent& rDCEvt );
void SetCtrModifiedHdl( const Link& rLink ) { aCtrModifiedLink = rLink; }
const Link& GetCtrModifiedHdl() const { return aCtrModifiedLink; }
diff --git a/sc/source/ui/inc/protectiondlg.hrc b/sc/source/ui/inc/protectiondlg.hrc
index 52e57040922c..7bee7725a617 100644
--- a/sc/source/ui/inc/protectiondlg.hrc
+++ b/sc/source/ui/inc/protectiondlg.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/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx
index d7d555ff5ac5..4d492f87445d 100644
--- a/sc/source/ui/inc/protectiondlg.hxx
+++ b/sc/source/ui/inc/protectiondlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index ef245ebf26cf..2c813cc36ca5 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -216,8 +216,8 @@ public:
virtual short Execute();
- /**
- * @return String internal name of the selected field. Note that this may
+ /**
+ * @return String internal name of the selected field. Note that this may
* be different from the name displayed in the dialog if the field
* has a layout name.
*/
diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx
index c74b9e028d2f..b14501eba42f 100644
--- a/sc/source/ui/inc/pvlaydlg.hxx
+++ b/sc/source/ui/inc/pvlaydlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/redcom.hxx b/sc/source/ui/inc/redcom.hxx
index e7e064359349..e4613d8741bf 100644
--- a/sc/source/ui/inc/redcom.hxx
+++ b/sc/source/ui/inc/redcom.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +35,15 @@
#include "chgtrack.hxx"
class ScDocShell;
-class AbstractSvxPostItDialog; //CHINA001
+class AbstractSvxPostItDialog; //CHINA001
class ScRedComDialog
{
private:
- ScChangeAction *pChangeAction;
- ScDocShell *pDocShell;
- String aComment;
+ ScChangeAction *pChangeAction;
+ ScDocShell *pDocShell;
+ String aComment;
AbstractSvxPostItDialog* pDlg;
DECL_LINK( PrevHdl, AbstractSvxPostItDialog* );
@@ -51,8 +51,8 @@ private:
protected:
- void ReInit(ScChangeAction *);
- void SelectCell();
+ void ReInit(ScChangeAction *);
+ void SelectCell();
ScChangeAction *FindPrev(ScChangeAction *pAction);
ScChangeAction *FindNext(ScChangeAction *pAction);
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index 617d7c0a669a..79c15d2d5288 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +33,11 @@
#include "dbfunc.hxx"
#define DECL_WRAPPER(Class) \
- class Class : public SfxChildWindow \
- { \
- public: \
- Class( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); \
- SFX_DECL_CHILDWINDOW(Class); \
+ class Class : public SfxChildWindow \
+ { \
+ public: \
+ Class( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); \
+ SFX_DECL_CHILDWINDOW(Class); \
};
@@ -67,7 +67,7 @@ DECL_WRAPPER(ScArgumentDlgWrapper)
class ScAcceptChgDlgWrapper: public SfxChildWindow
{
public:
- ScAcceptChgDlgWrapper( Window*,
+ ScAcceptChgDlgWrapper( Window*,
USHORT,
SfxBindings*,
SfxChildWinInfo* );
@@ -80,38 +80,38 @@ class ScAcceptChgDlgWrapper: public SfxChildWindow
class ScSimpleRefDlgWrapper: public SfxChildWindow
{
public:
- ScSimpleRefDlgWrapper( Window*,
+ ScSimpleRefDlgWrapper( Window*,
USHORT,
SfxBindings*,
SfxChildWinInfo* );
SFX_DECL_CHILDWINDOW(Class);
- static void SetDefaultPosSize(Point aPos, Size aSize, BOOL bSet=TRUE);
- virtual String GetRefString();
- virtual void SetRefString(const String& rStr);
- void SetCloseHdl( const Link& rLink );
- void SetUnoLinks( const Link& rDone, const Link& rAbort,
+ static void SetDefaultPosSize(Point aPos, Size aSize, BOOL bSet=TRUE);
+ virtual String GetRefString();
+ virtual void SetRefString(const String& rStr);
+ void SetCloseHdl( const Link& rLink );
+ void SetUnoLinks( const Link& rDone, const Link& rAbort,
const Link& rChange );
void SetFlags( BOOL bCloseOnButtonUp, BOOL bSingleCell, BOOL bMultiSelection );
- static void SetAutoReOpen(BOOL bFlag);
+ static void SetAutoReOpen(BOOL bFlag);
- void StartRefInput();
+ void StartRefInput();
};
//<!--Added by PengYunQuan for Validity Cell Range Picker
class SC_DLLPUBLIC ScValidityRefChildWin : public SfxChildWindow
{
- bool m_bVisibleLock:1;
- bool m_bFreeWindowLock:1;
+ bool m_bVisibleLock:1;
+ bool m_bFreeWindowLock:1;
Window * m_pSavedWndParent;
-public:
+public:
ScValidityRefChildWin( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
- SFX_DECL_CHILDWINDOW(ScValidityRefChildWin);
+ SFX_DECL_CHILDWINDOW(ScValidityRefChildWin);
~ScValidityRefChildWin();
- bool LockVisible( bool bLock ){ bool bVis = m_bVisibleLock; m_bVisibleLock = bLock; return bVis; }
- bool LockFreeWindow( bool bLock ){ bool bFreeWindow = m_bFreeWindowLock; m_bFreeWindowLock = bLock; return bFreeWindow; }
- void Hide(){ if( !m_bVisibleLock) SfxChildWindow::Hide(); }
+ bool LockVisible( bool bLock ){ bool bVis = m_bVisibleLock; m_bVisibleLock = bLock; return bVis; }
+ bool LockFreeWindow( bool bLock ){ bool bFreeWindow = m_bFreeWindowLock; m_bFreeWindowLock = bLock; return bFreeWindow; }
+ void Hide(){ if( !m_bVisibleLock) SfxChildWindow::Hide(); }
void Show( USHORT nFlags ){ if( !m_bVisibleLock ) SfxChildWindow::Show( nFlags ); }
};
//-->Added by PengYunQuan for Validity Cell Range Picker
diff --git a/sc/source/ui/inc/refundo.hxx b/sc/source/ui/inc/refundo.hxx
index 87b5330e0f96..668adbe075fc 100644
--- a/sc/source/ui/inc/refundo.hxx
+++ b/sc/source/ui/inc/refundo.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 ScUnoRefList;
class ScRefUndoData
{
private:
- ScDBCollection* pDBCollection;
- ScRangeName* pRangeName;
- ScPrintRangeSaver* pPrintRanges;
- ScDPCollection* pDPCollection;
- ScConditionalFormatList* pCondFormList;
- ScDetOpList* pDetOpList;
- ScChartListenerCollection* pChartListenerCollection;
- ScAreaLinkSaveCollection* pAreaLinks;
+ ScDBCollection* pDBCollection;
+ ScRangeName* pRangeName;
+ ScPrintRangeSaver* pPrintRanges;
+ ScDPCollection* pDPCollection;
+ ScConditionalFormatList* pCondFormList;
+ ScDetOpList* pDetOpList;
+ ScChartListenerCollection* pChartListenerCollection;
+ ScAreaLinkSaveCollection* pAreaLinks;
ScUnoRefList* pUnoRefs;
public:
ScRefUndoData( const ScDocument* pDoc );
~ScRefUndoData();
- void DeleteUnchanged( const ScDocument* pDoc );
- void DoUndo( ScDocument* pDoc, BOOL bUndoRefFirst );
+ void DeleteUnchanged( const ScDocument* pDoc );
+ void DoUndo( ScDocument* pDoc, BOOL bUndoRefFirst );
};
diff --git a/sc/source/ui/inc/retypepassdlg.hrc b/sc/source/ui/inc/retypepassdlg.hrc
index f027b6bc7ded..76f7a1231613 100644
--- a/sc/source/ui/inc/retypepassdlg.hrc
+++ b/sc/source/ui/inc/retypepassdlg.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/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx
index 59753d8d386b..d91125b407c7 100644
--- a/sc/source/ui/inc/retypepassdlg.hxx
+++ b/sc/source/ui/inc/retypepassdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxx
index 225fd01451df..6f9aa0d73e21 100644
--- a/sc/source/ui/inc/rfindlst.hxx
+++ b/sc/source/ui/inc/rfindlst.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +36,10 @@
struct ScRangeFindData
{
- ScRange aRef;
- USHORT nFlags;
- xub_StrLen nSelStart;
- xub_StrLen nSelEnd;
+ ScRange aRef;
+ USHORT nFlags;
+ xub_StrLen nSelStart;
+ xub_StrLen nSelEnd;
ScRangeFindData( const ScRange& rR, USHORT nF, xub_StrLen nS, xub_StrLen nE ) :
aRef(rR), nFlags(nF), nSelStart(nS), nSelEnd(nE) {}
@@ -47,23 +47,23 @@ struct ScRangeFindData
class ScRangeFindList
{
- List aEntries;
- String aDocName;
- BOOL bHidden;
+ List aEntries;
+ String aDocName;
+ BOOL bHidden;
public:
ScRangeFindList(const String& rName);
~ScRangeFindList();
- ULONG Count() const { return aEntries.Count(); }
- void Insert( ScRangeFindData* pNew ) { aEntries.Insert(pNew, LIST_APPEND); }
+ ULONG Count() const { return aEntries.Count(); }
+ void Insert( ScRangeFindData* pNew ) { aEntries.Insert(pNew, LIST_APPEND); }
ScRangeFindData* GetObject( ULONG nIndex ) const
{ return (ScRangeFindData*)aEntries.GetObject(nIndex); }
- void SetHidden( BOOL bSet ) { bHidden = bSet; }
+ void SetHidden( BOOL bSet ) { bHidden = bSet; }
- const String& GetDocName() const { return aDocName; }
- BOOL IsHidden() const { return bHidden; }
+ const String& GetDocName() const { return aDocName; }
+ BOOL IsHidden() const { return bHidden; }
static ColorData GetColorName( USHORT nIndex );
};
diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx
index 6281bb58b02c..6f42535c7a95 100644
--- a/sc/source/ui/inc/scendlg.hxx
+++ b/sc/source/ui/inc/scendlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,23 +52,23 @@ public:
private:
FixedLine aFlName;
- Edit aEdName;
+ Edit aEdName;
FixedLine aFlComment;
- MultiLineEdit aEdComment;
+ MultiLineEdit aEdComment;
FixedLine aFlOptions;
- CheckBox aCbShowFrame;
- ColorListBox aLbColor;
- //CheckBox aCbPrintFrame;
- CheckBox aCbTwoWay;
- //CheckBox aCbAttrib;
- //CheckBox aCbValue;
- CheckBox aCbCopyAll;
+ CheckBox aCbShowFrame;
+ ColorListBox aLbColor;
+ //CheckBox aCbPrintFrame;
+ CheckBox aCbTwoWay;
+ //CheckBox aCbAttrib;
+ //CheckBox aCbValue;
+ CheckBox aCbCopyAll;
CheckBox aCbProtect;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
- const String aDefScenarioName;
- BOOL bIsEdit;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
+ const String aDefScenarioName;
+ BOOL bIsEdit;
DECL_LINK( OkHdl, OKButton * );
DECL_LINK( EnableHdl, CheckBox * );
diff --git a/sc/source/ui/inc/scui_def.hxx b/sc/source/ui/inc/scui_def.hxx
index ca34ab0775b2..ff0c2d351379 100644
--- a/sc/source/ui/inc/scui_def.hxx
+++ b/sc/source/ui/inc/scui_def.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,27 +31,27 @@
#define SCRET_COLS 0x42
#define SCRET_ROWS 0x43
-#define FDS_OPT_NONE 0 // from filldlg.hxx
-#define FDS_OPT_HORZ 1 // from filldlg.hxx
-#define FDS_OPT_VERT 2 // from filldlg.hxx
+#define FDS_OPT_NONE 0 // from filldlg.hxx
+#define FDS_OPT_HORZ 1 // from filldlg.hxx
+#define FDS_OPT_VERT 2 // from filldlg.hxx
-#define INS_CONT_NOEMPTY 0x0100 //from inscodlg.hxx
-#define INS_CONT_TRANS 0x0200 //from inscodlg.hxx
-#define INS_CONT_LINK 0x0400 //from inscodlg.hxx
+#define INS_CONT_NOEMPTY 0x0100 //from inscodlg.hxx
+#define INS_CONT_TRANS 0x0200 //from inscodlg.hxx
+#define INS_CONT_LINK 0x0400 //from inscodlg.hxx
-#define SC_CELL_SHIFT_DISABLE_DOWN 0x01 //from inscodlg.hxx
-#define SC_CELL_SHIFT_DISABLE_RIGHT 0x02 //from inscodlg.hxx
+#define SC_CELL_SHIFT_DISABLE_DOWN 0x01 //from inscodlg.hxx
+#define SC_CELL_SHIFT_DISABLE_RIGHT 0x02 //from inscodlg.hxx
-#define NAME_TOP 1 //from namecrea.hxx
-#define NAME_LEFT 2 //from namecrea.hxx
-#define NAME_BOTTOM 4 //from namecrea.hxx
-#define NAME_RIGHT 8 //from namecrea.hxx
+#define NAME_TOP 1 //from namecrea.hxx
+#define NAME_LEFT 2 //from namecrea.hxx
+#define NAME_BOTTOM 4 //from namecrea.hxx
+#define NAME_RIGHT 8 //from namecrea.hxx
-#define BTN_PASTE_NAME 100 // from namepast.hxx
-#define BTN_PASTE_LIST 101 // from namepast.hxx
+#define BTN_PASTE_NAME 100 // from namepast.hxx
+#define BTN_PASTE_LIST 101 // from namepast.hxx
#define BTN_EXTEND_RANGE 150
#define BTN_CURRENT_SELECTION 151
-#define SCRET_REMOVE 0x42 //from subtdlg.hxx
+#define SCRET_REMOVE 0x42 //from subtdlg.hxx
#endif
diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx
index 3e1a7db38fb2..b89e7aeea4ef 100644
--- a/sc/source/ui/inc/scuiasciiopt.hxx
+++ b/sc/source/ui/inc/scuiasciiopt.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx
index 84a408267b20..857ca2f3f160 100644
--- a/sc/source/ui/inc/scuiautofmt.hxx
+++ b/sc/source/ui/inc/scuiautofmt.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +31,8 @@
class ScAutoFormatDlg : public ModalDialog
{
public:
- ScAutoFormatDlg( Window* pParent,
- ScAutoFormat* pAutoFormat,
+ ScAutoFormatDlg( Window* pParent,
+ ScAutoFormat* pAutoFormat,
const ScAutoFormatData* pSelFormatData,
ScDocument* pDoc );
~ScAutoFormatDlg();
@@ -42,38 +42,38 @@ public:
private:
FixedLine aFlFormat;
- ListBox aLbFormat;
- ScAutoFmtPreview* pWndPreview;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
- PushButton aBtnAdd;
- PushButton aBtnRemove;
- MoreButton aBtnMore;
+ ListBox aLbFormat;
+ ScAutoFmtPreview* pWndPreview;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
+ PushButton aBtnAdd;
+ PushButton aBtnRemove;
+ MoreButton aBtnMore;
FixedLine aFlFormatting;
- CheckBox aBtnNumFormat;
- CheckBox aBtnBorder;
- CheckBox aBtnFont;
- CheckBox aBtnPattern;
- CheckBox aBtnAlignment;
- CheckBox aBtnAdjust;
- PushButton aBtnRename;
- String aStrTitle;
- String aStrLabel;
- String aStrClose;
- String aStrDelTitle;
- String aStrDelMsg;
- String aStrRename;
+ CheckBox aBtnNumFormat;
+ CheckBox aBtnBorder;
+ CheckBox aBtnFont;
+ CheckBox aBtnPattern;
+ CheckBox aBtnAlignment;
+ CheckBox aBtnAdjust;
+ PushButton aBtnRename;
+ String aStrTitle;
+ String aStrLabel;
+ String aStrClose;
+ String aStrDelTitle;
+ String aStrDelMsg;
+ String aStrRename;
//------------------------
- ScAutoFormat* pFormat;
- const ScAutoFormatData* pSelFmtData;
- USHORT nIndex;
- BOOL bCoreDataChanged;
- BOOL bFmtInserted;
+ ScAutoFormat* pFormat;
+ const ScAutoFormatData* pSelFmtData;
+ USHORT nIndex;
+ BOOL bCoreDataChanged;
+ BOOL bFmtInserted;
- void Init ();
- void UpdateChecks ();
+ void Init ();
+ void UpdateChecks ();
//------------------------
DECL_LINK( CheckHdl, Button * );
DECL_LINK( AddHdl, void * );
diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx
index 957d174a3deb..bba9fefec0fd 100644
--- a/sc/source/ui/inc/scuiimoptdlg.hxx
+++ b/sc/source/ui/inc/scuiimoptdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -38,10 +38,10 @@ class ScDelimiterTable;
class ScImportOptionsDlg : public ModalDialog
{
public:
- ScImportOptionsDlg( Window* pParent,
+ ScImportOptionsDlg( Window* pParent,
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 );
@@ -52,20 +52,20 @@ public:
private:
FixedLine aFlFieldOpt;
- FixedText aFtFont;
- SvxTextEncodingBox aLbFont;
- FixedText aFtFieldSep;
- ComboBox aEdFieldSep;
- FixedText aFtTextSep;
- ComboBox aEdTextSep;
+ FixedText aFtFont;
+ SvxTextEncodingBox aLbFont;
+ FixedText aFtFieldSep;
+ ComboBox aEdFieldSep;
+ FixedText aFtTextSep;
+ ComboBox aEdTextSep;
CheckBox aCbFixed;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
- CheckBox aCbShown;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
+ CheckBox aCbShown;
- ScDelimiterTable* pFieldSepTab;
- ScDelimiterTable* pTextSepTab;
+ ScDelimiterTable* pFieldSepTab;
+ ScDelimiterTable* pTextSepTab;
private:
USHORT GetCodeFromCombo( const ComboBox& rEd ) const;
diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx
index 99bd6c2a805a..715097df1300 100644
--- a/sc/source/ui/inc/scuitphfedit.hxx
+++ b/sc/source/ui/inc/scuitphfedit.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,19 +33,19 @@
//===================================================================
enum ScHFEntryId
{
- eNoneEntry ,
- ePageEntry ,
+ eNoneEntry ,
+ ePageEntry ,
ePagesEntry ,
eSheetEntry ,
eConfidentialEntry ,
eFileNamePageEntry ,
eExtFileNameEntry ,
- ePageSheetEntry ,
- ePageFileNameEntry ,
- ePageExtFileNameEntry ,
- eUserNameEntry ,
- eCreatedByEntry ,
- eEntryCount
+ ePageSheetEntry ,
+ ePageFileNameEntry ,
+ ePageExtFileNameEntry ,
+ eUserNameEntry ,
+ eCreatedByEntry ,
+ eEntryCount
};
class ScHeaderEditEngine;
@@ -59,42 +59,42 @@ class ScAccessibleEditObject;
class ScHFEditPage : public SfxTabPage
{
public:
- virtual BOOL FillItemSet ( SfxItemSet& rCoreSet );
- virtual void Reset ( const SfxItemSet& rCoreSet );
+ virtual BOOL FillItemSet ( SfxItemSet& rCoreSet );
+ virtual void Reset ( const SfxItemSet& rCoreSet );
- void SetNumType(SvxNumType eNumType);
- void ClearTextAreas();
+ void SetNumType(SvxNumType eNumType);
+ void ClearTextAreas();
protected:
- ScHFEditPage( Window* pParent,
- USHORT nResId,
- const SfxItemSet& rCoreSet,
- USHORT nWhich, bool bHeader );
- virtual ~ScHFEditPage();
+ ScHFEditPage( Window* pParent,
+ USHORT nResId,
+ const SfxItemSet& rCoreSet,
+ USHORT nWhich, bool bHeader );
+ virtual ~ScHFEditPage();
private:
- FixedText aFtLeft;
- ScEditWindow aWndLeft;
- FixedText aFtCenter;
- ScEditWindow aWndCenter;
- FixedText aFtRight;
- ScEditWindow aWndRight;
- FixedText maFtDefinedHF;
+ FixedText aFtLeft;
+ ScEditWindow aWndLeft;
+ FixedText aFtCenter;
+ ScEditWindow aWndCenter;
+ FixedText aFtRight;
+ ScEditWindow aWndRight;
+ FixedText maFtDefinedHF;
ListBox maLbDefined;
- FixedText maFtCustomHF;
- ImageButton aBtnText;
- ScExtIButton aBtnFile;
- ImageButton aBtnTable;
- ImageButton aBtnPage;
- ImageButton aBtnLastPage;
- ImageButton aBtnDate;
- ImageButton aBtnTime;
- FixedLine aFlInfo;
- FixedInfo aFtInfo;
- ScPopupMenu aPopUpFile;
-
- USHORT nWhich;
- String aCmdArr[6];
+ FixedText maFtCustomHF;
+ ImageButton aBtnText;
+ ScExtIButton aBtnFile;
+ ImageButton aBtnTable;
+ ImageButton aBtnPage;
+ ImageButton aBtnLastPage;
+ ImageButton aBtnDate;
+ ImageButton aBtnTime;
+ FixedLine aFlInfo;
+ FixedInfo aFtInfo;
+ ScPopupMenu aPopUpFile;
+
+ USHORT nWhich;
+ String aCmdArr[6];
private:
#ifdef _TPHFEDIT_CXX
@@ -118,8 +118,8 @@ private:
class ScRightHeaderEditPage : public ScHFEditPage
{
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
- static USHORT* GetRanges();
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
+ static USHORT* GetRanges();
private:
ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rSet );
@@ -130,8 +130,8 @@ private:
class ScLeftHeaderEditPage : public ScHFEditPage
{
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
- static USHORT* GetRanges();
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
+ static USHORT* GetRanges();
private:
ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rSet );
@@ -142,8 +142,8 @@ private:
class ScRightFooterEditPage : public ScHFEditPage
{
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
- static USHORT* GetRanges();
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
+ static USHORT* GetRanges();
private:
ScRightFooterEditPage( Window* pParent, const SfxItemSet& rSet );
@@ -154,8 +154,8 @@ private:
class ScLeftFooterEditPage : public ScHFEditPage
{
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
- static USHORT* GetRanges();
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
+ static USHORT* GetRanges();
private:
ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rSet );
diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx
index ad12d9c743ad..47d1669ca56b 100644
--- a/sc/source/ui/inc/select.hxx
+++ b/sc/source/ui/inc/select.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 <vcl/seleng.hxx>
#endif
-#include "viewdata.hxx" // ScSplitPos
+#include "viewdata.hxx" // ScSplitPos
// ---------------------------------------------------------------------------
@@ -43,76 +43,76 @@ class ScViewData;
class ScViewSelectionEngine : public SelectionEngine
{
private:
- ScSplitPos eWhich;
+ ScSplitPos eWhich;
public:
ScViewSelectionEngine( Window* pWindow, ScTabView* pView,
ScSplitPos eSplitPos );
- ScSplitPos GetWhich() const { return eWhich; }
- void SetWhich(ScSplitPos eNew) { eWhich = eNew; }
+ ScSplitPos GetWhich() const { return eWhich; }
+ void SetWhich(ScSplitPos eNew) { eWhich = eNew; }
};
-class ScViewFunctionSet : public FunctionSet // View (Gridwin / Tastatur)
+class ScViewFunctionSet : public FunctionSet // View (Gridwin / Tastatur)
{
private:
- ScViewData* pViewData;
- ScViewSelectionEngine* pEngine;
+ ScViewData* pViewData;
+ ScViewSelectionEngine* pEngine;
- BOOL bAnchor;
- BOOL bStarted;
- ScAddress aAnchorPos;
+ BOOL bAnchor;
+ BOOL bStarted;
+ ScAddress aAnchorPos;
- ScSplitPos GetWhich();
+ ScSplitPos GetWhich();
public:
ScViewFunctionSet( ScViewData* pNewViewData );
- void SetSelectionEngine( ScViewSelectionEngine* pSelEngine );
+ void SetSelectionEngine( ScViewSelectionEngine* pSelEngine );
- void SetAnchor( SCCOL nPosX, SCROW nPosY );
- void SetAnchorFlag( BOOL bSet );
+ void SetAnchor( SCCOL nPosX, SCROW nPosY );
+ void SetAnchorFlag( BOOL bSet );
- virtual void BeginDrag();
- virtual void CreateAnchor();
- virtual void DestroyAnchor();
- virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE );
- virtual BOOL IsSelectionAtPoint( const Point& rPointPixel );
- virtual void DeselectAtPoint( const Point& rPointPixel );
- virtual void DeselectAll();
+ virtual void BeginDrag();
+ virtual void CreateAnchor();
+ virtual void DestroyAnchor();
+ virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE );
+ virtual BOOL IsSelectionAtPoint( const Point& rPointPixel );
+ virtual void DeselectAtPoint( const Point& rPointPixel );
+ virtual void DeselectAll();
- BOOL SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScroll );
+ BOOL SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScroll );
};
// ---------------------------------------------------------------------------
-class ScHeaderFunctionSet : public FunctionSet // Spalten- / Zeilenkoepfe
+class ScHeaderFunctionSet : public FunctionSet // Spalten- / Zeilenkoepfe
{
private:
- ScViewData* pViewData;
- BOOL bColumn; // Col- / Rowbar
- ScSplitPos eWhich;
+ ScViewData* pViewData;
+ BOOL bColumn; // Col- / Rowbar
+ ScSplitPos eWhich;
- BOOL bAnchor;
- SCCOLROW nCursorPos;
+ BOOL bAnchor;
+ SCCOLROW nCursorPos;
public:
ScHeaderFunctionSet( ScViewData* pNewViewData );
- void SetColumn( BOOL bSet );
- void SetWhich( ScSplitPos eNew );
+ void SetColumn( BOOL bSet );
+ void SetWhich( ScSplitPos eNew );
- virtual void BeginDrag();
- virtual void CreateAnchor();
- virtual void DestroyAnchor();
- virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE );
- virtual BOOL IsSelectionAtPoint( const Point& rPointPixel );
- virtual void DeselectAtPoint( const Point& rPointPixel );
- virtual void DeselectAll();
+ virtual void BeginDrag();
+ virtual void CreateAnchor();
+ virtual void DestroyAnchor();
+ virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE );
+ virtual BOOL IsSelectionAtPoint( const Point& rPointPixel );
+ virtual void DeselectAtPoint( const Point& rPointPixel );
+ virtual void DeselectAll();
- void SetAnchorFlag(BOOL bSet) { bAnchor = bSet; }
+ void SetAnchorFlag(BOOL bSet) { bAnchor = bSet; }
};
diff --git a/sc/source/ui/inc/selectionstate.hxx b/sc/source/ui/inc/selectionstate.hxx
index cbdc6b1faff7..a2f3bf4756c1 100644
--- a/sc/source/ui/inc/selectionstate.hxx
+++ b/sc/source/ui/inc/selectionstate.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/seltrans.hxx b/sc/source/ui/inc/seltrans.hxx
index c695c918dad0..4d06c24a7096 100644
--- a/sc/source/ui/inc/seltrans.hxx
+++ b/sc/source/ui/inc/seltrans.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,32 +49,32 @@ enum ScSelectionTransferMode
class ScSelectionTransferObj : public TransferableHelper
{
private:
- ScTabView* pView;
- ScSelectionTransferMode eMode;
- ScTransferObj* pCellData;
- ScDrawTransferObj* pDrawData;
+ ScTabView* pView;
+ ScSelectionTransferMode eMode;
+ ScTransferObj* pCellData;
+ ScDrawTransferObj* pDrawData;
ScSelectionTransferObj( ScTabView* pSource, ScSelectionTransferMode eNewMode );
- void CreateCellData();
- void CreateDrawData();
+ void CreateCellData();
+ void CreateDrawData();
public:
// creates an object if the view has a valid selection,
// returns NULL otherwise
static ScSelectionTransferObj* CreateFromView( ScTabView* pSource );
- virtual ~ScSelectionTransferObj();
-
- void ForgetView();
- BOOL StillValid();
- ScTabView* GetView() const { return pView; }
+ virtual ~ScSelectionTransferObj();
- ScTransferObj* GetCellData();
- ScDrawTransferObj* GetDrawData();
+ void ForgetView();
+ BOOL StillValid();
+ ScTabView* GetView() const { return pView; }
+
+ ScTransferObj* GetCellData();
+ ScDrawTransferObj* GetDrawData();
- virtual void AddSupportedFormats();
- virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
- virtual void ObjectReleased();
+ virtual void AddSupportedFormats();
+ virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+ virtual void ObjectReleased();
};
#endif
diff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxx
index 68e807461cad..cf7fd66ec789 100644
--- a/sc/source/ui/inc/servobj.hxx
+++ b/sc/source/ui/inc/servobj.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +51,12 @@ class ScServerObject : public ::sfx2::SvLinkSource, public SfxListener
{
private:
ScServerObjectSvtListenerForwarder aForwarder;
- ScDocShell* pDocSh;
- ScRange aRange;
- String aItemStr;
- BOOL bRefreshListener;
+ ScDocShell* pDocSh;
+ ScRange aRange;
+ String aItemStr;
+ BOOL bRefreshListener;
- void Clear();
+ void Clear();
public:
ScServerObject( ScDocShell* pShell, const String& rItem );
diff --git a/sc/source/ui/inc/sharedocdlg.hrc b/sc/source/ui/inc/sharedocdlg.hrc
index cc38e81bbddb..adf2ed06a31c 100644
--- a/sc/source/ui/inc/sharedocdlg.hrc
+++ b/sc/source/ui/inc/sharedocdlg.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/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx
index 52c2f393b19a..0de9600e0037 100644
--- a/sc/source/ui/inc/sharedocdlg.hxx
+++ b/sc/source/ui/inc/sharedocdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx
index 6c89c43b3a51..876e2468e87b 100644
--- a/sc/source/ui/inc/shtabdlg.hxx
+++ b/sc/source/ui/inc/shtabdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +64,8 @@ public:
/** Inserts a string into the ListBox. */
void Insert( const String& rString, BOOL bSelected );
- USHORT GetSelectEntryCount() const;
- String GetSelectEntry(USHORT nPos) const;
+ USHORT GetSelectEntryCount() const;
+ String GetSelectEntry(USHORT nPos) const;
USHORT GetSelectEntryPos(USHORT nPos) const;
};
diff --git a/sc/source/ui/inc/simpref.hrc b/sc/source/ui/inc/simpref.hrc
index d6fb6d4412eb..058abc26475d 100644
--- a/sc/source/ui/inc/simpref.hrc
+++ b/sc/source/ui/inc/simpref.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
@@ -28,10 +28,10 @@
#include "sc.hrc" // -> RID_SCDLG_SIMPLEREF
#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_ADD 3
-#define BTN_HELP 4
-#define FT_ASSIGN 10
-#define ED_ASSIGN 11
-#define RB_ASSIGN 12
+#define BTN_CANCEL 2
+#define BTN_ADD 3
+#define BTN_HELP 4
+#define FT_ASSIGN 10
+#define ED_ASSIGN 11
+#define RB_ASSIGN 12
diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx
index ba5b8ca287c3..1030d2c012a7 100644
--- a/sc/source/ui/inc/simpref.hxx
+++ b/sc/source/ui/inc/simpref.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,31 +56,31 @@ class ScDocument;
class ScSimpleRefDlg: public ScAnyRefDlg
{
private:
- Link aCloseHdl;
- Link aDoneHdl;
- Link aAbortedHdl;
- Link aChangeHdl;
-
- FixedText aFtAssign;
- formula::RefEdit aEdAssign;
- formula::RefButton aRbAssign;
-
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
-
- ScViewData* pViewData;
- ScDocument* pDoc;
- BOOL bRefInputMode;
-
- ScRange theCurArea;
- BOOL bCloseFlag;
- BOOL bAutoReOpen;
- BOOL bCloseOnButtonUp;
- BOOL bSingleCell;
+ Link aCloseHdl;
+ Link aDoneHdl;
+ Link aAbortedHdl;
+ Link aChangeHdl;
+
+ FixedText aFtAssign;
+ formula::RefEdit aEdAssign;
+ formula::RefButton aRbAssign;
+
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
+
+ ScViewData* pViewData;
+ ScDocument* pDoc;
+ BOOL bRefInputMode;
+
+ ScRange theCurArea;
+ BOOL bCloseFlag;
+ BOOL bAutoReOpen;
+ BOOL bCloseOnButtonUp;
+ BOOL bSingleCell;
BOOL bMultiSelection;
- void Init();
+ void Init();
DECL_LINK( CancelBtnHdl, void * );
DECL_LINK( OkBtnHdl, void * );
@@ -88,32 +88,32 @@ private:
protected:
- virtual void RefInputDone( BOOL bForced = FALSE );
+ virtual void RefInputDone( BOOL bForced = FALSE );
public:
ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
- ScViewData* ptrViewData );
+ ScViewData* ptrViewData );
~ScSimpleRefDlg();
- virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
+ virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual BOOL IsRefInputMode() const;
- virtual void SetActive();
- virtual BOOL Close();
+ virtual BOOL IsRefInputMode() const;
+ virtual void SetActive();
+ virtual BOOL Close();
- void StartRefInput();
+ void StartRefInput();
- virtual String GetRefString() const;
- virtual void SetRefString(const String &rStr);
+ virtual String GetRefString() const;
+ virtual void SetRefString(const String &rStr);
virtual void FillInfo(SfxChildWinInfo&) const;
- void SetCloseHdl( const Link& rLink );
- void SetUnoLinks( const Link& rDone, const Link& rAbort,
+ void SetCloseHdl( const Link& rLink );
+ void SetUnoLinks( const Link& rDone, const Link& rAbort,
const Link& rChange );
void SetFlags( BOOL bSetCloseOnButtonUp, BOOL bSetSingleCell, BOOL bSetMultiSelection );
- void SetAutoReOpen(BOOL bFlag) {bAutoReOpen=bFlag;}
+ void SetAutoReOpen(BOOL bFlag) {bAutoReOpen=bFlag;}
};
diff --git a/sc/source/ui/inc/sizedev.hxx b/sc/source/ui/inc/sizedev.hxx
index 615755be0240..5b501068429b 100644
--- a/sc/source/ui/inc/sizedev.hxx
+++ b/sc/source/ui/inc/sizedev.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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;
class ScSizeDeviceProvider
{
- OutputDevice* pDevice;
- BOOL bOwner;
- double nPPTX;
- double nPPTY;
- MapMode aOldMapMode;
+ OutputDevice* pDevice;
+ BOOL bOwner;
+ double nPPTX;
+ double nPPTY;
+ MapMode aOldMapMode;
public:
ScSizeDeviceProvider( ScDocShell* pDocSh );
~ScSizeDeviceProvider();
- OutputDevice* GetDevice() const { return pDevice; }
- double GetPPTX() const { return nPPTX; }
- double GetPPTY() const { return nPPTY; }
- BOOL IsPrinter() const { return !bOwner; }
+ OutputDevice* GetDevice() const { return pDevice; }
+ double GetPPTX() const { return nPPTX; }
+ double GetPPTY() const { return nPPTY; }
+ BOOL IsPrinter() const { return !bOwner; }
};
#endif
diff --git a/sc/source/ui/inc/solveroptions.hrc b/sc/source/ui/inc/solveroptions.hrc
index e3be150ccd1b..0cf4e05617c3 100644
--- a/sc/source/ui/inc/solveroptions.hrc
+++ b/sc/source/ui/inc/solveroptions.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/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx
index fc0714558be4..a6e92c85a6a2 100644
--- a/sc/source/ui/inc/solveroptions.hxx
+++ b/sc/source/ui/inc/solveroptions.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/solverutil.hxx b/sc/source/ui/inc/solverutil.hxx
index 89997e03c1a3..5241c247d122 100644
--- a/sc/source/ui/inc/solverutil.hxx
+++ b/sc/source/ui/inc/solverutil.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/solvrdlg.hrc b/sc/source/ui/inc/solvrdlg.hrc
index 7139abd2a5f6..a04fa5aafb22 100644
--- a/sc/source/ui/inc/solvrdlg.hrc
+++ b/sc/source/ui/inc/solvrdlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,20 +27,20 @@
#include "sc.hrc" // ->RID_SCDLG_SOLVER
-#define ED_FORMULACELL 1
-#define ED_TARGETVAL 2
-#define ED_VARCELL 3
-#define FT_FORMULACELL 1
-#define FT_TARGETVAL 2
-#define FT_VARCELL 3
-#define RB_FORMULACELL 1
-#define RB_VARCELL 2
+#define ED_FORMULACELL 1
+#define ED_TARGETVAL 2
+#define ED_VARCELL 3
+#define FT_FORMULACELL 1
+#define FT_TARGETVAL 2
+#define FT_VARCELL 3
+#define RB_FORMULACELL 1
+#define RB_VARCELL 2
#define FL_VARIABLES 1
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_HELP 1
-#define STR_INVALIDVAL 1
-#define STR_INVALIDVAR 2
-#define STR_INVALIDFORM 3
-#define STR_NOFORMULA 4
+#define BTN_OK 1
+#define BTN_CANCEL 2
+#define BTN_HELP 1
+#define STR_INVALIDVAL 1
+#define STR_INVALIDVAR 2
+#define STR_INVALIDFORM 3
+#define STR_NOFORMULA 4
diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx
index fa1b9eb6341c..4ab38adc891b 100644
--- a/sc/source/ui/inc/solvrdlg.hxx
+++ b/sc/source/ui/inc/solvrdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,51 +57,51 @@ public:
ScAddress aCursorPos );
~ScSolverDlg();
- virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
+ virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
virtual BOOL IsRefInputMode() const;
- virtual void SetActive();
- virtual BOOL Close();
+ virtual void SetActive();
+ virtual BOOL Close();
private:
FixedLine aFlVariables;
- FixedText aFtFormulaCell;
- formula::RefEdit aEdFormulaCell;
- formula::RefButton aRBFormulaCell;
+ FixedText aFtFormulaCell;
+ formula::RefEdit aEdFormulaCell;
+ formula::RefButton aRBFormulaCell;
- FixedText aFtTargetVal;
- Edit aEdTargetVal;
+ FixedText aFtTargetVal;
+ Edit aEdTargetVal;
- FixedText aFtVariableCell;
- formula::RefEdit aEdVariableCell;
- formula::RefButton aRBVariableCell;
+ FixedText aFtVariableCell;
+ formula::RefEdit aEdVariableCell;
+ formula::RefButton aRBVariableCell;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
- ScAddress theFormulaCell;
- ScAddress theVariableCell;
- String theTargetValStr;
+ ScAddress theFormulaCell;
+ ScAddress theVariableCell;
+ String theTargetValStr;
- ScDocument* pDoc;
- const SCTAB nCurTab;
- formula::RefEdit* pEdActive;
- BOOL bDlgLostFocus;
- const String errMsgInvalidVar;
- const String errMsgInvalidForm;
- const String errMsgNoFormula;
- const String errMsgInvalidVal;
+ ScDocument* pDoc;
+ const SCTAB nCurTab;
+ formula::RefEdit* pEdActive;
+ BOOL bDlgLostFocus;
+ const String errMsgInvalidVar;
+ const String errMsgInvalidForm;
+ const String errMsgNoFormula;
+ const String errMsgInvalidVal;
#ifdef _SOLVRDLG_CXX
- void Init();
- BOOL CheckTargetValue( String& rStrVal );
- void RaiseError( ScSolverErr eError );
+ void Init();
+ BOOL CheckTargetValue( String& rStrVal );
+ void RaiseError( ScSolverErr eError );
DECL_LINK( BtnHdl, PushButton* );
DECL_LINK( GetFocusHdl, Control* );
DECL_LINK( LoseFocusHdl, Control* );
-#endif // _SOLVERDLG_CXX
+#endif // _SOLVERDLG_CXX
};
#endif // SC_SOLVRDLG_HXX
diff --git a/sc/source/ui/inc/sortdlg.hrc b/sc/source/ui/inc/sortdlg.hrc
index 387690531cfd..40f5d042ff5c 100644
--- a/sc/source/ui/inc/sortdlg.hrc
+++ b/sc/source/ui/inc/sortdlg.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,33 +35,33 @@
// -> SCSTR_FIELD
/*
-#define RID_SCDLG_SORT 256
-#define RID_SCPAGE_SORT_FIELDS 257
-#define RID_SCPAGE_SORT_OPTIONS 258
+#define RID_SCDLG_SORT 256
+#define RID_SCPAGE_SORT_FIELDS 257
+#define RID_SCPAGE_SORT_OPTIONS 258
#define RID_SCDLG_SORT_WARNING
*/
-#define TP_FIELDS 1
-#define TP_OPTIONS 2
+#define TP_FIELDS 1
+#define TP_OPTIONS 2
// TP_SORT_FIELDS:
#define FL_SORT1 1
#define FL_SORT2 2
#define FL_SORT3 3
-#define LB_SORT1 4
-#define LB_SORT2 5
-#define LB_SORT3 6
-#define BTN_UP1 7
-#define BTN_UP2 8
-#define BTN_UP3 9
-#define BTN_DOWN1 10
-#define BTN_DOWN2 11
-#define BTN_DOWN3 12
+#define LB_SORT1 4
+#define LB_SORT2 5
+#define LB_SORT3 6
+#define BTN_UP1 7
+#define BTN_UP2 8
+#define BTN_UP3 9
+#define BTN_DOWN1 10
+#define BTN_DOWN2 11
+#define BTN_DOWN3 12
// TP_SORT_OPTIONS:
-#define FL_DIRECTION 1
-#define LB_SORT_USER 2
-#define LB_OUTAREA 3
+#define FL_DIRECTION 1
+#define LB_SORT_USER 2
+#define LB_OUTAREA 3
#define ED_OUTAREA 4
#define FT_AREA_LABEL 5
//#define FT_AREA 6
diff --git a/sc/source/ui/inc/sortdlg.hxx b/sc/source/ui/inc/sortdlg.hxx
index e6f9ab1bf0c8..f6b2231f6732 100644
--- a/sc/source/ui/inc/sortdlg.hxx
+++ b/sc/source/ui/inc/sortdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,25 +46,25 @@
class ScSortDlg : public SfxTabDialog
{
public:
- ScSortDlg( Window* pParent,
+ ScSortDlg( Window* pParent,
const SfxItemSet* pArgSet );
~ScSortDlg();
- void SetHeaders( BOOL bHeaders );
- void SetByRows ( BOOL bByRows );
- BOOL GetHeaders() const;
- BOOL GetByRows () const;
+ void SetHeaders( BOOL bHeaders );
+ void SetByRows ( BOOL bByRows );
+ BOOL GetHeaders() const;
+ BOOL GetByRows () const;
private:
- BOOL bIsHeaders;
- BOOL bIsByRows;
+ BOOL bIsHeaders;
+ BOOL bIsByRows;
};
-inline void ScSortDlg::SetHeaders( BOOL bHeaders ) { bIsHeaders = bHeaders; }
-inline void ScSortDlg::SetByRows ( BOOL bByRows ) { bIsByRows = bByRows; }
-inline BOOL ScSortDlg::GetHeaders() const { return bIsHeaders; }
-inline BOOL ScSortDlg::GetByRows () const { return bIsByRows; }
+inline void ScSortDlg::SetHeaders( BOOL bHeaders ) { bIsHeaders = bHeaders; }
+inline void ScSortDlg::SetByRows ( BOOL bByRows ) { bIsByRows = bByRows; }
+inline BOOL ScSortDlg::GetHeaders() const { return bIsHeaders; }
+inline BOOL ScSortDlg::GetByRows () const { return bIsByRows; }
class ScSortWarningDlg : public ModalDialog
{
diff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxx
index eef0d170c2c8..d77ccc7df3f9 100644
--- a/sc/source/ui/inc/spelldialog.hxx
+++ b/sc/source/ui/inc/spelldialog.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx
index f44d4a8f7094..85b54daa4852 100644
--- a/sc/source/ui/inc/spelleng.hxx
+++ b/sc/source/ui/inc/spelleng.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/spellparam.hxx b/sc/source/ui/inc/spellparam.hxx
index ecc66d7ccdcb..2b845ad6dbb0 100644
--- a/sc/source/ui/inc/spellparam.hxx
+++ b/sc/source/ui/inc/spellparam.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx
index f84d8e4e2b51..939956fc5ae3 100644
--- a/sc/source/ui/inc/strindlg.hxx
+++ b/sc/source/ui/inc/strindlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 ScStringInputDlg : public ModalDialog
{
public:
- ScStringInputDlg( Window* pParent,
+ ScStringInputDlg( Window* pParent,
const String& rTitle,
const String& rEditTitle,
const String& rDefault,
@@ -54,9 +54,9 @@ public:
private:
FixedText aFtEditTitle;
Edit aEdInput;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
};
#include <layout/layout-post.hxx>
diff --git a/sc/source/ui/inc/styledlg.hrc b/sc/source/ui/inc/styledlg.hrc
index 4a954bb3afc1..6ce7ef4ac422 100644
--- a/sc/source/ui/inc/styledlg.hrc
+++ b/sc/source/ui/inc/styledlg.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
@@ -30,9 +30,9 @@
#define TP_BORDER 5
#define TP_BACKGROUND 6
#define TP_PROTECTION 7
-#define TP_PAGE_STD 8
+#define TP_PAGE_STD 8
#define TP_PAGE_HEADER 9
-#define TP_PAGE_FOOTER 10
+#define TP_PAGE_FOOTER 10
#define TP_TABLE 11
#define TP_FONTEFF 12
#define TP_ASIAN 13
diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx
index 63e37becf188..35ef4986d50b 100644
--- a/sc/source/ui/inc/styledlg.hxx
+++ b/sc/source/ui/inc/styledlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +40,14 @@ class SfxStyleSheetBase;
class ScStyleDlg : public SfxStyleDialog
{
public:
- ScStyleDlg( Window* pParent,
- SfxStyleSheetBase& rStyleBase,
- USHORT nRscId );
+ ScStyleDlg( Window* pParent,
+ SfxStyleSheetBase& rStyleBase,
+ USHORT nRscId );
~ScStyleDlg();
protected:
- virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage );
- virtual const SfxItemSet* GetRefreshedSet();
+ virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage );
+ virtual const SfxItemSet* GetRefreshedSet();
private:
USHORT nDlgRsc;
diff --git a/sc/source/ui/inc/submenu.hrc b/sc/source/ui/inc/submenu.hrc
index 4e5ad6d28d9e..1a77b40842f7 100644
--- a/sc/source/ui/inc/submenu.hrc
+++ b/sc/source/ui/inc/submenu.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,44 +25,44 @@
*
************************************************************************/
-// IDs fuer Untermenues
+// IDs fuer Untermenues
-// 1 ist nicht erlaubt ????
-#define SUBMENU_EDIT 2
-#define SUBMENU_FILL 3
-#define SUBMENU_DELBREAK 4
-#define SUBMENU_VIEW 5
-#define SUBMENU_INSERT 6
-#define SUBMENU_INSBREAK 7
-#define SUBMENU_NAME 8
-#define SUBMENU_INSOBJ 9
-#define SUBMENU_DATA 10
-#define SUBMENU_FILTER 11
-#define SUBMENU_OUTLINE 12
-#define SUBMENU_PIVOT 13
-#define SUBMENU_EXTRA 14
-#define SUBMENU_AUDIT 15
-#define SUBMENU_PROTECT 16
-#define SUBMENU_ROW 17
-#define SUBMENU_COL 18
-#define SUBMENU_TAB 19
-#define SUBMENU_MERGE 20
-#define SUBMENU_AREA 21
-#define SUBMENU_MIRROR 22
-#define SUBMENU_OBJARRANGE 23
-#define SUBMENU_ANCHOR 24
-#define SUBMENU_POPARRANGE 25
-#define SUBMENU_OLEARRANGE 26
-#define SUBMENU_MAIL 27
-#define SUBMENU_OPTIONS 28
-#define SUBMENU_TOOLBARS 29
-#define SUBMENU_GRAPHIC 30
-#define SUBMENU_SPELLING 31
-#define SUBMENU_CELLCONT 32
-#define SUBMENU_OBJMIRROR 33
-#define SUBMENU_OBJALIGN 34
-#define SUBMENU_OBJANCHOR 35
-#define SUBMENU_SENDTO 36
-#define SUBMENU_CHANGES 37
+// 1 ist nicht erlaubt ????
+#define SUBMENU_EDIT 2
+#define SUBMENU_FILL 3
+#define SUBMENU_DELBREAK 4
+#define SUBMENU_VIEW 5
+#define SUBMENU_INSERT 6
+#define SUBMENU_INSBREAK 7
+#define SUBMENU_NAME 8
+#define SUBMENU_INSOBJ 9
+#define SUBMENU_DATA 10
+#define SUBMENU_FILTER 11
+#define SUBMENU_OUTLINE 12
+#define SUBMENU_PIVOT 13
+#define SUBMENU_EXTRA 14
+#define SUBMENU_AUDIT 15
+#define SUBMENU_PROTECT 16
+#define SUBMENU_ROW 17
+#define SUBMENU_COL 18
+#define SUBMENU_TAB 19
+#define SUBMENU_MERGE 20
+#define SUBMENU_AREA 21
+#define SUBMENU_MIRROR 22
+#define SUBMENU_OBJARRANGE 23
+#define SUBMENU_ANCHOR 24
+#define SUBMENU_POPARRANGE 25
+#define SUBMENU_OLEARRANGE 26
+#define SUBMENU_MAIL 27
+#define SUBMENU_OPTIONS 28
+#define SUBMENU_TOOLBARS 29
+#define SUBMENU_GRAPHIC 30
+#define SUBMENU_SPELLING 31
+#define SUBMENU_CELLCONT 32
+#define SUBMENU_OBJMIRROR 33
+#define SUBMENU_OBJALIGN 34
+#define SUBMENU_OBJANCHOR 35
+#define SUBMENU_SENDTO 36
+#define SUBMENU_CHANGES 37
#define SUBMENU_EDIT_TABLE 38
#define MN_TEMPLATES 39
diff --git a/sc/source/ui/inc/subtdlg.hrc b/sc/source/ui/inc/subtdlg.hrc
index 66c63df48953..9970491e5df3 100644
--- a/sc/source/ui/inc/subtdlg.hrc
+++ b/sc/source/ui/inc/subtdlg.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
@@ -34,7 +34,7 @@
*/
// TabDialog
-#define BTN_REMOVE 1
+#define BTN_REMOVE 1
#define PAGE_GROUP1 2
#define PAGE_GROUP2 3
#define PAGE_GROUP3 4
diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx
index ec68d0e1fba1..1036a1826041 100644
--- a/sc/source/ui/inc/subtdlg.hxx
+++ b/sc/source/ui/inc/subtdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,20 +33,20 @@
#include <sfx2/tabdlg.hxx>
-#include "scui_def.hxx" //CHINA001
+#include "scui_def.hxx" //CHINA001
//------------------------------------------------------------------------
-//CHINA001 #define SCRET_REMOVE 0x42
+//CHINA001 #define SCRET_REMOVE 0x42
//==================================================================
class ScSubTotalDlg : public SfxTabDialog
{
public:
- ScSubTotalDlg( Window* pParent,
- const SfxItemSet* pArgSet );
+ ScSubTotalDlg( Window* pParent,
+ const SfxItemSet* pArgSet );
private:
- PushButton aBtnRemove;
+ PushButton aBtnRemove;
DECL_LINK( RemoveHdl, PushButton * );
};
diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx
index 338609ae0e4d..826746300f16 100644
--- a/sc/source/ui/inc/tabbgcolordlg.hxx
+++ b/sc/source/ui/inc/tabbgcolordlg.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/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx
index d77ee812fdb3..77dfecc3ed5f 100644
--- a/sc/source/ui/inc/tabcont.hxx
+++ b/sc/source/ui/inc/tabcont.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,37 +37,37 @@ class ScViewData;
// ---------------------------------------------------------------------------
-// initial size
-#define SC_TABBAR_DEFWIDTH 270
+// initial size
+#define SC_TABBAR_DEFWIDTH 270
class ScTabControl : public TabBar, public DropTargetHelper, public DragSourceHelper
{
private:
- ScViewData* pViewData;
+ ScViewData* pViewData;
USHORT nMouseClickPageId; /// Last page ID after mouse button down/up
USHORT nSelPageIdByMouse; /// Selected page ID, if selected with mouse
BOOL bErrorShown;
- void DoDrag( const Region& rRegion );
+ void DoDrag( const Region& rRegion );
- USHORT GetMaxId() const;
- SCTAB GetPrivatDropPos(const Point& rPos );
+ USHORT GetMaxId() const;
+ SCTAB GetPrivatDropPos(const Point& rPos );
protected:
- virtual void Select();
- virtual void Command( const CommandEvent& rCEvt );
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void MouseButtonUp( const MouseEvent& rMEvt );
+ virtual void Select();
+ virtual void Command( const CommandEvent& rCEvt );
+ virtual void MouseButtonDown( const MouseEvent& rMEvt );
+ virtual void MouseButtonUp( const MouseEvent& rMEvt );
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
- virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
+ virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
- virtual long StartRenaming();
- virtual long AllowRenaming();
- virtual void EndRenaming();
+ virtual long StartRenaming();
+ virtual long AllowRenaming();
+ virtual void EndRenaming();
virtual void Mirror();
public:
@@ -76,8 +76,8 @@ public:
using TabBar::StartDrag;
- void UpdateStatus();
- void ActivateView(BOOL bActivate);
+ void UpdateStatus();
+ void ActivateView(BOOL bActivate);
void SetSheetLayoutRTL( BOOL bSheetRTL );
};
diff --git a/sc/source/ui/inc/tabopdlg.hrc b/sc/source/ui/inc/tabopdlg.hrc
index 5ae127b63e73..a2d3b7633cf9 100644
--- a/sc/source/ui/inc/tabopdlg.hrc
+++ b/sc/source/ui/inc/tabopdlg.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,24 +27,24 @@
#include "sc.hrc" // ->RID_SCDLG_TABOP
-#define ED_FORMULARANGE 1
-#define ED_ROWCELL 2
-#define ED_COLCELL 3
-#define FT_FORMULARANGE 1
-#define FT_ROWCELL 2
-#define FT_COLCELL 3
-#define RB_FORMULARANGE 1
-#define RB_ROWCELL 2
-#define RB_COLCELL 3
+#define ED_FORMULARANGE 1
+#define ED_ROWCELL 2
+#define ED_COLCELL 3
+#define FT_FORMULARANGE 1
+#define FT_ROWCELL 2
+#define FT_COLCELL 3
+#define RB_FORMULARANGE 1
+#define RB_ROWCELL 2
+#define RB_COLCELL 3
#define FL_VARIABLES 1
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_HELP 1
-#define STR_NOFORMULA 1
-#define STR_NOCOLROW 2
-#define STR_WRONGFORMULA 3
-#define STR_WRONGROWCOL 4
-#define STR_NOCOLFORMULA 5
-#define STR_NOROWFORMULA 6
+#define BTN_OK 1
+#define BTN_CANCEL 2
+#define BTN_HELP 1
+#define STR_NOFORMULA 1
+#define STR_NOCOLROW 2
+#define STR_WRONGFORMULA 3
+#define STR_WRONGROWCOL 4
+#define STR_NOCOLFORMULA 5
+#define STR_NOROWFORMULA 6
diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx
index e9286ca5ee96..5ecd5fbddac3 100644
--- a/sc/source/ui/inc/tabopdlg.hxx
+++ b/sc/source/ui/inc/tabopdlg.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,58 +54,58 @@ class ScTabOpDlg : public ScAnyRefDlg
{
public:
ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
- ScDocument* pDocument,
- const ScRefAddress& rCursorPos );
+ ScDocument* pDocument,
+ const ScRefAddress& rCursorPos );
~ScTabOpDlg();
- virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
- virtual BOOL IsRefInputMode() const { return TRUE; }
- virtual void SetActive();
+ virtual void SetReference( const ScRange& rRef, ScDocument* pDoc );
+ virtual BOOL IsRefInputMode() const { return TRUE; }
+ virtual void SetActive();
- virtual BOOL Close();
+ virtual BOOL Close();
private:
FixedLine aFlVariables;
- FixedText aFtFormulaRange;
- formula::RefEdit aEdFormulaRange;
- formula::RefButton aRBFormulaRange;
-
- FixedText aFtRowCell;
- formula::RefEdit aEdRowCell;
- formula::RefButton aRBRowCell;
-
- FixedText aFtColCell;
- formula::RefEdit aEdColCell;
- formula::RefButton aRBColCell;
-
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
-
- ScRefAddress theFormulaCell;
- ScRefAddress theFormulaEnd;
- ScRefAddress theRowCell;
- ScRefAddress theColCell;
-
- ScDocument* pDoc;
- const SCTAB nCurTab;
- formula::RefEdit* pEdActive;
- BOOL bDlgLostFocus;
- const String errMsgNoFormula;
- const String errMsgNoColRow;
- const String errMsgWrongFormula;
- const String errMsgWrongRowCol;
- const String errMsgNoColFormula;
- const String errMsgNoRowFormula;
+ FixedText aFtFormulaRange;
+ formula::RefEdit aEdFormulaRange;
+ formula::RefButton aRBFormulaRange;
+
+ FixedText aFtRowCell;
+ formula::RefEdit aEdRowCell;
+ formula::RefButton aRBRowCell;
+
+ FixedText aFtColCell;
+ formula::RefEdit aEdColCell;
+ formula::RefButton aRBColCell;
+
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
+ HelpButton aBtnHelp;
+
+ ScRefAddress theFormulaCell;
+ ScRefAddress theFormulaEnd;
+ ScRefAddress theRowCell;
+ ScRefAddress theColCell;
+
+ ScDocument* pDoc;
+ const SCTAB nCurTab;
+ formula::RefEdit* pEdActive;
+ BOOL bDlgLostFocus;
+ const String errMsgNoFormula;
+ const String errMsgNoColRow;
+ const String errMsgWrongFormula;
+ const String errMsgWrongRowCol;
+ const String errMsgNoColFormula;
+ const String errMsgNoRowFormula;
#ifdef _TABOPDLG_CXX
- void Init();
- void RaiseError( ScTabOpErr eError );
+ void Init();
+ void RaiseError( ScTabOpErr eError );
DECL_LINK( BtnHdl, PushButton* );
DECL_LINK( GetFocusHdl, Control* );
DECL_LINK( LoseFocusHdl, Control* );
-#endif // _TABOPDLG_CXX
+#endif // _TABOPDLG_CXX
};
#endif // SC_TABOPDLG_HXX
diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx
index 71d62f964fef..a69ad206ea5c 100644
--- a/sc/source/ui/inc/tabpages.hxx
+++ b/sc/source/ui/inc/tabpages.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,43 +39,43 @@
class ScTabPageProtection : public SfxTabPage
{
public:
- static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rAttrSet );
- static USHORT* GetRanges ();
- virtual BOOL FillItemSet ( SfxItemSet& rCoreAttrs );
- virtual void Reset ( const SfxItemSet& );
+ static SfxTabPage* Create ( Window* pParent,
+ const SfxItemSet& rAttrSet );
+ static USHORT* GetRanges ();
+ virtual BOOL FillItemSet ( SfxItemSet& rCoreAttrs );
+ virtual void Reset ( const SfxItemSet& );
protected:
using SfxTabPage::DeactivatePage;
- virtual int DeactivatePage ( SfxItemSet* pSet = NULL );
+ virtual int DeactivatePage ( SfxItemSet* pSet = NULL );
private:
- ScTabPageProtection( Window* pParent,
- const SfxItemSet& rCoreAttrs );
+ ScTabPageProtection( Window* pParent,
+ const SfxItemSet& rCoreAttrs );
~ScTabPageProtection();
private:
FixedLine aFlProtect;
- TriStateBox aBtnHideCell;
- TriStateBox aBtnProtect;
- TriStateBox aBtnHideFormula;
- FixedInfo aTxtHint;
+ TriStateBox aBtnHideCell;
+ TriStateBox aBtnProtect;
+ TriStateBox aBtnHideFormula;
+ FixedInfo aTxtHint;
FixedLine aFlPrint;
- TriStateBox aBtnHidePrint;
- FixedInfo aTxtHint2;
+ TriStateBox aBtnHidePrint;
+ FixedInfo aTxtHint2;
// aktueller Status:
- BOOL bTriEnabled; // wenn vorher Dont-Care
- BOOL bDontCare; // alles auf TriState
- BOOL bProtect; // einzelne Einstellungen ueber TriState sichern
- BOOL bHideForm;
- BOOL bHideCell;
- BOOL bHidePrint;
+ BOOL bTriEnabled; // wenn vorher Dont-Care
+ BOOL bDontCare; // alles auf TriState
+ BOOL bProtect; // einzelne Einstellungen ueber TriState sichern
+ BOOL bHideForm;
+ BOOL bHideCell;
+ BOOL bHidePrint;
// Handler:
DECL_LINK( ButtonClickHdl, TriStateBox* pBox );
- void UpdateButtons();
+ void UpdateButtons();
};
diff --git a/sc/source/ui/inc/tabpopsh.hxx b/sc/source/ui/inc/tabpopsh.hxx
index 177e3d75136f..e5eda9ba9904 100644
--- a/sc/source/ui/inc/tabpopsh.hxx
+++ b/sc/source/ui/inc/tabpopsh.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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:
ScTabPopShell(SfxItemPool& rItemPool);
~ScTabPopShell();
- void DummyExec( SfxRequest& rReq );
- void DummyState( SfxItemSet& rSet );
+ void DummyExec( SfxRequest& rReq );
+ void DummyState( SfxItemSet& rSet );
};
diff --git a/sc/source/ui/inc/tabsplit.hxx b/sc/source/ui/inc/tabsplit.hxx
index a06664c7c4ee..e6574322ffca 100644
--- a/sc/source/ui/inc/tabsplit.hxx
+++ b/sc/source/ui/inc/tabsplit.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,22 +36,22 @@ class ScViewData;
class ScTabSplitter : public Splitter
{
private:
- ScViewData* pViewData;
- BOOL bFixed;
+ ScViewData* pViewData;
+ BOOL bFixed;
protected:
- virtual void MouseMove( const MouseEvent& rMEvt );
- virtual void MouseButtonUp( const MouseEvent& rMEvt );
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
+ virtual void MouseMove( const MouseEvent& rMEvt );
+ virtual void MouseButtonUp( const MouseEvent& rMEvt );
+ virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void Splitting( Point& rSplitPos );
+ virtual void Splitting( Point& rSplitPos );
public:
ScTabSplitter( Window* pParent, WinBits nWinStyle,
ScViewData* pData );
~ScTabSplitter();
- void SetFixed(BOOL bSet);
+ void SetFixed(BOOL bSet);
};
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index a6e99613f2ea..d97a600b7c09 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +29,10 @@
#include <vcl/scrbar.hxx>
-//REMOVE #ifndef SO2_DECL_SVINPLACECLIENT_DEFINED
-//REMOVE #define SO2_DECL_SVINPLACECLIENT_DEFINED
-//REMOVE SO2_DECL_REF(SvInPlaceClient)
-//REMOVE #endif
+//REMOVE #ifndef SO2_DECL_SVINPLACECLIENT_DEFINED
+//REMOVE #define SO2_DECL_SVINPLACECLIENT_DEFINED
+//REMOVE SO2_DECL_REF(SvInPlaceClient)
+//REMOVE #endif
#include <sfx2/ipclient.hxx>
@@ -65,28 +65,28 @@ namespace chart2 { namespace data {
struct HighlightedRange;
}}}}}
-#define SPLIT_HANDLE_SIZE 3
-#define SC_FORCEMODE_NONE 0xff
+#define SPLIT_HANDLE_SIZE 3
+#define SC_FORCEMODE_NONE 0xff
// ---------------------------------------------------------------------------
-// Hilfs - Fenster
+// Hilfs - Fenster
class ScCornerButton : public Window
{
private:
- ScViewData* pViewData;
- BOOL bAdd;
+ ScViewData* pViewData;
+ BOOL bAdd;
protected:
- virtual void Paint( const Rectangle& rRect );
- virtual void Resize();
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
+ virtual void Paint( const Rectangle& rRect );
+ virtual void Resize();
+ virtual void MouseButtonDown( const MouseEvent& rMEvt );
public:
ScCornerButton( Window* pParent, ScViewData* pData, BOOL bAdditional );
~ScCornerButton();
- virtual void StateChanged( StateChangedType nType );
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
+ virtual void StateChanged( StateChangedType nType );
+ virtual void DataChanged( const DataChangedEvent& rDCEvt );
};
@@ -95,147 +95,147 @@ public:
class ScTabView
{
private:
- Window* pFrameWin; // als erstes !!!
- ScViewData aViewData; // muss ganz vorne stehen !
+ Window* pFrameWin; // als erstes !!!
+ ScViewData aViewData; // muss ganz vorne stehen !
- ScViewSelectionEngine* pSelEngine;
- ScViewFunctionSet aFunctionSet;
+ ScViewSelectionEngine* pSelEngine;
+ ScViewFunctionSet aFunctionSet;
ScHeaderSelectionEngine* pHdrSelEng;
- ScHeaderFunctionSet aHdrFunc;
+ ScHeaderFunctionSet aHdrFunc;
SfxInPlaceClient* pIPClient;
- ScDrawView* pDrawView;
+ ScDrawView* pDrawView;
- Size aFrameSize; // wie bei DoResize uebergeben
- Point aBorderPos;
+ Size aFrameSize; // wie bei DoResize uebergeben
+ Point aBorderPos;
- BOOL bDrawSelMode; // nur Zeichenobjekte selektieren ?
+ BOOL bDrawSelMode; // nur Zeichenobjekte selektieren ?
- FuPoor* pDrawActual;
- FuPoor* pDrawOld;
+ FuPoor* pDrawActual;
+ FuPoor* pDrawOld;
- ScGridWindow* pGridWin[4];
- ScColBar* pColBar[2];
- ScRowBar* pRowBar[2];
- ScOutlineWindow* pColOutline[2];
- ScOutlineWindow* pRowOutline[2];
- ScTabSplitter* pHSplitter;
- ScTabSplitter* pVSplitter;
- ScTabControl* pTabControl;
- ScrollBar aVScrollTop;
- ScrollBar aVScrollBottom; // anfangs sichtbar
- ScrollBar aHScrollLeft; // anfangs sichtbar
- ScrollBar aHScrollRight;
- ScCornerButton aCornerButton;
- ScCornerButton aTopButton;
- ScrollBarBox aScrollBarBox;
+ ScGridWindow* pGridWin[4];
+ ScColBar* pColBar[2];
+ ScRowBar* pRowBar[2];
+ ScOutlineWindow* pColOutline[2];
+ ScOutlineWindow* pRowOutline[2];
+ ScTabSplitter* pHSplitter;
+ ScTabSplitter* pVSplitter;
+ ScTabControl* pTabControl;
+ ScrollBar aVScrollTop;
+ ScrollBar aVScrollBottom; // anfangs sichtbar
+ ScrollBar aHScrollLeft; // anfangs sichtbar
+ ScrollBar aHScrollRight;
+ ScCornerButton aCornerButton;
+ ScCornerButton aTopButton;
+ ScrollBarBox aScrollBarBox;
- ScHintWindow* pInputHintWindow; // Eingabemeldung bei Gueltigkeit
+ ScHintWindow* pInputHintWindow; // Eingabemeldung bei Gueltigkeit
- ScPageBreakData* pPageBreakData; // fuer Seitenumbruch-Modus
- ScHighlightRanges* pHighlightRanges;
+ ScPageBreakData* pPageBreakData; // fuer Seitenumbruch-Modus
+ ScHighlightRanges* pHighlightRanges;
ScDocument* pBrushDocument; // cell formats for format paint brush
SfxItemSet* pDrawBrushSet; // drawing object attributes for paint brush
BOOL bLockPaintBrush; // keep for more than one use?
- Timer aScrollTimer;
- ScGridWindow* pTimerWindow;
- MouseEvent aTimerMEvt;
+ Timer aScrollTimer;
+ ScGridWindow* pTimerWindow;
+ MouseEvent aTimerMEvt;
- ULONG nTipVisible;
+ ULONG nTipVisible;
- BOOL bDragging; // fuer Scrollbars
- long nPrevDragPos;
+ BOOL bDragging; // fuer Scrollbars
+ long nPrevDragPos;
- BOOL bIsBlockMode; // Block markieren
- BOOL bBlockNeg; // wird Markierung aufgehoben?
- BOOL bBlockCols; // werden ganze Spalten markiert?
- BOOL bBlockRows; // werden ganze Zeilen markiert?
+ BOOL bIsBlockMode; // Block markieren
+ BOOL bBlockNeg; // wird Markierung aufgehoben?
+ BOOL bBlockCols; // werden ganze Spalten markiert?
+ BOOL bBlockRows; // werden ganze Zeilen markiert?
- SCCOL nBlockStartX;
+ SCCOL nBlockStartX;
SCCOL nBlockStartXOrig;
- SCCOL nBlockEndX;
+ SCCOL nBlockEndX;
- SCROW nBlockStartY;
+ SCROW nBlockStartY;
SCROW nBlockStartYOrig;
- SCROW nBlockEndY;
+ SCROW nBlockEndY;
- SCTAB nBlockStartZ;
- SCTAB nBlockEndZ;
+ SCTAB nBlockStartZ;
+ SCTAB nBlockEndZ;
SCCOL nOldCurX;
SCROW nOldCurY;
double mfPendingTabBarWidth; // Tab bar width relative to frame window width.
- BOOL bMinimized;
- BOOL bInUpdateHeader;
- BOOL bInActivatePart;
- BOOL bInZoomUpdate;
- BOOL bMoveIsShift;
- BOOL bNewStartIfMarking;
+ BOOL bMinimized;
+ BOOL bInUpdateHeader;
+ BOOL bInActivatePart;
+ BOOL bInZoomUpdate;
+ BOOL bMoveIsShift;
+ BOOL bNewStartIfMarking;
- void Init();
+ void Init();
- void DoAddWin( ScGridWindow* pWin );
+ void DoAddWin( ScGridWindow* pWin );
- void InitScrollBar( ScrollBar& rScrollBar, long nMaxVal );
- DECL_LINK( ScrollHdl, ScrollBar* );
- DECL_LINK( EndScrollHdl, ScrollBar* );
+ void InitScrollBar( ScrollBar& rScrollBar, long nMaxVal );
+ DECL_LINK( ScrollHdl, ScrollBar* );
+ DECL_LINK( EndScrollHdl, ScrollBar* );
- DECL_LINK( SplitHdl, Splitter* );
- void DoHSplit(long nSplitPos);
- void DoVSplit(long nSplitPos);
+ DECL_LINK( SplitHdl, Splitter* );
+ void DoHSplit(long nSplitPos);
+ void DoVSplit(long nSplitPos);
- DECL_LINK( TimerHdl, Timer* );
+ DECL_LINK( TimerHdl, Timer* );
- void UpdateVarZoom();
+ void UpdateVarZoom();
- static void SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, long nPos, BOOL bLayoutRTL );
- static long GetScrollBarPos( ScrollBar& rScroll, BOOL bLayoutRTL );
+ static void SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, long nPos, BOOL bLayoutRTL );
+ static long GetScrollBarPos( ScrollBar& rScroll, BOOL bLayoutRTL );
protected:
- void UpdateHeaderWidth( const ScVSplitPos* pWhich = NULL,
+ void UpdateHeaderWidth( const ScVSplitPos* pWhich = NULL,
const SCROW* pPosY = NULL );
- void HideTip();
- void ShowRefTip();
+ void HideTip();
+ void ShowRefTip();
- void ZoomChanged();
- void UpdateShow();
- void GetBorderSize( SvBorder& rBorder, const Size& rSize );
+ void ZoomChanged();
+ void UpdateShow();
+ void GetBorderSize( SvBorder& rBorder, const Size& rSize );
- void ResetDrawDragMode();
- BOOL IsDrawTextEdit() const;
- void DrawEnableAnim(BOOL bSet);
- //HMHvoid DrawShowMarkHdl(BOOL bShow);
+ void ResetDrawDragMode();
+ BOOL IsDrawTextEdit() const;
+ void DrawEnableAnim(BOOL bSet);
+ //HMHvoid DrawShowMarkHdl(BOOL bShow);
- void MakeDrawView( BYTE nForceDesignMode = SC_FORCEMODE_NONE );
+ void MakeDrawView( BYTE nForceDesignMode = SC_FORCEMODE_NONE );
- void HideNoteMarker();
+ void HideNoteMarker();
- void UpdateIMap( SdrObject* pObj );
+ void UpdateIMap( SdrObject* pObj );
public:
ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell );
-//UNUSED2009-05 ScTabView( Window* pParent, const ScTabView& rScTabView, ScTabViewShell* pViewShell );
+//UNUSED2009-05 ScTabView( Window* pParent, const ScTabView& rScTabView, ScTabViewShell* pViewShell );
~ScTabView();
- void MakeDrawLayer();
+ void MakeDrawLayer();
- void HideListBox();
+ void HideListBox();
- BOOL HasHintWindow() const { return pInputHintWindow != NULL; }
- void RemoveHintWindow();
- void TestHintWindow();
+ BOOL HasHintWindow() const { return pInputHintWindow != NULL; }
+ void RemoveHintWindow();
+ void TestHintWindow();
- DECL_LINK( TabBarResize, void* );
+ DECL_LINK( TabBarResize, void* );
/** Sets an absolute tab bar width (in pixels). */
- void SetTabBarWidth( long nNewWidth );
+ void SetTabBarWidth( long nNewWidth );
/** Sets a relative tab bar width.
@param fRelTabBarWidth Tab bar width relative to frame window width (0.0 ... 1.0). */
void SetRelTabBarWidth( double fRelTabBarWidth );
@@ -249,143 +249,143 @@ public:
/** Returns the pending tab bar width relative to the frame window width (0.0 ... 1.0). */
double GetPendingRelTabBarWidth() const;
- void DoResize( const Point& rOffset, const Size& rSize, BOOL bInner = FALSE );
- void RepeatResize( BOOL bUpdateFix = TRUE );
- void UpdateFixPos();
- Point GetGridOffset() const;
+ void DoResize( const Point& rOffset, const Size& rSize, BOOL bInner = FALSE );
+ void RepeatResize( BOOL bUpdateFix = TRUE );
+ void UpdateFixPos();
+ Point GetGridOffset() const;
- BOOL IsDrawSelMode() const { return bDrawSelMode; }
- void SetDrawSelMode(BOOL bNew) { bDrawSelMode = bNew; }
+ BOOL IsDrawSelMode() const { return bDrawSelMode; }
+ void SetDrawSelMode(BOOL bNew) { bDrawSelMode = bNew; }
- void SetDrawFuncPtr(FuPoor* pFuncPtr) { pDrawActual = pFuncPtr; }
- void SetDrawFuncOldPtr(FuPoor* pFuncPtr) { pDrawOld = pFuncPtr; }
- FuPoor* GetDrawFuncPtr() { return pDrawActual; }
- FuPoor* GetDrawFuncOldPtr() { return pDrawOld; }
+ void SetDrawFuncPtr(FuPoor* pFuncPtr) { pDrawActual = pFuncPtr; }
+ void SetDrawFuncOldPtr(FuPoor* pFuncPtr) { pDrawOld = pFuncPtr; }
+ FuPoor* GetDrawFuncPtr() { return pDrawActual; }
+ FuPoor* GetDrawFuncOldPtr() { return pDrawOld; }
- void DrawDeselectAll();
- void DrawMarkListHasChanged();
- void UpdateAnchorHandles();
+ void DrawDeselectAll();
+ void DrawMarkListHasChanged();
+ void UpdateAnchorHandles();
//UNUSED2008-05 String GetSelectedChartName() const;
- ScPageBreakData* GetPageBreakData() { return pPageBreakData; }
- ScHighlightRanges* GetHighlightRanges() { return pHighlightRanges; }
+ ScPageBreakData* GetPageBreakData() { return pPageBreakData; }
+ ScHighlightRanges* GetHighlightRanges() { return pHighlightRanges; }
- void UpdatePageBreakData( BOOL bForcePaint = FALSE );
+ void UpdatePageBreakData( BOOL bForcePaint = FALSE );
- void DrawMarkRect( const Rectangle& rRect );
+ void DrawMarkRect( const Rectangle& rRect );
- ScViewData* GetViewData() { return &aViewData; }
- const ScViewData* GetViewData() const { return &aViewData; }
+ ScViewData* GetViewData() { return &aViewData; }
+ const ScViewData* GetViewData() const { return &aViewData; }
- ScViewFunctionSet* GetFunctionSet() { return &aFunctionSet; }
- ScViewSelectionEngine* GetSelEngine() { return pSelEngine; }
+ ScViewFunctionSet* GetFunctionSet() { return &aFunctionSet; }
+ ScViewSelectionEngine* GetSelEngine() { return pSelEngine; }
- BOOL SelMouseButtonDown( const MouseEvent& rMEvt );
+ BOOL SelMouseButtonDown( const MouseEvent& rMEvt );
- ScDrawView* GetScDrawView() { return pDrawView; }
- SdrView* GetSdrView(); // gegen CLOKs
+ ScDrawView* GetScDrawView() { return pDrawView; }
+ SdrView* GetSdrView(); // gegen CLOKs
- BOOL IsMinimized() const { return bMinimized; }
+ BOOL IsMinimized() const { return bMinimized; }
- void TabChanged();
- void SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll );
+ void TabChanged();
+ void SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll );
SC_DLLPUBLIC void RefreshZoom();
- void SetPagebreakMode( BOOL bSet );
+ void SetPagebreakMode( BOOL bSet );
- void UpdateLayerLocks();
+ void UpdateLayerLocks();
- void UpdateDrawTextOutliner();
- void DigitLanguageChanged();
+ void UpdateDrawTextOutliner();
+ void DigitLanguageChanged();
- void UpdateInputLine();
+ void UpdateInputLine();
- void InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eType,
+ void InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eType,
BOOL bPaint = TRUE );
- void DoneRefMode( BOOL bContinue = FALSE );
- void UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ );
- void StopRefMode();
+ void DoneRefMode( BOOL bContinue = FALSE );
+ void UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ );
+ void StopRefMode();
//UNUSED2008-05 void EndSelection();
- void StopMarking();
- void FakeButtonUp( ScSplitPos eWhich );
+ void StopMarking();
+ void FakeButtonUp( ScSplitPos eWhich );
- Window* GetActiveWin();
- Window* GetWindowByPos( ScSplitPos ePos );
+ Window* GetActiveWin();
+ Window* GetWindowByPos( ScSplitPos ePos );
- ScSplitPos FindWindow( Window* pWindow ) const;
+ ScSplitPos FindWindow( Window* pWindow ) const;
- void SetActivePointer( const Pointer& rPointer );
+ void SetActivePointer( const Pointer& rPointer );
//UNUSED2008-05 void SetActivePointer( const ResId& rId );
- void ActiveGrabFocus();
+ void ActiveGrabFocus();
//UNUSED2008-05 void ActiveCaptureMouse();
-//UNUSED2008-05 void ActiveReleaseMouse();
+//UNUSED2008-05 void ActiveReleaseMouse();
//UNUSED2008-05 Point ActivePixelToLogic( const Point& rDevicePoint );
- void ClickCursor( SCCOL nPosX, SCROW nPosY, BOOL bControl );
+ void ClickCursor( SCCOL nPosX, SCROW nPosY, BOOL bControl );
- SC_DLLPUBLIC void SetCursor( SCCOL nPosX, SCROW nPosY, BOOL bNew = FALSE );
+ SC_DLLPUBLIC void SetCursor( SCCOL nPosX, SCROW nPosY, BOOL bNew = FALSE );
- SC_DLLPUBLIC void CellContentChanged();
- void SelectionChanged();
- void CursorPosChanged();
- void UpdateInputContext();
+ SC_DLLPUBLIC void CellContentChanged();
+ void SelectionChanged();
+ void CursorPosChanged();
+ void UpdateInputContext();
- void CheckSelectionTransfer();
+ void CheckSelectionTransfer();
- void InvertHorizontal( ScVSplitPos eWhich, long nDragPos );
- void InvertVertical( ScHSplitPos eWhich, long nDragPos );
+ void InvertHorizontal( ScVSplitPos eWhich, long nDragPos );
+ void InvertVertical( ScHSplitPos eWhich, long nDragPos );
- Point GetInsertPos();
+ Point GetInsertPos();
Point GetChartInsertPos( const Size& rSize, const ScRange& rCellRange );
Point GetChartDialogPos( const Size& rDialogSize, const Rectangle& rLogicChart );
- void UpdateAutoFillMark();
+ void UpdateAutoFillMark();
- void HideCursor(); // nur aktiver Teil
- void ShowCursor();
- void HideAllCursors();
- void ShowAllCursors();
+ void HideCursor(); // nur aktiver Teil
+ void ShowCursor();
+ void HideAllCursors();
+ void ShowAllCursors();
- void AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
+ void AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
const ScSplitPos* pWhich = NULL );
SvxZoomType GetZoomType() const;
void SetZoomType( SvxZoomType eNew, BOOL bAll );
- USHORT CalcZoom( SvxZoomType eType, USHORT nOldZoom );
+ USHORT CalcZoom( SvxZoomType eType, USHORT nOldZoom );
-// void CalcZoom( SvxZoomType eType, USHORT& rZoom, SCCOL& rCol, SCROW& rRow );
+// void CalcZoom( SvxZoomType eType, USHORT& rZoom, SCCOL& rCol, SCROW& rRow );
sal_Bool HasPageFieldDataAtCursor() const;
- void StartDataSelect();
+ void StartDataSelect();
- // MoveCursorAbs - absolut
- // MoveCursorRel - einzelne Zellen
- // MoveCursorPage - Bildschirmseite
- // MoveCursorArea - Datenblock
- // MoveCursorEnd - links oben / benutzter Bereich
+ // MoveCursorAbs - absolut
+ // MoveCursorRel - einzelne Zellen
+ // MoveCursorPage - Bildschirmseite
+ // MoveCursorArea - Datenblock
+ // MoveCursorEnd - links oben / benutzter Bereich
- SC_DLLPUBLIC void MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
+ SC_DLLPUBLIC void MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
BOOL bShift, BOOL bControl,
BOOL bKeepOld = FALSE, BOOL bKeepSel = FALSE );
- void MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
+ void MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
BOOL bShift, BOOL bKeepSel = FALSE );
- void MoveCursorPage( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
+ void MoveCursorPage( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
BOOL bShift, BOOL bKeepSel = FALSE );
- void MoveCursorArea( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
+ void MoveCursorArea( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
BOOL bShift, BOOL bKeepSel = FALSE );
- void MoveCursorEnd( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
+ void MoveCursorEnd( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
BOOL bShift, BOOL bKeepSel = FALSE );
- void MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift );
+ void MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift );
- void MoveCursorEnter( BOOL bShift ); // Shift fuer Richtung (kein Markieren)
+ void MoveCursorEnter( BOOL bShift ); // Shift fuer Richtung (kein Markieren)
BOOL MoveCursorKeyInput( const KeyEvent& rKeyEvent );
- void FindNextUnprot( BOOL bShift, BOOL bInSelection = TRUE );
+ void FindNextUnprot( BOOL bShift, BOOL bInSelection = TRUE );
- void SetNewStartIfMarking();
+ void SetNewStartIfMarking();
//<!--Added by PengYunQuan for Validity Cell Range Picker
//void SetTabNo( SCTAB nTab, BOOL bNew = FALSE, BOOL bExtendSelection = FALSE );
@@ -393,130 +393,130 @@ public:
//-->Added by PengYunQuan for Validity Cell Range Picker
void SelectNextTab( short nDir, BOOL bExtendSelection = FALSE );
- void ActivateView( BOOL bActivate, BOOL bFirst );
- void ActivatePart( ScSplitPos eWhich );
- BOOL IsInActivatePart() const { return bInActivatePart; }
+ void ActivateView( BOOL bActivate, BOOL bFirst );
+ void ActivatePart( ScSplitPos eWhich );
+ BOOL IsInActivatePart() const { return bInActivatePart; }
- void SetTimer( ScGridWindow* pWin, const MouseEvent& rMEvt );
- void ResetTimer();
+ void SetTimer( ScGridWindow* pWin, const MouseEvent& rMEvt );
+ void ResetTimer();
- void ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars = TRUE );
- void ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars = TRUE );
- SC_DLLPUBLIC void ScrollLines( long nDeltaX, long nDeltaY ); // aktives
+ void ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars = TRUE );
+ void ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars = TRUE );
+ SC_DLLPUBLIC void ScrollLines( long nDeltaX, long nDeltaY ); // aktives
- BOOL ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos );
+ BOOL ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos );
- void ScrollToObject( SdrObject* pDrawObj );
- void MakeVisible( const Rectangle& rHMMRect );
+ void ScrollToObject( SdrObject* pDrawObj );
+ void MakeVisible( const Rectangle& rHMMRect );
// Zeichnen
- void InvertBlockMark(SCCOL nBlockStartX, SCROW nBlockStartY,
+ void InvertBlockMark(SCCOL nBlockStartX, SCROW nBlockStartY,
SCCOL nBlockEndX, SCROW nBlockEndY);
//UNUSED2008-05 void DrawDragRect( SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY,
//UNUSED2008-05 ScSplitPos ePos );
-//UNUSED2008-05 void PaintCell( SCCOL nCol, SCROW nRow, SCTAB nTab );
-//UNUSED2008-05 void PaintLeftRow( SCROW nRow );
-//UNUSED2008-05 void PaintTopCol( SCCOL nCol );
+//UNUSED2008-05 void PaintCell( SCCOL nCol, SCROW nRow, SCTAB nTab );
+//UNUSED2008-05 void PaintLeftRow( SCROW nRow );
+//UNUSED2008-05 void PaintTopCol( SCCOL nCol );
- void PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
+ void PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
ScUpdateMode eMode = SC_UPDATE_ALL );
- void PaintGrid();
+ void PaintGrid();
- void PaintTopArea( SCCOL nStartCol, SCCOL nEndCol );
- void PaintTop();
+ void PaintTopArea( SCCOL nStartCol, SCCOL nEndCol );
+ void PaintTop();
- void PaintLeftArea( SCROW nStartRow, SCROW nEndRow );
- void PaintLeft();
+ void PaintLeftArea( SCROW nStartRow, SCROW nEndRow );
+ void PaintLeft();
- BOOL PaintExtras();
+ BOOL PaintExtras();
- void RecalcPPT();
+ void RecalcPPT();
- void CreateAnchorHandles(SdrHdlList& rHdl, const ScAddress& rAddress);
+ void CreateAnchorHandles(SdrHdlList& rHdl, const ScAddress& rAddress);
void UpdateSelectionOverlay();
void UpdateShrinkOverlay();
void UpdateAllOverlays();
- void UpdateFormulas();
- void InterpretVisible();
- void CheckNeedsRepaint();
+ void UpdateFormulas();
+ void InterpretVisible();
+ void CheckNeedsRepaint();
- void PaintRangeFinder( long nNumber = -1 );
- void AddHighlightRange( const ScRange& rRange, const Color& rColor );
- void ClearHighlightRanges();
+ void PaintRangeFinder( long nNumber = -1 );
+ void AddHighlightRange( const ScRange& rRange, const Color& rColor );
+ void ClearHighlightRanges();
- void DoChartSelection( const ::com::sun::star::uno::Sequence<
+ void DoChartSelection( const ::com::sun::star::uno::Sequence<
::com::sun::star::chart2::data::HighlightedRange > & rHilightRanges );
- long GetGridWidth( ScHSplitPos eWhich );
- long GetGridHeight( ScVSplitPos eWhich );
+ long GetGridWidth( ScHSplitPos eWhich );
+ long GetGridHeight( ScVSplitPos eWhich );
- void UpdateScrollBars();
- void SetNewVisArea();
+ void UpdateScrollBars();
+ void SetNewVisArea();
- void InvalidateAttribs();
+ void InvalidateAttribs();
- void MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW nRow );
- void KillEditView( BOOL bNoPaint );
- void UpdateEditView();
+ void MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW nRow );
+ void KillEditView( BOOL bNoPaint );
+ void UpdateEditView();
- // Bloecke
+ // Bloecke
- void SelectAll( BOOL bContinue = FALSE );
- void SelectAllTables();
+ void SelectAll( BOOL bContinue = FALSE );
+ void SelectAllTables();
void DeselectAllTables();
- void MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
+ void MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
BOOL bCols = FALSE, BOOL bRows = FALSE, BOOL bCellSelection = FALSE );
- void InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
+ void InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
BOOL bTestNeg = FALSE,
BOOL bCols = FALSE, BOOL bRows = FALSE );
- void InitOwnBlockMode();
- void DoneBlockMode( BOOL bContinue = FALSE );
+ void InitOwnBlockMode();
+ void DoneBlockMode( BOOL bContinue = FALSE );
- BOOL IsBlockMode() const { return bIsBlockMode; }
+ BOOL IsBlockMode() const { return bIsBlockMode; }
- void MarkColumns();
- void MarkRows();
- void MarkDataArea( BOOL bIncludeCursor = TRUE );
- void MarkMatrixFormula();
- void Unmark();
+ void MarkColumns();
+ void MarkRows();
+ void MarkDataArea( BOOL bIncludeCursor = TRUE );
+ void MarkMatrixFormula();
+ void Unmark();
void MarkRange( const ScRange& rRange, BOOL bSetCursor = TRUE, BOOL bContinue = FALSE );
- BOOL IsMarking( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
+ BOOL IsMarking( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
- void PaintMarks( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
- void PaintBlock( BOOL bReset = FALSE );
+ void PaintMarks( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
+ void PaintBlock( BOOL bReset = FALSE );
void SetMarkData( const ScMarkData& rNew );
void MarkDataChanged();
- void LockModifiers( USHORT nModifiers );
- USHORT GetLockedModifiers() const;
- void ViewOptionsHasChanged( BOOL bHScrollChanged,
+ void LockModifiers( USHORT nModifiers );
+ USHORT GetLockedModifiers() const;
+ void ViewOptionsHasChanged( BOOL bHScrollChanged,
BOOL bGraphicsChanged = FALSE);
- Point GetMousePosPixel();
+ Point GetMousePosPixel();
- void SnapSplitPos( Point& rScreenPosPixel );
- void FreezeSplitters( BOOL bFreeze );
- void RemoveSplit();
- void SplitAtCursor();
- void SplitAtPixel( const Point& rPixel, BOOL bHor, BOOL bVer );
- void InvalidateSplit();
+ void SnapSplitPos( Point& rScreenPosPixel );
+ void FreezeSplitters( BOOL bFreeze );
+ void RemoveSplit();
+ void SplitAtCursor();
+ void SplitAtPixel( const Point& rPixel, BOOL bHor, BOOL bVer );
+ void InvalidateSplit();
- void ErrorMessage( USHORT nGlobStrId );
- Window* GetParentOrChild( USHORT nChildId );
+ void ErrorMessage( USHORT nGlobStrId );
+ Window* GetParentOrChild( USHORT nChildId );
- void EnableRefInput(BOOL bFlag=TRUE);
+ void EnableRefInput(BOOL bFlag=TRUE);
- Window* GetFrameWin() const { return pFrameWin; }
+ Window* GetFrameWin() const { return pFrameWin; }
BOOL HasPaintBrush() const { return pBrushDocument || pDrawBrushSet; }
ScDocument* GetBrushDocument() const { return pBrushDocument; }
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index b4313c1d7a32..91add9d085eb 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +33,9 @@
#include <sfx2/viewfac.hxx>
#include <editeng/svxenum.hxx>
#include "scdllapi.h"
-#include "dbfunc.hxx" // -> tabview
+#include "dbfunc.hxx" // -> tabview
#include "target.hxx"
-#include "rangelst.hxx" // ScRangeListRef
+#include "rangelst.hxx" // ScRangeListRef
#include "shellids.hxx"
#include "tabprotection.hxx" // for ScPasswordHash
@@ -100,95 +100,95 @@ enum ObjectSelectionType
class ScTabViewShell: public SfxViewShell, public ScDBFunc
{
private:
- static USHORT nInsertCtrlState;
- static USHORT nInsCellsCtrlState;
- static USHORT nInsObjCtrlState;
+ static USHORT nInsertCtrlState;
+ static USHORT nInsCellsCtrlState;
+ static USHORT nInsObjCtrlState;
SvxHtmlOptions aHTMLOpt;
- ObjectSelectionType eCurOST;
- USHORT nDrawSfxId;
- USHORT nCtrlSfxId;
- USHORT nFormSfxId;
+ ObjectSelectionType eCurOST;
+ USHORT nDrawSfxId;
+ USHORT nCtrlSfxId;
+ USHORT nFormSfxId;
String sDrawCustom; // current custom shape type
- ScDrawShell* pDrawShell;
- ScDrawTextObjectBar* pDrawTextShell;
- ScEditShell* pEditShell;
- ScPivotShell* pPivotShell;
- ScAuditingShell* pAuditingShell;
- ScDrawFormShell* pDrawFormShell;
- ScCellShell* pCellShell;
- ScOleObjectShell* pOleObjectShell;
- ScChartShell* pChartShell;
- ScGraphicShell* pGraphicShell;
- ScMediaShell* pMediaShell;
- ScPageBreakShell* pPageBreakShell;
- svx::ExtrusionBar* pExtrusionBarShell;
- svx::FontworkBar* pFontworkBarShell;
-
- FmFormShell* pFormShell;
-
- ScInputHandler* pInputHandler; // fuer OLE-Eingabezeile
-
- SvxBorderLine* pCurFrameLine;
+ ScDrawShell* pDrawShell;
+ ScDrawTextObjectBar* pDrawTextShell;
+ ScEditShell* pEditShell;
+ ScPivotShell* pPivotShell;
+ ScAuditingShell* pAuditingShell;
+ ScDrawFormShell* pDrawFormShell;
+ ScCellShell* pCellShell;
+ ScOleObjectShell* pOleObjectShell;
+ ScChartShell* pChartShell;
+ ScGraphicShell* pGraphicShell;
+ ScMediaShell* pMediaShell;
+ ScPageBreakShell* pPageBreakShell;
+ svx::ExtrusionBar* pExtrusionBarShell;
+ svx::FontworkBar* pFontworkBarShell;
+
+ FmFormShell* pFormShell;
+
+ ScInputHandler* pInputHandler; // fuer OLE-Eingabezeile
+
+ SvxBorderLine* pCurFrameLine;
::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatchProviderInterceptor >
xDisProvInterceptor;
- Point aWinPos;
+ Point aWinPos;
- ScTabViewTarget aTarget;
- ScArea* pPivotSource;
- ScDPObject* pDialogDPObject;
+ ScTabViewTarget aTarget;
+ ScArea* pPivotSource;
+ ScDPObject* pDialogDPObject;
ScNavigatorSettings* pNavSettings;
// used in first Activate
::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aPendingUserData;
- BOOL bFirstActivate;
-
- BOOL bActiveDrawSh;
- BOOL bActiveDrawTextSh;
- BOOL bActivePivotSh;
- BOOL bActiveAuditingSh;
- BOOL bActiveDrawFormSh;
- BOOL bActiveOleObjectSh;
- BOOL bActiveChartSh;
- BOOL bActiveGraphicSh;
- BOOL bActiveMediaSh;
- BOOL bActiveEditSh;
+ BOOL bFirstActivate;
+
+ BOOL bActiveDrawSh;
+ BOOL bActiveDrawTextSh;
+ BOOL bActivePivotSh;
+ BOOL bActiveAuditingSh;
+ BOOL bActiveDrawFormSh;
+ BOOL bActiveOleObjectSh;
+ BOOL bActiveChartSh;
+ BOOL bActiveGraphicSh;
+ BOOL bActiveMediaSh;
+ BOOL bActiveEditSh;
BOOL bFormShellAtTop; // does the FormShell need to be on top?
- BOOL bDontSwitch; // EditShell nicht abschalten
- BOOL bInFormatDialog; // fuer GetSelectionText
- BOOL bPrintSelected; // for result of SvxPrtQryBox
+ BOOL bDontSwitch; // EditShell nicht abschalten
+ BOOL bInFormatDialog; // fuer GetSelectionText
+ BOOL bPrintSelected; // for result of SvxPrtQryBox
- BOOL bReadOnly; // um Status-Aenderungen zu erkennen
+ BOOL bReadOnly; // um Status-Aenderungen zu erkennen
- SbxObject* pScSbxObject;
+ SbxObject* pScSbxObject;
//UNUSED2008-05 BOOL bChartDlgIsEdit; // Datenbereich aendern
- BOOL bChartAreaValid; // wenn Chart aufgezogen wird
- String aEditChartName;
- ScRangeListRef aChartSource;
- Rectangle aChartPos;
- SCTAB nChartDestTab;
- USHORT nCurRefDlgId;
+ BOOL bChartAreaValid; // wenn Chart aufgezogen wird
+ String aEditChartName;
+ ScRangeListRef aChartSource;
+ Rectangle aChartPos;
+ SCTAB nChartDestTab;
+ USHORT nCurRefDlgId;
- SfxBroadcaster* pAccessibilityBroadcaster;
+ SfxBroadcaster* pAccessibilityBroadcaster;
- static const int MASTERENUMCOMMANDS = 6;
- String aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ];
+ static const int MASTERENUMCOMMANDS = 6;
+ String aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ];
private:
- void Construct( BYTE nForceDesignMode = SC_FORCEMODE_NONE );
+ void Construct( BYTE nForceDesignMode = SC_FORCEMODE_NONE );
//UNUSED2008-05 void SetMySubShell( SfxShell* pShell );
- SfxShell* GetMySubShell() const;
+ SfxShell* GetMySubShell() const;
- void DoReadUserData( const String& rData );
+ void DoReadUserData( const String& rData );
void DoReadUserDataSequence( const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& rSettings );
@@ -200,30 +200,30 @@ private:
DECL_LINK( HtmlOptionsHdl, void * );
protected:
- virtual void Activate(BOOL bMDI);
- virtual void Deactivate(BOOL bMDI);
- virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE );
+ virtual void Activate(BOOL bMDI);
+ virtual void Deactivate(BOOL bMDI);
+ virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE );
- virtual void ShowCursor(FASTBOOL bOn);
+ virtual void ShowCursor(FASTBOOL bOn);
- virtual void Move(); // Benachrichtigung
+ virtual void Move(); // Benachrichtigung
- virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); // alt
+ virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); // alt
- virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); // neu
- virtual void OuterResizePixel( const Point &rOfs, const Size &rSize );
- virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY );
+ virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); // neu
+ virtual void OuterResizePixel( const Point &rOfs, const Size &rSize );
+ virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY );
- virtual void QueryObjAreaPixel( Rectangle& rRect ) const;
+ virtual void QueryObjAreaPixel( Rectangle& rRect ) const;
- virtual Size GetOptimalSizePixel() const;
+ virtual Size GetOptimalSizePixel() const;
virtual String GetSelectionText( BOOL bWholeWord );
- virtual BOOL HasSelection( BOOL bText ) const;
+ virtual BOOL HasSelection( BOOL bText ) const;
virtual String GetDescription() const;
- virtual void WriteUserData(String &, BOOL bBrowse = FALSE);
- virtual void ReadUserData(const String &, BOOL bBrowse = FALSE);
+ virtual void WriteUserData(String &, BOOL bBrowse = FALSE);
+ virtual void ReadUserData(const String &, BOOL bBrowse = FALSE);
virtual void WriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False );
virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False );
@@ -247,118 +247,118 @@ public:
// aus einer allgemeinen Shell konstruieren und
// soviel wie moeglich uebernehmen (SliderPos etc.):
- ScTabViewShell( SfxViewFrame* pViewFrame,
- SfxViewShell* pOldSh );
+ ScTabViewShell( SfxViewFrame* pViewFrame,
+ SfxViewShell* pOldSh );
- virtual ~ScTabViewShell();
+ virtual ~ScTabViewShell();
- Window* GetDialogParent();
+ Window* GetDialogParent();
bool IsRefInputMode() const;
- void ExecuteInputDirect();
+ void ExecuteInputDirect();
- ScInputHandler* GetInputHandler() const;
- void UpdateInputHandler( BOOL bForce = FALSE, BOOL bStopEditing = TRUE );
+ ScInputHandler* GetInputHandler() const;
+ void UpdateInputHandler( BOOL bForce = FALSE, BOOL bStopEditing = TRUE );
void UpdateInputHandlerCellAdjust( SvxCellHorJustify eJust );
- BOOL TabKeyInput(const KeyEvent& rKEvt);
- BOOL SfxKeyInput(const KeyEvent& rKEvt);
+ BOOL TabKeyInput(const KeyEvent& rKEvt);
+ BOOL SfxKeyInput(const KeyEvent& rKEvt);
- void SetActive();
+ void SetActive();
- SvxBorderLine* GetDefaultFrameLine() const { return pCurFrameLine; }
- void SetDefaultFrameLine(const SvxBorderLine* pLine );
+ SvxBorderLine* GetDefaultFrameLine() const { return pCurFrameLine; }
+ void SetDefaultFrameLine(const SvxBorderLine* pLine );
//UNUSED2008-05 void ExecuteShowNIY( SfxRequest& rReq );
-//UNUSED2008-05 void StateDisabled( SfxItemSet& rSet );
+//UNUSED2008-05 void StateDisabled( SfxItemSet& rSet );
- SC_DLLPUBLIC void Execute( SfxRequest& rReq );
- SC_DLLPUBLIC void GetState( SfxItemSet& rSet );
+ SC_DLLPUBLIC void Execute( SfxRequest& rReq );
+ SC_DLLPUBLIC void GetState( SfxItemSet& rSet );
- void ExecuteTable( SfxRequest& rReq );
- void GetStateTable( SfxItemSet& rSet );
+ void ExecuteTable( SfxRequest& rReq );
+ void GetStateTable( SfxItemSet& rSet );
- void WindowChanged();
- void ExecDraw(SfxRequest&);
- void ExecDrawIns(SfxRequest& rReq);
- void GetDrawState(SfxItemSet &rSet);
- void GetDrawInsState(SfxItemSet &rSet);
- void ExecGallery(SfxRequest& rReq); // StarGallery
- void GetGalleryState(SfxItemSet& rSet);
+ void WindowChanged();
+ void ExecDraw(SfxRequest&);
+ void ExecDrawIns(SfxRequest& rReq);
+ void GetDrawState(SfxItemSet &rSet);
+ void GetDrawInsState(SfxItemSet &rSet);
+ void ExecGallery(SfxRequest& rReq); // StarGallery
+ void GetGalleryState(SfxItemSet& rSet);
- void ExecChildWin(SfxRequest& rReq);
- void GetChildWinState( SfxItemSet& rSet );
+ void ExecChildWin(SfxRequest& rReq);
+ void GetChildWinState( SfxItemSet& rSet );
- void ExecImageMap( SfxRequest& rReq );
- void GetImageMapState( SfxItemSet& rSet );
+ void ExecImageMap( SfxRequest& rReq );
+ void GetImageMapState( SfxItemSet& rSet );
- void ExecTbx( SfxRequest& rReq );
- void GetTbxState( SfxItemSet& rSet );
+ void ExecTbx( SfxRequest& rReq );
+ void GetTbxState( SfxItemSet& rSet );
- void ExecuteSave( SfxRequest& rReq );
- void GetSaveState( SfxItemSet& rSet );
- void ExecSearch( SfxRequest& rReq );
+ void ExecuteSave( SfxRequest& rReq );
+ void GetSaveState( SfxItemSet& rSet );
+ void ExecSearch( SfxRequest& rReq );
- void ExecuteUndo(SfxRequest& rReq);
- void GetUndoState(SfxItemSet &rSet);
+ void ExecuteUndo(SfxRequest& rReq);
+ void GetUndoState(SfxItemSet &rSet);
- void ExecuteSbx( SfxRequest& rReq );
- void GetSbxState( SfxItemSet& rSet );
+ void ExecuteSbx( SfxRequest& rReq );
+ void GetSbxState( SfxItemSet& rSet );
- void ExecuteObject(SfxRequest& rReq);
- void GetObjectState(SfxItemSet &rSet);
+ void ExecuteObject(SfxRequest& rReq);
+ void GetObjectState(SfxItemSet &rSet);
- void ExecDrawOpt(SfxRequest& rReq);
- void GetDrawOptState(SfxItemSet &rSet);
+ void ExecDrawOpt(SfxRequest& rReq);
+ void GetDrawOptState(SfxItemSet &rSet);
- void SetDrawShell( BOOL bActive );
- void SetDrawTextShell( BOOL bActive );
+ void SetDrawShell( BOOL bActive );
+ void SetDrawTextShell( BOOL bActive );
- void SetPivotShell( BOOL bActive );
- ScArea* GetPivotSource(){return pPivotSource;}
- void SetPivotSource(ScArea* pSrc){pPivotSource=pSrc;}
- void SetDialogDPObject( const ScDPObject* pObj );
+ void SetPivotShell( BOOL bActive );
+ ScArea* GetPivotSource(){return pPivotSource;}
+ void SetPivotSource(ScArea* pSrc){pPivotSource=pSrc;}
+ void SetDialogDPObject( const ScDPObject* pObj );
const ScDPObject* GetDialogDPObject() const { return pDialogDPObject; }
- BOOL GetDontSwitch(){return bDontSwitch;}
- void SetDontSwitch(BOOL bFlag){bDontSwitch=bFlag;}
+ BOOL GetDontSwitch(){return bDontSwitch;}
+ void SetDontSwitch(BOOL bFlag){bDontSwitch=bFlag;}
- void SetAuditShell( BOOL bActive );
- void SetDrawFormShell( BOOL bActive );
- void SetEditShell(EditView* pView, BOOL bActive );
- void SetOleObjectShell( BOOL bActive );
- void SetChartShell( BOOL bActive );
- void SetGraphicShell( BOOL bActive );
- void SetMediaShell( BOOL bActive );
+ void SetAuditShell( BOOL bActive );
+ void SetDrawFormShell( BOOL bActive );
+ void SetEditShell(EditView* pView, BOOL bActive );
+ void SetOleObjectShell( BOOL bActive );
+ void SetChartShell( BOOL bActive );
+ void SetGraphicShell( BOOL bActive );
+ void SetMediaShell( BOOL bActive );
- void SetDrawShellOrSub();
- void SetCurSubShell( ObjectSelectionType eOST, BOOL bForce = FALSE );
+ void SetDrawShellOrSub();
+ void SetCurSubShell( ObjectSelectionType eOST, BOOL bForce = FALSE );
void SetFormShellAtTop( BOOL bSet );
ObjectSelectionType GetCurObjectSelectionType();
- virtual ErrCode DoVerb(long nVerb);
+ virtual ErrCode DoVerb(long nVerb);
- void StopEditShell();
- BOOL IsDrawTextShell() const;
- BOOL IsAuditShell() const;
+ void StopEditShell();
+ BOOL IsDrawTextShell() const;
+ BOOL IsAuditShell() const;
- void SetDrawTextUndo( SfxUndoManager* pUndoMgr );
+ void SetDrawTextUndo( SfxUndoManager* pUndoMgr );
- void FillFieldData( ScHeaderFieldData& rData );
+ void FillFieldData( ScHeaderFieldData& rData );
//UNUSED2008-05 void ResetChartArea();
- void SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest );
- BOOL GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const;
+ void SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest );
+ BOOL GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const;
//UNUSED2008-05 BOOL IsChartDlgEdit() const;
//UNUSED2008-05 void SetChartDlgEdit(BOOL bFlag){bChartDlgIsEdit=bFlag;}
- void SetEditChartName(const String& aStr){aEditChartName=aStr;}
+ void SetEditChartName(const String& aStr){aEditChartName=aStr;}
//UNUSED2008-05 const String& GetEditChartName() const;
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
@@ -366,70 +366,70 @@ public:
ScNavigatorSettings* GetNavigatorSettings();
// Drucken:
- virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE );
- virtual USHORT SetPrinter( SfxPrinter* pNewPrinter,
+ virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE );
+ virtual USHORT SetPrinter( SfxPrinter* pNewPrinter,
USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false );
- virtual PrintDialog* CreatePrintDialog( Window* pParent );
+ virtual PrintDialog* CreatePrintDialog( Window* pParent );
virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions );
- virtual void PreparePrint( PrintDialog* pPrintDialog = NULL );
- virtual ErrCode DoPrint( SfxPrinter *pPrinter,
+ virtual void PreparePrint( PrintDialog* pPrintDialog = NULL );
+ virtual ErrCode DoPrint( SfxPrinter *pPrinter,
PrintDialog *pPrintDialog,
BOOL bSilent, BOOL bIsAPI );
virtual USHORT Print( SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pPrintDialog = NULL );
- void ConnectObject( SdrOle2Obj* pObj );
- BOOL ActivateObject( SdrOle2Obj* pObj, long nVerb );
+ void ConnectObject( SdrOle2Obj* pObj );
+ BOOL ActivateObject( SdrOle2Obj* pObj, long nVerb );
void DeactivateOle();
SC_DLLPUBLIC static ScTabViewShell* GetActiveViewShell();
- SfxModelessDialog* CreateRefDialog( SfxBindings* pB, SfxChildWindow* pCW,
+ SfxModelessDialog* CreateRefDialog( SfxBindings* pB, SfxChildWindow* pCW,
SfxChildWinInfo* pInfo,
Window* pParent, USHORT nSlotId );
- void UpdateOleZoom();
+ void UpdateOleZoom();
inline SbxObject* GetScSbxObject() const
{ return pScSbxObject; }
- inline void SetScSbxObject( SbxObject* pOb )
+ inline void SetScSbxObject( SbxObject* pOb )
{ pScSbxObject = pOb; }
- FmFormShell* GetFormShell() const { return pFormShell; }
+ FmFormShell* GetFormShell() const { return pFormShell; }
- void InsertURL( const String& rName, const String& rURL, const String& rTarget,
+ void InsertURL( const String& rName, const String& rURL, const String& rTarget,
USHORT nMode );
- void InsertURLButton( const String& rName, const String& rURL, const String& rTarget,
+ void InsertURLButton( const String& rName, const String& rURL, const String& rTarget,
const Point* pInsPos = NULL );
- void InsertURLField( const String& rName, const String& rURL, const String& rTarget );
+ void InsertURLField( const String& rName, const String& rURL, const String& rTarget );
- BOOL SelectObject( const String& rName );
+ BOOL SelectObject( const String& rName );
- void SetInFormatDialog(BOOL bFlag) {bInFormatDialog=bFlag;}
+ void SetInFormatDialog(BOOL bFlag) {bInFormatDialog=bFlag;}
BOOL IsInFormatDialog() {return bInFormatDialog;}
- void ForceMove() { Move(); }
+ void ForceMove() { Move(); }
- void MakeNumberInfoItem ( ScDocument* pDoc,
- ScViewData* pViewData,
- SvxNumberInfoItem** ppItem );
+ void MakeNumberInfoItem ( ScDocument* pDoc,
+ ScViewData* pViewData,
+ SvxNumberInfoItem** ppItem );
- void UpdateNumberFormatter ( ScDocument* pDoc,
- const SvxNumberInfoItem& rInfoItem );
+ void UpdateNumberFormatter ( ScDocument* pDoc,
+ const SvxNumberInfoItem& rInfoItem );
- void ExecuteCellFormatDlg ( SfxRequest& rReq, USHORT nTabPage = 0xffff );
+ void ExecuteCellFormatDlg ( SfxRequest& rReq, USHORT nTabPage = 0xffff );
- BOOL GetFunction( String& rFuncStr, sal_uInt16 nErrCode = 0 );
+ BOOL GetFunction( String& rFuncStr, sal_uInt16 nErrCode = 0 );
- void StartSimpleRefDialog( const String& rTitle, const String& rInitVal,
+ void StartSimpleRefDialog( const String& rTitle, const String& rInitVal,
BOOL bCloseOnButtonUp, BOOL bSingleCell, BOOL bMultiSelection );
- void StopSimpleRefDialog();
+ void StopSimpleRefDialog();
- void SetCurRefDlgId( USHORT nNew );
+ void SetCurRefDlgId( USHORT nNew );
- void AddAccessibilityObject( SfxListener& rObject );
- void RemoveAccessibilityObject( SfxListener& rObject );
- void BroadcastAccessibility( const SfxHint &rHint );
- BOOL HasAccessibilityObjects();
+ void AddAccessibilityObject( SfxListener& rObject );
+ void RemoveAccessibilityObject( SfxListener& rObject );
+ void BroadcastAccessibility( const SfxHint &rHint );
+ BOOL HasAccessibilityObjects();
bool ExecuteRetypePassDlg(ScPasswordHash eDesiredHash);
diff --git a/sc/source/ui/inc/target.hxx b/sc/source/ui/inc/target.hxx
index 6fc62ffaa8cf..58d83f1581d4 100644
--- a/sc/source/ui/inc/target.hxx
+++ b/sc/source/ui/inc/target.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +35,15 @@ class ScTabViewShell;
class ScTabViewTarget : public SfxRepeatTarget
{
private:
- ScTabViewShell* pViewShell;
+ ScTabViewShell* pViewShell;
public:
TYPEINFO();
ScTabViewTarget( ScTabViewShell* pShell ) : pViewShell( pShell ) {}
- virtual ~ScTabViewTarget();
+ virtual ~ScTabViewTarget();
- ScTabViewShell* GetViewShell() const { return pViewShell; }
+ ScTabViewShell* GetViewShell() const { return pViewShell; }
};
diff --git a/sc/source/ui/inc/tbinsert.hrc b/sc/source/ui/inc/tbinsert.hrc
index 44c0d295cfc6..b80e6fb5863b 100644
--- a/sc/source/ui/inc/tbinsert.hrc
+++ b/sc/source/ui/inc/tbinsert.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,8 +25,8 @@
*
************************************************************************/
-#define RID_TOOLBOX_INSERT 1
-#define RID_TOOLBOX_INSCELLS 2
-#define RID_TOOLBOX_INSOBJ 3
+#define RID_TOOLBOX_INSERT 1
+#define RID_TOOLBOX_INSCELLS 2
+#define RID_TOOLBOX_INSOBJ 3
diff --git a/sc/source/ui/inc/tbinsert.hxx b/sc/source/ui/inc/tbinsert.hxx
index a056da0a982c..5ef748848062 100644
--- a/sc/source/ui/inc/tbinsert.hxx
+++ b/sc/source/ui/inc/tbinsert.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +36,10 @@
class ScTbxInsertCtrl : public SfxToolBoxControl
{
- USHORT nLastSlotId;
+ USHORT nLastSlotId;
using SfxToolBoxControl::Select;
- virtual void Select( BOOL bMod1 = FALSE );
+ virtual void Select( BOOL bMod1 = FALSE );
public:
SFX_DECL_TOOLBOX_CONTROL();
@@ -47,9 +47,9 @@ public:
ScTbxInsertCtrl( USHORT nSlotId, USHORT nId, ToolBox& rBox );
~ScTbxInsertCtrl();
- virtual SfxPopupWindowType GetPopupWindowType() const;
- virtual SfxPopupWindow* CreatePopupWindow();
- virtual void StateChanged( USHORT nSID,
+ virtual SfxPopupWindowType GetPopupWindowType() const;
+ virtual SfxPopupWindow* CreatePopupWindow();
+ virtual void StateChanged( USHORT nSID,
SfxItemState eState,
const SfxPoolItem* pState );
};
@@ -60,17 +60,17 @@ public:
/*
class ScTbxInsertPopup : public SfxPopupWindow
{
- SfxToolBoxManager aTbx;
- ResId aRIdWinTemp;
- ResId aRIdTbxTemp;
+ SfxToolBoxManager aTbx;
+ ResId aRIdWinTemp;
+ ResId aRIdTbxTemp;
- Link aTbxClickHdl;
+ Link aTbxClickHdl;
DECL_LINK( TbxSelectHdl, ToolBox* );
DECL_LINK( TbxClickHdl, ToolBox* );
protected:
- virtual void PopupModeEnd();
+ virtual void PopupModeEnd();
public:
ScTbxInsertPopup( USHORT nId, WindowAlign eAlign,
diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx
index 6ea4f6e169ed..358be7084d6c 100644
--- a/sc/source/ui/inc/tbzoomsliderctrl.hxx
+++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -74,7 +74,7 @@ private:
void DoPaint( const Rectangle& rRect );
public:
- ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider,
+ ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame , USHORT nCurrentZoom );
~ScZoomSliderWnd();
void UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem );
diff --git a/sc/source/ui/inc/textdlgs.hxx b/sc/source/ui/inc/textdlgs.hxx
index 302b5de5ffd2..accd124c2165 100644
--- a/sc/source/ui/inc/textdlgs.hxx
+++ b/sc/source/ui/inc/textdlgs.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +33,16 @@
class SfxObjectShell;
//
-// Zeichen-Tab-Dialog
+// Zeichen-Tab-Dialog
//
class ScCharDlg : public SfxTabDialog
{
private:
- const SfxItemSet& rOutAttrs;
- const SfxObjectShell& rDocShell;
+ const SfxItemSet& rOutAttrs;
+ const SfxObjectShell& rDocShell;
- virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
+ virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
public:
ScCharDlg( Window* pParent, const SfxItemSet* pAttr,
@@ -51,15 +51,15 @@ public:
};
//
-// Absatz-Tab-Dialog
+// Absatz-Tab-Dialog
//
class ScParagraphDlg : public SfxTabDialog
{
private:
- const SfxItemSet& rOutAttrs;
+ const SfxItemSet& rOutAttrs;
- virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
+ virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
public:
ScParagraphDlg( Window* pParent, const SfxItemSet* pAttr );
diff --git a/sc/source/ui/inc/textimportoptions.hrc b/sc/source/ui/inc/textimportoptions.hrc
index 93c554ef5c45..eb981c1c4dc7 100644
--- a/sc/source/ui/inc/textimportoptions.hrc
+++ b/sc/source/ui/inc/textimportoptions.hrc
@@ -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/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx
index bbb2bf6ebf09..8ef489a9aa13 100644
--- a/sc/source/ui/inc/textimportoptions.hxx
+++ b/sc/source/ui/inc/textimportoptions.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/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx
index 31f2c9458c83..3fe9b76dbcd4 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,51 +43,51 @@ class ScDocOptions;
class ScTpCalcOptions : public SfxTabPage
{
public:
- static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rCoreSet );
- static USHORT* GetRanges ();
- virtual BOOL FillItemSet ( SfxItemSet& rCoreSet );
- virtual void Reset ( const SfxItemSet& rCoreSet );
+ static SfxTabPage* Create ( Window* pParent,
+ const SfxItemSet& rCoreSet );
+ static USHORT* GetRanges ();
+ virtual BOOL FillItemSet ( SfxItemSet& rCoreSet );
+ virtual void Reset ( const SfxItemSet& rCoreSet );
using SfxTabPage::DeactivatePage;
- virtual int DeactivatePage ( SfxItemSet* pSet = NULL );
+ virtual int DeactivatePage ( SfxItemSet* pSet = NULL );
private:
- ScTpCalcOptions( Window* pParent,
- const SfxItemSet& rCoreSet );
+ ScTpCalcOptions( Window* pParent,
+ const SfxItemSet& rCoreSet );
~ScTpCalcOptions();
private:
FixedLine aGbZRefs;
CheckBox aBtnIterate;
- FixedText aFtSteps;
- NumericField aEdSteps;
- FixedText aFtEps;
+ FixedText aFtSteps;
+ NumericField aEdSteps;
+ FixedText aFtEps;
ScDoubleField aEdEps;
FixedLine aSeparatorFL;
FixedLine aGbDate;
RadioButton aBtnDateStd;
- RadioButton aBtnDateSc10;
- RadioButton aBtnDate1904;
+ RadioButton aBtnDateSc10;
+ RadioButton aBtnDate1904;
FixedLine aHSeparatorFL;
CheckBox aBtnCase;
- CheckBox aBtnCalc;
- CheckBox aBtnMatch;
+ CheckBox aBtnCalc;
+ CheckBox aBtnMatch;
CheckBox aBtnRegex;
- CheckBox aBtnLookUp;
- CheckBox aBtnGeneralPrec;
+ CheckBox aBtnLookUp;
+ CheckBox aBtnGeneralPrec;
- FixedText aFtPrec;
- NumericField aEdPrec;
+ FixedText aFtPrec;
+ NumericField aEdPrec;
- ScDocOptions* pOldOptions;
- ScDocOptions* pLocalOptions;
- USHORT nWhichCalc;
+ ScDocOptions* pOldOptions;
+ ScDocOptions* pLocalOptions;
+ USHORT nWhichCalc;
#ifdef _TPCALC_CXX
private:
- void Init();
+ void Init();
//------------------------------------
// Handler:
diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx
index dcf730712a40..32dba2482389 100644
--- a/sc/source/ui/inc/tphf.hxx
+++ b/sc/source/ui/inc/tphf.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +38,13 @@ class ScStyleDlg;
class ScHFPage : public SvxHFPage
{
public:
- virtual ~ScHFPage();
+ virtual ~ScHFPage();
- virtual void Reset( const SfxItemSet& rSet );
- virtual BOOL FillItemSet( SfxItemSet& rOutSet );
+ virtual void Reset( const SfxItemSet& rSet );
+ virtual BOOL FillItemSet( SfxItemSet& rOutSet );
- void SetPageStyle( const String& rName ) { aStrPageStyle = rName; }
- void SetStyleDlg ( const ScStyleDlg* pDlg ) { pStyleDlg = pDlg; }
+ void SetPageStyle( const String& rName ) { aStrPageStyle = rName; }
+ void SetStyleDlg ( const ScStyleDlg* pDlg ) { pStyleDlg = pDlg; }
protected:
ScHFPage( Window* pParent,
@@ -56,15 +56,15 @@ protected:
// using SvxHFPage::DeactivatePage;
virtual void ActivatePage();
virtual void DeactivatePage();
- virtual void ActivatePage( const SfxItemSet& rSet );
- virtual int DeactivatePage( SfxItemSet* pSet = 0 );
+ virtual void ActivatePage( const SfxItemSet& rSet );
+ virtual int DeactivatePage( SfxItemSet* pSet = 0 );
private:
- PushButton aBtnEdit;
- SfxItemSet aDataSet;
- String aStrPageStyle;
- USHORT nPageUsage;
- const ScStyleDlg* pStyleDlg;
+ PushButton aBtnEdit;
+ SfxItemSet aDataSet;
+ String aStrPageStyle;
+ USHORT nPageUsage;
+ const ScStyleDlg* pStyleDlg;
#ifdef _TPHF_CXX
private:
@@ -79,8 +79,8 @@ private:
class ScHeaderPage : public ScHFPage
{
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static USHORT* GetRanges();
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static USHORT* GetRanges();
private:
ScHeaderPage( Window* pParent, const SfxItemSet& rSet );
@@ -91,8 +91,8 @@ private:
class ScFooterPage : public ScHFPage
{
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static USHORT* GetRanges();
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static USHORT* GetRanges();
private:
ScFooterPage( Window* pParent, const SfxItemSet& rSet );
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index d9d26d2111cd..90ee43cf6512 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ class SvxFieldItem;
class ScAccessibleEditObject;
class ScEditWindow;
-SC_DLLPUBLIC ScEditWindow* GetScEditWindow (); //CHINA001
+SC_DLLPUBLIC ScEditWindow* GetScEditWindow (); //CHINA001
enum ScEditWindowLocation
{
@@ -69,32 +69,32 @@ public:
~ScEditWindow();
using Control::SetFont;
- void SetFont( const ScPatternAttr& rPattern );
+ void SetFont( const ScPatternAttr& rPattern );
using Control::SetText;
- void SetText( const EditTextObject& rTextObject );
- EditTextObject* CreateTextObject();
- void SetCharAttriutes();
+ void SetText( const EditTextObject& rTextObject );
+ EditTextObject* CreateTextObject();
+ void SetCharAttriutes();
- void InsertField( const SvxFieldItem& rFld );
+ void InsertField( const SvxFieldItem& rFld );
- void SetNumType(SvxNumType eNumType);
+ void SetNumType(SvxNumType eNumType);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
inline ScHeaderEditEngine* GetEditEngine() const {return pEdEngine;}
protected:
- virtual void Paint( const Rectangle& rRec );
- virtual void MouseMove( const MouseEvent& rMEvt );
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void MouseButtonUp( const MouseEvent& rMEvt );
- virtual void KeyInput( const KeyEvent& rKEvt );
- virtual void Command( const CommandEvent& rCEvt );
- virtual void GetFocus();
+ virtual void Paint( const Rectangle& rRec );
+ virtual void MouseMove( const MouseEvent& rMEvt );
+ virtual void MouseButtonDown( const MouseEvent& rMEvt );
+ virtual void MouseButtonUp( const MouseEvent& rMEvt );
+ virtual void KeyInput( const KeyEvent& rKEvt );
+ virtual void Command( const CommandEvent& rCEvt );
+ virtual void GetFocus();
virtual void LoseFocus();
private:
- ScHeaderEditEngine* pEdEngine;
- EditView* pEdView;
+ ScHeaderEditEngine* pEdEngine;
+ EditView* pEdView;
ScEditWindowLocation eLocation;
bool mbRTL;
@@ -107,76 +107,76 @@ class SC_DLLPUBLIC ScExtIButton : public ImageButton
{
private:
- Timer aTimer;
- ScPopupMenu* pPopupMenu;
- Link aMLink;
- USHORT nSelected;
+ Timer aTimer;
+ ScPopupMenu* pPopupMenu;
+ Link aMLink;
+ USHORT nSelected;
SC_DLLPRIVATE DECL_LINK( TimerHdl, Timer*);
-// void DrawArrow();
+// void DrawArrow();
protected:
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void MouseButtonUp( const MouseEvent& rMEvt);
- virtual void Click();
+ virtual void MouseButtonDown( const MouseEvent& rMEvt );
+ virtual void MouseButtonUp( const MouseEvent& rMEvt);
+ virtual void Click();
- virtual void StartPopup();
+ virtual void StartPopup();
public:
ScExtIButton(Window* pParent, const ResId& rResId );
- void SetPopupMenu(ScPopupMenu* pPopUp);
+ void SetPopupMenu(ScPopupMenu* pPopUp);
- USHORT GetSelected();
+ USHORT GetSelected();
void SetMenuHdl( const Link& rLink ) { aMLink = rLink; }
const Link& GetMenuHdl() const { return aMLink; }
- virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual long PreNotify( NotifyEvent& rNEvt );
};
//===================================================================
-//CHINA001
+//CHINA001
//CHINA001 class ScHFEditPage : public SfxTabPage
//CHINA001 {
//CHINA001 public:
-//CHINA001 virtual BOOL FillItemSet ( SfxItemSet& rCoreSet );
-//CHINA001 virtual void Reset ( const SfxItemSet& rCoreSet );
-//CHINA001
-//CHINA001 void SetNumType(SvxNumType eNumType);
-//CHINA001
+//CHINA001 virtual BOOL FillItemSet ( SfxItemSet& rCoreSet );
+//CHINA001 virtual void Reset ( const SfxItemSet& rCoreSet );
+//CHINA001
+//CHINA001 void SetNumType(SvxNumType eNumType);
+//CHINA001
//CHINA001 protected:
-//CHINA001 ScHFEditPage( Window* pParent,
-//CHINA001 USHORT nResId,
-//CHINA001 const SfxItemSet& rCoreSet,
-//CHINA001 USHORT nWhich );
-//CHINA001 virtual ~ScHFEditPage();
-//CHINA001
+//CHINA001 ScHFEditPage( Window* pParent,
+//CHINA001 USHORT nResId,
+//CHINA001 const SfxItemSet& rCoreSet,
+//CHINA001 USHORT nWhich );
+//CHINA001 virtual ~ScHFEditPage();
+//CHINA001
//CHINA001 private:
-//CHINA001 FixedText aFtLeft;
-//CHINA001 ScEditWindow aWndLeft;
-//CHINA001 FixedText aFtCenter;
-//CHINA001 ScEditWindow aWndCenter;
-//CHINA001 FixedText aFtRight;
-//CHINA001 ScEditWindow aWndRight;
-//CHINA001 ImageButton aBtnText;
-//CHINA001 ScExtIButton aBtnFile;
-//CHINA001 ImageButton aBtnTable;
-//CHINA001 ImageButton aBtnPage;
-//CHINA001 ImageButton aBtnLastPage;
-//CHINA001 ImageButton aBtnDate;
-//CHINA001 ImageButton aBtnTime;
-//CHINA001 FixedLine aFlInfo;
-//CHINA001 FixedInfo aFtInfo;
-//CHINA001 ScPopupMenu aPopUpFile;
-//CHINA001
-//CHINA001 USHORT nWhich;
-//CHINA001 String aCmdArr[6];
-//CHINA001
+//CHINA001 FixedText aFtLeft;
+//CHINA001 ScEditWindow aWndLeft;
+//CHINA001 FixedText aFtCenter;
+//CHINA001 ScEditWindow aWndCenter;
+//CHINA001 FixedText aFtRight;
+//CHINA001 ScEditWindow aWndRight;
+//CHINA001 ImageButton aBtnText;
+//CHINA001 ScExtIButton aBtnFile;
+//CHINA001 ImageButton aBtnTable;
+//CHINA001 ImageButton aBtnPage;
+//CHINA001 ImageButton aBtnLastPage;
+//CHINA001 ImageButton aBtnDate;
+//CHINA001 ImageButton aBtnTime;
+//CHINA001 FixedLine aFlInfo;
+//CHINA001 FixedInfo aFtInfo;
+//CHINA001 ScPopupMenu aPopUpFile;
+//CHINA001
+//CHINA001 USHORT nWhich;
+//CHINA001 String aCmdArr[6];
+//CHINA001
//CHINA001 private:
//CHINA001 #ifdef _TPHFEDIT_CXX
//CHINA001 void FillCmdArr();
@@ -184,51 +184,51 @@ public:
//CHINA001 DECL_LINK( MenuHdl, ScExtIButton* );
//CHINA001 #endif
//CHINA001 };
-//CHINA001
+//CHINA001
//CHINA001 //===================================================================
-//CHINA001
+//CHINA001
//CHINA001 class ScRightHeaderEditPage : public ScHFEditPage
//CHINA001 {
//CHINA001 public:
-//CHINA001 static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
-//CHINA001 static USHORT* GetRanges();
-//CHINA001
+//CHINA001 static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
+//CHINA001 static USHORT* GetRanges();
+//CHINA001
//CHINA001 private:
//CHINA001 ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rSet );
//CHINA001 };
-//CHINA001
+//CHINA001
//CHINA001 //===================================================================
-//CHINA001
+//CHINA001
//CHINA001 class ScLeftHeaderEditPage : public ScHFEditPage
//CHINA001 {
//CHINA001 public:
-//CHINA001 static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
-//CHINA001 static USHORT* GetRanges();
-//CHINA001
+//CHINA001 static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
+//CHINA001 static USHORT* GetRanges();
+//CHINA001
//CHINA001 private:
//CHINA001 ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rSet );
//CHINA001 };
-//CHINA001
+//CHINA001
//CHINA001 //===================================================================
-//CHINA001
+//CHINA001
//CHINA001 class ScRightFooterEditPage : public ScHFEditPage
//CHINA001 {
//CHINA001 public:
-//CHINA001 static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
-//CHINA001 static USHORT* GetRanges();
-//CHINA001
+//CHINA001 static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
+//CHINA001 static USHORT* GetRanges();
+//CHINA001
//CHINA001 private:
//CHINA001 ScRightFooterEditPage( Window* pParent, const SfxItemSet& rSet );
//CHINA001 };
-//CHINA001
+//CHINA001
//CHINA001 //===================================================================
-//CHINA001
+//CHINA001
//CHINA001 class ScLeftFooterEditPage : public ScHFEditPage
//CHINA001 {
//CHINA001 public:
-//CHINA001 static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
-//CHINA001 static USHORT* GetRanges();
-//CHINA001
+//CHINA001 static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
+//CHINA001 static USHORT* GetRanges();
+//CHINA001
//CHINA001 private:
//CHINA001 ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rSet );
//CHINA001 };
diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx
index 358c29f83d97..434b83a65e4d 100644
--- a/sc/source/ui/inc/tpprint.hxx
+++ b/sc/source/ui/inc/tpprint.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,21 +35,21 @@
class ScTpPrintOptions : public SfxTabPage
{
- FixedLine aPagesFL;
- CheckBox aSkipEmptyPagesCB;
- FixedLine aSheetsFL;
- CheckBox aSelectedSheetsCB;
+ FixedLine aPagesFL;
+ CheckBox aSkipEmptyPagesCB;
+ FixedLine aSheetsFL;
+ CheckBox aSelectedSheetsCB;
ScTpPrintOptions( Window* pParent, const SfxItemSet& rCoreSet );
~ScTpPrintOptions();
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
- static USHORT* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& rCoreSet );
- virtual void Reset( const SfxItemSet& rCoreSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
+ static USHORT* GetRanges();
+ virtual BOOL FillItemSet( SfxItemSet& rCoreSet );
+ virtual void Reset( const SfxItemSet& rCoreSet );
using SfxTabPage::DeactivatePage;
- virtual int DeactivatePage( SfxItemSet* pSet = NULL );
+ virtual int DeactivatePage( SfxItemSet* pSet = NULL );
};
#endif
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index d1ba772a8ca2..f197ca6d5dd9 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
//------------------------------------------------------------------------
// +1 because one field is reserved for the "- undefined -" entry
-#define SC_MAXFIELDS MAXCOLCOUNT+1
+#define SC_MAXFIELDS MAXCOLCOUNT+1
class ScViewData;
class ScSortDlg;
@@ -55,66 +55,66 @@ struct ScSortParam;
class ScTabPageSortFields : public SfxTabPage
{
public:
- ScTabPageSortFields( Window* pParent,
- const SfxItemSet& rArgSet );
+ ScTabPageSortFields( Window* pParent,
+ const SfxItemSet& rArgSet );
~ScTabPageSortFields();
- static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rArgSet );
- static USHORT* GetRanges ();
- virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
- virtual void Reset ( const SfxItemSet& rArgSet );
+ static SfxTabPage* Create ( Window* pParent,
+ const SfxItemSet& rArgSet );
+ static USHORT* GetRanges ();
+ virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
+ virtual void Reset ( const SfxItemSet& rArgSet );
protected:
// fuer Datenaustausch (sollte noch umgestellt werden!)
-// virtual void ActivatePage ( const SfxItemSet& rSet );
+// virtual void ActivatePage ( const SfxItemSet& rSet );
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
- virtual void ActivatePage ();
- virtual int DeactivatePage ( SfxItemSet* pSet = 0);
+ virtual void ActivatePage ();
+ virtual int DeactivatePage ( SfxItemSet* pSet = 0);
private:
FixedLine aFlSort1;
- ListBox aLbSort1;
- RadioButton aBtnUp1;
- RadioButton aBtnDown1;
+ ListBox aLbSort1;
+ RadioButton aBtnUp1;
+ RadioButton aBtnDown1;
FixedLine aFlSort2;
- ListBox aLbSort2;
- RadioButton aBtnUp2;
- RadioButton aBtnDown2;
+ ListBox aLbSort2;
+ RadioButton aBtnUp2;
+ RadioButton aBtnDown2;
FixedLine aFlSort3;
- ListBox aLbSort3;
- RadioButton aBtnUp3;
- RadioButton aBtnDown3;
-
- String aStrUndefined;
- String aStrColumn;
- String aStrRow;
-
- const USHORT nWhichSort;
- ScSortDlg* pDlg;
- ScViewData* pViewData;
- const ScSortParam& rSortData;
- SCCOLROW nFieldArr[SC_MAXFIELDS];
- USHORT nFieldCount;
- SCCOL nFirstCol;
- SCROW nFirstRow;
- BOOL bHasHeader;
- BOOL bSortByRows;
-
- ListBox* aSortLbArr[3];
- RadioButton* aDirBtnArr[3][2];
+ ListBox aLbSort3;
+ RadioButton aBtnUp3;
+ RadioButton aBtnDown3;
+
+ String aStrUndefined;
+ String aStrColumn;
+ String aStrRow;
+
+ const USHORT nWhichSort;
+ ScSortDlg* pDlg;
+ ScViewData* pViewData;
+ const ScSortParam& rSortData;
+ SCCOLROW nFieldArr[SC_MAXFIELDS];
+ USHORT nFieldCount;
+ SCCOL nFirstCol;
+ SCROW nFirstRow;
+ BOOL bHasHeader;
+ BOOL bSortByRows;
+
+ ListBox* aSortLbArr[3];
+ RadioButton* aDirBtnArr[3][2];
FixedLine* aFlArr[3];
#ifdef _TPSORT_CXX
private:
- void Init ();
- void DisableField ( USHORT nField );
- void EnableField ( USHORT nField );
- void FillFieldLists ();
- USHORT GetFieldSelPos ( SCCOLROW nField );
+ void Init ();
+ void DisableField ( USHORT nField );
+ void EnableField ( USHORT nField );
+ void FillFieldLists ();
+ USHORT GetFieldSelPos ( SCCOLROW nField );
// Handler ------------------------
DECL_LINK( SelectHdl, ListBox * );
@@ -139,25 +139,25 @@ class CollatorWrapper;
class ScTabPageSortOptions : public SfxTabPage
{
public:
- ScTabPageSortOptions( Window* pParent,
- const SfxItemSet& rArgSet );
+ ScTabPageSortOptions( Window* pParent,
+ const SfxItemSet& rArgSet );
~ScTabPageSortOptions();
#undef SfxTabPage
#define SfxTabPage ::SfxTabPage
- static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rArgSet );
- static USHORT* GetRanges ();
- virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
- virtual void Reset ( const SfxItemSet& rArgSet );
+ static SfxTabPage* Create ( Window* pParent,
+ const SfxItemSet& rArgSet );
+ static USHORT* GetRanges ();
+ virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
+ virtual void Reset ( const SfxItemSet& rArgSet );
protected:
// fuer Datenaustausch (sollte noch umgestellt werden!)
-// virtual void ActivatePage ( const SfxItemSet& rSet );
+// virtual void ActivatePage ( const SfxItemSet& rSet );
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
- virtual void ActivatePage ();
- virtual int DeactivatePage ( SfxItemSet* pSet = 0);
+ virtual void ActivatePage ();
+ virtual int DeactivatePage ( SfxItemSet* pSet = 0);
private:
@@ -189,26 +189,26 @@ private:
String aStrNoName;
String aStrAreaLabel;
- const USHORT nWhichSort;
- const ScSortParam& rSortData;
- ScViewData* pViewData;
- ScDocument* pDoc;
- ScSortDlg* pDlg;
- ScAddress theOutPos;
+ const USHORT nWhichSort;
+ const ScSortParam& rSortData;
+ ScViewData* pViewData;
+ ScDocument* pDoc;
+ ScSortDlg* pDlg;
+ ScAddress theOutPos;
- CollatorRessource* pColRes;
- CollatorWrapper* pColWrap;
+ CollatorRessource* pColRes;
+ CollatorWrapper* pColWrap;
#ifdef _TPSORT_CXX
private:
- void Init ();
- void FillUserSortListBox ();
- void FillOutPosList ();
+ void Init ();
+ void FillUserSortListBox ();
+ void FillOutPosList ();
// Handler ------------------------
DECL_LINK( EnableHdl, CheckBox * );
DECL_LINK( SelOutPosHdl, ListBox * );
- void EdOutPosModHdl ( Edit* pEd );
+ void EdOutPosModHdl ( Edit* pEd );
DECL_LINK( SortDirHdl, RadioButton * );
DECL_LINK( FillAlgorHdl, void * );
#endif
diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx
index 1c928ff2ef13..d02d3e22e22a 100644
--- a/sc/source/ui/inc/tpstat.hxx
+++ b/sc/source/ui/inc/tpstat.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx
index 6dd640e7925e..b2f164d247db 100644
--- a/sc/source/ui/inc/tpsubt.hxx
+++ b/sc/source/ui/inc/tpsubt.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
//------------------------------------------------------------------------
// +1 because one field is reserved for the "- none -" entry
-#define SC_MAXFIELDS MAXCOLCOUNT+1
+#define SC_MAXFIELDS MAXCOLCOUNT+1
class ScViewData;
class ScDocument;
@@ -53,35 +53,35 @@ protected:
public:
virtual ~ScTpSubTotalGroup();
- static USHORT* GetRanges ();
- BOOL DoReset ( USHORT nGroupNo,
- const SfxItemSet& rArgSet );
- BOOL DoFillItemSet ( USHORT nGroupNo,
- SfxItemSet& rArgSet );
+ static USHORT* GetRanges ();
+ BOOL DoReset ( USHORT nGroupNo,
+ const SfxItemSet& rArgSet );
+ BOOL DoFillItemSet ( USHORT nGroupNo,
+ SfxItemSet& rArgSet );
protected:
- FixedText aFtGroup;
- ListBox aLbGroup;
- FixedText aFtColumns;
- SvxCheckListBox aLbColumns;
- FixedText aFtFunctions;
- ListBox aLbFunctions;
- const String aStrNone;
- const String aStrColumn;
-
- ScViewData* pViewData;
- ScDocument* pDoc;
-
- const USHORT nWhichSubTotals;
- const ScSubTotalParam& rSubTotalData;
- SCCOL nFieldArr[SC_MAXFIELDS];
- const USHORT nFieldCount;
+ FixedText aFtGroup;
+ ListBox aLbGroup;
+ FixedText aFtColumns;
+ SvxCheckListBox aLbColumns;
+ FixedText aFtFunctions;
+ ListBox aLbFunctions;
+ const String aStrNone;
+ const String aStrColumn;
+
+ ScViewData* pViewData;
+ ScDocument* pDoc;
+
+ const USHORT nWhichSubTotals;
+ const ScSubTotalParam& rSubTotalData;
+ SCCOL nFieldArr[SC_MAXFIELDS];
+ const USHORT nFieldCount;
private:
- void Init ();
- void FillListBoxes ();
- ScSubTotalFunc LbPosToFunc ( USHORT nPos );
- USHORT FuncToLbPos ( ScSubTotalFunc eFunc );
- USHORT GetFieldSelPos ( SCCOL nField );
+ void Init ();
+ void FillListBoxes ();
+ ScSubTotalFunc LbPosToFunc ( USHORT nPos );
+ USHORT FuncToLbPos ( ScSubTotalFunc eFunc );
+ USHORT GetFieldSelPos ( SCCOL nField );
// Handler ------------------------
DECL_LINK( SelectHdl, ListBox * );
@@ -93,16 +93,16 @@ private:
class ScTpSubTotalGroup1 : public ScTpSubTotalGroup
{
protected:
- ScTpSubTotalGroup1( Window* pParent,
- const SfxItemSet& rArgSet );
+ ScTpSubTotalGroup1( Window* pParent,
+ const SfxItemSet& rArgSet );
public:
virtual ~ScTpSubTotalGroup1();
- static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rArgSet );
- virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
- virtual void Reset ( const SfxItemSet& rArgSet );
+ static SfxTabPage* Create ( Window* pParent,
+ const SfxItemSet& rArgSet );
+ virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
+ virtual void Reset ( const SfxItemSet& rArgSet );
};
//------------------------------------------------------------------------
@@ -110,16 +110,16 @@ public:
class ScTpSubTotalGroup2 : public ScTpSubTotalGroup
{
protected:
- ScTpSubTotalGroup2( Window* pParent,
- const SfxItemSet& rArgSet );
+ ScTpSubTotalGroup2( Window* pParent,
+ const SfxItemSet& rArgSet );
public:
virtual ~ScTpSubTotalGroup2();
- static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rArgSet );
- virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
- virtual void Reset ( const SfxItemSet& rArgSet );
+ static SfxTabPage* Create ( Window* pParent,
+ const SfxItemSet& rArgSet );
+ virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
+ virtual void Reset ( const SfxItemSet& rArgSet );
};
//------------------------------------------------------------------------
@@ -127,16 +127,16 @@ public:
class ScTpSubTotalGroup3 : public ScTpSubTotalGroup
{
protected:
- ScTpSubTotalGroup3( Window* pParent,
- const SfxItemSet& rArgSet );
+ ScTpSubTotalGroup3( Window* pParent,
+ const SfxItemSet& rArgSet );
public:
virtual ~ScTpSubTotalGroup3();
- static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rArgSet );
- virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
- virtual void Reset ( const SfxItemSet& rArgSet );
+ static SfxTabPage* Create ( Window* pParent,
+ const SfxItemSet& rArgSet );
+ virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
+ virtual void Reset ( const SfxItemSet& rArgSet );
};
//========================================================================
@@ -145,38 +145,38 @@ public:
class ScTpSubTotalOptions : public SfxTabPage
{
protected:
- ScTpSubTotalOptions( Window* pParent,
+ ScTpSubTotalOptions( Window* pParent,
const SfxItemSet& rArgSet );
public:
virtual ~ScTpSubTotalOptions();
- static USHORT* GetRanges ();
- static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rArgSet );
- virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
- virtual void Reset ( const SfxItemSet& rArgSet );
+ static USHORT* GetRanges ();
+ static SfxTabPage* Create ( Window* pParent,
+ const SfxItemSet& rArgSet );
+ virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
+ virtual void Reset ( const SfxItemSet& rArgSet );
private:
FixedLine aFlGroup;
- CheckBox aBtnPagebreak;
- CheckBox aBtnCase;
- CheckBox aBtnSort;
+ CheckBox aBtnPagebreak;
+ CheckBox aBtnCase;
+ CheckBox aBtnSort;
FixedLine aFlSort;
- RadioButton aBtnAscending;
- RadioButton aBtnDescending;
- CheckBox aBtnFormats;
- CheckBox aBtnUserDef;
- ListBox aLbUserDef;
+ RadioButton aBtnAscending;
+ RadioButton aBtnDescending;
+ CheckBox aBtnFormats;
+ CheckBox aBtnUserDef;
+ ListBox aLbUserDef;
- ScViewData* pViewData;
- ScDocument* pDoc;
- const USHORT nWhichSubTotals;
- const ScSubTotalParam& rSubTotalData;
+ ScViewData* pViewData;
+ ScDocument* pDoc;
+ const USHORT nWhichSubTotals;
+ const ScSubTotalParam& rSubTotalData;
private:
- void Init ();
- void FillUserSortListBox ();
+ void Init ();
+ void FillUserSortListBox ();
// Handler ------------------------
DECL_LINK( CheckHdl, CheckBox * );
diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx
index 980a574dc61d..83a693eaa6a4 100644
--- a/sc/source/ui/inc/tptable.hxx
+++ b/sc/source/ui/inc/tptable.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +55,13 @@ public:
class ScTablePage : public SfxTabPage
{
public:
- static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rCoreSet );
- static USHORT* GetRanges ();
- virtual BOOL FillItemSet ( SfxItemSet& rCoreSet );
- virtual void Reset ( const SfxItemSet& rCoreSet );
+ static SfxTabPage* Create ( Window* pParent,
+ const SfxItemSet& rCoreSet );
+ static USHORT* GetRanges ();
+ virtual BOOL FillItemSet ( SfxItemSet& rCoreSet );
+ virtual void Reset ( const SfxItemSet& rCoreSet );
using SfxTabPage::DeactivatePage;
- virtual int DeactivatePage ( SfxItemSet* pSet = NULL );
+ virtual int DeactivatePage ( SfxItemSet* pSet = NULL );
virtual void DataChanged ( const DataChangedEvent& rDCEvt );
private:
@@ -72,25 +72,25 @@ private:
private:
FixedLine aFlPageDir;
- RadioButton aBtnTopDown;
- RadioButton aBtnLeftRight;
+ RadioButton aBtnTopDown;
+ RadioButton aBtnLeftRight;
FixedImage aBmpPageDir;
Image aImgLeftRight;
Image aImgTopDown;
Image aImgLeftRightHC;
Image aImgTopDownHC;
- CheckBox aBtnPageNo;
- NumericField aEdPageNo;
+ CheckBox aBtnPageNo;
+ NumericField aEdPageNo;
FixedLine aFlPrint;
- CheckBox aBtnHeaders;
- CheckBox aBtnGrid;
- CheckBox aBtnNotes;
- CheckBox aBtnObjects;
- CheckBox aBtnCharts;
- CheckBox aBtnDrawings;
- CheckBox aBtnFormulas;
- CheckBox aBtnNullVals;
+ CheckBox aBtnHeaders;
+ CheckBox aBtnGrid;
+ CheckBox aBtnNotes;
+ CheckBox aBtnObjects;
+ CheckBox aBtnCharts;
+ CheckBox aBtnDrawings;
+ CheckBox aBtnFormulas;
+ CheckBox aBtnNullVals;
FixedLine aFlScale;
FixedText aFtScaleMode;
diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx
index f26e48889f1d..ff4e114dd7ab 100644
--- a/sc/source/ui/inc/tpusrlst.hxx
+++ b/sc/source/ui/inc/tpusrlst.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,70 +44,70 @@ class ScRangeUtil;
class ScTpUserLists : public SfxTabPage
{
public:
- static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rAttrSet );
- static USHORT* GetRanges ();
- virtual BOOL FillItemSet ( SfxItemSet& rCoreAttrs );
- virtual void Reset ( const SfxItemSet& rCoreAttrs );
+ static SfxTabPage* Create ( Window* pParent,
+ const SfxItemSet& rAttrSet );
+ static USHORT* GetRanges ();
+ virtual BOOL FillItemSet ( SfxItemSet& rCoreAttrs );
+ virtual void Reset ( const SfxItemSet& rCoreAttrs );
using SfxTabPage::DeactivatePage;
- virtual int DeactivatePage ( SfxItemSet* pSet = NULL );
+ virtual int DeactivatePage ( SfxItemSet* pSet = NULL );
private:
- ScTpUserLists( Window* pParent,
- const SfxItemSet& rArgSet );
+ ScTpUserLists( Window* pParent,
+ const SfxItemSet& rArgSet );
~ScTpUserLists();
private:
- FixedText aFtLists;
- ListBox aLbLists;
- FixedText aFtEntries;
- MultiLineEdit aEdEntries;
- FixedText aFtCopyFrom;
- Edit aEdCopyFrom;
- PushButton aBtnNew;
- PushButton aBtnAdd;
- PushButton aBtnRemove;
- PushButton aBtnCopy;
-
- const String aStrQueryRemove;
- const String aStrNew;
- const String aStrCancel;
- const String aStrAdd;
- const String aStrModify;
- const String aStrCopyList;
- const String aStrCopyFrom;
- const String aStrCopyErr;
-
- const USHORT nWhichUserLists;
- ScUserList* pUserLists;
-
- ScDocument* pDoc;
- ScViewData* pViewData;
- ScRangeUtil* pRangeUtil;
- String aStrSelectedArea;
-
- BOOL bModifyMode;
- BOOL bCancelMode;
- BOOL bCopyDone;
- USHORT nCancelPos;
+ FixedText aFtLists;
+ ListBox aLbLists;
+ FixedText aFtEntries;
+ MultiLineEdit aEdEntries;
+ FixedText aFtCopyFrom;
+ Edit aEdCopyFrom;
+ PushButton aBtnNew;
+ PushButton aBtnAdd;
+ PushButton aBtnRemove;
+ PushButton aBtnCopy;
+
+ const String aStrQueryRemove;
+ const String aStrNew;
+ const String aStrCancel;
+ const String aStrAdd;
+ const String aStrModify;
+ const String aStrCopyList;
+ const String aStrCopyFrom;
+ const String aStrCopyErr;
+
+ const USHORT nWhichUserLists;
+ ScUserList* pUserLists;
+
+ ScDocument* pDoc;
+ ScViewData* pViewData;
+ ScRangeUtil* pRangeUtil;
+ String aStrSelectedArea;
+
+ BOOL bModifyMode;
+ BOOL bCancelMode;
+ BOOL bCopyDone;
+ USHORT nCancelPos;
#ifdef _TPUSRLST_CXX
private:
- void Init ();
- USHORT UpdateUserListBox ();
- void UpdateEntries ( USHORT nList );
- void MakeListStr ( String& rListStr );
- void AddNewList ( const String& rEntriesStr );
- void RemoveList ( USHORT nList );
- void ModifyList ( USHORT nSelList,
+ void Init ();
+ USHORT UpdateUserListBox ();
+ void UpdateEntries ( USHORT nList );
+ void MakeListStr ( String& rListStr );
+ void AddNewList ( const String& rEntriesStr );
+ void RemoveList ( USHORT nList );
+ void ModifyList ( USHORT nSelList,
const String& rEntriesStr );
- void CopyListFromArea ( const ScRefAddress& rStartPos,
+ void CopyListFromArea ( const ScRefAddress& rStartPos,
const ScRefAddress& rEndPos );
// Handler:
- DECL_LINK( LbSelectHdl, ListBox* );
- DECL_LINK( BtnClickHdl, PushButton* );
- DECL_LINK( EdEntriesModHdl, MultiLineEdit* );
+ DECL_LINK( LbSelectHdl, ListBox* );
+ DECL_LINK( BtnClickHdl, PushButton* );
+ DECL_LINK( EdEntriesModHdl, MultiLineEdit* );
#endif
};
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 81760eb66c67..8556911f86a3 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +46,13 @@ class ScViewOptions;
class ScTpContentOptions : public SfxTabPage
{
FixedLine aLinesGB;
- CheckBox aGridCB;
- FixedText aColorFT;
- ColorListBox aColorLB;
- CheckBox aBreakCB;
- CheckBox aGuideLineCB;
- CheckBox aHandleCB;
- CheckBox aBigHandleCB;
+ CheckBox aGridCB;
+ FixedText aColorFT;
+ ColorListBox aColorLB;
+ CheckBox aBreakCB;
+ CheckBox aGuideLineCB;
+ CheckBox aHandleCB;
+ CheckBox aBigHandleCB;
FixedLine aSeparator1FL;
@@ -79,11 +79,11 @@ class ScTpContentOptions : public SfxTabPage
FixedLine aSeparator2FL;
FixedLine aWindowGB;
- CheckBox aRowColHeaderCB;
- CheckBox aHScrollCB;
- CheckBox aVScrollCB;
- CheckBox aTblRegCB;
- CheckBox aOutlineCB;
+ CheckBox aRowColHeaderCB;
+ CheckBox aHScrollCB;
+ CheckBox aVScrollCB;
+ CheckBox aTblRegCB;
+ CheckBox aOutlineCB;
ScViewOptions* pLocalOptions;
@@ -92,19 +92,19 @@ class ScTpContentOptions : public SfxTabPage
DECL_LINK( SelLbObjHdl, ListBox* );
DECL_LINK( CBHdl, CheckBox* );
- ScTpContentOptions( Window* pParent,
- const SfxItemSet& rArgSet );
+ ScTpContentOptions( Window* pParent,
+ const SfxItemSet& rArgSet );
~ScTpContentOptions();
public:
- static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rCoreSet );
- virtual BOOL FillItemSet ( SfxItemSet& rCoreSet );
- virtual void Reset ( const SfxItemSet& rCoreSet );
+ static SfxTabPage* Create ( Window* pParent,
+ const SfxItemSet& rCoreSet );
+ virtual BOOL FillItemSet ( SfxItemSet& rCoreSet );
+ virtual void Reset ( const SfxItemSet& rCoreSet );
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
- virtual void ActivatePage( const SfxItemSet& );
- virtual int DeactivatePage( SfxItemSet* pSet = 0 );
+ virtual void ActivatePage( const SfxItemSet& );
+ virtual int DeactivatePage( SfxItemSet* pSet = 0 );
};
@@ -128,16 +128,16 @@ class ScTpLayoutOptions : public SfxTabPage
RadioButton aNeverRB;
FixedLine aOptionsGB;
- CheckBox aAlignCB;
- ListBox aAlignLB;
- CheckBox aEditModeCB;
- CheckBox aFormatCB;
+ CheckBox aAlignCB;
+ ListBox aAlignLB;
+ CheckBox aEditModeCB;
+ CheckBox aFormatCB;
CheckBox aExpRefCB;
- CheckBox aMarkHdrCB;
- CheckBox aTextFmtCB;
+ CheckBox aMarkHdrCB;
+ CheckBox aTextFmtCB;
CheckBox aReplWarnCB;
- SvxStringArray aUnitArr;
+ SvxStringArray aUnitArr;
DECL_LINK( CBHdl, CheckBox* );
@@ -146,21 +146,21 @@ class ScTpLayoutOptions : public SfxTabPage
ScDocument *pDoc;
- DECL_LINK( UpdateHdl, CheckBox* );
+ DECL_LINK( UpdateHdl, CheckBox* );
- ScTpLayoutOptions( Window* pParent,
- const SfxItemSet& rArgSet );
+ ScTpLayoutOptions( Window* pParent,
+ const SfxItemSet& rArgSet );
~ScTpLayoutOptions();
public:
- static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rCoreSet );
- virtual BOOL FillItemSet ( SfxItemSet& rCoreSet );
- virtual void Reset ( const SfxItemSet& rCoreSet );
+ static SfxTabPage* Create ( Window* pParent,
+ const SfxItemSet& rCoreSet );
+ virtual BOOL FillItemSet ( SfxItemSet& rCoreSet );
+ virtual void Reset ( const SfxItemSet& rCoreSet );
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
- virtual void ActivatePage( const SfxItemSet& );
- virtual int DeactivatePage( SfxItemSet* pSet = 0 );
+ virtual void ActivatePage( const SfxItemSet& );
+ virtual int DeactivatePage( SfxItemSet* pSet = 0 );
void SetDocument(ScDocument* pPtr){pDoc = pPtr;}
diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx
index e2dbad485812..e4db2bdd80b6 100644
--- a/sc/source/ui/inc/transobj.hxx
+++ b/sc/source/ui/inc/transobj.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,26 +47,26 @@ namespace com { namespace sun { namespace star {
class ScTransferObj : public TransferableHelper
{
private:
- ScDocument* pDoc;
- ScRange aBlock;
- SCROW nNonFiltered; // non-filtered rows
- TransferableDataHelper aOleData;
- TransferableObjectDescriptor aObjDesc;
-//REMOVE SvEmbeddedObjectRef aDocShellRef;
-//REMOVE SvEmbeddedObjectRef aDrawPersistRef;
- SfxObjectShellRef aDocShellRef;
- SfxObjectShellRef aDrawPersistRef;
+ ScDocument* pDoc;
+ ScRange aBlock;
+ SCROW nNonFiltered; // non-filtered rows
+ TransferableDataHelper aOleData;
+ TransferableObjectDescriptor aObjDesc;
+//REMOVE SvEmbeddedObjectRef aDocShellRef;
+//REMOVE SvEmbeddedObjectRef aDrawPersistRef;
+ SfxObjectShellRef aDocShellRef;
+ SfxObjectShellRef aDrawPersistRef;
com::sun::star::uno::Reference<com::sun::star::sheet::XSheetCellRanges> xDragSourceRanges;
- SCCOL nDragHandleX;
- SCROW nDragHandleY;
- SCTAB nVisibleTab;
- USHORT nDragSourceFlags;
- BOOL bDragWasInternal;
- BOOL bUsedForLink;
+ SCCOL nDragHandleX;
+ SCROW nDragHandleY;
+ SCTAB nVisibleTab;
+ USHORT nDragSourceFlags;
+ BOOL bDragWasInternal;
+ BOOL bUsedForLink;
bool bHasFiltered; // if has filtered rows
- void InitDocShell();
- static void StripRefs( ScDocument* pDoc, SCCOL nStartX, SCROW nStartY,
+ void InitDocShell();
+ static void StripRefs( ScDocument* pDoc, SCCOL nStartX, SCROW nStartY,
SCCOL nEndX, SCROW nEndY,
ScDocument* pDestDoc=0,
SCCOL nSubX=0, SCROW nSubY=0 );
@@ -78,35 +78,35 @@ public:
ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDescriptor& rDesc );
virtual ~ScTransferObj();
- virtual void AddSupportedFormats();
- virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
- virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId,
+ virtual void AddSupportedFormats();
+ virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+ virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId,
const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
- virtual void ObjectReleased();
- virtual void DragFinished( sal_Int8 nDropAction );
+ virtual void ObjectReleased();
+ virtual void DragFinished( sal_Int8 nDropAction );
- ScDocument* GetDocument() { return pDoc; } // owned by ScTransferObj
- const ScRange& GetRange() const { return aBlock; }
- SCROW GetNonFilteredRows() const { return nNonFiltered; }
- SCCOL GetDragHandleX() const { return nDragHandleX; }
- SCROW GetDragHandleY() const { return nDragHandleY; }
- SCTAB GetVisibleTab() const { return nVisibleTab; }
- USHORT GetDragSourceFlags() const { return nDragSourceFlags; }
+ ScDocument* GetDocument() { return pDoc; } // owned by ScTransferObj
+ const ScRange& GetRange() const { return aBlock; }
+ SCROW GetNonFilteredRows() const { return nNonFiltered; }
+ SCCOL GetDragHandleX() const { return nDragHandleX; }
+ SCROW GetDragHandleY() const { return nDragHandleY; }
+ SCTAB GetVisibleTab() const { return nVisibleTab; }
+ USHORT GetDragSourceFlags() const { return nDragSourceFlags; }
bool HasFilteredRows() const { return bHasFiltered; }
- ScDocShell* GetSourceDocShell();
- ScDocument* GetSourceDocument();
- ScMarkData GetSourceMarkData();
+ ScDocShell* GetSourceDocShell();
+ ScDocument* GetSourceDocument();
+ ScMarkData GetSourceMarkData();
- void SetDrawPersist( const SfxObjectShellRef& rRef );
- void SetDragHandlePos( SCCOL nX, SCROW nY );
- void SetVisibleTab( SCTAB nNew );
- void SetDragSource( ScDocShell* pSourceShell, const ScMarkData& rMark );
- void SetDragSourceFlags( USHORT nFlags );
- void SetDragWasInternal();
+ void SetDrawPersist( const SfxObjectShellRef& rRef );
+ void SetDragHandlePos( SCCOL nX, SCROW nY );
+ void SetVisibleTab( SCTAB nNew );
+ void SetDragSource( ScDocShell* pSourceShell, const ScMarkData& rMark );
+ void SetDragSourceFlags( USHORT nFlags );
+ void SetDragWasInternal();
static SC_DLLPUBLIC ScTransferObj* GetOwnClipboard( Window* pUIWin );
- static SfxObjectShell* SetDrawClipDoc( BOOL bAnyOle ); // update ScGlobal::pDrawClipDocShellRef
+ static SfxObjectShell* SetDrawClipDoc( BOOL bAnyOle ); // update ScGlobal::pDrawClipDocShellRef
virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException );
static const com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
};
diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx
index 1ef2f02d405b..cfa1ac075160 100644
--- a/sc/source/ui/inc/ui_pch.hxx
+++ b/sc/source/ui/inc/ui_pch.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
*
************************************************************************/
-// ItemID-Defines etc. muessen immer ganz vorne stehen
+// ItemID-Defines etc. muessen immer ganz vorne stehen
#include "scitems.hxx"
@@ -34,9 +34,9 @@
#define _PRINTFUN_CXX
#define _INPUTHDL_CXX
-// ab hier automatisch per makepch generiert
-// folgende duerfen nicht aufgenommen werden:
-// scslots.hxx
+// ab hier automatisch per makepch generiert
+// folgende duerfen nicht aufgenommen werden:
+// scslots.hxx
#include <tools/solar.h>
#include <tools/string.hxx>
@@ -184,7 +184,7 @@
#include <scresid.hxx>
#include <sfx2/ipfrm.hxx>
#include <docsh.hxx>
-//REMOVE #include <sfx2/interno.hxx>
+//REMOVE #include <sfx2/interno.hxx>
#include <vcl/wintypes.hxx>
#include <sfx2/docfac.hxx>
#include <scitems.hxx>
diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx
index 770411b63e1b..579f9dfa84db 100644
--- a/sc/source/ui/inc/uiitems.hxx
+++ b/sc/source/ui/inc/uiitems.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,17 +50,17 @@ class ScInputStatusItem : public SfxPoolItem
ScAddress aStartPos;
ScAddress aEndPos;
String aString;
- EditTextObject* pEditData;
+ EditTextObject* pEditData;
public:
TYPEINFO();
-//UNUSED2008-05 ScInputStatusItem( USHORT nWhich,
-//UNUSED2008-05 SCTAB nTab,
-//UNUSED2008-05 SCCOL nCol, SCROW nRow,
-//UNUSED2008-05 SCCOL nStartCol, SCROW nStartRow,
-//UNUSED2008-05 SCCOL nEndCol, SCROW nSEndRow,
-//UNUSED2008-05 const String& rString,
-//UNUSED2008-05 const EditTextObject* pData );
+//UNUSED2008-05 ScInputStatusItem( USHORT nWhich,
+//UNUSED2008-05 SCTAB nTab,
+//UNUSED2008-05 SCCOL nCol, SCROW nRow,
+//UNUSED2008-05 SCCOL nStartCol, SCROW nStartRow,
+//UNUSED2008-05 SCCOL nEndCol, SCROW nSEndRow,
+//UNUSED2008-05 const String& rString,
+//UNUSED2008-05 const EditTextObject* pData );
ScInputStatusItem( USHORT nWhich,
const ScAddress& rCurPos,
@@ -76,27 +76,27 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- const ScAddress& GetPos() const { return aCursorPos; }
+ const ScAddress& GetPos() const { return aCursorPos; }
const ScAddress& GetStartPos() const { return aStartPos; }
- const ScAddress& GetEndPos() const { return aEndPos; }
+ const ScAddress& GetEndPos() const { return aEndPos; }
SCTAB GetTab() const { return aCursorPos.Tab(); }
SCCOL GetCol() const { return aCursorPos.Col(); }
SCROW GetRow() const { return aCursorPos.Row(); }
SCCOL GetStartCol() const { return aStartPos.Col(); }
SCROW GetStartRow() const { return aStartPos.Row(); }
- SCCOL GetEndCol() const { return aEndPos.Col(); }
- SCROW GetEndRow() const { return aEndPos.Row(); }
+ SCCOL GetEndCol() const { return aEndPos.Col(); }
+ SCROW GetEndRow() const { return aEndPos.Row(); }
const String& GetString() const { return aString; }
- const EditTextObject* GetEditData() const { return pEditData; }
+ const EditTextObject* GetEditData() const { return pEditData; }
};
-#define SC_TAB_INSERTED 1
-#define SC_TAB_DELETED 2
-#define SC_TAB_MOVED 3
-#define SC_TAB_COPIED 4
-#define SC_TAB_HIDDEN 5
+#define SC_TAB_INSERTED 1
+#define SC_TAB_DELETED 2
+#define SC_TAB_MOVED 3
+#define SC_TAB_COPIED 4
+#define SC_TAB_HIDDEN 5
class ScTablesHint : public SfxHint
{
@@ -109,15 +109,15 @@ public:
ScTablesHint(USHORT nNewId, SCTAB nTable1, SCTAB nTable2=0);
~ScTablesHint();
- USHORT GetId() const { return nId; }
- SCTAB GetTab1() const { return nTab1; }
- SCTAB GetTab2() const { return nTab2; }
+ USHORT GetId() const { return nId; }
+ SCTAB GetTab1() const { return nTab1; }
+ SCTAB GetTab2() const { return nTab2; }
};
class ScEditViewHint : public SfxHint
{
- ScEditEngineDefaulter* pEditEngine;
- ScAddress aCursorPos;
+ ScEditEngineDefaulter* pEditEngine;
+ ScAddress aCursorPos;
public:
TYPEINFO();
@@ -127,7 +127,7 @@ public:
SCCOL GetCol() const { return aCursorPos.Col(); }
SCROW GetRow() const { return aCursorPos.Row(); }
SCTAB GetTab() const { return aCursorPos.Tab(); }
- ScEditEngineDefaulter* GetEngine() const { return pEditEngine; }
+ ScEditEngineDefaulter* GetEngine() const { return pEditEngine; }
private:
ScEditViewHint(); // disabled
@@ -143,8 +143,8 @@ public:
ScIndexHint(USHORT nNewId, USHORT nIdx);
~ScIndexHint();
- USHORT GetId() const { return nId; }
- USHORT GetIndex() const { return nIndex; }
+ USHORT GetId() const { return nId; }
+ USHORT GetIndex() const { return nIndex; }
};
//----------------------------------------------------------------------------
@@ -154,11 +154,11 @@ class SC_DLLPUBLIC ScSortItem : public SfxPoolItem
{
public:
TYPEINFO();
- ScSortItem( USHORT nWhich,
- ScViewData* ptrViewData,
- const ScSortParam* pSortData );
- ScSortItem( USHORT nWhich,
- const ScSortParam* pSortData );
+ ScSortItem( USHORT nWhich,
+ ScViewData* ptrViewData,
+ const ScSortParam* pSortData );
+ ScSortItem( USHORT nWhich,
+ const ScSortParam* pSortData );
ScSortItem( const ScSortItem& rItem );
~ScSortItem();
@@ -167,12 +167,12 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberUd ) const;
- ScViewData* GetViewData () const { return pViewData; }
- const ScSortParam& GetSortData () const { return theSortData; }
+ ScViewData* GetViewData () const { return pViewData; }
+ const ScSortParam& GetSortData () const { return theSortData; }
private:
- ScViewData* pViewData;
- ScSortParam theSortData;
+ ScViewData* pViewData;
+ ScSortParam theSortData;
};
//----------------------------------------------------------------------------
@@ -182,11 +182,11 @@ class SC_DLLPUBLIC ScQueryItem : public SfxPoolItem
{
public:
TYPEINFO();
- ScQueryItem( USHORT nWhich,
- ScViewData* ptrViewData,
- const ScQueryParam* pQueryData );
- ScQueryItem( USHORT nWhich,
- const ScQueryParam* pQueryData );
+ ScQueryItem( USHORT nWhich,
+ ScViewData* ptrViewData,
+ const ScQueryParam* pQueryData );
+ ScQueryItem( USHORT nWhich,
+ const ScQueryParam* pQueryData );
ScQueryItem( const ScQueryItem& rItem );
~ScQueryItem();
@@ -194,17 +194,17 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- ScViewData* GetViewData () const { return pViewData; }
- const ScQueryParam& GetQueryData() const { return theQueryData; }
+ ScViewData* GetViewData () const { return pViewData; }
+ const ScQueryParam& GetQueryData() const { return theQueryData; }
- BOOL GetAdvancedQuerySource(ScRange& rSource) const;
- void SetAdvancedQuerySource(const ScRange* pSource);
+ BOOL GetAdvancedQuerySource(ScRange& rSource) const;
+ void SetAdvancedQuerySource(const ScRange* pSource);
private:
- ScViewData* pViewData;
- ScQueryParam theQueryData;
- BOOL bIsAdvanced;
- ScRange aAdvSource;
+ ScViewData* pViewData;
+ ScQueryParam theQueryData;
+ BOOL bIsAdvanced;
+ ScRange aAdvSource;
};
//----------------------------------------------------------------------------
@@ -214,12 +214,12 @@ class SC_DLLPUBLIC ScSubTotalItem : public SfxPoolItem
{
public:
TYPEINFO();
- ScSubTotalItem( USHORT nWhich,
- ScViewData* ptrViewData,
- const ScSubTotalParam* pSubTotalData );
- ScSubTotalItem( USHORT nWhich,
- const ScSubTotalParam* pSubTotalData );
- ScSubTotalItem( const ScSubTotalItem& rItem );
+ ScSubTotalItem( USHORT nWhich,
+ ScViewData* ptrViewData,
+ const ScSubTotalParam* pSubTotalData );
+ ScSubTotalItem( USHORT nWhich,
+ const ScSubTotalParam* pSubTotalData );
+ ScSubTotalItem( const ScSubTotalItem& rItem );
~ScSubTotalItem();
virtual String GetValueText() const;
@@ -227,12 +227,12 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberUd ) const;
- ScViewData* GetViewData () const { return pViewData; }
- const ScSubTotalParam& GetSubTotalData() const { return theSubTotalData; }
+ ScViewData* GetViewData () const { return pViewData; }
+ const ScSubTotalParam& GetSubTotalData() const { return theSubTotalData; }
private:
- ScViewData* pViewData;
- ScSubTotalParam theSubTotalData;
+ ScViewData* pViewData;
+ ScSubTotalParam theSubTotalData;
};
//----------------------------------------------------------------------------
@@ -250,11 +250,11 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- void SetUserList ( const ScUserList& rUserList );
- ScUserList* GetUserList () const { return pUserList; }
+ void SetUserList ( const ScUserList& rUserList );
+ ScUserList* GetUserList () const { return pUserList; }
private:
- ScUserList* pUserList;
+ ScUserList* pUserList;
};
//----------------------------------------------------------------------------
@@ -264,9 +264,9 @@ class ScConsolidateItem : public SfxPoolItem
{
public:
TYPEINFO();
- ScConsolidateItem( USHORT nWhich,
+ ScConsolidateItem( USHORT nWhich,
const ScConsolidateParam* pParam );
- ScConsolidateItem( const ScConsolidateItem& rItem );
+ ScConsolidateItem( const ScConsolidateItem& rItem );
~ScConsolidateItem();
virtual String GetValueText() const;
@@ -276,7 +276,7 @@ public:
const ScConsolidateParam& GetData() const { return theConsData; }
private:
- ScConsolidateParam theConsData;
+ ScConsolidateParam theConsData;
};
//----------------------------------------------------------------------------
@@ -288,21 +288,21 @@ public:
TYPEINFO();
ScPivotItem( USHORT nWhich, const ScDPSaveData* pData,
const ScRange* pRange, BOOL bNew );
- ScPivotItem( const ScPivotItem& rItem );
+ ScPivotItem( const ScPivotItem& rItem );
~ScPivotItem();
virtual String GetValueText() const;
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- const ScDPSaveData& GetData() const { return *pSaveData; }
- const ScRange& GetDestRange() const { return aDestRange; }
- BOOL IsNewSheet() const { return bNewSheet; }
+ const ScDPSaveData& GetData() const { return *pSaveData; }
+ const ScRange& GetDestRange() const { return aDestRange; }
+ BOOL IsNewSheet() const { return bNewSheet; }
private:
- ScDPSaveData* pSaveData;
- ScRange aDestRange;
- BOOL bNewSheet;
+ ScDPSaveData* pSaveData;
+ ScRange aDestRange;
+ BOOL bNewSheet;
};
//----------------------------------------------------------------------------
@@ -312,9 +312,9 @@ class ScSolveItem : public SfxPoolItem
{
public:
TYPEINFO();
- ScSolveItem( USHORT nWhich,
+ ScSolveItem( USHORT nWhich,
const ScSolveParam* pParam );
- ScSolveItem( const ScSolveItem& rItem );
+ ScSolveItem( const ScSolveItem& rItem );
~ScSolveItem();
virtual String GetValueText() const;
@@ -324,7 +324,7 @@ public:
const ScSolveParam& GetData() const { return theSolveData; }
private:
- ScSolveParam theSolveData;
+ ScSolveParam theSolveData;
};
//----------------------------------------------------------------------------
@@ -334,9 +334,9 @@ class ScTabOpItem : public SfxPoolItem
{
public:
TYPEINFO();
- ScTabOpItem( USHORT nWhich,
+ ScTabOpItem( USHORT nWhich,
const ScTabOpParam* pParam );
- ScTabOpItem( const ScTabOpItem& rItem );
+ ScTabOpItem( const ScTabOpItem& rItem );
~ScTabOpItem();
virtual String GetValueText() const;
@@ -346,7 +346,7 @@ public:
const ScTabOpParam& GetData() const { return theTabOpData; }
private:
- ScTabOpParam theTabOpData;
+ ScTabOpParam theTabOpData;
};
//----------------------------------------------------------------------------
@@ -357,7 +357,7 @@ class ScCondFrmtItem : public SfxPoolItem
public:
TYPEINFO();
ScCondFrmtItem( USHORT nWhich,
-//! const ScConditionalFormat* pCondFrmt );
+//! const ScConditionalFormat* pCondFrmt );
const ScConditionalFormat& rCondFrmt );
ScCondFrmtItem( const ScCondFrmtItem& rItem );
~ScCondFrmtItem();
@@ -366,10 +366,10 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- const ScConditionalFormat& GetData() const { return theCondFrmtData; }
+ const ScConditionalFormat& GetData() const { return theCondFrmtData; }
private:
- ScConditionalFormat theCondFrmtData;
+ ScConditionalFormat theCondFrmtData;
};
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index 6f2bb3572832..4bb22d42f54e 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,21 +45,21 @@ class ScSimpleUndo: public SfxUndoAction
public:
TYPEINFO();
ScSimpleUndo( ScDocShell* pDocSh );
- virtual ~ScSimpleUndo();
+ virtual ~ScSimpleUndo();
- virtual BOOL Merge( SfxUndoAction *pNextAction );
+ virtual BOOL Merge( SfxUndoAction *pNextAction );
protected:
- ScDocShell* pDocShell;
- SfxUndoAction* pDetectiveUndo;
+ ScDocShell* pDocShell;
+ SfxUndoAction* pDetectiveUndo;
- void BeginUndo();
- void EndUndo();
- void BeginRedo();
- void EndRedo();
+ void BeginUndo();
+ void EndUndo();
+ void BeginRedo();
+ void EndRedo();
- static void ShowTable( SCTAB nTab );
- static void ShowTable( const ScRange& rRange );
+ static void ShowTable( SCTAB nTab );
+ static void ShowTable( const ScRange& rRange );
};
//----------------------------------------------------------------------------
@@ -72,20 +72,20 @@ public:
TYPEINFO();
ScBlockUndo( ScDocShell* pDocSh, const ScRange& rRange,
ScBlockUndoMode eBlockMode );
- virtual ~ScBlockUndo();
+ virtual ~ScBlockUndo();
protected:
- ScRange aBlockRange;
- SdrUndoAction* pDrawUndo;
- ScBlockUndoMode eMode;
+ ScRange aBlockRange;
+ SdrUndoAction* pDrawUndo;
+ ScBlockUndoMode eMode;
- void BeginUndo();
- void EndUndo();
-// void BeginRedo();
- void EndRedo();
+ void BeginUndo();
+ void EndUndo();
+// void BeginRedo();
+ void EndRedo();
- BOOL AdjustHeight();
- void ShowBlock();
+ BOOL AdjustHeight();
+ void ShowBlock();
};
//----------------------------------------------------------------------------
@@ -116,28 +116,28 @@ public:
enum ScMoveUndoMode { SC_UNDO_REFFIRST, SC_UNDO_REFLAST };
-class ScMoveUndo: public ScSimpleUndo // mit Referenzen
+class ScMoveUndo: public ScSimpleUndo // mit Referenzen
{
public:
TYPEINFO();
ScMoveUndo( ScDocShell* pDocSh,
ScDocument* pRefDoc, ScRefUndoData* pRefData,
ScMoveUndoMode eRefMode );
- virtual ~ScMoveUndo();
+ virtual ~ScMoveUndo();
protected:
- SdrUndoAction* pDrawUndo;
- ScDocument* pRefUndoDoc;
- ScRefUndoData* pRefUndoData;
- ScMoveUndoMode eMode;
+ SdrUndoAction* pDrawUndo;
+ ScDocument* pRefUndoDoc;
+ ScRefUndoData* pRefUndoData;
+ ScMoveUndoMode eMode;
- void BeginUndo();
- void EndUndo();
-// void BeginRedo();
-// void EndRedo();
+ void BeginUndo();
+ void EndUndo();
+// void BeginRedo();
+// void EndRedo();
private:
- void UndoRef();
+ void UndoRef();
};
//----------------------------------------------------------------------------
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index 574926ecbf52..350a4162057d 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,29 +55,29 @@ public:
const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios,
InsCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData,
BOOL bNewPartOfPaste );
- virtual ~ScUndoInsertCells();
+ virtual ~ScUndoInsertCells();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat( SfxRepeatTarget& rTarget );
- virtual BOOL CanRepeat( SfxRepeatTarget& rTarget ) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat( SfxRepeatTarget& rTarget );
+ virtual BOOL CanRepeat( SfxRepeatTarget& rTarget ) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
- virtual BOOL Merge( SfxUndoAction *pNextAction );
+ virtual BOOL Merge( SfxUndoAction *pNextAction );
private:
- ScRange aEffRange;
+ ScRange aEffRange;
SCTAB nCount;
SCTAB* pTabs;
SCTAB* pScenarios;
- ULONG nEndChangeAction;
- InsCellCmd eCmd;
- BOOL bPartOfPaste;
- SfxUndoAction* pPasteUndo;
+ ULONG nEndChangeAction;
+ InsCellCmd eCmd;
+ BOOL bPartOfPaste;
+ SfxUndoAction* pPasteUndo;
- void DoChange ( const BOOL bUndo );
- void SetChangeTrack();
+ void DoChange ( const BOOL bUndo );
+ void SetChangeTrack();
};
@@ -86,28 +86,28 @@ class ScUndoDeleteCells: public ScMoveUndo
public:
TYPEINFO();
ScUndoDeleteCells( ScDocShell* pNewDocShell,
- const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios,
+ const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios,
DelCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData );
- virtual ~ScUndoDeleteCells();
+ virtual ~ScUndoDeleteCells();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScRange aEffRange;
+ ScRange aEffRange;
SCTAB nCount;
SCTAB* pTabs;
SCTAB* pScenarios;
- ULONG nStartChangeAction;
- ULONG nEndChangeAction;
- DelCellCmd eCmd;
+ ULONG nStartChangeAction;
+ ULONG nEndChangeAction;
+ DelCellCmd eCmd;
- void DoChange ( const BOOL bUndo );
- void SetChangeTrack();
+ void DoChange ( const BOOL bUndo );
+ void SetChangeTrack();
};
@@ -119,26 +119,26 @@ public:
BOOL bNewRows, BOOL bNeedsRefresh, SCTAB nNewTab,
const SCCOLROW* pRng, SCCOLROW nRngCnt,
ScDocument* pUndoDocument, ScRefUndoData* pRefData );
- virtual ~ScUndoDeleteMulti();
+ virtual ~ScUndoDeleteMulti();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- BOOL bRows;
+ BOOL bRows;
BOOL bRefresh;
- SCTAB nTab;
- SCCOLROW* pRanges;
- SCCOLROW nRangeCnt;
- ULONG nStartChangeAction;
- ULONG nEndChangeAction;
+ SCTAB nTab;
+ SCCOLROW* pRanges;
+ SCCOLROW nRangeCnt;
+ ULONG nStartChangeAction;
+ ULONG nEndChangeAction;
- void DoChange() const;
- void SetChangeTrack();
+ void DoChange() const;
+ void SetChangeTrack();
};
@@ -151,24 +151,24 @@ public:
ScAddress aOldEnd, // end position without adjustment
const ScMarkData& rMark, // selected sheets
ScDocument* pNewUndoDoc );
- virtual ~ScUndoCut();
+ virtual ~ScUndoCut();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
ScMarkData aMarkData;
- ScDocument* pUndoDoc;
- ScRange aExtendedRange;
- ULONG nStartChangeAction;
- ULONG nEndChangeAction;
+ ScDocument* pUndoDoc;
+ ScRange aExtendedRange;
+ ULONG nStartChangeAction;
+ ULONG nEndChangeAction;
- void DoChange( const BOOL bUndo );
- void SetChangeTrack();
+ void DoChange( const BOOL bUndo );
+ void SetChangeTrack();
};
@@ -202,29 +202,29 @@ public:
ScRefUndoData* pRefData, void* pFill1, void* pFill2, void* pFill3,
BOOL bRedoIsFilled = TRUE,
const ScUndoPasteOptions* pOptions = NULL );
- virtual ~ScUndoPaste();
+ virtual ~ScUndoPaste();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScMarkData aMarkData;
- ScDocument* pUndoDoc;
- ScDocument* pRedoDoc;
- USHORT nFlags;
- ScRefUndoData* pRefUndoData;
- ScRefUndoData* pRefRedoData;
- ULONG nStartChangeAction;
- ULONG nEndChangeAction;
- BOOL bRedoFilled;
+ ScMarkData aMarkData;
+ ScDocument* pUndoDoc;
+ ScDocument* pRedoDoc;
+ USHORT nFlags;
+ ScRefUndoData* pRefUndoData;
+ ScRefUndoData* pRefRedoData;
+ ULONG nStartChangeAction;
+ ULONG nEndChangeAction;
+ BOOL bRedoFilled;
ScUndoPasteOptions aPasteOptions;
- void DoChange( const BOOL bUndo );
- void SetChangeTrack();
+ void DoChange( const BOOL bUndo );
+ void SetChangeTrack();
};
@@ -236,27 +236,27 @@ public:
const ScRange& rRange, ScAddress aNewDestPos, BOOL bNewCut,
ScDocument* pUndoDocument, ScRefUndoData* pRefData,
BOOL bScenario );
- virtual ~ScUndoDragDrop();
+ virtual ~ScUndoDragDrop();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScRange aSrcRange;
- ScRange aDestRange;
- ULONG nStartChangeAction;
- ULONG nEndChangeAction;
- BOOL bCut;
- BOOL bKeepScenarioFlags;
+ ScRange aSrcRange;
+ ScRange aDestRange;
+ ULONG nStartChangeAction;
+ ULONG nEndChangeAction;
+ BOOL bCut;
+ BOOL bKeepScenarioFlags;
- void PaintArea( ScRange aRange, USHORT nExtFlags ) const;
- void DoUndo( ScRange aRange ) const;
+ void PaintArea( ScRange aRange, USHORT nExtFlags ) const;
+ void DoUndo( ScRange aRange ) const;
- void SetChangeTrack();
+ void SetChangeTrack();
};
@@ -269,27 +269,27 @@ public:
const ScRange& rRange,
ScDocument* pNewUndoDoc, BOOL bNewMulti,
USHORT nNewFlags, BOOL bObjects );
- virtual ~ScUndoDeleteContents();
+ virtual ~ScUndoDeleteContents();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScRange aRange;
- ScMarkData aMarkData;
- ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten
- SdrUndoAction* pDrawUndo; // geloeschte Objekte
- ULONG nStartChangeAction;
- ULONG nEndChangeAction;
- USHORT nFlags;
- BOOL bMulti; // Mehrfachselektion
+ ScRange aRange;
+ ScMarkData aMarkData;
+ ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten
+ SdrUndoAction* pDrawUndo; // geloeschte Objekte
+ ULONG nStartChangeAction;
+ ULONG nEndChangeAction;
+ USHORT nFlags;
+ BOOL bMulti; // Mehrfachselektion
- void DoChange( const BOOL bUndo );
- void SetChangeTrack();
+ void DoChange( const BOOL bUndo );
+ void SetChangeTrack();
};
@@ -303,30 +303,30 @@ public:
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
ScDocument* pNewUndoDoc, BOOL bNewMulti, SCTAB nSrc,
USHORT nFlg, USHORT nFunc, BOOL bSkip, BOOL bLink );
- virtual ~ScUndoFillTable();
+ virtual ~ScUndoFillTable();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScRange aRange;
- ScMarkData aMarkData;
- ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten
- ULONG nStartChangeAction;
- ULONG nEndChangeAction;
- USHORT nFlags;
- USHORT nFunction;
- SCTAB nSrcTab;
- BOOL bMulti; // Mehrfachselektion
- BOOL bSkipEmpty;
- BOOL bAsLink;
+ ScRange aRange;
+ ScMarkData aMarkData;
+ ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten
+ ULONG nStartChangeAction;
+ ULONG nEndChangeAction;
+ USHORT nFlags;
+ USHORT nFunction;
+ SCTAB nSrcTab;
+ BOOL bMulti; // Mehrfachselektion
+ BOOL bSkipEmpty;
+ BOOL bAsLink;
- void DoChange( const BOOL bUndo );
- void SetChangeTrack();
+ void DoChange( const BOOL bUndo );
+ void SetChangeTrack();
};
@@ -342,25 +342,25 @@ public:
const ScPatternAttr* pNewApply,
const SvxBoxItem* pNewOuter = NULL,
const SvxBoxInfoItem* pNewInner = NULL );
- virtual ~ScUndoSelectionAttr();
+ virtual ~ScUndoSelectionAttr();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScMarkData aMarkData;
- ScRange aRange;
- ScDocument* pUndoDoc;
- BOOL bMulti;
- ScPatternAttr* pApplyPattern;
- SvxBoxItem* pLineOuter;
- SvxBoxInfoItem* pLineInner;
+ ScMarkData aMarkData;
+ ScRange aRange;
+ ScDocument* pUndoDoc;
+ BOOL bMulti;
+ ScPatternAttr* pApplyPattern;
+ SvxBoxItem* pLineOuter;
+ SvxBoxInfoItem* pLineInner;
- void DoChange( const BOOL bUndo );
+ void DoChange( const BOOL bUndo );
};
@@ -377,29 +377,29 @@ public:
ScOutlineTable* pNewUndoTab,
ScSizeMode eNewMode, USHORT nNewSizeTwips,
BOOL bNewWidth );
- virtual ~ScUndoWidthOrHeight();
+ virtual ~ScUndoWidthOrHeight();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
virtual String GetComment() const;
private:
- ScMarkData aMarkData;
- SCCOLROW nStart;
- SCCOLROW nEnd;
- SCTAB nStartTab;
- SCTAB nEndTab;
- ScDocument* pUndoDoc;
- ScOutlineTable* pUndoTab;
- SCCOLROW nRangeCnt;
- SCCOLROW* pRanges;
- USHORT nNewSize;
- BOOL bWidth;
- ScSizeMode eMode;
- SdrUndoAction* pDrawUndo;
+ ScMarkData aMarkData;
+ SCCOLROW nStart;
+ SCCOLROW nEnd;
+ SCTAB nStartTab;
+ SCTAB nEndTab;
+ ScDocument* pUndoDoc;
+ ScOutlineTable* pUndoTab;
+ SCCOLROW nRangeCnt;
+ SCCOLROW* pRanges;
+ USHORT nNewSize;
+ BOOL bWidth;
+ ScSizeMode eMode;
+ SdrUndoAction* pDrawUndo;
};
@@ -414,30 +414,30 @@ public:
FillCmd eNewFillCmd, FillDateCmd eNewFillDateCmd,
double fNewStartValue, double fNewStepValue, double fNewMaxValue,
USHORT nMaxShIndex );
- virtual ~ScUndoAutoFill();
+ virtual ~ScUndoAutoFill();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScRange aSource;
- ScMarkData aMarkData;
- ScDocument* pUndoDoc;
- FillDir eFillDir;
- FillCmd eFillCmd;
- FillDateCmd eFillDateCmd;
- double fStartValue;
- double fStepValue;
- double fMaxValue;
- ULONG nStartChangeAction;
- ULONG nEndChangeAction;
- USHORT nMaxSharedIndex;
+ ScRange aSource;
+ ScMarkData aMarkData;
+ ScDocument* pUndoDoc;
+ FillDir eFillDir;
+ FillCmd eFillCmd;
+ FillDateCmd eFillDateCmd;
+ double fStartValue;
+ double fStepValue;
+ double fMaxValue;
+ ULONG nStartChangeAction;
+ ULONG nEndChangeAction;
+ USHORT nMaxSharedIndex;
- void SetChangeTrack();
+ void SetChangeTrack();
};
@@ -449,22 +449,22 @@ public:
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo );
- virtual ~ScUndoMerge();
+ virtual ~ScUndoMerge();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
ScRange maRange;
bool mbMergeContents; // Merge contents in Redo().
- ScDocument* mpUndoDoc; // wenn Daten zusammengefasst
+ ScDocument* mpUndoDoc; // wenn Daten zusammengefasst
SdrUndoAction* mpDrawUndo;
- void DoChange( bool bUndo ) const;
+ void DoChange( bool bUndo ) const;
};
@@ -476,20 +476,20 @@ public:
const ScRange& rRange, ScDocument* pNewUndoDoc,
const ScMarkData& rMark,
BOOL bNewSize, USHORT nNewFormatNo );
- virtual ~ScUndoAutoFormat();
+ virtual ~ScUndoAutoFormat();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScDocument* pUndoDoc; // geloeschte Daten
- ScMarkData aMarkData;
- BOOL bSize;
- USHORT nFormatNo;
+ ScDocument* pUndoDoc; // geloeschte Daten
+ ScMarkData aMarkData;
+ BOOL bSize;
+ USHORT nFormatNo;
};
@@ -502,25 +502,25 @@ public:
SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
const String& rNewUndoStr, ScDocument* pNewUndoDoc,
const SvxSearchItem* pItem );
- virtual ~ScUndoReplace();
+ virtual ~ScUndoReplace();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScAddress aCursorPos;
- ScMarkData aMarkData;
- String aUndoStr; // Daten bei Einfachmarkierung
- ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten
- SvxSearchItem* pSearchItem;
- ULONG nStartChangeAction;
- ULONG nEndChangeAction;
+ ScAddress aCursorPos;
+ ScMarkData aMarkData;
+ String aUndoStr; // Daten bei Einfachmarkierung
+ ScDocument* pUndoDoc; // Blockmarkierung und geloeschte Daten
+ SvxSearchItem* pSearchItem;
+ ULONG nStartChangeAction;
+ ULONG nEndChangeAction;
- void SetChangeTrack();
+ void SetChangeTrack();
};
@@ -537,23 +537,23 @@ public:
const ScRefAddress& rRowCell,
const ScRefAddress& rColCell,
BYTE nMode );
- virtual ~ScUndoTabOp();
+ virtual ~ScUndoTabOp();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScRange aRange;
- ScDocument* pUndoDoc; // geloeschte Daten
- ScRefAddress theFormulaCell;
- ScRefAddress theFormulaEnd;
- ScRefAddress theRowCell;
- ScRefAddress theColCell;
- BYTE nMode;
+ ScRange aRange;
+ ScDocument* pUndoDoc; // geloeschte Daten
+ ScRefAddress theFormulaCell;
+ ScRefAddress theFormulaEnd;
+ ScRefAddress theRowCell;
+ ScRefAddress theColCell;
+ BYTE nMode;
};
@@ -627,20 +627,20 @@ public:
ScUndoListNames( ScDocShell* pNewDocShell,
const ScRange& rRange,
ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc );
- virtual ~ScUndoListNames();
+ virtual ~ScUndoListNames();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScDocument* pUndoDoc;
- ScDocument* pRedoDoc;
+ ScDocument* pUndoDoc;
+ ScDocument* pRedoDoc;
- void DoChange( ScDocument* pSrcDoc ) const;
+ void DoChange( ScDocument* pSrcDoc ) const;
};
@@ -652,20 +652,20 @@ public:
const ScMarkData& rMark,
const ScArea& rDestArea, ScDocument* pNewUndoDoc,
const String& rNewName );
- virtual ~ScUndoUseScenario();
+ virtual ~ScUndoUseScenario();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
virtual String GetComment() const;
private:
- ScDocument* pUndoDoc;
- ScRange aRange;
- ScMarkData aMarkData;
- String aName;
+ ScDocument* pUndoDoc;
+ ScRange aRange;
+ ScMarkData aMarkData;
+ String aName;
};
@@ -678,23 +678,23 @@ public:
const ScRange& rRange,
const String& rName,
ScDocument* pNewUndoDoc );
- virtual ~ScUndoSelectionStyle();
+ virtual ~ScUndoSelectionStyle();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
- virtual USHORT GetId() const;
+ virtual String GetComment() const;
+ virtual USHORT GetId() const;
private:
- ScMarkData aMarkData;
- ScDocument* pUndoDoc;
- String aStyleName;
- ScRange aRange;
+ ScMarkData aMarkData;
+ ScDocument* pUndoDoc;
+ String aStyleName;
+ ScRange aRange;
- void DoChange( const BOOL bUndo );
+ void DoChange( const BOOL bUndo );
};
@@ -704,18 +704,18 @@ public:
TYPEINFO();
ScUndoRefreshLink( ScDocShell* pNewDocShell,
ScDocument* pNewUndoDoc );
- virtual ~ScUndoRefreshLink();
+ virtual ~ScUndoRefreshLink();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScDocument* pUndoDoc;
- ScDocument* pRedoDoc;
+ ScDocument* pUndoDoc;
+ ScDocument* pRedoDoc;
};
@@ -727,23 +727,23 @@ public:
const ScRange& rArea,
ScDocument* pNewUndoDoc,
const String& rForm );
- virtual ~ScUndoEnterMatrix();
+ virtual ~ScUndoEnterMatrix();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScDocument* pUndoDoc;
- String aFormula;
+ ScDocument* pUndoDoc;
+ String aFormula;
formula::FormulaGrammar::AddressConvention eConv;
- ULONG nStartChangeAction;
- ULONG nEndChangeAction;
+ ULONG nStartChangeAction;
+ ULONG nEndChangeAction;
- void SetChangeTrack();
+ void SetChangeTrack();
};
@@ -756,22 +756,22 @@ public:
const String& rFlt, const String& rOpt,
const String& rArea, const ScRange& rDestRange,
ULONG nRefreshDelay );
- virtual ~ScUndoInsertAreaLink();
+ virtual ~ScUndoInsertAreaLink();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- String aDocName;
- String aFltName;
- String aOptions;
- String aAreaName;
- ScRange aRange;
- ULONG nRefreshDelay;
+ String aDocName;
+ String aFltName;
+ String aOptions;
+ String aAreaName;
+ ScRange aRange;
+ ULONG nRefreshDelay;
};
@@ -784,26 +784,26 @@ public:
const String& rFlt, const String& rOpt,
const String& rArea, const ScRange& rDestRange,
ULONG nRefreshDelay );
- virtual ~ScUndoRemoveAreaLink();
+ virtual ~ScUndoRemoveAreaLink();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- String aDocName;
- String aFltName;
- String aOptions;
- String aAreaName;
- ScRange aRange;
- ULONG nRefreshDelay;
+ String aDocName;
+ String aFltName;
+ String aOptions;
+ String aAreaName;
+ ScRange aRange;
+ ULONG nRefreshDelay;
};
-class ScUndoUpdateAreaLink : public ScSimpleUndo //! auch BlockUndo umstellen?
+class ScUndoUpdateAreaLink : public ScSimpleUndo //! auch BlockUndo umstellen?
{
public:
TYPEINFO();
@@ -818,33 +818,33 @@ public:
ULONG nNewRD,
ScDocument* pUndo, ScDocument* pRedo,
BOOL bDoInsert );
- virtual ~ScUndoUpdateAreaLink();
+ virtual ~ScUndoUpdateAreaLink();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- String aOldDoc;
- String aOldFlt;
- String aOldOpt;
- String aOldArea;
- ScRange aOldRange;
- String aNewDoc;
- String aNewFlt;
- String aNewOpt;
- String aNewArea;
- ScRange aNewRange;
- ScDocument* pUndoDoc;
- ScDocument* pRedoDoc;
- ULONG nOldRefresh;
- ULONG nNewRefresh;
- BOOL bWithInsert;
-
- void DoChange( const BOOL bUndo ) const;
+ String aOldDoc;
+ String aOldFlt;
+ String aOldOpt;
+ String aOldArea;
+ ScRange aOldRange;
+ String aNewDoc;
+ String aNewFlt;
+ String aNewOpt;
+ String aNewArea;
+ ScRange aNewRange;
+ ScDocument* pUndoDoc;
+ ScDocument* pRedoDoc;
+ ULONG nOldRefresh;
+ ULONG nNewRefresh;
+ BOOL bWithInsert;
+
+ void DoChange( const BOOL bUndo ) const;
};
@@ -854,19 +854,19 @@ public:
TYPEINFO();
ScUndoIndent( ScDocShell* pNewDocShell, const ScMarkData& rMark,
ScDocument* pNewUndoDoc, BOOL bIncrement );
- virtual ~ScUndoIndent();
+ virtual ~ScUndoIndent();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScMarkData aMarkData;
- ScDocument* pUndoDoc;
- BOOL bIsIncrement;
+ ScMarkData aMarkData;
+ ScDocument* pUndoDoc;
+ BOOL bIsIncrement;
};
@@ -876,19 +876,19 @@ public:
TYPEINFO();
ScUndoTransliterate( ScDocShell* pNewDocShell, const ScMarkData& rMark,
ScDocument* pNewUndoDoc, sal_Int32 nType );
- virtual ~ScUndoTransliterate();
+ virtual ~ScUndoTransliterate();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScMarkData aMarkData;
- ScDocument* pUndoDoc;
- sal_Int32 nTransliterationType;
+ ScMarkData aMarkData;
+ ScDocument* pUndoDoc;
+ sal_Int32 nTransliterationType;
};
@@ -898,19 +898,19 @@ public:
TYPEINFO();
ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData& rMark,
ScDocument* pNewUndoDoc, const USHORT* pW );
- virtual ~ScUndoClearItems();
+ virtual ~ScUndoClearItems();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScMarkData aMarkData;
- ScDocument* pUndoDoc;
- USHORT* pWhich;
+ ScMarkData aMarkData;
+ ScDocument* pUndoDoc;
+ USHORT* pWhich;
};
@@ -920,18 +920,18 @@ public:
TYPEINFO();
ScUndoRemoveBreaks( ScDocShell* pNewDocShell,
SCTAB nNewTab, ScDocument* pNewUndoDoc );
- virtual ~ScUndoRemoveBreaks();
+ virtual ~ScUndoRemoveBreaks();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SCTAB nTab;
- ScDocument* pUndoDoc;
+ SCTAB nTab;
+ ScDocument* pUndoDoc;
};
@@ -942,17 +942,17 @@ public:
ScUndoRemoveMerge( ScDocShell* pNewDocShell,
const ScRange& rArea,
ScDocument* pNewUndoDoc );
- virtual ~ScUndoRemoveMerge();
+ virtual ~ScUndoRemoveMerge();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScDocument* pUndoDoc;
+ ScDocument* pUndoDoc;
};
@@ -965,20 +965,20 @@ public:
ScDocument* pNewUndoDoc,
const SvxBoxItem& rNewOuter,
const SvxBoxInfoItem& rNewInner );
- virtual ~ScUndoBorder();
+ virtual ~ScUndoBorder();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScDocument* pUndoDoc;
- ScRangeList* pRanges;
- SvxBoxItem* pOuter;
- SvxBoxInfoItem* pInner;
+ ScDocument* pUndoDoc;
+ ScRangeList* pRanges;
+ SvxBoxItem* pOuter;
+ SvxBoxInfoItem* pInner;
};
diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx
index 53f129166d10..8bded7d830f5 100644
--- a/sc/source/ui/inc/undocell.hxx
+++ b/sc/source/ui/inc/undocell.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ public:
SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
const ScPatternAttr* pOldPat, const ScPatternAttr* pNewPat,
const ScPatternAttr* pApplyPat, BOOL bAutomatic );
- virtual ~ScUndoCursorAttr();
+ virtual ~ScUndoCursorAttr();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SCCOL nCol;
- SCROW nRow;
- SCTAB nTab;
- ScPatternAttr* pOldPattern;
- ScPatternAttr* pNewPattern;
- ScPatternAttr* pApplyPattern;
- BOOL bIsAutomatic;
-
- void DoChange( const ScPatternAttr* pWhichPattern ) const;
+ SCCOL nCol;
+ SCROW nRow;
+ SCTAB nTab;
+ ScPatternAttr* pOldPattern;
+ ScPatternAttr* pNewPattern;
+ ScPatternAttr* pApplyPattern;
+ BOOL bIsAutomatic;
+
+ void DoChange( const ScPatternAttr* pWhichPattern ) const;
};
@@ -81,30 +81,30 @@ public:
SCTAB nNewCount, SCTAB* pNewTabs,
ScBaseCell** ppOldData, BOOL* pHasForm, ULONG* pOldForm,
const String& rNewStr, EditTextObject* pObj = NULL );
- virtual ~ScUndoEnterData();
+ virtual ~ScUndoEnterData();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- String aNewString;
- SCTAB* pTabs;
- ScBaseCell** ppOldCells;
- BOOL* pHasFormat;
- ULONG* pOldFormats;
- EditTextObject* pNewEditData;
- ULONG nEndChangeAction;
- SCCOL nCol;
- SCROW nRow;
- SCTAB nTab;
- SCTAB nCount; // markierte Tabellen
-
- void DoChange() const;
- void SetChangeTrack();
+ String aNewString;
+ SCTAB* pTabs;
+ ScBaseCell** ppOldCells;
+ BOOL* pHasFormat;
+ ULONG* pOldFormats;
+ EditTextObject* pNewEditData;
+ ULONG nEndChangeAction;
+ SCCOL nCol;
+ SCROW nRow;
+ SCTAB nTab;
+ SCTAB nCount; // markierte Tabellen
+
+ void DoChange() const;
+ void SetChangeTrack();
};
@@ -115,23 +115,23 @@ public:
ScUndoEnterValue( ScDocShell* pNewDocShell,
const ScAddress& rNewPos,
ScBaseCell* pUndoCell, double nVal, BOOL bHeight );
- virtual ~ScUndoEnterValue();
+ virtual ~ScUndoEnterValue();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScAddress aPos;
- ScBaseCell* pOldCell;
- double nValue;
- ULONG nEndChangeAction;
- BOOL bNeedHeight;
+ ScAddress aPos;
+ ScBaseCell* pOldCell;
+ double nValue;
+ ULONG nEndChangeAction;
+ BOOL bNeedHeight;
- void SetChangeTrack();
+ void SetChangeTrack();
};
@@ -142,23 +142,23 @@ public:
ScUndoPutCell( ScDocShell* pNewDocShell,
const ScAddress& rNewPos,
ScBaseCell* pUndoCell, ScBaseCell* pRedoCell, BOOL bHeight );
- virtual ~ScUndoPutCell();
+ virtual ~ScUndoPutCell();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScAddress aPos;
- ScBaseCell* pOldCell;
- ScBaseCell* pEnteredCell;
- ULONG nEndChangeAction;
- BOOL bNeedHeight;
+ ScAddress aPos;
+ ScBaseCell* pOldCell;
+ ScBaseCell* pEnteredCell;
+ ULONG nEndChangeAction;
+ BOOL bNeedHeight;
- void SetChangeTrack();
+ void SetChangeTrack();
};
@@ -169,23 +169,23 @@ public:
ScUndoPageBreak( ScDocShell* pNewDocShell,
SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
BOOL bNewColumn, BOOL bNewInsert );
- virtual ~ScUndoPageBreak();
+ virtual ~ScUndoPageBreak();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SCCOL nCol;
- SCROW nRow;
- SCTAB nTab;
- BOOL bColumn; // Spalten- oder Zeilenumbruch
- BOOL bInsert; // Einfuegen oder Loeschen
+ SCCOL nCol;
+ SCROW nRow;
+ SCTAB nTab;
+ BOOL bColumn; // Spalten- oder Zeilenumbruch
+ BOOL bInsert; // Einfuegen oder Loeschen
- void DoChange( BOOL bInsert ) const;
+ void DoChange( BOOL bInsert ) const;
};
class ScUndoPrintZoom: public ScSimpleUndo
@@ -194,23 +194,23 @@ public:
TYPEINFO();
ScUndoPrintZoom( ScDocShell* pNewDocShell, SCTAB nT,
USHORT nOS, USHORT nOP, USHORT nNS, USHORT nNP );
- virtual ~ScUndoPrintZoom();
+ virtual ~ScUndoPrintZoom();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SCTAB nTab;
- USHORT nOldScale;
- USHORT nOldPages;
- USHORT nNewScale;
- USHORT nNewPages;
+ SCTAB nTab;
+ USHORT nOldScale;
+ USHORT nOldPages;
+ USHORT nNewScale;
+ USHORT nNewPages;
- void DoChange( BOOL bUndo );
+ void DoChange( BOOL bUndo );
};
class ScUndoThesaurus: public ScSimpleUndo
@@ -221,28 +221,28 @@ public:
SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab,
const String& rNewUndoStr, const EditTextObject* pUndoTObj,
const String& rNewRedoStr, const EditTextObject* pRedoTObj);
- virtual ~ScUndoThesaurus();
+ virtual ~ScUndoThesaurus();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SCCOL nCol;
- SCROW nRow;
- SCTAB nTab;
- String aUndoStr; // Daten bei StringZelle
- EditTextObject* pUndoTObject; // bei EditZelle
- String aRedoStr;
+ SCCOL nCol;
+ SCROW nRow;
+ SCTAB nTab;
+ String aUndoStr; // Daten bei StringZelle
+ EditTextObject* pUndoTObject; // bei EditZelle
+ String aRedoStr;
EditTextObject* pRedoTObject;
- ULONG nEndChangeAction;
+ ULONG nEndChangeAction;
- void DoChange( BOOL bUndo, const String& rStr,
+ void DoChange( BOOL bUndo, const String& rStr,
const EditTextObject* pTObj );
- void SetChangeTrack( ScBaseCell* pOldCell );
+ void SetChangeTrack( ScBaseCell* pOldCell );
};
// ============================================================================
@@ -297,18 +297,18 @@ class ScUndoShowHideNote : public ScSimpleUndo
public:
TYPEINFO();
ScUndoShowHideNote( ScDocShell& rDocShell, const ScAddress& rPos, bool bShow );
- virtual ~ScUndoShowHideNote();
+ virtual ~ScUndoShowHideNote();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat( SfxRepeatTarget& rTarget );
- virtual BOOL CanRepeat( SfxRepeatTarget& rTarget ) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat( SfxRepeatTarget& rTarget );
+ virtual BOOL CanRepeat( SfxRepeatTarget& rTarget ) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScAddress maPos;
- bool mbShown;
+ ScAddress maPos;
+ bool mbShown;
};
// ============================================================================
@@ -320,21 +320,21 @@ public:
ScUndoDetective( ScDocShell* pNewDocShell,
SdrUndoAction* pDraw, const ScDetOpData* pOperation,
ScDetOpList* pUndoList = NULL );
- virtual ~ScUndoDetective();
+ virtual ~ScUndoDetective();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- BOOL bIsDelete;
- ScDetOpList* pOldList;
- USHORT nAction;
- ScAddress aPos;
- SdrUndoAction* pDrawUndo;
+ BOOL bIsDelete;
+ ScDetOpList* pOldList;
+ USHORT nAction;
+ ScAddress aPos;
+ SdrUndoAction* pDrawUndo;
};
@@ -344,20 +344,20 @@ public:
TYPEINFO();
ScUndoRangeNames( ScDocShell* pNewDocShell,
ScRangeName* pOld, ScRangeName* pNew );
- virtual ~ScUndoRangeNames();
+ virtual ~ScUndoRangeNames();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScRangeName* pOldRanges;
- ScRangeName* pNewRanges;
+ ScRangeName* pOldRanges;
+ ScRangeName* pNewRanges;
- void DoChange( BOOL bUndo );
+ void DoChange( BOOL bUndo );
};
diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx
index a2fcd392e9b4..81da22ed972d 100644
--- a/sc/source/ui/inc/undodat.hxx
+++ b/sc/source/ui/inc/undodat.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
#define SC_UNDODAT_HXX
#include "undobase.hxx"
-#include "rangeutl.hxx" // ScArea
-#include "rangelst.hxx" // ScRangeListRef
+#include "rangeutl.hxx" // ScArea
+#include "rangelst.hxx" // ScRangeListRef
#include "markdata.hxx"
#include "sortparam.hxx"
#include "queryparam.hxx"
@@ -55,24 +55,24 @@ public:
SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab,
ScDocument* pNewUndoDoc, BOOL bNewColumns,
USHORT nNewLevel, USHORT nNewEntry, BOOL bNewShow );
- virtual ~ScUndoDoOutline();
+ virtual ~ScUndoDoOutline();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SCCOLROW nStart;
- SCCOLROW nEnd;
- SCTAB nTab;
- ScDocument* pUndoDoc;
- BOOL bColumns;
- USHORT nLevel;
- USHORT nEntry;
- BOOL bShow;
+ SCCOLROW nStart;
+ SCCOLROW nEnd;
+ SCTAB nTab;
+ ScDocument* pUndoDoc;
+ BOOL bColumns;
+ USHORT nLevel;
+ USHORT nEntry;
+ BOOL bShow;
};
@@ -85,21 +85,21 @@ public:
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
ScOutlineTable* pNewUndoTab,
BOOL bNewColumns, BOOL bNewMake );
- virtual ~ScUndoMakeOutline();
+ virtual ~ScUndoMakeOutline();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScAddress aBlockStart;
- ScAddress aBlockEnd;
- ScOutlineTable* pUndoTable;
- BOOL bColumns;
- BOOL bMake;
+ ScAddress aBlockStart;
+ ScAddress aBlockEnd;
+ ScOutlineTable* pUndoTable;
+ BOOL bColumns;
+ BOOL bMake;
};
@@ -111,23 +111,23 @@ public:
SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab,
ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
BOOL bNewColumns, USHORT nNewLevel );
- virtual ~ScUndoOutlineLevel();
+ virtual ~ScUndoOutlineLevel();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SCCOLROW nStart;
- SCCOLROW nEnd;
- SCTAB nTab;
- ScDocument* pUndoDoc;
- ScOutlineTable* pUndoTable;
- BOOL bColumns;
- USHORT nLevel;
+ SCCOLROW nStart;
+ SCCOLROW nEnd;
+ SCTAB nTab;
+ ScDocument* pUndoDoc;
+ ScOutlineTable* pUndoTable;
+ BOOL bColumns;
+ USHORT nLevel;
};
@@ -140,21 +140,21 @@ public:
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
BOOL bNewShow );
- virtual ~ScUndoOutlineBlock();
+ virtual ~ScUndoOutlineBlock();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScAddress aBlockStart;
- ScAddress aBlockEnd;
- ScDocument* pUndoDoc;
- ScOutlineTable* pUndoTable;
- BOOL bShow;
+ ScAddress aBlockStart;
+ ScAddress aBlockEnd;
+ ScDocument* pUndoDoc;
+ ScOutlineTable* pUndoTable;
+ BOOL bShow;
};
@@ -166,20 +166,20 @@ public:
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab );
- virtual ~ScUndoRemoveAllOutlines();
+ virtual ~ScUndoRemoveAllOutlines();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScAddress aBlockStart;
- ScAddress aBlockEnd;
- ScDocument* pUndoDoc;
- ScOutlineTable* pUndoTable;
+ ScAddress aBlockStart;
+ ScAddress aBlockEnd;
+ ScDocument* pUndoDoc;
+ ScOutlineTable* pUndoTable;
};
@@ -191,20 +191,20 @@ public:
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab );
- virtual ~ScUndoAutoOutline();
+ virtual ~ScUndoAutoOutline();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScAddress aBlockStart;
- ScAddress aBlockEnd;
- ScDocument* pUndoDoc;
- ScOutlineTable* pUndoTable;
+ ScAddress aBlockStart;
+ ScAddress aBlockEnd;
+ ScDocument* pUndoDoc;
+ ScOutlineTable* pUndoTable;
};
@@ -215,26 +215,26 @@ public:
ScUndoSubTotals( ScDocShell* pNewDocShell, SCTAB nNewTab,
const ScSubTotalParam& rNewParam, SCROW nNewEndY,
ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
-// ScDBData* pNewData,
+// ScDBData* pNewData,
ScRangeName* pNewUndoRange, ScDBCollection* pNewUndoDB );
- virtual ~ScUndoSubTotals();
+ virtual ~ScUndoSubTotals();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SCTAB nTab;
- ScSubTotalParam aParam; // Original uebergebener Parameter
- SCROW nNewEndRow; // Ergebnis-Groesse
- ScDocument* pUndoDoc;
- ScOutlineTable* pUndoTable;
-// ScDBData* pUndoDBData;
- ScRangeName* pUndoRange;
- ScDBCollection* pUndoDB;
+ SCTAB nTab;
+ ScSubTotalParam aParam; // Original uebergebener Parameter
+ SCROW nNewEndRow; // Ergebnis-Groesse
+ ScDocument* pUndoDoc;
+ ScOutlineTable* pUndoTable;
+// ScDBData* pUndoDBData;
+ ScRangeName* pUndoRange;
+ ScDBCollection* pUndoDB;
};
@@ -246,23 +246,23 @@ public:
const ScSortParam& rParam,
BOOL bQuery, ScDocument* pNewUndoDoc,
ScDBCollection* pNewUndoDB, const ScRange* pDest = NULL );
- virtual ~ScUndoSort();
+ virtual ~ScUndoSort();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SCTAB nTab;
- ScSortParam aSortParam;
- BOOL bRepeatQuery;
- ScDocument* pUndoDoc;
- ScDBCollection* pUndoDB; // wegen Quell- und Zielbereich
- BOOL bDestArea;
- ScRange aDestRange;
+ SCTAB nTab;
+ ScSortParam aSortParam;
+ BOOL bRepeatQuery;
+ ScDocument* pUndoDoc;
+ ScDBCollection* pUndoDB; // wegen Quell- und Zielbereich
+ BOOL bDestArea;
+ ScRange aDestRange;
};
@@ -274,26 +274,26 @@ public:
const ScQueryParam& rParam, ScDocument* pNewUndoDoc,
ScDBCollection* pNewUndoDB, const ScRange* pOld,
BOOL bSize, const ScRange* pAdvSrc );
- virtual ~ScUndoQuery();
+ virtual ~ScUndoQuery();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
SdrUndoAction* pDrawUndo;
- SCTAB nTab;
- ScQueryParam aQueryParam;
- ScDocument* pUndoDoc;
- ScDBCollection* pUndoDB; // wegen Quell- und Zielbereich
- ScRange aOldDest;
- ScRange aAdvSource;
- BOOL bIsAdvanced;
- BOOL bDestArea;
- BOOL bDoSize;
+ SCTAB nTab;
+ ScQueryParam aQueryParam;
+ ScDocument* pUndoDoc;
+ ScDBCollection* pUndoDB; // wegen Quell- und Zielbereich
+ ScRange aOldDest;
+ ScRange aAdvSource;
+ BOOL bIsAdvanced;
+ BOOL bDestArea;
+ BOOL bDoSize;
};
@@ -326,14 +326,14 @@ public:
TYPEINFO();
ScUndoDBData( ScDocShell* pNewDocShell,
ScDBCollection* pNewUndoColl, ScDBCollection* pNewRedoColl );
- virtual ~ScUndoDBData();
+ virtual ~ScUndoDBData();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
ScDBCollection* pUndoColl;
@@ -350,26 +350,26 @@ public:
SCCOL nNewFormula,
ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
ScDBData* pNewUndoData, ScDBData* pNewRedoData );
- virtual ~ScUndoImportData();
+ virtual ~ScUndoImportData();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SCTAB nTab;
- ScImportParam aImportParam;
- SCCOL nEndCol;
- SCROW nEndRow;
- ScDocument* pUndoDoc;
- ScDocument* pRedoDoc;
- ScDBData* pUndoDBData;
- ScDBData* pRedoDBData;
- SCCOL nFormulaCols;
- BOOL bRedoFilled;
+ SCTAB nTab;
+ ScImportParam aImportParam;
+ SCCOL nEndCol;
+ SCROW nEndRow;
+ ScDocument* pUndoDoc;
+ ScDocument* pRedoDoc;
+ ScDBData* pUndoDBData;
+ ScDBData* pRedoDBData;
+ SCCOL nFormulaCols;
+ BOOL bRedoFilled;
};
@@ -383,27 +383,27 @@ public:
ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
ScRangeName* pNewUndoRange, ScDBCollection* pNewUndoDB,
const ScRange* pOldQ, const ScRange* pNewQ );
- virtual ~ScUndoRepeatDB();
+ virtual ~ScUndoRepeatDB();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScAddress aBlockStart;
- ScAddress aBlockEnd;
- SCROW nNewEndRow;
- ScAddress aCursorPos;
- ScDocument* pUndoDoc;
- ScOutlineTable* pUndoTable;
- ScRangeName* pUndoRange;
- ScDBCollection* pUndoDB;
- ScRange aOldQuery;
- ScRange aNewQuery;
- BOOL bQuerySize;
+ ScAddress aBlockStart;
+ ScAddress aBlockEnd;
+ SCROW nNewEndRow;
+ ScAddress aCursorPos;
+ ScDocument* pUndoDoc;
+ ScOutlineTable* pUndoTable;
+ ScRangeName* pUndoRange;
+ ScDBCollection* pUndoDB;
+ ScRange aOldQuery;
+ ScRange aNewQuery;
+ BOOL bQuerySize;
};
//UNUSED2008-05 class ScUndoPivot: public ScSimpleUndo
@@ -415,14 +415,14 @@ private:
//UNUSED2008-05 ScDocument* pOldDoc, ScDocument* pNewDoc,
//UNUSED2008-05 const ScPivot* pOldPivot, const ScPivot* pNewPivot );
//UNUSED2008-05 virtual ~ScUndoPivot();
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 virtual void Undo();
//UNUSED2008-05 virtual void Redo();
//UNUSED2008-05 virtual void Repeat(SfxRepeatTarget& rTarget);
//UNUSED2008-05 virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 virtual String GetComment() const;
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 private:
//UNUSED2008-05 ScArea aOldArea;
//UNUSED2008-05 ScArea aNewArea;
@@ -448,21 +448,21 @@ public:
ScDocument* pOldDoc, ScDocument* pNewDoc,
const ScDPObject* pOldObj, const ScDPObject* pNewObj,
BOOL bMove );
- virtual ~ScUndoDataPilot();
+ virtual ~ScUndoDataPilot();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScDocument* pOldUndoDoc;
- ScDocument* pNewUndoDoc;
- ScDPObject* pOldDPObject;
- ScDPObject* pNewDPObject;
- BOOL bAllowMove;
+ ScDocument* pOldUndoDoc;
+ ScDocument* pNewUndoDoc;
+ ScDPObject* pOldDPObject;
+ ScDPObject* pNewDPObject;
+ BOOL bAllowMove;
};
@@ -475,23 +475,23 @@ public:
ScDocument* pNewUndoDoc, BOOL bReference,
SCROW nInsCount, ScOutlineTable* pTab,
ScDBData* pData );
- virtual ~ScUndoConsolidate();
+ virtual ~ScUndoConsolidate();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- ScArea aDestArea;
- ScDocument* pUndoDoc;
- ScConsolidateParam aParam;
- BOOL bInsRef;
- SCSIZE nInsertCount;
- ScOutlineTable* pUndoTab;
- ScDBData* pUndoData;
+ ScArea aDestArea;
+ ScDocument* pUndoDoc;
+ ScConsolidateParam aParam;
+ BOOL bInsRef;
+ SCSIZE nInsertCount;
+ ScOutlineTable* pUndoTab;
+ ScDBData* pUndoData;
};
@@ -505,27 +505,27 @@ public:
ScUndoChartData( ScDocShell* pNewDocShell,
const String& rName, const ScRangeListRef& rNew,
BOOL bColHdr, BOOL bRowHdr, BOOL bAdd );
- virtual ~ScUndoChartData();
+ virtual ~ScUndoChartData();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- String aChartName;
- ScRangeListRef aOldRangeListRef;
- BOOL bOldColHeaders;
- BOOL bOldRowHeaders;
-// ScRange aNewRange;
- ScRangeListRef aNewRangeListRef;
- BOOL bNewColHeaders;
- BOOL bNewRowHeaders;
- BOOL bAddRange;
-
- void Init();
+ String aChartName;
+ ScRangeListRef aOldRangeListRef;
+ BOOL bOldColHeaders;
+ BOOL bOldRowHeaders;
+// ScRange aNewRange;
+ ScRangeListRef aNewRangeListRef;
+ BOOL bNewColHeaders;
+ BOOL bNewRowHeaders;
+ BOOL bAddRange;
+
+ void Init();
};
diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx
index a2647985af9f..16dddd99cf69 100644
--- a/sc/source/ui/inc/undodraw.hxx
+++ b/sc/source/ui/inc/undodraw.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,27 +34,27 @@ class ScDocShell;
class ScUndoDraw: public SfxUndoAction
{
- SfxUndoAction* pDrawUndo;
- ScDocShell* pDocShell;
+ SfxUndoAction* pDrawUndo;
+ ScDocShell* pDocShell;
public:
TYPEINFO();
ScUndoDraw( SfxUndoAction* pUndo, ScDocShell* pDocSh );
- virtual ~ScUndoDraw();
-
- SfxUndoAction* GetDrawUndo() { return pDrawUndo; }
- void ForgetDrawUndo();
-
- virtual BOOL IsLinked();
- virtual void SetLinked( BOOL bIsLinked );
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual BOOL Merge( SfxUndoAction *pNextAction );
+ virtual ~ScUndoDraw();
+
+ SfxUndoAction* GetDrawUndo() { return pDrawUndo; }
+ void ForgetDrawUndo();
+
+ virtual BOOL IsLinked();
+ virtual void SetLinked( BOOL bIsLinked );
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual BOOL Merge( SfxUndoAction *pNextAction );
virtual String GetComment() const;
- virtual String GetRepeatComment(SfxRepeatTarget&) const;
- virtual USHORT GetId() const;
+ virtual String GetRepeatComment(SfxRepeatTarget&) const;
+ virtual USHORT GetId() const;
};
diff --git a/sc/source/ui/inc/undoolk.hxx b/sc/source/ui/inc/undoolk.hxx
index 527c973b6705..0ad489cf69fb 100644
--- a/sc/source/ui/inc/undoolk.hxx
+++ b/sc/source/ui/inc/undoolk.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +33,11 @@
class SdrUndoAction;
class ScDocument;
-SdrUndoAction* GetSdrUndoAction ( ScDocument* pDoc );
-void DoSdrUndoAction ( SdrUndoAction* pUndoAction, ScDocument* pDoc );
-void RedoSdrUndoAction ( SdrUndoAction* pUndoAction );
-void DeleteSdrUndoAction ( SdrUndoAction* pUndoAction );
-void EnableDrawAdjust ( ScDocument* pDoc, BOOL bEnable );
+SdrUndoAction* GetSdrUndoAction ( ScDocument* pDoc );
+void DoSdrUndoAction ( SdrUndoAction* pUndoAction, ScDocument* pDoc );
+void RedoSdrUndoAction ( SdrUndoAction* pUndoAction );
+void DeleteSdrUndoAction ( SdrUndoAction* pUndoAction );
+void EnableDrawAdjust ( ScDocument* pDoc, BOOL bEnable );
diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx
index 5e7b86449722..6869fc8cdce0 100644
--- a/sc/source/ui/inc/undostyl.hxx
+++ b/sc/source/ui/inc/undostyl.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,31 +39,31 @@ class SfxStyleSheetBase;
class ScStyleSaveData
{
private:
- String aName;
- String aParent;
- SfxItemSet* pItems;
+ String aName;
+ String aParent;
+ SfxItemSet* pItems;
public:
ScStyleSaveData();
ScStyleSaveData( const ScStyleSaveData& rOther );
~ScStyleSaveData();
- ScStyleSaveData& operator=( const ScStyleSaveData& rOther );
+ ScStyleSaveData& operator=( const ScStyleSaveData& rOther );
- void InitFromStyle( const SfxStyleSheetBase* pSource );
+ void InitFromStyle( const SfxStyleSheetBase* pSource );
- const String& GetName() const { return aName; }
- const String& GetParent() const { return aParent; }
- const SfxItemSet* GetItems() const { return pItems; }
+ const String& GetName() const { return aName; }
+ const String& GetParent() const { return aParent; }
+ const SfxItemSet* GetItems() const { return pItems; }
};
class ScUndoModifyStyle: public ScSimpleUndo
{
private:
- SfxStyleFamily eFamily;
- ScStyleSaveData aOldData;
- ScStyleSaveData aNewData;
+ SfxStyleFamily eFamily;
+ ScStyleSaveData aOldData;
+ ScStyleSaveData aNewData;
- static void DoChange( ScDocShell* pDocSh,
+ static void DoChange( ScDocShell* pDocSh,
const String& rName, SfxStyleFamily eStyleFamily,
const ScStyleSaveData& rData );
@@ -73,14 +73,14 @@ public:
SfxStyleFamily eFam,
const ScStyleSaveData& rOld,
const ScStyleSaveData& rNew );
- virtual ~ScUndoModifyStyle();
+ virtual ~ScUndoModifyStyle();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
};
class ScUndoApplyPageStyle: public ScSimpleUndo
@@ -88,16 +88,16 @@ class ScUndoApplyPageStyle: public ScSimpleUndo
public:
TYPEINFO();
ScUndoApplyPageStyle( ScDocShell* pDocSh, const String& rNewStyle );
- virtual ~ScUndoApplyPageStyle();
+ virtual ~ScUndoApplyPageStyle();
void AddSheetAction( SCTAB nTab, const String& rOld );
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
struct ApplyStyleEntry
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index c8d135070ab1..1be7962dd378 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,23 +71,23 @@ public:
SCTAB nTabNum,
BOOL bApp,
const String& rNewName);
- virtual ~ScUndoInsertTab();
+ virtual ~ScUndoInsertTab();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- String sNewName;
- SdrUndoAction* pDrawUndo;
- ULONG nEndChangeAction;
- SCTAB nTab;
- BOOL bAppend;
+ String sNewName;
+ SdrUndoAction* pDrawUndo;
+ ULONG nEndChangeAction;
+ SCTAB nTab;
+ BOOL bAppend;
- void SetChangeTrack();
+ void SetChangeTrack();
};
class ScUndoInsertTables : public ScSimpleUndo
@@ -99,52 +99,52 @@ public:
SCTAB nTabNum,
BOOL bApp,
SvStrings *pNewNameList);
- virtual ~ScUndoInsertTables();
+ virtual ~ScUndoInsertTables();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SdrUndoAction* pDrawUndo;
- SvStrings* pNameList;
- ULONG nStartChangeAction;
- ULONG nEndChangeAction;
- SCTAB nTab;
- BOOL bAppend;
+ SdrUndoAction* pDrawUndo;
+ SvStrings* pNameList;
+ ULONG nStartChangeAction;
+ ULONG nEndChangeAction;
+ SCTAB nTab;
+ BOOL bAppend;
- void SetChangeTrack();
+ void SetChangeTrack();
};
-class ScUndoDeleteTab: public ScMoveUndo // Draw vom Move fuer geloeschte Tabelle
+class ScUndoDeleteTab: public ScMoveUndo // Draw vom Move fuer geloeschte Tabelle
{
public:
TYPEINFO();
ScUndoDeleteTab(
ScDocShell* pNewDocShell,
- const SvShorts &theTabs, //SCTAB nNewTab,
+ const SvShorts &theTabs, //SCTAB nNewTab,
ScDocument* pUndoDocument,
ScRefUndoData* pRefData );
- virtual ~ScUndoDeleteTab();
+ virtual ~ScUndoDeleteTab();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SvShorts theTabs;
- ULONG nStartChangeAction;
- ULONG nEndChangeAction;
+ SvShorts theTabs;
+ ULONG nStartChangeAction;
+ ULONG nEndChangeAction;
- void SetChangeTrack();
+ void SetChangeTrack();
};
@@ -157,19 +157,19 @@ public:
SCTAB nT,
const String& rOldName,
const String& rNewName);
- virtual ~ScUndoRenameTab();
+ virtual ~ScUndoRenameTab();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SCTAB nTab;
- String sOldName;
- String sNewName;
+ SCTAB nTab;
+ String sOldName;
+ String sNewName;
void DoChange( SCTAB nTab, const String& rName ) const;
};
@@ -182,18 +182,18 @@ public:
ScUndoMoveTab( ScDocShell* pNewDocShell,
const SvShorts &aOldTab,
const SvShorts &aNewTab);
- virtual ~ScUndoMoveTab();
+ virtual ~ScUndoMoveTab();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SvShorts theOldTabs;
- SvShorts theNewTabs;
+ SvShorts theOldTabs;
+ SvShorts theNewTabs;
void DoChange( BOOL bUndo ) const;
};
@@ -207,19 +207,19 @@ public:
const SvShorts &aOldTab,
const SvShorts &aNewTab);
- virtual ~ScUndoCopyTab();
+ virtual ~ScUndoCopyTab();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SdrUndoAction* pDrawUndo;
- SvShorts theOldTabs;
- SvShorts theNewTabs;
+ SdrUndoAction* pDrawUndo;
+ SvShorts theOldTabs;
+ SvShorts theNewTabs;
void DoChange() const;
};
@@ -243,7 +243,7 @@ public:
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
-virtual String GetComment() const;
+virtual String GetComment() const;
private:
ScUndoTabColorInfo::List aTabColorList;
@@ -262,23 +262,23 @@ public:
const String& rN, const String& rC,
const Color& rCol, USHORT nF,
const ScMarkData& rMark );
- virtual ~ScUndoMakeScenario();
+ virtual ~ScUndoMakeScenario();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SCTAB nSrcTab;
- SCTAB nDestTab;
- String aName;
- String aComment;
- Color aColor;
- USHORT nFlags;
- ScMarkData aMarkData;
+ SCTAB nSrcTab;
+ SCTAB nDestTab;
+ String aName;
+ String aComment;
+ Color aColor;
+ USHORT nFlags;
+ ScMarkData aMarkData;
SdrUndoAction* pDrawUndo;
};
@@ -291,21 +291,21 @@ public:
ScDocShell* pShell,
SCTAB nNewTab, SCTAB nNewCount,
BOOL bNewLink );
- virtual ~ScUndoImportTab();
+ virtual ~ScUndoImportTab();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SCTAB nTab;
- SCTAB nCount;
- BOOL bLink;
- ScDocument* pRedoDoc;
- SdrUndoAction* pDrawUndo;
+ SCTAB nTab;
+ SCTAB nCount;
+ BOOL bLink;
+ ScDocument* pRedoDoc;
+ SdrUndoAction* pDrawUndo;
void DoChange() const;
};
@@ -315,27 +315,27 @@ class ScUndoRemoveLink : public ScSimpleUndo
{
public:
TYPEINFO();
- ScUndoRemoveLink( // vor dem Loeschen aufrufen!
+ ScUndoRemoveLink( // vor dem Loeschen aufrufen!
ScDocShell* pShell,
const String& rDoc );
- virtual ~ScUndoRemoveLink();
+ virtual ~ScUndoRemoveLink();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- String aDocName;
- String aFltName;
- String aOptions;
- ULONG nRefreshDelay;
- USHORT nCount;
- SCTAB* pTabs;
- BYTE* pModes;
- String* pTabNames;
+ String aDocName;
+ String aFltName;
+ String aOptions;
+ ULONG nRefreshDelay;
+ USHORT nCount;
+ SCTAB* pTabs;
+ BYTE* pModes;
+ String* pTabNames;
void DoChange( BOOL bLink ) const;
};
@@ -348,18 +348,18 @@ public:
ScUndoShowHideTab(
ScDocShell* pShell,
SCTAB nNewTab, BOOL bNewShow );
- virtual ~ScUndoShowHideTab();
+ virtual ~ScUndoShowHideTab();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SCTAB nTab;
- BOOL bShow;
+ SCTAB nTab;
+ BOOL bShow;
void DoChange( BOOL bShow ) const;
};
@@ -372,19 +372,19 @@ class ScUndoDocProtect : public ScSimpleUndo
{
public:
ScUndoDocProtect(ScDocShell* pShell, ::std::auto_ptr<ScDocProtection> pProtectSettings);
- virtual ~ScUndoDocProtect();
+ virtual ~ScUndoDocProtect();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
::std::auto_ptr<ScDocProtection> mpProtectSettings;
- void DoProtect(bool bProtect);
+ void DoProtect(bool bProtect);
};
// ============================================================================
@@ -394,22 +394,22 @@ private:
class ScUndoTabProtect : public ScSimpleUndo
{
public:
- ScUndoTabProtect(ScDocShell* pShell, SCTAB nTab,
+ ScUndoTabProtect(ScDocShell* pShell, SCTAB nTab,
::std::auto_ptr<ScTableProtection> pProtectSettings);
- virtual ~ScUndoTabProtect();
+ virtual ~ScUndoTabProtect();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
SCTAB mnTab;
::std::auto_ptr<ScTableProtection> mpProtectSettings;
- void DoProtect(bool bProtect);
+ void DoProtect(bool bProtect);
};
@@ -419,19 +419,19 @@ public:
TYPEINFO();
ScUndoPrintRange( ScDocShell* pShell, SCTAB nNewTab,
ScPrintRangeSaver* pOld, ScPrintRangeSaver* pNew );
- virtual ~ScUndoPrintRange();
+ virtual ~ScUndoPrintRange();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SCTAB nTab;
- ScPrintRangeSaver* pOldRanges;
- ScPrintRangeSaver* pNewRanges;
+ SCTAB nTab;
+ ScPrintRangeSaver* pOldRanges;
+ ScPrintRangeSaver* pNewRanges;
void DoChange( BOOL bUndo );
};
@@ -448,25 +448,25 @@ public:
const Color& rOCol, const Color& rNCol,
USHORT nOF, USHORT nNF );
- virtual ~ScUndoScenarioFlags();
+ virtual ~ScUndoScenarioFlags();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SCTAB nTab;
- String aOldName;
- String aNewName;
- String aOldComment;
- String aNewComment;
- Color aOldColor;
- Color aNewColor;
- USHORT nOldFlags;
- USHORT nNewFlags;
+ SCTAB nTab;
+ String aOldName;
+ String aNewName;
+ String aOldComment;
+ String aNewComment;
+ Color aOldColor;
+ Color aNewColor;
+ USHORT nOldFlags;
+ USHORT nNewFlags;
};
@@ -478,21 +478,21 @@ public:
ScDocShell* pNewDocShell, const String& rPN,
const String& rON, const String& rNN );
- virtual ~ScUndoRenameObject();
+ virtual ~ScUndoRenameObject();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- String aPersistName; // to find object (works only for OLE objects)
- String aOldName;
- String aNewName;
+ String aPersistName; // to find object (works only for OLE objects)
+ String aOldName;
+ String aNewName;
- SdrObject* GetObject();
+ SdrObject* GetObject();
};
@@ -501,18 +501,18 @@ class ScUndoLayoutRTL : public ScSimpleUndo
public:
TYPEINFO();
ScUndoLayoutRTL( ScDocShell* pShell, SCTAB nNewTab, BOOL bNewRTL );
- virtual ~ScUndoLayoutRTL();
+ virtual ~ScUndoLayoutRTL();
- virtual void Undo();
- virtual void Redo();
- virtual void Repeat(SfxRepeatTarget& rTarget);
- virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
+ virtual void Undo();
+ virtual void Redo();
+ virtual void Repeat(SfxRepeatTarget& rTarget);
+ virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
- virtual String GetComment() const;
+ virtual String GetComment() const;
private:
- SCTAB nTab;
- BOOL bRTL;
+ SCTAB nTab;
+ BOOL bRTL;
void DoChange( BOOL bNew );
};
@@ -525,17 +525,17 @@ private:
//UNUSED2009-05 ScUndoSetGrammar( ScDocShell* pShell,
//UNUSED2009-05 formula::FormulaGrammar::Grammar eGrammar );
//UNUSED2009-05 virtual ~ScUndoSetGrammar();
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 virtual void Undo();
//UNUSED2009-05 virtual void Redo();
//UNUSED2009-05 virtual void Repeat(SfxRepeatTarget& rTarget);
//UNUSED2009-05 virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const;
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 virtual String GetComment() const;
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 private:
//UNUSED2009-05 formula::FormulaGrammar::Grammar meNewGrammar, meOldGrammar;
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 void DoChange( formula::FormulaGrammar::Grammar eGrammar );
//UNUSED2009-05 };
diff --git a/sc/source/ui/inc/undoutil.hxx b/sc/source/ui/inc/undoutil.hxx
index 38302096b1fa..8835b70fc96a 100644
--- a/sc/source/ui/inc/undoutil.hxx
+++ b/sc/source/ui/inc/undoutil.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +41,7 @@ class ScDocument;
class ScUndoUtil
{
public:
- // Block markieren (unsichtbar, muss repainted werden)
+ // Block markieren (unsichtbar, muss repainted werden)
static void MarkSimpleBlock( ScDocShell* pDocShell,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ );
@@ -51,12 +51,12 @@ public:
static void MarkSimpleBlock( ScDocShell* pDocShell,
const ScRange& rRange );
- // Bereich +1 painten
+ // Bereich +1 painten
static void PaintMore( ScDocShell* pDocShell,
const ScRange& rRange );
- // DB-Bereich im Dokument suchen ("unbenannt" oder nach Bereich)
- // legt neu an, wenn nicht gefunden
+ // DB-Bereich im Dokument suchen ("unbenannt" oder nach Bereich)
+ // legt neu an, wenn nicht gefunden
static ScDBData* GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB nTab,
SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
};
diff --git a/sc/source/ui/inc/validate.hrc b/sc/source/ui/inc/validate.hrc
index 45e5dda39c2d..0af2a1481a52 100644
--- a/sc/source/ui/inc/validate.hrc
+++ b/sc/source/ui/inc/validate.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
@@ -59,7 +59,7 @@
#define EDT_LIST 29
#define FT_SOURCEHINT 30
//<!--Added by PengYunQuan for Validity Cell Range Picker
-#define RB_VALIDITY_REF 88
+#define RB_VALIDITY_REF 88
//-->Added by PengYunQuan for Validity Cell Range Picker
/* Position indexes for "Allow" list box.
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index f7cb9af23b63..11f6f1aba93f 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,51 +40,51 @@
// ============================================================================
//<!--Added by PengYunQuan for Validity Cell Range Picker
-struct ScRefHandlerCaller{
+struct ScRefHandlerCaller{
virtual ~ScRefHandlerCaller(){}
};
class ScRefHandlerHelper
{
protected:
- ScRefHandlerCaller *m_pHandler;
+ ScRefHandlerCaller *m_pHandler;
void (ScRefHandlerCaller::*m_pSetReferenceHdl)( const ScRange& , ScDocument* );
void (ScRefHandlerCaller::*m_pSetActiveHdl)();
void (ScRefHandlerCaller::*m_pRefInputStartPreHdl)( ScRefEdit* pEdit, ScRefButton* pButton );
void (ScRefHandlerCaller::*m_pRefInputStartPostHdl)( ScRefEdit* pEdit, ScRefButton* pButton );
void (ScRefHandlerCaller::*m_pRefInputDonePreHdl)();
void (ScRefHandlerCaller::*m_pRefInputDonePostHdl)();
-
+
public:
typedef void (ScRefHandlerCaller::*PFUNCSETREFHDLTYPE)( const ScRange& , ScDocument* );
- typedef void (ScRefHandlerCaller::*PCOMMONHDLTYPE)();
- typedef void (ScRefHandlerCaller::*PINPUTSTARTDLTYPE)( ScRefEdit* pEdit, ScRefButton* pButton );
+ typedef void (ScRefHandlerCaller::*PCOMMONHDLTYPE)();
+ typedef void (ScRefHandlerCaller::*PINPUTSTARTDLTYPE)( ScRefEdit* pEdit, ScRefButton* pButton );
- PFUNCSETREFHDLTYPE SetSetRefHdl( PFUNCSETREFHDLTYPE pNewHdl )
+ PFUNCSETREFHDLTYPE SetSetRefHdl( PFUNCSETREFHDLTYPE pNewHdl )
{
PFUNCSETREFHDLTYPE pOldHdl = m_pSetReferenceHdl;
m_pSetReferenceHdl = pNewHdl;
return pOldHdl;
}
- PCOMMONHDLTYPE SetSetActHdl( PCOMMONHDLTYPE pNewHdl )
+ PCOMMONHDLTYPE SetSetActHdl( PCOMMONHDLTYPE pNewHdl )
{
PCOMMONHDLTYPE pOldHdl = m_pSetActiveHdl;
m_pSetActiveHdl = pNewHdl;
return pOldHdl;
}
- ScRefHandlerCaller *SetHandler( ScRefHandlerCaller *pNewHandler )
+ ScRefHandlerCaller *SetHandler( ScRefHandlerCaller *pNewHandler )
{
- ScRefHandlerCaller *pOldHandler = m_pHandler;
+ ScRefHandlerCaller *pOldHandler = m_pHandler;
m_pHandler = pNewHandler;
return pOldHandler;
}
- void SetRefInputStartPreHdl( PINPUTSTARTDLTYPE pNewHdl ){ m_pRefInputStartPreHdl = pNewHdl; }
- void SetRefInputDonePostHdl( void (ScRefHandlerCaller::*pNewHdl)() ){ m_pRefInputDonePostHdl = pNewHdl; }
- void SetRefInputStartPostHdl( PINPUTSTARTDLTYPE pNewHdl ){ m_pRefInputStartPostHdl = pNewHdl; }
- void SetRefInputDonePreHdl( void (ScRefHandlerCaller::*pNewHdl)() ){ m_pRefInputDonePreHdl = pNewHdl; }
+ void SetRefInputStartPreHdl( PINPUTSTARTDLTYPE pNewHdl ){ m_pRefInputStartPreHdl = pNewHdl; }
+ void SetRefInputDonePostHdl( void (ScRefHandlerCaller::*pNewHdl)() ){ m_pRefInputDonePostHdl = pNewHdl; }
+ void SetRefInputStartPostHdl( PINPUTSTARTDLTYPE pNewHdl ){ m_pRefInputStartPostHdl = pNewHdl; }
+ void SetRefInputDonePreHdl( void (ScRefHandlerCaller::*pNewHdl)() ){ m_pRefInputDonePreHdl = pNewHdl; }
- ScRefHandlerHelper():m_pHandler(NULL), m_pSetReferenceHdl( NULL ), m_pSetActiveHdl(NULL), m_pRefInputStartPreHdl( NULL ), m_pRefInputStartPostHdl( NULL ), m_pRefInputDonePreHdl( NULL ), m_pRefInputDonePostHdl( NULL ){}
+ ScRefHandlerHelper():m_pHandler(NULL), m_pSetReferenceHdl( NULL ), m_pSetActiveHdl(NULL), m_pRefInputStartPreHdl( NULL ), m_pRefInputStartPostHdl( NULL ), m_pRefInputDonePreHdl( NULL ), m_pRefInputDonePostHdl( NULL ){}
};
//-->Added by PengYunQuan for Validity Cell Range Picker
@@ -95,17 +95,17 @@ class ScValidationDlg :public ScRefHdlrImpl<ScValidationDlg, SfxTabDialog, false
//-->Modified by PengYunQuan for Validity Cell Range Picker
{
//<!--Added by PengYunQuan for Validity Cell Range Picker
- typedef ScRefHdlrImpl<ScValidationDlg, SfxTabDialog, false> ScValidationDlgBase;
+ typedef ScRefHdlrImpl<ScValidationDlg, SfxTabDialog, false> ScValidationDlgBase;
//Start_Moddify by liliang 03/26/2008 SODC_13677_2
DECL_LINK( OkHdl, Button * );
//End_Moddify by liliang 03/26/2008 SODC_13677_2
- bool m_bOwnRefHdlr:1;
+ bool m_bOwnRefHdlr:1;
ScTabViewShell *m_pTabVwSh;
- bool m_bRefInputting:1;
- bool EnterRefStatus();
- bool LeaveRefStatus();
+ bool m_bRefInputting:1;
+ bool EnterRefStatus();
+ bool LeaveRefStatus();
//-->Added by PengYunQuan for Validity Cell Range Picker
public:
//<!--Modified by PengYunQuan for Validity Cell Range Picker
@@ -115,13 +115,13 @@ public:
//<!--Added by PengYunQuan for Validity Cell Range Picker
virtual ~ScValidationDlg();
inline static ScValidationDlg * Find1AliveObject( Window *pAncestor );
- bool IsAlive();
- inline ScTabViewShell * GetTabViewShell();
+ bool IsAlive();
+ inline ScTabViewShell * GetTabViewShell();
- bool SetupRefDlg();
- bool RemoveRefDlg( BOOL bRestoreModal = TRUE );
+ bool SetupRefDlg();
+ bool RemoveRefDlg( BOOL bRestoreModal = TRUE );
- virtual void SetModal( BOOL bModal ){ ScValidationDlgBase::SetModalInputMode( bModal ); }
+ virtual void SetModal( BOOL bModal ){ ScValidationDlgBase::SetModalInputMode( bModal ); }
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc )
{
@@ -135,7 +135,7 @@ public:
(m_pHandler->*m_pSetActiveHdl)();
}
- void CloseRefDialog()
+ void CloseRefDialog()
{
DBG_ASSERT( false, "should not execute here!!!when the edit kill focus, should remove refhandler.\r\n" );
@@ -145,7 +145,7 @@ public:
Close();
}
- bool IsRefInputting(){ return m_bRefInputting; }
+ bool IsRefInputting(){ return m_bRefInputting; }
virtual void RefInputStart( ScRefEdit* pEdit, ScRefButton* pButton = NULL )
{
@@ -243,8 +243,8 @@ private:
//<!--Added by PengYunQuan for Validity Cell Range Picker
DECL_LINK( EditSetFocusHdl, Edit *);
DECL_LINK( KillFocusHdl, Window *);
- void OnClick( Button *pBtn );
- ScRefEdit *m_pRefEdit;
+ void OnClick( Button *pBtn );
+ ScRefEdit *m_pRefEdit;
class ScRefButtonEx:public ::ScRefButton
{
void Click();
@@ -254,18 +254,18 @@ private:
friend class ScRefButtonEx;
void SetReferenceHdl( const ScRange& , ScDocument* );
void SetActiveHdl();
- void RefInputStartPreHdl( ScRefEdit* pEdit, ScRefButton* pButton );
- void RefInputDonePreHdl();
- void RefInputDonePostHdl();
+ void RefInputStartPreHdl( ScRefEdit* pEdit, ScRefButton* pButton );
+ void RefInputDonePreHdl();
+ void RefInputDonePostHdl();
ScValidationDlg * GetValidationDlg();
//TYPEINFO();
- void TidyListBoxes();
+ void TidyListBoxes();
public:
- USHORT GetAllowEntryPos();
- String GetMinText();
- void SetupRefDlg();
- void RemoveRefDlg();
+ USHORT GetAllowEntryPos();
+ String GetMinText();
+ void SetupRefDlg();
+ void RemoveRefDlg();
//-->Added by PengYunQuan for Validity Cell Range Picker
};
@@ -275,16 +275,16 @@ public:
class ScTPValidationHelp : public SfxTabPage
{
private:
- TriStateBox aTsbHelp;
+ TriStateBox aTsbHelp;
FixedLine aFlContent;
- FixedText aFtTitle;
- Edit aEdtTitle;
- FixedText aFtInputHelp;
- MultiLineEdit aEdInputHelp;
+ FixedText aFtTitle;
+ Edit aEdtTitle;
+ FixedText aFtInputHelp;
+ MultiLineEdit aEdInputHelp;
const SfxItemSet& mrArgSet;
- void Init();
+ void Init();
// Handler ------------------------
// DECL_LINK( SelectHdl, ListBox * );
@@ -293,10 +293,10 @@ public:
ScTPValidationHelp( Window* pParent, const SfxItemSet& rArgSet );
~ScTPValidationHelp();
- static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet );
- static USHORT* GetRanges ();
- virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
- virtual void Reset ( const SfxItemSet& rArgSet );
+ static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet );
+ static USHORT* GetRanges ();
+ virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
+ virtual void Reset ( const SfxItemSet& rArgSet );
};
//==================================================================
@@ -304,19 +304,19 @@ public:
class ScTPValidationError : public SfxTabPage
{
private:
- TriStateBox aTsbShow;
+ TriStateBox aTsbShow;
FixedLine aFlContent;
- FixedText aFtAction;
- ListBox aLbAction;
- PushButton aBtnSearch;
- FixedText aFtTitle;
- Edit aEdtTitle;
- FixedText aFtError;
- MultiLineEdit aEdError;
+ FixedText aFtAction;
+ ListBox aLbAction;
+ PushButton aBtnSearch;
+ FixedText aFtTitle;
+ Edit aEdtTitle;
+ FixedText aFtError;
+ MultiLineEdit aEdError;
const SfxItemSet& mrArgSet;
- void Init();
+ void Init();
// Handler ------------------------
DECL_LINK( SelectActionHdl, ListBox * );
@@ -326,10 +326,10 @@ public:
ScTPValidationError( Window* pParent, const SfxItemSet& rArgSet );
~ScTPValidationError();
- static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet );
- static USHORT* GetRanges ();
- virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
- virtual void Reset ( const SfxItemSet& rArgSet );
+ static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet );
+ static USHORT* GetRanges ();
+ virtual BOOL FillItemSet ( SfxItemSet& rArgSet );
+ virtual void Reset ( const SfxItemSet& rArgSet );
};
//<!--Added by PengYunQuan for Validity Cell Range Picker
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index fb9c674a4488..114601d82eaa 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +35,16 @@
// ---------------------------------------------------------------------------
-#define SC_SLIDER_SIZE 2
-#define SC_SMALL3DSHADOW COL_BLACK
-#define SC_SIZE_NONE 65535
+#define SC_SLIDER_SIZE 2
+#define SC_SMALL3DSHADOW COL_BLACK
+#define SC_SIZE_NONE 65535
const SCCOL SC_TABSTART_NONE = SCCOL_MAX;
-#define SC_FILL_NONE 0
-#define SC_FILL_FILL 1
-#define SC_FILL_EMBED_LT 2
-#define SC_FILL_EMBED_RB 3
-#define SC_FILL_MATRIX 4
+#define SC_FILL_NONE 0
+#define SC_FILL_FILL 1
+#define SC_FILL_EMBED_LT 2
+#define SC_FILL_EMBED_RB 3
+#define SC_FILL_MATRIX 4
enum ScSplitMode { SC_SPLIT_NONE = 0, SC_SPLIT_NORMAL, SC_SPLIT_FIX };
@@ -57,10 +57,10 @@ inline ScVSplitPos WhichV( ScSplitPos ePos );
inline ScSplitPos Which( ScHSplitPos eHPos );
inline ScSplitPos Which( ScVSplitPos eVPos );
-// Bildschirmverhalten bei Cursorbewegungen:
+// Bildschirmverhalten bei Cursorbewegungen:
enum ScFollowMode { SC_FOLLOW_NONE, SC_FOLLOW_LINE, SC_FOLLOW_FIX, SC_FOLLOW_JUMP };
-// Mausmodi um Bereiche zu selektieren
+// Mausmodi um Bereiche zu selektieren
enum ScRefType { SC_REFTYPE_NONE, SC_REFTYPE_REF, SC_REFTYPE_FILL,
SC_REFTYPE_EMBED_LT, SC_REFTYPE_EMBED_RB };
@@ -106,7 +106,7 @@ class ScViewData;
//--------------------------------------------------------------------------
-class ScViewDataTable // Daten pro Tabelle
+class ScViewDataTable // Daten pro Tabelle
{
friend class ScViewData;
private:
@@ -116,30 +116,30 @@ private:
Fraction aPageZoomX; // zoom in page break preview mode
Fraction aPageZoomY;
- long nTPosX[2]; // MapMode - Offset (Twips)
- long nTPosY[2];
- long nMPosX[2]; // MapMode - Offset (1/100 mm)
- long nMPosY[2];
- long nPixPosX[2]; // Offset in Pixeln
- long nPixPosY[2];
- long nHSplitPos;
- long nVSplitPos;
+ long nTPosX[2]; // MapMode - Offset (Twips)
+ long nTPosY[2];
+ long nMPosX[2]; // MapMode - Offset (1/100 mm)
+ long nMPosY[2];
+ long nPixPosX[2]; // Offset in Pixeln
+ long nPixPosY[2];
+ long nHSplitPos;
+ long nVSplitPos;
- ScSplitMode eHSplitMode;
- ScSplitMode eVSplitMode;
- ScSplitPos eWhichActive;
+ ScSplitMode eHSplitMode;
+ ScSplitMode eVSplitMode;
+ ScSplitPos eWhichActive;
- SCCOL nFixPosX; // Zellposition des Splitters beim Fixieren
- SCROW nFixPosY;
+ SCCOL nFixPosX; // Zellposition des Splitters beim Fixieren
+ SCROW nFixPosY;
- SCCOL nCurX;
- SCROW nCurY;
- SCCOL nOldCurX;
- SCROW nOldCurY;
- SCCOL nPosX[2];
- SCROW nPosY[2];
+ SCCOL nCurX;
+ SCROW nCurY;
+ SCCOL nOldCurX;
+ SCROW nOldCurY;
+ SCCOL nPosX[2];
+ SCROW nPosY[2];
- BOOL bOldCurValid; // "virtuelle" Cursorpos. bei zusammengefassten
+ BOOL bOldCurValid; // "virtuelle" Cursorpos. bei zusammengefassten
ScViewDataTable();
~ScViewDataTable();
@@ -158,26 +158,26 @@ private:
class SC_DLLPUBLIC ScViewData
{
private:
- double nPPTX, nPPTY; // Scaling-Faktoren
+ double nPPTX, nPPTY; // Scaling-Faktoren
- ScViewDataTable* pTabData[MAXTABCOUNT];
- ScViewDataTable* pThisTab; // Daten der angezeigten Tabelle
- ScDocShell* pDocShell;
- ScDocument* pDoc;
- ScDBFunc* pView;
- ScTabViewShell* pViewShell;
- EditView* pEditView[4]; // gehoert dem Fenster
- ScViewOptions* pOptions;
- EditView* pSpellingView;
+ ScViewDataTable* pTabData[MAXTABCOUNT];
+ ScViewDataTable* pThisTab; // Daten der angezeigten Tabelle
+ ScDocShell* pDocShell;
+ ScDocument* pDoc;
+ ScDBFunc* pView;
+ ScTabViewShell* pViewShell;
+ EditView* pEditView[4]; // gehoert dem Fenster
+ ScViewOptions* pOptions;
+ EditView* pSpellingView;
- ScMarkData aMarkData;
+ ScMarkData aMarkData;
- long nEditMargin;
+ long nEditMargin;
- Size aScenButSize; // Groesse eines Szenario-Buttons
+ Size aScenButSize; // Groesse eines Szenario-Buttons
- Size aScrSize;
- MapMode aLogicMode; // skalierter 1/100mm-MapMode
+ Size aScrSize;
+ MapMode aLogicMode; // skalierter 1/100mm-MapMode
SvxZoomType eDefZoomType; // default zoom and type for missing TabData
Fraction aDefZoomX;
@@ -185,42 +185,42 @@ private:
Fraction aDefPageZoomX; // zoom in page break preview mode
Fraction aDefPageZoomY;
- ScRefType eRefType;
-
- SCTAB nTabNo; // angezeigte Tabelle
- SCTAB nRefTabNo; // Tabelle auf die sich RefInput bezieht
- SCCOL nRefStartX;
- SCROW nRefStartY;
- SCTAB nRefStartZ;
- SCCOL nRefEndX;
- SCROW nRefEndY;
- SCTAB nRefEndZ;
- SCCOL nFillStartX; // Fill-Cursor
- SCROW nFillStartY;
- SCCOL nFillEndX;
- SCROW nFillEndY;
- SCCOL nEditCol; // Position dazu
- SCROW nEditRow;
- SCCOL nEditStartCol;
- SCCOL nEditEndCol; // Ende der Edit-View
- SCROW nEditEndRow;
- SCCOL nTabStartCol; // fuer Enter nach Tab
- ScRange aDelRange; // fuer AutoFill-Loeschen
+ ScRefType eRefType;
+
+ SCTAB nTabNo; // angezeigte Tabelle
+ SCTAB nRefTabNo; // Tabelle auf die sich RefInput bezieht
+ SCCOL nRefStartX;
+ SCROW nRefStartY;
+ SCTAB nRefStartZ;
+ SCCOL nRefEndX;
+ SCROW nRefEndY;
+ SCTAB nRefEndZ;
+ SCCOL nFillStartX; // Fill-Cursor
+ SCROW nFillStartY;
+ SCCOL nFillEndX;
+ SCROW nFillEndY;
+ SCCOL nEditCol; // Position dazu
+ SCROW nEditRow;
+ SCCOL nEditStartCol;
+ SCCOL nEditEndCol; // Ende der Edit-View
+ SCROW nEditEndRow;
+ SCCOL nTabStartCol; // fuer Enter nach Tab
+ ScRange aDelRange; // fuer AutoFill-Loeschen
ScSplitPos eEditActivePart; // the part that was active when edit mode was started
- BOOL bEditActive[4]; // aktiv?
- BOOL bActive; // aktives Fenster ?
- BOOL bIsRefMode; // Referenzeingabe
- BOOL bDelMarkValid; // nur gueltig bei SC_REFTYPE_FILL
- BYTE nFillMode; // Modus
- BOOL bPagebreak; // Seitenumbruch-Vorschaumodus
+ BOOL bEditActive[4]; // aktiv?
+ BOOL bActive; // aktives Fenster ?
+ BOOL bIsRefMode; // Referenzeingabe
+ BOOL bDelMarkValid; // nur gueltig bei SC_REFTYPE_FILL
+ BYTE nFillMode; // Modus
+ BOOL bPagebreak; // Seitenumbruch-Vorschaumodus
- BOOL bSelCtrlMouseClick; // special selection handling for ctrl-mouse-click
+ BOOL bSelCtrlMouseClick; // special selection handling for ctrl-mouse-click
SC_DLLPRIVATE DECL_LINK (EmptyEditHdl, EditStatus*);
SC_DLLPRIVATE DECL_LINK (EditEngineHdl, EditStatus*);
- SC_DLLPRIVATE void CalcPPT();
+ SC_DLLPRIVATE void CalcPPT();
SC_DLLPRIVATE void CreateTabData( SCTAB nNewTab );
SC_DLLPRIVATE void CreateTabData( std::vector< SCTAB >& rvTabs );
SC_DLLPRIVATE void CreateSelectedTabData();
@@ -230,83 +230,83 @@ public:
ScViewData( const ScViewData& rViewData );
~ScViewData();
- void InitData( ScDocument* pDocument );
+ void InitData( ScDocument* pDocument );
//UNUSED2008-05 void InitFrom( const ScViewData* pRef );
-//UNUSED2008-05 void SetDocShell( ScDocShell* pShell );
+//UNUSED2008-05 void SetDocShell( ScDocShell* pShell );
- ScDocShell* GetDocShell() const { return pDocShell; }
- ScDBFunc* GetView() const { return pView; }
- ScTabViewShell* GetViewShell() const { return pViewShell; }
+ ScDocShell* GetDocShell() const { return pDocShell; }
+ ScDBFunc* GetView() const { return pView; }
+ ScTabViewShell* GetViewShell() const { return pViewShell; }
SfxObjectShell* GetSfxDocShell() const;
- SfxBindings& GetBindings(); // from ViewShell's ViewFrame
- SfxDispatcher& GetDispatcher(); // from ViewShell's ViewFrame
+ SfxBindings& GetBindings(); // from ViewShell's ViewFrame
+ SfxDispatcher& GetDispatcher(); // from ViewShell's ViewFrame
- ScMarkData& GetMarkData() { return aMarkData; }
+ ScMarkData& GetMarkData() { return aMarkData; }
const ScMarkData& GetMarkData() const { return aMarkData; }
- Window* GetDialogParent(); // von tabvwsh weitergeleitet
- Window* GetActiveWin(); // von View
- ScDrawView* GetScDrawView(); // von View
- BOOL IsMinimized(); // von View
+ Window* GetDialogParent(); // von tabvwsh weitergeleitet
+ Window* GetActiveWin(); // von View
+ ScDrawView* GetScDrawView(); // von View
+ BOOL IsMinimized(); // von View
- void UpdateInputHandler( BOOL bForce = FALSE, BOOL bStopEditing = TRUE );
+ void UpdateInputHandler( BOOL bForce = FALSE, BOOL bStopEditing = TRUE );
- void WriteUserData(String& rData);
- void ReadUserData(const String& rData);
+ void WriteUserData(String& rData);
+ void ReadUserData(const String& rData);
void WriteExtOptions( ScExtDocOptions& rOpt ) const;
void ReadExtOptions( const ScExtDocOptions& rOpt );
- void WriteUserDataSequence(com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings);
- void ReadUserDataSequence(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings);
-
- ScDocument* GetDocument() const;
-
- void SetViewShell( ScTabViewShell* pViewSh );
-
- BOOL IsActive() const { return bActive; }
- void Activate(BOOL bActivate) { bActive = bActivate; }
-
- void UpdateThis();
-
- void InsertTab( SCTAB nTab );
- void DeleteTab( SCTAB nTab );
- void CopyTab( SCTAB nSrcTab, SCTAB nDestTab );
- void MoveTab( SCTAB nSrcTab, SCTAB nDestTab );
-
- SCTAB GetRefTabNo() const { return nRefTabNo; }
- void SetRefTabNo( SCTAB nNewTab ) { nRefTabNo = nNewTab; }
-
- SCTAB GetTabNo() const { return nTabNo; }
- ScSplitPos GetActivePart() const { return pThisTab->eWhichActive; }
- SCCOL GetPosX( ScHSplitPos eWhich ) const { return pThisTab->nPosX[eWhich]; }
- SCROW GetPosY( ScVSplitPos eWhich ) const { return pThisTab->nPosY[eWhich]; }
- SCCOL GetCurX() const { return pThisTab->nCurX; }
- SCROW GetCurY() const { return pThisTab->nCurY; }
- BOOL HasOldCursor() const { return pThisTab->bOldCurValid; }
- SCCOL GetOldCurX() const;
- SCROW GetOldCurY() const;
- ScSplitMode GetHSplitMode() const { return pThisTab->eHSplitMode; }
- ScSplitMode GetVSplitMode() const { return pThisTab->eVSplitMode; }
- long GetHSplitPos() const { return pThisTab->nHSplitPos; }
- long GetVSplitPos() const { return pThisTab->nVSplitPos; }
- SCCOL GetFixPosX() const { return pThisTab->nFixPosX; }
- SCROW GetFixPosY() const { return pThisTab->nFixPosY; }
- BOOL IsPagebreakMode() const { return bPagebreak; }
-
- void SetPosX( ScHSplitPos eWhich, SCCOL nNewPosX );
- void SetPosY( ScVSplitPos eWhich, SCROW nNewPosY );
- void SetCurX( SCCOL nNewCurX ) { pThisTab->nCurX = nNewCurX; }
- void SetCurY( SCROW nNewCurY ) { pThisTab->nCurY = nNewCurY; }
- void SetOldCursor( SCCOL nNewX, SCROW nNewY );
- void ResetOldCursor();
- void SetHSplitMode( ScSplitMode eMode ) { pThisTab->eHSplitMode = eMode; }
- void SetVSplitMode( ScSplitMode eMode ) { pThisTab->eVSplitMode = eMode; }
- void SetHSplitPos( long nPos ) { pThisTab->nHSplitPos = nPos; }
- void SetVSplitPos( long nPos ) { pThisTab->nVSplitPos = nPos; }
- void SetFixPosX( SCCOL nPos ) { pThisTab->nFixPosX = nPos; }
- void SetFixPosY( SCROW nPos ) { pThisTab->nFixPosY = nPos; }
- void SetPagebreakMode( BOOL bSet );
+ void WriteUserDataSequence(com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings);
+ void ReadUserDataSequence(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& rSettings);
+
+ ScDocument* GetDocument() const;
+
+ void SetViewShell( ScTabViewShell* pViewSh );
+
+ BOOL IsActive() const { return bActive; }
+ void Activate(BOOL bActivate) { bActive = bActivate; }
+
+ void UpdateThis();
+
+ void InsertTab( SCTAB nTab );
+ void DeleteTab( SCTAB nTab );
+ void CopyTab( SCTAB nSrcTab, SCTAB nDestTab );
+ void MoveTab( SCTAB nSrcTab, SCTAB nDestTab );
+
+ SCTAB GetRefTabNo() const { return nRefTabNo; }
+ void SetRefTabNo( SCTAB nNewTab ) { nRefTabNo = nNewTab; }
+
+ SCTAB GetTabNo() const { return nTabNo; }
+ ScSplitPos GetActivePart() const { return pThisTab->eWhichActive; }
+ SCCOL GetPosX( ScHSplitPos eWhich ) const { return pThisTab->nPosX[eWhich]; }
+ SCROW GetPosY( ScVSplitPos eWhich ) const { return pThisTab->nPosY[eWhich]; }
+ SCCOL GetCurX() const { return pThisTab->nCurX; }
+ SCROW GetCurY() const { return pThisTab->nCurY; }
+ BOOL HasOldCursor() const { return pThisTab->bOldCurValid; }
+ SCCOL GetOldCurX() const;
+ SCROW GetOldCurY() const;
+ ScSplitMode GetHSplitMode() const { return pThisTab->eHSplitMode; }
+ ScSplitMode GetVSplitMode() const { return pThisTab->eVSplitMode; }
+ long GetHSplitPos() const { return pThisTab->nHSplitPos; }
+ long GetVSplitPos() const { return pThisTab->nVSplitPos; }
+ SCCOL GetFixPosX() const { return pThisTab->nFixPosX; }
+ SCROW GetFixPosY() const { return pThisTab->nFixPosY; }
+ BOOL IsPagebreakMode() const { return bPagebreak; }
+
+ void SetPosX( ScHSplitPos eWhich, SCCOL nNewPosX );
+ void SetPosY( ScVSplitPos eWhich, SCROW nNewPosY );
+ void SetCurX( SCCOL nNewCurX ) { pThisTab->nCurX = nNewCurX; }
+ void SetCurY( SCROW nNewCurY ) { pThisTab->nCurY = nNewCurY; }
+ void SetOldCursor( SCCOL nNewX, SCROW nNewY );
+ void ResetOldCursor();
+ void SetHSplitMode( ScSplitMode eMode ) { pThisTab->eHSplitMode = eMode; }
+ void SetVSplitMode( ScSplitMode eMode ) { pThisTab->eVSplitMode = eMode; }
+ void SetHSplitPos( long nPos ) { pThisTab->nHSplitPos = nPos; }
+ void SetVSplitPos( long nPos ) { pThisTab->nVSplitPos = nPos; }
+ void SetFixPosX( SCCOL nPos ) { pThisTab->nFixPosX = nPos; }
+ void SetFixPosY( SCROW nPos ) { pThisTab->nFixPosY = nPos; }
+ void SetPagebreakMode( BOOL bSet );
void SetZoomType( SvxZoomType eNew, BOOL bAll );
void SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs );
@@ -314,188 +314,188 @@ public:
void SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll );
void RefreshZoom();
- void SetSelCtrlMouseClick( BOOL bTmp ) { bSelCtrlMouseClick = bTmp; }
+ void SetSelCtrlMouseClick( BOOL bTmp ) { bSelCtrlMouseClick = bTmp; }
SvxZoomType GetZoomType() const { return pThisTab->eZoomType; }
- const Fraction& GetZoomX() const { return bPagebreak ? pThisTab->aPageZoomX : pThisTab->aZoomX; }
- const Fraction& GetZoomY() const { return bPagebreak ? pThisTab->aPageZoomY : pThisTab->aZoomY; }
+ const Fraction& GetZoomX() const { return bPagebreak ? pThisTab->aPageZoomX : pThisTab->aZoomX; }
+ const Fraction& GetZoomY() const { return bPagebreak ? pThisTab->aPageZoomY : pThisTab->aZoomY; }
- const MapMode& GetLogicMode( ScSplitPos eWhich );
- const MapMode& GetLogicMode(); // Offset 0
+ const MapMode& GetLogicMode( ScSplitPos eWhich );
+ const MapMode& GetLogicMode(); // Offset 0
- long GetTPosX( ScHSplitPos eWhich ) const { return pThisTab->nTPosX[eWhich]; }
- long GetTPosY( ScVSplitPos eWhich ) const { return pThisTab->nTPosY[eWhich]; }
+ long GetTPosX( ScHSplitPos eWhich ) const { return pThisTab->nTPosX[eWhich]; }
+ long GetTPosY( ScVSplitPos eWhich ) const { return pThisTab->nTPosY[eWhich]; }
- double GetPPTX() const { return nPPTX; }
- double GetPPTY() const { return nPPTY; }
+ double GetPPTX() const { return nPPTX; }
+ double GetPPTY() const { return nPPTY; }
ScMarkType GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& rStartTab,
SCCOL& rEndCol, SCROW& rEndRow, SCTAB& rEndTab ) const;
ScMarkType GetSimpleArea( ScRange& rRange ) const;
/// May modify rNewMark using MarkToSimple().
ScMarkType GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) const;
- void GetMultiArea( ScRangeListRef& rRange ) const;
+ void GetMultiArea( ScRangeListRef& rRange ) const;
- BOOL SimpleColMarked();
- BOOL SimpleRowMarked();
+ BOOL SimpleColMarked();
+ BOOL SimpleRowMarked();
- BOOL IsMultiMarked();
+ BOOL IsMultiMarked();
- void SetFillMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
- void SetDragMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
+ void SetFillMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
+ void SetDragMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
BYTE nMode );
- void GetFillData( SCCOL& rStartCol, SCROW& rStartRow,
+ void GetFillData( SCCOL& rStartCol, SCROW& rStartRow,
SCCOL& rEndCol, SCROW& rEndRow );
- void ResetFillMode();
- BOOL IsAnyFillMode() { return nFillMode != SC_FILL_NONE; }
- BOOL IsFillMode() { return nFillMode == SC_FILL_FILL; }
- BYTE GetFillMode() { return nFillMode; }
+ void ResetFillMode();
+ BOOL IsAnyFillMode() { return nFillMode != SC_FILL_NONE; }
+ BOOL IsFillMode() { return nFillMode == SC_FILL_FILL; }
+ BYTE GetFillMode() { return nFillMode; }
// TRUE: Zelle ist zusammengefasst
- BOOL GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix );
- BOOL GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich,
+ BOOL GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix );
+ BOOL GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich,
SCsCOL& rPosX, SCsROW& rPosY,
BOOL bTestMerge = TRUE, BOOL bRepair = FALSE,
BOOL bNextIfLarge = TRUE );
- void GetMouseQuadrant( const Point& rClickPos, ScSplitPos eWhich,
+ void GetMouseQuadrant( const Point& rClickPos, ScSplitPos eWhich,
SCsCOL nPosX, SCsROW nPosY, BOOL& rLeft, BOOL& rTop );
- BOOL IsRefMode() const { return bIsRefMode; }
- ScRefType GetRefType() const { return eRefType; }
- SCCOL GetRefStartX() const { return nRefStartX; }
- SCROW GetRefStartY() const { return nRefStartY; }
- SCTAB GetRefStartZ() const { return nRefStartZ; }
- SCCOL GetRefEndX() const { return nRefEndX; }
- SCROW GetRefEndY() const { return nRefEndY; }
- SCTAB GetRefEndZ() const { return nRefEndZ; }
+ BOOL IsRefMode() const { return bIsRefMode; }
+ ScRefType GetRefType() const { return eRefType; }
+ SCCOL GetRefStartX() const { return nRefStartX; }
+ SCROW GetRefStartY() const { return nRefStartY; }
+ SCTAB GetRefStartZ() const { return nRefStartZ; }
+ SCCOL GetRefEndX() const { return nRefEndX; }
+ SCROW GetRefEndY() const { return nRefEndY; }
+ SCTAB GetRefEndZ() const { return nRefEndZ; }
- void SetRefMode( BOOL bNewMode, ScRefType eNewType )
+ void SetRefMode( BOOL bNewMode, ScRefType eNewType )
{ bIsRefMode = bNewMode; eRefType = eNewType; }
- void SetRefStart( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ )
+ void SetRefStart( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ )
{ nRefStartX = nNewX; nRefStartY = nNewY; nRefStartZ = nNewZ; }
- void SetRefEnd( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ )
+ void SetRefEnd( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ )
{ nRefEndX = nNewX; nRefEndY = nNewY; nRefEndZ = nNewZ; }
- void ResetDelMark() { bDelMarkValid = FALSE; }
- void SetDelMark( const ScRange& rRange )
+ void ResetDelMark() { bDelMarkValid = FALSE; }
+ void SetDelMark( const ScRange& rRange )
{ aDelRange = rRange; bDelMarkValid = TRUE; }
- BOOL GetDelMark( ScRange& rRange ) const
+ BOOL GetDelMark( ScRange& rRange ) const
{ rRange = aDelRange; return bDelMarkValid; }
- inline void GetMoveCursor( SCCOL& rCurX, SCROW& rCurY );
-
- const ScViewOptions& GetOptions() const { return *pOptions; }
- void SetOptions( const ScViewOptions& rOpt );
-
- BOOL IsGridMode () const { return pOptions->GetOption( VOPT_GRID ); }
- void SetGridMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_GRID, bNewMode ); }
- BOOL IsSyntaxMode () const { return pOptions->GetOption( VOPT_SYNTAX ); }
- void SetSyntaxMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_SYNTAX, bNewMode ); }
- BOOL IsHeaderMode () const { return pOptions->GetOption( VOPT_HEADER ); }
- void SetHeaderMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_HEADER, bNewMode ); }
- BOOL IsTabMode () const { return pOptions->GetOption( VOPT_TABCONTROLS ); }
- void SetTabMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_TABCONTROLS, bNewMode ); }
- BOOL IsVScrollMode () const { return pOptions->GetOption( VOPT_VSCROLL ); }
- void SetVScrollMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_VSCROLL, bNewMode ); }
- BOOL IsHScrollMode () const { return pOptions->GetOption( VOPT_HSCROLL ); }
- void SetHScrollMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_HSCROLL, bNewMode ); }
- BOOL IsOutlineMode () const { return pOptions->GetOption( VOPT_OUTLINER ); }
- void SetOutlineMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_OUTLINER, bNewMode ); }
-
- void KillEditView();
- void ResetEditView();
- void SetEditEngine( ScSplitPos eWhich,
+ inline void GetMoveCursor( SCCOL& rCurX, SCROW& rCurY );
+
+ const ScViewOptions& GetOptions() const { return *pOptions; }
+ void SetOptions( const ScViewOptions& rOpt );
+
+ BOOL IsGridMode () const { return pOptions->GetOption( VOPT_GRID ); }
+ void SetGridMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_GRID, bNewMode ); }
+ BOOL IsSyntaxMode () const { return pOptions->GetOption( VOPT_SYNTAX ); }
+ void SetSyntaxMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_SYNTAX, bNewMode ); }
+ BOOL IsHeaderMode () const { return pOptions->GetOption( VOPT_HEADER ); }
+ void SetHeaderMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_HEADER, bNewMode ); }
+ BOOL IsTabMode () const { return pOptions->GetOption( VOPT_TABCONTROLS ); }
+ void SetTabMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_TABCONTROLS, bNewMode ); }
+ BOOL IsVScrollMode () const { return pOptions->GetOption( VOPT_VSCROLL ); }
+ void SetVScrollMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_VSCROLL, bNewMode ); }
+ BOOL IsHScrollMode () const { return pOptions->GetOption( VOPT_HSCROLL ); }
+ void SetHScrollMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_HSCROLL, bNewMode ); }
+ BOOL IsOutlineMode () const { return pOptions->GetOption( VOPT_OUTLINER ); }
+ void SetOutlineMode ( BOOL bNewMode ) { pOptions->SetOption( VOPT_OUTLINER, bNewMode ); }
+
+ void KillEditView();
+ void ResetEditView();
+ void SetEditEngine( ScSplitPos eWhich,
ScEditEngineDefaulter* pNewEngine,
Window* pWin, SCCOL nNewX, SCROW nNewY );
- void GetEditView( ScSplitPos eWhich, EditView*& rViewPtr, SCCOL& rCol, SCROW& rRow );
- BOOL HasEditView( ScSplitPos eWhich ) const
+ void GetEditView( ScSplitPos eWhich, EditView*& rViewPtr, SCCOL& rCol, SCROW& rRow );
+ BOOL HasEditView( ScSplitPos eWhich ) const
{ return pEditView[eWhich] && bEditActive[eWhich]; }
- EditView* GetEditView( ScSplitPos eWhich ) const
+ EditView* GetEditView( ScSplitPos eWhich ) const
{ return pEditView[eWhich]; }
- void EditGrowX();
- void EditGrowY( BOOL bInitial = FALSE );
+ void EditGrowX();
+ void EditGrowY( BOOL bInitial = FALSE );
ScSplitPos GetEditActivePart() const { return eEditActivePart; }
- SCCOL GetEditViewCol() const { return nEditCol; }
- SCROW GetEditViewRow() const { return nEditRow; }
- SCCOL GetEditStartCol() const { return nEditStartCol; }
- SCROW GetEditStartRow() const { return nEditRow; } // never editing above the cell
- SCCOL GetEditEndCol() const { return nEditEndCol; }
- SCROW GetEditEndRow() const { return nEditEndRow; }
-
- Rectangle GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, Window* pWin,
+ SCCOL GetEditViewCol() const { return nEditCol; }
+ SCROW GetEditViewRow() const { return nEditRow; }
+ SCCOL GetEditStartCol() const { return nEditStartCol; }
+ SCROW GetEditStartRow() const { return nEditRow; } // never editing above the cell
+ SCCOL GetEditEndCol() const { return nEditEndCol; }
+ SCROW GetEditEndRow() const { return nEditEndRow; }
+
+ Rectangle GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, Window* pWin,
const ScPatternAttr* pPattern, BOOL bForceToTop );
- void SetTabNo( SCTAB nNewTab );
- void SetActivePart( ScSplitPos eNewActive );
+ void SetTabNo( SCTAB nNewTab );
+ void SetActivePart( ScSplitPos eNewActive );
- Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich,
+ Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich,
BOOL bAllowNeg = FALSE ) const;
- Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScHSplitPos eWhich ) const;
- Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScVSplitPos eWhich ) const;
+ Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScHSplitPos eWhich ) const;
+ Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScVSplitPos eWhich ) const;
- SCCOL CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHORT nScrSizeY = SC_SIZE_NONE ) const;
- SCROW CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, USHORT nScrSizeX = SC_SIZE_NONE ) const;
+ SCCOL CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHORT nScrSizeY = SC_SIZE_NONE ) const;
+ SCROW CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, USHORT nScrSizeX = SC_SIZE_NONE ) const;
- SCCOL VisibleCellsX( ScHSplitPos eWhichX ) const; // angezeigte komplette Zellen
- SCROW VisibleCellsY( ScVSplitPos eWhichY ) const;
- SCCOL PrevCellsX( ScHSplitPos eWhichX ) const; // Zellen auf der vorgehenden Seite
- SCROW PrevCellsY( ScVSplitPos eWhichY ) const;
+ SCCOL VisibleCellsX( ScHSplitPos eWhichX ) const; // angezeigte komplette Zellen
+ SCROW VisibleCellsY( ScVSplitPos eWhichY ) const;
+ SCCOL PrevCellsX( ScHSplitPos eWhichX ) const; // Zellen auf der vorgehenden Seite
+ SCROW PrevCellsY( ScVSplitPos eWhichY ) const;
//UNUSED2008-05 SCCOL LastCellsX( ScHSplitPos eWhichX ) const; // Zellen auf der letzten Seite
//UNUSED2008-05 SCROW LastCellsY( ScVSplitPos eWhichY ) const;
- BOOL IsOle();
+ BOOL IsOle();
//UNUSED2008-05 void UpdateOle( ScSplitPos eWhich );
- void SetScreen( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
- void SetScreen( const Rectangle& rVisArea );
- void SetScreenPos( const Point& rVisAreaStart );
+ void SetScreen( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
+ void SetScreen( const Rectangle& rVisArea );
+ void SetScreenPos( const Point& rVisAreaStart );
- void UpdateScreenZoom( const Fraction& rNewX, const Fraction& rNewY );
+ void UpdateScreenZoom( const Fraction& rNewX, const Fraction& rNewY );
- Size GetScrSize() const { return aScrSize; }
+ Size GetScrSize() const { return aScrSize; }
- void RecalcPixPos();
- Point GetPixPos( ScSplitPos eWhich ) const
+ void RecalcPixPos();
+ Point GetPixPos( ScSplitPos eWhich ) const
{ return Point( pThisTab->nPixPosX[WhichH(eWhich)],
pThisTab->nPixPosY[WhichV(eWhich)] ); }
- void SetSpellingView( EditView* pSpView) { pSpellingView = pSpView; }
- EditView* GetSpellingView() const { return pSpellingView; }
+ void SetSpellingView( EditView* pSpView) { pSpellingView = pSpView; }
+ EditView* GetSpellingView() const { return pSpellingView; }
- void UpdateOutlinerFlags( Outliner& rOutl ) const;
+ void UpdateOutlinerFlags( Outliner& rOutl ) const;
- Point GetMousePosPixel();
+ Point GetMousePosPixel();
- BOOL UpdateFixX(SCTAB nTab = MAXTAB+1);
- BOOL UpdateFixY(SCTAB nTab = MAXTAB+1);
+ BOOL UpdateFixX(SCTAB nTab = MAXTAB+1);
+ BOOL UpdateFixY(SCTAB nTab = MAXTAB+1);
- SCCOL GetTabStartCol() const { return nTabStartCol; }
- void SetTabStartCol(SCCOL nNew) { nTabStartCol = nNew; }
+ SCCOL GetTabStartCol() const { return nTabStartCol; }
+ void SetTabStartCol(SCCOL nNew) { nTabStartCol = nNew; }
- ScAddress GetCurPos() const;
+ ScAddress GetCurPos() const;
- const Size& GetScenButSize() const { return aScenButSize; }
- void SetScenButSize(const Size& rNew) { aScenButSize = rNew; }
+ const Size& GetScenButSize() const { return aScenButSize; }
+ void SetScenButSize(const Size& rNew) { aScenButSize = rNew; }
- BOOL IsSelCtrlMouseClick() { return bSelCtrlMouseClick; }
+ BOOL IsSelCtrlMouseClick() { return bSelCtrlMouseClick; }
static inline long ToPixel( USHORT nTwips, double nFactor );
- /** while (rScrY <= nEndPixels && rPosY <= nEndRow) add pixels of row
- heights converted with nPPTY to rScrY, optimized for row height
- segments. Upon return rPosY is the last row evaluated <= nEndRow, rScrY
- may be > nEndPixels!
+ /** while (rScrY <= nEndPixels && rPosY <= nEndRow) add pixels of row
+ heights converted with nPPTY to rScrY, optimized for row height
+ segments. Upon return rPosY is the last row evaluated <= nEndRow, rScrY
+ may be > nEndPixels!
*/
static void AddPixelsWhile( long & rScrY, long nEndPixels,
SCROW & rPosY, SCROW nEndRow, double nPPTY,
const ScDocument * pDoc, SCTAB nTabNo );
- /** while (rScrY <= nEndPixels && rPosY >= nStartRow) add pixels of row
- heights converted with nPPTY to rScrY, optimized for row height
- segments. Upon return rPosY is the last row evaluated >= nStartRow,
- rScrY may be > nEndPixels!
+ /** while (rScrY <= nEndPixels && rPosY >= nStartRow) add pixels of row
+ heights converted with nPPTY to rScrY, optimized for row height
+ segments. Upon return rPosY is the last row evaluated >= nStartRow,
+ rScrY may be > nEndPixels!
*/
static void AddPixelsWhileBackward( long & rScrY, long nEndPixels,
SCROW & rPosY, SCROW nStartRow, double nPPTY,
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 59da2966cc60..1f969dafb371 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,230 +77,230 @@ namespace com { namespace sun { namespace star { namespace datatransfer { class
class ScViewFunc : public ScTabView
{
private:
- ScAddress aFormatSource; // fuer automatisches Erweitern von Formatierung
- ScRange aFormatArea;
- BOOL bFormatValid;
+ ScAddress aFormatSource; // fuer automatisches Erweitern von Formatierung
+ ScRange aFormatArea;
+ BOOL bFormatValid;
public:
ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell );
//UNUSED2008-05 ScViewFunc( Window* pParent, const ScViewFunc& rViewFunc, ScTabViewShell* pViewShell );
~ScViewFunc();
- const ScPatternAttr* GetSelectionPattern ();
- void GetSelectionFrame ( SvxBoxItem& rLineOuter,
- SvxBoxInfoItem& rLineInner );
+ const ScPatternAttr* GetSelectionPattern ();
+ void GetSelectionFrame ( SvxBoxItem& rLineOuter,
+ SvxBoxInfoItem& rLineInner );
- BYTE GetSelectionScriptType();
+ BYTE GetSelectionScriptType();
- BOOL GetAutoSumArea(ScRangeList& rRangeList);
- void EnterAutoSum(const ScRangeList& rRangeList, sal_Bool bSubTotal);
+ BOOL GetAutoSumArea(ScRangeList& rRangeList);
+ void EnterAutoSum(const ScRangeList& rRangeList, sal_Bool bSubTotal);
bool AutoSum( const ScRange& rRange, bool bSubTotal, bool bSetCursor, bool bContinue );
String GetAutoSumFormula( const ScRangeList& rRangeList, bool bSubTotal );
- void EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString,
+ void EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString,
BOOL bRecord = TRUE, const EditTextObject* pData = NULL );
- void EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rValue );
- void EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextObject* pData,
+ void EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rValue );
+ void EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextObject* pData,
BOOL bRecord = TRUE, BOOL bTestSimple = FALSE );
- void EnterMatrix( const String& rString );
- void EnterBlock( const String& rString, const EditTextObject* pData );
+ void EnterMatrix( const String& rString );
+ void EnterBlock( const String& rString, const EditTextObject* pData );
- void EnterDataAtCursor( const String& rString ); //! nicht benutzt ?
+ void EnterDataAtCursor( const String& rString ); //! nicht benutzt ?
- SC_DLLPUBLIC void CutToClip( ScDocument* pClipDoc = NULL, BOOL bIncludeObjects = FALSE );
- SC_DLLPUBLIC BOOL CopyToClip( ScDocument* pClipDoc = NULL, BOOL bCut = FALSE, BOOL bApi = FALSE,
+ SC_DLLPUBLIC void CutToClip( ScDocument* pClipDoc = NULL, BOOL bIncludeObjects = FALSE );
+ SC_DLLPUBLIC BOOL CopyToClip( ScDocument* pClipDoc = NULL, BOOL bCut = FALSE, BOOL bApi = FALSE,
BOOL bIncludeObjects = FALSE, BOOL bStopEdit = TRUE );
ScTransferObj* CopyToTransferable();
- SC_DLLPUBLIC BOOL PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
+ SC_DLLPUBLIC BOOL PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
USHORT nFunction = PASTE_NOFUNC, BOOL bSkipEmpty = FALSE,
BOOL bTranspose = FALSE, BOOL bAsLink = FALSE,
InsCellCmd eMoveMode = INS_NONE,
USHORT nUndoExtraFlags = IDF_NONE,
BOOL bAllowDialogs = FALSE );
- void FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL bAsLink );
+ void FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL bAsLink );
- SC_DLLPUBLIC void PasteFromSystem();
- SC_DLLPUBLIC BOOL PasteFromSystem( ULONG nFormatId, BOOL bApi = FALSE );
+ SC_DLLPUBLIC void PasteFromSystem();
+ SC_DLLPUBLIC BOOL PasteFromSystem( ULONG nFormatId, BOOL bApi = FALSE );
void PasteFromTransferable( const ::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::XTransferable >& rxTransferable );
- void PasteDraw();
- void PasteDraw( const Point& rLogicPos, SdrModel* pModel,
+ void PasteDraw();
+ void PasteDraw( const Point& rLogicPos, SdrModel* pModel,
BOOL bGroup = FALSE, BOOL bSameDocClipboard = FALSE );
- BOOL PasteOnDrawObject( const ::com::sun::star::uno::Reference<
+ BOOL PasteOnDrawObject( const ::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::XTransferable >& rxTransferable,
SdrObject* pHitObj, BOOL bLink );
- BOOL PasteDataFormat( ULONG nFormatId,
+ BOOL PasteDataFormat( ULONG nFormatId,
const ::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::XTransferable >& rxTransferable,
SCCOL nPosX, SCROW nPosY, Point* pLogicPos = NULL,
BOOL bLink = FALSE, BOOL bAllowDialogs = FALSE );
- BOOL PasteFile( const Point&, const String&, BOOL bLink=FALSE );
+ BOOL PasteFile( const Point&, const String&, BOOL bLink=FALSE );
BOOL PasteObject( const Point&, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&, const Size* = NULL, const Graphic* = NULL, const ::rtl::OUString& = ::rtl::OUString(), sal_Int64 nAspect = ::com::sun::star::embed::Aspects::MSOLE_CONTENT );
- BOOL PasteBitmap( const Point&, const Bitmap& );
- BOOL PasteMetaFile( const Point&, const GDIMetaFile& );
- BOOL PasteGraphic( const Point& rPos, const Graphic& rGraphic,
+ BOOL PasteBitmap( const Point&, const Bitmap& );
+ BOOL PasteMetaFile( const Point&, const GDIMetaFile& );
+ BOOL PasteGraphic( const Point& rPos, const Graphic& rGraphic,
const String& rFile, const String& rFilter );
- BOOL PasteBookmark( ULONG nFormatId,
+ BOOL PasteBookmark( ULONG nFormatId,
const ::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::XTransferable >& rxTransferable,
SCCOL nPosX, SCROW nPosY );
- BOOL PasteDDE( const ::com::sun::star::uno::Reference<
+ BOOL PasteDDE( const ::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::XTransferable >& rxTransferable );
- BOOL ApplyGraphicToObject( SdrObject* pObject, const Graphic& rGraphic );
+ BOOL ApplyGraphicToObject( SdrObject* pObject, const Graphic& rGraphic );
- void InsertBookmark( const String& rDescription, const String& rURL,
+ void InsertBookmark( const String& rDescription, const String& rURL,
SCCOL nPosX, SCROW nPosY, const String* pTarget = NULL,
BOOL bTryReplace = FALSE );
- BOOL HasBookmarkAtCursor( SvxHyperlinkItem* pContent );
+ BOOL HasBookmarkAtCursor( SvxHyperlinkItem* pContent );
- long DropRequestHdl( Exchange* pExchange );
- BOOL MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
+ long DropRequestHdl( Exchange* pExchange );
+ BOOL MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
BOOL bCut, BOOL bRecord, BOOL bPaint, BOOL bApi );
- BOOL LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, BOOL bApi );
+ BOOL LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, BOOL bApi );
- void CreateNames( USHORT nFlags );
- USHORT GetCreateNameFlags();
- void InsertNameList();
- BOOL InsertName( const String& rName, const String& rSymbol,
+ void CreateNames( USHORT nFlags );
+ USHORT GetCreateNameFlags();
+ void InsertNameList();
+ BOOL InsertName( const String& rName, const String& rSymbol,
const String& rType );
- void ApplyAttributes( const SfxItemSet* pDialogSet, const SfxItemSet* pOldSet,
+ void ApplyAttributes( const SfxItemSet* pDialogSet, const SfxItemSet* pOldSet,
BOOL bRecord = TRUE );
- void ApplyAttr( const SfxPoolItem& rAttrItem );
- void ApplySelectionPattern( const ScPatternAttr& rAttr,
+ void ApplyAttr( const SfxPoolItem& rAttrItem );
+ void ApplySelectionPattern( const ScPatternAttr& rAttr,
BOOL bRecord = TRUE,
BOOL bCursorOnly = FALSE );
- void ApplyPatternLines( const ScPatternAttr& rAttr,
+ void ApplyPatternLines( const ScPatternAttr& rAttr,
const SvxBoxItem* pNewOuter,
const SvxBoxInfoItem* pNewInner, BOOL bRecord = TRUE );
- void ApplyUserItemSet( const SfxItemSet& rItemSet );
+ void ApplyUserItemSet( const SfxItemSet& rItemSet );
- const SfxStyleSheet* GetStyleSheetFromMarked();
- void SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet,
+ const SfxStyleSheet* GetStyleSheetFromMarked();
+ void SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet,
BOOL bRecord = TRUE );
- void RemoveStyleSheetInUse( SfxStyleSheet* pStyleSheet );
- void UpdateStyleSheetInUse( SfxStyleSheet* pStyleSheet );
+ void RemoveStyleSheetInUse( SfxStyleSheet* pStyleSheet );
+ void UpdateStyleSheetInUse( SfxStyleSheet* pStyleSheet );
- void SetNumberFormat( short nFormatType, ULONG nAdd = 0 );
- void SetNumFmtByStr( const String& rCode );
- void ChangeNumFmtDecimals( BOOL bIncrement );
+ void SetNumberFormat( short nFormatType, ULONG nAdd = 0 );
+ void SetNumFmtByStr( const String& rCode );
+ void ChangeNumFmtDecimals( BOOL bIncrement );
- void SetConditionalFormat( const ScConditionalFormat& rNew );
- void SetValidation( const ScValidationData& rNew );
+ void SetConditionalFormat( const ScConditionalFormat& rNew );
+ void SetValidation( const ScValidationData& rNew );
- void ChangeIndent( BOOL bIncrement );
+ void ChangeIndent( BOOL bIncrement );
- void ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect );
+ void ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect );
- void Protect( SCTAB nTab, const String& rPassword );
- BOOL Unprotect( SCTAB nTab, const String& rPassword );
+ void Protect( SCTAB nTab, const String& rPassword );
+ BOOL Unprotect( SCTAB nTab, const String& rPassword );
- void DeleteCells( DelCellCmd eCmd, BOOL bRecord = TRUE );
- BOOL InsertCells( InsCellCmd eCmd, BOOL bRecord = TRUE, BOOL bPartOfPaste = FALSE );
- void DeleteMulti( BOOL bRows, BOOL bRecord = TRUE );
+ void DeleteCells( DelCellCmd eCmd, BOOL bRecord = TRUE );
+ BOOL InsertCells( InsCellCmd eCmd, BOOL bRecord = TRUE, BOOL bPartOfPaste = FALSE );
+ void DeleteMulti( BOOL bRows, BOOL bRecord = TRUE );
- void DeleteContents( USHORT nFlags, BOOL bRecord = TRUE );
+ void DeleteContents( USHORT nFlags, BOOL bRecord = TRUE );
- void SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges,
+ void SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges,
ScSizeMode eMode, USHORT nSizeTwips,
BOOL bRecord = TRUE, BOOL bPaint = TRUE,
ScMarkData* pMarkData = NULL );
- void SetMarkedWidthOrHeight( BOOL bWidth, ScSizeMode eMode, USHORT nSizeTwips,
+ void SetMarkedWidthOrHeight( BOOL bWidth, ScSizeMode eMode, USHORT nSizeTwips,
BOOL bRecord = TRUE, BOOL bPaint = TRUE );
- void ShowMarkedColumns( BOOL bShow, BOOL bRecord = TRUE );
- void ShowMarkedRows( BOOL bShow, BOOL bRecord = TRUE );
+ void ShowMarkedColumns( BOOL bShow, BOOL bRecord = TRUE );
+ void ShowMarkedRows( BOOL bShow, BOOL bRecord = TRUE );
- BOOL AdjustBlockHeight( BOOL bPaint = TRUE, ScMarkData* pMarkData = NULL );
- BOOL AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, BOOL bPaint = TRUE );
+ BOOL AdjustBlockHeight( BOOL bPaint = TRUE, ScMarkData* pMarkData = NULL );
+ BOOL AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, BOOL bPaint = TRUE );
- void ModifyCellSize( ScDirection eDir, BOOL bOptimal );
+ void ModifyCellSize( ScDirection eDir, BOOL bOptimal );
- SC_DLLPUBLIC void InsertPageBreak( BOOL bColumn, BOOL bRecord = TRUE,
+ SC_DLLPUBLIC void InsertPageBreak( BOOL bColumn, BOOL bRecord = TRUE,
const ScAddress* pPos = NULL,
BOOL bSetModified = TRUE );
- SC_DLLPUBLIC void DeletePageBreak( BOOL bColumn, BOOL bRecord = TRUE,
+ SC_DLLPUBLIC void DeletePageBreak( BOOL bColumn, BOOL bRecord = TRUE,
const ScAddress* pPos = NULL,
BOOL bSetModified = TRUE );
- void RemoveManualBreaks();
+ void RemoveManualBreaks();
- void SetPrintZoom(USHORT nScale, USHORT nPages);
- void AdjustPrintZoom();
+ void SetPrintZoom(USHORT nScale, USHORT nPages);
+ void AdjustPrintZoom();
- BOOL TestMergeCells();
- BOOL TestRemoveMerge();
+ BOOL TestMergeCells();
+ BOOL TestRemoveMerge();
- BOOL MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord = TRUE );
- BOOL RemoveMerge( BOOL bRecord = TRUE );
+ BOOL MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord = TRUE );
+ BOOL RemoveMerge( BOOL bRecord = TRUE );
- void FillSimple( FillDir eDir, BOOL bRecord = TRUE );
- void FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd,
+ void FillSimple( FillDir eDir, BOOL bRecord = TRUE );
+ void FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd,
double fStart, double fStep, double fMax, BOOL bRecord = TRUE );
- void FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow,
+ void FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow, ULONG nCount, BOOL bRecord = TRUE );
- void FillCrossDblClick();
+ void FillCrossDblClick();
- void TransliterateText( sal_Int32 nType );
+ void TransliterateText( sal_Int32 nType );
ScAutoFormatData* CreateAutoFormatData();
- void AutoFormat( USHORT nFormatNo, BOOL bRecord = TRUE );
+ void AutoFormat( USHORT nFormatNo, BOOL bRecord = TRUE );
- void SearchAndReplace( const SvxSearchItem* pSearchItem,
+ void SearchAndReplace( const SvxSearchItem* pSearchItem,
BOOL bAddUndo, BOOL bIsApi );
- void Solve( const ScSolveParam& rParam );
- void TabOp( const ScTabOpParam& rParam, BOOL bRecord = TRUE );
+ void Solve( const ScSolveParam& rParam );
+ void TabOp( const ScTabOpParam& rParam, BOOL bRecord = TRUE );
- BOOL InsertTable( const String& rName, SCTAB nTabNr, BOOL bRecord = TRUE );
- BOOL InsertTables(SvStrings *pNames, SCTAB nTab, SCTAB nCount, BOOL bRecord = TRUE);
+ BOOL InsertTable( const String& rName, SCTAB nTabNr, BOOL bRecord = TRUE );
+ BOOL InsertTables(SvStrings *pNames, SCTAB nTab, SCTAB nCount, BOOL bRecord = TRUE);
- BOOL AppendTable( const String& rName, BOOL bRecord = TRUE );
+ BOOL AppendTable( const String& rName, BOOL bRecord = TRUE );
- BOOL DeleteTable( SCTAB nTabNr, BOOL bRecord = TRUE );
- BOOL DeleteTables(const SvShorts &TheTabs, BOOL bRecord = TRUE );
+ BOOL DeleteTable( SCTAB nTabNr, BOOL bRecord = TRUE );
+ BOOL DeleteTables(const SvShorts &TheTabs, BOOL bRecord = TRUE );
- BOOL RenameTable( const String& rName, SCTAB nTabNr );
- void MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy );
- void ImportTables( ScDocShell* pSrcShell,
+ BOOL RenameTable( const String& rName, SCTAB nTabNr );
+ void MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy );
+ void ImportTables( ScDocShell* pSrcShell,
SCTAB nCount, const SCTAB* pSrcTabs,
BOOL bLink,SCTAB nTab);
bool SetTabBgColor( const Color& rColor, SCTAB nTabNr );
bool SetTabBgColor( ScUndoTabColorInfo::List& rUndoSetTabBgColorInfoList );
- void InsertTableLink( const String& rFile,
+ void InsertTableLink( const String& rFile,
const String& rFilter, const String& rOptions,
const String& rTabName );
- void InsertAreaLink( const String& rFile,
+ void InsertAreaLink( const String& rFile,
const String& rFilter, const String& rOptions,
const String& rSource, ULONG nRefresh );
- void ShowTable( const String& rName );
- void HideTable( SCTAB nTabNr );
+ void ShowTable( const String& rName );
+ void HideTable( SCTAB nTabNr );
- void MakeScenario( const String& rName, const String& rComment,
+ void MakeScenario( const String& rName, const String& rComment,
const Color& rColor, USHORT nFlags );
- void ExtendScenario();
- void UseScenario( const String& rName );
+ void ExtendScenario();
+ void UseScenario( const String& rName );
- void InsertSpecialChar( const String& rStr, const Font& rFont );
+ void InsertSpecialChar( const String& rStr, const Font& rFont );
- void InsertDummyObject();
- void InsertOleObject();
+ void InsertDummyObject();
+ void InsertOleObject();
- void InsertDraw();
+ void InsertDraw();
- void SetSelectionFrameLines( const SvxBorderLine* pLine,
+ void SetSelectionFrameLines( const SvxBorderLine* pLine,
BOOL bColorOnly );
void SetNoteText( const ScAddress& rPos, const String& rNoteText );
@@ -309,7 +309,7 @@ public:
//UNUSED2008-05 void DoSpellingChecker( BOOL bRecord = TRUE );
void DoHangulHanjaConversion( BOOL bRecord = TRUE );
- void DoThesaurus( BOOL bRecord = TRUE );
+ void DoThesaurus( BOOL bRecord = TRUE );
//UNUSED2008-05 DECL_LINK( SpellError, void * );
/** Generic implementation of sheet conversion functions. */
@@ -320,34 +320,34 @@ public:
const String* pRepCol, const String* pRepRow,
BOOL bAddPrint );
- void DetectiveAddPred();
- void DetectiveDelPred();
- void DetectiveAddSucc();
- void DetectiveDelSucc();
- void DetectiveAddError();
- void DetectiveMarkInvalid();
- void DetectiveDelAll();
- void DetectiveRefresh();
+ void DetectiveAddPred();
+ void DetectiveDelPred();
+ void DetectiveAddSucc();
+ void DetectiveDelSucc();
+ void DetectiveAddError();
+ void DetectiveMarkInvalid();
+ void DetectiveDelAll();
+ void DetectiveRefresh();
- void ShowNote( bool bShow = true );
- inline void HideNote() { ShowNote( false ); }
- void EditNote();
+ void ShowNote( bool bShow = true );
+ inline void HideNote() { ShowNote( false ); }
+ void EditNote();
- void ForgetFormatArea() { bFormatValid = FALSE; }
- BOOL SelectionEditable( BOOL* pOnlyNotBecauseOfMatrix = NULL );
+ void ForgetFormatArea() { bFormatValid = FALSE; }
+ BOOL SelectionEditable( BOOL* pOnlyNotBecauseOfMatrix = NULL );
// interne Hilfsfunktionen
protected:
- void UpdateLineAttrs( SvxBorderLine& rLine,
+ void UpdateLineAttrs( SvxBorderLine& rLine,
const SvxBorderLine* pDestLine,
const SvxBorderLine* pSrcLine,
- BOOL bColor );
+ BOOL bColor );
//UNUSED2008-05 void PaintWidthHeight( BOOL bColumns, SCCOLROW nStart, SCCOLROW nEnd );
private:
- void PasteRTF( SCCOL nCol, SCROW nStartRow,
+ void PasteRTF( SCCOL nCol, SCROW nStartRow,
const ::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::XTransferable >& rxTransferable );
bool PasteMultiRangesFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc, sal_uInt16 nFunction,
@@ -355,11 +355,11 @@ private:
InsCellCmd eMoveMode, sal_uInt16 nCondFlags, sal_uInt16 nUndoFlags );
void PostPasteFromClip(const ScRange& rPasteRange, const ScMarkData& rMark);
- USHORT GetOptimalColWidth( SCCOL nCol, SCTAB nTab, BOOL bFormula );
+ USHORT GetOptimalColWidth( SCCOL nCol, SCTAB nTab, BOOL bFormula );
- void StartFormatArea();
- BOOL TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrChanged );
- void DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab,
+ void StartFormatArea();
+ BOOL TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrChanged );
+ void DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab,
BOOL bAttrChanged, BOOL bAddUndo );
};
diff --git a/sc/source/ui/inc/viewutil.hxx b/sc/source/ui/inc/viewutil.hxx
index eb1c6df2f902..9d17f866afc3 100644
--- a/sc/source/ui/inc/viewutil.hxx
+++ b/sc/source/ui/inc/viewutil.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +49,13 @@ enum ScUpdateMode { SC_UPDATE_ALL, SC_UPDATE_CHANGED, SC_UPDATE_MARKS };
// ---------------------------------------------------------------------------
-class ScViewUtil // static Methoden
+class ScViewUtil // static Methoden
{
public:
- static BOOL ExecuteCharMap( const SvxFontItem& rOldFont,
- SfxViewFrame& rFrame,
- SvxFontItem& rNewFont,
- String& rString );
+ static BOOL ExecuteCharMap( const SvxFontItem& rOldFont,
+ SfxViewFrame& rFrame,
+ SvxFontItem& rNewFont,
+ String& rString );
static BOOL IsActionShown( const ScChangeAction& rAction,
const ScChangeViewSettings& rSettings,
@@ -87,26 +87,26 @@ public:
class ScUpdateRect
{
private:
- SCCOL nOldStartX;
- SCROW nOldStartY;
- SCCOL nOldEndX;
- SCROW nOldEndY;
- SCCOL nNewStartX;
- SCROW nNewStartY;
- SCCOL nNewEndX;
- SCROW nNewEndY;
- SCCOL nContX1;
- SCROW nContY1;
- SCCOL nContX2;
- SCROW nContY2;
+ SCCOL nOldStartX;
+ SCROW nOldStartY;
+ SCCOL nOldEndX;
+ SCROW nOldEndY;
+ SCCOL nNewStartX;
+ SCROW nNewStartY;
+ SCCOL nNewEndX;
+ SCROW nNewEndY;
+ SCCOL nContX1;
+ SCROW nContY1;
+ SCCOL nContX2;
+ SCROW nContY2;
public:
ScUpdateRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 );
- void SetNew( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 );
- BOOL GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 );
-#ifdef OLD_SELECTION_PAINT
- BOOL GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, BOOL& rCont );
+ void SetNew( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 );
+ BOOL GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 );
+#ifdef OLD_SELECTION_PAINT
+ BOOL GetXorDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, BOOL& rCont );
void GetContDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 );
-#endif
+#endif
};
diff --git a/sc/source/ui/inc/warnbox.hxx b/sc/source/ui/inc/warnbox.hxx
index 3b06c98c9e3e..374c97da1762 100644
--- a/sc/source/ui/inc/warnbox.hxx
+++ b/sc/source/ui/inc/warnbox.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 6f59b64c52fc..efeab20cfbec 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +57,12 @@
// defines -------------------------------------------------------------------
-#define ABS_SREF SCA_VALID \
+#define ABS_SREF SCA_VALID \
| SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE
-#define ABS_DREF ABS_SREF \
+#define ABS_DREF ABS_SREF \
| SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE
-#define ABS_SREF3D ABS_SREF | SCA_TAB_3D
-#define ABS_DREF3D ABS_DREF | SCA_TAB_3D
+#define ABS_SREF3D ABS_SREF | SCA_TAB_3D
+#define ABS_DREF3D ABS_DREF | SCA_TAB_3D
@@ -76,12 +76,12 @@ inline void EnableDisable( Window& rWin, BOOL bEnable )
rWin.Disable();
}
-#define RD_SPECIAL_NONE 0
-#define RD_SPECIAL_CONTENT 1
-#define RD_SPECIAL_VISCONTENT 2
+#define RD_SPECIAL_NONE 0
+#define RD_SPECIAL_CONTENT 1
+#define RD_SPECIAL_VISCONTENT 2
//============================================================================
-// class ScRedlinData
+// class ScRedlinData
//----------------------------------------------------------------------------
ScRedlinData::ScRedlinData()
@@ -110,38 +110,38 @@ ScRedlinData::~ScRedlinData()
//============================================================================
-// class ScAcceptChgDlg
+// class ScAcceptChgDlg
//----------------------------------------------------------------------------
ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
- ScViewData* ptrViewData)
+ ScViewData* ptrViewData)
- : SfxModelessDialog( pB, pCW, pParent, ScResId(RID_SCDLG_CHANGES) ),
+ : SfxModelessDialog( pB, pCW, pParent, ScResId(RID_SCDLG_CHANGES) ),
//
- aAcceptChgCtr ( this, ScResId( CTR_REDLINING ) ),
+ aAcceptChgCtr ( this, ScResId( CTR_REDLINING ) ),
//
- pViewData ( ptrViewData ),
- pDoc ( ptrViewData->GetDocument() ),
+ pViewData ( ptrViewData ),
+ pDoc ( ptrViewData->GetDocument() ),
aLocalRangeName ( *(pDoc->GetRangeName()) ),
//
- aStrInsertCols ( ScResId( STR_INSERT_COLS)),
- aStrInsertRows ( ScResId( STR_INSERT_ROWS)),
- aStrInsertTabs ( ScResId( STR_INSERT_TABS)),
- aStrDeleteCols ( ScResId( STR_DELETE_COLS)),
- aStrDeleteRows ( ScResId( STR_DELETE_ROWS)),
- aStrDeleteTabs ( ScResId( STR_DELETE_TABS)),
- aStrMove ( ScResId( STR_MOVE )),
- aStrContent ( ScResId( STR_CONTENT )),
- aStrReject ( ScResId( STR_REJECT )),
- aStrAllAccepted ( ScResId( STR_ACCEPTED )),
- aStrAllRejected ( ScResId( STR_REJECTED )),
- aStrNoEntry ( ScResId( STR_NO_ENTRY )),
- aStrContentWithChild ( ScResId( STR_CONTENT_WITH_CHILD)),
- aStrChildContent ( ScResId( STR_CHILD_CONTENT)),
- aStrChildOrgContent ( ScResId( STR_CHILD_ORGCONTENT)),
- aStrEmpty ( ScResId( STR_EMPTY ))
+ aStrInsertCols ( ScResId( STR_INSERT_COLS)),
+ aStrInsertRows ( ScResId( STR_INSERT_ROWS)),
+ aStrInsertTabs ( ScResId( STR_INSERT_TABS)),
+ aStrDeleteCols ( ScResId( STR_DELETE_COLS)),
+ aStrDeleteRows ( ScResId( STR_DELETE_ROWS)),
+ aStrDeleteTabs ( ScResId( STR_DELETE_TABS)),
+ aStrMove ( ScResId( STR_MOVE )),
+ aStrContent ( ScResId( STR_CONTENT )),
+ aStrReject ( ScResId( STR_REJECT )),
+ aStrAllAccepted ( ScResId( STR_ACCEPTED )),
+ aStrAllRejected ( ScResId( STR_REJECTED )),
+ aStrNoEntry ( ScResId( STR_NO_ENTRY )),
+ aStrContentWithChild ( ScResId( STR_CONTENT_WITH_CHILD)),
+ aStrChildContent ( ScResId( STR_CHILD_CONTENT)),
+ aStrChildOrgContent ( ScResId( STR_CHILD_ORGCONTENT)),
+ aStrEmpty ( ScResId( STR_EMPTY ))
{
FreeResource();
-// bScAcceptChgDlgIsDead=FALSE;
+// bScAcceptChgDlgIsDead=FALSE;
bNoSelection=FALSE;
bNeedsUpdate=FALSE;
bIgnoreMsg=FALSE;
@@ -154,8 +154,8 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP
aReOpenTimer.SetTimeout(50);
aReOpenTimer.SetTimeoutHdl(LINK( this, ScAcceptChgDlg, ReOpenTimerHdl ));
- // dialog is now only hidden, not deleted, on switching views,
- // so there's no need to restore settings when reopening
+ // dialog is now only hidden, not deleted, on switching views,
+ // so there's no need to restore settings when reopening
MinSize=aAcceptChgCtr.GetMinSizePixel();
MinSize.Height()+=2;
@@ -201,7 +201,7 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP
}
ScAcceptChgDlg::~ScAcceptChgDlg()
{
-// bScAcceptChgDlgIsDead=TRUE;
+// bScAcceptChgDlgIsDead=TRUE;
ClearView();
ScChangeTrack* pChanges=pDoc->GetChangeTrack();
@@ -232,8 +232,8 @@ void ScAcceptChgDlg::ReInit(ScViewData* ptrViewData)
bAcceptEnableFlag=TRUE;
bRejectEnableFlag=TRUE;
- // #91781# don't call Init here (switching between views), just set link below
- // (dialog is just hidden, not deleted anymore, when switching views)
+ // #91781# don't call Init here (switching between views), just set link below
+ // (dialog is just hidden, not deleted anymore, when switching views)
ClearView();
UpdateView();
@@ -247,7 +247,7 @@ void ScAcceptChgDlg::ReInit(ScViewData* ptrViewData)
void __EXPORT ScAcceptChgDlg::Init()
{
- String aAreaStr;
+ String aAreaStr;
ScRange aRange;
DBG_ASSERT( pViewData && pDoc, "ViewData oder Document nicht gefunden!" );
@@ -260,7 +260,7 @@ void __EXPORT ScAcceptChgDlg::Init()
aChangeViewSet.SetTheAuthorToShow(pChanges->GetUser());
pTPFilter->ClearAuthors();
ScStrCollection aUserColl=pChanges->GetUserCollection();
- for(USHORT i=0;i<aUserColl.GetCount();i++)
+ for(USHORT i=0;i<aUserColl.GetCount();i++)
pTPFilter->InsertAuthor(aUserColl[i]->GetString());
}
@@ -331,25 +331,25 @@ String* ScAcceptChgDlg::MakeTypeString(ScChangeActionType eType)
switch(eType)
{
- case SC_CAT_INSERT_COLS: pStr=&aStrInsertCols;break;
+ case SC_CAT_INSERT_COLS: pStr=&aStrInsertCols;break;
- case SC_CAT_INSERT_ROWS: pStr=&aStrInsertRows;break;
+ case SC_CAT_INSERT_ROWS: pStr=&aStrInsertRows;break;
- case SC_CAT_INSERT_TABS: pStr=&aStrInsertTabs;break;
+ case SC_CAT_INSERT_TABS: pStr=&aStrInsertTabs;break;
- case SC_CAT_DELETE_COLS: pStr=&aStrDeleteCols;break;
+ case SC_CAT_DELETE_COLS: pStr=&aStrDeleteCols;break;
- case SC_CAT_DELETE_ROWS: pStr=&aStrDeleteRows;break;
+ case SC_CAT_DELETE_ROWS: pStr=&aStrDeleteRows;break;
- case SC_CAT_DELETE_TABS: pStr=&aStrDeleteTabs;break;
+ case SC_CAT_DELETE_TABS: pStr=&aStrDeleteTabs;break;
- case SC_CAT_MOVE: pStr=&aStrMove;break;
+ case SC_CAT_MOVE: pStr=&aStrMove;break;
- case SC_CAT_CONTENT: pStr=&aStrContent;break;
+ case SC_CAT_CONTENT: pStr=&aStrContent;break;
- case SC_CAT_REJECT: pStr=&aStrReject;break;
+ case SC_CAT_REJECT: pStr=&aStrReject;break;
- default: pStr=&aUnknown;break;
+ default: pStr=&aUnknown;break;
}
return pStr;
}
@@ -445,8 +445,8 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA
pNewData->bIsRejectable=pScChangeAction->IsRejectable();
pNewData->bDisabled=!pNewData->bIsAcceptable | bDisabled;
pNewData->aDateTime=aDateTime;
- pNewData->nRow = aRef.aStart.Row();
- pNewData->nCol = aRef.aStart.Col();
+ pNewData->nRow = aRef.aStart.Row();
+ pNewData->nCol = aRef.aStart.Col();
pNewData->nTable= aRef.aStart.Tab();
if(eType==SC_CAT_CONTENT)
@@ -627,8 +627,8 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(const ScChangeAction* pScChang
pNewData->bIsRejectable=pScChangeAction->IsRejectable();
pNewData->bDisabled=!pNewData->bIsAcceptable | bDisabled;
pNewData->aDateTime=aDateTime;
- pNewData->nRow = aRef.aStart.Row();
- pNewData->nCol = aRef.aStart.Col();
+ pNewData->nRow = aRef.aStart.Row();
+ pNewData->nCol = aRef.aStart.Col();
pNewData->nTable= aRef.aStart.Tab();
if(eType==SC_CAT_CONTENT)
@@ -814,8 +814,8 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionConte
pNewData->bIsRejectable=FALSE;
pNewData->bDisabled=!pNewData->bIsAcceptable;
pNewData->aDateTime=aDateTime;
- pNewData->nRow = aRef.aStart.Row();
- pNewData->nCol = aRef.aStart.Col();
+ pNewData->nRow = aRef.aStart.Row();
+ pNewData->nCol = aRef.aStart.Col();
pNewData->nTable= aRef.aStart.Tab();
if(pTheView->IsValidComment(&aComment) && bFlag)
@@ -984,7 +984,7 @@ IMPL_LINK( ScAcceptChgDlg, RefHandle, SvxTPFilter*, EMPTYARG )
if(pWnd!=NULL)
{
-// bSimpleRefDlgStarted=TRUE;
+// bSimpleRefDlgStarted=TRUE;
USHORT nAcceptId=ScAcceptChgDlgWrapper::GetChildWindowId();
pViewFrm->ShowChildWindow(nAcceptId,FALSE);
pWnd->SetCloseHdl(LINK( this, ScAcceptChgDlg,RefInfoHandle));
@@ -1003,7 +1003,7 @@ IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, String*, pResult)
{
USHORT nId;
-// bSimpleRefDlgStarted=FALSE;
+// bSimpleRefDlgStarted=FALSE;
ScSimpleRefDlgWrapper::SetAutoReOpen(TRUE);
SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame();
@@ -1313,7 +1313,7 @@ BOOL ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBo
ScRedlinData *pParentData=(ScRedlinData *)(pOriginal->GetUserData());
pParentData->pData=(void *)pScChangeAction;
pParentData->nActionNo=pScChangeAction->GetActionNumber();
- pParentData->bIsAcceptable=pScChangeAction->IsRejectable(); // select old value
+ pParentData->bIsAcceptable=pScChangeAction->IsRejectable(); // select old value
pParentData->bIsRejectable=FALSE;
pParentData->bDisabled=FALSE;
}
@@ -1762,13 +1762,13 @@ void ScAcceptChgDlg::UpdateEntrys(ScChangeTrack* pChgTrack, ULONG nStartAction,U
IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack*, pChgTrack)
{
-// if(bScAcceptChgDlgIsDead) return 0;
+// if(bScAcceptChgDlgIsDead) return 0;
ScChangeTrackMsgQueue& aMsgQueue= pChgTrack->GetMsgQueue();
ScChangeTrackMsgInfo* pTrackInfo=aMsgQueue.Get();
- ULONG nStartAction;
- ULONG nEndAction;
+ ULONG nStartAction;
+ ULONG nEndAction;
while(pTrackInfo!=NULL)
{
@@ -2000,7 +2000,7 @@ void ScAcceptChgDlg::FillInfo(SfxChildWinInfo& rInfo) const
SfxModelessDialog::FillInfo(rInfo);
rInfo.aExtraString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( "AcceptChgDat:(" ));
- USHORT nCount=pTheView->TabCount();
+ USHORT nCount=pTheView->TabCount();
rInfo.aExtraString += String::CreateFromInt32(nCount);
rInfo.aExtraString += ';';
@@ -2046,8 +2046,8 @@ IMPL_LINK( ScAcceptChgDlg, FilterModified, SvxTPFilter*, EMPTYARG )
return 0;
}
-#define CALC_DATE 3
-#define CALC_POS 1
+#define CALC_DATE 3
+#define CALC_POS 1
IMPL_LINK( ScAcceptChgDlg, ColCompareHdl, SvSortData*, pSortData )
{
diff --git a/sc/source/ui/miscdlgs/acredlin.src b/sc/source/ui/miscdlgs/acredlin.src
index 4baa9f3d388c..dab2c5d91d2f 100644
--- a/sc/source/ui/miscdlgs/acredlin.src
+++ b/sc/source/ui/miscdlgs/acredlin.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/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 32b3376da9a7..7dd87b2703c0 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +60,9 @@
#include "global.hxx"
#include "inputopt.hxx"
#include "rangeutl.hxx"
+
-
-ScFormulaReferenceHelper::ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings)
+ScFormulaReferenceHelper::ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings)
: m_pDlg(_pDlg)
, pRefEdit (NULL)
, m_pWindow(NULL)
@@ -101,7 +101,7 @@ void ScFormulaReferenceHelper::enableInput( BOOL bEnable )
SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell );
while( pFrame )
{
- // #71577# enable everything except InPlace, including bean frames
+ // #71577# enable everything except InPlace, including bean frames
if ( !pFrame->GetFrame().IsInPlace() )
{
SfxViewShell* p = pFrame->GetViewShell();
@@ -137,7 +137,7 @@ void ScFormulaReferenceHelper::ShowSimpleReference( const XubString& rStr )
if ( pViewData )
{
ScDocument* pDoc=pViewData->GetDocument();
- ScTabViewShell* pTabViewShell=pViewData->GetViewShell();
+ ScTabViewShell* pTabViewShell=pViewData->GetViewShell();
ScRangeList aRangeList;
@@ -186,7 +186,7 @@ bool ScFormulaReferenceHelper::ParseWithNames( ScRangeList& rRanges, const Strin
else if ( aRangeUtil.MakeRangeFromName( aRangeStr, pDoc, nRefTab, aRange, RUTL_NAMES, aDetails ) )
rRanges.Append( aRange );
else
- bError = true;
+ bError = true;
}
return !bError;
@@ -200,7 +200,7 @@ void ScFormulaReferenceHelper::ShowFormulaReference( const XubString& rStr )
ScViewData* pViewData=ScDocShell::GetViewData();
if ( pViewData && pRefComp.get() )
{
- ScTabViewShell* pTabViewShell=pViewData->GetViewShell();
+ ScTabViewShell* pTabViewShell=pViewData->GetViewShell();
SCCOL nCol = pViewData->GetCurX();
SCROW nRow = pViewData->GetCurY();
SCTAB nTab = pViewData->GetTabNo();
@@ -259,12 +259,12 @@ void ScFormulaReferenceHelper::HideReference( BOOL bDoneRefMode )
if( pViewData && /*!pRefEdit &&*/ bHighLightRef && bEnableColorRef)
{
- ScTabViewShell* pTabViewShell=pViewData->GetViewShell();
+ ScTabViewShell* pTabViewShell=pViewData->GetViewShell();
if(pTabViewShell!=NULL)
{
- // bDoneRefMode is FALSE when called from before SetReference.
- // In that case, RefMode was just started and must not be ended now.
+ // bDoneRefMode is FALSE when called from before SetReference.
+ // In that case, RefMode was just started and must not be ended now.
if ( bDoneRefMode )
pTabViewShell->DoneRefMode( FALSE );
@@ -278,7 +278,7 @@ void ScFormulaReferenceHelper::ShowReference( const XubString& rStr )
{
if( /*!pRefEdit &&*/ bEnableColorRef )
{
- if( rStr.Search('(')!=STRING_NOTFOUND ||
+ if( rStr.Search('(')!=STRING_NOTFOUND ||
rStr.Search('+')!=STRING_NOTFOUND ||
rStr.Search('*')!=STRING_NOTFOUND ||
rStr.Search('-')!=STRING_NOTFOUND ||
@@ -378,7 +378,7 @@ void ScFormulaReferenceHelper::RefInputDone( BOOL bForced )
if ( CanInputDone( bForced ) )//if (pRefEdit && (bForced || !pRefBtn))
//-->Modified by PengYunQuan for Validity Cell Range Picker
{
- if (bAccInserted) // Accelerator wieder abschalten
+ if (bAccInserted) // Accelerator wieder abschalten
{
Application::RemoveAccel( pAccel.get() );
bAccInserted = FALSE;
@@ -440,7 +440,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula::
sNewDialogText += m_pWindow->GetChild(i-1)->GetWindow( WINDOW_CLIENT )->GetText();
}
else if (pWin == (Window*)pRefBtn)
- ; // do nothing
+ ; // do nothing
else if (pWin->IsVisible())
{
pHiddenMarks[i] = TRUE;
@@ -526,14 +526,14 @@ BOOL ScFormulaReferenceHelper::DoClose( USHORT nId )
{
SfxApplication* pSfxApp = SFX_APP();
- SetDispatcherLock( FALSE ); //! here and in dtor ?
+ SetDispatcherLock( FALSE ); //! here and in dtor ?
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
if ( pViewFrm && pViewFrm->HasChildWindow(FID_INPUTLINE_STATUS) )
{
- // Die Eingabezeile wird per ToolBox::Disable disabled, muss darum auch
- // per ToolBox::Enable wieder aktiviert werden (vor dem Enable des AppWindow),
- // damit die Buttons auch wieder enabled gezeichnet werden.
+ // Die Eingabezeile wird per ToolBox::Disable disabled, muss darum auch
+ // per ToolBox::Enable wieder aktiviert werden (vor dem Enable des AppWindow),
+ // damit die Buttons auch wieder enabled gezeichnet werden.
SfxChildWindow* pChild = pViewFrm->GetChildWindow(FID_INPUTLINE_STATUS);
if (pChild)
{
@@ -562,7 +562,7 @@ BOOL ScFormulaReferenceHelper::DoClose( USHORT nId )
}
void ScFormulaReferenceHelper::SetDispatcherLock( BOOL bLock )
{
- // lock / unlock only the dispatchers of Calc documents
+ // lock / unlock only the dispatchers of Calc documents
TypeId aType(TYPE(ScDocShell));
ScDocShell* pDocShell = (ScDocShell*)SfxObjectShell::GetFirst(&aType);
@@ -580,9 +580,9 @@ void ScFormulaReferenceHelper::SetDispatcherLock( BOOL bLock )
pDocShell = (ScDocShell*)SfxObjectShell::GetNext(*pDocShell, &aType);
}
- // if a new view is created while the dialog is open,
- // that view's dispatcher is locked when trying to create the dialog
- // for that view (ScTabViewShell::CreateRefDialog)
+ // if a new view is created while the dialog is open,
+ // that view's dispatcher is locked when trying to create the dialog
+ // for that view (ScTabViewShell::CreateRefDialog)
}
// -----------------------------------------------------------------------------
void ScFormulaReferenceHelper::ViewShellChanged(ScTabViewShell* /* pScViewShell */)
@@ -600,7 +600,7 @@ void ScFormulaReferenceHelper::EnableSpreadsheets(BOOL bFlag, BOOL bChilds)
SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell );
while( pFrame )
{
- // #71577# enable everything except InPlace, including bean frames
+ // #71577# enable everything except InPlace, including bean frames
if ( !pFrame->GetFrame().IsInPlace() )
{
SfxViewShell* p = pFrame->GetViewShell();
@@ -640,7 +640,7 @@ void lcl_InvalidateWindows()
SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell );
while( pFrame )
{
- // #71577# enable everything except InPlace, including bean frames
+ // #71577# enable everything except InPlace, including bean frames
if ( !pFrame->GetFrame().IsInPlace() )
{
SfxViewShell* p = pFrame->GetViewShell();
@@ -677,12 +677,12 @@ void lcl_HideAllReferences()
//============================================================================
//The class of ScAnyRefDlg is rewritten by PengYunQuan for Validity Cell Range Picker
-// class ScRefHandler
+// class ScRefHandler
//----------------------------------------------------------------------------
ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB/*, SfxChildWindow* pCW,
Window* pParent, USHORT nResId*/, bool bBindRef )
- : //SfxModelessDialog ( pB, pCW, pParent, ScResId( nResId ) ),
+ : //SfxModelessDialog ( pB, pCW, pParent, ScResId( nResId ) ),
m_rWindow( rWindow ),
m_bInRefMode( false ),
m_aHelper(this,pB),
@@ -690,8 +690,8 @@ ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB/*, SfxChildWindow*
pActiveWin(NULL)
{
m_aHelper.SetWindow(/*this*/&m_rWindow);
- if(m_rWindow.GetHelpId()==0) //Hack, da im SfxModelessDialog die HelpId
- m_rWindow.SetHelpId(m_rWindow.GetUniqueId()); //fuer einen ModelessDialog entfernt und
+ if(m_rWindow.GetHelpId()==0) //Hack, da im SfxModelessDialog die HelpId
+ m_rWindow.SetHelpId(m_rWindow.GetUniqueId()); //fuer einen ModelessDialog entfernt und
//in eine UniqueId gewandelt wird, machen
//wir das an dieser Stelle rueckgaengig.
aTimer.SetTimeout(200);
@@ -728,12 +728,12 @@ bool ScRefHandler::EnterRefMode()
}
}
}
- if ( !pParentDoc && pScViewShell ) // use current only if above fails
+ if ( !pParentDoc && pScViewShell ) // use current only if above fails
pParentDoc = pScViewShell->GetObjectShell();
if ( pParentDoc )
aDocName = pParentDoc->GetTitle();
- ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(pScViewShell);
+ ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(pScViewShell);
DBG_ASSERT( pInputHdl, "Missing input handler :-/" );
@@ -748,8 +748,8 @@ bool ScRefHandler::EnterRefMode()
m_aHelper.SetDispatcherLock( TRUE );
//@Test
- //SFX_APPWINDOW->Disable(TRUE); //@BugID 54702
-
+ //SFX_APPWINDOW->Disable(TRUE); //@BugID 54702
+
return m_bInRefMode = true;
}
@@ -768,7 +768,7 @@ bool ScRefHandler::LeaveRefMode()
if( Dialog *pDlg = dynamic_cast<Dialog*>( static_cast<Window*>(*this) ) )
pDlg->SetModalInputMode(FALSE);
- SetDispatcherLock( FALSE ); //! here and in DoClose ?
+ SetDispatcherLock( FALSE ); //! here and in DoClose ?
ScTabViewShell* pScViewShell = ScTabViewShell::GetActiveViewShell();
if( pScViewShell )
@@ -785,9 +785,9 @@ bool ScRefHandler::LeaveRefMode()
//SfxBindings& ScRefHandler::GetBindings()
//{
-// //! SfxModelessDialog should allow access to pBindings pointer
+// //! SfxModelessDialog should allow access to pBindings pointer
//
-// return *pMyBindings;
+// return *pMyBindings;
//}
//----------------------------------------------------------------------------
@@ -800,7 +800,7 @@ void ScRefHandler::SwitchToDocument()
SfxObjectShell* pObjSh = pCurrent->GetObjectShell();
if ( pObjSh && pObjSh->GetTitle() == aDocName )
{
- // right document already visible -> nothing to do
+ // right document already visible -> nothing to do
return;
}
}
@@ -812,7 +812,7 @@ void ScRefHandler::SwitchToDocument()
SfxObjectShell* pObjSh = pSh->GetObjectShell();
if ( pObjSh && pObjSh->GetTitle() == aDocName )
{
- // switch to first TabViewShell for document
+ // switch to first TabViewShell for document
((ScTabViewShell*)pSh)->SetActive();
return;
}
@@ -822,14 +822,14 @@ void ScRefHandler::SwitchToDocument()
//----------------------------------------------------------------------------
-BOOL ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be 0
+BOOL ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be 0
{
- // default: allow only same document (overridden in function dialog)
+ // default: allow only same document (overridden in function dialog)
String aCmpName;
if ( pDocSh )
aCmpName = pDocSh->GetTitle();
- // if aDocName isn't initialized, allow
+ // if aDocName isn't initialized, allow
return ( aDocName.Len() == 0 || aDocName == aCmpName );
}
@@ -864,7 +864,7 @@ void ScRefHandler::ViewShellChanged(ScTabViewShell* pScViewShell )
void ScRefHandler::AddRefEntry()
{
- // wenn nicht ueberladen, gibt es keine Mehrfach-Referenzen
+ // wenn nicht ueberladen, gibt es keine Mehrfach-Referenzen
}
//----------------------------------------------------------------------------
@@ -878,8 +878,8 @@ BOOL __EXPORT ScRefHandler::IsTableLocked() const
//----------------------------------------------------------------------------
//
-// RefInputStart/Done: Zoom-In (AutoHide) auf einzelnes Feld
-// (per Button oder Bewegung)
+// RefInputStart/Done: Zoom-In (AutoHide) auf einzelnes Feld
+// (per Button oder Bewegung)
//
//----------------------------------------------------------------------------
@@ -897,42 +897,42 @@ void ScRefHandler::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton*
//The two following function is commentted out by PengYunQuan for Validity Cell Range Picker
//long ScAnyRefDlg::PreNotify( NotifyEvent& rNEvt )
//{
-// USHORT nSwitch=rNEvt.GetType();
-// if(nSwitch==EVENT_GETFOCUS)
-// {
-// pActiveWin=rNEvt.GetWindow();
-// }
-// return SfxModelessDialog::PreNotify(rNEvt);
+// USHORT nSwitch=rNEvt.GetType();
+// if(nSwitch==EVENT_GETFOCUS)
+// {
+// pActiveWin=rNEvt.GetWindow();
+// }
+// return SfxModelessDialog::PreNotify(rNEvt);
//}
//
//void ScAnyRefDlg::StateChanged( StateChangedType nStateChange )
//{
-// SfxModelessDialog::StateChanged( nStateChange );
+// SfxModelessDialog::StateChanged( nStateChange );
//
-// if(nStateChange == STATE_CHANGE_VISIBLE)
-// {
-// if(IsVisible())
-// {
-// m_aHelper.enableInput( FALSE );
-// m_aHelper.EnableSpreadsheets();
-// m_aHelper.SetDispatcherLock( TRUE );
-// aTimer.Start();
-// }
-// else
-// {
-// m_aHelper.enableInput( TRUE );
-// m_aHelper.SetDispatcherLock( FALSE ); //! here and in DoClose ?
-// }
-// }
+// if(nStateChange == STATE_CHANGE_VISIBLE)
+// {
+// if(IsVisible())
+// {
+// m_aHelper.enableInput( FALSE );
+// m_aHelper.EnableSpreadsheets();
+// m_aHelper.SetDispatcherLock( TRUE );
+// aTimer.Start();
+// }
+// else
+// {
+// m_aHelper.enableInput( TRUE );
+// m_aHelper.SetDispatcherLock( FALSE ); //! here and in DoClose ?
+// }
+// }
//}
#if defined( _MSC_VER )
#define INTRODUCE_TEMPLATE
#else
-#define INTRODUCE_TEMPLATE template <>
+#define INTRODUCE_TEMPLATE template <>
#endif
-#define IMPL_TWINDOW_PRENOTIFY( TWindow,bBindRef ) \
+#define IMPL_TWINDOW_PRENOTIFY( TWindow,bBindRef ) \
INTRODUCE_TEMPLATE long ScRefHdlrImplBase<TWindow,bBindRef>::PreNotify( NotifyEvent& rNEvt )\
{\
if( bBindRef || m_bInRefMode )\
@@ -946,7 +946,7 @@ INTRODUCE_TEMPLATE long ScRefHdlrImplBase<TWindow,bBindRef>::PreNotify( NotifyEv
return TWindow::PreNotify(rNEvt);\
}
-#define IMPL_TWINDOW_STATECHANGED( TWindow,bBindRef ) \
+#define IMPL_TWINDOW_STATECHANGED( TWindow,bBindRef ) \
INTRODUCE_TEMPLATE void ScRefHdlrImplBase<TWindow,bBindRef>::StateChanged( StateChangedType nStateChange )\
{\
TWindow::StateChanged( nStateChange );\
@@ -965,7 +965,7 @@ INTRODUCE_TEMPLATE void ScRefHdlrImplBase<TWindow,bBindRef>::StateChanged( State
else\
{\
m_aHelper.enableInput( TRUE );\
- m_aHelper.SetDispatcherLock( FALSE ); /*//! here and in DoClose ?*/\
+ m_aHelper.SetDispatcherLock( FALSE ); /*//! here and in DoClose ?*/\
}\
}\
}
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index 6ce65ab914be..ceed2e048e06 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -484,12 +484,12 @@
// ScAutoFmtPreview
ScAutoFmtPreview::ScAutoFmtPreview( Window* pParent, const ResId& rRes, ScDocument* pDoc ) :
- Window ( pParent, rRes ),
- pCurData ( NULL ),
- aVD ( *this ),
+ Window ( pParent, rRes ),
+ pCurData ( NULL ),
+ aVD ( *this ),
aScriptedText ( aVD ),
xBreakIter ( pDoc->GetBreakIterator() ),
- bFitWidth ( FALSE ),
+ bFitWidth ( FALSE ),
mbRTL ( false ),
aPrvSize ( GetSizePixel().Width() - 6, GetSizePixel().Height() - 30 ),
mnLabelColWidth ( (aPrvSize.Width() - 4) / 4 - 12 ),
@@ -503,7 +503,7 @@ ScAutoFmtPreview::ScAutoFmtPreview( Window* pParent, const ResId& rRes, ScDocume
aStrMid ( ScResId( STR_MID ) ),
aStrSouth ( ScResId( STR_SOUTH ) ),
aStrSum ( ScResId( STR_SUM ) ),
- pNumFmt ( new SvNumberFormatter( ::comphelper::getProcessServiceFactory(), ScGlobal::eLnge ) )
+ pNumFmt ( new SvNumberFormatter( ::comphelper::getProcessServiceFactory(), ScGlobal::eLnge ) )
{
Init();
}
@@ -616,8 +616,8 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow )
// Ausgabe des Zelltextes:
//------------------------
- String cellString;
- BOOL bNumFormat = pCurData->GetIncludeValueFormat();
+ String cellString;
+ BOOL bNumFormat = pCurData->GetIncludeValueFormat();
ULONG nNum;
double nVal;
Color* pDummy = NULL;
@@ -625,14 +625,14 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow )
switch( nIndex )
{
- case 1: cellString = aStrJan; break;
- case 2: cellString = aStrFeb; break;
- case 3: cellString = aStrMar; break;
- case 5: cellString = aStrNorth; break;
- case 10: cellString = aStrMid; break;
- case 15: cellString = aStrSouth; break;
+ case 1: cellString = aStrJan; break;
+ case 2: cellString = aStrFeb; break;
+ case 3: cellString = aStrMar; break;
+ case 5: cellString = aStrNorth; break;
+ case 10: cellString = aStrMid; break;
+ case 15: cellString = aStrSouth; break;
case 4:
- case 20: cellString = aStrSum; break;
+ case 20: cellString = aStrSum; break;
case 6:
case 8:
@@ -671,14 +671,14 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow )
if ( cellString.Len() > 0 )
{
- Size aStrSize;
+ Size aStrSize;
USHORT nFmtIndex = GetFormatIndex( nCol, nRow );
Rectangle cellRect = maArray.GetCellRect( nCol, nRow );
Point aPos = cellRect.TopLeft();
- USHORT nRightX = 0;
- BOOL bJustify = pCurData->GetIncludeJustify();
+ USHORT nRightX = 0;
+ BOOL bJustify = pCurData->GetIncludeJustify();
SvxHorJustifyItem aHorJustifyItem( SVX_HOR_JUSTIFY_STANDARD, ATTR_HOR_JUSTIFY );
- SvxCellHorJustify eJustification;
+ SvxCellHorJustify eJustification;
//-------------
// Ausrichtung:
@@ -694,7 +694,7 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow )
MakeFonts( nFmtIndex, aFont, aCJKFont, aCTLFont );
- theMaxStrSize = cellRect.GetSize();
+ theMaxStrSize = cellRect.GetSize();
theMaxStrSize.Width() -= FRAME_OFFSET;
theMaxStrSize.Height() -= FRAME_OFFSET;
@@ -851,7 +851,7 @@ void ScAutoFmtPreview::Init()
maArray.SetUseDiagDoubleClipping( false );
CalcCellArray( FALSE );
CalcLineMap();
-
+
TypeId aType(TYPE(ScDocShell));
ScDocShell* pDocShell = (ScDocShell*)SfxObjectShell::GetFirst(&aType);
SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell );
@@ -940,7 +940,7 @@ void ScAutoFmtPreview::NotifyChange( ScAutoFormatData* pNewData )
void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ )
{
sal_uInt32 nOldDrawMode = aVD.GetDrawMode();
- // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
+ // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
if( GetSettings().GetStyleSettings().GetHighContrastMode() )
aVD.SetDrawMode( DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
@@ -963,8 +963,8 @@ void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ )
DrawRect( aRect );
Point aPos( (aWndSize.Width() - aPrvSize.Width()) / 2, (aWndSize.Height() - aPrvSize.Height()) / 2 );
- if (Application::GetSettings().GetLayoutRTL())
- aPos.X() = -aPos.X();
+ if (Application::GetSettings().GetLayoutRTL())
+ aPos.X() = -aPos.X();
DrawOutDev( aPos, aWndSize, Point(), aWndSize, aVD );
aVD.SetDrawMode( nOldDrawMode );
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 361f201281dc..161c6476bef6 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ bool ScConflictsListEntry::HasOwnAction( ULONG nOwnAction ) const
//UNUSED2008-05 return true;
//UNUSED2008-05 }
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 return false;
//UNUSED2008-05 }
@@ -188,7 +188,7 @@ ScConflictsFinder::ScConflictsFinder( ScChangeTrack* pTrack, ULONG nStartShared,
,mrConflictsList( rConflictsList )
{
}
-
+
ScConflictsFinder::~ScConflictsFinder()
{
}
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.src b/sc/source/ui/miscdlgs/conflictsdlg.src
index 1facf85da95b..dad8abb48780 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.src
+++ b/sc/source/ui/miscdlgs/conflictsdlg.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 @@ ModalDialog RID_SCDLG_CONFLICTS
Pos = MAP_APPFONT ( 6 , 34 ) ;
Size = MAP_APPFONT ( 326 , 104 ) ;
Border = TRUE ;
- };
+ };
PushButton BTN_KEEPMINE
{
Pos = MAP_APPFONT ( 72 , 145 ) ;
@@ -87,7 +87,7 @@ ModalDialog RID_SCDLG_CONFLICTS
HelpButton BTN_HELP
{
Pos = MAP_APPFONT ( 282 , 172 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
};
String STR_TITLE_CONFLICT
{
diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx
index 074d54a5c912..38b539265cbe 100644
--- a/sc/source/ui/miscdlgs/crdlg.cxx
+++ b/sc/source/ui/miscdlgs/crdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
//==================================================================
-ScColOrRowDlg::ScColOrRowDlg( Window* pParent,
- const String& rStrTitle,
- const String& rStrLabel,
- BOOL bColDefault )
+ScColOrRowDlg::ScColOrRowDlg( Window* pParent,
+ const String& rStrTitle,
+ const String& rStrLabel,
+ BOOL bColDefault )
- : ModalDialog ( pParent, ScResId( RID_SCDLG_COLORROW ) ),
+ : ModalDialog ( pParent, ScResId( RID_SCDLG_COLORROW ) ),
//
aFlFrame ( this, ScResId( FL_FRAME ) ),
aBtnRows ( this, ScResId( BTN_GROUP_ROWS ) ),
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 0ad2a2e80ca4..f2fa6eb77fe5 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,57 +58,57 @@ const ULONG nEntryDataDelim = 2;
//============================================================================
-// class ScColRowNameRangesDlg
+// class ScColRowNameRangesDlg
/*************************************************************************
-#* Member: ScColRowNameRangesDlg Datum:04.09.97
+#* Member: ScColRowNameRangesDlg Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
-#* Funktion: Konstruktor der Klasse ScColRowNameRangesDlg.
-#* Initialisieren der Klassen- Mitglieder,
-#* Uebernahme der Range- Angaben und Aufruf
-#* der eigentlichen Initialisierungsroutine
+#* Funktion: Konstruktor der Klasse ScColRowNameRangesDlg.
+#* Initialisieren der Klassen- Mitglieder,
+#* Uebernahme der Range- Angaben und Aufruf
+#* der eigentlichen Initialisierungsroutine
#*
-#* Input: Sfx- Verknuepfungen
-#* Parent- Window
-#* SCViewData
+#* Input: Sfx- Verknuepfungen
+#* Parent- Window
+#* SCViewData
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB,
SfxChildWindow* pCW,
Window* pParent,
- ScViewData* ptrViewData )
+ ScViewData* ptrViewData )
- : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_COLROWNAMERANGES ),
+ : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_COLROWNAMERANGES ),
//
aFlAssign ( this, ScResId( FL_ASSIGN ) ),
- aLbRange ( this, ScResId( LB_RANGE ) ),
+ aLbRange ( this, ScResId( LB_RANGE ) ),
aEdAssign ( this, this, ScResId( ED_AREA ) ),
- aRbAssign ( this, ScResId( RB_AREA ), &aEdAssign, this ),
- aBtnColHead ( this, ScResId( BTN_COLHEAD ) ),
- aBtnRowHead ( this, ScResId( BTN_ROWHEAD ) ),
- aFtAssign2 ( this, ScResId( FT_DATA_LABEL ) ),
+ aRbAssign ( this, ScResId( RB_AREA ), &aEdAssign, this ),
+ aBtnColHead ( this, ScResId( BTN_COLHEAD ) ),
+ aBtnRowHead ( this, ScResId( BTN_ROWHEAD ) ),
+ aFtAssign2 ( this, ScResId( FT_DATA_LABEL ) ),
aEdAssign2 ( this, this, ScResId( ED_DATA ) ),
- aRbAssign2 ( this, ScResId( RB_DATA ), &aEdAssign2, this ),
+ aRbAssign2 ( this, ScResId( RB_DATA ), &aEdAssign2, this ),
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
- aBtnAdd ( this, ScResId( BTN_ADD ) ),
- aBtnRemove ( this, ScResId( BTN_REMOVE ) ),
+ aBtnOk ( this, ScResId( BTN_OK ) ),
+ aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
+ aBtnHelp ( this, ScResId( BTN_HELP ) ),
+ aBtnAdd ( this, ScResId( BTN_ADD ) ),
+ aBtnRemove ( this, ScResId( BTN_REMOVE ) ),
- pViewData ( ptrViewData ),
- pDoc ( ptrViewData->GetDocument() ),
+ pViewData ( ptrViewData ),
+ pDoc ( ptrViewData->GetDocument() ),
- pEdActive ( NULL ),
- bDlgLostFocus ( FALSE )
+ pEdActive ( NULL ),
+ bDlgLostFocus ( FALSE )
{
xColNameRanges = pDoc->GetColNameRanges()->Clone();
xRowNameRanges = pDoc->GetRowNameRanges()->Clone();
@@ -118,16 +118,16 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB,
/*************************************************************************
-#* Member: ~ScColRowNameRangesDlg Datum:04.09.97
+#* Member: ~ScColRowNameRangesDlg Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
-#* Funktion: Destruktor der Klasse
+#* Funktion: Destruktor der Klasse
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -137,39 +137,39 @@ __EXPORT ScColRowNameRangesDlg::~ScColRowNameRangesDlg()
/*************************************************************************
-#* Member: Init Datum:04.09.97
+#* Member: Init Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
-#* Funktion: Initialisierungs- Routine:
-#* Umlenken der Event- Handler und einstellen der
-#* Startparameter.
+#* Funktion: Initialisierungs- Routine:
+#* Umlenken der Event- Handler und einstellen der
+#* Startparameter.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
void ScColRowNameRangesDlg::Init()
{
- SCCOL nStartCol = 0;
- SCROW nStartRow = 0;
- SCTAB nStartTab = 0;
- SCCOL nEndCol = 0;
- SCROW nEndRow = 0;
- SCTAB nEndTab = 0;
-
- aBtnOk.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, OkBtnHdl ) );
- aBtnCancel.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, CancelBtnHdl ) );
- aBtnAdd.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, AddBtnHdl ) );
- aBtnRemove.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, RemoveBtnHdl ) );
- aLbRange.SetSelectHdl ( LINK( this, ScColRowNameRangesDlg, Range1SelectHdl ) );
- aEdAssign.SetModifyHdl ( LINK( this, ScColRowNameRangesDlg, Range1DataModifyHdl ) );
- aBtnColHead.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, ColClickHdl ) );
- aBtnRowHead.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, RowClickHdl ) );
- aEdAssign2.SetModifyHdl ( LINK( this, ScColRowNameRangesDlg, Range2DataModifyHdl ) );
+ SCCOL nStartCol = 0;
+ SCROW nStartRow = 0;
+ SCTAB nStartTab = 0;
+ SCCOL nEndCol = 0;
+ SCROW nEndRow = 0;
+ SCTAB nEndTab = 0;
+
+ aBtnOk.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, OkBtnHdl ) );
+ aBtnCancel.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, CancelBtnHdl ) );
+ aBtnAdd.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, AddBtnHdl ) );
+ aBtnRemove.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, RemoveBtnHdl ) );
+ aLbRange.SetSelectHdl ( LINK( this, ScColRowNameRangesDlg, Range1SelectHdl ) );
+ aEdAssign.SetModifyHdl ( LINK( this, ScColRowNameRangesDlg, Range1DataModifyHdl ) );
+ aBtnColHead.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, ColClickHdl ) );
+ aBtnRowHead.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, RowClickHdl ) );
+ aEdAssign2.SetModifyHdl ( LINK( this, ScColRowNameRangesDlg, Range2DataModifyHdl ) );
Link aLink = LINK( this, ScColRowNameRangesDlg, GetFocusHdl );
aEdAssign.SetGetFocusHdl( aLink );
@@ -190,7 +190,7 @@ void ScColRowNameRangesDlg::Init()
if ( pViewData && pDoc )
{
pViewData->GetSimpleArea( nStartCol, nStartRow, nStartTab,
- nEndCol, nEndRow, nEndTab );
+ nEndCol, nEndRow, nEndTab );
SetColRowData( ScRange( ScAddress( nStartCol, nStartRow, nStartTab ),
ScAddress( nEndCol, nEndRow, nEndTab ) ) );
}
@@ -209,25 +209,25 @@ void ScColRowNameRangesDlg::Init()
aEdAssign.GrabFocus();
aRbAssign.Enable();
//@BugID 54702 Enablen/Disablen nur noch in Basisklasse
- //SFX_APPWINDOW->Enable(); // Ref-Feld hat Focus
+ //SFX_APPWINDOW->Enable(); // Ref-Feld hat Focus
Range1SelectHdl( 0 );
}
/*************************************************************************
-#* Member: SetColRowData Datum:04.09.97
+#* Member: SetColRowData Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
-#* Funktion: zugehoerigen Datenbereich eines Beschriftungsbereiches
-#* auf default Werte setzen und beide Referenz-Edit-Felder
-#* fuellen.
+#* Funktion: zugehoerigen Datenbereich eines Beschriftungsbereiches
+#* auf default Werte setzen und beide Referenz-Edit-Felder
+#* fuellen.
#*
-#* Input: Einstellbereich fuer Labels
+#* Input: Einstellbereich fuer Labels
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -240,36 +240,36 @@ void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,BOOL bRef)
SCROW nRow1 = theCurArea.aStart.Row();
SCROW nRow2 = theCurArea.aEnd.Row();
if ( (static_cast<SCCOLROW>(nCol2 - nCol1) >= nRow2 - nRow1) || (nCol1 == 0 && nCol2 == MAXCOL) )
- { // Spaltenkoepfe und Grenzfall gesamte Tabelle
+ { // Spaltenkoepfe und Grenzfall gesamte Tabelle
aBtnColHead.Check( TRUE );
aBtnRowHead.Check( FALSE );
if ( nRow2 == MAXROW )
{
if ( nRow1 == 0 )
- bValid = FALSE; // Grenzfall gesamte Tabelle
+ bValid = FALSE; // Grenzfall gesamte Tabelle
else
- { // Head unten, Data oben
+ { // Head unten, Data oben
theCurData.aStart.SetRow( 0 );
theCurData.aEnd.SetRow( nRow1 - 1 );
}
}
else
- { // Head oben, Data unten
+ { // Head oben, Data unten
theCurData.aStart.SetRow( nRow2 + 1 );
theCurData.aEnd.SetRow( MAXROW );
}
}
else
- { // Zeilenkoepfe
+ { // Zeilenkoepfe
aBtnRowHead.Check( TRUE );
aBtnColHead.Check( FALSE );
if ( nCol2 == MAXCOL )
- { // Head rechts, Data links
+ { // Head rechts, Data links
theCurData.aStart.SetCol( 0 );
theCurData.aEnd.SetCol( nCol2 - 1 );
}
else
- { // Head links, Data rechts
+ { // Head links, Data rechts
theCurData.aStart.SetCol( nCol2 + 1 );
theCurData.aEnd.SetCol( MAXCOL );
}
@@ -317,17 +317,17 @@ void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,BOOL bRef)
/*************************************************************************
-#* Member: AdjustColRowData Datum:04.09.97
+#* Member: AdjustColRowData Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
-#* Funktion: zugehoerigen Datenbereich eines Beschriftungsbereiches
-#* anpassen und Data-Referenz-Edit-Feld fuellen.
+#* Funktion: zugehoerigen Datenbereich eines Beschriftungsbereiches
+#* anpassen und Data-Referenz-Edit-Feld fuellen.
#*
-#* Input: Bereich fuer Labels
+#* Input: Bereich fuer Labels
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -335,7 +335,7 @@ void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,BOOL bRe
{
theCurData = rDataRange;
if ( aBtnColHead.IsChecked() )
- { // Datenbereich gleiche Spalten wie Koepfe
+ { // Datenbereich gleiche Spalten wie Koepfe
theCurData.aStart.SetCol( theCurArea.aStart.Col() );
theCurData.aEnd.SetCol( theCurArea.aEnd.Col() );
if ( theCurData.Intersects( theCurArea ) )
@@ -344,13 +344,13 @@ void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,BOOL bRe
SCROW nRow2 = theCurArea.aEnd.Row();
if ( nRow1 > 0
&& (theCurData.aEnd.Row() < nRow2 || nRow2 == MAXROW) )
- { // Data oben
+ { // Data oben
theCurData.aEnd.SetRow( nRow1 - 1 );
if ( theCurData.aStart.Row() > theCurData.aEnd.Row() )
theCurData.aStart.SetRow( theCurData.aEnd.Row() );
}
else
- { // Data unten
+ { // Data unten
theCurData.aStart.SetRow( nRow2 + 1 );
if ( theCurData.aStart.Row() > theCurData.aEnd.Row() )
theCurData.aEnd.SetRow( theCurData.aStart.Row() );
@@ -358,7 +358,7 @@ void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,BOOL bRe
}
}
else
- { // Datenbereich gleiche Zeilen wie Koepfe
+ { // Datenbereich gleiche Zeilen wie Koepfe
theCurData.aStart.SetRow( theCurArea.aStart.Row() );
theCurData.aEnd.SetRow( theCurArea.aEnd.Row() );
if ( theCurData.Intersects( theCurArea ) )
@@ -367,13 +367,13 @@ void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,BOOL bRe
SCCOL nCol2 = theCurArea.aEnd.Col();
if ( nCol1 > 0
&& (theCurData.aEnd.Col() < nCol2 || nCol2 == MAXCOL) )
- { // Data links
+ { // Data links
theCurData.aEnd.SetCol( nCol1 - 1 );
if ( theCurData.aStart.Col() > theCurData.aEnd.Col() )
theCurData.aStart.SetCol( theCurData.aEnd.Col() );
}
else
- { // Data rechts
+ { // Data rechts
theCurData.aStart.SetCol( nCol2 + 1 );
if ( theCurData.aStart.Col() > theCurData.aEnd.Col() )
theCurData.aEnd.SetCol( theCurData.aStart.Col() );
@@ -393,19 +393,19 @@ void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,BOOL bRe
/*************************************************************************
-#* Member: SetReference Datum:04.09.97
+#* Member: SetReference Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
-#* Funktion: Uebergabe eines mit der Maus selektierten Tabellen-
-#* bereiches, der dann als neue Selektion im Referenz-
-#* Fenster angezeigt wird.
+#* Funktion: Uebergabe eines mit der Maus selektierten Tabellen-
+#* bereiches, der dann als neue Selektion im Referenz-
+#* Fenster angezeigt wird.
#*
-#* Input: Bereich fuer Labels
-#* Dokumentklasse
+#* Input: Bereich fuer Labels
+#* Dokumentklasse
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -430,16 +430,16 @@ void ScColRowNameRangesDlg::SetReference( const ScRange& rRef, ScDocument* /* pD
/*************************************************************************
-#* Member: Close Datum:04.09.97
+#* Member: Close Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
-#* Funktion: Schliessen des Fensters
+#* Funktion: Schliessen des Fensters
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -450,16 +450,16 @@ BOOL __EXPORT ScColRowNameRangesDlg::Close()
/*************************************************************************
-#* Member: SetActive Datum:04.09.97
+#* Member: SetActive Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
-#* Funktion: Aktivieren des Fensters
+#* Funktion: Aktivieren des Fensters
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -484,16 +484,16 @@ void ScColRowNameRangesDlg::SetActive()
/*************************************************************************
-#* Member: UpdateNames Datum:04.09.97
+#* Member: UpdateNames Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
-#* Funktion: Aktualisieren der Namen
+#* Funktion: Aktualisieren der Namen
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -508,8 +508,8 @@ void ScColRowNameRangesDlg::UpdateNames()
ULONG nCount, j;
USHORT nPos; //@008 Hilfsvariable q eingefuegt
- SCCOL nCol1; //@008 04.09.97
- SCROW nRow1; //Erweiterung fuer Bereichsnamen
+ SCCOL nCol1; //@008 04.09.97
+ SCROW nRow1; //Erweiterung fuer Bereichsnamen
SCTAB nTab1;
SCCOL nCol2;
SCROW nRow2;
@@ -544,12 +544,12 @@ void ScColRowNameRangesDlg::UpdateNames()
if(pDoc!=NULL)
{
pDoc->GetString(nCol1, nRow1, nTab1,rString);
- strShow +=rString;
+ strShow +=rString;
for(SCCOL i=nCol1+1;i<=q;i++)
{
strShow.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
pDoc->GetString(i, nRow1, nTab1,rString);
- strShow += rString;
+ strShow += rString;
}
}
if(q<nCol2) // Zu lang? Ergaenzen um ",..."
@@ -590,12 +590,12 @@ void ScColRowNameRangesDlg::UpdateNames()
if(pDoc!=NULL)
{
pDoc->GetString(nCol1, nRow1, nTab1,rString);
- strShow += rString;
+ strShow += rString;
for(SCROW i=nRow1+1;i<=q;i++)
{
strShow.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
pDoc->GetString(nCol1, i, nTab1,rString);
- strShow += rString;
+ strShow += rString;
}
}
if(q<nRow2)
@@ -619,17 +619,17 @@ void ScColRowNameRangesDlg::UpdateNames()
/*************************************************************************
-#* Member: UpdateRangeData Datum:04.09.97
+#* Member: UpdateRangeData Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
-#* Funktion: Aktualisieren der Bereichsdaten
+#* Funktion: Aktualisieren der Bereichsdaten
#*
-#* Input: Bereichs-String
-#* Flag fuer Spalten
+#* Input: Bereichs-String
+#* Flag fuer Spalten
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -670,17 +670,17 @@ void ScColRowNameRangesDlg::UpdateRangeData( const ScRange& rRange, BOOL bColNam
/*************************************************************************
-#* Member: IsRefInputMode Datum:04.09.97
+#* Member: IsRefInputMode Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
-#* Funktion: Abfragefunktion fuer Referenz- Input- Mode.
+#* Funktion: Abfragefunktion fuer Referenz- Input- Mode.
#*
-#* Input: Bereichs-String
-#* Flag fuer Spalten
+#* Input: Bereichs-String
+#* Flag fuer Spalten
#*
-#* Output: true, wenn Referenz- Input- Mode
+#* Output: true, wenn Referenz- Input- Mode
#*
#************************************************************************/
@@ -694,18 +694,18 @@ BOOL ScColRowNameRangesDlg::IsRefInputMode() const
// ========
/*************************************************************************
-#* Handler: OkBtnHdl Datum:04.09.97
+#* Handler: OkBtnHdl Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
#* Funktion: Wird ausgeloest, wenn der OK- Button gedrueckt wurde.
-#* Hinzufuegen- Button ausloesen, und die neu einge-
-#* stellten Bereiche ans Dokument uebergeben.
-#* Fensterschliessen- Anweisung ausloesen.
-#* Input: ---
+#* Hinzufuegen- Button ausloesen, und die neu einge-
+#* stellten Bereiche ans Dokument uebergeben.
+#* Fensterschliessen- Anweisung ausloesen.
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -728,16 +728,16 @@ IMPL_LINK( ScColRowNameRangesDlg, OkBtnHdl, void *, EMPTYARG )
/*************************************************************************
-#* Handler: CancelBtnHdl Datum:04.09.97
+#* Handler: CancelBtnHdl Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
-#* Funktion: Fensterschliessen- Anweisung ausloesen.
+#* Funktion: Fensterschliessen- Anweisung ausloesen.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -750,18 +750,18 @@ IMPL_LINK_INLINE_END( ScColRowNameRangesDlg, CancelBtnHdl, void *, EMPTYARG )
/*************************************************************************
-#* Handler: AddBtnHdl Datum:04.09.97
+#* Handler: AddBtnHdl Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
-#* Funktion: Nach betaetigen des Hinzufuegen- Buttons, werden
-#* die Bereichsangaben eingestellt und in der
-#* Listbox dargestellt.
+#* Funktion: Nach betaetigen des Hinzufuegen- Buttons, werden
+#* die Bereichsangaben eingestellt und in der
+#* Listbox dargestellt.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -823,17 +823,17 @@ IMPL_LINK( ScColRowNameRangesDlg, AddBtnHdl, void *, EMPTYARG )
/*************************************************************************
-#* Handler: RemoveBtnHdl Datum:04.09.97
+#* Handler: RemoveBtnHdl Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
-#* Funktion: Nach betaetigen des Loeschen- Buttons, wird
-#* die markierte Bereichsangabe geloescht.
+#* Funktion: Nach betaetigen des Loeschen- Buttons, wird
+#* die markierte Bereichsangabe geloescht.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -857,7 +857,7 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG )
if ( bFound )
{
String aStrDelMsg = ScGlobal::GetRscString( STR_QUERY_DELENTRY );
- String aMsg = aStrDelMsg.GetToken( 0, '#' );
+ String aMsg = aStrDelMsg.GetToken( 0, '#' );
aMsg += aRangeStr;
aMsg += aStrDelMsg.GetToken( 1, '#' );
@@ -882,7 +882,7 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG )
aLbRange.SelectEntryPos( nSelectPos );
if ( nSelectPos &&
(ULONG)aLbRange.GetEntryData( nSelectPos ) == nEntryDataDelim )
- aLbRange.SelectEntryPos( --nSelectPos ); // ---Zeile---
+ aLbRange.SelectEntryPos( --nSelectPos ); // ---Zeile---
aLbRange.GrabFocus();
aBtnAdd.Disable();
@@ -900,18 +900,18 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG )
/*************************************************************************
-#* Handler: Range1SelectHdl Datum:04.09.97
+#* Handler: Range1SelectHdl Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
-#* Funktion: Wenn Zeile in Listbox ausgewaehlt wird,
-#* werden die Eingabefelder entsprechend
-#* eingestellt.
+#* Funktion: Wenn Zeile in Listbox ausgewaehlt wird,
+#* werden die Eingabefelder entsprechend
+#* eingestellt.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -922,7 +922,7 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG )
USHORT nMoves = 0;
while ( nSelectPos < nCnt
&& (ULONG)aLbRange.GetEntryData( nSelectPos ) == nEntryDataDelim )
- { // skip Delimiter
+ { // skip Delimiter
++nMoves;
aLbRange.SelectEntryPos( ++nSelectPos );
}
@@ -930,7 +930,7 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG )
if ( nMoves )
{
if ( nSelectPos > 1 && nSelectPos >= nCnt )
- { // am Ende nicht auf dem " --- Zeile --- " Delimiter stehenbleiben
+ { // am Ende nicht auf dem " --- Zeile --- " Delimiter stehenbleiben
// wenn davor Eintraege existieren
nSelectPos = nCnt - 2;
aLbRange.SelectEntryPos( nSelectPos );
@@ -938,7 +938,7 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG )
}
else if ( nSelectPos > 2 && nSelectPos < nCnt && aRangeStr.Len()
&& aRangeStr == aEdAssign.GetText() )
- { // nach oben wandern statt nach unten auf die vorherige Position
+ { // nach oben wandern statt nach unten auf die vorherige Position
nSelectPos -= 2;
aLbRange.SelectEntryPos( nSelectPos );
aRangeStr = aLbRange.GetSelectEntry();
@@ -988,17 +988,17 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG )
/*************************************************************************
-#* Handler: Range1DataModifyHdl Datum:04.09.97
+#* Handler: Range1DataModifyHdl Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
-#* Funktion: Wird ausgeloest, wenn in der Tabelle, der Label-
-#* Bereich geaendert wurde.
+#* Funktion: Wird ausgeloest, wenn in der Tabelle, der Label-
+#* Bereich geaendert wurde.
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -1037,17 +1037,17 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1DataModifyHdl, void *, EMPTYARG )
/*************************************************************************
-#* Handler: Range2DataModifyHdl Datum:04.09.97
+#* Handler: Range2DataModifyHdl Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
-#* Funktion: Wird ausgeloest, wenn in der Tabelle, der Daten-
-#* Bereich geaendert wurde
+#* Funktion: Wird ausgeloest, wenn in der Tabelle, der Daten-
+#* Bereich geaendert wurde
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -1074,18 +1074,18 @@ IMPL_LINK( ScColRowNameRangesDlg, Range2DataModifyHdl, void *, EMPTYARG )
/*************************************************************************
-#* Handler: ColClickHdl Datum:04.09.97
+#* Handler: ColClickHdl Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
-#* Funktion: Radiobutton fuer Spalten wurde betaetigt,
-#* die entsprechenden Einstellungen werden
-#* vorgenommen
+#* Funktion: Radiobutton fuer Spalten wurde betaetigt,
+#* die entsprechenden Einstellungen werden
+#* vorgenommen
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
@@ -1112,18 +1112,18 @@ IMPL_LINK( ScColRowNameRangesDlg, ColClickHdl, void *, EMPTYARG )
/*************************************************************************
-#* Handler: RowClickHdl Datum:04.09.97
+#* Handler: RowClickHdl Datum:04.09.97
#*------------------------------------------------------------------------
#*
-#* Klasse: ScColRowNameRangesDlg
+#* Klasse: ScColRowNameRangesDlg
#*
-#* Funktion: Radiobutton fuer Zeilen wurde betaetigt,
-#* die entsprechenden Einstellungen werden
-#* vorgenommen
+#* Funktion: Radiobutton fuer Zeilen wurde betaetigt,
+#* die entsprechenden Einstellungen werden
+#* vorgenommen
#*
-#* Input: ---
+#* Input: ---
#*
-#* Output: ---
+#* Output: ---
#*
#************************************************************************/
diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx
index fd206ac537ba..e3fc21672714 100644
--- a/sc/source/ui/miscdlgs/delcldlg.cxx
+++ b/sc/source/ui/miscdlgs/delcldlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx
index 7be4c7a0bf3f..1811a1eee410 100644
--- a/sc/source/ui/miscdlgs/delcodlg.cxx
+++ b/sc/source/ui/miscdlgs/delcodlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent,
aBtnDelFormulas ( this, ScResId( BTN_DELFORMULAS ) ),
aBtnDelNotes ( this, ScResId( BTN_DELNOTES ) ),
aBtnDelAttrs ( this, ScResId( BTN_DELATTRS ) ),
- aBtnDelObjects ( this, ScResId( BTN_DELOBJECTS ) ),
+ aBtnDelObjects ( this, ScResId( BTN_DELOBJECTS ) ),
aBtnOk ( this, ScResId( BTN_OK ) ),
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp ( this, ScResId( BTN_HELP ) ),
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index 2b247f0f9a07..63cb85480154 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +54,16 @@
//----------------------------------------------------------------------------
ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent,
- ScDocument& rDocument,
+ ScDocument& rDocument,
FillDir eFillDir,
FillCmd eFillCmd,
FillDateCmd eFillDateCmd,
- String aStartStr,
- double fStep,
- double fMax,
- USHORT nPossDir )
+ String aStartStr,
+ double fStep,
+ double fMax,
+ USHORT nPossDir )
- : ModalDialog ( pParent, ScResId( RID_SCDLG_FILLSERIES ) ),
+ : ModalDialog ( pParent, ScResId( RID_SCDLG_FILLSERIES ) ),
aFlDirection ( this, ScResId( FL_DIRECTION ) ),
aBtnDown ( this, ScResId( BTN_BOTTOM ) ),
@@ -85,7 +85,7 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent,
aFtStartVal ( this, ScResId( FT_START_VALUE ) ),
aEdStartVal ( this, ScResId( ED_START_VALUES ) ),
- aStartStrVal ( aStartStr),
+ aStartStrVal ( aStartStr),
aFtEndVal ( this, ScResId( FT_END_VALUE ) ),
aEdEndVal ( this, ScResId( ED_END_VALUES ) ),
aFtIncrement ( this, ScResId( FT_INCREMENT ) ),
@@ -95,7 +95,7 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent,
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp ( this, ScResId( BTN_HELP ) ),
errMsgInvalidVal( ScResId( STR_VALERR ) ),
- rDoc ( rDocument ),
+ rDoc ( rDocument ),
theFillDir ( eFillDir ),
theFillCmd ( eFillCmd ),
theFillDateCmd ( eFillDateCmd ),
@@ -263,9 +263,9 @@ BOOL __EXPORT ScFillSeriesDlg::CheckIncrementVal()
BOOL __EXPORT ScFillSeriesDlg::CheckEndVal()
{
- BOOL bValOk = FALSE;
+ BOOL bValOk = FALSE;
sal_uInt32 nKey = 0;
- String aStr( aEdEndVal.GetText() );
+ String aStr( aEdEndVal.GetText() );
if ( aStr.Len() == 0 )
{
diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx
index d6eb1865b184..60513d76ef73 100644
--- a/sc/source/ui/miscdlgs/groupdlg.cxx
+++ b/sc/source/ui/miscdlgs/groupdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
//==================================================================
ScGroupDlg::ScGroupDlg( Window* pParent,
- USHORT nResId,
+ USHORT nResId,
BOOL bUngroup,
BOOL bRows ) :
ModalDialog ( pParent, ScResId( nResId ) ),
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index dce755c10db3..57af654708a7 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +48,12 @@
// defines -------------------------------------------------------------------
-#define ABS_SREF SCA_VALID \
+#define ABS_SREF SCA_VALID \
| SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE
-#define ABS_DREF ABS_SREF \
+#define ABS_DREF ABS_SREF \
| SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE
-#define ABS_SREF3D ABS_SREF | SCA_TAB_3D
-#define ABS_DREF3D ABS_DREF | SCA_TAB_3D
+#define ABS_SREF3D ABS_SREF | SCA_TAB_3D
+#define ABS_DREF3D ABS_DREF | SCA_TAB_3D
@@ -68,27 +68,27 @@ inline void EnableDisable( Window& rWin, BOOL bEnable )
}
//============================================================================
-// class ScHighlightChgDlg
+// class ScHighlightChgDlg
//----------------------------------------------------------------------------
ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
- ScViewData* ptrViewData)
+ ScViewData* ptrViewData)
- : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_HIGHLIGHT_CHANGES ),
+ : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_HIGHLIGHT_CHANGES ),
//
- aHighlightBox ( this, ScResId( CB_HIGHLIGHT)),
+ aHighlightBox ( this, ScResId( CB_HIGHLIGHT)),
aFlFilter ( this, ScResId( FL_FILTER)),
- aFilterCtr ( this),
- aCbAccept ( this, ScResId( CB_HIGHLIGHT_ACCEPT)),
- aCbReject ( this, ScResId( CB_HIGHLIGHT_REJECT)),
- aOkButton ( this, ScResId( BTN_OK ) ),
- aCancelButton ( this, ScResId( BTN_CANCEL ) ),
- aHelpButton ( this, ScResId( BTN_HELP ) ),
+ aFilterCtr ( this),
+ aCbAccept ( this, ScResId( CB_HIGHLIGHT_ACCEPT)),
+ aCbReject ( this, ScResId( CB_HIGHLIGHT_REJECT)),
+ aOkButton ( this, ScResId( BTN_OK ) ),
+ aCancelButton ( this, ScResId( BTN_CANCEL ) ),
+ aHelpButton ( this, ScResId( BTN_HELP ) ),
aEdAssign ( this, this, ScResId( ED_ASSIGN ) ),
- aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ),
+ aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ),
//
- pViewData ( ptrViewData ),
- pDoc ( ptrViewData->GetDocument() ),
+ pViewData ( ptrViewData ),
+ pDoc ( ptrViewData->GetDocument() ),
aLocalRangeName ( *(pDoc->GetRangeName()) )
{
FreeResource();
@@ -118,7 +118,7 @@ ScHighlightChgDlg::~ScHighlightChgDlg()
void __EXPORT ScHighlightChgDlg::Init()
{
- String aAreaStr;
+ String aAreaStr;
ScRange aRange;
DBG_ASSERT( pViewData && pDoc, "ViewData oder Document nicht gefunden!" );
@@ -129,7 +129,7 @@ void __EXPORT ScHighlightChgDlg::Init()
aChangeViewSet.SetTheAuthorToShow(pChanges->GetUser());
aFilterCtr.ClearAuthors();
ScStrCollection aUserColl=pChanges->GetUserCollection();
- for(USHORT i=0;i<aUserColl.GetCount();i++)
+ for(USHORT i=0;i<aUserColl.GetCount();i++)
aFilterCtr.InsertAuthor(aUserColl[i]->GetString());
}
diff --git a/sc/source/ui/miscdlgs/highred.src b/sc/source/ui/miscdlgs/highred.src
index a244a3e2a44e..ce6409347168 100644
--- a/sc/source/ui/miscdlgs/highred.src
+++ b/sc/source/ui/miscdlgs/highred.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/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx
index 2a3489088489..20a501700c83 100644
--- a/sc/source/ui/miscdlgs/inscldlg.cxx
+++ b/sc/source/ui/miscdlgs/inscldlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx
index b1c8e31ef373..39332abe74b4 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +47,12 @@ USHORT ScInsertContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING |
IDF_ATTRIB | IDF_OBJECTS);
USHORT ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC;
USHORT ScInsertContentsDlg::nPreviousChecks2 = 0;
-USHORT ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; // enum InsCellCmd
+USHORT ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; // enum InsCellCmd
//-----------------------------------------------------------------------
-ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent,
- USHORT nCheckDefaults,
+ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent,
+ USHORT nCheckDefaults,
const String* pStrTitle )
: ModalDialog ( pParent, ScResId( RID_SCDLG_INSCONT ) ),
@@ -69,11 +69,11 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent,
aFlSep1 ( this, ScResId( FL_SEP1 ) ),
aFlOptions ( this, ScResId( FL_OPTIONS ) ),
aBtnSkipEmptyCells( this, ScResId(BTN_SKIP_EMPTY ) ),
- aBtnTranspose ( this, ScResId( BTN_TRANSPOSE ) ),
+ aBtnTranspose ( this, ScResId( BTN_TRANSPOSE ) ),
aBtnLink ( this, ScResId( BTN_LINK ) ),
aFlOperation ( this, ScResId( FL_OPERATION ) ),
aRbNoOp ( this, ScResId( BTN_OP_NOOP ) ),
- aRbAdd ( this, ScResId( BTN_OP_ADD ) ),
+ aRbAdd ( this, ScResId( BTN_OP_ADD ) ),
aRbSub ( this, ScResId( BTN_OP_SUB ) ),
aRbMul ( this, ScResId( BTN_OP_MUL ) ),
aRbDiv ( this, ScResId( BTN_OP_DIV ) ),
@@ -85,9 +85,9 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent,
aBtnOk ( this, ScResId( BTN_OK ) ),
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp ( this, ScResId( BTN_HELP ) ),
- bOtherDoc ( FALSE ),
- bFillMode ( FALSE ),
- bChangeTrack ( FALSE ),
+ bOtherDoc ( FALSE ),
+ bFillMode ( FALSE ),
+ bChangeTrack ( FALSE ),
bMoveDownDisabled( FALSE ),
bMoveRightDisabled( FALSE )
{
@@ -128,14 +128,14 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent,
switch( ScInsertContentsDlg::nPreviousMoveMode )
{
- case INS_NONE: aRbMoveNone.Check(TRUE); break;
- case INS_CELLSDOWN: aRbMoveDown.Check(TRUE); break;
+ case INS_NONE: aRbMoveNone.Check(TRUE); break;
+ case INS_CELLSDOWN: aRbMoveDown.Check(TRUE); break;
case INS_CELLSRIGHT: aRbMoveRight.Check(TRUE); break;
}
aBtnSkipEmptyCells.Check( ( ScInsertContentsDlg::nPreviousChecks2 & INS_CONT_NOEMPTY ) != 0);
- aBtnTranspose.Check( ( ScInsertContentsDlg::nPreviousChecks2 & INS_CONT_TRANS ) != 0);
- aBtnLink.Check( ( ScInsertContentsDlg::nPreviousChecks2 & INS_CONT_LINK ) != 0);
+ aBtnTranspose.Check( ( ScInsertContentsDlg::nPreviousChecks2 & INS_CONT_TRANS ) != 0);
+ aBtnLink.Check( ( ScInsertContentsDlg::nPreviousChecks2 & INS_CONT_LINK ) != 0);
DisableChecks( aBtnInsAll.IsChecked() );
@@ -212,7 +212,7 @@ void ScInsertContentsDlg::DisableChecks( BOOL bInsAllChecked )
aBtnInsNotes.Enable();
aBtnInsAttrs.Enable();
- // "Objects" is disabled for "Fill Tables"
+ // "Objects" is disabled for "Fill Tables"
if ( bFillMode )
aBtnInsObjects.Disable();
else
@@ -337,12 +337,12 @@ __EXPORT ScInsertContentsDlg::~ScInsertContentsDlg()
ScInsertContentsDlg::nPreviousChecks2 = 0;
if(aBtnSkipEmptyCells.IsChecked())
ScInsertContentsDlg::nPreviousChecks2 |= INS_CONT_NOEMPTY;
- if( aBtnTranspose.IsChecked())
+ if( aBtnTranspose.IsChecked())
ScInsertContentsDlg::nPreviousChecks2 |= INS_CONT_TRANS;
if( aBtnLink.IsChecked() )
ScInsertContentsDlg::nPreviousChecks2 |= INS_CONT_LINK;
- if (!bFillMode) // im FillMode ist None gecheckt und alle 3 disabled
+ if (!bFillMode) // im FillMode ist None gecheckt und alle 3 disabled
{
if ( aRbMoveNone.IsChecked() )
ScInsertContentsDlg::nPreviousMoveMode = INS_NONE;
@@ -353,7 +353,7 @@ __EXPORT ScInsertContentsDlg::~ScInsertContentsDlg()
}
}
-USHORT ScInsertContentsDlg::GetFormulaCmdBits() const
+USHORT ScInsertContentsDlg::GetFormulaCmdBits() const
{
ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC;
if(aRbAdd.IsChecked())
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 06d4f23389c0..2bb75ad5b87f 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,32 +67,32 @@
ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nTabCount, bool bFromFile )
- : ModalDialog ( pParent, ScResId( RID_SCDLG_INSERT_TABLE ) ),
+ : ModalDialog ( pParent, ScResId( RID_SCDLG_INSERT_TABLE ) ),
//
- aBtnBefore ( this, ScResId( RB_BEFORE ) ),
- aBtnBehind ( this, ScResId( RB_BEHIND ) ),
- aFlPos ( this, ScResId( FL_POSITION ) ),
- aBtnNew ( this, ScResId( RB_NEW ) ),
+ aBtnBefore ( this, ScResId( RB_BEFORE ) ),
+ aBtnBehind ( this, ScResId( RB_BEHIND ) ),
+ aFlPos ( this, ScResId( FL_POSITION ) ),
+ aBtnNew ( this, ScResId( RB_NEW ) ),
aBtnFromFile ( this, ScResId( RB_FROMFILE ) ),
- aFtCount ( this, ScResId( FT_COUNT ) ),
- aNfCount ( this, ScResId( NF_COUNT ) ),
- aFtName ( this, ScResId( FT_NAME ) ),
- aEdName ( this, ScResId( ED_TABNAME ) ),
- aLbTables ( this, ScResId( LB_TABLES ) ),
- aFtPath ( this, ScResId( FT_PATH ) ),
- aBtnBrowse ( this, ScResId( BTN_BROWSE ) ),
- aBtnLink ( this, ScResId( CB_LINK ) ),
- aFlTable ( this, ScResId( FL_TABLE ) ),
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
- rViewData ( rData ),
- rDoc ( *rData.GetDocument() ),
- pDocShTables ( NULL ),
+ aFtCount ( this, ScResId( FT_COUNT ) ),
+ aNfCount ( this, ScResId( NF_COUNT ) ),
+ aFtName ( this, ScResId( FT_NAME ) ),
+ aEdName ( this, ScResId( ED_TABNAME ) ),
+ aLbTables ( this, ScResId( LB_TABLES ) ),
+ aFtPath ( this, ScResId( FT_PATH ) ),
+ aBtnBrowse ( this, ScResId( BTN_BROWSE ) ),
+ aBtnLink ( this, ScResId( CB_LINK ) ),
+ aFlTable ( this, ScResId( FL_TABLE ) ),
+ aBtnOk ( this, ScResId( BTN_OK ) ),
+ aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
+ aBtnHelp ( this, ScResId( BTN_HELP ) ),
+ rViewData ( rData ),
+ rDoc ( *rData.GetDocument() ),
+ pDocShTables ( NULL ),
pDocInserter ( NULL ),
bMustClose ( false ),
- nSelTabIndex ( 0 ),
- nTableCount (nTabCount)
+ nSelTabIndex ( 0 ),
+ nTableCount (nTabCount)
{
#if ENABLE_LAYOUT
SetHelpId (SID_INSERT_TABLE);
@@ -115,12 +115,12 @@ __EXPORT ScInsertTableDlg::~ScInsertTableDlg()
void ScInsertTableDlg::Init_Impl( bool bFromFile )
{
- aBtnBrowse .SetClickHdl( LINK( this, ScInsertTableDlg, BrowseHdl_Impl ) );
- aBtnNew .SetClickHdl( LINK( this, ScInsertTableDlg, ChoiceHdl_Impl ) );
- aBtnFromFile .SetClickHdl( LINK( this, ScInsertTableDlg, ChoiceHdl_Impl ) );
- aLbTables .SetSelectHdl( LINK( this, ScInsertTableDlg, SelectHdl_Impl ) );
- aNfCount .SetModifyHdl( LINK( this, ScInsertTableDlg, CountHdl_Impl));
- aBtnOk .SetClickHdl( LINK( this, ScInsertTableDlg, DoEnterHdl ));
+ aBtnBrowse .SetClickHdl( LINK( this, ScInsertTableDlg, BrowseHdl_Impl ) );
+ aBtnNew .SetClickHdl( LINK( this, ScInsertTableDlg, ChoiceHdl_Impl ) );
+ aBtnFromFile .SetClickHdl( LINK( this, ScInsertTableDlg, ChoiceHdl_Impl ) );
+ aLbTables .SetSelectHdl( LINK( this, ScInsertTableDlg, SelectHdl_Impl ) );
+ aNfCount .SetModifyHdl( LINK( this, ScInsertTableDlg, CountHdl_Impl));
+ aBtnOk .SetClickHdl( LINK( this, ScInsertTableDlg, DoEnterHdl ));
aBtnBefore.Check();
aNfCount.SetText( String::CreateFromInt32(nTableCount) );
@@ -172,7 +172,7 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile )
short __EXPORT ScInsertTableDlg::Execute()
{
// set Parent of DocumentInserter and Doc-Manager
- Window* pOldDefParent = Application::GetDefDialogParent();
+ Window* pOldDefParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( LAYOUT_THIS_WINDOW (this) );
if ( aBtnFromFile.IsChecked() )
@@ -189,12 +189,12 @@ void ScInsertTableDlg::SetNewTable_Impl()
{
if (aBtnNew.IsChecked() )
{
- aNfCount .Enable();
- aFtCount .Enable();
- aLbTables .Disable();
- aFtPath .Disable();
- aBtnBrowse .Disable();
- aBtnLink .Disable();
+ aNfCount .Enable();
+ aFtCount .Enable();
+ aLbTables .Disable();
+ aFtPath .Disable();
+ aBtnBrowse .Disable();
+ aBtnLink .Disable();
if(nTableCount==1)
{
@@ -210,14 +210,14 @@ void ScInsertTableDlg::SetFromTo_Impl()
{
if (aBtnFromFile.IsChecked() )
{
- aEdName .Disable();
- aFtName .Disable();
- aFtCount .Disable();
- aNfCount .Disable();
- aLbTables .Enable();
- aFtPath .Enable();
- aBtnBrowse .Enable();
- aBtnLink .Enable();
+ aEdName .Disable();
+ aFtName .Disable();
+ aFtCount .Disable();
+ aNfCount .Disable();
+ aLbTables .Enable();
+ aFtPath .Enable();
+ aBtnBrowse .Enable();
+ aBtnLink .Enable();
}
}
diff --git a/sc/source/ui/miscdlgs/instbdlg.src b/sc/source/ui/miscdlgs/instbdlg.src
index 6f64c0de1d62..375dfc24fa4a 100644
--- a/sc/source/ui/miscdlgs/instbdlg.src
+++ b/sc/source/ui/miscdlgs/instbdlg.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/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx
index 79dcfe3b7ad8..eb010b414e77 100644
--- a/sc/source/ui/miscdlgs/lbseldlg.cxx
+++ b/sc/source/ui/miscdlgs/lbseldlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
//==================================================================
ScSelEntryDlg::ScSelEntryDlg( Window* pParent,
- USHORT nResId,
+ USHORT nResId,
const String& aTitle,
const String& aLbTitle,
List& aEntryList ) :
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx
index 48e33622e99f..d16a829cbeb7 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,18 +57,18 @@
ScLinkedAreaDlg::ScLinkedAreaDlg( Window* pParent ) :
ModalDialog ( pParent, ScResId( RID_SCDLG_LINKAREA ) ),
//
- aFlLocation ( this, ScResId( FL_LOCATION ) ),
- aCbUrl ( this, ScResId( CB_URL ) ),
- aBtnBrowse ( this, ScResId( BTN_BROWSE ) ),
- aTxtHint ( this, ScResId( FT_HINT ) ),
- aFtRanges ( this, ScResId( FT_RANGES ) ),
- aLbRanges ( this, ScResId( LB_RANGES ) ),
- aBtnReload ( this, ScResId( BTN_RELOAD ) ),
- aNfDelay ( this, ScResId( NF_DELAY ) ),
- aFtSeconds ( this, ScResId( FT_SECONDS ) ),
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
+ aFlLocation ( this, ScResId( FL_LOCATION ) ),
+ aCbUrl ( this, ScResId( CB_URL ) ),
+ aBtnBrowse ( this, ScResId( BTN_BROWSE ) ),
+ aTxtHint ( this, ScResId( FT_HINT ) ),
+ aFtRanges ( this, ScResId( FT_RANGES ) ),
+ aLbRanges ( this, ScResId( LB_RANGES ) ),
+ aBtnReload ( this, ScResId( BTN_RELOAD ) ),
+ aNfDelay ( this, ScResId( NF_DELAY ) ),
+ aFtSeconds ( this, ScResId( FT_SECONDS ) ),
+ aBtnOk ( this, ScResId( BTN_OK ) ),
+ aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
+ aBtnHelp ( this, ScResId( BTN_HELP ) ),
//
pSourceShell( NULL ),
pDocInserter( NULL )
@@ -76,7 +76,7 @@ ScLinkedAreaDlg::ScLinkedAreaDlg( Window* pParent ) :
{
FreeResource();
- aCbUrl.SetHelpId( HID_SCDLG_LINKAREAURL ); // SvtURLBox ctor always sets SID_OPENURL
+ aCbUrl.SetHelpId( HID_SCDLG_LINKAREAURL ); // SvtURLBox ctor always sets SID_OPENURL
aCbUrl.SetSelectHdl( LINK( this, ScLinkedAreaDlg, FileHdl ) );
aBtnBrowse.SetClickHdl( LINK( this, ScLinkedAreaDlg, BrowseHdl ) );
aLbRanges.SetSelectHdl( LINK( this, ScLinkedAreaDlg, RangeHdl ) );
@@ -93,7 +93,7 @@ short ScLinkedAreaDlg::Execute()
{
// set parent for file dialog or filter options
- Window* pOldDefParent = Application::GetDefDialogParent();
+ Window* pOldDefParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( this );
short nRet = ModalDialog::Execute();
@@ -123,14 +123,14 @@ IMPL_LINK( ScLinkedAreaDlg, FileHdl, ComboBox*, EMPTYARG )
SfxMedium* pMed = pSourceShell->GetMedium();
if ( pMed->GetName() == aEntered )
{
- // already loaded - nothing to do
+ // already loaded - nothing to do
return 0;
}
}
String aFilter;
String aOptions;
- // get filter name by looking at the file content (bWithContent = TRUE)
+ // get filter name by looking at the file content (bWithContent = TRUE)
// Break operation if any error occured inside.
if (!ScDocumentLoader::GetFilterName( aEntered, aFilter, aOptions, TRUE, TRUE ))
return 0;
@@ -150,7 +150,7 @@ void ScLinkedAreaDlg::LoadDocument( const String& rFile, const String& rFilter,
{
if ( pSourceShell )
{
- // unload old document
+ // unload old document
pSourceShell->DoClose();
pSourceShell = NULL;
aSourceRef.Clear();
@@ -165,16 +165,16 @@ void ScLinkedAreaDlg::LoadDocument( const String& rFile, const String& rFilter,
SfxErrorContext aEc( ERRCTX_SFX_OPENDOC, rFile );
- ScDocumentLoader aLoader( rFile, aNewFilter, aNewOptions, 0, TRUE ); // with interaction
+ ScDocumentLoader aLoader( rFile, aNewFilter, aNewOptions, 0, TRUE ); // with interaction
pSourceShell = aLoader.GetDocShell();
if ( pSourceShell )
{
ULONG nErr = pSourceShell->GetErrorCode();
if (nErr)
- ErrorHandler::HandleError( nErr ); // including warnings
+ ErrorHandler::HandleError( nErr ); // including warnings
aSourceRef = pSourceShell;
- aLoader.ReleaseDocRef(); // don't call DoClose in DocLoader dtor
+ aLoader.ReleaseDocRef(); // don't call DoClose in DocLoader dtor
}
}
}
@@ -361,6 +361,6 @@ ULONG ScLinkedAreaDlg::GetRefresh()
if ( aBtnReload.IsChecked() )
return sal::static_int_cast<ULONG>( aNfDelay.GetValue() );
else
- return 0; // disabled
+ return 0; // disabled
}
diff --git a/sc/source/ui/miscdlgs/linkarea.src b/sc/source/ui/miscdlgs/linkarea.src
index 715d3fd20766..ec5e3d4b868d 100644
--- a/sc/source/ui/miscdlgs/linkarea.src
+++ b/sc/source/ui/miscdlgs/linkarea.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/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx
index 02bc77f8f89e..ceb96573e0c8 100644
--- a/sc/source/ui/miscdlgs/mtrindlg.cxx
+++ b/sc/source/ui/miscdlgs/mtrindlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +42,9 @@
//==================================================================
ScMetricInputDlg::ScMetricInputDlg( Window* pParent,
- USHORT nResId,
- long nCurrent,
- long nDefault,
+ USHORT nResId,
+ long nCurrent,
+ long nDefault,
FieldUnit eFUnit,
USHORT nDecimals,
long nMaximum,
@@ -52,11 +52,11 @@ ScMetricInputDlg::ScMetricInputDlg( Window* pParent,
long nFirst,
long nLast )
- : ModalDialog ( pParent, ScResId( nResId ) ),
+ : ModalDialog ( pParent, ScResId( nResId ) ),
//
aFtEditTitle ( this, ScResId( FT_LABEL ) ),
aEdValue ( this, ScResId( ED_VALUE ) ),
- aBtnDefVal ( this, ScResId( BTN_DEFVAL ) ),
+ aBtnDefVal ( this, ScResId( BTN_DEFVAL ) ),
aBtnOk ( this, ScResId( BTN_OK ) ),
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp ( this, ScResId( BTN_HELP ) )
@@ -76,9 +76,9 @@ ScMetricInputDlg::ScMetricInputDlg( Window* pParent,
aEdValue.SetFirst ( aEdValue.Normalize( nFirst ), FUNIT_TWIP );
aEdValue.SetSpinSize ( aEdValue.Normalize( 1 ) / 10 );
aEdValue.SetValue ( aEdValue.Normalize( nDefault ), FUNIT_TWIP );
- nDefaultValue = sal::static_int_cast<long>( aEdValue.GetValue() );
+ nDefaultValue = sal::static_int_cast<long>( aEdValue.GetValue() );
aEdValue.SetValue ( aEdValue.Normalize( nCurrent ), FUNIT_TWIP );
- nCurrentValue = sal::static_int_cast<long>( aEdValue.GetValue() );
+ nCurrentValue = sal::static_int_cast<long>( aEdValue.GetValue() );
aBtnDefVal.Check( nCurrentValue == nDefaultValue );
FreeResource();
@@ -97,9 +97,9 @@ long ScMetricInputDlg::GetInputValue( FieldUnit eUnit ) const
/*
mit Nachkommastellen:
- double nVal = aEdValue.GetValue( eUnit );
- USHORT nDecs = aEdValue.GetDecimalDigits();
- double nFactor = 0.0;
+ double nVal = aEdValue.GetValue( eUnit );
+ USHORT nDecs = aEdValue.GetDecimalDigits();
+ double nFactor = 0.0;
// static long ImpPower10( USHORT nDecs )
{
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index 296cf8a8637f..37405ee1d947 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
ScMoveTableDlg::ScMoveTableDlg( Window* pParent )
- : ModalDialog ( pParent, ScResId( RID_SCDLG_MOVETAB ) ),
+ : ModalDialog ( pParent, ScResId( RID_SCDLG_MOVETAB ) ),
//
aFtDoc ( this, ScResId( FT_DEST ) ),
aLbDoc ( this, ScResId( LB_DEST ) ),
@@ -122,10 +122,10 @@ void __EXPORT ScMoveTableDlg::Init()
void ScMoveTableDlg::InitDocListBox()
{
- SfxObjectShell* pSh = SfxObjectShell::GetFirst();
- ScDocShell* pScSh = NULL;
- USHORT nSelPos = 0;
- USHORT i = 0;
+ SfxObjectShell* pSh = SfxObjectShell::GetFirst();
+ ScDocShell* pScSh = NULL;
+ USHORT nSelPos = 0;
+ USHORT i = 0;
aLbDoc.Clear();
aLbDoc.SetUpdateMode( FALSE );
diff --git a/sc/source/ui/miscdlgs/namecrea.cxx b/sc/source/ui/miscdlgs/namecrea.cxx
index 1714fddd3b3d..770551e33976 100644
--- a/sc/source/ui/miscdlgs/namecrea.cxx
+++ b/sc/source/ui/miscdlgs/namecrea.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,18 +44,18 @@
ScNameCreateDlg::ScNameCreateDlg( Window * pParent, USHORT nFlags )
: ModalDialog( pParent, ScResId(RID_SCDLG_NAMES_CREATE) ),
aFixedLine ( this, ScResId( FL_FRAME ) ),
- aTopBox ( this, ScResId( BTN_TOP ) ),
- aLeftBox ( this, ScResId( BTN_LEFT ) ),
- aBottomBox ( this, ScResId( BTN_BOTTOM ) ),
- aRightBox ( this, ScResId( BTN_RIGHT ) ),
- aOKButton ( this, ScResId( BTN_OK ) ),
- aCancelButton ( this, ScResId( BTN_CANCEL ) ),
- aHelpButton ( this, ScResId( BTN_HELP ) )
+ aTopBox ( this, ScResId( BTN_TOP ) ),
+ aLeftBox ( this, ScResId( BTN_LEFT ) ),
+ aBottomBox ( this, ScResId( BTN_BOTTOM ) ),
+ aRightBox ( this, ScResId( BTN_RIGHT ) ),
+ aOKButton ( this, ScResId( BTN_OK ) ),
+ aCancelButton ( this, ScResId( BTN_CANCEL ) ),
+ aHelpButton ( this, ScResId( BTN_HELP ) )
{
- aTopBox.Check ( (nFlags & NAME_TOP) ? TRUE : FALSE );
- aLeftBox.Check ( (nFlags & NAME_LEFT) ? TRUE : FALSE );
+ aTopBox.Check ( (nFlags & NAME_TOP) ? TRUE : FALSE );
+ aLeftBox.Check ( (nFlags & NAME_LEFT) ? TRUE : FALSE );
aBottomBox.Check( (nFlags & NAME_BOTTOM)? TRUE : FALSE );
- aRightBox.Check ( (nFlags & NAME_RIGHT) ? TRUE : FALSE );
+ aRightBox.Check ( (nFlags & NAME_RIGHT) ? TRUE : FALSE );
FreeResource();
}
@@ -64,12 +64,12 @@ ScNameCreateDlg::ScNameCreateDlg( Window * pParent, USHORT nFlags )
USHORT ScNameCreateDlg::GetFlags() const
{
- USHORT nResult = 0;
+ USHORT nResult = 0;
- nResult |= aTopBox.IsChecked() ? NAME_TOP: 0 ;
- nResult |= aLeftBox.IsChecked() ? NAME_LEFT: 0 ;
- nResult |= aBottomBox.IsChecked() ? NAME_BOTTOM: 0 ;
- nResult |= aRightBox.IsChecked() ? NAME_RIGHT: 0 ;
+ nResult |= aTopBox.IsChecked() ? NAME_TOP: 0 ;
+ nResult |= aLeftBox.IsChecked() ? NAME_LEFT: 0 ;
+ nResult |= aBottomBox.IsChecked() ? NAME_BOTTOM: 0 ;
+ nResult |= aRightBox.IsChecked() ? NAME_RIGHT: 0 ;
return nResult;
}
diff --git a/sc/source/ui/miscdlgs/namepast.cxx b/sc/source/ui/miscdlgs/namepast.cxx
index c621f14b431c..d72d86d2bc2d 100644
--- a/sc/source/ui/miscdlgs/namepast.cxx
+++ b/sc/source/ui/miscdlgs/namepast.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +44,12 @@
ScNamePasteDlg::ScNamePasteDlg( Window * pParent, const ScRangeName* pList, BOOL bInsList )
: ModalDialog( pParent, ScResId( RID_SCDLG_NAMES_PASTE ) ),
- aLabelText ( this, ScResId( FT_LABEL ) ),
- aNameList ( this, ScResId( LB_ENTRYLIST ) ),
- aOKButton ( this, ScResId( BTN_OK ) ),
- aCancelButton ( this, ScResId( BTN_CANCEL ) ),
- aHelpButton ( this, ScResId( BTN_HELP ) ),
- aInsListButton ( this, ScResId( BTN_ADD ) )
+ aLabelText ( this, ScResId( FT_LABEL ) ),
+ aNameList ( this, ScResId( LB_ENTRYLIST ) ),
+ aOKButton ( this, ScResId( BTN_OK ) ),
+ aCancelButton ( this, ScResId( BTN_CANCEL ) ),
+ aHelpButton ( this, ScResId( BTN_HELP ) ),
+ aInsListButton ( this, ScResId( BTN_ADD ) )
{
if( ! bInsList )
aInsListButton.Disable();
@@ -59,8 +59,8 @@ ScNamePasteDlg::ScNamePasteDlg( Window * pParent, const ScRangeName* pList, BOOL
aNameList.SetSelectHdl( LINK( this,ScNamePasteDlg,ListSelHdl) );
aNameList.SetDoubleClickHdl( LINK( this,ScNamePasteDlg,ListDblClickHdl) );
- USHORT nCnt = pList->GetCount();
- String aText;
+ USHORT nCnt = pList->GetCount();
+ String aText;
for( USHORT i=0 ; i<nCnt ; i++ )
{
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 37759aef81b5..ca91292dde2a 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -498,7 +498,7 @@ void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
{
USHORT nFmt = ( aAdr.Tab() == mnCurTab ) ? SCA_ABS : SCA_ABS_3D;
if ( bSingle )
- aAdr.Format( aStr, nFmt, pDocP, pDocP->GetAddressConvention() );
+ aAdr.Format( aStr, nFmt, pDocP, pDocP->GetAddressConvention() );
else
rRef.Format( aStr, nFmt | SCR_ABS, pDocP, pDocP->GetAddressConvention() );
}
diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx
index c10620bc8c4a..79d53b9c8206 100644
--- a/sc/source/ui/miscdlgs/protectiondlg.cxx
+++ b/sc/source/ui/miscdlgs/protectiondlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/miscdlgs/protectiondlg.src b/sc/source/ui/miscdlgs/protectiondlg.src
index 6b62efb4c784..34ad4063de57 100644
--- a/sc/source/ui/miscdlgs/protectiondlg.src
+++ b/sc/source/ui/miscdlgs/protectiondlg.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/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx
index 7046009f63b2..f1004a3faa0e 100644
--- a/sc/source/ui/miscdlgs/redcom.cxx
+++ b/sc/source/ui/miscdlgs/redcom.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScChangeAction *ScRedComDialog::FindPrev(ScChangeAction *pAction)
while(pAction!=NULL)
{
- if( pAction->GetState()==SC_CAS_VIRGIN &&
+ if( pAction->GetState()==SC_CAS_VIRGIN &&
pAction->IsDialogRoot() &&
ScViewUtil::IsActionShown(*pAction,*pSettings,*pDoc)) break;
@@ -96,7 +96,7 @@ ScChangeAction *ScRedComDialog::FindNext(ScChangeAction *pAction)
while(pAction!=NULL)
{
- if( pAction->GetState()==SC_CAS_VIRGIN &&
+ if( pAction->GetState()==SC_CAS_VIRGIN &&
pAction->IsDialogRoot() &&
ScViewUtil::IsActionShown(*pAction,*pSettings,*pDoc)) break;
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx
index 24e5dc409c83..02a7c0174037 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx
+++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/miscdlgs/retypepassdlg.src b/sc/source/ui/miscdlgs/retypepassdlg.src
index 794af9d43ebd..20cb3976a328 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.src
+++ b/sc/source/ui/miscdlgs/retypepassdlg.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/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index b2f837db4cb4..a7c902100f4e 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -67,30 +67,30 @@
//========================================================================
// AutoFormat-Dialog:
-ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent,
- ScAutoFormat* pAutoFormat,
+ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent,
+ ScAutoFormat* pAutoFormat,
const ScAutoFormatData* pSelFormatData,
ScDocument* pDoc ) :
- ModalDialog ( pParent, ScResId( RID_SCDLG_AUTOFORMAT ) ),
+ ModalDialog ( pParent, ScResId( RID_SCDLG_AUTOFORMAT ) ),
//
aFlFormat ( this, ScResId( FL_FORMAT ) ),
- aLbFormat ( this, ScResId( LB_FORMAT ) ),
+ aLbFormat ( this, ScResId( LB_FORMAT ) ),
pWndPreview ( new ScAutoFmtPreview( this, ScResId( WND_PREVIEW ), pDoc ) ),
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
- aBtnAdd ( this, ScResId( BTN_ADD ) ),
- aBtnRemove ( this, ScResId( BTN_REMOVE ) ),
- aBtnMore ( this, ScResId( BTN_MORE ) ),
+ aBtnOk ( this, ScResId( BTN_OK ) ),
+ aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
+ aBtnHelp ( this, ScResId( BTN_HELP ) ),
+ aBtnAdd ( this, ScResId( BTN_ADD ) ),
+ aBtnRemove ( this, ScResId( BTN_REMOVE ) ),
+ aBtnMore ( this, ScResId( BTN_MORE ) ),
aFlFormatting ( this, ScResId( FL_FORMATTING ) ),
- aBtnNumFormat ( this, ScResId( BTN_NUMFORMAT ) ),
- aBtnBorder ( this, ScResId( BTN_BORDER ) ),
- aBtnFont ( this, ScResId( BTN_FONT ) ),
- aBtnPattern ( this, ScResId( BTN_PATTERN ) ),
- aBtnAlignment ( this, ScResId( BTN_ALIGNMENT ) ),
- aBtnAdjust ( this, ScResId( BTN_ADJUST ) ),
- aBtnRename ( this, ScResId( BTN_RENAME ) ),
+ aBtnNumFormat ( this, ScResId( BTN_NUMFORMAT ) ),
+ aBtnBorder ( this, ScResId( BTN_BORDER ) ),
+ aBtnFont ( this, ScResId( BTN_FONT ) ),
+ aBtnPattern ( this, ScResId( BTN_PATTERN ) ),
+ aBtnAlignment ( this, ScResId( BTN_ALIGNMENT ) ),
+ aBtnAdjust ( this, ScResId( BTN_ADJUST ) ),
+ aBtnRename ( this, ScResId( BTN_RENAME ) ),
aStrTitle ( ScResId( STR_ADD_TITLE ) ),
aStrLabel ( ScResId( STR_ADD_LABEL ) ),
aStrClose ( ScResId( STR_BTN_CLOSE ) ),
@@ -98,11 +98,11 @@ ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent,
aStrDelMsg ( ScResId( STR_DEL_MSG ) ) ,
aStrRename ( ScResId( STR_RENAME_TITLE ) ),
//
- pFormat ( pAutoFormat ),
- pSelFmtData ( pSelFormatData ),
- nIndex ( 0 ),
+ pFormat ( pAutoFormat ),
+ pSelFmtData ( pSelFormatData ),
+ nIndex ( 0 ),
bCoreDataChanged( FALSE ),
- bFmtInserted ( FALSE )
+ bFmtInserted ( FALSE )
{
Init();
pWndPreview->NotifyChange( (*pFormat)[0] );
@@ -123,19 +123,19 @@ void ScAutoFormatDlg::Init()
USHORT nCount;
String aEntry;
- aLbFormat .SetSelectHdl( LINK( this, ScAutoFormatDlg, SelFmtHdl ) );
+ aLbFormat .SetSelectHdl( LINK( this, ScAutoFormatDlg, SelFmtHdl ) );
aBtnNumFormat.SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) );
- aBtnBorder .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) );
- aBtnFont .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) );
+ aBtnBorder .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) );
+ aBtnFont .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) );
aBtnPattern .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) );
aBtnAlignment.SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) );
- aBtnAdjust .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) );
- aBtnAdd .SetClickHdl ( LINK( this, ScAutoFormatDlg, AddHdl ) );
- aBtnRemove .SetClickHdl ( LINK( this, ScAutoFormatDlg, RemoveHdl ) );
- aBtnOk .SetClickHdl ( LINK( this, ScAutoFormatDlg, CloseHdl ) );
- aBtnCancel .SetClickHdl ( LINK( this, ScAutoFormatDlg, CloseHdl ) );
- aBtnRename .SetClickHdl ( LINK( this, ScAutoFormatDlg, RenameHdl ) );
- aLbFormat .SetDoubleClickHdl( LINK( this, ScAutoFormatDlg, DblClkHdl ) );
+ aBtnAdjust .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) );
+ aBtnAdd .SetClickHdl ( LINK( this, ScAutoFormatDlg, AddHdl ) );
+ aBtnRemove .SetClickHdl ( LINK( this, ScAutoFormatDlg, RemoveHdl ) );
+ aBtnOk .SetClickHdl ( LINK( this, ScAutoFormatDlg, CloseHdl ) );
+ aBtnCancel .SetClickHdl ( LINK( this, ScAutoFormatDlg, CloseHdl ) );
+ aBtnRename .SetClickHdl ( LINK( this, ScAutoFormatDlg, RenameHdl ) );
+ aLbFormat .SetDoubleClickHdl( LINK( this, ScAutoFormatDlg, DblClkHdl ) );
aBtnMore.AddWindow( &aBtnRename );
aBtnMore.AddWindow( &aBtnNumFormat );
@@ -179,11 +179,11 @@ void ScAutoFormatDlg::UpdateChecks()
ScAutoFormatData* pData = (*pFormat)[nIndex];
aBtnNumFormat.Check( pData->GetIncludeValueFormat() );
- aBtnBorder .Check( pData->GetIncludeFrame() );
- aBtnFont .Check( pData->GetIncludeFont() );
+ aBtnBorder .Check( pData->GetIncludeFrame() );
+ aBtnFont .Check( pData->GetIncludeFont() );
aBtnPattern .Check( pData->GetIncludeBackground() );
aBtnAlignment.Check( pData->GetIncludeJustify() );
- aBtnAdjust .Check( pData->GetIncludeWidthHeight() );
+ aBtnAdjust .Check( pData->GetIncludeWidthHeight() );
}
//------------------------------------------------------------------------
@@ -219,7 +219,7 @@ IMPL_LINK_INLINE_END( ScAutoFormatDlg, DblClkHdl, void *, EMPTYARG )
IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn )
{
ScAutoFormatData* pData = (*pFormat)[nIndex];
- BOOL bCheck = ((CheckBox*)pBtn)->IsChecked();
+ BOOL bCheck = ((CheckBox*)pBtn)->IsChecked();
if ( pBtn == &aBtnNumFormat )
pData->SetIncludeValueFormat( bCheck );
@@ -251,10 +251,10 @@ IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG )
{
if ( !bFmtInserted && pSelFmtData )
{
- String aStrStandard( ScResId(STR_STANDARD) );
- String aFormatName;
- ScStringInputDlg* pDlg;
- BOOL bOk = FALSE;
+ String aStrStandard( ScResId(STR_STANDARD) );
+ String aFormatName;
+ ScStringInputDlg* pDlg;
+ BOOL bOk = FALSE;
while ( !bOk )
{
@@ -468,7 +468,7 @@ IMPL_LINK( ScAutoFormatDlg, SelFmtHdl, void *, EMPTYARG )
String __EXPORT ScAutoFormatDlg::GetCurrFormatName()
{
- String aResult;
+ String aResult;
((*pFormat)[nIndex])->GetName( aResult );
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index 4a5b7cc2149b..96d5ded3b4d3 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/miscdlgs/sharedocdlg.src b/sc/source/ui/miscdlgs/sharedocdlg.src
index fe55ee58c8e4..13361b216ea5 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.src
+++ b/sc/source/ui/miscdlgs/sharedocdlg.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
@@ -65,7 +65,7 @@ ModalDialog RID_SCDLG_SHAREDOCUMENT
Pos = MAP_APPFONT ( 6 , 82 ) ;
Size = MAP_APPFONT ( 192 , 72 ) ;
Border = TRUE ;
- };
+ };
FixedLine FL_END
{
Pos = MAP_APPFONT ( 1 , 156 ) ;
diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx
index 7e57ebbe5d60..f71a4ab861fd 100644
--- a/sc/source/ui/miscdlgs/shtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/shtabdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx
index 097016836ee5..9dfc1af2d3dc 100644
--- a/sc/source/ui/miscdlgs/simpref.cxx
+++ b/sc/source/ui/miscdlgs/simpref.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,18 +42,18 @@
#include "scresid.hxx"
#include "globstr.hrc"
#include "simpref.hrc"
-#include "rangenam.hxx" // IsNameValid
+#include "rangenam.hxx" // IsNameValid
#include "simpref.hxx"
#include "scmod.hxx"
//============================================================================
-#define ABS_SREF SCA_VALID \
+#define ABS_SREF SCA_VALID \
| SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE
-#define ABS_DREF ABS_SREF \
+#define ABS_DREF ABS_SREF \
| SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE
-#define ABS_SREF3D ABS_SREF | SCA_TAB_3D
-#define ABS_DREF3D ABS_DREF | SCA_TAB_3D
+#define ABS_SREF3D ABS_SREF | SCA_TAB_3D
+#define ABS_DREF3D ABS_DREF | SCA_TAB_3D
//----------------------------------------------------------------------------
@@ -61,32 +61,32 @@
#define QUERYBOX(m) QueryBox(this,WinBits(WB_YES_NO|WB_DEF_YES),m).Execute()
//============================================================================
-// class ScSimpleRefDlg
+// class ScSimpleRefDlg
//----------------------------------------------------------------------------
ScSimpleRefDlg::ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
- ScViewData* ptrViewData )
+ ScViewData* ptrViewData )
- : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SIMPLEREF ),
+ : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SIMPLEREF ),
//
- aFtAssign ( this, ScResId( FT_ASSIGN ) ),
+ aFtAssign ( this, ScResId( FT_ASSIGN ) ),
aEdAssign ( this, this, ScResId( ED_ASSIGN ) ),
- aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ),
+ aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ),
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
+ aBtnOk ( this, ScResId( BTN_OK ) ),
+ aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
+ aBtnHelp ( this, ScResId( BTN_HELP ) ),
//
- pViewData ( ptrViewData ),
- pDoc ( ptrViewData->GetDocument() ),
- bRefInputMode ( FALSE ),
- bAutoReOpen ( TRUE ),
+ pViewData ( ptrViewData ),
+ pDoc ( ptrViewData->GetDocument() ),
+ bRefInputMode ( FALSE ),
+ bAutoReOpen ( TRUE ),
bCloseOnButtonUp( FALSE ),
bSingleCell ( FALSE ),
bMultiSelection ( FALSE )
{
- // damit die Strings in der Resource bei den FixedTexten bleiben koennen:
+ // damit die Strings in der Resource bei den FixedTexten bleiben koennen:
Init();
FreeResource();
SetDispatcherLock( TRUE ); // Modal-Modus einschalten
@@ -114,8 +114,8 @@ void ScSimpleRefDlg::SetRefString(const String &rStr)
//----------------------------------------------------------------------------
void ScSimpleRefDlg::Init()
{
- aBtnOk.SetClickHdl ( LINK( this, ScSimpleRefDlg, OkBtnHdl ) );
- aBtnCancel.SetClickHdl ( LINK( this, ScSimpleRefDlg, CancelBtnHdl ) );
+ aBtnOk.SetClickHdl ( LINK( this, ScSimpleRefDlg, OkBtnHdl ) );
+ aBtnCancel.SetClickHdl ( LINK( this, ScSimpleRefDlg, CancelBtnHdl ) );
bCloseFlag=FALSE;
}
@@ -170,9 +170,9 @@ void ScSimpleRefDlg::SetActive()
{
aEdAssign.GrabFocus();
- // kein NameModifyHdl, weil sonst Bereiche nicht geaendert werden koennen
- // (nach dem Aufziehen der Referenz wuerde der alte Inhalt wieder angezeigt)
- // (der ausgewaehlte DB-Name hat sich auch nicht veraendert)
+ // kein NameModifyHdl, weil sonst Bereiche nicht geaendert werden koennen
+ // (nach dem Aufziehen der Referenz wuerde der alte Inhalt wieder angezeigt)
+ // (der ausgewaehlte DB-Name hat sich auch nicht veraendert)
RefInputDone();
}
@@ -195,9 +195,9 @@ void ScSimpleRefDlg::SetCloseHdl( const Link& rLink )
void ScSimpleRefDlg::SetUnoLinks( const Link& rDone, const Link& rAbort,
const Link& rChange )
{
- aDoneHdl = rDone;
- aAbortedHdl = rAbort;
- aChangeHdl = rChange;
+ aDoneHdl = rDone;
+ aAbortedHdl = rAbort;
+ aChangeHdl = rChange;
}
void ScSimpleRefDlg::SetFlags( BOOL bSetCloseOnButtonUp, BOOL bSetSingleCell, BOOL bSetMultiSelection )
@@ -233,7 +233,7 @@ IMPL_LINK( ScSimpleRefDlg, OkBtnHdl, void *, EMPTYARG )
bAutoReOpen=FALSE;
String aResult=aEdAssign.GetText();
aCloseHdl.Call(&aResult);
- Link aUnoLink = aDoneHdl; // stack var because this is deleted in DoClose
+ Link aUnoLink = aDoneHdl; // stack var because this is deleted in DoClose
DoClose( ScSimpleRefDlgWrapper::GetChildWindowId() );
aUnoLink.Call( &aResult );
return 0;
@@ -245,7 +245,7 @@ IMPL_LINK( ScSimpleRefDlg, CancelBtnHdl, void *, EMPTYARG )
bAutoReOpen=FALSE;
String aResult=aEdAssign.GetText();
aCloseHdl.Call(NULL);
- Link aUnoLink = aAbortedHdl; // stack var because this is deleted in DoClose
+ Link aUnoLink = aAbortedHdl; // stack var because this is deleted in DoClose
DoClose( ScSimpleRefDlgWrapper::GetChildWindowId() );
aUnoLink.Call( &aResult );
return 0;
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index 418a88b3cbea..bd3b54c7f12b 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ const uno::Sequence<beans::PropertyValue>& ScSolverOptionsDialog::GetProperties(
USHORT nItemCount = pEntry->ItemCount();
for (USHORT nItemPos=0; nItemPos<nItemCount && !bHasData; ++nItemPos)
{
- SvLBoxItem* pItem = pEntry->GetItem( nItemPos );
+ SvLBoxItem* pItem = pEntry->GetItem( nItemPos );
ScSolverOptionsString* pStringItem = dynamic_cast<ScSolverOptionsString*>(pItem);
if ( pStringItem )
{
@@ -230,7 +230,7 @@ const uno::Sequence<beans::PropertyValue>& ScSolverOptionsDialog::GetProperties(
{
DBG_ERRORFILE( "wrong count" );
}
-
+
return maProperties;
}
@@ -277,7 +277,7 @@ void ScSolverOptionsDialog::FillListBox()
for (sal_Int32 nPos=0; nPos<nCount; nPos++)
{
rtl::OUString aVisName = aDescriptions[nPos].aDescription;
-
+
uno::Any aValue = maProperties[nPos].Value;
uno::TypeClass eClass = aValue.getValueTypeClass();
if ( eClass == uno::TypeClass_BOOLEAN )
@@ -333,7 +333,7 @@ void ScSolverOptionsDialog::EditOption()
USHORT nItemCount = pEntry->ItemCount();
for (USHORT nPos=0; nPos<nItemCount; ++nPos)
{
- SvLBoxItem* pItem = pEntry->GetItem( nPos );
+ SvLBoxItem* pItem = pEntry->GetItem( nPos );
ScSolverOptionsString* pStringItem = dynamic_cast<ScSolverOptionsString*>(pItem);
if ( pStringItem )
{
diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx
index ae080f2525c7..24eb0eb56a89 100644
--- a/sc/source/ui/miscdlgs/solverutil.cxx
+++ b/sc/source/ui/miscdlgs/solverutil.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx
index 5b41592e8457..c430fce8916c 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,42 +49,42 @@
#undef _SOLVERDLG_CXX
-#define ERRORBOX(s) ErrorBox( this, WinBits( WB_OK | WB_DEF_OK), s ).Execute()
+#define ERRORBOX(s) ErrorBox( this, WinBits( WB_OK | WB_DEF_OK), s ).Execute()
//============================================================================
-// class ScSolverDlg
+// class ScSolverDlg
//----------------------------------------------------------------------------
ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
ScDocument* pDocument,
- ScAddress aCursorPos )
+ ScAddress aCursorPos )
- : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SOLVER ),
+ : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SOLVER ),
//
aFlVariables ( this, ScResId( FL_VARIABLES ) ),
- aFtFormulaCell ( this, ScResId( FT_FORMULACELL ) ),
+ aFtFormulaCell ( this, ScResId( FT_FORMULACELL ) ),
aEdFormulaCell ( this, this, ScResId( ED_FORMULACELL ) ),
- aRBFormulaCell ( this, ScResId( RB_FORMULACELL ), &aEdFormulaCell, this ),
- aFtTargetVal ( this, ScResId( FT_TARGETVAL ) ),
- aEdTargetVal ( this, ScResId( ED_TARGETVAL ) ),
- aFtVariableCell ( this, ScResId( FT_VARCELL ) ),
+ aRBFormulaCell ( this, ScResId( RB_FORMULACELL ), &aEdFormulaCell, this ),
+ aFtTargetVal ( this, ScResId( FT_TARGETVAL ) ),
+ aEdTargetVal ( this, ScResId( ED_TARGETVAL ) ),
+ aFtVariableCell ( this, ScResId( FT_VARCELL ) ),
aEdVariableCell ( this, this, ScResId( ED_VARCELL ) ),
- aRBVariableCell ( this, ScResId( RB_VARCELL ), &aEdVariableCell, this ),
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
+ aRBVariableCell ( this, ScResId( RB_VARCELL ), &aEdVariableCell, this ),
+ aBtnOk ( this, ScResId( BTN_OK ) ),
+ aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
+ aBtnHelp ( this, ScResId( BTN_HELP ) ),
//
- theFormulaCell ( aCursorPos ),
- theVariableCell ( aCursorPos ),
- pDoc ( pDocument ),
- nCurTab ( aCursorPos.Tab() ),
- pEdActive ( NULL ),
- bDlgLostFocus ( FALSE ),
- errMsgInvalidVar ( ScResId( STR_INVALIDVAR ) ),
- errMsgInvalidForm ( ScResId( STR_INVALIDFORM ) ),
- errMsgNoFormula ( ScResId( STR_NOFORMULA ) ),
- errMsgInvalidVal ( ScResId( STR_INVALIDVAL ) )
+ theFormulaCell ( aCursorPos ),
+ theVariableCell ( aCursorPos ),
+ pDoc ( pDocument ),
+ nCurTab ( aCursorPos.Tab() ),
+ pEdActive ( NULL ),
+ bDlgLostFocus ( FALSE ),
+ errMsgInvalidVar ( ScResId( STR_INVALIDVAR ) ),
+ errMsgInvalidForm ( ScResId( STR_INVALIDFORM ) ),
+ errMsgNoFormula ( ScResId( STR_NOFORMULA ) ),
+ errMsgInvalidVal ( ScResId( STR_INVALIDVAL ) )
{
Init();
FreeResource();
@@ -100,10 +100,10 @@ __EXPORT ScSolverDlg::~ScSolverDlg()
void __EXPORT ScSolverDlg::Init()
{
- String aStr;
+ String aStr;
- aBtnOk. SetClickHdl ( LINK( this, ScSolverDlg, BtnHdl ) );
- aBtnCancel. SetClickHdl ( LINK( this, ScSolverDlg, BtnHdl ) );
+ aBtnOk. SetClickHdl ( LINK( this, ScSolverDlg, BtnHdl ) );
+ aBtnCancel. SetClickHdl ( LINK( this, ScSolverDlg, BtnHdl ) );
Link aLink = LINK( this, ScSolverDlg, GetFocusHdl );
aEdFormulaCell. SetGetFocusHdl ( aLink );
@@ -158,9 +158,9 @@ void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
if ( rRef.aStart != rRef.aEnd )
RefInputStart(pEdActive);
- String aStr;
- ScAddress aAdr = rRef.aStart;
- USHORT nFmt = ( aAdr.Tab() == nCurTab )
+ String aStr;
+ ScAddress aAdr = rRef.aStart;
+ USHORT nFmt = ( aAdr.Tab() == nCurTab )
? SCA_ABS
: SCA_ABS_3D;
@@ -234,8 +234,8 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn )
// 3. wurde ein korrekter Zielwert eingegeben
const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
- USHORT nRes1 = theFormulaCell .Parse( aEdFormulaCell.GetText(), pDoc, eConv );
- USHORT nRes2 = theVariableCell.Parse( aEdVariableCell.GetText(), pDoc, eConv );
+ USHORT nRes1 = theFormulaCell .Parse( aEdFormulaCell.GetText(), pDoc, eConv );
+ USHORT nRes2 = theVariableCell.Parse( aEdVariableCell.GetText(), pDoc, eConv );
if ( SCA_VALID == ( nRes1 & SCA_VALID ) )
{
@@ -254,7 +254,7 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn )
ScSolveParam aOutParam( theFormulaCell,
theVariableCell,
theTargetValStr );
- ScSolveItem aOutItem( SCITEM_SOLVEDATA, &aOutParam );
+ ScSolveItem aOutItem( SCITEM_SOLVEDATA, &aOutParam );
SetDispatcherLock( FALSE );
diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx
index b8dc2e13538e..3999d4dc40f3 100644
--- a/sc/source/ui/miscdlgs/strindlg.cxx
+++ b/sc/source/ui/miscdlgs/strindlg.cxx
@@ -70,7 +70,7 @@ ScStringInputDlg::ScStringInputDlg( Window* pParent,
aEdInput.SetText( rDefault );
aEdInput.SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
- // HelpId for Edit different for different uses
+ // HelpId for Edit different for different uses
if ( nHelpId == FID_TAB_APPEND )
aEdInput.SetHelpId( HID_SC_APPEND_NAME );
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index 463c06d76712..6fdf87a96238 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -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/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx
index 38ae6bddaebd..884560c5514e 100644
--- a/sc/source/ui/miscdlgs/tabopdlg.cxx
+++ b/sc/source/ui/miscdlgs/tabopdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,25 +49,25 @@
//============================================================================
-// class ScTabOpDlg
+// class ScTabOpDlg
//----------------------------------------------------------------------------
ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
ScDocument* pDocument,
- const ScRefAddress& rCursorPos )
+ const ScRefAddress& rCursorPos )
- : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_TABOP ),
+ : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_TABOP ),
//
aFlVariables ( this, ScResId( FL_VARIABLES ) ),
aFtFormulaRange ( this, ScResId( FT_FORMULARANGE ) ),
aEdFormulaRange ( this, this, ScResId( ED_FORMULARANGE ) ),
- aRBFormulaRange ( this, ScResId( RB_FORMULARANGE ), &aEdFormulaRange, this ),
- aFtRowCell ( this, ScResId( FT_ROWCELL ) ),
+ aRBFormulaRange ( this, ScResId( RB_FORMULARANGE ), &aEdFormulaRange, this ),
+ aFtRowCell ( this, ScResId( FT_ROWCELL ) ),
aEdRowCell ( this, this, ScResId( ED_ROWCELL ) ),
- aRBRowCell ( this, ScResId( RB_ROWCELL ), &aEdRowCell, this ),
- aFtColCell ( this, ScResId( FT_COLCELL ) ),
+ aRBRowCell ( this, ScResId( RB_ROWCELL ), &aEdRowCell, this ),
+ aFtColCell ( this, ScResId( FT_COLCELL ) ),
aEdColCell ( this, this, ScResId( ED_COLCELL ) ),
- aRBColCell ( this, ScResId( RB_COLCELL ), &aEdColCell, this ),
+ aRBColCell ( this, ScResId( RB_COLCELL ), &aEdColCell, this ),
aBtnOk ( this, ScResId( BTN_OK ) ),
aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp ( this, ScResId( BTN_HELP ) ),
@@ -77,12 +77,12 @@ ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
nCurTab ( theFormulaCell.Tab() ),
pEdActive ( NULL ),
bDlgLostFocus ( FALSE ),
- errMsgNoFormula ( ScResId( STR_NOFORMULA ) ),
- errMsgNoColRow ( ScResId( STR_NOCOLROW ) ),
- errMsgWrongFormula ( ScResId( STR_WRONGFORMULA ) ),
- errMsgWrongRowCol ( ScResId( STR_WRONGROWCOL ) ),
- errMsgNoColFormula ( ScResId( STR_NOCOLFORMULA ) ),
- errMsgNoRowFormula ( ScResId( STR_NOROWFORMULA ) )
+ errMsgNoFormula ( ScResId( STR_NOFORMULA ) ),
+ errMsgNoColRow ( ScResId( STR_NOCOLROW ) ),
+ errMsgWrongFormula ( ScResId( STR_WRONGFORMULA ) ),
+ errMsgWrongRowCol ( ScResId( STR_WRONGROWCOL ) ),
+ errMsgNoColFormula ( ScResId( STR_NOCOLFORMULA ) ),
+ errMsgNoRowFormula ( ScResId( STR_NOROWFORMULA ) )
{
Init();
FreeResource();
@@ -99,8 +99,8 @@ __EXPORT ScTabOpDlg::~ScTabOpDlg()
void __EXPORT ScTabOpDlg::Init()
{
- aBtnOk. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) );
- aBtnCancel. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) );
+ aBtnOk. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) );
+ aBtnCancel. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) );
Link aLink = LINK( this, ScTabOpDlg, GetFocusHdl );
aEdFormulaRange.SetGetFocusHdl( aLink );
@@ -159,8 +159,8 @@ void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
if ( rRef.aStart != rRef.aEnd )
RefInputStart(pEdActive);
- String aStr;
- USHORT nFmt = ( rRef.aStart.Tab() == nCurTab )
+ String aStr;
+ USHORT nFmt = ( rRef.aStart.Tab() == nCurTab )
? SCR_ABS
: SCR_ABS_3D;
@@ -190,7 +190,7 @@ void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
void ScTabOpDlg::RaiseError( ScTabOpErr eError )
{
const String* pMsg = &errMsgNoFormula;
- Edit* pEd = &aEdFormulaRange;
+ Edit* pEd = &aEdFormulaRange;
switch ( eError )
{
@@ -280,7 +280,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn )
const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
if (aEdRowCell.GetText().Len() > 0)
{
- if (!ConvertSingleRef( pDoc, aEdRowCell.GetText(), nCurTab,
+ if (!ConvertSingleRef( pDoc, aEdRowCell.GetText(), nCurTab,
theRowCell, eConv ))
nError = TABOPERR_WRONGROW;
else
@@ -299,7 +299,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn )
nError = TABOPERR_WRONGCOL;
else
{
- if (nMode == 1) // beides
+ if (nMode == 1) // beides
{
nMode = 2;
ConvertSingleRef( pDoc, aEdFormulaRange.GetText(), nCurTab,
@@ -322,7 +322,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn )
theRowCell,
theColCell,
nMode );
- ScTabOpItem aOutItem( SID_TABOP, &aOutParam );
+ ScTabOpItem aOutItem( SID_TABOP, &aOutParam );
SetDispatcherLock( FALSE );
SwitchToDocument();
diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx
index 9f8b2474fc3e..7c48cf288446 100644
--- a/sc/source/ui/miscdlgs/textdlgs.cxx
+++ b/sc/source/ui/miscdlgs/textdlgs.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#undef SC_DLLIMPLEMENTATION
-// ohne precompiled Headers uebersetzen !!!
+// ohne precompiled Headers uebersetzen !!!
@@ -55,9 +55,9 @@
ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr,
const SfxObjectShell* pDocShell ) :
- SfxTabDialog ( pParent, ScResId( RID_SCDLG_CHAR ), pAttr ),
- rOutAttrs ( *pAttr ),
- rDocShell ( *pDocShell )
+ SfxTabDialog ( pParent, ScResId( RID_SCDLG_CHAR ), pAttr ),
+ rOutAttrs ( *pAttr ),
+ rDocShell ( *pDocShell )
{
FreeResource();
@@ -99,8 +99,8 @@ void __EXPORT ScCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
// -----------------------------------------------------------------------
ScParagraphDlg::ScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ) :
- SfxTabDialog ( pParent, ScResId( RID_SCDLG_PARAGRAPH ), pAttr ),
- rOutAttrs ( *pAttr )
+ SfxTabDialog ( pParent, ScResId( RID_SCDLG_PARAGRAPH ), pAttr ),
+ rOutAttrs ( *pAttr )
{
FreeResource();
@@ -125,8 +125,8 @@ void __EXPORT ScParagraphDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
case RID_SVXPAGE_TABULATOR:
{
//CHINA001 ( (SvxTabulatorTabPage&) rPage ).
- //CHINA001 DisableControls( TABTYPE_ALL &~TABTYPE_LEFT |
- //CHINA001 TABFILL_ALL &~TABFILL_NONE );
+ //CHINA001 DisableControls( TABTYPE_ALL &~TABTYPE_LEFT |
+ //CHINA001 TABFILL_ALL &~TABFILL_NONE );
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));//add CHINA001
aSet.Put(SfxUInt16Item(SID_SVXTABULATORTABPAGE_CONTROLFLAGS,(TABTYPE_ALL &~TABTYPE_LEFT) |
(TABFILL_ALL &~TABFILL_NONE) ));
diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx
index 24b2e62a1c78..3d970e4e5c50 100644
--- a/sc/source/ui/miscdlgs/warnbox.cxx
+++ b/sc/source/ui/miscdlgs/warnbox.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index bc79fa7c65e7..1e1ebd7eebaa 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +51,12 @@
// defines -------------------------------------------------------------------
-#define ABS_SREF SCA_VALID \
+#define ABS_SREF SCA_VALID \
| SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE
-#define ABS_DREF ABS_SREF \
+#define ABS_DREF ABS_SREF \
| SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE
-#define ABS_SREF3D ABS_SREF | SCA_TAB_3D
-#define ABS_DREF3D ABS_DREF | SCA_TAB_3D
+#define ABS_SREF3D ABS_SREF | SCA_TAB_3D
+#define ABS_DREF3D ABS_DREF | SCA_TAB_3D
//============================================================================
@@ -78,78 +78,78 @@ struct SaveData
bDirty = TRUE;
}
- String aStrSymbol;
- BOOL bCriteria:1;
- BOOL bPrintArea:1;
- BOOL bColHeader:1;
- BOOL bRowHeader:1;
- BOOL bDirty:1;
+ String aStrSymbol;
+ BOOL bCriteria:1;
+ BOOL bPrintArea:1;
+ BOOL bColHeader:1;
+ BOOL bRowHeader:1;
+ BOOL bDirty:1;
};
static SaveData* pSaveObj = NULL;
#define SAVE_DATA() \
- pSaveObj->aStrSymbol = aEdAssign.GetText(); \
- pSaveObj->bCriteria = aBtnCriteria.IsChecked(); \
- pSaveObj->bPrintArea = aBtnPrintArea.IsChecked(); \
- pSaveObj->bColHeader = aBtnColHeader.IsChecked(); \
- pSaveObj->bRowHeader = aBtnRowHeader.IsChecked(); \
- pSaveObj->bDirty = TRUE;
+ pSaveObj->aStrSymbol = aEdAssign.GetText(); \
+ pSaveObj->bCriteria = aBtnCriteria.IsChecked(); \
+ pSaveObj->bPrintArea = aBtnPrintArea.IsChecked(); \
+ pSaveObj->bColHeader = aBtnColHeader.IsChecked(); \
+ pSaveObj->bRowHeader = aBtnRowHeader.IsChecked(); \
+ pSaveObj->bDirty = TRUE;
#define RESTORE_DATA() \
- if ( pSaveObj->bDirty ) \
- { \
- aEdAssign.SetText( pSaveObj->aStrSymbol ); \
- aBtnCriteria.Check( pSaveObj->bCriteria ); \
- aBtnPrintArea.Check( pSaveObj->bPrintArea ); \
- aBtnColHeader.Check( pSaveObj->bColHeader ); \
- aBtnRowHeader.Check( pSaveObj->bRowHeader ); \
- pSaveObj->bDirty = FALSE; \
+ if ( pSaveObj->bDirty ) \
+ { \
+ aEdAssign.SetText( pSaveObj->aStrSymbol ); \
+ aBtnCriteria.Check( pSaveObj->bCriteria ); \
+ aBtnPrintArea.Check( pSaveObj->bPrintArea ); \
+ aBtnColHeader.Check( pSaveObj->bColHeader ); \
+ aBtnRowHeader.Check( pSaveObj->bRowHeader ); \
+ pSaveObj->bDirty = FALSE; \
}
#define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute();
//============================================================================
-// class ScNameDlg
+// class ScNameDlg
//----------------------------------------------------------------------------
ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
- ScViewData* ptrViewData,
- const ScAddress& aCursorPos )
+ ScViewData* ptrViewData,
+ const ScAddress& aCursorPos )
- : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_NAMES ),
+ : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_NAMES ),
//
aFlName ( this, ScResId( FL_NAME ) ),
- aEdName ( this, ScResId( ED_NAME ) ),
+ aEdName ( this, ScResId( ED_NAME ) ),
//
aFlAssign ( this, ScResId( FL_ASSIGN ) ),
aEdAssign ( this, this, ScResId( ED_ASSIGN ) ),
- aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ),
+ aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ),
//
- aFlType ( this, ScResId( FL_TYPE ) ),
- aBtnPrintArea ( this, ScResId( BTN_PRINTAREA ) ),
- aBtnColHeader ( this, ScResId( BTN_COLHEADER ) ),
- aBtnCriteria ( this, ScResId( BTN_CRITERIA ) ),
- aBtnRowHeader ( this, ScResId( BTN_ROWHEADER ) ),
+ aFlType ( this, ScResId( FL_TYPE ) ),
+ aBtnPrintArea ( this, ScResId( BTN_PRINTAREA ) ),
+ aBtnColHeader ( this, ScResId( BTN_COLHEADER ) ),
+ aBtnCriteria ( this, ScResId( BTN_CRITERIA ) ),
+ aBtnRowHeader ( this, ScResId( BTN_ROWHEADER ) ),
//
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
- aBtnAdd ( this, ScResId( BTN_ADD ) ),
- aBtnRemove ( this, ScResId( BTN_REMOVE ) ),
- aBtnMore ( this, ScResId( BTN_MORE ) ),
+ aBtnOk ( this, ScResId( BTN_OK ) ),
+ aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
+ aBtnHelp ( this, ScResId( BTN_HELP ) ),
+ aBtnAdd ( this, ScResId( BTN_ADD ) ),
+ aBtnRemove ( this, ScResId( BTN_REMOVE ) ),
+ aBtnMore ( this, ScResId( BTN_MORE ) ),
//
- bSaved (FALSE),
- aStrAdd ( ScResId( STR_ADD ) ),
- aStrModify ( ScResId( STR_MODIFY ) ),
+ bSaved (FALSE),
+ aStrAdd ( ScResId( STR_ADD ) ),
+ aStrModify ( ScResId( STR_MODIFY ) ),
errMsgInvalidSym( ScResId( STR_INVALIDSYMBOL ) ),
//
- pViewData ( ptrViewData ),
- pDoc ( ptrViewData->GetDocument() ),
+ pViewData ( ptrViewData ),
+ pDoc ( ptrViewData->GetDocument() ),
aLocalRangeName ( *(pDoc->GetRangeName()) ),
- theCursorPos ( aCursorPos ) // zum Berechnen der Referenzen
+ theCursorPos ( aCursorPos ) // zum Berechnen der Referenzen
{
pSaveObj = new SaveData;
Init();
@@ -169,19 +169,19 @@ __EXPORT ScNameDlg::~ScNameDlg()
void __EXPORT ScNameDlg::Init()
{
- String aAreaStr;
+ String aAreaStr;
ScRange aRange;
DBG_ASSERT( pViewData && pDoc, "ViewData oder Document nicht gefunden!" );
- aBtnOk.SetClickHdl ( LINK( this, ScNameDlg, OkBtnHdl ) );
- aBtnCancel.SetClickHdl ( LINK( this, ScNameDlg, CancelBtnHdl ) );
- aBtnAdd.SetClickHdl ( LINK( this, ScNameDlg, AddBtnHdl ) );
- aBtnRemove.SetClickHdl ( LINK( this, ScNameDlg, RemoveBtnHdl ) );
+ aBtnOk.SetClickHdl ( LINK( this, ScNameDlg, OkBtnHdl ) );
+ aBtnCancel.SetClickHdl ( LINK( this, ScNameDlg, CancelBtnHdl ) );
+ aBtnAdd.SetClickHdl ( LINK( this, ScNameDlg, AddBtnHdl ) );
+ aBtnRemove.SetClickHdl ( LINK( this, ScNameDlg, RemoveBtnHdl ) );
aEdAssign.SetGetFocusHdl( LINK( this, ScNameDlg, AssignGetFocusHdl ) );
- aEdAssign.SetModifyHdl ( LINK( this, ScNameDlg, EdModifyHdl ) );
- aEdName.SetModifyHdl ( LINK( this, ScNameDlg, EdModifyHdl ) );
- aEdName.SetSelectHdl ( LINK( this, ScNameDlg, NameSelectHdl ) );
+ aEdAssign.SetModifyHdl ( LINK( this, ScNameDlg, EdModifyHdl ) );
+ aEdName.SetModifyHdl ( LINK( this, ScNameDlg, EdModifyHdl ) );
+ aEdName.SetSelectHdl ( LINK( this, ScNameDlg, NameSelectHdl ) );
aBtnCriteria .Hide();
aBtnPrintArea.Hide();
@@ -217,7 +217,7 @@ void __EXPORT ScNameDlg::Init()
SAVE_DATA()
//@BugID 54702
- //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
+ //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
}
//----------------------------------------------------------------------------
@@ -243,7 +243,7 @@ void ScNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
if ( rRef.aStart != rRef.aEnd )
RefInputStart(&aEdAssign);
String aRefStr;
- rRef.Format( aRefStr, ABS_DREF3D, pDocP,
+ rRef.Format( aRefStr, ABS_DREF3D, pDocP,
ScAddress::Details(pDocP->GetAddressConvention(), 0, 0) );
aEdAssign.SetRefString( aRefStr );
}
@@ -270,7 +270,7 @@ void ScNameDlg::SetActive()
void __EXPORT ScNameDlg::UpdateChecks()
{
- USHORT nCurPos=0;
+ USHORT nCurPos=0;
if(aLocalRangeName.SearchName( aEdName.GetText(), nCurPos))
{
@@ -287,7 +287,7 @@ void __EXPORT ScNameDlg::UpdateChecks()
{
if ( !aFlType.IsEnabled() )
{
- aFlType .Enable();
+ aFlType .Enable();
aBtnCriteria .Enable();
aBtnPrintArea.Enable();
aBtnColHeader.Enable();
@@ -299,7 +299,7 @@ void __EXPORT ScNameDlg::UpdateChecks()
}
else if ( aFlType.IsEnabled() )
{
- aFlType .Disable();
+ aFlType .Disable();
aBtnCriteria .Disable();
aBtnPrintArea.Disable();
aBtnColHeader.Disable();
@@ -315,7 +315,7 @@ void __EXPORT ScNameDlg::UpdateChecks()
void __EXPORT ScNameDlg::UpdateNames()
{
- USHORT nRangeCount = aLocalRangeName.GetCount();
+ USHORT nRangeCount = aLocalRangeName.GetCount();
aEdName.SetUpdateMode( FALSE );
//-----------------------------------------------------------
@@ -326,8 +326,8 @@ void __EXPORT ScNameDlg::UpdateNames()
if ( nRangeCount > 0 )
{
- ScRangeData* pRangeData = NULL;
- String aString;
+ ScRangeData* pRangeData = NULL;
+ String aString;
for ( USHORT i=0; i<nRangeCount; i++ )
{
@@ -409,8 +409,8 @@ IMPL_LINK_INLINE_END( ScNameDlg, CancelBtnHdl, void *, EMPTYARG )
IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG )
{
- BOOL bAdded = FALSE;
- String aNewEntry = aEdName.GetText();
+ BOOL bAdded = FALSE;
+ String aNewEntry = aEdName.GetText();
USHORT nNamePos = aEdName.GetTopEntry();
aNewEntry.EraseLeadingChars( ' ' );
aNewEntry.EraseTrailingChars( ' ' );
@@ -421,12 +421,12 @@ IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG )
{
if ( pDoc )
{
- ScRangeData* pNewEntry = NULL;
- RangeType nType = RT_NAME;
- USHORT nFoundAt = 0;
- String theSymbol = aEdAssign.GetText();
- String aStrPos;
- String aStrArea;
+ ScRangeData* pNewEntry = NULL;
+ RangeType nType = RT_NAME;
+ USHORT nFoundAt = 0;
+ String theSymbol = aEdAssign.GetText();
+ String aStrPos;
+ String aStrArea;
pNewEntry = new ScRangeData( pDoc,
aNewEntry,
@@ -445,12 +445,12 @@ IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG )
// theSymbol gueltig?
// (= konnte theSymbol im ScRangeData-Ctor
- // in ein Token-Array uebersetzt werden?)
+ // in ein Token-Array uebersetzt werden?)
if ( 0 == pNewEntry->GetErrCode() )
{
// Eintrag bereits vorhanden? Dann vorher entfernen (=Aendern)
if ( aLocalRangeName.SearchName( aNewEntry, nFoundAt ) )
- { // alten Index uebernehmen
+ { // alten Index uebernehmen
pNewEntry->SetIndex(
((ScRangeData*)(aLocalRangeName.At(nFoundAt)))->GetIndex() );
aLocalRangeName.AtFree( nFoundAt );
@@ -472,7 +472,7 @@ IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG )
aBtnRemove.Disable();
//@BugID 54702 raus mit dem Sch.
- //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
+ //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
bAdded = TRUE;
}
@@ -502,13 +502,13 @@ IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG )
IMPL_LINK( ScNameDlg, RemoveBtnHdl, void *, EMPTYARG )
{
- USHORT nRemoveAt = 0;
+ USHORT nRemoveAt = 0;
const String aStrEntry = aEdName.GetText();
if ( aLocalRangeName.SearchName( aStrEntry, nRemoveAt ) )
{
String aStrDelMsg = ScGlobal::GetRscString( STR_QUERY_DELENTRY );
- String aMsg = aStrDelMsg.GetToken( 0, '#' );
+ String aMsg = aStrDelMsg.GetToken( 0, '#' );
aMsg += aStrEntry;
aMsg += aStrDelMsg.GetToken( 1, '#' );
@@ -539,8 +539,8 @@ IMPL_LINK( ScNameDlg, NameSelectHdl, void *, EMPTYARG )
if ( aLocalRangeName.SearchName( aEdName.GetText(), nAtPos ) )
{
- String aSymbol;
- ScRangeData* pData = (ScRangeData*)(aLocalRangeName.At( nAtPos ));
+ String aSymbol;
+ ScRangeData* pData = (ScRangeData*)(aLocalRangeName.At( nAtPos ));
if ( pData )
{
@@ -560,9 +560,9 @@ IMPL_LINK( ScNameDlg, NameSelectHdl, void *, EMPTYARG )
IMPL_LINK( ScNameDlg, EdModifyHdl, Edit *, pEd )
{
- String theName = aEdName.GetText();
- String theSymbol = aEdAssign.GetText();
- BOOL bNameFound = (COMBOBOX_ENTRY_NOTFOUND
+ String theName = aEdName.GetText();
+ String theSymbol = aEdAssign.GetText();
+ BOOL bNameFound = (COMBOBOX_ENTRY_NOTFOUND
!= aEdName.GetEntryPos( theName ));
if ( pEd == &aEdName )
@@ -577,7 +577,7 @@ IMPL_LINK( ScNameDlg, EdModifyHdl, Edit *, pEd )
aEdAssign.Disable();
aRbAssign.Disable();
//@BugID 54702 raus mit dem Sch.
- //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
+ //SFX_APPWINDOW->Disable(FALSE); //! allgemeine Methode im ScAnyRefDlg
}
else
{
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index a417621bb303..5d2ecffbada4 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@
#include "scmod.hxx"
#include "rangenam.hxx"
#include "dbcolect.hxx"
-#include "tablink.hxx" // fuer Loader
+#include "tablink.hxx" // fuer Loader
#include "popmenu.hxx"
#include "drwlayer.hxx"
#include "transobj.hxx"
@@ -72,11 +72,11 @@
using namespace com::sun::star;
-// Reihenfolge der Kategorien im Navigator -------------------------------------
+// Reihenfolge der Kategorien im Navigator -------------------------------------
static USHORT pTypeList[SC_CONTENT_COUNT] =
{
- SC_CONTENT_ROOT, // ROOT (0) muss vorne stehen
+ SC_CONTENT_ROOT, // ROOT (0) muss vorne stehen
SC_CONTENT_TABLE,
SC_CONTENT_RANGENAME,
SC_CONTENT_DBAREA,
@@ -106,8 +106,8 @@ ScDocShell* ScContentTree::GetManualOrCurrent()
}
else
{
- // Current nur, wenn keine manuell eingestellt ist
- // (damit erkannt wird, wenn das Dokument nicht mehr existiert)
+ // Current nur, wenn keine manuell eingestellt ist
+ // (damit erkannt wird, wenn das Dokument nicht mehr existiert)
SfxViewShell* pViewSh = SfxViewShell::Current();
if ( pViewSh )
@@ -121,20 +121,20 @@ ScDocShell* ScContentTree::GetManualOrCurrent()
}
//
-// ScContentTree
+// ScContentTree
//
ScContentTree::ScContentTree( Window* pParent, const ResId& rResId ) :
- SvTreeListBox ( pParent, rResId ),
- aEntryImages ( ScResId( RID_IMAGELIST_NAVCONT ) ),
- aHCEntryImages ( ScResId( RID_IMAGELIST_H_NAVCONT ) ),
- nRootType ( SC_CONTENT_ROOT ),
- bHiddenDoc ( FALSE ),
- pHiddenDocument ( NULL )
+ SvTreeListBox ( pParent, rResId ),
+ aEntryImages ( ScResId( RID_IMAGELIST_NAVCONT ) ),
+ aHCEntryImages ( ScResId( RID_IMAGELIST_H_NAVCONT ) ),
+ nRootType ( SC_CONTENT_ROOT ),
+ bHiddenDoc ( FALSE ),
+ pHiddenDocument ( NULL )
{
USHORT i;
for (i=0; i<SC_CONTENT_COUNT; i++)
- pPosList[pTypeList[i]] = i; // invers zum suchen
+ pPosList[pTypeList[i]] = i; // invers zum suchen
pParentWindow = (ScNavigatorDlg*)pParent;
@@ -156,7 +156,7 @@ void ScContentTree::InitRoot( USHORT nType )
if ( !nType )
return;
- if ( nRootType && nRootType != nType ) // ausgeblendet ?
+ if ( nRootType && nRootType != nType ) // ausgeblendet ?
{
pRootNodes[nType] = NULL;
return;
@@ -189,11 +189,11 @@ void ScContentTree::ClearType(USHORT nType)
else
{
SvLBoxEntry* pParent = pRootNodes[nType];
- if ( !pParent || GetChildCount(pParent) ) // nicht, wenn ohne Children schon da
+ if ( !pParent || GetChildCount(pParent) ) // nicht, wenn ohne Children schon da
{
if (pParent)
- GetModel()->Remove( pParent ); // mit allen Children
- InitRoot( nType ); // ggf. neu eintragen
+ GetModel()->Remove( pParent ); // mit allen Children
+ InitRoot( nType ); // ggf. neu eintragen
}
}
}
@@ -269,7 +269,7 @@ String lcl_GetDBAreaRange( ScDocument* pDoc, const String& rDBName )
String aRet;
if (pDoc)
{
- ScDBCollection* pDbNames = pDoc->GetDBCollection();
+ ScDBCollection* pDbNames = pDoc->GetDBCollection();
USHORT nCount = pDbNames->GetCount();
for ( USHORT i=0; i<nCount; i++ )
{
@@ -296,7 +296,7 @@ IMPL_LINK( ScContentTree, ContentDoubleClickHdl, ScContentTree *, EMPTYARG )
if( pEntry && (nType != SC_CONTENT_ROOT) && (nChild != SC_CONTENT_NOCHILD) )
{
if ( bHiddenDoc )
- return 0; //! spaeter...
+ return 0; //! spaeter...
String aText( GetEntryText( pEntry ) );
@@ -354,7 +354,7 @@ IMPL_LINK( ScContentTree, ContentDoubleClickHdl, ScContentTree *, EMPTYARG )
break;
}
- ScNavigatorDlg::ReleaseFocus(); // set focus into document
+ ScNavigatorDlg::ReleaseFocus(); // set focus into document
}
return 0;
@@ -376,7 +376,7 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt )
switch (aCode.GetModifier())
{
case KEY_MOD1:
- ToggleRoot(); // toggle root mode (as in Writer)
+ ToggleRoot(); // toggle root mode (as in Writer)
bUsed = TRUE;
break;
case 0:
@@ -413,12 +413,12 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt )
//BOOL __EXPORT ScContentTree::Drop( const DropEvent& rEvt )
//{
-// return pParentWindow->Drop(rEvt); // Drop auf Navigator
+// return pParentWindow->Drop(rEvt); // Drop auf Navigator
//}
//BOOL __EXPORT ScContentTree::QueryDrop( DropEvent& rEvt )
//{
-// return pParentWindow->QueryDrop(rEvt); // Drop auf Navigator
+// return pParentWindow->QueryDrop(rEvt); // Drop auf Navigator
//}
sal_Int8 ScContentTree::AcceptDrop( const AcceptDropEvent& /* rEvt */ )
@@ -447,12 +447,12 @@ void __EXPORT ScContentTree::Command( const CommandEvent& rCEvt )
switch ( rCEvt.GetCommand() )
{
case COMMAND_STARTDRAG:
- // Aus dem ExecuteDrag heraus kann der Navigator geloescht werden
- // (beim Umschalten auf einen anderen Dokument-Typ), das wuerde aber
- // den StarView MouseMove-Handler, der Command() aufruft, umbringen.
- // Deshalb Drag&Drop asynchron:
+ // Aus dem ExecuteDrag heraus kann der Navigator geloescht werden
+ // (beim Umschalten auf einen anderen Dokument-Typ), das wuerde aber
+ // den StarView MouseMove-Handler, der Command() aufruft, umbringen.
+ // Deshalb Drag&Drop asynchron:
-// DoDrag();
+// DoDrag();
Application::PostUserEvent( STATIC_LINK( this, ScContentTree, ExecDragHdl ) );
@@ -461,7 +461,7 @@ void __EXPORT ScContentTree::Command( const CommandEvent& rCEvt )
case COMMAND_CONTEXTMENU:
{
- // Drag-Drop Modus
+ // Drag-Drop Modus
PopupMenu aPop;
ScPopupMenu aDropMenu( ScResId( RID_POPUP_DROPMODE ) );
@@ -469,13 +469,13 @@ void __EXPORT ScContentTree::Command( const CommandEvent& rCEvt )
aPop.InsertItem( 1, pParentWindow->GetStrDragMode() );
aPop.SetPopupMenu( 1, &aDropMenu );
- // angezeigtes Dokument
+ // angezeigtes Dokument
ScPopupMenu aDocMenu;
aDocMenu.SetMenuFlags( aDocMenu.GetMenuFlags() | MENU_FLAG_NOAUTOMNEMONICS );
USHORT i=0;
USHORT nPos=0;
- // geladene Dokumente
+ // geladene Dokumente
ScDocShell* pCurrentSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() );
SfxObjectShell* pSh = SfxObjectShell::GetFirst();
while ( pSh )
@@ -494,11 +494,11 @@ void __EXPORT ScContentTree::Command( const CommandEvent& rCEvt )
}
pSh = SfxObjectShell::GetNext( *pSh );
}
- // "aktives Fenster"
+ // "aktives Fenster"
aDocMenu.InsertItem( ++i, pParentWindow->aStrActiveWin );
if (!bHiddenDoc && !aManualDoc.Len())
nPos = i;
- // verstecktes Dokument
+ // verstecktes Dokument
if ( aHiddenTitle.Len() )
{
String aEntry = aHiddenTitle;
@@ -511,17 +511,17 @@ void __EXPORT ScContentTree::Command( const CommandEvent& rCEvt )
aPop.InsertItem( 2, pParentWindow->GetStrDisplay() );
aPop.SetPopupMenu( 2, &aDocMenu );
- // ausfuehren
+ // ausfuehren
aPop.Execute( this, rCEvt.GetMousePosPixel() );
- if ( aDropMenu.WasHit() ) // Drag-Drop Modus
+ if ( aDropMenu.WasHit() ) // Drag-Drop Modus
{
USHORT nId = aDropMenu.GetSelected();
if ( nId >= RID_DROPMODE_URL && nId <= RID_DROPMODE_COPY )
pParentWindow->SetDropMode( nId - RID_DROPMODE_URL );
}
- else if ( aDocMenu.WasHit() ) // angezeigtes Dokument
+ else if ( aDocMenu.WasHit() ) // angezeigtes Dokument
{
USHORT nId = aDocMenu.GetSelected();
String aName = aDocMenu.GetItemText(nId);
@@ -547,7 +547,7 @@ void __EXPORT ScContentTree::RequestHelp( const HelpEvent& rHEvt )
BOOL bRet = FALSE;
String aHelpText;
SvLBoxEntry* pParent = GetParent(pEntry);
- if ( !pParent ) // Top-Level ?
+ if ( !pParent ) // Top-Level ?
{
aHelpText = String::CreateFromInt32( GetChildCount(pEntry) );
aHelpText += ' ';
@@ -556,7 +556,7 @@ void __EXPORT ScContentTree::RequestHelp( const HelpEvent& rHEvt )
}
else if ( pParent == pRootNodes[SC_CONTENT_NOTE] )
{
- aHelpText = GetEntryText(pEntry); // Notizen als Help-Text
+ aHelpText = GetEntryText(pEntry); // Notizen als Help-Text
bRet = TRUE;
}
else if ( pParent == pRootNodes[SC_CONTENT_AREALINK] )
@@ -612,9 +612,9 @@ ScDocument* ScContentTree::GetSourceDocument()
void ScContentTree::Refresh( USHORT nType )
{
if ( bHiddenDoc && !pHiddenDocument )
- return; // anderes Dokument angezeigt
+ return; // anderes Dokument angezeigt
- // wenn sich nichts geaendert hat, gleich abbrechen (gegen Geflacker)
+ // wenn sich nichts geaendert hat, gleich abbrechen (gegen Geflacker)
if ( nType == SC_CONTENT_NOTE )
if (!NoteStringsChanged())
@@ -656,7 +656,7 @@ void ScContentTree::Refresh( USHORT nType )
void ScContentTree::GetTableNames()
{
- if ( nRootType && nRootType != SC_CONTENT_TABLE ) // ausgeblendet ?
+ if ( nRootType && nRootType != SC_CONTENT_TABLE ) // ausgeblendet ?
return;
ScDocument* pDoc = GetSourceDocument();
@@ -674,7 +674,7 @@ void ScContentTree::GetTableNames()
void ScContentTree::GetAreaNames()
{
- if ( nRootType && nRootType != SC_CONTENT_RANGENAME ) // ausgeblendet ?
+ if ( nRootType && nRootType != SC_CONTENT_RANGENAME ) // ausgeblendet ?
return;
ScDocument* pDoc = GetSourceDocument();
@@ -720,14 +720,14 @@ void ScContentTree::GetAreaNames()
void ScContentTree::GetDbNames()
{
- if ( nRootType && nRootType != SC_CONTENT_DBAREA ) // ausgeblendet ?
+ if ( nRootType && nRootType != SC_CONTENT_DBAREA ) // ausgeblendet ?
return;
ScDocument* pDoc = GetSourceDocument();
if (!pDoc)
return;
- ScDBCollection* pDbNames = pDoc->GetDBCollection();
+ ScDBCollection* pDbNames = pDoc->GetDBCollection();
USHORT nCount = pDbNames->GetCount();
if ( nCount > 0 )
{
@@ -764,7 +764,7 @@ bool ScContentTree::IsPartOfType( USHORT nContentType, USHORT nObjIdentifier )
void ScContentTree::GetDrawNames( USHORT nType )
{
- if ( nRootType && nRootType != nType ) // ausgeblendet ?
+ if ( nRootType && nRootType != nType ) // ausgeblendet ?
return;
ScDocument* pDoc = GetSourceDocument();
@@ -820,7 +820,7 @@ void ScContentTree::GetDrawingNames()
void ScContentTree::GetLinkNames()
{
- if ( nRootType && nRootType != SC_CONTENT_AREALINK ) // ausgeblendet ?
+ if ( nRootType && nRootType != SC_CONTENT_AREALINK ) // ausgeblendet ?
return;
ScDocument* pDoc = GetSourceDocument();
@@ -837,7 +837,7 @@ void ScContentTree::GetLinkNames()
if (pBase->ISA(ScAreaLink))
InsertContent( SC_CONTENT_AREALINK, ((ScAreaLink*)pBase)->GetSource() );
- // in der Liste die Namen der Quellbereiche
+ // in der Liste die Namen der Quellbereiche
}
}
@@ -878,7 +878,7 @@ String lcl_NoteString( const ScPostIt& rNote )
void ScContentTree::GetNoteStrings()
{
- if ( nRootType && nRootType != SC_CONTENT_NOTE ) // ausgeblendet ?
+ if ( nRootType && nRootType != SC_CONTENT_NOTE ) // ausgeblendet ?
return;
ScDocument* pDoc = GetSourceDocument();
@@ -912,7 +912,7 @@ ScAddress ScContentTree::GetNotePos( ULONG nIndex )
if( pCell->HasNote() )
{
if (nFound == nIndex)
- return ScAddress( aIter.GetCol(), aIter.GetRow(), nTab ); // gefunden
+ return ScAddress( aIter.GetCol(), aIter.GetRow(), nTab ); // gefunden
++nFound;
}
pCell = aIter.GetNext();
@@ -960,7 +960,7 @@ BOOL ScContentTree::NoteStringsChanged()
}
if ( pEntry )
- bEqual = FALSE; // kommt noch was
+ bEqual = FALSE; // kommt noch was
return !bEqual;
}
@@ -1015,7 +1015,7 @@ BOOL ScContentTree::DrawNamesChanged( USHORT nType )
}
if ( pEntry )
- bEqual = FALSE; // kommt noch was
+ bEqual = FALSE; // kommt noch was
return !bEqual;
}
@@ -1035,7 +1035,7 @@ BOOL lcl_GetRange( ScDocument* pDoc, USHORT nType, const String& rName, ScRange&
}
else if ( nType == SC_CONTENT_DBAREA )
{
- ScDBCollection* pList = pDoc->GetDBCollection();
+ ScDBCollection* pList = pDoc->GetDBCollection();
if (pList)
if (pList->SearchName( rName, nPos ))
{
@@ -1116,7 +1116,7 @@ void lcl_DoDragCells( ScDocShell* pSrcShell, const ScRange& rRange, USHORT nFlag
pTransferObj->SetDragSource( pSrcShell, aMark );
pTransferObj->SetDragSourceFlags( nFlags );
- SC_MOD()->SetDragObject( pTransferObj, NULL ); // for internal D&D
+ SC_MOD()->SetDragObject( pTransferObj, NULL ); // for internal D&D
pWin->ReleaseMouse();
pTransferObj->StartDrag( pWin, DND_ACTION_COPYMOVE | DND_ACTION_LINK );
}
@@ -1142,7 +1142,7 @@ void ScContentTree::DoDrag()
{
String aText( GetEntryText( pEntry ) );
- ScDocument* pLocalDoc = NULL; // fuer URL-Drop
+ ScDocument* pLocalDoc = NULL; // fuer URL-Drop
String aDocName;
if (bHiddenDoc)
aDocName = aHiddenName;
@@ -1154,12 +1154,12 @@ void ScContentTree::DoDrag()
if (pDocSh->HasName())
aDocName = pDocSh->GetMedium()->GetName();
else
- pLocalDoc = pDocSh->GetDocument(); // Drop nur in dieses Dokument
+ pLocalDoc = pDocSh->GetDocument(); // Drop nur in dieses Dokument
}
}
- BOOL bDoLinkTrans = FALSE; // use ScLinkTransferObj
- String aLinkURL; // for ScLinkTransferObj
+ BOOL bDoLinkTrans = FALSE; // use ScLinkTransferObj
+ String aLinkURL; // for ScLinkTransferObj
String aLinkText;
USHORT nDropMode = pParentWindow->GetDropMode();
@@ -1175,8 +1175,8 @@ void ScContentTree::DoDrag()
if (aDocName.Len())
{
- // provide URL to outside only if the document has a name
- // (without name, only internal D&D via SetDragJump)
+ // provide URL to outside only if the document has a name
+ // (without name, only internal D&D via SetDragJump)
aLinkURL = aUrl;
aLinkText = aText;
@@ -1186,7 +1186,7 @@ void ScContentTree::DoDrag()
break;
case SC_DROPMODE_LINK:
{
- if ( aDocName.Len() ) // link only to named documents
+ if ( aDocName.Len() ) // link only to named documents
{
// for internal D&D, set flag to insert a link
@@ -1245,8 +1245,8 @@ void ScContentTree::DoDrag()
{
lcl_DoDragObject( pSrcShell, aText, nType, this );
- // in ExecuteDrag kann der Navigator geloescht worden sein
- // -> nicht mehr auf Member zugreifen !!!
+ // in ExecuteDrag kann der Navigator geloescht worden sein
+ // -> nicht mehr auf Member zugreifen !!!
}
}
}
@@ -1261,22 +1261,22 @@ void ScContentTree::DoDrag()
if ( aLinkURL.Len() )
pTransferObj->SetLinkURL( aLinkURL, aLinkText );
- // SetDragJump / SetDragLink has been done above
+ // SetDragJump / SetDragLink has been done above
ReleaseMouse();
pTransferObj->StartDrag( this, DND_ACTION_COPYMOVE | DND_ACTION_LINK );
}
}
- bIsInDrag = FALSE; // static Member
+ bIsInDrag = FALSE; // static Member
- delete pDocLoader; // falls Dokument zum Draggen geladen wurde
+ delete pDocLoader; // falls Dokument zum Draggen geladen wurde
}
IMPL_STATIC_LINK(ScContentTree, ExecDragHdl, void*, EMPTYARG)
{
- // als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch der
- // Navigator geloescht werden darf
+ // als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch der
+ // Navigator geloescht werden darf
pThis->DoDrag();
return 0;
@@ -1298,7 +1298,7 @@ BOOL ScContentTree::LoadFile( const String& rUrl )
String aDocName = rUrl;
xub_StrLen nPos = aDocName.Search('#');
if ( nPos != STRING_NOTFOUND )
- aDocName.Erase(nPos); // nur der Name, ohne #...
+ aDocName.Erase(nPos); // nur der Name, ohne #...
BOOL bReturn = FALSE;
String aFilter, aOptions;
@@ -1310,17 +1310,17 @@ BOOL ScContentTree::LoadFile( const String& rUrl )
aHiddenTitle = aLoader.GetTitle();
pHiddenDocument = aLoader.GetDocument();
- Refresh(); // Inhalte aus geladenem Dokument holen
+ Refresh(); // Inhalte aus geladenem Dokument holen
pHiddenDocument = NULL;
-// AdjustTitle();
+// AdjustTitle();
- pParentWindow->GetDocNames( &aHiddenTitle ); // Liste fuellen
+ pParentWindow->GetDocNames( &aHiddenTitle ); // Liste fuellen
}
else
- Sound::Beep(); // Fehler beim Laden
+ Sound::Beep(); // Fehler beim Laden
- // Dokument wird im dtor von ScDocumentLoader wieder geschlossen
+ // Dokument wird im dtor von ScDocumentLoader wieder geschlossen
return bReturn;
}
@@ -1347,7 +1347,7 @@ void ScContentTree::SetRootType( USHORT nNew )
}
}
-void ScContentTree::ToggleRoot() // nach Selektion
+void ScContentTree::ToggleRoot() // nach Selektion
{
USHORT nNew = SC_CONTENT_ROOT;
if ( nRootType == SC_CONTENT_ROOT )
@@ -1376,9 +1376,9 @@ void ScContentTree::ResetManualDoc()
void ScContentTree::ActiveDocChanged()
{
if ( !bHiddenDoc && !aManualDoc.Len() )
- Refresh(); // Inhalte nur wenn automatisch
+ Refresh(); // Inhalte nur wenn automatisch
- // Listbox muss immer geupdated werden, wegen aktiv-Flag
+ // Listbox muss immer geupdated werden, wegen aktiv-Flag
String aCurrent;
if ( bHiddenDoc )
@@ -1390,16 +1390,16 @@ void ScContentTree::ActiveDocChanged()
aCurrent = pSh->GetTitle();
else
{
- // eingestelltes Dokument existiert nicht mehr
+ // eingestelltes Dokument existiert nicht mehr
- aManualDoc.Erase(); // wieder automatisch
+ aManualDoc.Erase(); // wieder automatisch
Refresh();
- pSh = GetManualOrCurrent(); // sollte jetzt aktives sein
+ pSh = GetManualOrCurrent(); // sollte jetzt aktives sein
if (pSh)
aCurrent = pSh->GetTitle();
}
}
- pParentWindow->GetDocNames( &aCurrent ); // selektieren
+ pParentWindow->GetDocNames( &aCurrent ); // selektieren
}
void ScContentTree::SetManualDoc(const String& rName)
@@ -1408,11 +1408,11 @@ void ScContentTree::SetManualDoc(const String& rName)
if (!bHiddenDoc)
{
Refresh();
- pParentWindow->GetDocNames( &aManualDoc ); // selektieren
+ pParentWindow->GetDocNames( &aManualDoc ); // selektieren
}
}
-void ScContentTree::SelectDoc(const String& rName) // rName wie im Menue/Listbox angezeigt
+void ScContentTree::SelectDoc(const String& rName) // rName wie im Menue/Listbox angezeigt
{
if ( rName == pParentWindow->aStrActiveWin )
{
@@ -1420,7 +1420,7 @@ void ScContentTree::SelectDoc(const String& rName) // rName wie im Menue/Li
return;
}
- // "aktiv" oder "inaktiv" weglassen
+ // "aktiv" oder "inaktiv" weglassen
String aRealName = rName;
xub_StrLen nLen = rName.Len();
@@ -1451,7 +1451,7 @@ void ScContentTree::SelectDoc(const String& rName) // rName wie im Menue/Li
bHiddenDoc = FALSE;
SetManualDoc(aRealName);
}
- else if (aHiddenTitle.Len()) // verstecktes ausgewaehlt
+ else if (aHiddenTitle.Len()) // verstecktes ausgewaehlt
{
if (!bHiddenDoc)
LoadFile(aHiddenName);
diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx
index e5002c44c60e..280538011e6a 100644
--- a/sc/source/ui/navipi/navcitem.cxx
+++ b/sc/source/ui/navipi/navcitem.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "navcitem.hxx"
#include "global.hxx"
#include "navipi.hxx"
-#include "sc.hrc" // -> Item-IDs
+#include "sc.hrc" // -> Item-IDs
// STATIC DATA -----------------------------------------------------------
@@ -47,9 +47,9 @@
ScNavigatorControllerItem::ScNavigatorControllerItem( USHORT nIdP,
ScNavigatorDlg& rDlg,
- SfxBindings& rBindings )
+ SfxBindings& rBindings )
: SfxControllerItem ( nIdP, rBindings ),
- rNavigatorDlg ( rDlg )
+ rNavigatorDlg ( rDlg )
{
}
@@ -63,22 +63,22 @@ void __EXPORT ScNavigatorControllerItem::StateChanged( USHORT /* nSID */, SfxIte
case SID_CURRENTCELL:
if ( pItem )
{
-// const SfxPointItem* pCellPosItem = PTR_CAST(SfxPointItem, pItem);
+// const SfxPointItem* pCellPosItem = PTR_CAST(SfxPointItem, pItem);
const SfxStringItem* pCellPosItem = PTR_CAST(SfxStringItem, pItem);
DBG_ASSERT( pCellPosItem, "SfxStringItem expected!" );
if ( pCellPosItem )
{
- String aAddress( pCellPosItem->GetValue() );
+ String aAddress( pCellPosItem->GetValue() );
ScAddress aScAddress;
aScAddress.Parse( aAddress );
SCCOL nCol = aScAddress.Col()+1;
SCROW nRow = aScAddress.Row()+1;
-// SCCOL nCol = (USHORT)pCellPosItem->GetValue().X()+1;
-// SCROW nRow = (USHORT)pCellPosItem->GetValue().Y()+1;
+// SCCOL nCol = (USHORT)pCellPosItem->GetValue().X()+1;
+// SCROW nRow = (USHORT)pCellPosItem->GetValue().Y()+1;
rNavigatorDlg.UpdateColumn( &nCol );
rNavigatorDlg.UpdateRow ( &nRow );
@@ -94,7 +94,7 @@ void __EXPORT ScNavigatorControllerItem::StateChanged( USHORT /* nSID */, SfxIte
DBG_ASSERT( pTabItem, "SfxUInt16Item expected!" );
- // Tabelle fuer Basic ist 1-basiert
+ // Tabelle fuer Basic ist 1-basiert
if ( pTabItem && pTabItem->GetValue() )
{
SCTAB nTab = pTabItem->GetValue() - 1;
@@ -109,7 +109,7 @@ void __EXPORT ScNavigatorControllerItem::StateChanged( USHORT /* nSID */, SfxIte
case SID_CURRENTDOC:
//
- // gar nix mehr, wird ueber SFX_HINT_DOCCHANGED erledigt
+ // gar nix mehr, wird ueber SFX_HINT_DOCCHANGED erledigt
//
break;
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 846e2ce53310..d01ee0375bf6 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +60,11 @@
#include "navipi.hxx"
#include "navsett.hxx"
-// Timeout, um Notizen zu suchen
-#define SC_CONTENT_TIMEOUT 1000
+// Timeout, um Notizen zu suchen
+#define SC_CONTENT_TIMEOUT 1000
-// Toleranz, wieviel ueber der eingeklappten Groesse noch klein ist
-#define SCNAV_MINTOL 5
+// Toleranz, wieviel ueber der eingeklappten Groesse noch klein ist
+#define SCNAV_MINTOL 5
// maximum values for UI
#define SCNAV_MAXCOL (MAXCOLCOUNT)
@@ -77,7 +77,7 @@ static const xub_StrLen SCNAV_COLLETTERS = ::ScColToAlpha(SCNAV_MAXCOL).Len();
//------------------------------------------------------------------------
-// static
+// static
void ScNavigatorDlg::ReleaseFocus()
{
SfxViewShell* pCurSh = SfxViewShell::Current();
@@ -91,14 +91,14 @@ void ScNavigatorDlg::ReleaseFocus()
}
//==================================================================
-// class ColumnEdit
+// class ColumnEdit
//==================================================================
ColumnEdit::ColumnEdit( ScNavigatorDlg* pParent, const ResId& rResId )
- : SpinField ( pParent, rResId ),
- rDlg ( *pParent ),
- nCol ( 0 ),
- nKeyGroup ( KEYGROUP_ALPHA )
+ : SpinField ( pParent, rResId ),
+ rDlg ( *pParent ),
+ nCol ( 0 ),
+ nKeyGroup ( KEYGROUP_ALPHA )
{
SetMaxTextLen( SCNAV_COLDIGITS ); // 1...256...18278 or A...IV...ZZZ
}
@@ -123,9 +123,9 @@ long __EXPORT ColumnEdit::Notify( NotifyEvent& rNEvt )
if ( !aCode.IsMod1() && !aCode.IsMod2() )
{
- //! Eingabeueberpruefung (nur Zahlen oder nur Buchstaben, max 2 bzw 3 Stellen)
- //! war vor VCL per nicht weitergeleitetem KeyInput
- //! dafuer was neues ausdenken!!!
+ //! Eingabeueberpruefung (nur Zahlen oder nur Buchstaben, max 2 bzw 3 Stellen)
+ //! war vor VCL per nicht weitergeleitetem KeyInput
+ //! dafuer was neues ausdenken!!!
if ( aCode.GetCode() == KEY_RETURN )
{
@@ -135,8 +135,8 @@ long __EXPORT ColumnEdit::Notify( NotifyEvent& rNEvt )
}
}
}
- else if ( nType == EVENT_LOSEFOCUS ) // LoseFocus wird bei VCL nicht gerufen
- EvalText(); // nCol setzen
+ else if ( nType == EVENT_LOSEFOCUS ) // LoseFocus wird bei VCL nicht gerufen
+ EvalText(); // nCol setzen
return nHandled;
}
@@ -204,7 +204,7 @@ void ColumnEdit::EvalText()
if ( aStrCol.Len() > 0 )
{
- // nKeyGroup wird bei VCL mangels KeyInput nicht mehr gesetzt
+ // nKeyGroup wird bei VCL mangels KeyInput nicht mehr gesetzt
if ( CharClass::isAsciiNumeric(aStrCol) )
nCol = NumStrToAlpha( aStrCol );
@@ -303,12 +303,12 @@ SCCOL ColumnEdit::NumToAlpha( SCCOL nColNo, String& rStr )
}
//==================================================================
-// class RowEdit
+// class RowEdit
//==================================================================
RowEdit::RowEdit( ScNavigatorDlg* pParent, const ResId& rResId )
- : NumericField( pParent, rResId ),
- rDlg ( *pParent )
+ : NumericField( pParent, rResId ),
+ rDlg ( *pParent )
{
SetMax( SCNAV_MAXROW);
SetLast( SCNAV_MAXROW);
@@ -359,12 +359,12 @@ void RowEdit::ExecuteRow()
}
//==================================================================
-// class ScDocListBox
+// class ScDocListBox
//==================================================================
ScDocListBox::ScDocListBox( ScNavigatorDlg* pParent, const ResId& rResId )
- : ListBox ( pParent, rResId ),
- rDlg ( *pParent )
+ : ListBox ( pParent, rResId ),
+ rDlg ( *pParent )
{
}
@@ -385,20 +385,20 @@ void __EXPORT ScDocListBox::Select()
}
//==================================================================
-// class CommandToolBox
+// class CommandToolBox
//==================================================================
CommandToolBox::CommandToolBox( ScNavigatorDlg* pParent, const ResId& rResId )
- : ToolBox ( pParent, rResId ),
- rDlg ( *pParent )
+ : ToolBox ( pParent, rResId ),
+ rDlg ( *pParent )
{
- InitImageList(); // ImageList members of ScNavigatorDlg must be initialized before!
+ InitImageList(); // ImageList members of ScNavigatorDlg must be initialized before!
SetSizePixel( CalcWindowSizePixel() );
SetDropdownClickHdl( LINK(this, CommandToolBox, ToolBoxDropdownClickHdl) );
SetItemBits( IID_DROPMODE, GetItemBits( IID_DROPMODE ) | TIB_DROPDOWNONLY );
-// EnableItem( IID_UP, FALSE );
-// EnableItem( IID_DOWN, FALSE );
+// EnableItem( IID_UP, FALSE );
+// EnableItem( IID_DOWN, FALSE );
}
//------------------------------------------------------------------------
@@ -411,21 +411,21 @@ __EXPORT CommandToolBox::~CommandToolBox()
void CommandToolBox::Select( USHORT nSelId )
{
- // Modus umschalten ?
+ // Modus umschalten ?
if ( nSelId == IID_ZOOMOUT || nSelId == IID_SCENARIOS )
{
NavListMode eOldMode = rDlg.eListMode;
NavListMode eNewMode = eOldMode;
- if ( nSelId == IID_SCENARIOS ) // auf Szenario
+ if ( nSelId == IID_SCENARIOS ) // auf Szenario
{
if ( eOldMode == NAV_LMODE_SCENARIOS )
eNewMode = NAV_LMODE_AREAS;
else
eNewMode = NAV_LMODE_SCENARIOS;
}
- else // ein/aus
+ else // ein/aus
{
if ( eOldMode == NAV_LMODE_NONE )
eNewMode = NAV_LMODE_AREAS;
@@ -470,8 +470,8 @@ void __EXPORT CommandToolBox::Click()
IMPL_LINK( CommandToolBox, ToolBoxDropdownClickHdl, ToolBox*, EMPTYARG )
{
- // Das Popupmenue fuer den Dropmodus muss im Click (Button Down)
- // statt im Select (Button Up) aufgerufen werden.
+ // Das Popupmenue fuer den Dropmodus muss im Click (Button Down)
+ // statt im Select (Button Up) aufgerufen werden.
if ( GetCurItemId() == IID_DROPMODE )
{
@@ -480,12 +480,12 @@ IMPL_LINK( CommandToolBox, ToolBoxDropdownClickHdl, ToolBox*, EMPTYARG )
aPop.Execute( this, GetItemRect(IID_DROPMODE), POPUPMENU_EXECUTE_DOWN );
USHORT nId = aPop.GetSelected();
- EndSelection(); // vor SetDropMode (SetDropMode ruft SetItemImage)
+ EndSelection(); // vor SetDropMode (SetDropMode ruft SetItemImage)
if ( nId >= RID_DROPMODE_URL && nId <= RID_DROPMODE_COPY )
rDlg.SetDropMode( nId - RID_DROPMODE_URL );
- // #49956# den gehighlighteten Button aufheben
+ // #49956# den gehighlighteten Button aufheben
Point aPoint;
MouseEvent aLeave( aPoint, 0, MOUSE_LEAVEWINDOW | MOUSE_SYNTHETIC );
MouseMove( aLeave );
@@ -499,18 +499,18 @@ IMPL_LINK( CommandToolBox, ToolBoxDropdownClickHdl, ToolBox*, EMPTYARG )
void CommandToolBox::UpdateButtons()
{
NavListMode eMode = rDlg.eListMode;
- CheckItem( IID_SCENARIOS, eMode == NAV_LMODE_SCENARIOS );
- CheckItem( IID_ZOOMOUT, eMode != NAV_LMODE_NONE );
+ CheckItem( IID_SCENARIOS, eMode == NAV_LMODE_SCENARIOS );
+ CheckItem( IID_ZOOMOUT, eMode != NAV_LMODE_NONE );
- // Umschalten-Button:
+ // Umschalten-Button:
if ( eMode == NAV_LMODE_SCENARIOS || eMode == NAV_LMODE_NONE )
{
- EnableItem( IID_CHANGEROOT, FALSE );
+ EnableItem( IID_CHANGEROOT, FALSE );
CheckItem( IID_CHANGEROOT, FALSE );
}
else
{
- EnableItem( IID_CHANGEROOT, TRUE );
+ EnableItem( IID_CHANGEROOT, TRUE );
BOOL bRootSet = rDlg.aLbEntries.GetRootType() != SC_CONTENT_ROOT;
CheckItem( IID_CHANGEROOT, bRootSet );
}
@@ -520,9 +520,9 @@ void CommandToolBox::UpdateButtons()
USHORT nImageId = 0;
switch ( rDlg.nDropMode )
{
- case SC_DROPMODE_URL: nImageId = bHC ? RID_IMG_H_DROP_URL : RID_IMG_DROP_URL; break;
- case SC_DROPMODE_LINK: nImageId = bHC ? RID_IMG_H_DROP_LINK : RID_IMG_DROP_LINK; break;
- case SC_DROPMODE_COPY: nImageId = bHC ? RID_IMG_H_DROP_COPY : RID_IMG_DROP_COPY; break;
+ case SC_DROPMODE_URL: nImageId = bHC ? RID_IMG_H_DROP_URL : RID_IMG_DROP_URL; break;
+ case SC_DROPMODE_LINK: nImageId = bHC ? RID_IMG_H_DROP_LINK : RID_IMG_DROP_LINK; break;
+ case SC_DROPMODE_COPY: nImageId = bHC ? RID_IMG_H_DROP_COPY : RID_IMG_DROP_COPY; break;
}
SetItemImage( IID_DROPMODE, Image(ScResId(nImageId)) );
}
@@ -545,10 +545,10 @@ void CommandToolBox::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( rDCEvt.GetType() == DATACHANGED_SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
- // update item images
+ // update item images
InitImageList();
- UpdateButtons(); // drop mode
+ UpdateButtons(); // drop mode
}
ToolBox::DataChanged( rDCEvt );
@@ -566,7 +566,7 @@ ScNavigatorSettings::ScNavigatorSettings() :
}
//==================================================================
-// class ScNavigatorDlgWrapper
+// class ScNavigatorDlgWrapper
//==================================================================
SFX_IMPL_CHILDWINDOWCONTEXT( ScNavigatorDialogWrapper, SID_NAVIGATOR )
@@ -574,34 +574,34 @@ SFX_IMPL_CHILDWINDOWCONTEXT( ScNavigatorDialogWrapper, SID_NAVIGATOR )
#define IS_MODE(bit)(((nFlags)&(bit))==(bit))
ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
- Window* pParent,
- USHORT nId,
- SfxBindings* pBind,
+ Window* pParent,
+ USHORT nId,
+ SfxBindings* pBind,
SfxChildWinInfo* /* pInfo */ ) :
SfxChildWindowContext( nId )
{
pNavigator = new ScNavigatorDlg( pBind, this, pParent );
SetWindow( pNavigator );
- // Einstellungen muessen anderswo gemerkt werden,
- // pInfo geht uns (ausser der Groesse) nichts mehr an
+ // Einstellungen muessen anderswo gemerkt werden,
+ // pInfo geht uns (ausser der Groesse) nichts mehr an
- Size aInfoSize = pParent->GetOutputSizePixel(); // von aussen vorgegebene Groesse
- Size aNavSize = pNavigator->GetOutputSizePixel(); // Default-Groesse
+ Size aInfoSize = pParent->GetOutputSizePixel(); // von aussen vorgegebene Groesse
+ Size aNavSize = pNavigator->GetOutputSizePixel(); // Default-Groesse
aNavSize.Width() = Max( aInfoSize.Width(), aNavSize.Width() );
aNavSize.Height() = Max( aInfoSize.Height(), aNavSize.Height() );
pNavigator->nListModeHeight = Max( aNavSize.Height(), pNavigator->nListModeHeight );
- // Die Groesse kann in einem anderen Modul geaendert worden sein,
- // deshalb muessen in Abhaengigkeit von der momentanen Groesse die
- // Inhalte eingeblendet werden oder nicht
+ // Die Groesse kann in einem anderen Modul geaendert worden sein,
+ // deshalb muessen in Abhaengigkeit von der momentanen Groesse die
+ // Inhalte eingeblendet werden oder nicht
BOOL bSmall = ( aInfoSize.Height() <= pNavigator->aInitSize.Height() + SCNAV_MINTOL );
NavListMode eNavMode = NAV_LMODE_NONE;
if (!bSmall)
{
- // wenn Szenario aktiv war, wieder einschalten
+ // wenn Szenario aktiv war, wieder einschalten
ScNavipiCfg& rCfg = SC_MOD()->GetNavipiCfg();
NavListMode eLastMode = (NavListMode) rCfg.GetListMode();
@@ -611,18 +611,18 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
eNavMode = NAV_LMODE_AREAS;
}
- // Die Groesse des Floats nicht neu setzen (FALSE bei SetListMode), damit der
- // Navigator nicht aufgeklappt wird, wenn er minimiert war (#38872#).
+ // Die Groesse des Floats nicht neu setzen (FALSE bei SetListMode), damit der
+ // Navigator nicht aufgeklappt wird, wenn er minimiert war (#38872#).
- pNavigator->SetListMode( eNavMode, FALSE ); // FALSE: Groesse des Float nicht setzen
+ pNavigator->SetListMode( eNavMode, FALSE ); // FALSE: Groesse des Float nicht setzen
USHORT nCmdId;
switch (eNavMode)
{
- case NAV_LMODE_DOCS: nCmdId = IID_DOCS; break;
- case NAV_LMODE_AREAS: nCmdId = IID_AREAS; break;
- case NAV_LMODE_DBAREAS: nCmdId = IID_DBAREAS; break;
- case NAV_LMODE_SCENARIOS: nCmdId = IID_SCENARIOS; break;
+ case NAV_LMODE_DOCS: nCmdId = IID_DOCS; break;
+ case NAV_LMODE_AREAS: nCmdId = IID_AREAS; break;
+ case NAV_LMODE_DBAREAS: nCmdId = IID_DBAREAS; break;
+ case NAV_LMODE_SCENARIOS: nCmdId = IID_SCENARIOS; break;
default: nCmdId = 0;
}
if (nCmdId)
@@ -631,7 +631,7 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
pNavigator->DoResize();
}
- pNavigator->bFirstBig = ( nCmdId == 0 ); // dann spaeter
+ pNavigator->bFirstBig = ( nCmdId == 0 ); // dann spaeter
/*???
FloatingWindow* pFloat = GetFloatingWindow();
@@ -639,7 +639,7 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
pFloat->SetMinOutputSizePixel( pNavigator->GetMinOutputSizePixel() );
*/
-//!? pNavigator->Show();
+//!? pNavigator->Show();
}
void __EXPORT ScNavigatorDialogWrapper::Resizing( Size& rSize )
@@ -658,47 +658,47 @@ void __EXPORT ScNavigatorDialogWrapper::Resizing( Size& rSize )
ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Window* pParent ) :
Window( pParent, ScResId(RID_SCDLG_NAVIGATOR) ),
- rBindings ( *pB ), // is used in CommandToolBox ctor
+ rBindings ( *pB ), // is used in CommandToolBox ctor
aCmdImageList( ScResId( IL_CMD ) ),
aCmdImageListH( ScResId( ILH_CMD ) ),
- aFtCol ( this, ScResId( FT_COL ) ),
- aEdCol ( this, ScResId( ED_COL ) ),
- aFtRow ( this, ScResId( FT_ROW ) ),
- aEdRow ( this, ScResId( ED_ROW ) ),
- aTbxCmd ( this, ScResId( TBX_CMD ) ),
- aLbEntries ( this, ScResId( LB_ENTRIES ) ),
+ aFtCol ( this, ScResId( FT_COL ) ),
+ aEdCol ( this, ScResId( ED_COL ) ),
+ aFtRow ( this, ScResId( FT_ROW ) ),
+ aEdRow ( this, ScResId( ED_ROW ) ),
+ aTbxCmd ( this, ScResId( TBX_CMD ) ),
+ aLbEntries ( this, ScResId( LB_ENTRIES ) ),
aWndScenarios( this,ScResId( STR_QHLP_SCEN_LISTBOX), ScResId(STR_QHLP_SCEN_COMMENT)),
aLbDocuments( this, ScResId( LB_DOCUMENTS ) ),
aStrDragMode ( ScResId( STR_DRAGMODE ) ),
aStrDisplay ( ScResId( STR_DISPLAY ) ),
aStrActiveWin( ScResId( STR_ACTIVEWIN ) ),
- pContextWin ( pCW ),
- pMarkArea ( NULL ),
- pViewData ( NULL ),
+ pContextWin ( pCW ),
+ pMarkArea ( NULL ),
+ pViewData ( NULL ),
nListModeHeight( 0 ),
nInitListHeight( 0 ),
- eListMode ( NAV_LMODE_NONE ),
- nDropMode ( SC_DROPMODE_URL ),
- nCurCol ( 0 ),
- nCurRow ( 0 ),
- nCurTab ( 0 ),
- bFirstBig ( FALSE )
+ eListMode ( NAV_LMODE_NONE ),
+ nDropMode ( SC_DROPMODE_URL ),
+ nCurCol ( 0 ),
+ nCurRow ( 0 ),
+ nCurTab ( 0 ),
+ bFirstBig ( FALSE )
{
ScNavipiCfg& rCfg = SC_MOD()->GetNavipiCfg();
nDropMode = rCfg.GetDragMode();
- // eListMode wird von aussen gesetzt, Root weiter unten
+ // eListMode wird von aussen gesetzt, Root weiter unten
aLbDocuments.SetDropDownLineCount(9);
String aOpen = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( " (" ));
aStrActive = aOpen;
aStrActive += String( ScResId( STR_ACTIVE ) );
- aStrActive += ')'; // " (aktiv)"
+ aStrActive += ')'; // " (aktiv)"
aStrNotActive = aOpen;
aStrNotActive += String( ScResId( STR_NOTACTIVE ) );
- aStrNotActive += ')'; // " (inaktiv)"
+ aStrNotActive += ')'; // " (inaktiv)"
aStrHidden = aOpen;
aStrHidden += String( ScResId( STR_HIDDEN ) );
- aStrHidden += ')'; // " (versteckt)"
+ aStrHidden += ')'; // " (versteckt)"
aTitleBase = GetText();
@@ -712,13 +712,13 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win
+ nBorderOffset;
aInitSize.Height() = aLbEntries.GetPosPixel().Y();
- nInitListHeight = aLbEntries.GetSizePixel().Height();
- nListModeHeight = aInitSize.Height()
+ nInitListHeight = aLbEntries.GetSizePixel().Height();
+ nListModeHeight = aInitSize.Height()
+ nInitListHeight;
- // kein Resize, eh der ganze Kontext-Kram initialisiert ist!
-// SetOutputSizePixel( aInitSize ); //???
-/*! FloatingWindow* pFloat = pContextWin->GetFloatingWindow();
+ // kein Resize, eh der ganze Kontext-Kram initialisiert ist!
+// SetOutputSizePixel( aInitSize ); //???
+/*! FloatingWindow* pFloat = pContextWin->GetFloatingWindow();
if ( pFloat)
pFloat->SetMinOutputSizePixel( aInitSize );
*/
@@ -726,27 +726,27 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win
rBindings.ENTERREGISTRATIONS();
//-----------------------------
- REGISTER_SLOT( 0, SID_CURRENTCELL );
- REGISTER_SLOT( 1, SID_CURRENTTAB );
- REGISTER_SLOT( 2, SID_CURRENTDOC );
- REGISTER_SLOT( 3, SID_SELECT_SCENARIO );
+ REGISTER_SLOT( 0, SID_CURRENTCELL );
+ REGISTER_SLOT( 1, SID_CURRENTTAB );
+ REGISTER_SLOT( 2, SID_CURRENTDOC );
+ REGISTER_SLOT( 3, SID_SELECT_SCENARIO );
//-----------------------------
rBindings.LEAVEREGISTRATIONS();
StartListening( *(SFX_APP()) );
StartListening( rBindings );
- aLbDocuments.Hide(); // bei NAV_LMODE_NONE gibts die nicht
+ aLbDocuments.Hide(); // bei NAV_LMODE_NONE gibts die nicht
aLbEntries.InitWindowBits(TRUE);
aLbEntries.SetSpaceBetweenEntries(0);
aLbEntries.SetSelectionMode( SINGLE_SELECTION );
- aLbEntries.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE |
+ aLbEntries.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE |
SV_DRAGDROP_CTRL_COPY |
SV_DRAGDROP_ENABLE_TOP );
- // war eine Kategorie als Root ausgewaehlt?
+ // war eine Kategorie als Root ausgewaehlt?
USHORT nLastRoot = rCfg.GetRootType();
if ( nLastRoot )
aLbEntries.SetRootType( nLastRoot );
@@ -806,8 +806,8 @@ void __EXPORT ScNavigatorDlg::Resizing( Size& rNewSize ) // Size = Outputsize?
rNewSize.Height() = aMinOut.Height();
}
}
-// else
-// SfxDockingWindow::Resizing(rNewSize);
+// else
+// SfxDockingWindow::Resizing(rNewSize);
}
@@ -829,7 +829,7 @@ void ScNavigatorDlg::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( rDCEvt.GetType() == DATACHANGED_SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
- // toolbox images are exchanged in CommandToolBox::DataChanged
+ // toolbox images are exchanged in CommandToolBox::DataChanged
Invalidate();
}
@@ -850,13 +850,13 @@ void ScNavigatorDlg::DoResize()
Size aNewSize = GetOutputSizePixel();
long nTotalHeight = aNewSize.Height();
- // #41403# bei angedocktem Navigator wird das Fenster evtl. erst klein erzeugt,
- // dann kommt ein Resize auf die wirkliche Groesse -> dann Inhalte einschalten
+ // #41403# bei angedocktem Navigator wird das Fenster evtl. erst klein erzeugt,
+ // dann kommt ein Resize auf die wirkliche Groesse -> dann Inhalte einschalten
BOOL bSmall = ( nTotalHeight <= aInitSize.Height() + SCNAV_MINTOL );
if ( !bSmall && bFirstBig )
{
- // Inhalte laut Config wieder einschalten
+ // Inhalte laut Config wieder einschalten
bFirstBig = FALSE;
NavListMode eNavMode = NAV_LMODE_AREAS;
@@ -864,11 +864,11 @@ void ScNavigatorDlg::DoResize()
NavListMode eLastMode = (NavListMode) rCfg.GetListMode();
if ( eLastMode == NAV_LMODE_SCENARIOS )
eNavMode = NAV_LMODE_SCENARIOS;
- SetListMode( eNavMode, FALSE ); // FALSE: Groesse des Float nicht setzen
+ SetListMode( eNavMode, FALSE ); // FALSE: Groesse des Float nicht setzen
}
- // auch wenn die Inhalte nicht sichtbar sind, die Groessen anpassen,
- // damit die Breite stimmt
+ // auch wenn die Inhalte nicht sichtbar sind, die Groessen anpassen,
+ // damit die Breite stimmt
//@@ 03.11.97 changes begin
Point aEntryPos = aLbEntries.GetPosPixel();
@@ -882,7 +882,7 @@ void ScNavigatorDlg::DoResize()
long nListHeight = aLbDocuments.GetSizePixel().Height();
aNewSize.Height() -= ( aEntryPos.Y() + nListHeight + 2*nBorderOffset );
- if(aNewSize.Height()<0) aNewSize.Height()=0;
+ if(aNewSize.Height()<0) aNewSize.Height()=0;
aListPos.Y() = aEntryPos.Y() + aNewSize.Height() + nBorderOffset;
@@ -916,7 +916,7 @@ void __EXPORT ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
else if ( NAV_LMODE_NONE == eListMode )
{
- // Tabellen hier nicht mehr
+ // Tabellen hier nicht mehr
}
else
{
@@ -944,7 +944,7 @@ void __EXPORT ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
aLbEntries.Refresh( SC_CONTENT_AREALINK );
break;
- // SFX_HINT_DOCCHANGED kommt nicht nur bei Dokument-Wechsel
+ // SFX_HINT_DOCCHANGED kommt nicht nur bei Dokument-Wechsel
case SC_HINT_NAVIGATOR_UPDATEALL:
UpdateAll();
@@ -952,7 +952,7 @@ void __EXPORT ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
case FID_DATACHANGED:
case FID_ANYDATACHANGED:
- aContentTimer.Start(); // Notizen nicht sofort suchen
+ aContentTimer.Start(); // Notizen nicht sofort suchen
break;
default:
@@ -997,10 +997,10 @@ void ScNavigatorDlg::SetDropMode(USHORT nNew)
void ScNavigatorDlg::CursorPosChanged()
{
- //! Eintraege selektieren ???
+ //! Eintraege selektieren ???
-// if ( GetDBAtCursor( aStrDbName ) )
-// if ( GetAreaAtCursor( aStrAreaName ) )
+// if ( GetDBAtCursor( aStrDbName ) )
+// if ( GetAreaAtCursor( aStrAreaName ) )
}
//------------------------------------------------------------------------
@@ -1014,15 +1014,15 @@ void ScNavigatorDlg::SetCurrentCell( SCCOL nColNo, SCROW nRowNo )
ppBoundItems[0]->ClearCache();
ScAddress aScAddress( nColNo, nRowNo, 0 );
- String aAddr;
+ String aAddr;
aScAddress.Format( aAddr, SCA_ABS );
BOOL bUnmark = FALSE;
if ( GetViewData() )
bUnmark = !pViewData->GetMarkData().IsCellMarked( nColNo, nRowNo );
- SfxStringItem aPosItem( SID_CURRENTCELL, aAddr );
- SfxBoolItem aUnmarkItem( FN_PARAM_1, bUnmark ); // ggf. Selektion aufheben
+ SfxStringItem aPosItem( SID_CURRENTCELL, aAddr );
+ SfxBoolItem aUnmarkItem( FN_PARAM_1, bUnmark ); // ggf. Selektion aufheben
rBindings.GetDispatcher()->Execute( SID_CURRENTCELL,
SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD,
@@ -1033,7 +1033,7 @@ void ScNavigatorDlg::SetCurrentCell( SCCOL nColNo, SCROW nRowNo )
void ScNavigatorDlg::SetCurrentCellStr( const String rName )
{
ppBoundItems[0]->ClearCache();
- SfxStringItem aNameItem( SID_CURRENTCELL, rName );
+ SfxStringItem aNameItem( SID_CURRENTCELL, rName );
rBindings.GetDispatcher()->Execute( SID_CURRENTCELL,
SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD,
@@ -1046,7 +1046,7 @@ void ScNavigatorDlg::SetCurrentTable( SCTAB nTabNo )
{
if ( nTabNo != nCurTab )
{
- // Tabelle fuer Basic ist 1-basiert
+ // Tabelle fuer Basic ist 1-basiert
SfxUInt16Item aTabItem( SID_CURRENTTAB, static_cast<sal_uInt16>(nTabNo) + 1 );
rBindings.GetDispatcher()->Execute( SID_CURRENTTAB,
SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD,
@@ -1059,7 +1059,7 @@ void ScNavigatorDlg::SetCurrentTableStr( const String rName )
if (!GetViewData()) return;
ScDocument* pDoc = pViewData->GetDocument();
- SCTAB nCount = pDoc->GetTableCount();
+ SCTAB nCount = pDoc->GetTableCount();
String aTabName;
for ( SCTAB i=0; i<nCount; i++ )
@@ -1072,7 +1072,7 @@ void ScNavigatorDlg::SetCurrentTableStr( const String rName )
}
}
- Sound::Beep(); // Tabelle nicht gefunden
+ Sound::Beep(); // Tabelle nicht gefunden
}
//------------------------------------------------------------------------
@@ -1087,7 +1087,7 @@ void ScNavigatorDlg::SetCurrentObject( const String rName )
//------------------------------------------------------------------------
-void ScNavigatorDlg::SetCurrentDoc( const String& rDocName ) // aktivieren
+void ScNavigatorDlg::SetCurrentDoc( const String& rDocName ) // aktivieren
{
SfxStringItem aDocItem( SID_CURRENTDOC, rDocName );
rBindings.GetDispatcher()->Execute( SID_CURRENTDOC,
@@ -1160,7 +1160,7 @@ void ScNavigatorDlg::UpdateTable( const SCTAB* pTab )
else if ( GetViewData() )
nCurTab = pViewData->GetTabNo();
-// aLbTables.SetTab( nCurTab );
+// aLbTables.SetTab( nCurTab );
CheckDataArea();
}
@@ -1177,14 +1177,14 @@ void ScNavigatorDlg::UpdateAll()
break;
case NAV_LMODE_NONE:
- //! ???
+ //! ???
break;
default:
break;
}
- aContentTimer.Stop(); // dann nicht nochmal
+ aContentTimer.Stop(); // dann nicht nochmal
}
//------------------------------------------------------------------------
@@ -1194,7 +1194,7 @@ void ScNavigatorDlg::SetListMode( NavListMode eMode, BOOL bSetSize )
if ( eMode != eListMode )
{
if ( eMode != NAV_LMODE_NONE )
- bFirstBig = FALSE; // nicht mehr automatisch umschalten
+ bFirstBig = FALSE; // nicht mehr automatisch umschalten
eListMode = eMode;
@@ -1325,7 +1325,7 @@ void ScNavigatorDlg::ShowScenarios( BOOL bShow, BOOL bSetSize )
//------------------------------------------------------------------------
//
-// Dokumente fuer Dropdown-Listbox
+// Dokumente fuer Dropdown-Listbox
//
//------------------------------------------------------------------------
@@ -1352,7 +1352,7 @@ void ScNavigatorDlg::GetDocNames( const String* pManualSel )
if ( pManualSel ? ( aName == *pManualSel )
: ( pSh == pCurrentSh ) )
- aSelEntry = aEntry; // kompletter Eintrag zum Selektieren
+ aSelEntry = aEntry; // kompletter Eintrag zum Selektieren
}
pSh = SfxObjectShell::GetNext( *pSh );
@@ -1385,7 +1385,7 @@ void ScNavigatorDlg::MarkDataArea()
if ( pViewSh )
{
if ( !pMarkArea )
- pMarkArea = new ScArea;
+ pMarkArea = new ScArea;
pViewSh->MarkDataArea();
ScRange aMarkRange;
@@ -1433,7 +1433,7 @@ void ScNavigatorDlg::CheckDataArea()
void ScNavigatorDlg::StartOfDataArea()
{
- // pMarkArea auswerten ???
+ // pMarkArea auswerten ???
if ( GetViewData() )
{
@@ -1453,7 +1453,7 @@ void ScNavigatorDlg::StartOfDataArea()
void ScNavigatorDlg::EndOfDataArea()
{
- // pMarkArea auswerten ???
+ // pMarkArea auswerten ???
if ( GetViewData() )
{
@@ -1476,7 +1476,7 @@ SfxChildAlignment __EXPORT ScNavigatorDlg::CheckAlignment(
{
SfxChildAlignment eRetAlign;
- //! kein Andocken, wenn Listbox nicht da ???
+ //! kein Andocken, wenn Listbox nicht da ???
switch (eAlign)
{
@@ -1486,7 +1486,7 @@ SfxChildAlignment __EXPORT ScNavigatorDlg::CheckAlignment(
case SFX_ALIGN_BOTTOM:
case SFX_ALIGN_LOWESTBOTTOM:
case SFX_ALIGN_HIGHESTBOTTOM:
- eRetAlign = eActAlign; // nicht erlaubt
+ eRetAlign = eActAlign; // nicht erlaubt
break;
case SFX_ALIGN_LEFT:
@@ -1495,7 +1495,7 @@ SfxChildAlignment __EXPORT ScNavigatorDlg::CheckAlignment(
case SFX_ALIGN_LASTLEFT:
case SFX_ALIGN_FIRSTRIGHT:
case SFX_ALIGN_LASTRIGHT:
- eRetAlign = eAlign; // erlaubt
+ eRetAlign = eAlign; // erlaubt
break;
default:
@@ -1507,7 +1507,7 @@ SfxChildAlignment __EXPORT ScNavigatorDlg::CheckAlignment(
//------------------------------------------------------------------------
//
-// Drop auf den Navigator - andere Datei laden (File oder Bookmark)
+// Drop auf den Navigator - andere Datei laden (File oder Bookmark)
//
//------------------------------------------------------------------------
@@ -1516,7 +1516,7 @@ BOOL __EXPORT ScNavigatorDlg::Drop( const DropEvent& rEvt )
{
BOOL bReturn = FALSE;
- if ( !aLbEntries.IsInDrag() ) // kein Verschieben innerhalb der TreeListBox
+ if ( !aLbEntries.IsInDrag() ) // kein Verschieben innerhalb der TreeListBox
{
String aFileName;
@@ -1528,7 +1528,7 @@ BOOL __EXPORT ScNavigatorDlg::Drop( const DropEvent& rEvt )
aFileName = aBookmark.GetURL();
else
{
- // FORMAT_FILE direkt aus DragServer
+ // FORMAT_FILE direkt aus DragServer
USHORT nCount = DragServer::GetItemCount();
for ( USHORT i = 0; i < nCount && !aFileName.Len(); ++i )
@@ -1546,13 +1546,13 @@ BOOL __EXPORT ScNavigatorDlg::QueryDrop( DropEvent& rEvt )
{
BOOL bReturn = FALSE;
- if ( !aLbEntries.IsInDrag() ) // kein Verschieben innerhalb der TreeListBox
+ if ( !aLbEntries.IsInDrag() ) // kein Verschieben innerhalb der TreeListBox
{
SvScDataObjectRef pObject = SvScDataObject::PasteDragServer(rEvt);
if ( pObject->HasFormat(FORMAT_FILE)
|| INetBookmark::HasFormat(*pObject) )
{
- rEvt.SetAction(DROP_COPY); // Kopier-Cursor anzeigen
+ rEvt.SetAction(DROP_COPY); // Kopier-Cursor anzeigen
bReturn = TRUE;
}
}
diff --git a/sc/source/ui/navipi/navipi.hrc b/sc/source/ui/navipi/navipi.hrc
index 0adb65a5a042..2ae1121e448d 100644
--- a/sc/source/ui/navipi/navipi.hrc
+++ b/sc/source/ui/navipi/navipi.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,38 +26,38 @@
************************************************************************/
#include "sc.hrc"
-//#define RID_SCDLG_NAVIGATOR 256
+//#define RID_SCDLG_NAVIGATOR 256
-#define FT_ROW 1
-#define ED_ROW 2
-#define FT_COL 3
-#define ED_COL 4
-#define LB_DOCUMENTS 5
-#define LB_ENTRIES 6
-#define TBX_CMD 7
-#define STR_DRAGMODE 8
-#define STR_DISPLAY 9
-#define STR_ACTIVE 10
-#define STR_NOTACTIVE 11
-#define STR_HIDDEN 12
-#define STR_ACTIVEWIN 13
-//#define IMG_ENTRIES 14
-#define STR_QHLP_SCEN_LISTBOX 15
-#define STR_QHLP_SCEN_COMMENT 16
+#define FT_ROW 1
+#define ED_ROW 2
+#define FT_COL 3
+#define ED_COL 4
+#define LB_DOCUMENTS 5
+#define LB_ENTRIES 6
+#define TBX_CMD 7
+#define STR_DRAGMODE 8
+#define STR_DISPLAY 9
+#define STR_ACTIVE 10
+#define STR_NOTACTIVE 11
+#define STR_HIDDEN 12
+#define STR_ACTIVEWIN 13
+//#define IMG_ENTRIES 14
+#define STR_QHLP_SCEN_LISTBOX 15
+#define STR_QHLP_SCEN_COMMENT 16
#define IL_CMD 17
#define ILH_CMD 18
-#define IID_AREAS 1
-#define IID_DBAREAS 2
-#define IID_DATA 3
-#define IID_DOCS 4
-#define IID_UP 5
-#define IID_DOWN 6
-#define IID_SCENARIOS 7
-#define IID_DROPMODE 9
-#define IID_CHANGEROOT 10
-#define IID_ZOOMOUT 11
+#define IID_AREAS 1
+#define IID_DBAREAS 2
+#define IID_DATA 3
+#define IID_DOCS 4
+#define IID_UP 5
+#define IID_DOWN 6
+#define IID_SCENARIOS 7
+#define IID_DROPMODE 9
+#define IID_CHANGEROOT 10
+#define IID_ZOOMOUT 11
diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src
index c2e9ecb6a4e6..a2ef5b4f6e69 100644
--- a/sc/source/ui/navipi/navipi.src
+++ b/sc/source/ui/navipi/navipi.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
@@ -28,38 +28,38 @@
#include "navipi.hrc"
#define SC_NAVI_CMD_IDLIST \
- IdList = \
- { \
- IID_DATA ; \
- IID_UP ; \
- IID_DOWN ; \
- IID_SCENARIOS ; \
- IID_DROPMODE ; \
+ IdList = \
+ { \
+ IID_DATA ; \
+ IID_UP ; \
+ IID_DOWN ; \
+ IID_SCENARIOS ; \
+ IID_DROPMODE ; \
IID_CHANGEROOT ; \
- IID_ZOOMOUT ; \
- }; \
+ IID_ZOOMOUT ; \
+ }; \
IdCount = { 8 ; };
// SC_CONTENT_...
#define SC_NAVI_CONT_IDLIST \
- IdList = \
- { \
- 1 ; \
- 2 ; \
- 3 ; \
- 4 ; \
- 5 ; \
- 6 ; \
- 7 ; \
- 8 ; \
- }; \
+ IdList = \
+ { \
+ 1 ; \
+ 2 ; \
+ 3 ; \
+ 4 ; \
+ 5 ; \
+ 6 ; \
+ 7 ; \
+ 8 ; \
+ }; \
IdCount = { 8 ; };
Window RID_SCDLG_NAVIGATOR
{
SVLook = TRUE ;
HelpId = HID_SC_NAVIGATOR ;
- //? Pos = MAP_APPFONT( 0, 0 );
+ //? Pos = MAP_APPFONT( 0, 0 );
Size = MAP_APPFONT ( 115 , 116 ) ;
OutputSize = TRUE ;
DialogControl = TRUE ;
@@ -75,7 +75,7 @@ Window RID_SCDLG_NAVIGATOR
// Dockable = TRUE ;
FixedText FT_ROW
{
- // Pos = MAP_APPFONT( 2, 20 );
+ // Pos = MAP_APPFONT( 2, 20 );
Pos = MAP_APPFONT ( 2 , 19 ) ;
// an kleinere Toolbox-Bitmaps angepasst
Size = MAP_APPFONT ( 19 , 10 ) ;
@@ -85,7 +85,7 @@ Window RID_SCDLG_NAVIGATOR
{
HelpId = HID_SC_NAVIPI_ROW ;
Border = TRUE ;
- // Pos = MAP_APPFONT( 31, 19 );
+ // Pos = MAP_APPFONT( 31, 19 );
Pos = MAP_APPFONT ( 31 , 18 ) ;
// an kleinere Toolbox-Bitmaps angepasst
Size = MAP_APPFONT ( 30 , 12 ) ;
@@ -119,7 +119,7 @@ Window RID_SCDLG_NAVIGATOR
// "Control" braucht immer eigene HelpId
HelpId = HID_SC_NAVIPI_ENTRIES ;
Border = TRUE ;
- // Pos = MAP_APPFONT( 2, 52 );
+ // Pos = MAP_APPFONT( 2, 52 );
Pos = MAP_APPFONT ( 2 , 35 ) ;
Size = MAP_APPFONT ( 110 , 100 ) ;
TabStop = TRUE ;
@@ -128,7 +128,7 @@ Window RID_SCDLG_NAVIGATOR
{
HelpId = HID_SC_NAVIPI_DOC ;
Border = TRUE ;
- // Pos = MAP_APPFONT( 2, 35 );
+ // Pos = MAP_APPFONT( 2, 35 );
Pos = MAP_APPFONT ( 2 , 89 ) ;
Size = MAP_APPFONT ( 82 , 50 ) ;
TabStop = TRUE ;
@@ -175,7 +175,7 @@ Window RID_SCDLG_NAVIGATOR
Text [ en-US ] = "End" ;
};
//--------------------------------------------
- // ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR; };
+ // ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR; };
//--------------------------------------------
//----------------------------------------
ToolBoxItem { Type = TOOLBOXITEM_BREAK ; };
@@ -289,7 +289,7 @@ Image RID_IMG_H_DROP_COPY
MaskColor = SC_HC_MASKCOLOR ;
};
-// content description strings are also used in ScLinkTargetsObj
+// content description strings are also used in ScLinkTargetsObj
String SCSTR_CONTENT_ROOT
{
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index e7dff0bf37c7..bb496059a031 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -301,7 +301,7 @@ void ScScenarioWindow::SetSizePixel( const Size& rNewSize )
aLbScenario.SetSizePixel( aSize );
aSize.Height() -= 4;
- aEdComment.SetPosSizePixel( Point( 0, nHeight+4 ), aSize );
+ aEdComment.SetPosSizePixel( Point( 0, nHeight+4 ), aSize );
}
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index 1a45ab715dee..1147bd43fba0 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +60,16 @@
ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( Window* pParent,
const SfxItemSet& rSet )
: SfxTabPage(pParent, ScResId(RID_SCPAGE_OPREDLINE), rSet),
- aContentFT ( this, ScResId(FT_CONTENT )),
- aContentColorLB ( this, ScResId(CLB_CONTENT )),
- aRemoveFT ( this, ScResId(FT_REMOVE )),
- aRemoveColorLB ( this, ScResId(CLB_REMOVE )),
- aInsertFT ( this, ScResId(FT_INSERT )),
- aInsertColorLB ( this, ScResId(CLB_INSERT )),
- aMoveFT ( this, ScResId(FT_MOVE )),
- aMoveColorLB ( this, ScResId(CLB_MOVE )),
- aChangedGB ( this, ScResId(GB_COLORCHGS)),
- aAuthorStr (ScResId(STR_AUTHOR))
+ aContentFT ( this, ScResId(FT_CONTENT )),
+ aContentColorLB ( this, ScResId(CLB_CONTENT )),
+ aRemoveFT ( this, ScResId(FT_REMOVE )),
+ aRemoveColorLB ( this, ScResId(CLB_REMOVE )),
+ aInsertFT ( this, ScResId(FT_INSERT )),
+ aInsertColorLB ( this, ScResId(CLB_INSERT )),
+ aMoveFT ( this, ScResId(FT_MOVE )),
+ aMoveColorLB ( this, ScResId(CLB_MOVE )),
+ aChangedGB ( this, ScResId(GB_COLORCHGS)),
+ aAuthorStr (ScResId(STR_AUTHOR))
{
FreeResource();
@@ -92,7 +92,7 @@ __EXPORT ScRedlineOptionsTabPage::~ScRedlineOptionsTabPage()
Beschreibung:
-----------------------------------------------------------------------*/
-SfxTabPage* __EXPORT ScRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet )
+SfxTabPage* __EXPORT ScRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet )
{
return new ScRedlineOptionsTabPage( pParent, rSet );
}
@@ -159,8 +159,8 @@ BOOL __EXPORT ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ )
SC_MOD()->SetAppOptions(aAppOptions);
- // Repaint (wenn alles ueber Items laufen wuerde, wie es sich gehoert,
- // waere das nicht noetig...)
+ // Repaint (wenn alles ueber Items laufen wuerde, wie es sich gehoert,
+ // waere das nicht noetig...)
ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current());
if (pDocSh)
pDocSh->PostPaintGridAll();
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 5b5920e904fc..a829002051cc 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,39 +64,39 @@ static USHORT pCalcOptRanges[] =
//========================================================================
-ScTpCalcOptions::ScTpCalcOptions( Window* pParent,
+ScTpCalcOptions::ScTpCalcOptions( Window* pParent,
const SfxItemSet& rCoreAttrs )
- : SfxTabPage ( pParent,
+ : SfxTabPage ( pParent,
ScResId( RID_SCPAGE_CALC ),
rCoreAttrs ),
- aGbZRefs ( this, ScResId( GB_ZREFS ) ),
- aBtnIterate ( this, ScResId( BTN_ITERATE ) ),
- aFtSteps ( this, ScResId( FT_STEPS ) ),
- aEdSteps ( this, ScResId( ED_STEPS ) ),
- aFtEps ( this, ScResId( FT_EPS ) ),
- aEdEps ( this, ScResId( ED_EPS ) ),
+ aGbZRefs ( this, ScResId( GB_ZREFS ) ),
+ aBtnIterate ( this, ScResId( BTN_ITERATE ) ),
+ aFtSteps ( this, ScResId( FT_STEPS ) ),
+ aEdSteps ( this, ScResId( ED_STEPS ) ),
+ aFtEps ( this, ScResId( FT_EPS ) ),
+ aEdEps ( this, ScResId( ED_EPS ) ),
aSeparatorFL ( this, ScResId( FL_SEPARATOR ) ),
- aGbDate ( this, ScResId( GB_DATE ) ),
- aBtnDateStd ( this, ScResId( BTN_DATESTD ) ),
- aBtnDateSc10 ( this, ScResId( BTN_DATESC10 ) ),
- aBtnDate1904 ( this, ScResId( BTN_DATE1904 ) ),
+ aGbDate ( this, ScResId( GB_DATE ) ),
+ aBtnDateStd ( this, ScResId( BTN_DATESTD ) ),
+ aBtnDateSc10 ( this, ScResId( BTN_DATESC10 ) ),
+ aBtnDate1904 ( this, ScResId( BTN_DATE1904 ) ),
aHSeparatorFL ( this, ScResId( FL_H_SEPARATOR ) ),
- aBtnCase ( this, ScResId( BTN_CASE ) ),
- aBtnCalc ( this, ScResId( BTN_CALC ) ),
- aBtnMatch ( this, ScResId( BTN_MATCH ) ),
+ aBtnCase ( this, ScResId( BTN_CASE ) ),
+ aBtnCalc ( this, ScResId( BTN_CALC ) ),
+ aBtnMatch ( this, ScResId( BTN_MATCH ) ),
aBtnRegex ( this, ScResId( BTN_REGEX ) ),
- aBtnLookUp ( this, ScResId( BTN_LOOKUP ) ),
+ aBtnLookUp ( this, ScResId( BTN_LOOKUP ) ),
aBtnGeneralPrec ( this, ScResId( BTN_GENERAL_PREC ) ),
- aFtPrec ( this, ScResId( FT_PREC ) ),
- aEdPrec ( this, ScResId( ED_PREC ) ),
- pOldOptions ( new ScDocOptions(
+ aFtPrec ( this, ScResId( FT_PREC ) ),
+ aEdPrec ( this, ScResId( ED_PREC ) ),
+ pOldOptions ( new ScDocOptions(
((const ScTpCalcItem&)rCoreAttrs.Get(
GetWhich( SID_SCDOCOPTIONS ))).
GetDocOptions() ) ),
- pLocalOptions ( new ScDocOptions ),
- nWhichCalc ( GetWhich( SID_SCDOCOPTIONS ) )
+ pLocalOptions ( new ScDocOptions ),
+ nWhichCalc ( GetWhich( SID_SCDOCOPTIONS ) )
{
aSeparatorFL.SetStyle( aSeparatorFL.GetStyle() | WB_VERT );
Init();
@@ -141,9 +141,9 @@ SfxTabPage* __EXPORT ScTpCalcOptions::Create( Window* pParent, const SfxItemSet&
void __EXPORT ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ )
{
- USHORT d,m,y;
+ USHORT d,m,y;
- *pLocalOptions = *pOldOptions;
+ *pLocalOptions = *pOldOptions;
aBtnCase .Check( !pLocalOptions->IsIgnoreCase() );
aBtnCalc .Check( pLocalOptions->IsCalcAsShown() );
@@ -286,14 +286,14 @@ IMPL_LINK( ScTpCalcOptions, CheckClickHdl, CheckBox*, pBtn )
if ( pBtn->IsChecked() )
{
pLocalOptions->SetIter( TRUE );
- aFtSteps.Enable(); aEdSteps.Enable();
- aFtEps .Enable(); aEdEps .Enable();
+ aFtSteps.Enable(); aEdSteps.Enable();
+ aFtEps .Enable(); aEdEps .Enable();
}
else
{
pLocalOptions->SetIter( FALSE );
aFtSteps.Disable(); aEdSteps.Disable();
- aFtEps .Disable(); aEdEps .Disable();
+ aFtEps .Disable(); aEdEps .Disable();
}
}
diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx
index d14b79bd739a..d0b317d964c4 100644
--- a/sc/source/ui/optdlg/tpprint.cxx
+++ b/sc/source/ui/optdlg/tpprint.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +50,14 @@ static USHORT pPrintOptRanges[] =
// -----------------------------------------------------------------------
-ScTpPrintOptions::ScTpPrintOptions( Window* pParent,
+ScTpPrintOptions::ScTpPrintOptions( Window* pParent,
const SfxItemSet& rCoreAttrs )
- : SfxTabPage ( pParent,
+ : SfxTabPage ( pParent,
ScResId( RID_SCPAGE_PRINT ),
rCoreAttrs ),
- aPagesFL ( this, ScResId( FL_PAGES ) ),
+ aPagesFL ( this, ScResId( FL_PAGES ) ),
aSkipEmptyPagesCB( this, ScResId( BTN_SKIPEMPTYPAGES ) ),
- aSheetsFL ( this, ScResId( FL_SHEETS ) ),
+ aSheetsFL ( this, ScResId( FL_SHEETS ) ),
aSelectedSheetsCB( this, ScResId( BTN_SELECTEDSHEETS ) )
{
FreeResource();
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index eb7c8a6635eb..ae16bb781605 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +53,15 @@
#include "tpusrlst.hxx"
#undef _TPUSRLST_CXX
-//CHINA001 #include "scui_def.hxx" //CHINA001
+//CHINA001 #include "scui_def.hxx" //CHINA001
//CHINA001 #include "scresid.hxx" //add by CHINA001
//CHINA001 #include "miscdlgs.hrc" //add by CHINA001
-//CHINA001
+//CHINA001
//CHINA001 #include "scabstdlg.hxx" //CHINA001
// STATIC DATA -----------------------------------------------------------
-#define CR (sal_Unicode)13
-#define LF (sal_Unicode)10
+#define CR (sal_Unicode)13
+#define LF (sal_Unicode)10
static USHORT pUserListsRanges[] =
{
@@ -77,40 +77,40 @@ static const sal_Unicode cDelimiter = ',';
// Benutzerdefinierte Listen:
-ScTpUserLists::ScTpUserLists( Window* pParent,
- const SfxItemSet& rCoreAttrs )
+ScTpUserLists::ScTpUserLists( Window* pParent,
+ const SfxItemSet& rCoreAttrs )
- : SfxTabPage ( pParent,
+ : SfxTabPage ( pParent,
ScResId( RID_SCPAGE_USERLISTS ),
rCoreAttrs ),
- aFtLists ( this, ScResId( FT_LISTS ) ),
- aLbLists ( this, ScResId( LB_LISTS ) ),
- aFtEntries ( this, ScResId( FT_ENTRIES ) ),
- aEdEntries ( this, ScResId( ED_ENTRIES ) ),
- aFtCopyFrom ( this, ScResId( FT_COPYFROM ) ),
- aEdCopyFrom ( this, ScResId( ED_COPYFROM ) ),
- aBtnNew ( this, ScResId( BTN_NEW ) ),
- aBtnAdd ( this, ScResId( BTN_ADD ) ),
- aBtnRemove ( this, ScResId( BTN_REMOVE ) ),
- aBtnCopy ( this, ScResId( BTN_COPY ) ),
+ aFtLists ( this, ScResId( FT_LISTS ) ),
+ aLbLists ( this, ScResId( LB_LISTS ) ),
+ aFtEntries ( this, ScResId( FT_ENTRIES ) ),
+ aEdEntries ( this, ScResId( ED_ENTRIES ) ),
+ aFtCopyFrom ( this, ScResId( FT_COPYFROM ) ),
+ aEdCopyFrom ( this, ScResId( ED_COPYFROM ) ),
+ aBtnNew ( this, ScResId( BTN_NEW ) ),
+ aBtnAdd ( this, ScResId( BTN_ADD ) ),
+ aBtnRemove ( this, ScResId( BTN_REMOVE ) ),
+ aBtnCopy ( this, ScResId( BTN_COPY ) ),
aStrQueryRemove ( ScResId( STR_QUERYREMOVE ) ),
- aStrNew ( aBtnNew.GetText() ),
- aStrCancel ( ScResId( STR_DISMISS ) ),
- aStrAdd ( ScResId( SCSTR_ADD ) ),
- aStrModify ( ScResId( SCSTR_MODIFY ) ),
- aStrCopyList ( ScResId( STR_COPYLIST ) ),
- aStrCopyFrom ( ScResId( STR_COPYFROM ) ),
- aStrCopyErr ( ScResId( STR_COPYERR ) ),
+ aStrNew ( aBtnNew.GetText() ),
+ aStrCancel ( ScResId( STR_DISMISS ) ),
+ aStrAdd ( ScResId( SCSTR_ADD ) ),
+ aStrModify ( ScResId( SCSTR_MODIFY ) ),
+ aStrCopyList ( ScResId( STR_COPYLIST ) ),
+ aStrCopyFrom ( ScResId( STR_COPYFROM ) ),
+ aStrCopyErr ( ScResId( STR_COPYERR ) ),
//
nWhichUserLists ( GetWhich( SID_SCUSERLISTS ) ),
- pUserLists ( NULL ),
- pDoc ( NULL ),
- pViewData ( NULL ),
- pRangeUtil ( new ScRangeUtil ),
- bModifyMode ( FALSE ),
- bCancelMode ( FALSE ),
- bCopyDone ( FALSE ),
- nCancelPos ( 0 )
+ pUserLists ( NULL ),
+ pDoc ( NULL ),
+ pViewData ( NULL ),
+ pRangeUtil ( new ScRangeUtil ),
+ bModifyMode ( FALSE ),
+ bCancelMode ( FALSE ),
+ bCopyDone ( FALSE ),
+ nCancelPos ( 0 )
{
SetExchangeSupport();
Init();
@@ -129,31 +129,31 @@ __EXPORT ScTpUserLists::~ScTpUserLists()
void ScTpUserLists::Init()
{
- SfxViewShell* pSh = SfxViewShell::Current();
+ SfxViewShell* pSh = SfxViewShell::Current();
ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell, pSh);
- aLbLists.SetSelectHdl ( LINK( this, ScTpUserLists, LbSelectHdl ) );
- aBtnNew.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) );
- aBtnNew.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) );
- aBtnAdd.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) );
- aBtnRemove.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) );
- aEdEntries.SetModifyHdl ( LINK( this, ScTpUserLists, EdEntriesModHdl ) );
+ aLbLists.SetSelectHdl ( LINK( this, ScTpUserLists, LbSelectHdl ) );
+ aBtnNew.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) );
+ aBtnNew.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) );
+ aBtnAdd.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) );
+ aBtnRemove.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) );
+ aEdEntries.SetModifyHdl ( LINK( this, ScTpUserLists, EdEntriesModHdl ) );
if ( pViewSh )
{
- SCTAB nStartTab = 0;
- SCTAB nEndTab = 0;
- SCCOL nStartCol = 0;
- SCROW nStartRow = 0;
- SCCOL nEndCol = 0;
- SCROW nEndRow = 0;
+ SCTAB nStartTab = 0;
+ SCTAB nEndTab = 0;
+ SCCOL nStartCol = 0;
+ SCROW nStartRow = 0;
+ SCCOL nEndCol = 0;
+ SCROW nEndRow = 0;
pViewData = pViewSh->GetViewData();
pDoc = pViewData->GetDocument();
pViewData->GetSimpleArea( nStartCol, nStartRow, nStartTab,
- nEndCol, nEndRow, nEndTab );
+ nEndCol, nEndRow, nEndTab );
PutInOrder( nStartCol, nEndCol );
PutInOrder( nStartRow, nEndRow );
@@ -172,7 +172,7 @@ void ScTpUserLists::Init()
aEdCopyFrom.Disable();
}
-// aLbLists.GrabFocus();
+// aLbLists.GrabFocus();
}
// -----------------------------------------------------------------------
@@ -195,7 +195,7 @@ void __EXPORT ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs )
{
const ScUserListItem& rUserListItem = (const ScUserListItem&)
rCoreAttrs.Get( nWhichUserLists );
- const ScUserList* pCoreList = rUserListItem.GetUserList();
+ const ScUserList* pCoreList = rUserListItem.GetUserList();
DBG_ASSERT( pCoreList, "UserList not found :-/" );
@@ -219,11 +219,11 @@ void __EXPORT ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs )
if ( aLbLists.GetEntryCount() == 0 )
{
- aFtLists .Disable();
- aLbLists .Disable();
- aFtEntries .Disable();
- aEdEntries .Disable();
- aBtnRemove .Disable();
+ aFtLists .Disable();
+ aLbLists .Disable();
+ aFtEntries .Disable();
+ aEdEntries .Disable();
+ aBtnRemove .Disable();
}
aBtnNew.SetText( aStrNew );
@@ -234,10 +234,10 @@ void __EXPORT ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs )
{
aFtCopyFrom .Enable();
aEdCopyFrom .Enable();
- aBtnCopy .Enable();
+ aBtnCopy .Enable();
}
-// aLbLists.GrabFocus();
+// aLbLists.GrabFocus();
}
// -----------------------------------------------------------------------
@@ -253,8 +253,8 @@ BOOL __EXPORT ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs )
const ScUserListItem& rUserListItem = (const ScUserListItem&)
GetItemSet().Get( nWhichUserLists );
- ScUserList* pCoreList = rUserListItem.GetUserList();
- BOOL bDataModified = FALSE;
+ ScUserList* pCoreList = rUserListItem.GetUserList();
+ BOOL bDataModified = FALSE;
if ( (pUserLists == NULL) && (pCoreList == NULL) )
{
@@ -301,8 +301,8 @@ USHORT ScTpUserLists::UpdateUserListBox()
//----------------------------------------------------------
- USHORT nCount = pUserLists->GetCount();
- String aEntry;
+ USHORT nCount = pUserLists->GetCount();
+ String aEntry;
if ( nCount > 0 )
{
@@ -327,9 +327,9 @@ void ScTpUserLists::UpdateEntries( USHORT nList )
if ( nList < pUserLists->GetCount() )
{
- ScUserListData* pList = (*pUserLists)[nList];
- USHORT nSubCount = pList->GetSubCount();
- String aEntryListStr;
+ ScUserListData* pList = (*pUserLists)[nList];
+ USHORT nSubCount = pList->GetSubCount();
+ String aEntryListStr;
for ( USHORT i=0; i<nSubCount; i++ )
{
@@ -351,11 +351,11 @@ void ScTpUserLists::UpdateEntries( USHORT nList )
void ScTpUserLists::MakeListStr( String& rListStr )
{
- String aInputStr(rListStr);
- String aStr;
+ String aInputStr(rListStr);
+ String aStr;
- xub_StrLen nLen = aStr.Len();
- xub_StrLen c = 0;
+ xub_StrLen nLen = aStr.Len();
+ xub_StrLen c = 0;
aInputStr.ConvertLineEnd( LINEEND_LF );
//aStr.EraseAllChars( ' ' );
@@ -433,24 +433,24 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
//----------------------------------------------------------
- SCTAB nTab = rStartPos.Tab();
- SCCOL nStartCol = rStartPos.Col();
- SCROW nStartRow = rStartPos.Row();
- SCCOL nEndCol = rEndPos.Col();
- SCROW nEndRow = rEndPos.Row();
- USHORT nCellDir = SCRET_COLS;
- BOOL bValueIgnored = FALSE;
+ SCTAB nTab = rStartPos.Tab();
+ SCCOL nStartCol = rStartPos.Col();
+ SCROW nStartRow = rStartPos.Row();
+ SCCOL nEndCol = rEndPos.Col();
+ SCROW nEndRow = rEndPos.Row();
+ USHORT nCellDir = SCRET_COLS;
+ BOOL bValueIgnored = FALSE;
if ( (nStartCol != nEndCol) && (nStartRow != nEndRow) )
- {
+ {
nCellDir = ScColOrRowDlg( this, aStrCopyList, aStrCopyFrom ).Execute();
-//CHINA001 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-//CHINA001 DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
-//CHINA001
-//CHINA001 VclAbstractDialog* pDlg = pFact->CreateScColOrRowDlg( this, aStrCopyList, aStrCopyFrom,ResId(RID_SCDLG_COLORROW) );
-//CHINA001 DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
-//CHINA001 nCellDir = pDlg->Execute();
-//CHINA001 delete pDlg; //CHINA001
+//CHINA001 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
+//CHINA001 DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+//CHINA001
+//CHINA001 VclAbstractDialog* pDlg = pFact->CreateScColOrRowDlg( this, aStrCopyList, aStrCopyFrom,ResId(RID_SCDLG_COLORROW) );
+//CHINA001 DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+//CHINA001 nCellDir = pDlg->Execute();
+//CHINA001 delete pDlg; //CHINA001
}
else if ( nStartCol != nEndCol )
nCellDir = SCRET_ROWS;
@@ -459,8 +459,8 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
if ( nCellDir != RET_CANCEL )
{
- String aStrList;
- String aStrField;
+ String aStrList;
+ String aStrField;
if ( nCellDir == SCRET_COLS )
{
@@ -520,13 +520,13 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
//----------------------------------------------------------
bCopyDone = TRUE;
-
+
}
// -----------------------------------------------------------------------
-void ScTpUserLists::ModifyList( USHORT nSelList,
- const String& rEntriesStr )
+void ScTpUserLists::ModifyList( USHORT nSelList,
+ const String& rEntriesStr )
{
if ( !pUserLists ) return;
@@ -557,10 +557,10 @@ IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox*, pLb )
USHORT nSelPos = aLbLists.GetSelectEntryPos();
if ( nSelPos != LISTBOX_ENTRY_NOTFOUND )
{
- if ( !aFtEntries.IsEnabled() ) aFtEntries.Enable();
- if ( !aEdEntries.IsEnabled() ) aEdEntries.Enable();
- if ( !aBtnRemove.IsEnabled() ) aBtnRemove.Enable();
- if ( aBtnAdd.IsEnabled() ) aBtnAdd.Disable();
+ if ( !aFtEntries.IsEnabled() ) aFtEntries.Enable();
+ if ( !aEdEntries.IsEnabled() ) aEdEntries.Enable();
+ if ( !aBtnRemove.IsEnabled() ) aBtnRemove.Enable();
+ if ( aBtnAdd.IsEnabled() ) aBtnAdd.Disable();
UpdateEntries( nSelPos );
}
@@ -663,7 +663,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
{
USHORT nSelList = aLbLists.GetSelectEntryPos();
- DBG_ASSERT( nSelList != LISTBOX_ENTRY_NOTFOUND, "Modify without List :-/" );
+ DBG_ASSERT( nSelList != LISTBOX_ENTRY_NOTFOUND, "Modify without List :-/" );
if ( theEntriesStr.Len() > 0 )
{
@@ -696,8 +696,8 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
{
if ( aLbLists.GetEntryCount() > 0 )
{
- USHORT nRemovePos = aLbLists.GetSelectEntryPos();
- String aMsg ( aStrQueryRemove.GetToken( 0, '#' ) );
+ USHORT nRemovePos = aLbLists.GetSelectEntryPos();
+ String aMsg ( aStrQueryRemove.GetToken( 0, '#' ) );
aMsg += aLbLists.GetEntry( nRemovePos );
aMsg += aStrQueryRemove.GetToken( 1, '#' );
@@ -747,8 +747,8 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
ScRefAddress theStartPos;
ScRefAddress theEndPos;
- String theAreaStr( aEdCopyFrom.GetText() );
- BOOL bAreaOk = FALSE;
+ String theAreaStr( aEdCopyFrom.GetText() );
+ BOOL bAreaOk = FALSE;
if ( theAreaStr.Len() > 0 )
{
@@ -777,10 +777,10 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
UpdateUserListBox();
aLbLists.SelectEntryPos( aLbLists.GetEntryCount()-1 );
LbSelectHdl( &aLbLists );
- aEdCopyFrom .SetText( theAreaStr );
- aEdCopyFrom .Disable();
- aBtnCopy .Disable();
- aFtCopyFrom .Disable();
+ aEdCopyFrom .SetText( theAreaStr );
+ aEdCopyFrom .Disable();
+ aBtnCopy .Disable();
+ aFtCopyFrom .Disable();
}
else
{
@@ -806,17 +806,17 @@ IMPL_LINK( ScTpUserLists, EdEntriesModHdl, MultiLineEdit*, pEd )
if ( aBtnCopy.IsEnabled() )
{
- aBtnCopy .Disable();
- aFtCopyFrom .Disable();
- aEdCopyFrom .Disable();
+ aBtnCopy .Disable();
+ aFtCopyFrom .Disable();
+ aEdCopyFrom .Disable();
}
if ( aEdEntries.GetText().Len() > 0 )
{
if ( !bCancelMode && !bModifyMode )
{
- aBtnNew.SetText( aStrCancel ); bCancelMode = TRUE;
- aBtnAdd.SetText( aStrModify ); bModifyMode = TRUE;
+ aBtnNew.SetText( aStrCancel ); bCancelMode = TRUE;
+ aBtnAdd.SetText( aStrModify ); bModifyMode = TRUE;
aBtnAdd.Enable();
aBtnRemove.Disable();
aFtLists.Disable();
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 5c2e8dd52c9f..0ab4c76f6dd4 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,47 +60,47 @@
Optionen Inhalte
--------------------------------------------------*/
-ScTpContentOptions::ScTpContentOptions( Window* pParent,
- const SfxItemSet& rArgSet ) :
+ScTpContentOptions::ScTpContentOptions( Window* pParent,
+ const SfxItemSet& rArgSet ) :
SfxTabPage(pParent, ScResId( RID_SCPAGE_CONTENT ), rArgSet),
aLinesGB( this, ScResId(GB_LINES )),
- aGridCB( this, ScResId(CB_GRID )),
- aColorFT( this, ScResId(FT_COLOR )),
- aColorLB( this, ScResId(LB_COLOR )),
- aBreakCB( this, ScResId(CB_PAGEBREAKS )),
- aGuideLineCB( this, ScResId(CB_GUIDELINE )),
- aHandleCB( this, ScResId(CB_HANDLES )),
- aBigHandleCB( this, ScResId(CB_BIGHANDLES )),
+ aGridCB( this, ScResId(CB_GRID )),
+ aColorFT( this, ScResId(FT_COLOR )),
+ aColorLB( this, ScResId(LB_COLOR )),
+ aBreakCB( this, ScResId(CB_PAGEBREAKS )),
+ aGuideLineCB( this, ScResId(CB_GUIDELINE )),
+ aHandleCB( this, ScResId(CB_HANDLES )),
+ aBigHandleCB( this, ScResId(CB_BIGHANDLES )),
aSeparator1FL (this, ScResId(FL_SEPARATOR1 )),
aDisplayGB( this, ScResId(GB_DISPLAY)),
- aFormulaCB( this, ScResId(CB_FORMULA)),
- aNilCB( this, ScResId(CB_NIL )),
- aAnnotCB( this, ScResId(CB_ANNOT )),
- aValueCB( this, ScResId(CB_VALUE )),
- aAnchorCB( this, ScResId(CB_ANCHOR )),
- aClipMarkCB( this, ScResId(CB_CLIP )),
+ aFormulaCB( this, ScResId(CB_FORMULA)),
+ aNilCB( this, ScResId(CB_NIL )),
+ aAnnotCB( this, ScResId(CB_ANNOT )),
+ aValueCB( this, ScResId(CB_VALUE )),
+ aAnchorCB( this, ScResId(CB_ANCHOR )),
+ aClipMarkCB( this, ScResId(CB_CLIP )),
aRangeFindCB( this, ScResId( CB_RFIND )),
aObjectGB( this, ScResId(GB_OBJECT )),
- aObjGrfFT( this, ScResId(FT_OBJGRF )),
- aObjGrfLB( this, ScResId(LB_OBJGRF )),
+ aObjGrfFT( this, ScResId(FT_OBJGRF )),
+ aObjGrfLB( this, ScResId(LB_OBJGRF )),
aDiagramFT( this, ScResId(FT_DIAGRAM)),
- aDiagramLB( this, ScResId(LB_DIAGRAM)),
- aDrawFT( this, ScResId(FT_DRAW )),
- aDrawLB( this, ScResId(LB_DRAW )),
+ aDiagramLB( this, ScResId(LB_DIAGRAM)),
+ aDrawFT( this, ScResId(FT_DRAW )),
+ aDrawLB( this, ScResId(LB_DRAW )),
aZoomGB( this, ScResId(GB_ZOOM) ),
aSyncZoomCB( this, ScResId(CB_SYNCZOOM) ),
aSeparator2FL (this, ScResId(FL_SEPARATOR2)),
aWindowGB( this, ScResId(GB_WINDOW )),
- aRowColHeaderCB(this, ScResId(CB_ROWCOLHEADER )),
- aHScrollCB( this, ScResId(CB_HSCROLL )),
- aVScrollCB( this, ScResId(CB_VSCROLL )),
- aTblRegCB( this, ScResId(CB_TBLREG )),
- aOutlineCB( this, ScResId(CB_OUTLINE )),
+ aRowColHeaderCB(this, ScResId(CB_ROWCOLHEADER )),
+ aHScrollCB( this, ScResId(CB_HSCROLL )),
+ aVScrollCB( this, ScResId(CB_VSCROLL )),
+ aTblRegCB( this, ScResId(CB_TBLREG )),
+ aOutlineCB( this, ScResId(CB_OUTLINE )),
pLocalOptions(0)
{
FreeResource();
@@ -144,36 +144,36 @@ ScTpContentOptions::~ScTpContentOptions()
--------------------------------------------------*/
-SfxTabPage* ScTpContentOptions::Create( Window* pParent,
- const SfxItemSet& rCoreSet )
+SfxTabPage* ScTpContentOptions::Create( Window* pParent,
+ const SfxItemSet& rCoreSet )
{
return new ScTpContentOptions(pParent, rCoreSet);
}
/*-----------------11.01.97 10.52-------------------
--------------------------------------------------*/
-BOOL ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
+BOOL ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
{
BOOL bRet = FALSE;
- if( aFormulaCB .GetSavedValue() != aFormulaCB .IsChecked() ||
- aNilCB .GetSavedValue() != aNilCB .IsChecked() ||
- aAnnotCB .GetSavedValue() != aAnnotCB .IsChecked() ||
- aValueCB .GetSavedValue() != aValueCB .IsChecked() ||
- aAnchorCB .GetSavedValue() != aAnchorCB .IsChecked() ||
- aClipMarkCB .GetSavedValue() != aClipMarkCB .IsChecked() ||
- aObjGrfLB .GetSavedValue() != aObjGrfLB .GetSelectEntryPos() ||
- aDiagramLB .GetSavedValue() != aDiagramLB .GetSelectEntryPos() ||
+ if( aFormulaCB .GetSavedValue() != aFormulaCB .IsChecked() ||
+ aNilCB .GetSavedValue() != aNilCB .IsChecked() ||
+ aAnnotCB .GetSavedValue() != aAnnotCB .IsChecked() ||
+ aValueCB .GetSavedValue() != aValueCB .IsChecked() ||
+ aAnchorCB .GetSavedValue() != aAnchorCB .IsChecked() ||
+ aClipMarkCB .GetSavedValue() != aClipMarkCB .IsChecked() ||
+ aObjGrfLB .GetSavedValue() != aObjGrfLB .GetSelectEntryPos() ||
+ aDiagramLB .GetSavedValue() != aDiagramLB .GetSelectEntryPos() ||
aDrawLB .GetSavedValue() != aDrawLB .GetSelectEntryPos() ||
aGridCB .GetSavedValue() != aGridCB.IsChecked() ||
- aRowColHeaderCB .GetSavedValue() != aRowColHeaderCB.IsChecked() ||
+ aRowColHeaderCB .GetSavedValue() != aRowColHeaderCB.IsChecked() ||
aHScrollCB .GetSavedValue() != aHScrollCB .IsChecked() ||
aVScrollCB .GetSavedValue() != aVScrollCB .IsChecked() ||
aTblRegCB .GetSavedValue() != aTblRegCB .IsChecked() ||
aOutlineCB .GetSavedValue() != aOutlineCB .IsChecked() ||
aColorLB .GetSavedValue() != aColorLB .GetSelectEntryPos() ||
- aBreakCB .GetSavedValue() != aBreakCB .IsChecked() ||
+ aBreakCB .GetSavedValue() != aBreakCB .IsChecked() ||
aGuideLineCB .GetSavedValue() != aGuideLineCB .IsChecked() ||
- aHandleCB .GetSavedValue() != aHandleCB .IsChecked() ||
+ aHandleCB .GetSavedValue() != aHandleCB .IsChecked() ||
aBigHandleCB .GetSavedValue() != aBigHandleCB .IsChecked())
{
pLocalOptions->SetGridColor( aColorLB.GetSelectEntryColor(),
@@ -199,7 +199,7 @@ BOOL ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
--------------------------------------------------*/
-void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
+void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
{
const SfxPoolItem* pItem;
if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCVIEWOPTIONS, FALSE , &pItem))
@@ -207,14 +207,14 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
((const ScTpViewItem*)pItem)->GetViewOptions() );
else
pLocalOptions = new ScViewOptions;
- aFormulaCB .Check(pLocalOptions->GetOption(VOPT_FORMULAS));
- aNilCB .Check(pLocalOptions->GetOption(VOPT_NULLVALS));
- aAnnotCB .Check(pLocalOptions->GetOption(VOPT_NOTES));
- aValueCB .Check(pLocalOptions->GetOption(VOPT_SYNTAX));
- aAnchorCB .Check(pLocalOptions->GetOption(VOPT_ANCHOR));
- aClipMarkCB .Check(pLocalOptions->GetOption(VOPT_CLIPMARKS));
-
- aObjGrfLB .SelectEntryPos( (USHORT)pLocalOptions->GetObjMode(VOBJ_TYPE_OLE) );
+ aFormulaCB .Check(pLocalOptions->GetOption(VOPT_FORMULAS));
+ aNilCB .Check(pLocalOptions->GetOption(VOPT_NULLVALS));
+ aAnnotCB .Check(pLocalOptions->GetOption(VOPT_NOTES));
+ aValueCB .Check(pLocalOptions->GetOption(VOPT_SYNTAX));
+ aAnchorCB .Check(pLocalOptions->GetOption(VOPT_ANCHOR));
+ aClipMarkCB .Check(pLocalOptions->GetOption(VOPT_CLIPMARKS));
+
+ aObjGrfLB .SelectEntryPos( (USHORT)pLocalOptions->GetObjMode(VOBJ_TYPE_OLE) );
aDiagramLB .SelectEntryPos( (USHORT)pLocalOptions->GetObjMode(VOBJ_TYPE_CHART) );
aDrawLB .SelectEntryPos( (USHORT)pLocalOptions->GetObjMode(VOBJ_TYPE_DRAW) );
@@ -228,7 +228,7 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
aBreakCB.Check( pLocalOptions->GetOption(VOPT_PAGEBREAKS) );
aGuideLineCB.Check( pLocalOptions->GetOption(VOPT_HELPLINES) );
- aHandleCB.Check( !pLocalOptions->GetOption(VOPT_SOLIDHANDLES) ); // inverted
+ aHandleCB.Check( !pLocalOptions->GetOption(VOPT_SOLIDHANDLES) ); // inverted
aBigHandleCB.Check( pLocalOptions->GetOption(VOPT_BIGHANDLES) );
if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_RANGEFINDER, FALSE, &pItem))
@@ -240,11 +240,11 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
aSyncZoomCB.SaveValue();
aFormulaCB .SaveValue();
- aNilCB .SaveValue();
- aAnnotCB .SaveValue();
- aValueCB .SaveValue();
- aAnchorCB .SaveValue();
- aClipMarkCB .SaveValue();
+ aNilCB .SaveValue();
+ aAnnotCB .SaveValue();
+ aValueCB .SaveValue();
+ aAnchorCB .SaveValue();
+ aClipMarkCB .SaveValue();
aObjGrfLB .SaveValue();
aDiagramLB .SaveValue();
aDrawLB .SaveValue();
@@ -255,10 +255,10 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
aOutlineCB .SaveValue();
aGridCB .SaveValue();
aColorLB .SaveValue();
- aBreakCB .SaveValue();
+ aBreakCB .SaveValue();
aGuideLineCB .SaveValue();
- aHandleCB .SaveValue();
- aBigHandleCB .SaveValue();
+ aHandleCB .SaveValue();
+ aBigHandleCB .SaveValue();
}
/*-----------------11.01.97 12.45-------------------
@@ -274,7 +274,7 @@ void ScTpContentOptions::ActivatePage( const SfxItemSet& rSet)
--------------------------------------------------*/
-int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP )
+int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP )
{
if(pSetP)
FillItemSet(*pSetP);
@@ -286,9 +286,9 @@ int ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP )
IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb )
{
- USHORT nSelPos = pLb->GetSelectEntryPos();
- ScVObjMode eMode = ScVObjMode(nSelPos);
- ScVObjType eType = VOBJ_TYPE_OLE;
+ USHORT nSelPos = pLb->GetSelectEntryPos();
+ ScVObjMode eMode = ScVObjMode(nSelPos);
+ ScVObjType eType = VOBJ_TYPE_OLE;
if ( pLb == &aDiagramLB )
eType = VOBJ_TYPE_CHART;
@@ -307,25 +307,25 @@ IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb )
IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn )
{
ScViewOption eOption = VOPT_FORMULAS;
- BOOL bChecked = pBtn->IsChecked();
-
- if ( &aFormulaCB == pBtn ) eOption = VOPT_FORMULAS;
- else if ( &aNilCB == pBtn ) eOption = VOPT_NULLVALS;
- else if ( &aAnnotCB == pBtn ) eOption = VOPT_NOTES;
- else if ( &aValueCB == pBtn ) eOption = VOPT_SYNTAX;
- else if ( &aAnchorCB == pBtn ) eOption = VOPT_ANCHOR;
- else if ( &aClipMarkCB == pBtn ) eOption = VOPT_CLIPMARKS;
+ BOOL bChecked = pBtn->IsChecked();
+
+ if ( &aFormulaCB == pBtn ) eOption = VOPT_FORMULAS;
+ else if ( &aNilCB == pBtn ) eOption = VOPT_NULLVALS;
+ else if ( &aAnnotCB == pBtn ) eOption = VOPT_NOTES;
+ else if ( &aValueCB == pBtn ) eOption = VOPT_SYNTAX;
+ else if ( &aAnchorCB == pBtn ) eOption = VOPT_ANCHOR;
+ else if ( &aClipMarkCB == pBtn ) eOption = VOPT_CLIPMARKS;
else if ( &aVScrollCB == pBtn ) eOption = VOPT_VSCROLL;
- else if ( &aHScrollCB == pBtn ) eOption = VOPT_HSCROLL;
- else if ( &aTblRegCB == pBtn ) eOption = VOPT_TABCONTROLS;
- else if ( &aOutlineCB == pBtn ) eOption = VOPT_OUTLINER;
- else if ( &aBreakCB == pBtn ) eOption = VOPT_PAGEBREAKS;
- else if ( &aGuideLineCB == pBtn ) eOption = VOPT_HELPLINES;
- else if ( &aHandleCB == pBtn ) eOption = VOPT_SOLIDHANDLES;
- else if ( &aBigHandleCB == pBtn ) eOption = VOPT_BIGHANDLES;
- else if ( &aRowColHeaderCB == pBtn ) eOption = VOPT_HEADER;
-
- // VOPT_SOLIDHANDLES is inverted (CheckBox is "simple handles")
+ else if ( &aHScrollCB == pBtn ) eOption = VOPT_HSCROLL;
+ else if ( &aTblRegCB == pBtn ) eOption = VOPT_TABCONTROLS;
+ else if ( &aOutlineCB == pBtn ) eOption = VOPT_OUTLINER;
+ else if ( &aBreakCB == pBtn ) eOption = VOPT_PAGEBREAKS;
+ else if ( &aGuideLineCB == pBtn ) eOption = VOPT_HELPLINES;
+ else if ( &aHandleCB == pBtn ) eOption = VOPT_SOLIDHANDLES;
+ else if ( &aBigHandleCB == pBtn ) eOption = VOPT_BIGHANDLES;
+ else if ( &aRowColHeaderCB == pBtn ) eOption = VOPT_HEADER;
+
+ // VOPT_SOLIDHANDLES is inverted (CheckBox is "simple handles")
if ( eOption == VOPT_SOLIDHANDLES )
pLocalOptions->SetOption( eOption, !bChecked );
else
@@ -351,7 +351,7 @@ void ScTpContentOptions::InitGridOpt()
if ( aColorLB.GetEntryCount() == 0 )
{
- SfxObjectShell* pDocSh = SfxObjectShell::Current();
+ SfxObjectShell* pDocSh = SfxObjectShell::Current();
// hier koennte auch eine andere DocShell kommen!
pDocSh = PTR_CAST(ScDocShell, pDocSh);
@@ -374,7 +374,7 @@ void ScTpContentOptions::InitGridOpt()
aColorLB.SetUpdateMode( FALSE );
- // Eintraege aus der Colortable
+ // Eintraege aus der Colortable
long nCount = pColorTable->Count();
for ( long n=0; n<nCount; n++ )
@@ -383,9 +383,9 @@ void ScTpContentOptions::InitGridOpt()
aColorLB.InsertEntry( pEntry->GetColor(), pEntry->GetName() );
}
- // Standard-Gitterfarbe
+ // Standard-Gitterfarbe
- Color aStdCol( SC_STD_GRIDCOLOR ); // wie Default in ScViewOptions
+ Color aStdCol( SC_STD_GRIDCOLOR ); // wie Default in ScViewOptions
if ( LISTBOX_ENTRY_NOTFOUND ==
aColorLB.GetEntryPos( aStdCol ) )
aColorLB.InsertEntry( aStdCol, ScGlobal::GetRscString( STR_GRIDCOLOR ) );
@@ -395,11 +395,11 @@ void ScTpContentOptions::InitGridOpt()
Invalidate();
}
- // #79720# also select grid color entry on subsequent calls
+ // #79720# also select grid color entry on subsequent calls
- String aName;
- Color aCol = pLocalOptions->GetGridColor( &aName );
- USHORT nSelPos = aColorLB.GetEntryPos( aCol );
+ String aName;
+ Color aCol = pLocalOptions->GetGridColor( &aName );
+ USHORT nSelPos = aColorLB.GetEntryPos( aCol );
if ( LISTBOX_ENTRY_NOTFOUND != nSelPos )
aColorLB.SelectEntryPos( nSelPos );
@@ -422,8 +422,8 @@ IMPL_LINK( ScTpContentOptions, GridHdl, CheckBox*, pBox )
--------------------------------------------------*/
-ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent,
- const SfxItemSet& rArgSet ) :
+ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent,
+ const SfxItemSet& rArgSet ) :
SfxTabPage(pParent, ScResId( RID_SCPAGE_LAYOUT ), rArgSet),
aUnitGB( this, ScResId(GB_UNIT )),
aUnitFT( this, ScResId(FT_UNIT )),
@@ -431,17 +431,17 @@ ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent,
aTabFT( this, ScResId( FT_TAB )),
aTabMF( this, ScResId( MF_TAB )),
aSeparatorFL( this, ScResId( FL_SEPARATOR )),
- aLinkGB (this, ScResId(GB_LINK )),
+ aLinkGB (this, ScResId(GB_LINK )),
aLinkFT(this, ScResId(FT_UPDATE_LINKS )),
- aAlwaysRB (this, ScResId(RB_ALWAYS )),
- aRequestRB (this, ScResId(RB_REQUEST )),
- aNeverRB (this, ScResId(RB_NEVER )),
+ aAlwaysRB (this, ScResId(RB_ALWAYS )),
+ aRequestRB (this, ScResId(RB_REQUEST )),
+ aNeverRB (this, ScResId(RB_NEVER )),
aOptionsGB( this, ScResId( GB_OPTIONS )),
- aAlignCB ( this, ScResId( CB_ALIGN )),
- aAlignLB ( this, ScResId( LB_ALIGN )),
- aEditModeCB( this, ScResId( CB_EDITMODE )),
- aFormatCB( this, ScResId( CB_FORMAT )),
+ aAlignCB ( this, ScResId( CB_ALIGN )),
+ aAlignLB ( this, ScResId( LB_ALIGN )),
+ aEditModeCB( this, ScResId( CB_EDITMODE )),
+ aFormatCB( this, ScResId( CB_FORMAT )),
aExpRefCB( this, ScResId( CB_EXPREF )),
aMarkHdrCB( this, ScResId( CB_MARKHDR )),
aTextFmtCB( this, ScResId( CB_TEXTFMT )),
@@ -495,8 +495,8 @@ ScTpLayoutOptions::~ScTpLayoutOptions()
--------------------------------------------------*/
-SfxTabPage* ScTpLayoutOptions::Create( Window* pParent,
- const SfxItemSet& rCoreSet )
+SfxTabPage* ScTpLayoutOptions::Create( Window* pParent,
+ const SfxItemSet& rCoreSet )
{
ScTpLayoutOptions* pNew = new ScTpLayoutOptions(pParent, rCoreSet);
ScDocShell* pDocSh = PTR_CAST(ScDocShell,SfxObjectShell::Current());
@@ -509,7 +509,7 @@ SfxTabPage* ScTpLayoutOptions::Create( Window* pParent,
--------------------------------------------------*/
-BOOL ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
+BOOL ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
{
BOOL bRet = TRUE;
const USHORT nMPos = aUnitLB.GetSelectEntryPos();
@@ -604,7 +604,7 @@ BOOL ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
--------------------------------------------------*/
-void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
+void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
{
aUnitLB.SetNoSelection();
if ( rCoreSet.GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_AVAILABLE )
@@ -630,7 +630,7 @@ void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
aTabMF.SaveValue();
aUnitLB .SaveValue();
- aTabMF .SaveValue();
+ aTabMF .SaveValue();
ScLkUpdMode nSet=LM_UNKNOWN;
@@ -647,9 +647,9 @@ void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
switch(nSet)
{
- case LM_ALWAYS: aAlwaysRB. Check(); break;
- case LM_NEVER: aNeverRB. Check(); break;
- case LM_ON_DEMAND: aRequestRB. Check(); break;
+ case LM_ALWAYS: aAlwaysRB. Check(); break;
+ case LM_NEVER: aNeverRB. Check(); break;
+ case LM_ON_DEMAND: aRequestRB. Check(); break;
default:
{
// added to avoid warnings
@@ -681,13 +681,13 @@ void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
aReplWarnCB.Check( ( (const SfxBoolItem*)pItem)->GetValue() );
aAlignCB .SaveValue();
- aAlignLB .SaveValue();
- aEditModeCB .SaveValue();
- aFormatCB .SaveValue();
+ aAlignLB .SaveValue();
+ aEditModeCB .SaveValue();
+ aFormatCB .SaveValue();
aExpRefCB .SaveValue();
- aMarkHdrCB .SaveValue();
- aTextFmtCB .SaveValue();
+ aMarkHdrCB .SaveValue();
+ aTextFmtCB .SaveValue();
aReplWarnCB .SaveValue();
AlignHdl(&aAlignCB);
@@ -700,14 +700,14 @@ void ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
--------------------------------------------------*/
-void ScTpLayoutOptions::ActivatePage( const SfxItemSet& /* rCoreSet */ )
+void ScTpLayoutOptions::ActivatePage( const SfxItemSet& /* rCoreSet */ )
{
}
/*-----------------11.01.97 12.46-------------------
--------------------------------------------------*/
-int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP )
+int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP )
{
if(pSetP)
FillItemSet(*pSetP);
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index 915355d5d0f2..3ab86455f1ff 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +68,15 @@ const USHORT SC_AREASDLG_RR_OFFSET = 2;
//============================================================================
-#define HDL(hdl) LINK( this, ScPrintAreasDlg, hdl )
-#define ERRORBOX(nId) ErrorBox( this, WinBits(WB_OK|WB_DEF_OK), \
+#define HDL(hdl) LINK( this, ScPrintAreasDlg, hdl )
+#define ERRORBOX(nId) ErrorBox( this, WinBits(WB_OK|WB_DEF_OK), \
ScGlobal::GetRscString( nId ) ).Execute()
-#define SWAP(x1,x2) { int n=x1; x1=x2; x2=n; }
+#define SWAP(x1,x2) { int n=x1; x1=x2; x2=n; }
// globale Funktionen (->am Ende der Datei):
bool lcl_CheckRepeatString( const String& rStr, ScDocument* pDoc, bool bIsRow, ScRange* pRange );
-void lcl_GetRepeatRangeString( const ScRange* pRange, ScDocument* pDoc, bool bIsRow, String& rStr );
+void lcl_GetRepeatRangeString( const ScRange* pRange, ScDocument* pDoc, bool bIsRow, String& rStr );
#if 0
static void printAddressFlags(USHORT nFlag)
@@ -105,40 +105,40 @@ static void printAddressFlags(USHORT nFlag)
#endif
//============================================================================
-// class ScPrintAreasDlg
+// class ScPrintAreasDlg
//----------------------------------------------------------------------------
ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent )
- : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_AREAS),
+ : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_AREAS),
//
- aLbPrintArea ( this, ScResId( LB_PRINTAREA ) ),
+ aLbPrintArea ( this, ScResId( LB_PRINTAREA ) ),
aFlPrintArea ( this, ScResId( FL_PRINTAREA ) ),
aEdPrintArea ( this, this, ScResId( ED_PRINTAREA ) ),
- aRbPrintArea ( this, ScResId( RB_PRINTAREA ), &aEdPrintArea, this ),
+ aRbPrintArea ( this, ScResId( RB_PRINTAREA ), &aEdPrintArea, this ),
//
- aLbRepeatRow ( this, ScResId( LB_REPEATROW ) ),
+ aLbRepeatRow ( this, ScResId( LB_REPEATROW ) ),
aFlRepeatRow ( this, ScResId( FL_REPEATROW ) ),
aEdRepeatRow ( this, this, ScResId( ED_REPEATROW ) ),
- aRbRepeatRow ( this, ScResId( RB_REPEATROW ), &aEdRepeatRow, this ),
+ aRbRepeatRow ( this, ScResId( RB_REPEATROW ), &aEdRepeatRow, this ),
//
- aLbRepeatCol ( this, ScResId( LB_REPEATCOL ) ),
+ aLbRepeatCol ( this, ScResId( LB_REPEATCOL ) ),
aFlRepeatCol ( this, ScResId( FL_REPEATCOL ) ),
aEdRepeatCol ( this, this, ScResId( ED_REPEATCOL ) ),
- aRbRepeatCol ( this, ScResId( RB_REPEATCOL ), &aEdRepeatCol, this ),
+ aRbRepeatCol ( this, ScResId( RB_REPEATCOL ), &aEdRepeatCol, this ),
//
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
+ aBtnOk ( this, ScResId( BTN_OK ) ),
+ aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
+ aBtnHelp ( this, ScResId( BTN_HELP ) ),
//
- bDlgLostFocus ( FALSE ),
- pRefInputEdit ( &aEdPrintArea ),
- pDoc ( NULL ),
- pViewData ( NULL ),
- nCurTab ( 0 )
+ bDlgLostFocus ( FALSE ),
+ pRefInputEdit ( &aEdPrintArea ),
+ pDoc ( NULL ),
+ pViewData ( NULL ),
+ nCurTab ( 0 )
{
ScTabViewShell* pScViewSh = PTR_CAST( ScTabViewShell, SfxViewShell::Current() );
- ScDocShell* pScDocSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() );
+ ScDocShell* pScDocSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() );
DBG_ASSERT( pScDocSh, "Current DocumentShell not found :-(" );
@@ -187,8 +187,8 @@ BOOL ScPrintAreasDlg::Close()
BOOL ScPrintAreasDlg::IsTableLocked() const
{
- // Druckbereiche gelten pro Tabelle, darum macht es keinen Sinn,
- // bei der Eingabe die Tabelle umzuschalten
+ // Druckbereiche gelten pro Tabelle, darum macht es keinen Sinn,
+ // bei der Eingabe die Tabelle umzuschalten
return TRUE;
}
@@ -203,14 +203,14 @@ void ScPrintAreasDlg::SetReference( const ScRange& rRef, ScDocument* /* pDoc */
if ( rRef.aStart != rRef.aEnd )
RefInputStart( pRefInputEdit );
- String aStr;
+ String aStr;
const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
if ( &aEdPrintArea == pRefInputEdit )
{
rRef.Format( aStr, SCR_ABS, pDoc, eConv );
-// aEdPrintArea.ReplaceSelected( aStr );
+// aEdPrintArea.ReplaceSelected( aStr );
String aVal = aEdPrintArea.GetText();
Selection aSel = aEdPrintArea.GetSelection();
@@ -285,24 +285,24 @@ void ScPrintAreasDlg::SetActive()
void ScPrintAreasDlg::Impl_Reset()
{
- String aStrRange;
- const ScRange* pRepeatColRange = pDoc->GetRepeatColRange( nCurTab );
- const ScRange* pRepeatRowRange = pDoc->GetRepeatRowRange( nCurTab );
+ String aStrRange;
+ const ScRange* pRepeatColRange = pDoc->GetRepeatColRange( nCurTab );
+ const ScRange* pRepeatRowRange = pDoc->GetRepeatRowRange( nCurTab );
- aEdPrintArea.SetModifyHdl ( HDL(Impl_ModifyHdl) );
- aEdRepeatRow.SetModifyHdl ( HDL(Impl_ModifyHdl) );
- aEdRepeatCol.SetModifyHdl ( HDL(Impl_ModifyHdl) );
+ aEdPrintArea.SetModifyHdl ( HDL(Impl_ModifyHdl) );
+ aEdRepeatRow.SetModifyHdl ( HDL(Impl_ModifyHdl) );
+ aEdRepeatCol.SetModifyHdl ( HDL(Impl_ModifyHdl) );
aEdPrintArea.SetGetFocusHdl( HDL(Impl_GetFocusHdl) );
aEdRepeatRow.SetGetFocusHdl( HDL(Impl_GetFocusHdl) );
aEdRepeatCol.SetGetFocusHdl( HDL(Impl_GetFocusHdl) );
aLbPrintArea.SetGetFocusHdl( HDL(Impl_GetFocusHdl) );
aLbRepeatRow.SetGetFocusHdl( HDL(Impl_GetFocusHdl) );
aLbRepeatCol.SetGetFocusHdl( HDL(Impl_GetFocusHdl) );
- aLbPrintArea.SetSelectHdl ( HDL(Impl_SelectHdl) );
- aLbRepeatRow.SetSelectHdl ( HDL(Impl_SelectHdl) );
- aLbRepeatCol.SetSelectHdl ( HDL(Impl_SelectHdl) );
- aBtnOk .SetClickHdl ( HDL(Impl_BtnHdl) );
- aBtnCancel .SetClickHdl ( HDL(Impl_BtnHdl) );
+ aLbPrintArea.SetSelectHdl ( HDL(Impl_SelectHdl) );
+ aLbRepeatRow.SetSelectHdl ( HDL(Impl_SelectHdl) );
+ aLbRepeatCol.SetSelectHdl ( HDL(Impl_SelectHdl) );
+ aBtnOk .SetClickHdl ( HDL(Impl_BtnHdl) );
+ aBtnCancel .SetClickHdl ( HDL(Impl_BtnHdl) );
Impl_FillLists();
@@ -345,7 +345,7 @@ void ScPrintAreasDlg::Impl_Reset()
if( pDoc->IsPrintEntireSheet( nCurTab ) )
aLbPrintArea.SelectEntryPos( SC_AREASDLG_PR_ENTIRE );
- aEdPrintArea.SaveValue(); // fuer FillItemSet() merken:
+ aEdPrintArea.SaveValue(); // fuer FillItemSet() merken:
aEdRepeatRow.SaveValue();
aEdRepeatCol.SaveValue();
}
@@ -355,8 +355,8 @@ void ScPrintAreasDlg::Impl_Reset()
BOOL ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem )
{
- String aRangeStr = pEd->GetText();
- BOOL bDataChanged = (pEd->GetSavedValue() != aRangeStr);
+ String aRangeStr = pEd->GetText();
+ BOOL bDataChanged = (pEd->GetSavedValue() != aRangeStr);
if ( (aRangeStr.Len() > 0) && &aEdPrintArea != pEd )
{
@@ -376,10 +376,10 @@ BOOL ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem )
BOOL ScPrintAreasDlg::Impl_CheckRefStrings()
{
- BOOL bOk = FALSE;
- String aStrPrintArea = aEdPrintArea.GetText();
- String aStrRepeatRow = aEdRepeatRow.GetText();
- String aStrRepeatCol = aEdRepeatCol.GetText();
+ BOOL bOk = FALSE;
+ String aStrPrintArea = aEdPrintArea.GetText();
+ String aStrRepeatRow = aEdRepeatRow.GetText();
+ String aStrRepeatCol = aEdRepeatCol.GetText();
BOOL bPrintAreaOk = TRUE;
if ( aStrPrintArea.Len() )
@@ -441,8 +441,8 @@ void ScPrintAreasDlg::Impl_FillLists()
//------------------------------------------------------
// Selektion holen und String in PrintArea-ListBox merken
//------------------------------------------------------
- ScRange aRange;
- String aStrRange;
+ ScRange aRange;
+ String aStrRange;
BOOL bSimple = TRUE;
if ( pViewData )
@@ -464,15 +464,15 @@ void ScPrintAreasDlg::Impl_FillLists()
//------------------------------------------------------
// Ranges holen und in ListBoxen merken
//------------------------------------------------------
- ScRangeName* pRangeNames = pDoc->GetRangeName();
- const USHORT nCount = pRangeNames ? pRangeNames->GetCount() : 0;
+ ScRangeName* pRangeNames = pDoc->GetRangeName();
+ const USHORT nCount = pRangeNames ? pRangeNames->GetCount() : 0;
if ( nCount > 0 )
{
- String aName;
- String aSymbol;
+ String aName;
+ String aSymbol;
// ScRange aRange;
- ScRangeData* pData = NULL;
+ ScRangeData* pData = NULL;
for ( USHORT i=0; i<nCount; i++ )
{
@@ -528,11 +528,11 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn )
{
if ( Impl_CheckRefStrings() )
{
- BOOL bDataChanged = FALSE;
- String aStr;
- SfxStringItem aPrintArea( SID_CHANGE_PRINTAREA, aStr );
- SfxStringItem aRepeatRow( FN_PARAM_2, aStr );
- SfxStringItem aRepeatCol( FN_PARAM_3, aStr );
+ BOOL bDataChanged = FALSE;
+ String aStr;
+ SfxStringItem aPrintArea( SID_CHANGE_PRINTAREA, aStr );
+ SfxStringItem aRepeatRow( FN_PARAM_2, aStr );
+ SfxStringItem aRepeatCol( FN_PARAM_3, aStr );
//-------------------------
// Druckbereich veraendert?
@@ -668,15 +668,15 @@ IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd )
return 0;
// set list box selection according to edit field
- USHORT nEntryCount = pLb->GetEntryCount();
- String aStrEd( pEd->GetText() );
- String aEdUpper = aStrEd;
+ USHORT nEntryCount = pLb->GetEntryCount();
+ String aStrEd( pEd->GetText() );
+ String aEdUpper = aStrEd;
aEdUpper.ToUpperAscii();
if ( (nEntryCount > nFirstCustomPos) && aStrEd.Len() > 0 )
{
- BOOL bFound = FALSE;
- String* pSymbol = NULL;
+ BOOL bFound = FALSE;
+ String* pSymbol = NULL;
USHORT i;
for ( i=nFirstCustomPos; i<nEntryCount && !bFound; i++ )
@@ -707,10 +707,10 @@ bool lcl_CheckOne_OOO( const String& rStr, bool bIsRow, SCCOLROW& rVal )
// Row: [$]1-MAXTAB
// Col: [$]A-IV
- String aStr = rStr;
+ String aStr = rStr;
xub_StrLen nLen = aStr.Len();
- SCCOLROW nNum = 0;
- BOOL bStrOk = ( nLen > 0 ) && ( bIsRow ? ( nLen < 6 ) : ( nLen < 4 ) );
+ SCCOLROW nNum = 0;
+ BOOL bStrOk = ( nLen > 0 ) && ( bIsRow ? ( nLen < 6 ) : ( nLen < 4 ) );
if ( bStrOk )
{
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx
index 52527d3f60ce..c155ef3a8946 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
//CHINA001 #include "tphfedit.hxx"
#include "scresid.hxx"
#include "hfedtdlg.hrc"
-#include "scuitphfedit.hxx" //CHINA001
+#include "scuitphfedit.hxx" //CHINA001
//------------------------------------------------------------------
-// macros from docsh4.cxx
-//! use SIDs?
+// macros from docsh4.cxx
+//! use SIDs?
#define IS_SHARE_HEADER(set) \
((SfxBoolItem&) \
@@ -62,9 +62,9 @@
//==================================================================
ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP,
- Window* pParent,
+ Window* pParent,
const SfxItemSet& rCoreSet,
- const String& rPageStyle,
+ const String& rPageStyle,
USHORT nResIdP )
: SfxTabDialog( pFrameP, pParent, ScResId( nResIdP ), &rCoreSet )
{
@@ -131,7 +131,7 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP,
default:
case RID_SCDLG_HFEDIT:
{
- const SvxPageItem& rPageItem = (const SvxPageItem&)
+ const SvxPageItem& rPageItem = (const SvxPageItem&)
rCoreSet.Get(
rCoreSet.GetPool()->GetWhich(SID_ATTR_PAGE) );
@@ -145,7 +145,7 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP,
}
else
{
- // #69193a# respect "shared" setting
+ // #69193a# respect "shared" setting
BOOL bShareHeader = IS_SHARE_HEADER(rCoreSet);
if ( bShareHeader )
diff --git a/sc/source/ui/pagedlg/hfedtdlg.hrc b/sc/source/ui/pagedlg/hfedtdlg.hrc
index 30e6f8ecae63..a8a32da3446f 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.hrc
+++ b/sc/source/ui/pagedlg/hfedtdlg.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
@@ -45,10 +45,10 @@
#define BTN_FILE 6
#define BTN_TABLE 7
-#define RID_POPUP_FCOMMAND 10
-#define FILE_COMMAND_TITEL 11
-#define FILE_COMMAND_FILENAME 12
-#define FILE_COMMAND_PATH 13
+#define RID_POPUP_FCOMMAND 10
+#define FILE_COMMAND_TITEL 11
+#define FILE_COMMAND_FILENAME 12
+#define FILE_COMMAND_PATH 13
#define FL_INFO 14
diff --git a/sc/source/ui/pagedlg/hfedtdlg.src b/sc/source/ui/pagedlg/hfedtdlg.src
index 1445636e8cc6..749303ce7164 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.src
+++ b/sc/source/ui/pagedlg/hfedtdlg.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
@@ -57,7 +57,7 @@ TabDialog RID_SCDLG_HFED_HEADER
Size = MAP_APPFONT ( 270 , 140 ) ;
Text [ en-US ] = "Headers" ;
Moveable = TRUE ;
- // Closeable = TRUE;
+ // Closeable = TRUE;
TabControl 1
{
OutputSize = TRUE ;
@@ -88,7 +88,7 @@ TabDialog RID_SCDLG_HFED_FOOTER
Size = MAP_APPFONT ( 270 , 140 ) ;
Text [ en-US ] = "Footers" ;
Moveable = TRUE ;
- // Closeable = TRUE;
+ // Closeable = TRUE;
TabControl 1
{
OutputSize = TRUE ;
@@ -121,7 +121,7 @@ TabDialog RID_SCDLG_HFEDIT_ALL
SVLook = TRUE ;
Size = MAP_APPFONT ( 270 , 140 ) ;
Moveable = TRUE ;
- // Closeable = TRUE;
+ // Closeable = TRUE;
HFEDIT_DLGTITLE
TabControl 1
{
@@ -164,7 +164,7 @@ TabDialog RID_SCDLG_HFEDIT_SHDR
SVLook = TRUE ;
Size = MAP_APPFONT ( 270 , 140 ) ;
Moveable = TRUE ;
- // Closeable = TRUE;
+ // Closeable = TRUE;
HFEDIT_DLGTITLE
TabControl 1
{
@@ -201,7 +201,7 @@ TabDialog RID_SCDLG_HFEDIT_SFTR
SVLook = TRUE ;
Size = MAP_APPFONT ( 270 , 140 ) ;
Moveable = TRUE ;
- // Closeable = TRUE;
+ // Closeable = TRUE;
HFEDIT_DLGTITLE
TabControl 1
{
@@ -238,7 +238,7 @@ TabDialog RID_SCDLG_HFEDIT
SVLook = TRUE ;
Size = MAP_APPFONT ( 270 , 140 ) ;
Moveable = TRUE ;
- // Closeable = TRUE;
+ // Closeable = TRUE;
HFEDIT_DLGTITLE
TabControl 1
{
@@ -269,7 +269,7 @@ TabDialog RID_SCDLG_HFEDIT_HEADER
SVLook = TRUE ;
Size = MAP_APPFONT ( 270 , 140 ) ;
Moveable = TRUE ;
- // Closeable = TRUE;
+ // Closeable = TRUE;
HFEDIT_DLGTITLE
TabControl 1
{
@@ -300,7 +300,7 @@ TabDialog RID_SCDLG_HFEDIT_FOOTER
SVLook = TRUE ;
Size = MAP_APPFONT ( 270 , 140 ) ;
Moveable = TRUE ;
- // Closeable = TRUE;
+ // Closeable = TRUE;
HFEDIT_DLGTITLE
TabControl 1
{
@@ -331,7 +331,7 @@ TabDialog RID_SCDLG_HFEDIT_RIGHTHEADER
SVLook = TRUE ;
Size = MAP_APPFONT ( 270 , 140 ) ;
Moveable = TRUE ;
- // Closeable = TRUE;
+ // Closeable = TRUE;
HFEDIT_DLGTITLE
TabControl 1
{
@@ -356,7 +356,7 @@ TabDialog RID_SCDLG_HFEDIT_LEFTHEADER
SVLook = TRUE ;
Size = MAP_APPFONT ( 270 , 140 ) ;
Moveable = TRUE ;
- // Closeable = TRUE;
+ // Closeable = TRUE;
HFEDIT_DLGTITLE
TabControl 1
{
@@ -381,7 +381,7 @@ TabDialog RID_SCDLG_HFEDIT_RIGHTFOOTER
SVLook = TRUE ;
Size = MAP_APPFONT ( 270 , 140 ) ;
Moveable = TRUE ;
- // Closeable = TRUE;
+ // Closeable = TRUE;
HFEDIT_DLGTITLE
TabControl 1
{
@@ -406,7 +406,7 @@ TabDialog RID_SCDLG_HFEDIT_LEFTFOOTER
SVLook = TRUE ;
Size = MAP_APPFONT ( 270 , 140 ) ;
Moveable = TRUE ;
- // Closeable = TRUE;
+ // Closeable = TRUE;
HFEDIT_DLGTITLE
TabControl 1
{
@@ -440,7 +440,7 @@ TabPage RID_HFBASE
Size = MAP_APPFONT ( 75 , 10 ) ;
Text [ en-US ] = "~Left area" ;
};
- /* "Control" braucht eigene HelpId, darum in der Ableitung:
+ /* "Control" braucht eigene HelpId, darum in der Ableitung:
Control WND_LEFT
{
Border = TRUE ;
@@ -455,7 +455,7 @@ TabPage RID_HFBASE
Size = MAP_APPFONT ( 75 , 10 ) ;
Text [ en-US ] = "~Center area" ;
};
- /* "Control" braucht eigene HelpId, darum in der Ableitung:
+ /* "Control" braucht eigene HelpId, darum in der Ableitung:
Control WND_CENTER
{
Border = TRUE ;
@@ -470,7 +470,7 @@ TabPage RID_HFBASE
Size = MAP_APPFONT ( 75 , 10 ) ;
Text [ en-US ] = "R~ight area" ;
};
- /* "Control" braucht eigene HelpId, darum in der Ableitung:
+ /* "Control" braucht eigene HelpId, darum in der Ableitung:
Control WND_RIGHT
{
Border = TRUE ;
@@ -672,8 +672,8 @@ TabPage RID_HFBASE
Text [ en-US ] = "Note" ;
};
};
- // Kombinationen: Header/Footer links/rechts
- // die Eingabefenster jeweils mit eigener ID, sonst aus RID_HFBASE kopiert
+ // Kombinationen: Header/Footer links/rechts
+ // die Eingabefenster jeweils mit eigener ID, sonst aus RID_HFBASE kopiert
TabPage RID_SCPAGE_HFED_HL < RID_HFBASE
{
Hide = TRUE ;
diff --git a/sc/source/ui/pagedlg/pagedlg.hrc b/sc/source/ui/pagedlg/pagedlg.hrc
index 2f3593c2f6d1..6a995b1679d4 100644
--- a/sc/source/ui/pagedlg/pagedlg.hrc
+++ b/sc/source/ui/pagedlg/pagedlg.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,42 +26,42 @@
************************************************************************/
-#include "sc.hrc" // -> RID_SCDLG_PAGE
+#include "sc.hrc" // -> RID_SCDLG_PAGE
// -> RID_SCPAGE_TABLE
// -> RID_SCPAGE_AREAS
-#define TP_PAGE_STD 1
-#define TP_PAGE_HEADER 2
-#define TP_PAGE_FOOTER 3
-#define TP_PAGE_TABLE 4
-#define TP_PAGE_AREAS 5
+#define TP_PAGE_STD 1
+#define TP_PAGE_HEADER 2
+#define TP_PAGE_FOOTER 3
+#define TP_PAGE_TABLE 4
+#define TP_PAGE_AREAS 5
//================================================
// TabPage: Tabelle
-#define BTN_GRID 10
-#define BTN_HEADER 11
-#define BTN_NOTES 12
-#define BTN_CHARTS 13
-#define BTN_OBJECTS 14
-#define BTN_DRAWINGS 15
-#define BTN_FORMULAS 16
-#define BTN_NULLVALS 17
+#define BTN_GRID 10
+#define BTN_HEADER 11
+#define BTN_NOTES 12
+#define BTN_CHARTS 13
+#define BTN_OBJECTS 14
+#define BTN_DRAWINGS 15
+#define BTN_FORMULAS 16
+#define BTN_NULLVALS 17
#define FL_PRINT 19
-#define BTN_TOPDOWN 20
-#define BTN_LEFTRIGHT 21
-#define BMP_PAGEDIR 22
-#define IMG_LEFTRIGHT 23
-#define IMG_TOPDOWN 24
-#define BTN_PAGENO 25
-#define ED_PAGENO 26
+#define BTN_TOPDOWN 20
+#define BTN_LEFTRIGHT 21
+#define BMP_PAGEDIR 22
+#define IMG_LEFTRIGHT 23
+#define IMG_TOPDOWN 24
+#define BTN_PAGENO 25
+#define ED_PAGENO 26
#define FL_PAGEDIR 29
#define FT_SCALEMODE 30
#define LB_SCALEMODE 31
-#define ED_SCALEALL 32
-#define ED_SCALEPAGENUM 34
+#define ED_SCALEALL 32
+#define ED_SCALEPAGENUM 34
#define ED_SCALEPAGEWIDTH 35
#define ED_SCALEPAGEHEIGHT 36
#define FL_SCALE 39
@@ -83,21 +83,21 @@
// Dialog: Druckbereiche
#define FL_PRINTAREA 10
-#define ED_PRINTAREA 11
-#define RB_PRINTAREA 12
-#define LB_PRINTAREA 13
+#define ED_PRINTAREA 11
+#define RB_PRINTAREA 12
+#define LB_PRINTAREA 13
#define FL_REPEATROW 20
-#define ED_REPEATROW 21
-#define RB_REPEATROW 22
-#define LB_REPEATROW 23
+#define ED_REPEATROW 21
+#define RB_REPEATROW 22
+#define LB_REPEATROW 23
#define FL_REPEATCOL 30
-#define ED_REPEATCOL 31
-#define RB_REPEATCOL 32
-#define LB_REPEATCOL 33
+#define ED_REPEATCOL 31
+#define RB_REPEATCOL 32
+#define LB_REPEATCOL 33
-#define BTN_OK 1
-#define BTN_CANCEL 2
-#define BTN_HELP 3
+#define BTN_OK 1
+#define BTN_CANCEL 2
+#define BTN_HELP 3
diff --git a/sc/source/ui/pagedlg/pagedlg.src b/sc/source/ui/pagedlg/pagedlg.src
index d0f95c3d9f6b..a4e51bff0792 100644
--- a/sc/source/ui/pagedlg/pagedlg.src
+++ b/sc/source/ui/pagedlg/pagedlg.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 @@ ModelessDialog RID_SCDLG_AREAS
Size = MAP_APPFONT ( 316 , 90 ) ;
OutputSize = TRUE ;
Moveable = TRUE ;
- //Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button !
+ //Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button !
Hide = TRUE ;
SVLook = TRUE ;
Text [ en-US ] = "Edit Print Ranges" ;
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index ba89691239c3..2c897cb51262 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,52 +94,52 @@ static ScEditWindow* pActiveEdWnd = NULL;
// class ScHFEditPage
//
-ScHFEditPage::ScHFEditPage( Window* pParent,
- USHORT nResId,
- const SfxItemSet& rCoreAttrs,
- USHORT nWhichId,
+ScHFEditPage::ScHFEditPage( Window* pParent,
+ USHORT nResId,
+ const SfxItemSet& rCoreAttrs,
+ USHORT nWhichId,
bool bHeader )
- : SfxTabPage ( pParent, ScResId( nResId ), rCoreAttrs ),
-
- aFtLeft ( this, ScResId( FT_LEFT ) ),
- aWndLeft ( this, ScResId( WND_LEFT ), Left ),
- aFtCenter ( this, ScResId( FT_CENTER ) ),
- aWndCenter ( this, ScResId( WND_CENTER ), Center ),
- aFtRight ( this, ScResId( FT_RIGHT ) ),
- aWndRight ( this, ScResId( WND_RIGHT ), Right ),
- maFtDefinedHF ( this, ScResId( FT_HF_DEFINED ) ),
- maLbDefined ( this, ScResId( LB_DEFINED ) ),
- maFtCustomHF ( this, ScResId( FT_HF_CUSTOM ) ),
- aBtnText ( this, ScResId( BTN_TEXT ) ),
- aBtnFile ( this, ScResId( BTN_FILE ) ),
- aBtnTable ( this, ScResId( BTN_TABLE ) ),
- aBtnPage ( this, ScResId( BTN_PAGE ) ),
- aBtnLastPage ( this, ScResId( BTN_PAGES ) ),
- aBtnDate ( this, ScResId( BTN_DATE ) ),
- aBtnTime ( this, ScResId( BTN_TIME ) ),
- aFlInfo ( this, ScResId( FL_INFO ) ),
- aFtInfo ( this, ScResId( FT_INFO ) ),
- aPopUpFile ( ScResId( RID_POPUP_FCOMMAND) ),
- nWhich ( nWhichId )
+ : SfxTabPage ( pParent, ScResId( nResId ), rCoreAttrs ),
+
+ aFtLeft ( this, ScResId( FT_LEFT ) ),
+ aWndLeft ( this, ScResId( WND_LEFT ), Left ),
+ aFtCenter ( this, ScResId( FT_CENTER ) ),
+ aWndCenter ( this, ScResId( WND_CENTER ), Center ),
+ aFtRight ( this, ScResId( FT_RIGHT ) ),
+ aWndRight ( this, ScResId( WND_RIGHT ), Right ),
+ maFtDefinedHF ( this, ScResId( FT_HF_DEFINED ) ),
+ maLbDefined ( this, ScResId( LB_DEFINED ) ),
+ maFtCustomHF ( this, ScResId( FT_HF_CUSTOM ) ),
+ aBtnText ( this, ScResId( BTN_TEXT ) ),
+ aBtnFile ( this, ScResId( BTN_FILE ) ),
+ aBtnTable ( this, ScResId( BTN_TABLE ) ),
+ aBtnPage ( this, ScResId( BTN_PAGE ) ),
+ aBtnLastPage ( this, ScResId( BTN_PAGES ) ),
+ aBtnDate ( this, ScResId( BTN_DATE ) ),
+ aBtnTime ( this, ScResId( BTN_TIME ) ),
+ aFlInfo ( this, ScResId( FL_INFO ) ),
+ aFtInfo ( this, ScResId( FT_INFO ) ),
+ aPopUpFile ( ScResId( RID_POPUP_FCOMMAND) ),
+ nWhich ( nWhichId )
{
- //! use default style from current document?
- //! if font color is used, header/footer background color must be set
+ //! use default style from current document?
+ //! if font color is used, header/footer background color must be set
- ScPatternAttr aPatAttr( rCoreAttrs.GetPool() );
+ ScPatternAttr aPatAttr( rCoreAttrs.GetPool() );
aBtnFile.SetPopupMenu(&aPopUpFile);
maLbDefined.SetSelectHdl( LINK( this, ScHFEditPage, ListHdl_Impl ) );
aBtnFile.SetMenuHdl( LINK( this, ScHFEditPage, MenuHdl ) );
- aBtnText .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
- aBtnPage .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
+ aBtnText .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
+ aBtnPage .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
aBtnLastPage.SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
- aBtnDate .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
- aBtnTime .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
- aBtnFile .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
- aBtnTable .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
+ aBtnDate .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
+ aBtnTime .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
+ aBtnFile .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
+ aBtnTable .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
aBtnText .SetModeImage( Image( ScResId( IMG_TEXT_H ) ), BMP_COLOR_HIGHCONTRAST );
aBtnFile .SetModeImage( Image( ScResId( IMG_FILE_H ) ), BMP_COLOR_HIGHCONTRAST );
@@ -166,9 +166,9 @@ ScHFEditPage::ScHFEditPage( Window* pParent,
aFtLeft.SetPosPixel(pt2);
aFtRight.SetPosPixel(pt1);
}
- aWndLeft. SetFont( aPatAttr );
+ aWndLeft. SetFont( aPatAttr );
aWndCenter. SetFont( aPatAttr );
- aWndRight. SetFont( aPatAttr );
+ aWndRight. SetFont( aPatAttr );
FillCmdArr();
@@ -219,10 +219,10 @@ void __EXPORT ScHFEditPage::Reset( const SfxItemSet& rCoreSet )
BOOL __EXPORT ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet )
{
- ScPageHFItem aItem( nWhich );
- EditTextObject* pLeft = aWndLeft .CreateTextObject();
+ ScPageHFItem aItem( nWhich );
+ EditTextObject* pLeft = aWndLeft .CreateTextObject();
EditTextObject* pCenter = aWndCenter.CreateTextObject();
- EditTextObject* pRight = aWndRight .CreateTextObject();
+ EditTextObject* pRight = aWndRight .CreateTextObject();
aItem.SetLeftArea ( *pLeft );
aItem.SetCenterArea( *pCenter );
@@ -239,9 +239,9 @@ BOOL __EXPORT ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet )
// -----------------------------------------------------------------------
#define SET_CMD(i,id) \
- aCmd = aDel; \
- aCmd += ScGlobal::GetRscString( id ); \
- aCmd += aDel; \
+ aCmd = aDel; \
+ aCmd += ScGlobal::GetRscString( id ); \
+ aCmd += aDel; \
aCmdArr[i] = aCmd;
// -----------------------------------------------------------------------
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index de647cf5f82a..059535e80634 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "hfedtdlg.hxx"
#include "styledlg.hxx"
#include "scresid.hxx"
-#include "scuitphfedit.hxx" //CHINA001
+#include "scuitphfedit.hxx" //CHINA001
#undef _TPHF_CXX
@@ -63,19 +63,19 @@
ScHFPage::ScHFPage( Window* pParent, USHORT nResId,
const SfxItemSet& rSet, USHORT nSetId )
- : SvxHFPage ( pParent, nResId, rSet, nSetId ),
- aBtnEdit ( this, ScResId( RID_SCBTN_HFEDIT ) ),
- aDataSet ( *rSet.GetPool(),
+ : SvxHFPage ( pParent, nResId, rSet, nSetId ),
+ aBtnEdit ( this, ScResId( RID_SCBTN_HFEDIT ) ),
+ aDataSet ( *rSet.GetPool(),
ATTR_PAGE_HEADERLEFT, ATTR_PAGE_FOOTERRIGHT,
ATTR_PAGE, ATTR_PAGE, 0 ),
- nPageUsage ( (USHORT)SVX_PAGE_ALL ),
- pStyleDlg ( NULL )
+ nPageUsage ( (USHORT)SVX_PAGE_ALL ),
+ pStyleDlg ( NULL )
{
SetExchangeSupport();
- SfxViewShell* pSh = SfxViewShell::Current();
+ SfxViewShell* pSh = SfxViewShell::Current();
ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell,pSh);
- Point aPos( aBackgroundBtn.GetPosPixel() );
+ Point aPos( aBackgroundBtn.GetPosPixel() );
// aBackgroundBtn position not changed anymore
@@ -89,13 +89,13 @@ ScHFPage::ScHFPage( Window* pParent, USHORT nResId,
if ( pViewSh )
{
ScViewData* pViewData = pViewSh->GetViewData();
- ScDocument* pDoc = pViewData->GetDocument();
+ ScDocument* pDoc = pViewData->GetDocument();
aStrPageStyle = pDoc->GetPageStyle( pViewData->GetTabNo() );
}
- aBtnEdit.SetClickHdl ( LINK( this, ScHFPage, BtnHdl ) );
- aTurnOnBox.SetClickHdl ( LINK( this, ScHFPage, TurnOnHdl ) );
+ aBtnEdit.SetClickHdl ( LINK( this, ScHFPage, BtnHdl ) );
+ aTurnOnBox.SetClickHdl ( LINK( this, ScHFPage, TurnOnHdl ) );
if ( nId == SID_ATTR_PAGE_HEADERSET )
aBtnEdit.SetHelpId( HID_SC_HEADER_EDIT );
@@ -141,8 +141,8 @@ BOOL __EXPORT ScHFPage::FillItemSet( SfxItemSet& rOutSet )
void __EXPORT ScHFPage::ActivatePage( const SfxItemSet& rSet )
{
- USHORT nPageWhich = GetWhich( SID_ATTR_PAGE );
- const SvxPageItem& rPageItem = (const SvxPageItem&)
+ USHORT nPageWhich = GetWhich( SID_ATTR_PAGE );
+ const SvxPageItem& rPageItem = (const SvxPageItem&)
rSet.Get(nPageWhich);
nPageUsage = rPageItem.GetPageUsage();
@@ -197,10 +197,10 @@ IMPL_LINK( ScHFPage, TurnOnHdl, CheckBox*, EMPTYARG )
IMPL_LINK( ScHFPage, BtnHdl, PushButton*, EMPTYARG )
{
- // Wenn der Bearbeiten-Dialog direkt aus dem Click-Handler des Buttons
- // aufgerufen wird, funktioniert im Bearbeiten-Dialog unter OS/2 das
- // GrabFocus nicht (Bug #41805#).
- // Mit dem neuen StarView sollte dieser Workaround wieder raus koennen!
+ // Wenn der Bearbeiten-Dialog direkt aus dem Click-Handler des Buttons
+ // aufgerufen wird, funktioniert im Bearbeiten-Dialog unter OS/2 das
+ // GrabFocus nicht (Bug #41805#).
+ // Mit dem neuen StarView sollte dieser Workaround wieder raus koennen!
Application::PostUserEvent( LINK( this, ScHFPage, HFEditHdl ) );
return 0;
@@ -208,7 +208,7 @@ IMPL_LINK( ScHFPage, BtnHdl, PushButton*, EMPTYARG )
IMPL_LINK( ScHFPage, HFEditHdl, void*, EMPTYARG )
{
- SfxViewShell* pViewSh = SfxViewShell::Current();
+ SfxViewShell* pViewSh = SfxViewShell::Current();
if ( !pViewSh )
{
@@ -236,7 +236,7 @@ IMPL_LINK( ScHFPage, HFEditHdl, void*, EMPTYARG )
}
else
{
- String aText;
+ String aText;
SfxSingleTabDialog* pDlg = new SfxSingleTabDialog( this, aDataSet, 42 );
BOOL bRightPage = aCntSharedBox.IsChecked()
|| ( SVX_PAGE_LEFT != SvxPageUsage(nPageUsage) );
diff --git a/sc/source/ui/pagedlg/tphf.src b/sc/source/ui/pagedlg/tphf.src
index b2f59e06da72..7970a0367019 100644
--- a/sc/source/ui/pagedlg/tphf.src
+++ b/sc/source/ui/pagedlg/tphf.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/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index 8e6b6efda28d..baaf85e08a75 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,46 +98,46 @@ ScEditWindow* GetScEditWindow ()
//CHINA001 // class ScHFEditPage
//CHINA001 //
//CHINA001
-//CHINA001 ScHFEditPage::ScHFEditPage( Window* pParent,
-//CHINA001 USHORT nResId,
-//CHINA001 const SfxItemSet& rCoreAttrs,
-//CHINA001 USHORT nWhichId )
-//CHINA001
-//CHINA001 : SfxTabPage ( pParent, ScResId( nResId ), rCoreAttrs ),
-//CHINA001
-//CHINA001 aWndLeft ( this, ScResId( WND_LEFT ), Left ),
-//CHINA001 aWndCenter ( this, ScResId( WND_CENTER ), Center ),
-//CHINA001 aWndRight ( this, ScResId( WND_RIGHT ), Right ),
-//CHINA001 aFtLeft ( this, ScResId( FT_LEFT ) ),
-//CHINA001 aFtCenter ( this, ScResId( FT_CENTER ) ),
-//CHINA001 aFtRight ( this, ScResId( FT_RIGHT ) ),
-//CHINA001 aFlInfo ( this, ScResId( FL_INFO ) ),
-//CHINA001 aFtInfo ( this, ScResId( FT_INFO ) ),
-//CHINA001 aBtnText ( this, ScResId( BTN_TEXT ) ),
-//CHINA001 aBtnPage ( this, ScResId( BTN_PAGE ) ),
-//CHINA001 aBtnLastPage ( this, ScResId( BTN_PAGES ) ),
-//CHINA001 aBtnDate ( this, ScResId( BTN_DATE ) ),
-//CHINA001 aBtnTime ( this, ScResId( BTN_TIME ) ),
-//CHINA001 aBtnFile ( this, ScResId( BTN_FILE ) ),
-//CHINA001 aBtnTable ( this, ScResId( BTN_TABLE ) ),
-//CHINA001 aPopUpFile ( ScResId( RID_POPUP_FCOMMAND) ),
-//CHINA001 nWhich ( nWhichId )
+//CHINA001 ScHFEditPage::ScHFEditPage( Window* pParent,
+//CHINA001 USHORT nResId,
+//CHINA001 const SfxItemSet& rCoreAttrs,
+//CHINA001 USHORT nWhichId )
+//CHINA001
+//CHINA001 : SfxTabPage ( pParent, ScResId( nResId ), rCoreAttrs ),
+//CHINA001
+//CHINA001 aWndLeft ( this, ScResId( WND_LEFT ), Left ),
+//CHINA001 aWndCenter ( this, ScResId( WND_CENTER ), Center ),
+//CHINA001 aWndRight ( this, ScResId( WND_RIGHT ), Right ),
+//CHINA001 aFtLeft ( this, ScResId( FT_LEFT ) ),
+//CHINA001 aFtCenter ( this, ScResId( FT_CENTER ) ),
+//CHINA001 aFtRight ( this, ScResId( FT_RIGHT ) ),
+//CHINA001 aFlInfo ( this, ScResId( FL_INFO ) ),
+//CHINA001 aFtInfo ( this, ScResId( FT_INFO ) ),
+//CHINA001 aBtnText ( this, ScResId( BTN_TEXT ) ),
+//CHINA001 aBtnPage ( this, ScResId( BTN_PAGE ) ),
+//CHINA001 aBtnLastPage ( this, ScResId( BTN_PAGES ) ),
+//CHINA001 aBtnDate ( this, ScResId( BTN_DATE ) ),
+//CHINA001 aBtnTime ( this, ScResId( BTN_TIME ) ),
+//CHINA001 aBtnFile ( this, ScResId( BTN_FILE ) ),
+//CHINA001 aBtnTable ( this, ScResId( BTN_TABLE ) ),
+//CHINA001 aPopUpFile ( ScResId( RID_POPUP_FCOMMAND) ),
+//CHINA001 nWhich ( nWhichId )
//CHINA001 {
-//CHINA001 //! use default style from current document?
-//CHINA001 //! if font color is used, header/footer background color must be set
+//CHINA001 //! use default style from current document?
+//CHINA001 //! if font color is used, header/footer background color must be set
//CHINA001
-//CHINA001 ScPatternAttr aPatAttr( rCoreAttrs.GetPool() );
+//CHINA001 ScPatternAttr aPatAttr( rCoreAttrs.GetPool() );
//CHINA001
//CHINA001 aBtnFile.SetPopupMenu(&aPopUpFile);
//CHINA001
//CHINA001 aBtnFile.SetMenuHdl( LINK( this, ScHFEditPage, MenuHdl ) );
-//CHINA001 aBtnText .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
-//CHINA001 aBtnPage .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
+//CHINA001 aBtnText .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
+//CHINA001 aBtnPage .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
//CHINA001 aBtnLastPage.SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
-//CHINA001 aBtnDate .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
-//CHINA001 aBtnTime .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
-//CHINA001 aBtnFile .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
-//CHINA001 aBtnTable .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
+//CHINA001 aBtnDate .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
+//CHINA001 aBtnTime .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
+//CHINA001 aBtnFile .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
+//CHINA001 aBtnTable .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
//CHINA001
//CHINA001 aBtnText .SetModeImage( Image( ScResId( IMG_TEXT_H ) ), BMP_COLOR_HIGHCONTRAST );
//CHINA001 aBtnFile .SetModeImage( Image( ScResId( IMG_FILE_H ) ), BMP_COLOR_HIGHCONTRAST );
@@ -147,9 +147,9 @@ ScEditWindow* GetScEditWindow ()
//CHINA001 aBtnDate .SetModeImage( Image( ScResId( IMG_DATE_H ) ), BMP_COLOR_HIGHCONTRAST );
//CHINA001 aBtnTime .SetModeImage( Image( ScResId( IMG_TIME_H ) ), BMP_COLOR_HIGHCONTRAST );
//CHINA001
-//CHINA001 aWndLeft. SetFont( aPatAttr );
+//CHINA001 aWndLeft. SetFont( aPatAttr );
//CHINA001 aWndCenter. SetFont( aPatAttr );
-//CHINA001 aWndRight. SetFont( aPatAttr );
+//CHINA001 aWndRight. SetFont( aPatAttr );
//CHINA001
//CHINA001 FillCmdArr();
//CHINA001
@@ -178,7 +178,7 @@ ScEditWindow* GetScEditWindow ()
//CHINA001 void __EXPORT ScHFEditPage::Reset( const SfxItemSet& rCoreSet )
//CHINA001 {
//CHINA001 if ( IS_AVAILABLE( nWhich ) )
-//CHINA001 {
+//CHINA001 {
//CHINA001 const ScPageHFItem& rItem = (const ScPageHFItem&)(rCoreSet.Get( nWhich ));
//CHINA001
//CHINA001 const EditTextObject* pLeft = rItem.GetLeftArea();
@@ -186,12 +186,12 @@ ScEditWindow* GetScEditWindow ()
//CHINA001 const EditTextObject* pRight = rItem.GetRightArea();
//CHINA001
//CHINA001 if ( pLeft && pCenter && pRight )
-//CHINA001 {
-//CHINA001 aWndLeft .SetText( *pLeft );
-//CHINA001 aWndCenter .SetText( *pCenter );
-//CHINA001 aWndRight .SetText( *pRight );
-//CHINA001 }
-//CHINA001 }
+//CHINA001 {
+//CHINA001 aWndLeft .SetText( *pLeft );
+//CHINA001 aWndCenter .SetText( *pCenter );
+//CHINA001 aWndRight .SetText( *pRight );
+//CHINA001 }
+//CHINA001 }
//CHINA001 }
//CHINA001
//CHINA001 #undef IS_AVAILABLE
@@ -200,10 +200,10 @@ ScEditWindow* GetScEditWindow ()
//CHINA001
//CHINA001 BOOL __EXPORT ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet )
//CHINA001 {
-//CHINA001 ScPageHFItem aItem( nWhich );
-//CHINA001 EditTextObject* pLeft = aWndLeft .CreateTextObject();
+//CHINA001 ScPageHFItem aItem( nWhich );
+//CHINA001 EditTextObject* pLeft = aWndLeft .CreateTextObject();
//CHINA001 EditTextObject* pCenter = aWndCenter.CreateTextObject();
-//CHINA001 EditTextObject* pRight = aWndRight .CreateTextObject();
+//CHINA001 EditTextObject* pRight = aWndRight .CreateTextObject();
//CHINA001
//CHINA001 aItem.SetLeftArea ( *pLeft );
//CHINA001 aItem.SetCenterArea( *pCenter );
@@ -218,11 +218,11 @@ ScEditWindow* GetScEditWindow ()
//CHINA001 }
//CHINA001
//CHINA001 // -----------------------------------------------------------------------
-//CHINA001
+//CHINA001
//CHINA001 #define SET_CMD(i,id) x
-//CHINA001 aCmd = aDel; x
-//CHINA001 aCmd += ScGlobal::GetRscString( id ); x
-//CHINA001 aCmd += aDel; x
+//CHINA001 aCmd = aDel; x
+//CHINA001 aCmd += ScGlobal::GetRscString( id ); x
+//CHINA001 aCmd += aDel; x
//CHINA001 aCmdArr[i] = aCmd;
//CHINA001
//CHINA001 // -----------------------------------------------------------------------
@@ -252,26 +252,26 @@ ScEditWindow* GetScEditWindow ()
//CHINA001 return 0;
//CHINA001
//CHINA001 if ( pBtn == &aBtnText )
-//CHINA001 {
+//CHINA001 {
//CHINA001 pActiveEdWnd->SetCharAttriutes();
-//CHINA001 }
-//CHINA001 else
-//CHINA001 {
+//CHINA001 }
+//CHINA001 else
+//CHINA001 {
//CHINA001 if ( pBtn == &aBtnPage )
//CHINA001 pActiveEdWnd->InsertField( SvxFieldItem(SvxPageField()) );
-//CHINA001 else if ( pBtn == &aBtnLastPage )
+//CHINA001 else if ( pBtn == &aBtnLastPage )
//CHINA001 pActiveEdWnd->InsertField( SvxFieldItem(SvxPagesField()) );
-//CHINA001 else if ( pBtn == &aBtnDate )
+//CHINA001 else if ( pBtn == &aBtnDate )
//CHINA001 pActiveEdWnd->InsertField( SvxFieldItem(SvxDateField(Date(),SVXDATETYPE_VAR)) );
-//CHINA001 else if ( pBtn == &aBtnTime )
+//CHINA001 else if ( pBtn == &aBtnTime )
//CHINA001 pActiveEdWnd->InsertField( SvxFieldItem(SvxTimeField()) );
-//CHINA001 else if ( pBtn == &aBtnFile )
-//CHINA001 {
+//CHINA001 else if ( pBtn == &aBtnFile )
+//CHINA001 {
//CHINA001 pActiveEdWnd->InsertField( SvxFieldItem( SvxFileField() ) );
-//CHINA001 }
-//CHINA001 else if ( pBtn == &aBtnTable )
+//CHINA001 }
+//CHINA001 else if ( pBtn == &aBtnTable )
//CHINA001 pActiveEdWnd->InsertField( SvxFieldItem(SvxTableField()) );
-//CHINA001 }
+//CHINA001 }
//CHINA001 pActiveEdWnd->GrabFocus();
//CHINA001
//CHINA001 return 0;
@@ -283,22 +283,22 @@ ScEditWindow* GetScEditWindow ()
//CHINA001 return 0;
//CHINA001
//CHINA001 if(pBtn!=NULL)
-//CHINA001 {
+//CHINA001 {
//CHINA001 switch(pBtn->GetSelected())
-//CHINA001 {
-//CHINA001 case FILE_COMMAND_TITEL:
+//CHINA001 {
+//CHINA001 case FILE_COMMAND_TITEL:
//CHINA001 pActiveEdWnd->InsertField( SvxFieldItem( SvxFileField() ) );
//CHINA001 break;
-//CHINA001 case FILE_COMMAND_FILENAME:
+//CHINA001 case FILE_COMMAND_FILENAME:
//CHINA001 pActiveEdWnd->InsertField( SvxFieldItem( SvxExtFileField(
//CHINA001 EMPTY_STRING, SVXFILETYPE_VAR, SVXFILEFORMAT_NAME_EXT ) ) );
//CHINA001 break;
-//CHINA001 case FILE_COMMAND_PATH:
+//CHINA001 case FILE_COMMAND_PATH:
//CHINA001 pActiveEdWnd->InsertField( SvxFieldItem( SvxExtFileField(
//CHINA001 EMPTY_STRING, SVXFILETYPE_VAR, SVXFILEFORMAT_FULLPATH ) ) );
//CHINA001 break;
-//CHINA001 }
-//CHINA001 }
+//CHINA001 }
+//CHINA001 }
//CHINA001 return 0;
//CHINA001 }
//CHINA001
@@ -309,17 +309,17 @@ ScEditWindow* GetScEditWindow ()
//CHINA001 ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rCoreSet )
//CHINA001 : ScHFEditPage( pParent, RID_SCPAGE_HFED_HR, rCoreSet,
//CHINA001 rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_HEADERRIGHT) )
-//CHINA001 {}
+//CHINA001 {}
//CHINA001
//CHINA001 // -----------------------------------------------------------------------
//CHINA001
//CHINA001 USHORT* __EXPORT ScRightHeaderEditPage::GetRanges()
-//CHINA001 { return pPageRightHeaderRanges; }
+//CHINA001 { return pPageRightHeaderRanges; }
//CHINA001
//CHINA001 // -----------------------------------------------------------------------
//CHINA001
//CHINA001 SfxTabPage* __EXPORT ScRightHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
-//CHINA001 { return ( new ScRightHeaderEditPage( pParent, rCoreSet ) ); };
+//CHINA001 { return ( new ScRightHeaderEditPage( pParent, rCoreSet ) ); };
//CHINA001
//CHINA001
//CHINA001 //========================================================================
@@ -329,17 +329,17 @@ ScEditWindow* GetScEditWindow ()
//CHINA001 ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rCoreSet )
//CHINA001 : ScHFEditPage( pParent, RID_SCPAGE_HFED_HL, rCoreSet,
//CHINA001 rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_HEADERLEFT) )
-//CHINA001 {}
+//CHINA001 {}
//CHINA001
//CHINA001 // -----------------------------------------------------------------------
//CHINA001
//CHINA001 USHORT* __EXPORT ScLeftHeaderEditPage::GetRanges()
-//CHINA001 { return pPageLeftHeaderRanges; }
+//CHINA001 { return pPageLeftHeaderRanges; }
//CHINA001
//CHINA001 // -----------------------------------------------------------------------
//CHINA001
//CHINA001 SfxTabPage* __EXPORT ScLeftHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
-//CHINA001 { return ( new ScLeftHeaderEditPage( pParent, rCoreSet ) ); };
+//CHINA001 { return ( new ScLeftHeaderEditPage( pParent, rCoreSet ) ); };
//CHINA001
//CHINA001 //========================================================================
//CHINA001 // class ScRightFooterEditPage
@@ -348,17 +348,17 @@ ScEditWindow* GetScEditWindow ()
//CHINA001 ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet& rCoreSet )
//CHINA001 : ScHFEditPage( pParent, RID_SCPAGE_HFED_FR, rCoreSet,
//CHINA001 rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_FOOTERRIGHT) )
-//CHINA001 {}
+//CHINA001 {}
//CHINA001
//CHINA001 // -----------------------------------------------------------------------
//CHINA001
//CHINA001 USHORT* __EXPORT ScRightFooterEditPage::GetRanges()
-//CHINA001 { return pPageRightFooterRanges; }
+//CHINA001 { return pPageRightFooterRanges; }
//CHINA001
//CHINA001 // -----------------------------------------------------------------------
//CHINA001
//CHINA001 SfxTabPage* __EXPORT ScRightFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
-//CHINA001 { return ( new ScRightFooterEditPage( pParent, rCoreSet ) ); };
+//CHINA001 { return ( new ScRightFooterEditPage( pParent, rCoreSet ) ); };
//CHINA001
//CHINA001 //========================================================================
//CHINA001 // class ScLeftFooterEditPage
@@ -367,17 +367,17 @@ ScEditWindow* GetScEditWindow ()
//CHINA001 ScLeftFooterEditPage::ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rCoreSet )
//CHINA001 : ScHFEditPage( pParent, RID_SCPAGE_HFED_FL, rCoreSet,
//CHINA001 rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_FOOTERLEFT) )
-//CHINA001 {}
+//CHINA001 {}
//CHINA001
//CHINA001 // -----------------------------------------------------------------------
//CHINA001
//CHINA001 USHORT* __EXPORT ScLeftFooterEditPage::GetRanges()
-//CHINA001 { return pPageLeftFooterRanges; }
+//CHINA001 { return pPageLeftFooterRanges; }
//CHINA001
//CHINA001 // -----------------------------------------------------------------------
//CHINA001
//CHINA001 SfxTabPage* __EXPORT ScLeftFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
-//CHINA001 { return ( new ScLeftFooterEditPage( pParent, rCoreSet ) ); };
+//CHINA001 { return ( new ScLeftFooterEditPage( pParent, rCoreSet ) ); };
//========================================================================
@@ -398,7 +398,7 @@ void lcl_GetFieldData( ScHeaderFieldData& rData )
//========================================================================
ScEditWindow::ScEditWindow( Window* pParent, const ResId& rResId, ScEditWindowLocation eLoc )
- : Control( pParent, rResId ),
+ : Control( pParent, rResId ),
eLocation(eLoc),
pAcc(NULL)
{
@@ -421,10 +421,10 @@ ScEditWindow::ScEditWindow( Window* pParent, const ResId& rResId, ScEditWindowLo
ScHeaderFieldData aData;
lcl_GetFieldData( aData );
- // Feldbefehle:
+ // Feldbefehle:
pEdEngine->SetData( aData );
pEdEngine->SetControlWord( pEdEngine->GetControlWord() | EE_CNTRL_MARKFIELDS );
- mbRTL = ScGlobal::IsSystemRTL();
+ mbRTL = ScGlobal::IsSystemRTL();
if (mbRTL)
pEdEngine->SetDefaultHorizontalTextDirection(EE_HTEXTDIR_R2L);
@@ -462,8 +462,8 @@ void ScEditWindow::SetNumType(SvxNumType eNumType)
EditTextObject* __EXPORT ScEditWindow::CreateTextObject()
{
- // wegen #38841# die Absatzattribute zuruecksetzen
- // (GetAttribs beim Format-Dialog-Aufruf gibt immer gesetzte Items zurueck)
+ // wegen #38841# die Absatzattribute zuruecksetzen
+ // (GetAttribs beim Format-Dialog-Aufruf gibt immer gesetzte Items zurueck)
const SfxItemSet& rEmpty = pEdEngine->GetEmptyItemSet();
USHORT nParCnt = pEdEngine->GetParagraphCount();
@@ -477,15 +477,15 @@ EditTextObject* __EXPORT ScEditWindow::CreateTextObject()
void ScEditWindow::SetFont( const ScPatternAttr& rPattern )
{
- SfxItemSet* pSet = new SfxItemSet( pEdEngine->GetEmptyItemSet() );
+ SfxItemSet* pSet = new SfxItemSet( pEdEngine->GetEmptyItemSet() );
rPattern.FillEditItemSet( pSet );
- // FillEditItemSet adjusts font height to 1/100th mm,
- // but for header/footer twips is needed, as in the PatternAttr:
+ // FillEditItemSet adjusts font height to 1/100th mm,
+ // but for header/footer twips is needed, as in the PatternAttr:
pSet->Put( rPattern.GetItem(ATTR_FONT_HEIGHT), EE_CHAR_FONTHEIGHT );
pSet->Put( rPattern.GetItem(ATTR_CJK_FONT_HEIGHT), EE_CHAR_FONTHEIGHT_CJK );
pSet->Put( rPattern.GetItem(ATTR_CTL_FONT_HEIGHT), EE_CHAR_FONTHEIGHT_CTL );
if (mbRTL)
- pSet->Put( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) );
+ pSet->Put( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) );
pEdEngine->SetDefaults( pSet );
}
@@ -507,11 +507,11 @@ void ScEditWindow::InsertField( const SvxFieldItem& rFld )
void ScEditWindow::SetCharAttriutes()
{
- SfxObjectShell* pDocSh = SfxObjectShell::Current();
+ SfxObjectShell* pDocSh = SfxObjectShell::Current();
- SfxViewShell* pViewSh = SfxViewShell::Current();
+ SfxViewShell* pViewSh = SfxViewShell::Current();
- ScTabViewShell* pTabViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current());
+ ScTabViewShell* pTabViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current());
DBG_ASSERT( pDocSh, "Current DocShell not found" );
@@ -554,7 +554,7 @@ void __EXPORT ScEditWindow::Paint( const Rectangle& rRec )
SetBackground( aBgColor );
- Control::Paint( rRec );
+ Control::Paint( rRec );
pEdView->Paint( rRec );
}
@@ -672,27 +672,27 @@ class ScExtIButton : public ImageButton
{
private:
- Timer aTimer;
- ScPopupMenu* pPopupMenu;
+ Timer aTimer;
+ ScPopupMenu* pPopupMenu;
DECL_LINK( TimerHdl, Timer*);
- void DrawArrow();
+ void DrawArrow();
protected:
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- virtual void MouseButtonUp( const MouseEvent& rMEvt);
+ virtual void MouseButtonDown( const MouseEvent& rMEvt );
+ virtual void MouseButtonUp( const MouseEvent& rMEvt);
- virtual void StartPopup();
+ virtual void StartPopup();
public:
ScExtIButton(Window* pParent, const ResId& rResId );
- void SetPopupMenu(ScPopupMenu* pPopUp);
+ void SetPopupMenu(ScPopupMenu* pPopUp);
- USHORT GetSelected();
+ USHORT GetSelected();
void SetMenuHdl( const Link& rLink ) { aFxLink = rLink; }
const Link& GetMenuHdl() const { return aFxLink; }
@@ -700,14 +700,14 @@ public:
}
*/
ScExtIButton::ScExtIButton(Window* pParent, const ResId& rResId )
-: ImageButton(pParent,rResId),
+: ImageButton(pParent,rResId),
pPopupMenu(NULL)
{
nSelected=0;
aTimer.SetTimeout(600);
SetDropDown( TRUE);
-// DrawArrow();
+// DrawArrow();
}
void ScExtIButton::SetPopupMenu(ScPopupMenu* pPopUp)
@@ -786,8 +786,8 @@ IMPL_LINK( ScExtIButton, TimerHdl, Timer*, EMPTYARG )
static void ImplDrawToolArrow( ToolBox* pBox, long nX, long nY, BOOL bBlack,
BOOL bLeft = FALSE, BOOL bTop = FALSE )
{
- Color aOldFillColor = pBox->GetFillColor();
- WindowAlign eAlign = pBox->meAlign;
+ Color aOldFillColor = pBox->GetFillColor();
+ WindowAlign eAlign = pBox->meAlign;
if ( bLeft )
eAlign = WINDOWALIGN_RIGHT;
else if ( bTop )
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index a2b732464e12..cae675222d68 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +76,14 @@ static USHORT pPageTableRanges[] =
0
};
-BOOL lcl_PutVObjModeItem( USHORT nWhich,
- SfxItemSet& rCoreSet,
- const SfxItemSet& rOldSet,
- const CheckBox& rBtn );
+BOOL lcl_PutVObjModeItem( USHORT nWhich,
+ SfxItemSet& rCoreSet,
+ const SfxItemSet& rOldSet,
+ const CheckBox& rBtn );
-BOOL lcl_PutScaleItem( USHORT nWhich,
- SfxItemSet& rCoreSet,
- const SfxItemSet& rOldSet,
+BOOL lcl_PutScaleItem( USHORT nWhich,
+ SfxItemSet& rCoreSet,
+ const SfxItemSet& rOldSet,
const ListBox& rListBox,
USHORT nLBEntry,
const SpinField& rEd,
@@ -97,22 +97,22 @@ BOOL lcl_PutScaleItem2( USHORT nWhich,
const NumericField& rEd1,
const NumericField& rEd2 );
-BOOL lcl_PutBoolItem( USHORT nWhich,
- SfxItemSet& rCoreSet,
- const SfxItemSet& rOldSet,
- BOOL bIsChecked,
- BOOL bSavedValue );
+BOOL lcl_PutBoolItem( USHORT nWhich,
+ SfxItemSet& rCoreSet,
+ const SfxItemSet& rOldSet,
+ BOOL bIsChecked,
+ BOOL bSavedValue );
//------------------------------------------------------------------------
-#define PAGENO_HDL LINK(this,ScTablePage,PageNoHdl)
-#define PAGEDIR_HDL LINK(this,ScTablePage,PageDirHdl)
-#define SCALE_HDL LINK(this,ScTablePage,ScaleHdl)
+#define PAGENO_HDL LINK(this,ScTablePage,PageNoHdl)
+#define PAGEDIR_HDL LINK(this,ScTablePage,PageDirHdl)
+#define SCALE_HDL LINK(this,ScTablePage,ScaleHdl)
#define WAS_DEFAULT(w,s) (SFX_ITEM_DEFAULT==(s).GetItemState((w),TRUE))
-#define GET_BOOL(sid,set) ((const SfxBoolItem&)((set).Get(GetWhich((sid))))).GetValue()
-#define GET_USHORT(sid,set) (USHORT)((const SfxUInt16Item&)((set).Get(GetWhich((sid))))).GetValue()
-#define GET_SHOW(sid,set) ( ScVObjMode( ((const ScViewObjectModeItem&)((set).Get(GetWhich((sid))))).GetValue() ) \
+#define GET_BOOL(sid,set) ((const SfxBoolItem&)((set).Get(GetWhich((sid))))).GetValue()
+#define GET_USHORT(sid,set) (USHORT)((const SfxUInt16Item&)((set).Get(GetWhich((sid))))).GetValue()
+#define GET_SHOW(sid,set) ( ScVObjMode( ((const ScViewObjectModeItem&)((set).Get(GetWhich((sid))))).GetValue() ) \
== VOBJ_MODE_SHOW )
//========================================================================
@@ -122,29 +122,29 @@ ScTablePage::ScTablePage( Window* pParent, const SfxItemSet& rCoreAttrs ) :
SfxTabPage( pParent, ScResId( RID_SCPAGE_TABLE ), rCoreAttrs ),
aFlPageDir ( this, ScResId( FL_PAGEDIR ) ),
- aBtnTopDown ( this, ScResId( BTN_TOPDOWN ) ),
- aBtnLeftRight ( this, ScResId( BTN_LEFTRIGHT ) ),
- aBmpPageDir ( this, ScResId( BMP_PAGEDIR ) ),
- aImgLeftRight ( ScResId( IMG_LEFTRIGHT ) ),
- aImgTopDown ( ScResId( IMG_TOPDOWN ) ),
+ aBtnTopDown ( this, ScResId( BTN_TOPDOWN ) ),
+ aBtnLeftRight ( this, ScResId( BTN_LEFTRIGHT ) ),
+ aBmpPageDir ( this, ScResId( BMP_PAGEDIR ) ),
+ aImgLeftRight ( ScResId( IMG_LEFTRIGHT ) ),
+ aImgTopDown ( ScResId( IMG_TOPDOWN ) ),
aImgLeftRightHC ( ScResId( IMG_LEFTRIGHT_H ) ),
aImgTopDownHC ( ScResId( IMG_TOPDOWN_H ) ),
- aBtnPageNo ( this, ScResId( BTN_PAGENO ) ),
- aEdPageNo ( this, ScResId( ED_PAGENO ) ),
+ aBtnPageNo ( this, ScResId( BTN_PAGENO ) ),
+ aEdPageNo ( this, ScResId( ED_PAGENO ) ),
aFlPrint ( this, ScResId( FL_PRINT ) ),
- aBtnHeaders ( this, ScResId( BTN_HEADER ) ),
- aBtnGrid ( this, ScResId( BTN_GRID ) ),
- aBtnNotes ( this, ScResId( BTN_NOTES ) ),
- aBtnObjects ( this, ScResId( BTN_OBJECTS ) ),
- aBtnCharts ( this, ScResId( BTN_CHARTS ) ),
- aBtnDrawings ( this, ScResId( BTN_DRAWINGS ) ),
- aBtnFormulas ( this, ScResId( BTN_FORMULAS ) ),
- aBtnNullVals ( this, ScResId( BTN_NULLVALS ) ),
+ aBtnHeaders ( this, ScResId( BTN_HEADER ) ),
+ aBtnGrid ( this, ScResId( BTN_GRID ) ),
+ aBtnNotes ( this, ScResId( BTN_NOTES ) ),
+ aBtnObjects ( this, ScResId( BTN_OBJECTS ) ),
+ aBtnCharts ( this, ScResId( BTN_CHARTS ) ),
+ aBtnDrawings ( this, ScResId( BTN_DRAWINGS ) ),
+ aBtnFormulas ( this, ScResId( BTN_FORMULAS ) ),
+ aBtnNullVals ( this, ScResId( BTN_NULLVALS ) ),
aFlScale ( this, ScResId( FL_SCALE ) ),
aFtScaleMode ( this, ScResId( FT_SCALEMODE ) ),
aLbScaleMode ( this, ScResId( LB_SCALEMODE ) ),
aFtScaleAll ( this, ScResId( FT_SCALEFACTOR ) ),
- aEdScaleAll ( this, ScResId( ED_SCALEALL ) ),
+ aEdScaleAll ( this, ScResId( ED_SCALEALL ) ),
aFtScalePageWidth ( this, ScResId( FT_SCALEPAGEWIDTH ) ),
aEdScalePageWidth ( this, ScResId( ED_SCALEPAGEWIDTH ) ),
aFtScalePageHeight ( this, ScResId( FT_SCALEPAGEHEIGHT ) ),
@@ -199,19 +199,19 @@ SfxTabPage* ScTablePage::Create( Window* pParent, const SfxItemSet& rCoreSet )
void ScTablePage::Reset( const SfxItemSet& rCoreSet )
{
- BOOL bTopDown = GET_BOOL( SID_SCATTR_PAGE_TOPDOWN, rCoreSet );
- USHORT nWhich = 0;
+ BOOL bTopDown = GET_BOOL( SID_SCATTR_PAGE_TOPDOWN, rCoreSet );
+ USHORT nWhich = 0;
//-----------
// BOOL-Flags
//-----------
- aBtnNotes .Check( GET_BOOL(SID_SCATTR_PAGE_NOTES,rCoreSet) );
- aBtnGrid .Check( GET_BOOL(SID_SCATTR_PAGE_GRID,rCoreSet) );
- aBtnHeaders .Check( GET_BOOL(SID_SCATTR_PAGE_HEADERS,rCoreSet) );
- aBtnFormulas .Check( GET_BOOL(SID_SCATTR_PAGE_FORMULAS,rCoreSet) );
- aBtnNullVals .Check( GET_BOOL(SID_SCATTR_PAGE_NULLVALS,rCoreSet) );
- aBtnTopDown .Check( bTopDown );
- aBtnLeftRight .Check( !bTopDown );
+ aBtnNotes .Check( GET_BOOL(SID_SCATTR_PAGE_NOTES,rCoreSet) );
+ aBtnGrid .Check( GET_BOOL(SID_SCATTR_PAGE_GRID,rCoreSet) );
+ aBtnHeaders .Check( GET_BOOL(SID_SCATTR_PAGE_HEADERS,rCoreSet) );
+ aBtnFormulas .Check( GET_BOOL(SID_SCATTR_PAGE_FORMULAS,rCoreSet) );
+ aBtnNullVals .Check( GET_BOOL(SID_SCATTR_PAGE_NULLVALS,rCoreSet) );
+ aBtnTopDown .Check( bTopDown );
+ aBtnLeftRight .Check( !bTopDown );
//------------------
// Erste Druckseite:
@@ -224,9 +224,9 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet )
//-------------------
// Objektdarstellung:
//-------------------
- aBtnCharts .Check( GET_SHOW( SID_SCATTR_PAGE_CHARTS, rCoreSet ) );
- aBtnObjects .Check( GET_SHOW( SID_SCATTR_PAGE_OBJECTS, rCoreSet ) );
- aBtnDrawings .Check( GET_SHOW( SID_SCATTR_PAGE_DRAWINGS, rCoreSet ) );
+ aBtnCharts .Check( GET_SHOW( SID_SCATTR_PAGE_CHARTS, rCoreSet ) );
+ aBtnObjects .Check( GET_SHOW( SID_SCATTR_PAGE_OBJECTS, rCoreSet ) );
+ aBtnDrawings .Check( GET_SHOW( SID_SCATTR_PAGE_DRAWINGS, rCoreSet ) );
//------------
// Skalierung:
@@ -278,32 +278,32 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet )
ScaleHdl( NULL );
// merken fuer FillItemSet
- aBtnFormulas .SaveValue();
- aBtnNullVals .SaveValue();
- aBtnNotes .SaveValue();
- aBtnGrid .SaveValue();
- aBtnHeaders .SaveValue();
- aBtnTopDown .SaveValue();
- aBtnLeftRight .SaveValue();
+ aBtnFormulas .SaveValue();
+ aBtnNullVals .SaveValue();
+ aBtnNotes .SaveValue();
+ aBtnGrid .SaveValue();
+ aBtnHeaders .SaveValue();
+ aBtnTopDown .SaveValue();
+ aBtnLeftRight .SaveValue();
aLbScaleMode .SaveValue();
- aBtnCharts .SaveValue();
- aBtnObjects .SaveValue();
- aBtnDrawings .SaveValue();
- aBtnPageNo .SaveValue();
- aEdPageNo .SaveValue();
- aEdScaleAll .SaveValue();
+ aBtnCharts .SaveValue();
+ aBtnObjects .SaveValue();
+ aBtnDrawings .SaveValue();
+ aBtnPageNo .SaveValue();
+ aEdPageNo .SaveValue();
+ aEdScaleAll .SaveValue();
aEdScalePageWidth.SaveValue();
aEdScalePageHeight.SaveValue();
- aEdScalePageNum .SaveValue();
+ aEdScalePageNum .SaveValue();
}
// -----------------------------------------------------------------------
BOOL ScTablePage::FillItemSet( SfxItemSet& rCoreSet )
{
- const SfxItemSet& rOldSet = GetItemSet();
- USHORT nWhichPageNo = GetWhich(SID_SCATTR_PAGE_FIRSTPAGENO);
- BOOL bDataChanged = FALSE;
+ const SfxItemSet& rOldSet = GetItemSet();
+ USHORT nWhichPageNo = GetWhich(SID_SCATTR_PAGE_FIRSTPAGENO);
+ BOOL bDataChanged = FALSE;
//-----------
// BOOL-Flags
@@ -345,7 +345,7 @@ BOOL ScTablePage::FillItemSet( SfxItemSet& rCoreSet )
BOOL bUseValue = aBtnPageNo.IsChecked();
if ( WAS_DEFAULT(nWhichPageNo,rOldSet)
- && ( (!bUseValue && bUseValue == aBtnPageNo.GetSavedValue())
+ && ( (!bUseValue && bUseValue == aBtnPageNo.GetSavedValue())
|| ( bUseValue && bUseValue == aBtnPageNo.GetSavedValue()
&& aEdPageNo.GetText() == aEdPageNo.GetSavedValue() ) ) )
{
@@ -475,11 +475,11 @@ IMPL_LINK( ScTablePage, ScaleHdl, ListBox*, EMPTYARG )
// Hilfsfunktionen fuer FillItemSet:
//========================================================================
-BOOL lcl_PutBoolItem( USHORT nWhich,
- SfxItemSet& rCoreSet,
- const SfxItemSet& rOldSet,
- BOOL bIsChecked,
- BOOL bSavedValue )
+BOOL lcl_PutBoolItem( USHORT nWhich,
+ SfxItemSet& rCoreSet,
+ const SfxItemSet& rOldSet,
+ BOOL bIsChecked,
+ BOOL bSavedValue )
{
BOOL bDataChanged = ( bSavedValue == bIsChecked
&& WAS_DEFAULT(nWhich,rOldSet) );
@@ -494,10 +494,10 @@ BOOL lcl_PutBoolItem( USHORT nWhich,
//------------------------------------------------------------------------
-BOOL lcl_PutVObjModeItem( USHORT nWhich,
- SfxItemSet& rCoreSet,
- const SfxItemSet& rOldSet,
- const CheckBox& rBtn )
+BOOL lcl_PutVObjModeItem( USHORT nWhich,
+ SfxItemSet& rCoreSet,
+ const SfxItemSet& rOldSet,
+ const CheckBox& rBtn )
{
BOOL bIsChecked = rBtn.IsChecked();
BOOL bDataChanged = ( rBtn.GetSavedValue() == bIsChecked
@@ -515,9 +515,9 @@ BOOL lcl_PutVObjModeItem( USHORT nWhich,
//------------------------------------------------------------------------
-BOOL lcl_PutScaleItem( USHORT nWhich,
- SfxItemSet& rCoreSet,
- const SfxItemSet& rOldSet,
+BOOL lcl_PutScaleItem( USHORT nWhich,
+ SfxItemSet& rCoreSet,
+ const SfxItemSet& rOldSet,
const ListBox& rListBox,
USHORT nLBEntry,
const SpinField& rEd,
diff --git a/sc/source/ui/src/attrdlg.src b/sc/source/ui/src/attrdlg.src
index ae130f7e8a96..14a53e12f123 100644
--- a/sc/source/ui/src/attrdlg.src
+++ b/sc/source/ui/src/attrdlg.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/source/ui/src/autofmt.src b/sc/source/ui/src/autofmt.src
index cb56f6ac85a4..7f0c156a1f9a 100644
--- a/sc/source/ui/src/autofmt.src
+++ b/sc/source/ui/src/autofmt.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/source/ui/src/condfrmt.src b/sc/source/ui/src/condfrmt.src
index 3018cc867e0d..18b08117cfe6 100644
--- a/sc/source/ui/src/condfrmt.src
+++ b/sc/source/ui/src/condfrmt.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/source/ui/src/crnrdlg.src b/sc/source/ui/src/crnrdlg.src
index b16a3506bf7b..f4811bd63cb8 100644
--- a/sc/source/ui/src/crnrdlg.src
+++ b/sc/source/ui/src/crnrdlg.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 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES
Size = MAP_APPFONT ( 256 , 181 ) ;
HelpId = HID_COLROWNAMERANGES ;
Moveable = TRUE ;
- // Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button !
+ // Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button !
FixedLine FL_ASSIGN
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/sc/source/ui/src/dbnamdlg.src b/sc/source/ui/src/dbnamdlg.src
index 50152d95d9d5..c5ff35bc42d6 100644
--- a/sc/source/ui/src/dbnamdlg.src
+++ b/sc/source/ui/src/dbnamdlg.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
@@ -34,7 +34,7 @@ ModelessDialog RID_SCDLG_DBNAMES
Size = MAP_APPFONT ( 222 , 142 ) ;
Text [ en-US ] = "Define Database Range" ;
Moveable = TRUE ;
- // Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button !
+ // Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button !
FixedLine FL_NAME
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/sc/source/ui/src/filter.src b/sc/source/ui/src/filter.src
index 52ce38db1516..a1338638682a 100644
--- a/sc/source/ui/src/filter.src
+++ b/sc/source/ui/src/filter.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/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 6c15762bda6a..37f0d314eaa5 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.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/source/ui/src/hdrcont.src b/sc/source/ui/src/hdrcont.src
index e4a82d38ec98..da3f5b6e1412 100644
--- a/sc/source/ui/src/hdrcont.src
+++ b/sc/source/ui/src/hdrcont.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/source/ui/src/miscdlgs.src b/sc/source/ui/src/miscdlgs.src
index 6d4761c8589c..8f2dc9c2f0e3 100644
--- a/sc/source/ui/src/miscdlgs.src
+++ b/sc/source/ui/src/miscdlgs.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
@@ -662,7 +662,7 @@ ModalDialog RID_SCDLG_MTRINPUT
};
MetricField ED_VALUE
{
- // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
+ // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
HelpId = HID_SC_MTRIN_VAL ;
Border = TRUE ;
Pos = MAP_APPFONT ( 70 , 6 ) ;
@@ -673,7 +673,7 @@ ModalDialog RID_SCDLG_MTRINPUT
};
CheckBox BTN_DEFVAL
{
- // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
+ // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
TabStop = TRUE ;
Pos = MAP_APPFONT ( 70 , 24 ) ;
Size = MAP_APPFONT ( 58 , 10 ) ;
@@ -728,7 +728,7 @@ ModalDialog RID_SCDLG_COL_MAN
};
CheckBox BTN_DEFVAL
{
- // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
+ // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
TabStop = TRUE ;
Pos = MAP_APPFONT ( 70 , 24 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
@@ -773,7 +773,7 @@ ModalDialog RID_SCDLG_COL_OPT
};
MetricField ED_VALUE
{
- // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
+ // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
Border = TRUE ;
Pos = MAP_APPFONT ( 70 , 6 ) ;
Size = MAP_APPFONT ( 70 , 12 ) ;
@@ -783,7 +783,7 @@ ModalDialog RID_SCDLG_COL_OPT
};
CheckBox BTN_DEFVAL
{
- // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
+ // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
TabStop = TRUE ;
Pos = MAP_APPFONT ( 70 , 24 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
@@ -828,7 +828,7 @@ ModalDialog RID_SCDLG_ROW_MAN
};
MetricField ED_VALUE
{
- // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
+ // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
Border = TRUE ;
Pos = MAP_APPFONT ( 70 , 6 ) ;
Size = MAP_APPFONT ( 70 , 12 ) ;
@@ -838,7 +838,7 @@ ModalDialog RID_SCDLG_ROW_MAN
};
CheckBox BTN_DEFVAL
{
- // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
+ // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
TabStop = TRUE ;
Pos = MAP_APPFONT ( 70 , 24 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
@@ -892,7 +892,7 @@ ModalDialog RID_SCDLG_ROW_OPT
};
CheckBox BTN_DEFVAL
{
- // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
+ // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
TabStop = TRUE ;
Pos = MAP_APPFONT ( 70 , 24 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
@@ -901,8 +901,8 @@ ModalDialog RID_SCDLG_ROW_OPT
};
- // RID_SCDLG_SELENTRY als Basis fuer RID_SCDLG_SELECTDB und RID_SCDLG_SHOW_TAB
- // gibt es nicht mehr, weil die beiden jetzt unterschiedlich sind
+ // RID_SCDLG_SELENTRY als Basis fuer RID_SCDLG_SELECTDB und RID_SCDLG_SHOW_TAB
+ // gibt es nicht mehr, weil die beiden jetzt unterschiedlich sind
ModalDialog RID_SCDLG_SELECTDB
{
@@ -934,7 +934,7 @@ ModalDialog RID_SCDLG_SELECTDB
};
ListBox LB_ENTRYLIST
{
- // HelpID aus Zeiten, als noch abgeleitet wurde
+ // HelpID aus Zeiten, als noch abgeleitet wurde
HelpId = HID_SC_SELENTRY_LIST ;
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 14 ) ;
@@ -1216,7 +1216,7 @@ ModalDialog RID_SCDLG_GROUP
};
RadioButton BTN_GROUP_ROWS
{
- // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
+ // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
HelpId = HID_SC_GROUP_ROWS ;
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 71 , 10 ) ;
@@ -1225,7 +1225,7 @@ ModalDialog RID_SCDLG_GROUP
};
RadioButton BTN_GROUP_COLS
{
- // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
+ // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen
HelpId = HID_SC_GROUP_COLS ;
Pos = MAP_APPFONT ( 12 , 28 ) ;
Size = MAP_APPFONT ( 71 , 10 ) ;
@@ -1249,11 +1249,11 @@ ModalDialog RID_SCDLG_GROUP
Text [ en-US ] = "Group" ;
};
- // Ableitungen
+ // Ableitungen
ModalDialog RID_SCDLG_GRP_MAKE < RID_SCDLG_GROUP { HelpId = SID_OUTLINE_MAKE ; };
ModalDialog RID_SCDLG_GRP_KILL < RID_SCDLG_GROUP { HelpId = SID_OUTLINE_REMOVE ; };
- // RID_SCDLG_COLORROW wird nur in der Optionen-Sortierlisten-Seite benutzt
+ // RID_SCDLG_COLORROW wird nur in der Optionen-Sortierlisten-Seite benutzt
ModalDialog RID_SCDLG_COLORROW
{
diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src
index 38e1271b2959..51ad9f1d4f78 100644
--- a/sc/source/ui/src/namedlg.src
+++ b/sc/source/ui/src/namedlg.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
@@ -35,7 +35,7 @@ ModelessDialog RID_SCDLG_NAMES
Size = MAP_APPFONT ( 222 , 142 ) ;
Text [ en-US ] = "Define Names" ;
Moveable = TRUE ;
- // Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button !
+ // Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button !
OKButton BTN_OK
{
Pos = MAP_APPFONT ( 166 , 6 ) ;
diff --git a/sc/source/ui/src/opredlin.src b/sc/source/ui/src/opredlin.src
index a8c2daf4892a..34813be0f786 100644
--- a/sc/source/ui/src/opredlin.src
+++ b/sc/source/ui/src/opredlin.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/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index 4c64e312bc2d..959a21cac2ec 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.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
@@ -635,7 +635,7 @@ TabPage RID_SCPAGE_LAYOUT
Size = MAP_APPFONT ( 60 , 60 ) ;
Border = TRUE ;
DropDown = TRUE ;
- // Reihenfolge der Strings wie enum ScDirection
+ // Reihenfolge der Strings wie enum ScDirection
StringList [ en-US ] =
{
< "Down" ; Default ; > ;
diff --git a/sc/source/ui/src/optsolver.src b/sc/source/ui/src/optsolver.src
index 2fc5cf3a3c54..28ca5ae9afec 100644
--- a/sc/source/ui/src/optsolver.src
+++ b/sc/source/ui/src/optsolver.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/source/ui/src/popup.src b/sc/source/ui/src/popup.src
index 9753aa1590e3..a4f96b4e8969 100644
--- a/sc/source/ui/src/popup.src
+++ b/sc/source/ui/src/popup.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/source/ui/src/pseudo.src b/sc/source/ui/src/pseudo.src
index e3d27edf0ecb..589520ee1eb5 100644
--- a/sc/source/ui/src/pseudo.src
+++ b/sc/source/ui/src/pseudo.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/source/ui/src/sc.src b/sc/source/ui/src/sc.src
index dae422e15cd0..4fa37b2dab91 100644
--- a/sc/source/ui/src/sc.src
+++ b/sc/source/ui/src/sc.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/source/ui/src/scerrors.src b/sc/source/ui/src/scerrors.src
index bdb76b2b710c..e28dde2f9b8c 100644
--- a/sc/source/ui/src/scerrors.src
+++ b/sc/source/ui/src/scerrors.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/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 2f5a2d8c88fb..610c1f4b782b 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.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
@@ -72,7 +72,7 @@
*/
// Hack:
-#define U2S(x) ((x)-HID_START)
+#define U2S(x) ((x)-HID_START)
// Macro U2S: unsigned to signed
// is needed because the resource compiler only knows signed short int in
// ExtraData, but the HID_XXX are unsigned and exceed 32k. Code reading the
@@ -95,7 +95,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATABASE;
U2S( HID_FUNC_DBANZAHL );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -135,7 +135,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATABASE;
U2S( HID_FUNC_DBANZAHL2 );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -175,7 +175,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATABASE;
U2S( HID_FUNC_DBMITTELWERT );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -215,7 +215,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATABASE;
U2S( HID_FUNC_DBAUSZUG );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -255,7 +255,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATABASE;
U2S( HID_FUNC_DBMAX );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -295,7 +295,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATABASE;
U2S( HID_FUNC_DBMIN );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -335,7 +335,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATABASE;
U2S( HID_FUNC_DBPRODUKT );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -375,7 +375,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATABASE;
U2S( HID_FUNC_DBSTDABW );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -415,7 +415,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATABASE;
U2S( HID_FUNC_DBSTDABWN );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -455,7 +455,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATABASE;
U2S( HID_FUNC_DBSUMME );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -495,7 +495,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATABASE;
U2S( HID_FUNC_DBVARIANZ );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -535,7 +535,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATABASE;
U2S( HID_FUNC_DBVARIANZEN );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -575,7 +575,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATETIME;
U2S( HID_FUNC_DATUM );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -615,7 +615,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATETIME;
U2S( HID_FUNC_DATWERT );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -639,7 +639,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATETIME;
U2S( HID_FUNC_TAG );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -663,7 +663,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATETIME;
U2S( HID_FUNC_TAGE360 );
- 3; 0; 0; 1;
+ 3; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -703,7 +703,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATETIME;
U2S( HID_FUNC_STUNDE );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -727,7 +727,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATETIME;
U2S( HID_FUNC_MINUTE );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -751,7 +751,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATETIME;
U2S( HID_FUNC_MONAT );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -791,7 +791,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATETIME;
U2S( HID_FUNC_SEKUNDE );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -815,7 +815,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATETIME;
U2S( HID_FUNC_ZEIT );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -855,7 +855,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATETIME;
U2S( HID_FUNC_ZEITWERT );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -895,7 +895,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATETIME;
U2S( HID_FUNC_WOCHENTAG );
- 2; 0; 1;
+ 2; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -927,7 +927,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATETIME;
U2S( HID_FUNC_JAHR );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -951,7 +951,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATETIME;
U2S( HID_FUNC_TAGE );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -983,7 +983,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATETIME;
U2S( HID_FUNC_KALENDERWOCHE );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -1015,7 +1015,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_DATETIME;
U2S( HID_FUNC_OSTERSONNTAG );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -1039,7 +1039,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_BW );
- 5; 0; 0; 0; 1; 1;
+ 5; 0; 0; 0; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -1095,7 +1095,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_ZW );
- 5; 0; 0; 0; 1; 1;
+ 5; 0; 0; 0; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -1151,7 +1151,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_ZZR );
- 5; 0; 0; 0; 1; 1;
+ 5; 0; 0; 0; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -1207,7 +1207,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_RMZ );
- 5; 0; 0; 0; 1; 1;
+ 5; 0; 0; 0; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -1263,7 +1263,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_ZINS );
- 6; 0; 0; 0; 1; 1; 1;
+ 6; 0; 0; 0; 1; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -1327,7 +1327,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_ZINSZ );
- 6; 0; 0; 0; 0; 1; 1;
+ 6; 0; 0; 0; 0; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -1391,7 +1391,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_KAPZ );
- 6; 0; 0; 0; 0; 1; 1;
+ 6; 0; 0; 0; 0; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -1455,7 +1455,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_KUMKAPITAL );
- 6; 0; 0; 0; 0; 0; 0;
+ 6; 0; 0; 0; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -1519,7 +1519,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_KUMZINSZ );
- 6; 0; 0; 0; 0; 0; 0;
+ 6; 0; 0; 0; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -1583,7 +1583,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_DIA );
- 4; 0; 0; 0; 0;
+ 4; 0; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -1631,7 +1631,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_LIA );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -1671,7 +1671,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_GDA );
- 5; 0; 0; 0; 0; 1;
+ 5; 0; 0; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -1727,7 +1727,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_GDA2 );
- 5; 0; 0; 0; 0; 1;
+ 5; 0; 0; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -1783,7 +1783,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_VDB );
- 7; 0; 0; 0; 0; 0; 1; 1;
+ 7; 0; 0; 0; 0; 0; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -1855,7 +1855,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_EFFEKTIV );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -1887,7 +1887,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_NOMINAL );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -1919,7 +1919,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_NBW );
- VAR_ARGS+1; 0; 0;
+ VAR_ARGS+1; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -1951,7 +1951,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_IKV );
- 2; 0; 1;
+ 2; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -1983,7 +1983,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_QIKV );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2023,7 +2023,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_ISPMT );
- 4; 0; 0; 0; 0;
+ 4; 0; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2071,7 +2071,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_LAUFZEIT );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2111,7 +2111,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_FINANZ;
U2S( HID_FUNC_ZGZ );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2151,7 +2151,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_INFO;
U2S( HID_FUNC_ISTBEZUG );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2175,7 +2175,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_INFO;
U2S( HID_FUNC_ISTFEHL );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2199,7 +2199,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_INFO;
U2S( HID_FUNC_ISTFEHLER );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2223,7 +2223,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_INFO;
U2S( HID_FUNC_ISTLEER );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2247,7 +2247,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_INFO;
U2S( HID_FUNC_ISTLOG );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2271,7 +2271,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_INFO;
U2S( HID_FUNC_ISTNV );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2295,7 +2295,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_INFO;
U2S( HID_FUNC_ISTKTEXT );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2319,7 +2319,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_INFO;
U2S( HID_FUNC_ISTTEXT );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2343,7 +2343,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_INFO;
U2S( HID_FUNC_ISTZAHL );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2367,7 +2367,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_INFO;
U2S( HID_FUNC_ISTFORMEL );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2391,7 +2391,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_INFO;
U2S( HID_FUNC_FORMEL );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2415,7 +2415,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_INFO;
U2S( HID_FUNC_N );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2455,7 +2455,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_INFO;
U2S( HID_FUNC_TYP );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2479,7 +2479,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_INFO;
U2S( HID_FUNC_ZELLE );
- 2; 0; 1;
+ 2; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -2543,7 +2543,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_LOGIC;
U2S( HID_FUNC_NICHT );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2583,7 +2583,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_LOGIC;
U2S( HID_FUNC_WENN );
- 3; 0; 1; 1;
+ 3; 0; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -2623,7 +2623,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_LOGIC;
U2S( HID_FUNC_ODER );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2647,7 +2647,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_LOGIC;
U2S( HID_FUNC_UND );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2671,7 +2671,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_ABS );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2695,7 +2695,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_POTENZ );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2727,7 +2727,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_ANZAHLLEEREZELLEN );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2767,7 +2767,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_SUMME );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2791,7 +2791,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_QUADRATESUMME );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2815,7 +2815,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_PRODUKT );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2839,7 +2839,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_SUMMEWENN );
- 3; 0; 0; 1;
+ 3; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -2879,7 +2879,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_ZAEHLENWENN );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2911,7 +2911,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_WURZEL );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2951,7 +2951,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_ISTGERADE );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2975,7 +2975,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_ISTUNGERADE );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -2999,7 +2999,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_KOMBINATIONEN );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3031,7 +3031,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_KOMBINATIONEN2 );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3063,7 +3063,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_ARCCOS );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3087,7 +3087,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_ARCSIN );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3111,7 +3111,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_ARCOSHYP );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3135,7 +3135,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_ARSINHYP );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3159,7 +3159,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_ARCCOT );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3183,7 +3183,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_ARCTAN );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3207,7 +3207,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_ARCOTHYP );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3231,7 +3231,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_ARTANHYP );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3255,7 +3255,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_COS );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3279,7 +3279,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_SIN );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3303,7 +3303,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_COT );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3327,7 +3327,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_TAN );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3351,7 +3351,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_COSHYP );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3375,7 +3375,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_SINHYP );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3399,7 +3399,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_COTHYP );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3423,7 +3423,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_TANHYP );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3447,7 +3447,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_ARCTAN2 );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3479,7 +3479,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_DEG );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3503,7 +3503,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_RAD );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3527,7 +3527,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_EXP );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3551,7 +3551,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_LOG );
- 2; 0; 1;
+ 2; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -3583,7 +3583,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_LN );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3607,7 +3607,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_LOG10 );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3631,7 +3631,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_FAKULTAET );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3655,7 +3655,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_REST );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3687,7 +3687,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_VORZEICHEN );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3711,7 +3711,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_TEILERGEBNIS );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3743,7 +3743,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_GANZZAHL );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3767,7 +3767,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_KUERZEN );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3799,7 +3799,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_RUNDEN );
- 2; 0; 1;
+ 2; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -3831,7 +3831,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_AUFRUNDEN );
- 2; 0; 1;
+ 2; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -3863,7 +3863,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_ABRUNDEN );
- 2; 0; 1;
+ 2; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -3895,7 +3895,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_GERADE );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3919,7 +3919,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_UNGERADE );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -3943,7 +3943,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_OBERGRENZE );
- 3; 0; 0; 1;
+ 3; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -3983,7 +3983,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_UNTERGRENZE );
- 3; 0; 0; 1;
+ 3; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -4023,7 +4023,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_GGT );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4047,7 +4047,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_KGV );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4071,7 +4071,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATRIX;
U2S( HID_FUNC_MTRANS );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4095,7 +4095,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATRIX;
U2S( HID_FUNC_MMULT );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4127,7 +4127,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATRIX;
U2S( HID_FUNC_MDET );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4151,7 +4151,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATRIX;
U2S( HID_FUNC_MINV );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4175,7 +4175,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATRIX;
U2S( HID_FUNC_EINHEITSMATRIX );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4199,7 +4199,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATRIX;
U2S( HID_FUNC_SUMMENPRODUKT );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4223,7 +4223,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATRIX;
U2S( HID_FUNC_SUMMEX2MY2 );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4255,7 +4255,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATRIX;
U2S( HID_FUNC_SUMMEX2PY2 );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4287,7 +4287,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
0;
ID_FUNCTION_GRP_MATRIX;
U2S( HID_FUNC_SUMMEXMY2 );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4323,7 +4323,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_MATRIX;
U2S( HID_FUNC_HAEUFIGKEIT );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4355,7 +4355,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_MATRIX;
U2S( HID_FUNC_RGP );
- 4; 0; 1; 1; 1;
+ 4; 0; 1; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -4403,7 +4403,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_MATRIX;
U2S( HID_FUNC_RKP );
- 4; 0; 1; 1; 1;
+ 4; 0; 1; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -4451,7 +4451,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_MATRIX;
U2S( HID_FUNC_TREND );
- 4; 0; 1; 1; 1;
+ 4; 0; 1; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -4499,7 +4499,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_MATRIX;
U2S( HID_FUNC_VARIATION );
- 4; 0; 1; 1; 1;
+ 4; 0; 1; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -4547,7 +4547,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_ANZAHL );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4571,7 +4571,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_ANZAHL2 );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4595,7 +4595,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_MAX );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4619,7 +4619,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_MAXA );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4643,7 +4643,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_MIN );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4667,7 +4667,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_MINA );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4691,7 +4691,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_VARIANZ );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4715,7 +4715,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_VARIANZA );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4739,7 +4739,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_VARIANZEN );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4763,7 +4763,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_VARIANZENA );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4787,7 +4787,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_STABW );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4811,7 +4811,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_STABWA );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4835,7 +4835,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_STABWN );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4859,7 +4859,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_STABWNA );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4883,7 +4883,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_MITTELWERT );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4907,7 +4907,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_MITTELWERTA );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4931,7 +4931,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_SUMQUADABW );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4955,7 +4955,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_MITTELABW );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -4979,7 +4979,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_SCHIEFE );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5003,7 +5003,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_KURT );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5027,7 +5027,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_GEOMITTEL );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5051,7 +5051,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_HARMITTEL );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5075,7 +5075,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_MODALWERT );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5099,7 +5099,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_MEDIAN );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5123,7 +5123,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_QUANTIL );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5155,7 +5155,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_QUARTILE );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5187,7 +5187,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_KGROESSTE );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5219,7 +5219,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_KKLEINSTE );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5251,7 +5251,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_QUANTILSRANG );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5283,7 +5283,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_RANG );
- 3; 0; 0; 1;
+ 3; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -5323,7 +5323,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_GESTUTZTMITTEL );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5355,7 +5355,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_WAHRSCHBEREICH );
- 4; 0; 0; 0; 1;
+ 4; 0; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -5403,7 +5403,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_B );
- 4; 0; 0; 0; 1;
+ 4; 0; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -5451,7 +5451,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_PHI );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5475,7 +5475,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_GAUSS );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5499,7 +5499,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_FISHER );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5523,7 +5523,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_FISHERINV );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5547,7 +5547,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_BINOMVERT );
- 4; 0; 0; 0; 0;
+ 4; 0; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5595,7 +5595,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_NEGBINOMVERT );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5635,7 +5635,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_KRITBINOM );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5675,7 +5675,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_POISSON );
- 3; 0; 0; 1;
+ 3; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -5715,7 +5715,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_NORMVERT );
- 4; 0; 0; 0; 1;
+ 4; 0; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -5763,7 +5763,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_NORMINV );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5803,7 +5803,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_STANDNORMVERT );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5827,7 +5827,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_STANDNORMINV );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5851,7 +5851,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_LOGNORMVERT );
- 4; 0; 1; 1; 1;
+ 4; 0; 1; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -5899,7 +5899,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_LOGINV );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5939,7 +5939,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_EXPONVERT );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -5979,7 +5979,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_GAMMAVERT );
- 4; 0; 0; 0; 1;
+ 4; 0; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -6027,7 +6027,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_GAMMAINV );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -6067,7 +6067,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_GAMMALN );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -6079,7 +6079,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
Text [ en-US ] = "The value for which the natural logarithm of the gamma function is to be calculated." ;
};
};
-
+
// -=*# Resource for function GAMMA #*=-
Resource SC_OPCODE_GAMMA
{
@@ -6181,7 +6181,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_BETAINV );
- 5; 0; 0; 0; 1; 1;
+ 5; 0; 0; 0; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -6237,7 +6237,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_WEIBULL );
- 4; 0; 0; 0; 0;
+ 4; 0; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -6285,7 +6285,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_HYPGEOMVERT );
- 4; 0; 0; 0; 0;
+ 4; 0; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -6333,7 +6333,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_TVERT );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -6373,7 +6373,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_TINV );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -6405,7 +6405,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_FVERT );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -6445,7 +6445,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_FINV );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -6485,7 +6485,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_CHIVERT );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -6560,7 +6560,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_CHIINV );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -6626,7 +6626,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_STANDARDISIERUNG );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -6666,7 +6666,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_VARIATIONEN );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -6698,7 +6698,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_VARIATIONEN2 );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -6730,7 +6730,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_KONFIDENZ );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -6770,7 +6770,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_GTEST );
- 3; 0; 0; 1;
+ 3; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -6810,7 +6810,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_CHITEST );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -6842,7 +6842,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_FTEST );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -6874,7 +6874,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_TTEST );
- 4; 0; 0; 0; 0;
+ 4; 0; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -6922,7 +6922,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_BESTIMMTHEITSMASS );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -6954,7 +6954,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_ACHSENABSCHNITT );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -6986,7 +6986,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_STEIGUNG );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -7018,7 +7018,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_STFEHLERYX );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -7050,7 +7050,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_PEARSON );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -7082,7 +7082,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_KORREL );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -7114,7 +7114,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_KOVAR );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -7146,7 +7146,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_SCHAETZER );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -7186,7 +7186,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_ADRESSE );
- 5; 0; 0; 1; 1; 1;
+ 5; 0; 0; 1; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -7244,7 +7244,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_BEREICHE );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -7268,7 +7268,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_WAHL );
- VAR_ARGS+1; 0; 0;
+ VAR_ARGS+1; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -7300,7 +7300,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_SPALTE );
- 1; 1;
+ 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -7324,7 +7324,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_ZEILE );
- 1; 1;
+ 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -7348,7 +7348,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_TABELLE );
- 1; 1;
+ 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -7372,7 +7372,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_SPALTEN );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -7396,7 +7396,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_ZEILEN );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -7420,7 +7420,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_TABELLEN );
- 1; 1;
+ 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -7444,7 +7444,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_WVERWEIS );
- 4; 0; 0; 0; 1;
+ 4; 0; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -7492,7 +7492,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_SVERWEIS );
- 4; 0; 0; 0; 1;
+ 4; 0; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -7540,7 +7540,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_INDEX );
- 4; 0; 1; 1; 1;
+ 4; 0; 1; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -7588,7 +7588,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_INDIREKT );
- 2; 0; 1;
+ 2; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -7620,7 +7620,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_VERWEIS );
- 3; 0; 0; 1;
+ 3; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -7660,7 +7660,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_VERGLEICH );
- 3; 0; 0; 1;
+ 3; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -7700,7 +7700,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_VERSCHIEBUNG );
- 5; 0; 0; 0; 1; 1;
+ 5; 0; 0; 0; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -7756,7 +7756,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_FEHLERTYP );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -7780,7 +7780,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_VORLAGE );
- 3; 0; 1; 1;
+ 3; 0; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -7820,7 +7820,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_DDE );
- 4; 0; 0; 0; 1;
+ 4; 0; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -7868,7 +7868,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TABLE;
U2S( HID_FUNC_HYPERLINK );
- 2; 0; 1;
+ 2; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -8012,7 +8012,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_CODE );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8036,7 +8036,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_DM );
- 2; 0; 1;
+ 2; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -8068,7 +8068,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_ZEICHEN );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8092,7 +8092,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_SAEUBERN );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8116,7 +8116,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_VERKETTEN );
- VAR_ARGS; 0;
+ VAR_ARGS; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8140,7 +8140,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_IDENTISCH );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8172,7 +8172,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_FINDEN );
- 3; 0; 0; 1;
+ 3; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -8212,7 +8212,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_SUCHEN );
- 3; 0; 0; 1;
+ 3; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -8252,7 +8252,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_GLAETTEN );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8276,7 +8276,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_GROSS2 );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8300,7 +8300,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_GROSS );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8324,7 +8324,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_KLEIN );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8348,7 +8348,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_WERT );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8372,7 +8372,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_TEXT );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8404,7 +8404,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_T );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8428,7 +8428,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_ERSETZEN );
- 4; 0; 0; 0; 0;
+ 4; 0; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8476,7 +8476,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_FEST );
- 3; 0; 0; 1;
+ 3; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -8516,7 +8516,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_LAENGE );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8540,7 +8540,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_LINKS );
- 2; 0; 1;
+ 2; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -8572,7 +8572,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_RECHTS );
- 2; 0; 1;
+ 2; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -8604,7 +8604,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_TEIL );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8644,7 +8644,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_WIEDERHOLEN );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8676,7 +8676,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_WECHSELN );
- 4; 0; 0; 0; 1;
+ 4; 0; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -8724,7 +8724,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_BASIS );
- 3; 0; 0; 1;
+ 3; 0; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -8764,7 +8764,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_DEZIMAL );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8796,7 +8796,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_UMRECHNEN );
- 3; 0; 0; 0;
+ 3; 0; 0; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8836,7 +8836,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_ROEMISCH );
- 2; 0; 1;
+ 2; 0; 1;
0;
};
String 2 // Name of Parameter 1
@@ -8868,7 +8868,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_ARABISCH );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8891,7 +8891,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
0;
ID_FUNCTION_GRP_INFO;
U2S( HID_FUNC_INFO );
- 1; 0;
+ 1; 0;
0;
};
String 2
@@ -8911,10 +8911,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
ExtraData =
{
- 0;
+ 0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_UNICODE );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8934,10 +8934,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
ExtraData =
{
- 0;
+ 0;
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_UNICHAR );
- 1; 0;
+ 1; 0;
0;
};
String 2 // Name of Parameter 1
@@ -8957,10 +8957,10 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
ExtraData =
{
- 0; // DOING
+ 0; // DOING
ID_FUNCTION_GRP_MATH;
U2S( HID_FUNC_EUROCONVERT );
- 5; 0; 0; 0; 1; 1;
+ 5; 0; 0; 0; 1; 1;
0;
};
String 2 // Name of Parameter 1
@@ -9016,7 +9016,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
1; // TODO: implementation and unsuppress
ID_FUNCTION_GRP_TEXT;
U2S( HID_FUNC_NUMBERVALUE );
- 2; 0; 0;
+ 2; 0; 0;
0;
};
String 2 // Name of Parameter 1
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index 9c47a42239cc..f7c44c1fcd95 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.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
@@ -472,7 +472,7 @@ String SCSTR_VALID_LIST
Text [ en-US ] = "~Entries" ;
};
- // fuer Dialoge:
+ // fuer Dialoge:
String SCSTR_CHARSET_USER
{
@@ -499,7 +499,7 @@ String SCSTR_FORMULA_AUTOCORRECTION
Text [ en-US ] = "%PRODUCTNAME Calc found an error in the formula entered.\nDo you want to accept the correction proposed below?\n\n" ;
};
-//! the graphics filter error strings should be moved to svx or offapp!
+//! the graphics filter error strings should be moved to svx or offapp!
String SCSTR_GRFILTER_OPENERROR
{
diff --git a/sc/source/ui/src/scwarngs.src b/sc/source/ui/src/scwarngs.src
index 9cd22567d77c..64184e9e41e5 100644
--- a/sc/source/ui/src/scwarngs.src
+++ b/sc/source/ui/src/scwarngs.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/source/ui/src/simpref.src b/sc/source/ui/src/simpref.src
index 03f41c1a56aa..d0bf767f4f50 100644
--- a/sc/source/ui/src/simpref.src
+++ b/sc/source/ui/src/simpref.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
@@ -35,7 +35,7 @@ ModelessDialog RID_SCDLG_SIMPLEREF
Size = MAP_APPFONT ( 222 , 60 ) ;
Text = "Bereich festlegen" ;
Moveable = TRUE ;
- // Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button !
+ // Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button !
FixedText FT_ASSIGN
{
Pos = MAP_APPFONT ( 6 , 6 ) ;
@@ -48,7 +48,7 @@ ModelessDialog RID_SCDLG_SIMPLEREF
Pos = MAP_APPFONT ( 48 , 6 ) ;
Size = MAP_APPFONT ( 90 , 12 ) ;
TabStop = TRUE ;
- // Text = "<Tabellenbereich>" ;
+ // Text = "<Tabellenbereich>" ;
};
ImageButton RB_ASSIGN
{
diff --git a/sc/source/ui/src/solveroptions.src b/sc/source/ui/src/solveroptions.src
index 0a3432344f35..12e02f690e2a 100644
--- a/sc/source/ui/src/solveroptions.src
+++ b/sc/source/ui/src/solveroptions.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/source/ui/src/solvrdlg.src b/sc/source/ui/src/solvrdlg.src
index 6a8a3d955644..c067a6db14c6 100644
--- a/sc/source/ui/src/solvrdlg.src
+++ b/sc/source/ui/src/solvrdlg.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/source/ui/src/sortdlg.src b/sc/source/ui/src/sortdlg.src
index 3aca09211edd..ec03bb25da8d 100644
--- a/sc/source/ui/src/sortdlg.src
+++ b/sc/source/ui/src/sortdlg.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
@@ -304,13 +304,13 @@ TabDialog RID_SCDLG_SORT
ModalDialog RID_SCDLG_SORT_WARNING
{
OutputSize = TRUE ;
- SVLook = TRUE ;
+ SVLook = TRUE ;
Size = MAP_APPFONT ( 180 , 91 ) ;
Text [ en-US ] = "Sort Range" ;
Moveable = TRUE ;
Closeable = FALSE ;
FixedText FT_TEXT
- {
+ {
Pos = MAP_APPFONT ( 8 , 3 ) ;
Size = MAP_APPFONT ( 170 , 33 ) ;
WordBreak = TRUE;
diff --git a/sc/source/ui/src/subtdlg.src b/sc/source/ui/src/subtdlg.src
index c0bcfba1b07b..b97b6c8383c5 100644
--- a/sc/source/ui/src/subtdlg.src
+++ b/sc/source/ui/src/subtdlg.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
@@ -109,8 +109,8 @@ TabPage RID_SCPAGE_SUBT_OPTIONS
TabPage RID_SUBTBASE
{
- // Die Elemente haben hart vergebene Hilfe-IDs, weil automatisch generierte
- // aus den Ableitungen nicht in der HID-Liste auftauchen wuerden
+ // Die Elemente haben hart vergebene Hilfe-IDs, weil automatisch generierte
+ // aus den Ableitungen nicht in der HID-Liste auftauchen wuerden
HelpId = HID_SCPAGE_SUBT_GROUP ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( 260 , 185 ) ;
diff --git a/sc/source/ui/src/tabopdlg.src b/sc/source/ui/src/tabopdlg.src
index 25af654f4147..6df01004931e 100644
--- a/sc/source/ui/src/tabopdlg.src
+++ b/sc/source/ui/src/tabopdlg.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/source/ui/src/textdlgs.src b/sc/source/ui/src/textdlgs.src
index 2b0e408262ba..447b174e1aec 100644
--- a/sc/source/ui/src/textdlgs.src
+++ b/sc/source/ui/src/textdlgs.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/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.src
index 6e4b89e5faa0..85fb80bfcc5f 100644
--- a/sc/source/ui/src/toolbox.src
+++ b/sc/source/ui/src/toolbox.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
@@ -124,7 +124,7 @@ String SCSTR_QHELP_BTNEQUAL
};
// --------------------------------------------------------------------
- // PopUp's fuer Werkzeugleiste
+ // PopUp's fuer Werkzeugleiste
// --------------------------------------------------------------------
FloatingWindow RID_TBXCTL_INSERT
@@ -259,10 +259,10 @@ FloatingWindow RID_TBXCTL_INSOBJ
#define DEFAULT_IDLIST \
IdList = { \
- /* Eingabezeile */ \
- SID_INPUT_FUNCTION; /* 20047 */ \
- SID_INPUT_SUM; /* 20048 */ \
- SID_INPUT_EQUAL; /* 20049 */ \
+ /* Eingabezeile */ \
+ SID_INPUT_FUNCTION; /* 20047 */ \
+ SID_INPUT_SUM; /* 20048 */ \
+ SID_INPUT_EQUAL; /* 20049 */ \
SID_INPUT_CANCEL; \
SID_INPUT_OK; \
}; \
diff --git a/sc/source/ui/styleui/scstyles.src b/sc/source/ui/styleui/scstyles.src
index 1968b6dca877..8c057d65f70a 100644
--- a/sc/source/ui/styleui/scstyles.src
+++ b/sc/source/ui/styleui/scstyles.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
@@ -28,7 +28,7 @@
#include "sc.hrc"
#include <svl/style.hrc>
#define IMPL_FAMILY(family,filter) \
- StyleFamily = family; \
+ StyleFamily = family; \
FilterList = { filter }
//------------------------------------------------------------------------
@@ -53,15 +53,15 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
};
};
- // style family images are now taken from an ImageList
- // (for each family, there's one entry in the IdList)
- ImageList 1 // == BMP_COLOR_NORMAL + 1
+ // style family images are now taken from an ImageList
+ // (for each family, there's one entry in the IdList)
+ ImageList 1 // == BMP_COLOR_NORMAL + 1
{
Prefix = "sf";
MaskColor = STD_MASKCOLOR ;
IdList = { 1; 2; };
};
- ImageList 2 // == BMP_COLOR_HIGHCONTRAST + 1
+ ImageList 2 // == BMP_COLOR_HIGHCONTRAST + 1
{
Prefix = "sfh";
MaskColor = SC_HC_MASKCOLOR ;
diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx
index 72a52520d1c1..6d5c2d3361b5 100644
--- a/sc/source/ui/styleui/styledlg.cxx
+++ b/sc/source/ui/styleui/styledlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include <svl/cjkoptions.hxx>
#include "styledlg.hxx"
-#include "tabpages.hxx" // Zellvorlagen
-#include "tphf.hxx" // Seitenvorlage: Kopf-/Fusszeilen
-#include "tptable.hxx" // Seitenvorlage: Tabelle
+#include "tabpages.hxx" // Zellvorlagen
+#include "tphf.hxx" // Seitenvorlage: Kopf-/Fusszeilen
+#include "tptable.hxx" // Seitenvorlage: Tabelle
#include "scresid.hxx"
#include "sc.hrc"
#include "styledlg.hrc"
@@ -63,21 +63,21 @@
#include <svx/flagsdef.hxx> //CHINA001
//==================================================================
-ScStyleDlg::ScStyleDlg( Window* pParent,
- SfxStyleSheetBase& rStyleBase,
- USHORT nRscId )
+ScStyleDlg::ScStyleDlg( Window* pParent,
+ SfxStyleSheetBase& rStyleBase,
+ USHORT nRscId )
- : SfxStyleDialog ( pParent,
+ : SfxStyleDialog ( pParent,
ScResId( nRscId ),
rStyleBase,
FALSE ),
- nDlgRsc ( nRscId )
+ nDlgRsc ( nRscId )
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); //CHINA001
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
switch ( nRscId )
{
- case RID_SCDLG_STYLES_PAR: // Zellformatvorlagen
+ case RID_SCDLG_STYLES_PAR: // Zellformatvorlagen
{
SvtCJKOptions aCJKOptions;
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageCreatorFunc fail!");//CHINA001
@@ -85,47 +85,47 @@ ScStyleDlg::ScStyleDlg( Window* pParent,
AddTabPage( TP_NUMBER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_NUMBERFORMAT ) ); //CHINA001 AddTabPage( TP_NUMBER, &SvxNumberFormatTabPage::Create, &SvxNumberFormatTabPage::GetRanges );
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!");//CHINA001
DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageRangesFunc fail!");//CHINA001
- AddTabPage( TP_FONT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ) ); //CHINA001 AddTabPage( TP_FONT, &SvxCharNamePage::Create, &SvxCharNamePage::GetRanges );
+ AddTabPage( TP_FONT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ) ); //CHINA001 AddTabPage( TP_FONT, &SvxCharNamePage::Create, &SvxCharNamePage::GetRanges );
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!");//CHINA001
DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageRangesFunc fail!");//CHINA001
- AddTabPage( TP_FONTEFF, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ) ); //CHINA001 AddTabPage( TP_FONTEFF, &SvxCharEffectsPage::Create, &SvxCharEffectsPage::GetRanges );
+ AddTabPage( TP_FONTEFF, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ) ); //CHINA001 AddTabPage( TP_FONTEFF, &SvxCharEffectsPage::Create, &SvxCharEffectsPage::GetRanges );
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), "GetTabPageCreatorFunc fail!");//CHINA001
DBG_ASSERT( pFact->GetTabPageRangesFunc( RID_SVXPAGE_ALIGNMENT ), "GetTabPageRangesFunc fail!");//CHINA001
- AddTabPage( TP_ALIGNMENT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_ALIGNMENT ) ); //CHINA001 AddTabPage( TP_ALIGNMENT, &SvxAlignmentTabPage::Create, &SvxAlignmentTabPage::GetRanges );
+ AddTabPage( TP_ALIGNMENT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_ALIGNMENT ) ); //CHINA001 AddTabPage( TP_ALIGNMENT, &SvxAlignmentTabPage::Create, &SvxAlignmentTabPage::GetRanges );
if ( aCJKOptions.IsAsianTypographyEnabled() )
{
- //CHINA001 AddTabPage( TP_ASIAN, &SvxAsianTabPage::Create, &SvxAsianTabPage::GetRanges );
+ //CHINA001 AddTabPage( TP_ASIAN, &SvxAsianTabPage::Create, &SvxAsianTabPage::GetRanges );
DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!");//CHINA001
DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageRangesFunc fail!");//CHINA001
- AddTabPage( TP_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) );
+ AddTabPage( TP_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) );
}
else
RemoveTabPage( TP_ASIAN );
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");//CHINA001
DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");//CHINA001
- AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); //CHINA001 AddTabPage( TP_BORDER, &SvxBorderTabPage::Create, &SvxBorderTabPage::GetRanges );
+ AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); //CHINA001 AddTabPage( TP_BORDER, &SvxBorderTabPage::Create, &SvxBorderTabPage::GetRanges );
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");//CHINA001
DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");//CHINA001
- AddTabPage( TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); //CHINA001 AddTabPage( TP_BACKGROUND, &SvxBackgroundTabPage::Create, &SvxBackgroundTabPage::GetRanges );
- AddTabPage( TP_PROTECTION, &ScTabPageProtection::Create, &ScTabPageProtection::GetRanges );
+ AddTabPage( TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); //CHINA001 AddTabPage( TP_BACKGROUND, &SvxBackgroundTabPage::Create, &SvxBackgroundTabPage::GetRanges );
+ AddTabPage( TP_PROTECTION, &ScTabPageProtection::Create, &ScTabPageProtection::GetRanges );
}
break;
- case RID_SCDLG_STYLES_PAGE: // Seitenvorlagen
+ case RID_SCDLG_STYLES_PAGE: // Seitenvorlagen
{
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), "GetTabPageCreatorFunc fail!");//CHINA001
DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), "GetTabPageRangesFunc fail!");//CHINA001
- AddTabPage( TP_PAGE_STD, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ) ); //CHINA001 AddTabPage( TP_PAGE_STD, &SvxPageDescPage::Create, &SvxPageDescPage::GetRanges );
+ AddTabPage( TP_PAGE_STD, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ) ); //CHINA001 AddTabPage( TP_PAGE_STD, &SvxPageDescPage::Create, &SvxPageDescPage::GetRanges );
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");//CHINA001
DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");//CHINA001
- AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); //CHINA001 AddTabPage( TP_BORDER, &SvxBorderTabPage::Create, &SvxBorderTabPage::GetRanges );
+ AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); //CHINA001 AddTabPage( TP_BORDER, &SvxBorderTabPage::Create, &SvxBorderTabPage::GetRanges );
DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");//CHINA001
DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");//CHINA001
- AddTabPage( TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); //CHINA001 AddTabPage( TP_BACKGROUND, &SvxBackgroundTabPage::Create, &SvxBackgroundTabPage::GetRanges );
- AddTabPage( TP_PAGE_HEADER, &ScHeaderPage::Create, &ScHeaderPage::GetRanges );
- AddTabPage( TP_PAGE_FOOTER, &ScFooterPage::Create, &ScFooterPage::GetRanges );
- AddTabPage( TP_TABLE, &ScTablePage::Create, &ScTablePage::GetRanges );
+ AddTabPage( TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); //CHINA001 AddTabPage( TP_BACKGROUND, &SvxBackgroundTabPage::Create, &SvxBackgroundTabPage::GetRanges );
+ AddTabPage( TP_PAGE_HEADER, &ScHeaderPage::Create, &ScHeaderPage::GetRanges );
+ AddTabPage( TP_PAGE_FOOTER, &ScFooterPage::Create, &ScFooterPage::GetRanges );
+ AddTabPage( TP_TABLE, &ScTablePage::Create, &ScTablePage::GetRanges );
}
break;
@@ -189,13 +189,13 @@ void __EXPORT ScStyleDlg::PageCreated( USHORT nPageId, SfxTabPage& rTabPage )
}
else if ( nDlgRsc == RID_SCDLG_STYLES_PAGE )
{
- SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));//CHINA001
+ SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));//CHINA001
switch ( nPageId )
{
case TP_PAGE_STD:
//CHINA001 ((SvxPageDescPage&)rTabPage).SetMode( SVX_PAGE_MODE_CENTER );
- aSet.Put (SfxAllEnumItem((const USHORT)SID_ENUM_PAGE_MODE, SVX_PAGE_MODE_CENTER)); //CHINA001
- rTabPage.PageCreated(aSet); //CHINA001
+ aSet.Put (SfxAllEnumItem((const USHORT)SID_ENUM_PAGE_MODE, SVX_PAGE_MODE_CENTER)); //CHINA001
+ rTabPage.PageCreated(aSet); //CHINA001
break;
case TP_PAGE_HEADER:
@@ -207,7 +207,7 @@ void __EXPORT ScStyleDlg::PageCreated( USHORT nPageId, SfxTabPage& rTabPage )
case TP_BACKGROUND:
if( nDlgRsc == RID_SCDLG_STYLES_PAGE)
//CHINA001 ((SvxBackgroundTabPage&)rTabPage).ShowSelector();
- { //add CHINA001
+ { //add CHINA001
aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_SHOW_SELECTOR));
rTabPage.PageCreated(aSet);
}
diff --git a/sc/source/ui/styleui/styledlg.src b/sc/source/ui/styleui/styledlg.src
index 4c862e21ebd0..be1f7d3457fd 100644
--- a/sc/source/ui/styleui/styledlg.src
+++ b/sc/source/ui/styleui/styledlg.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/source/ui/undo/areasave.cxx b/sc/source/ui/undo/areasave.cxx
index 8f5ce350b887..77cae60a8eec 100644
--- a/sc/source/ui/undo/areasave.cxx
+++ b/sc/source/ui/undo/areasave.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,22 +44,22 @@
// -----------------------------------------------------------------------
ScAreaLinkSaver::ScAreaLinkSaver( const ScAreaLink& rSource ) :
- aFileName ( rSource.GetFile() ),
- aFilterName ( rSource.GetFilter() ),
- aOptions ( rSource.GetOptions() ),
- aSourceArea ( rSource.GetSource() ),
- aDestArea ( rSource.GetDestArea() ),
+ aFileName ( rSource.GetFile() ),
+ aFilterName ( rSource.GetFilter() ),
+ aOptions ( rSource.GetOptions() ),
+ aSourceArea ( rSource.GetSource() ),
+ aDestArea ( rSource.GetDestArea() ),
nRefresh ( rSource.GetRefreshDelay() ) // seconds
{
}
ScAreaLinkSaver::ScAreaLinkSaver( const ScAreaLinkSaver& rCopy ) :
ScDataObject(),
- aFileName ( rCopy.aFileName ),
- aFilterName ( rCopy.aFilterName ),
- aOptions ( rCopy.aOptions ),
- aSourceArea ( rCopy.aSourceArea ),
- aDestArea ( rCopy.aDestArea ),
+ aFileName ( rCopy.aFileName ),
+ aFilterName ( rCopy.aFilterName ),
+ aOptions ( rCopy.aOptions ),
+ aSourceArea ( rCopy.aSourceArea ),
+ aDestArea ( rCopy.aDestArea ),
nRefresh ( rCopy.nRefresh )
{
}
@@ -68,16 +68,16 @@ ScAreaLinkSaver::~ScAreaLinkSaver()
{
}
-ScDataObject* ScAreaLinkSaver::Clone() const
+ScDataObject* ScAreaLinkSaver::Clone() const
{
return new ScAreaLinkSaver( *this );
}
BOOL ScAreaLinkSaver::IsEqualSource( const ScAreaLink& rCompare ) const
{
- return ( aFileName == rCompare.GetFile() &&
+ return ( aFileName == rCompare.GetFile() &&
aFilterName == rCompare.GetFilter() &&
- aOptions == rCompare.GetOptions() &&
+ aOptions == rCompare.GetOptions() &&
aSourceArea == rCompare.GetSource() &&
nRefresh == rCompare.GetRefreshDelay() );
}
@@ -127,7 +127,7 @@ ScAreaLinkSaveCollection::~ScAreaLinkSaveCollection()
{
}
-ScDataObject* ScAreaLinkSaveCollection::Clone() const
+ScDataObject* ScAreaLinkSaveCollection::Clone() const
{
return new ScAreaLinkSaveCollection( *this );
}
diff --git a/sc/source/ui/undo/refundo.cxx b/sc/source/ui/undo/refundo.cxx
index c863259ddf94..69344dffa9ce 100644
--- a/sc/source/ui/undo/refundo.cxx
+++ b/sc/source/ui/undo/refundo.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +58,14 @@ ScRefUndoData::ScRefUndoData( const ScDocument* pDoc ) :
ScDBCollection* pOldDBColl = pDoc->GetDBCollection();
pDBCollection = pOldDBColl ? new ScDBCollection(*pOldDBColl) : NULL;
- ScRangeName* pOldRanges = ((ScDocument*)pDoc)->GetRangeName(); //! const
+ ScRangeName* pOldRanges = ((ScDocument*)pDoc)->GetRangeName(); //! const
pRangeName = pOldRanges ? new ScRangeName(*pOldRanges) : NULL;
- pPrintRanges = pDoc->CreatePrintRangeSaver(); // neu erzeugt
+ pPrintRanges = pDoc->CreatePrintRangeSaver(); // neu erzeugt
- //! bei Pivot nur Bereiche merken ???
+ //! bei Pivot nur Bereiche merken ???
- ScDPCollection* pOldDP = ((ScDocument*)pDoc)->GetDPCollection(); //! const
+ ScDPCollection* pOldDP = ((ScDocument*)pDoc)->GetDPCollection(); //! const
pDPCollection = pOldDP ? new ScDPCollection(*pOldDP) : NULL;
ScConditionalFormatList* pOldCond = pDoc->GetCondFormList();
@@ -79,7 +79,7 @@ ScRefUndoData::ScRefUndoData( const ScDocument* pDoc ) :
pChartListenerCollection = pOldChartListenerCollection ?
new ScChartListenerCollection( *pOldChartListenerCollection ) : NULL;
- pAreaLinks = ScAreaLinkSaveCollection::CreateFromDoc(pDoc); // returns NULL if empty
+ pAreaLinks = ScAreaLinkSaveCollection::CreateFromDoc(pDoc); // returns NULL if empty
const_cast<ScDocument*>(pDoc)->BeginUnoRefUndo();
}
@@ -107,7 +107,7 @@ void ScRefUndoData::DeleteUnchanged( const ScDocument* pDoc )
}
if (pRangeName)
{
- ScRangeName* pNewRanges = ((ScDocument*)pDoc)->GetRangeName(); //! const
+ ScRangeName* pNewRanges = ((ScDocument*)pDoc)->GetRangeName(); //! const
if ( pNewRanges && *pRangeName == *pNewRanges )
DELETEZ(pRangeName);
}
@@ -122,7 +122,7 @@ void ScRefUndoData::DeleteUnchanged( const ScDocument* pDoc )
if (pDPCollection)
{
- ScDPCollection* pNewDP = ((ScDocument*)pDoc)->GetDPCollection(); //! const
+ ScDPCollection* pNewDP = ((ScDocument*)pDoc)->GetDPCollection(); //! const
if ( pNewDP && pDPCollection->RefsEqual(*pNewDP) )
DELETEZ(pDPCollection);
}
@@ -196,7 +196,7 @@ void ScRefUndoData::DoUndo( ScDocument* pDoc, BOOL bUndoRefFirst )
if (pDBCollection || pRangeName)
{
BOOL bOldAutoCalc = pDoc->GetAutoCalc();
- pDoc->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
+ pDoc->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
pDoc->CompileAll();
pDoc->SetDirty();
pDoc->SetAutoCalc( bOldAutoCalc );
diff --git a/sc/source/ui/undo/target.cxx b/sc/source/ui/undo/target.cxx
index 1c2e4a925378..feac9ddb34e0 100644
--- a/sc/source/ui/undo/target.cxx
+++ b/sc/source/ui/undo/target.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index fffb76ebd061..3798d7f76f54 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1(ScSimpleUndo, SfxUndoAction);
+TYPEINIT1(ScSimpleUndo, SfxUndoAction);
TYPEINIT1(ScBlockUndo, ScSimpleUndo);
TYPEINIT1(ScMoveUndo, ScSimpleUndo);
TYPEINIT1(ScDBFuncUndo, ScSimpleUndo);
@@ -68,17 +68,17 @@ __EXPORT ScSimpleUndo::~ScSimpleUndo()
BOOL __EXPORT ScSimpleUndo::Merge( SfxUndoAction *pNextAction )
{
- // Zu jeder Undo-Action kann eine SdrUndoGroup fuer das Aktualisieren
- // der Detektiv-Pfeile gehoeren.
- // DetectiveRefresh kommt immer hinterher, die SdrUndoGroup ist in
- // eine ScUndoDraw Action verpackt.
- // Nur beim automatischen Aktualisieren wird AddUndoAction mit
- // bTryMerg=TRUE gerufen.
+ // Zu jeder Undo-Action kann eine SdrUndoGroup fuer das Aktualisieren
+ // der Detektiv-Pfeile gehoeren.
+ // DetectiveRefresh kommt immer hinterher, die SdrUndoGroup ist in
+ // eine ScUndoDraw Action verpackt.
+ // Nur beim automatischen Aktualisieren wird AddUndoAction mit
+ // bTryMerg=TRUE gerufen.
if ( !pDetectiveUndo && pNextAction->ISA(ScUndoDraw) )
{
- // SdrUndoAction aus der ScUndoDraw Action uebernehmen,
- // ScUndoDraw wird dann vom UndoManager geloescht
+ // SdrUndoAction aus der ScUndoDraw Action uebernehmen,
+ // ScUndoDraw wird dann vom UndoManager geloescht
ScUndoDraw* pCalcUndo = (ScUndoDraw*)pNextAction;
pDetectiveUndo = pCalcUndo->GetDrawUndo();
@@ -95,9 +95,9 @@ void ScSimpleUndo::BeginUndo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
- pViewShell->HideAllCursors(); // z.B. wegen zusammengefassten Zellen
+ pViewShell->HideAllCursors(); // z.B. wegen zusammengefassten Zellen
- // detective updates happened last, must be undone first
+ // detective updates happened last, must be undone first
if (pDetectiveUndo)
pDetectiveUndo->Undo();
}
@@ -119,11 +119,11 @@ void ScSimpleUndo::EndUndo()
void ScSimpleUndo::BeginRedo()
{
- pDocShell->SetInUndo( TRUE ); //! eigenes Flag fuer Redo?
+ pDocShell->SetInUndo( TRUE ); //! eigenes Flag fuer Redo?
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
- pViewShell->HideAllCursors(); // z.B. wegen zusammengefassten Zellen
+ pViewShell->HideAllCursors(); // z.B. wegen zusammengefassten Zellen
}
void ScSimpleUndo::EndRedo()
@@ -144,14 +144,14 @@ void ScSimpleUndo::EndRedo()
pDocShell->SetInUndo( FALSE );
}
-void ScSimpleUndo::ShowTable( SCTAB nTab ) // static
+void ScSimpleUndo::ShowTable( SCTAB nTab ) // static
{
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
pViewShell->SetTabNo( nTab );
}
-void ScSimpleUndo::ShowTable( const ScRange& rRange ) // static
+void ScSimpleUndo::ShowTable( const ScRange& rRange ) // static
{
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
@@ -159,8 +159,8 @@ void ScSimpleUndo::ShowTable( const ScRange& rRange ) // static
SCTAB nStart = rRange.aStart.Tab();
SCTAB nEnd = rRange.aEnd.Tab();
SCTAB nTab = pViewShell->GetViewData()->GetTabNo();
- if ( nTab < nStart || nTab > nEnd ) // wenn nicht im Bereich:
- pViewShell->SetTabNo( nStart ); // auf erste des Bereiches
+ if ( nTab < nStart || nTab > nEnd ) // wenn nicht im Bereich:
+ pViewShell->SetTabNo( nStart ); // auf erste des Bereiches
}
}
@@ -234,13 +234,13 @@ BOOL ScBlockUndo::AdjustHeight()
}
else
{
- // Zoom auf 100 lassen
+ // Zoom auf 100 lassen
nPPTX = ScGlobal::nScreenPPTX;
nPPTY = ScGlobal::nScreenPPTY;
}
BOOL bRet = pDoc->SetOptimalHeight( aBlockRange.aStart.Row(), aBlockRange.aEnd.Row(),
-/*!*/ aBlockRange.aStart.Tab(), 0, &aVirtDev,
+/*!*/ aBlockRange.aStart.Tab(), 0, &aVirtDev,
nPPTX, nPPTY, aZoomX, aZoomY, FALSE );
if (bRet)
@@ -256,7 +256,7 @@ void ScBlockUndo::ShowBlock()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
{
- ShowTable( aBlockRange ); // bei mehreren Tabs im Range ist jede davon gut
+ ShowTable( aBlockRange ); // bei mehreren Tabs im Range ist jede davon gut
pViewShell->MoveCursorAbs( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(),
SC_FOLLOW_JUMP, FALSE, FALSE );
SCTAB nTab = pViewShell->GetViewData()->GetTabNo();
@@ -265,7 +265,7 @@ void ScBlockUndo::ShowBlock()
aRange.aEnd.SetTab( nTab );
pViewShell->MarkRange( aRange );
- // nicht per SetMarkArea an MarkData, wegen evtl. fehlendem Paint
+ // nicht per SetMarkArea an MarkData, wegen evtl. fehlendem Paint
}
}
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 3fb2c74a9954..6c096c99fb75 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,37 +67,37 @@
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1(ScUndoInsertCells, SfxUndoAction);
-TYPEINIT1(ScUndoDeleteCells, SfxUndoAction);
-TYPEINIT1(ScUndoDeleteMulti, SfxUndoAction);
-TYPEINIT1(ScUndoCut, ScBlockUndo);
-TYPEINIT1(ScUndoPaste, SfxUndoAction);
-TYPEINIT1(ScUndoDragDrop, SfxUndoAction);
-TYPEINIT1(ScUndoListNames, SfxUndoAction);
-TYPEINIT1(ScUndoUseScenario, SfxUndoAction);
-TYPEINIT1(ScUndoSelectionStyle, SfxUndoAction);
-TYPEINIT1(ScUndoEnterMatrix, ScBlockUndo);
-TYPEINIT1(ScUndoIndent, ScBlockUndo);
-TYPEINIT1(ScUndoTransliterate, ScBlockUndo);
-TYPEINIT1(ScUndoClearItems, ScBlockUndo);
-TYPEINIT1(ScUndoRemoveBreaks, SfxUndoAction);
-TYPEINIT1(ScUndoRemoveMerge, ScBlockUndo);
-TYPEINIT1(ScUndoBorder, ScBlockUndo);
+TYPEINIT1(ScUndoInsertCells, SfxUndoAction);
+TYPEINIT1(ScUndoDeleteCells, SfxUndoAction);
+TYPEINIT1(ScUndoDeleteMulti, SfxUndoAction);
+TYPEINIT1(ScUndoCut, ScBlockUndo);
+TYPEINIT1(ScUndoPaste, SfxUndoAction);
+TYPEINIT1(ScUndoDragDrop, SfxUndoAction);
+TYPEINIT1(ScUndoListNames, SfxUndoAction);
+TYPEINIT1(ScUndoUseScenario, SfxUndoAction);
+TYPEINIT1(ScUndoSelectionStyle, SfxUndoAction);
+TYPEINIT1(ScUndoEnterMatrix, ScBlockUndo);
+TYPEINIT1(ScUndoIndent, ScBlockUndo);
+TYPEINIT1(ScUndoTransliterate, ScBlockUndo);
+TYPEINIT1(ScUndoClearItems, ScBlockUndo);
+TYPEINIT1(ScUndoRemoveBreaks, SfxUndoAction);
+TYPEINIT1(ScUndoRemoveMerge, ScBlockUndo);
+TYPEINIT1(ScUndoBorder, ScBlockUndo);
// To Do:
-/*A*/ // SetOptimalHeight auf Dokument, wenn keine View
-/*B*/ // gelinkte Tabellen
-/*C*/ // ScArea
-//? // spaeter mal pruefen
+/*A*/ // SetOptimalHeight auf Dokument, wenn keine View
+/*B*/ // gelinkte Tabellen
+/*C*/ // ScArea
+//? // spaeter mal pruefen
// -----------------------------------------------------------------------
//
-// Zellen einfuegen
+// Zellen einfuegen
// Zeilen einfuegen
-// einzeln oder Block
+// einzeln oder Block
//
ScUndoInsertCells::ScUndoInsertCells( ScDocShell* pNewDocShell,
@@ -113,13 +113,13 @@ ScUndoInsertCells::ScUndoInsertCells( ScDocShell* pNewDocShell,
bPartOfPaste( bNewPartOfPaste ),
pPasteUndo( NULL )
{
- if (eCmd == INS_INSROWS) // ganze Zeilen?
+ if (eCmd == INS_INSROWS) // ganze Zeilen?
{
aEffRange.aStart.SetCol(0);
aEffRange.aEnd.SetCol(MAXCOL);
}
- if (eCmd == INS_INSCOLS) // ganze Spalten?
+ if (eCmd == INS_INSCOLS) // ganze Spalten?
{
aEffRange.aStart.SetRow(0);
aEffRange.aEnd.SetRow(MAXROW);
@@ -142,7 +142,7 @@ String __EXPORT ScUndoInsertCells::GetComment() const
BOOL ScUndoInsertCells::Merge( SfxUndoAction* pNextAction )
{
- // If a paste undo action has already been added, append (detective) action there.
+ // If a paste undo action has already been added, append (detective) action there.
if ( pPasteUndo )
return pPasteUndo->Merge( pNextAction );
@@ -152,16 +152,16 @@ BOOL ScUndoInsertCells::Merge( SfxUndoAction* pNextAction )
SfxUndoAction* pWrappedAction = pWrapper->GetWrappedUndo();
if ( pWrappedAction && pWrappedAction->ISA( ScUndoPaste ) )
{
- // Store paste action if this is part of paste with inserting cells.
- // A list action isn't used because Repeat wouldn't work (insert wrong cells).
+ // Store paste action if this is part of paste with inserting cells.
+ // A list action isn't used because Repeat wouldn't work (insert wrong cells).
pPasteUndo = pWrappedAction;
- pWrapper->ForgetWrappedUndo(); // pWrapper is deleted by UndoManager
+ pWrapper->ForgetWrappedUndo(); // pWrapper is deleted by UndoManager
return TRUE;
}
}
- // Call base class for detective handling
+ // Call base class for detective handling
return ScMoveUndo::Merge( pNextAction );
}
@@ -239,7 +239,7 @@ void ScUndoInsertCells::DoChange( const BOOL bUndo )
}
}
-//? Undo fuer herausgeschobene Attribute ?
+//? Undo fuer herausgeschobene Attribute ?
USHORT nPaint = PAINT_GRID;
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
@@ -262,14 +262,14 @@ void ScUndoInsertCells::DoChange( const BOOL bUndo )
}
break;
case INS_INSCOLS:
- nPaint |= PAINT_TOP; // obere Leiste
+ nPaint |= PAINT_TOP; // obere Leiste
case INS_CELLSRIGHT:
for( i=0; i<nCount; i++ )
{
- aWorkRange.aEnd.SetCol(MAXCOL); // bis ganz nach rechts
+ aWorkRange.aEnd.SetCol(MAXCOL); // bis ganz nach rechts
if ( pDocShell->AdjustRowHeight( aWorkRange.aStart.Row(), aWorkRange.aEnd.Row(), pTabs[i]) )
- { // AdjustDraw zeichnet PAINT_TOP nicht,
- aWorkRange.aStart.SetCol(0); // daher so geloest
+ { // AdjustDraw zeichnet PAINT_TOP nicht,
+ aWorkRange.aStart.SetCol(0); // daher so geloest
aWorkRange.aEnd.SetRow(MAXROW);
nPaint |= PAINT_LEFT;
}
@@ -294,9 +294,9 @@ void ScUndoInsertCells::DoChange( const BOOL bUndo )
void __EXPORT ScUndoInsertCells::Undo()
{
if ( pPasteUndo )
- pPasteUndo->Undo(); // undo paste first
+ pPasteUndo->Undo(); // undo paste first
- WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
+ WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
BeginUndo();
DoChange( TRUE );
EndUndo();
@@ -304,13 +304,13 @@ void __EXPORT ScUndoInsertCells::Undo()
void __EXPORT ScUndoInsertCells::Redo()
{
- WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
+ WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
BeginRedo();
DoChange( FALSE );
EndRedo();
if ( pPasteUndo )
- pPasteUndo->Redo(); // redo paste last
+ pPasteUndo->Redo(); // redo paste last
}
void __EXPORT ScUndoInsertCells::Repeat(SfxRepeatTarget& rTarget)
@@ -319,8 +319,8 @@ void __EXPORT ScUndoInsertCells::Repeat(SfxRepeatTarget& rTarget)
{
if ( pPasteUndo )
{
- // #94115# Repeat for paste with inserting cells is handled completely
- // by the Paste undo action
+ // #94115# Repeat for paste with inserting cells is handled completely
+ // by the Paste undo action
pPasteUndo->Repeat( rTarget );
}
@@ -337,9 +337,9 @@ BOOL __EXPORT ScUndoInsertCells::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Zellen loeschen
+// Zellen loeschen
// Zeilen loeschen
-// einzeln oder Block
+// einzeln oder Block
//
ScUndoDeleteCells::ScUndoDeleteCells( ScDocShell* pNewDocShell,
@@ -352,13 +352,13 @@ ScUndoDeleteCells::ScUndoDeleteCells( ScDocShell* pNewDocShell,
pScenarios( pNewScenarios ),
eCmd( eNewCmd )
{
- if (eCmd == DEL_DELROWS) // gaze Zeilen?
+ if (eCmd == DEL_DELROWS) // gaze Zeilen?
{
aEffRange.aStart.SetCol(0);
aEffRange.aEnd.SetCol(MAXCOL);
}
- if (eCmd == DEL_DELCOLS) // ganze Spalten?
+ if (eCmd == DEL_DELCOLS) // ganze Spalten?
{
aEffRange.aStart.SetRow(0);
aEffRange.aEnd.SetRow(MAXROW);
@@ -458,7 +458,7 @@ void ScUndoDeleteCells::DoChange( const BOOL bUndo )
{
if ( eCmd==DEL_DELCOLS || eCmd==DEL_CELLSLEFT )
aWorkRange.aEnd.SetCol(MAXCOL);
- if ( eCmd==DEL_DELROWS || eCmd==DEL_CELLSUP )
+ if ( eCmd==DEL_DELROWS || eCmd==DEL_CELLSUP )
aWorkRange.aEnd.SetRow(MAXROW);
ScMarkData aMarkData;
aMarkData.SelectOneTable( aWorkRange.aStart.Tab() );
@@ -496,11 +496,11 @@ void ScUndoDeleteCells::DoChange( const BOOL bUndo )
}
break;
case DEL_DELCOLS:
- nPaint |= PAINT_TOP; // obere Leiste
+ nPaint |= PAINT_TOP; // obere Leiste
case DEL_CELLSLEFT:
for( i=0; i<nCount; i++ )
{
- aWorkRange.aEnd.SetCol(MAXCOL); // bis ganz nach rechts
+ aWorkRange.aEnd.SetCol(MAXCOL); // bis ganz nach rechts
if ( pDocShell->AdjustRowHeight( aWorkRange.aStart.Row(), aWorkRange.aEnd.Row(), pTabs[i] ) )
{
aWorkRange.aStart.SetCol(0);
@@ -523,12 +523,12 @@ void ScUndoDeleteCells::DoChange( const BOOL bUndo )
// Markierung erst nach EndUndo
pDocShell->PostDataChanged();
- // CellContentChanged kommt mit der Markierung
+ // CellContentChanged kommt mit der Markierung
}
void __EXPORT ScUndoDeleteCells::Undo()
{
- WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
+ WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
BeginUndo();
DoChange( TRUE );
EndUndo();
@@ -547,7 +547,7 @@ void __EXPORT ScUndoDeleteCells::Undo()
void __EXPORT ScUndoDeleteCells::Redo()
{
- WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
+ WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
BeginRedo();
DoChange( FALSE);
EndRedo();
@@ -555,7 +555,7 @@ void __EXPORT ScUndoDeleteCells::Redo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
- pViewShell->DoneBlockMode(); // aktuelle weg
+ pViewShell->DoneBlockMode(); // aktuelle weg
}
void __EXPORT ScUndoDeleteCells::Repeat(SfxRepeatTarget& rTarget)
@@ -572,7 +572,7 @@ BOOL __EXPORT ScUndoDeleteCells::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Zellen loeschen auf Mehrfachselektion
+// Zellen loeschen auf Mehrfachselektion
//
ScUndoDeleteMulti::ScUndoDeleteMulti( ScDocShell* pNewDocShell,
@@ -597,7 +597,7 @@ __EXPORT ScUndoDeleteMulti::~ScUndoDeleteMulti()
String __EXPORT ScUndoDeleteMulti::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_DELETECELLS ); // wie DeleteCells
+ return ScGlobal::GetRscString( STR_UNDO_DELETECELLS ); // wie DeleteCells
}
void ScUndoDeleteMulti::DoChange() const
@@ -674,14 +674,14 @@ void ScUndoDeleteMulti::SetChangeTrack()
void __EXPORT ScUndoDeleteMulti::Undo()
{
- WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
+ WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
BeginUndo();
ScDocument* pDoc = pDocShell->GetDocument();
SCCOLROW* pOneRange;
SCCOLROW nRangeNo;
- // rueckwaerts geloescht -> vorwaerts einfuegen
+ // rueckwaerts geloescht -> vorwaerts einfuegen
pOneRange = pRanges;
for (nRangeNo=0; nRangeNo<nRangeCnt; nRangeNo++)
{
@@ -711,8 +711,8 @@ void __EXPORT ScUndoDeleteMulti::Undo()
DoChange();
- //! Markierung wieder einzeichnen
- //! geht im Moment nicht, da keine Daten fuer Markierung vorhanden!
+ //! Markierung wieder einzeichnen
+ //! geht im Moment nicht, da keine Daten fuer Markierung vorhanden!
EndUndo();
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
@@ -720,7 +720,7 @@ void __EXPORT ScUndoDeleteMulti::Undo()
void __EXPORT ScUndoDeleteMulti::Redo()
{
- WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
+ WaitObject aWait( pDocShell->GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference
BeginRedo();
ScDocument* pDoc = pDocShell->GetDocument();
@@ -741,10 +741,10 @@ void __EXPORT ScUndoDeleteMulti::Redo()
DoChange();
-//! Markierung loeschen, derzeit unnoetig (s.o.)
-//! ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
-//! if (pViewShell)
-//! DoneBlockMode();
+//! Markierung loeschen, derzeit unnoetig (s.o.)
+//! ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
+//! if (pViewShell)
+//! DoneBlockMode();
EndRedo();
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
@@ -752,7 +752,7 @@ void __EXPORT ScUndoDeleteMulti::Redo()
void __EXPORT ScUndoDeleteMulti::Repeat(SfxRepeatTarget& rTarget)
{
- // DeleteCells, falls einfache Selektion
+ // DeleteCells, falls einfache Selektion
if (rTarget.ISA(ScTabViewTarget))
((ScTabViewTarget&)rTarget).GetViewShell()->DeleteCells( DEL_DELROWS, TRUE );
}
@@ -765,7 +765,7 @@ BOOL __EXPORT ScUndoDeleteMulti::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Ausschneiden (Cut)
+// Ausschneiden (Cut)
//
ScUndoCut::ScUndoCut( ScDocShell* pNewDocShell,
@@ -807,7 +807,7 @@ void ScUndoCut::DoChange( const BOOL bUndo )
// do not undo/redo objects and note captions, they are handled via drawing undo
USHORT nUndoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
- if (bUndo) // nur bei Undo
+ if (bUndo) // nur bei Undo
{
// all sheets - CopyToDocument skips those that don't exist in pUndoDoc
SCTAB nTabCount = pDoc->GetTableCount();
@@ -819,7 +819,7 @@ void ScUndoCut::DoChange( const BOOL bUndo )
if ( pChangeTrack )
pChangeTrack->Undo( nStartChangeAction, nEndChangeAction );
}
- else // nur bei Redo
+ else // nur bei Redo
{
pDocShell->UpdatePaintExt( nExtFlags, aExtendedRange );
pDoc->DeleteArea( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(),
@@ -829,10 +829,10 @@ void ScUndoCut::DoChange( const BOOL bUndo )
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if ( !( (pViewShell) && pViewShell->AdjustBlockHeight() ) )
-/*A*/ pDocShell->PostPaint( aExtendedRange, PAINT_GRID, nExtFlags );
+/*A*/ pDocShell->PostPaint( aExtendedRange, PAINT_GRID, nExtFlags );
if ( !bUndo ) // draw redo after updating row heights
- RedoSdrUndoAction( pDrawUndo ); //! include in ScBlockUndo?
+ RedoSdrUndoAction( pDrawUndo ); //! include in ScBlockUndo?
pDocShell->PostDataChanged();
if (pViewShell)
@@ -850,9 +850,9 @@ void __EXPORT ScUndoCut::Redo()
{
BeginRedo();
ScDocument* pDoc = pDocShell->GetDocument();
- EnableDrawAdjust( pDoc, FALSE ); //! include in ScBlockUndo?
+ EnableDrawAdjust( pDoc, FALSE ); //! include in ScBlockUndo?
DoChange( FALSE );
- EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo?
+ EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo?
EndRedo();
}
@@ -870,7 +870,7 @@ BOOL __EXPORT ScUndoCut::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Einfuegen (Paste)
+// Einfuegen (Paste)
//
ScUndoPaste::ScUndoPaste( ScDocShell* pNewDocShell,
@@ -891,18 +891,18 @@ ScUndoPaste::ScUndoPaste( ScDocShell* pNewDocShell,
pRefRedoData( NULL ),
bRedoFilled( bRedoIsFilled )
{
- // pFill1,pFill2,pFill3 are there so the ctor calls for simple paste (without cutting)
- // don't have to be changed and branched for 641.
- // They can be removed later.
+ // pFill1,pFill2,pFill3 are there so the ctor calls for simple paste (without cutting)
+ // don't have to be changed and branched for 641.
+ // They can be removed later.
- if ( !aMarkData.IsMarked() ) // no cell marked:
- aMarkData.SetMarkArea( aBlockRange ); // mark paste block
+ if ( !aMarkData.IsMarked() ) // no cell marked:
+ aMarkData.SetMarkArea( aBlockRange ); // mark paste block
if ( pRefUndoData )
pRefUndoData->DeleteUnchanged( pDocShell->GetDocument() );
if ( pOptions )
- aPasteOptions = *pOptions; // used only for Repeat
+ aPasteOptions = *pOptions; // used only for Repeat
SetChangeTrack();
}
@@ -934,15 +934,15 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
{
ScDocument* pDoc = pDocShell->GetDocument();
- // RefUndoData for redo is created before first undo
- // (with DeleteUnchanged after the DoUndo call)
+ // RefUndoData for redo is created before first undo
+ // (with DeleteUnchanged after the DoUndo call)
BOOL bCreateRedoData = ( bUndo && pRefUndoData && !pRefRedoData );
if ( bCreateRedoData )
pRefRedoData = new ScRefUndoData( pDoc );
ScRefUndoData* pWorkRefData = bUndo ? pRefUndoData : pRefRedoData;
- // fuer Undo immer alle oder keine Inhalte sichern
+ // fuer Undo immer alle oder keine Inhalte sichern
USHORT nUndoFlags = IDF_NONE;
if (nFlags & IDF_CONTENTS)
nUndoFlags |= IDF_CONTENTS;
@@ -1006,7 +1006,7 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
if (pWorkRefData)
{
- pWorkRefData->DoUndo( pDoc, TRUE ); // TRUE = bSetChartRangeLists for SetChartListenerCollection
+ pWorkRefData->DoUndo( pDoc, TRUE ); // TRUE = bSetChartRangeLists for SetChartListenerCollection
if ( pDoc->RefreshAutoFilter( 0,0, MAXCOL,MAXROW, aBlockRange.aStart.Tab() ) )
bPaintAll = TRUE;
}
@@ -1047,22 +1047,22 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
aDrawRange.aEnd.SetCol(MAXCOL);
aDrawRange.aEnd.SetRow(MAXROW);
nPaint |= PAINT_TOP | PAINT_LEFT;
-/*A*/ if (pViewShell)
+/*A*/ if (pViewShell)
pViewShell->AdjustBlockHeight(FALSE);
}
else
{
- if ( aBlockRange.aStart.Row() == 0 && aBlockRange.aEnd.Row() == MAXROW ) // ganze Spalte
+ if ( aBlockRange.aStart.Row() == 0 && aBlockRange.aEnd.Row() == MAXROW ) // ganze Spalte
{
nPaint |= PAINT_TOP;
aDrawRange.aEnd.SetCol(MAXCOL);
}
- if ( aBlockRange.aStart.Col() == 0 && aBlockRange.aEnd.Col() == MAXCOL ) // ganze Zeile
+ if ( aBlockRange.aStart.Col() == 0 && aBlockRange.aEnd.Col() == MAXCOL ) // ganze Zeile
{
nPaint |= PAINT_LEFT;
aDrawRange.aEnd.SetRow(MAXROW);
}
-/*A*/ if ((pViewShell) && pViewShell->AdjustBlockHeight(FALSE))
+/*A*/ if ((pViewShell) && pViewShell->AdjustBlockHeight(FALSE))
{
aDrawRange.aStart.SetCol(0);
aDrawRange.aStart.SetRow(0);
@@ -1074,7 +1074,7 @@ void ScUndoPaste::DoChange( const BOOL bUndo )
}
if ( !bUndo ) // draw redo after updating row heights
- RedoSdrUndoAction( pDrawUndo ); //! include in ScBlockUndo?
+ RedoSdrUndoAction( pDrawUndo ); //! include in ScBlockUndo?
pDocShell->PostPaint( aDrawRange, nPaint, nExtFlags );
@@ -1096,9 +1096,9 @@ void __EXPORT ScUndoPaste::Redo()
{
BeginRedo();
ScDocument* pDoc = pDocShell->GetDocument();
- EnableDrawAdjust( pDoc, FALSE ); //! include in ScBlockUndo?
+ EnableDrawAdjust( pDoc, FALSE ); //! include in ScBlockUndo?
DoChange( FALSE );
- EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo?
+ EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo?
EndRedo();
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
}
@@ -1116,7 +1116,7 @@ void __EXPORT ScUndoPaste::Repeat(SfxRepeatTarget& rTarget)
pViewSh->PasteFromClip( nFlags, pOwnClip->GetDocument(),
aPasteOptions.nFunction, aPasteOptions.bSkipEmpty, aPasteOptions.bTranspose,
aPasteOptions.bAsLink, aPasteOptions.eMoveMode, IDF_NONE,
- TRUE ); // allow warning dialog
+ TRUE ); // allow warning dialog
}
}
}
@@ -1129,7 +1129,7 @@ BOOL __EXPORT ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Verschieben/Kopieren (Drag & Drop)
+// Verschieben/Kopieren (Drag & Drop)
//
ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell,
@@ -1168,7 +1168,7 @@ __EXPORT ScUndoDragDrop::~ScUndoDragDrop()
}
String __EXPORT ScUndoDragDrop::GetComment() const
-{ // "Verschieben" : "Kopieren"
+{ // "Verschieben" : "Kopieren"
return bCut ?
ScGlobal::GetRscString( STR_UNDO_MOVE ) :
ScGlobal::GetRscString( STR_UNDO_COPY );
@@ -1219,14 +1219,14 @@ void ScUndoDragDrop::PaintArea( ScRange aRange, USHORT nExtFlags ) const
if ( bKeepScenarioFlags )
{
- // Szenarien mitkopiert -> auch Szenario-Rahmen painten
+ // Szenarien mitkopiert -> auch Szenario-Rahmen painten
aRange.aStart.SetCol(0);
aRange.aStart.SetRow(0);
aRange.aEnd.SetCol(MAXCOL);
aRange.aEnd.SetRow(MAXROW);
}
- // column/row info (width/height) included if whole columns/rows were copied
+ // column/row info (width/height) included if whole columns/rows were copied
if ( aSrcRange.aStart.Col() == 0 && aSrcRange.aEnd.Col() == MAXCOL )
{
nPaint |= PAINT_LEFT;
@@ -1250,10 +1250,10 @@ void ScUndoDragDrop::DoUndo( ScRange aRange ) const
if ( pChangeTrack )
pChangeTrack->Undo( nStartChangeAction, nEndChangeAction );
-//? DB-Areas vor Daten, damit bei ExtendMerge die Autofilter-Knoepfe stimmen
+//? DB-Areas vor Daten, damit bei ExtendMerge die Autofilter-Knoepfe stimmen
ScRange aPaintRange = aRange;
- pDoc->ExtendMerge( aPaintRange ); // before deleting
+ pDoc->ExtendMerge( aPaintRange ); // before deleting
USHORT nExtFlags = 0;
pDocShell->UpdatePaintExt( nExtFlags, aPaintRange );
@@ -1290,7 +1290,7 @@ void __EXPORT ScUndoDragDrop::Redo()
ScDocument* pDoc = pDocShell->GetDocument();
ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP );
- EnableDrawAdjust( pDoc, FALSE ); //! include in ScBlockUndo?
+ EnableDrawAdjust( pDoc, FALSE ); //! include in ScBlockUndo?
// do not undo/redo objects and note captions, they are handled via drawing undo
USHORT nRedoFlags = (IDF_ALL & ~IDF_OBJECTS) | IDF_NOCAPTIONS;
@@ -1320,7 +1320,7 @@ void __EXPORT ScUndoDragDrop::Redo()
if (bCut)
{
ScRange aSrcPaintRange = aSrcRange;
- pDoc->ExtendMerge( aSrcPaintRange ); // before deleting
+ pDoc->ExtendMerge( aSrcPaintRange ); // before deleting
USHORT nExtFlags = 0;
pDocShell->UpdatePaintExt( nExtFlags, aSrcPaintRange );
pDoc->DeleteAreaTab( aSrcRange, nRedoFlags );
@@ -1360,7 +1360,7 @@ void __EXPORT ScUndoDragDrop::Redo()
ShowTable( aDestRange.aStart.Tab() );
RedoSdrUndoAction( pDrawUndo ); //! include in ScBlockUndo?
- EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo?
+ EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo?
EndRedo();
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
@@ -1372,14 +1372,14 @@ void __EXPORT ScUndoDragDrop::Repeat(SfxRepeatTarget& /* rTarget */)
BOOL __EXPORT ScUndoDragDrop::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- return FALSE; // geht nicht
+ return FALSE; // geht nicht
}
// -----------------------------------------------------------------------
//
-// Liste der Bereichsnamen einfuegen
-// (Einfuegen|Name|Einfuegen =>[Liste])
+// Liste der Bereichsnamen einfuegen
+// (Einfuegen|Name|Einfuegen =>[Liste])
//
ScUndoListNames::ScUndoListNames( ScDocShell* pNewDocShell, const ScRange& rRange,
@@ -1442,13 +1442,13 @@ BOOL __EXPORT ScUndoListNames::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Szenario anwenden
-// (Extras|Szenarien)
+// Szenario anwenden
+// (Extras|Szenarien)
//
ScUndoUseScenario::ScUndoUseScenario( ScDocShell* pNewDocShell,
const ScMarkData& rMark,
-/*C*/ const ScArea& rDestArea,
+/*C*/ const ScArea& rDestArea,
ScDocument* pNewUndoDoc,
const String& rNewName ) :
ScSimpleUndo( pNewDocShell ),
@@ -1489,7 +1489,7 @@ void __EXPORT ScUndoUseScenario::Undo()
pDoc->DeleteSelection( IDF_ALL, aMarkData );
pUndoDoc->CopyToDocument( aRange, IDF_ALL, TRUE, pDoc, &aMarkData );
- // Szenario-Tabellen
+ // Szenario-Tabellen
BOOL bFrame = FALSE;
SCTAB nTab = aRange.aStart.Tab();
SCTAB nEndTab = nTab;
@@ -1497,7 +1497,7 @@ void __EXPORT ScUndoUseScenario::Undo()
++nEndTab;
for (SCTAB i = nTab+1; i<=nEndTab; i++)
{
- // Flags immer
+ // Flags immer
String aComment;
Color aColor;
USHORT nScenFlags;
@@ -1505,7 +1505,7 @@ void __EXPORT ScUndoUseScenario::Undo()
pDoc->SetScenarioData( i, aComment, aColor, nScenFlags );
BOOL bActive = pUndoDoc->IsActiveScenario( i );
pDoc->SetActiveScenario( i, bActive );
- // Bei Zurueckkopier-Szenarios auch Inhalte
+ // Bei Zurueckkopier-Szenarios auch Inhalte
if ( nScenFlags & SC_SCENARIO_TWOWAY )
{
pDoc->DeleteAreaTab( 0,0, MAXCOL,MAXROW, i, IDF_ALL );
@@ -1515,7 +1515,7 @@ void __EXPORT ScUndoUseScenario::Undo()
bFrame = TRUE;
}
- // Wenn sichtbare Rahmen, dann alles painten
+ // Wenn sichtbare Rahmen, dann alles painten
if (bFrame)
pDocShell->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID | PAINT_EXTRAS );
else
@@ -1569,8 +1569,8 @@ BOOL __EXPORT ScUndoUseScenario::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Vorlage anwenden
-// (Format|Vorlagenkatalog)
+// Vorlage anwenden
+// (Format|Vorlagenkatalog)
//
ScUndoSelectionStyle::ScUndoSelectionStyle( ScDocShell* pNewDocShell,
@@ -1606,13 +1606,13 @@ void ScUndoSelectionStyle::DoChange( const BOOL bUndo )
pViewShell->SetMarkData( aMarkData );
ScRange aWorkRange( aRange );
- if ( pDoc->HasAttrib( aWorkRange, HASATTR_MERGED ) ) // zusammengefasste Zellen?
+ if ( pDoc->HasAttrib( aWorkRange, HASATTR_MERGED ) ) // zusammengefasste Zellen?
pDoc->ExtendMerge( aWorkRange, TRUE );
USHORT nExtFlags = 0;
pDocShell->UpdatePaintExt( nExtFlags, aWorkRange );
- if (bUndo) // bei Undo alte Daten wieder reinschubsen
+ if (bUndo) // bei Undo alte Daten wieder reinschubsen
{
SCTAB nTabCount = pDoc->GetTableCount();
ScRange aCopyRange = aWorkRange;
@@ -1620,7 +1620,7 @@ void ScUndoSelectionStyle::DoChange( const BOOL bUndo )
aCopyRange.aEnd.SetTab(nTabCount-1);
pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, TRUE, pDoc, &aMarkData );
}
- else // bei Redo Style wieder zuweisen
+ else // bei Redo Style wieder zuweisen
{
ScStyleSheetPool* pStlPool = pDoc->GetStyleSheetPool();
ScStyleSheet* pStyleSheet =
@@ -1636,7 +1636,7 @@ void ScUndoSelectionStyle::DoChange( const BOOL bUndo )
pDocShell->UpdatePaintExt( nExtFlags, aWorkRange );
if ( !( (pViewShell) && pViewShell->AdjustBlockHeight() ) )
-/*A*/ pDocShell->PostPaint( aWorkRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
+/*A*/ pDocShell->PostPaint( aWorkRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
ShowTable( aWorkRange.aStart.Tab() );
}
@@ -1687,7 +1687,7 @@ USHORT __EXPORT ScUndoSelectionStyle::GetId() const
// -----------------------------------------------------------------------
//
-// Matrix-Formel eingeben
+// Matrix-Formel eingeben
//
ScUndoEnterMatrix::ScUndoEnterMatrix( ScDocShell* pNewDocShell, const ScRange& rArea,
@@ -1754,7 +1754,7 @@ void __EXPORT ScUndoEnterMatrix::Redo()
pDoc->InsertMatrixFormula( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(),
aBlockRange.aEnd.Col(), aBlockRange.aEnd.Row(),
aDestMark, aFormula );
-// pDocShell->PostPaint( aBlockRange, PAINT_GRID ); // nicht noetig ???
+// pDocShell->PostPaint( aBlockRange, PAINT_GRID ); // nicht noetig ???
SetChangeTrack();
@@ -1777,7 +1777,7 @@ BOOL __EXPORT ScUndoEnterMatrix::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Einzug vermindern / erhoehen
+// Einzug vermindern / erhoehen
//
ScRange lcl_GetMultiMarkRange( const ScMarkData& rMark )
@@ -1848,7 +1848,7 @@ BOOL __EXPORT ScUndoIndent::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Transliteration for cells
+// Transliteration for cells
//
ScUndoTransliterate::ScUndoTransliterate( ScDocShell* pNewDocShell, const ScMarkData& rMark,
@@ -1909,7 +1909,7 @@ BOOL __EXPORT ScUndoTransliterate::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// einzelne Items per Which-IDs aus Bereich loeschen
+// einzelne Items per Which-IDs aus Bereich loeschen
//
ScUndoClearItems::ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData& rMark,
@@ -1979,7 +1979,7 @@ BOOL __EXPORT ScUndoClearItems::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Alle Umbrueche einer Tabelle loeschen
+// Alle Umbrueche einer Tabelle loeschen
//
ScUndoRemoveBreaks::ScUndoRemoveBreaks( ScDocShell* pNewDocShell,
@@ -2047,7 +2047,7 @@ BOOL __EXPORT ScUndoRemoveBreaks::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Zusammenfassung aufheben (fuer einen ganzen Bereich)
+// Zusammenfassung aufheben (fuer einen ganzen Bereich)
//
ScUndoRemoveMerge::ScUndoRemoveMerge( ScDocShell* pNewDocShell,
@@ -2064,7 +2064,7 @@ __EXPORT ScUndoRemoveMerge::~ScUndoRemoveMerge()
String __EXPORT ScUndoRemoveMerge::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_REMERGE ); // "Zusammenfassung aufheben"
+ return ScGlobal::GetRscString( STR_UNDO_REMERGE ); // "Zusammenfassung aufheben"
}
void __EXPORT ScUndoRemoveMerge::Undo()
@@ -2103,7 +2103,7 @@ void __EXPORT ScUndoRemoveMerge::Redo()
ScRange aRefresh = aExtended;
pDoc->ExtendOverlapped( aRefresh );
- // ausfuehren
+ // ausfuehren
const SfxPoolItem& rDefAttr = pDoc->GetPool()->GetDefaultItem( ATTR_MERGE );
ScPatternAttr aPattern( pDoc->GetPool() );
@@ -2118,7 +2118,7 @@ void __EXPORT ScUndoRemoveMerge::Redo()
pDoc->ExtendMerge( aRefresh, TRUE, FALSE );
- // Paint
+ // Paint
BOOL bDidPaint = FALSE;
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
@@ -2146,7 +2146,7 @@ BOOL __EXPORT ScUndoRemoveMerge::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// nur Umrandung setzen, per ScRangeList (StarOne)
+// nur Umrandung setzen, per ScRangeList (StarOne)
//
ScRange lcl_TotalRange( const ScRangeList& rRanges )
@@ -2198,7 +2198,7 @@ __EXPORT ScUndoBorder::~ScUndoBorder()
String __EXPORT ScUndoBorder::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_SELATTRLINES ); //! eigener String?
+ return ScGlobal::GetRscString( STR_UNDO_SELATTRLINES ); //! eigener String?
}
void __EXPORT ScUndoBorder::Undo()
@@ -2218,7 +2218,7 @@ void __EXPORT ScUndoBorder::Redo()
{
BeginRedo();
- ScDocument* pDoc = pDocShell->GetDocument(); //! Funktion an docfunc aufrufen
+ ScDocument* pDoc = pDocShell->GetDocument(); //! Funktion an docfunc aufrufen
ULONG nCount = pRanges->Count();
ULONG i;
for (i=0; i<nCount; i++)
@@ -2240,12 +2240,12 @@ void __EXPORT ScUndoBorder::Redo()
void __EXPORT ScUndoBorder::Repeat(SfxRepeatTarget& /* rTarget */)
{
- //! spaeter (wenn die Funktion aus cellsuno nach docfunc gewandert ist)
+ //! spaeter (wenn die Funktion aus cellsuno nach docfunc gewandert ist)
}
BOOL __EXPORT ScUndoBorder::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- return FALSE; // s.o.
+ return FALSE; // s.o.
}
diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx
index 2ab03eb71923..bf9540ce7cf1 100644
--- a/sc/source/ui/undo/undoblk2.cxx
+++ b/sc/source/ui/undo/undoblk2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +52,14 @@
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1(ScUndoWidthOrHeight, SfxUndoAction);
+TYPEINIT1(ScUndoWidthOrHeight, SfxUndoAction);
// -----------------------------------------------------------------------
//
-// Spaltenbreiten oder Zeilenhoehen aendern
+// Spaltenbreiten oder Zeilenhoehen aendern
//
ScUndoWidthOrHeight::ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
@@ -123,12 +123,12 @@ void __EXPORT ScUndoWidthOrHeight::Undo()
{
pViewShell->SetMarkData( aMarkData );
- nPaintStart = 0; // paint all, because of changed selection
+ nPaintStart = 0; // paint all, because of changed selection
}
}
- //! outlines from all tables?
- if (pUndoTab) // Outlines mit gespeichert?
+ //! outlines from all tables?
+ if (pUndoTab) // Outlines mit gespeichert?
pDoc->SetOutlineTable( nStartTab, pUndoTab );
SCTAB nTabCount = pDoc->GetTableCount();
@@ -136,7 +136,7 @@ void __EXPORT ScUndoWidthOrHeight::Undo()
for (nTab=0; nTab<nTabCount; nTab++)
if (aMarkData.GetTableSelect(nTab))
{
- if (bWidth) // Width
+ if (bWidth) // Width
{
pUndoDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab,
static_cast<SCCOL>(nEnd), MAXROW, nTab, IDF_NONE,
@@ -145,7 +145,7 @@ void __EXPORT ScUndoWidthOrHeight::Undo()
pDocShell->PostPaint( static_cast<SCCOL>(nPaintStart), 0, nTab,
MAXCOL, MAXROW, nTab, PAINT_GRID | PAINT_TOP );
}
- else // Height
+ else // Height
{
pUndoDoc->CopyToDocument( 0, nStart, nTab, MAXCOL, nEnd, nTab, IDF_NONE, FALSE, pDoc );
pDoc->UpdatePageBreaks( nTab );
@@ -180,7 +180,7 @@ void __EXPORT ScUndoWidthOrHeight::Redo()
{
pViewShell->SetMarkData( aMarkData );
- bPaintAll = TRUE; // paint all, because of changed selection
+ bPaintAll = TRUE; // paint all, because of changed selection
}
}
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 506afeac138e..0a6325198b18 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,30 +62,30 @@
// STATIC DATA ---------------------------------------------------------------
-TYPEINIT1(ScUndoDeleteContents, SfxUndoAction);
-TYPEINIT1(ScUndoFillTable, SfxUndoAction);
-TYPEINIT1(ScUndoSelectionAttr, SfxUndoAction);
-TYPEINIT1(ScUndoAutoFill, SfxUndoAction);
-TYPEINIT1(ScUndoMerge, SfxUndoAction);
-TYPEINIT1(ScUndoAutoFormat, SfxUndoAction);
-TYPEINIT1(ScUndoReplace, SfxUndoAction);
-TYPEINIT1(ScUndoTabOp, SfxUndoAction);
+TYPEINIT1(ScUndoDeleteContents, SfxUndoAction);
+TYPEINIT1(ScUndoFillTable, SfxUndoAction);
+TYPEINIT1(ScUndoSelectionAttr, SfxUndoAction);
+TYPEINIT1(ScUndoAutoFill, SfxUndoAction);
+TYPEINIT1(ScUndoMerge, SfxUndoAction);
+TYPEINIT1(ScUndoAutoFormat, SfxUndoAction);
+TYPEINIT1(ScUndoReplace, SfxUndoAction);
+TYPEINIT1(ScUndoTabOp, SfxUndoAction);
TYPEINIT1(ScUndoConversion, SfxUndoAction);
TYPEINIT1(ScUndoRefConversion, SfxUndoAction);
-TYPEINIT1(ScUndoRefreshLink, SfxUndoAction);
-TYPEINIT1(ScUndoInsertAreaLink, SfxUndoAction);
-TYPEINIT1(ScUndoRemoveAreaLink, SfxUndoAction);
-TYPEINIT1(ScUndoUpdateAreaLink, SfxUndoAction);
+TYPEINIT1(ScUndoRefreshLink, SfxUndoAction);
+TYPEINIT1(ScUndoInsertAreaLink, SfxUndoAction);
+TYPEINIT1(ScUndoRemoveAreaLink, SfxUndoAction);
+TYPEINIT1(ScUndoUpdateAreaLink, SfxUndoAction);
// To Do:
-/*A*/ // SetOptimalHeight auf Dokument, wenn keine View
+/*A*/ // SetOptimalHeight auf Dokument, wenn keine View
//============================================================================
-// class ScUndoDeleteContents
+// class ScUndoDeleteContents
//
-// Inhalte loeschen
+// Inhalte loeschen
//----------------------------------------------------------------------------
@@ -95,20 +95,20 @@ ScUndoDeleteContents::ScUndoDeleteContents(
ScDocument* pNewUndoDoc, BOOL bNewMulti,
USHORT nNewFlags, BOOL bObjects )
//
- : ScSimpleUndo( pNewDocShell ),
+ : ScSimpleUndo( pNewDocShell ),
//
- aRange ( rRange ),
- aMarkData ( rMark ),
- pUndoDoc ( pNewUndoDoc ),
- pDrawUndo ( NULL ),
- nFlags ( nNewFlags ),
- bMulti ( bNewMulti ) // ueberliquid
+ aRange ( rRange ),
+ aMarkData ( rMark ),
+ pUndoDoc ( pNewUndoDoc ),
+ pDrawUndo ( NULL ),
+ nFlags ( nNewFlags ),
+ bMulti ( bNewMulti ) // ueberliquid
{
if (bObjects)
pDrawUndo = GetSdrUndoAction( pDocShell->GetDocument() );
- if ( !(aMarkData.IsMarked() || aMarkData.IsMultiMarked()) ) // keine Zelle markiert:
- aMarkData.SetMarkArea( aRange ); // Zelle unter Cursor markieren
+ if ( !(aMarkData.IsMarked() || aMarkData.IsMultiMarked()) ) // keine Zelle markiert:
+ aMarkData.SetMarkArea( aRange ); // Zelle unter Cursor markieren
SetChangeTrack();
}
@@ -127,7 +127,7 @@ __EXPORT ScUndoDeleteContents::~ScUndoDeleteContents()
String __EXPORT ScUndoDeleteContents::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); // "Loeschen"
+ return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS ); // "Loeschen"
}
@@ -154,15 +154,15 @@ void ScUndoDeleteContents::DoChange( const BOOL bUndo )
USHORT nExtFlags = 0;
- if (bUndo) // nur Undo
+ if (bUndo) // nur Undo
{
- USHORT nUndoFlags = IDF_NONE; // entweder alle oder keine Inhalte kopieren
- if (nFlags & IDF_CONTENTS) // (es sind nur die richtigen ins UndoDoc kopiert worden)
+ USHORT nUndoFlags = IDF_NONE; // entweder alle oder keine Inhalte kopieren
+ if (nFlags & IDF_CONTENTS) // (es sind nur die richtigen ins UndoDoc kopiert worden)
nUndoFlags |= IDF_CONTENTS;
if (nFlags & IDF_ATTRIB)
nUndoFlags |= IDF_ATTRIB;
- if (nFlags & IDF_EDITATTR) // Edit-Engine-Attribute
- nUndoFlags |= IDF_STRING; // -> Zellen werden geaendert
+ if (nFlags & IDF_EDITATTR) // Edit-Engine-Attribute
+ nUndoFlags |= IDF_STRING; // -> Zellen werden geaendert
// do not create clones of note captions, they will be restored via drawing undo
nUndoFlags |= IDF_NOCAPTIONS;
@@ -179,11 +179,11 @@ void ScUndoDeleteContents::DoChange( const BOOL bUndo )
if ( pChangeTrack )
pChangeTrack->Undo( nStartChangeAction, nEndChangeAction );
- pDocShell->UpdatePaintExt( nExtFlags, aRange ); // content after the change
+ pDocShell->UpdatePaintExt( nExtFlags, aRange ); // content after the change
}
- else // nur Redo
+ else // nur Redo
{
- pDocShell->UpdatePaintExt( nExtFlags, aRange ); // content before the change
+ pDocShell->UpdatePaintExt( nExtFlags, aRange ); // content before the change
aMarkData.MarkToMulti();
RedoSdrUndoAction( pDrawUndo );
@@ -197,7 +197,7 @@ void ScUndoDeleteContents::DoChange( const BOOL bUndo )
if ( !( (pViewShell) && pViewShell->AdjustRowHeight(
aRange.aStart.Row(), aRange.aEnd.Row() ) ) )
-/*A*/ pDocShell->PostPaint( aRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
+/*A*/ pDocShell->PostPaint( aRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
pDocShell->PostDataChanged();
if (pViewShell)
@@ -263,10 +263,10 @@ BOOL __EXPORT ScUndoDeleteContents::CanRepeat(SfxRepeatTarget& rTarget) const
//============================================================================
-// class ScUndoFillTable
+// class ScUndoFillTable
//
-// Tabellen ausfuellen
-// (Bearbeiten|Ausfuellen|...)
+// Tabellen ausfuellen
+// (Bearbeiten|Ausfuellen|...)
//----------------------------------------------------------------------------
@@ -277,17 +277,17 @@ ScUndoFillTable::ScUndoFillTable( ScDocShell* pNewDocShell,
ScDocument* pNewUndoDoc, BOOL bNewMulti, SCTAB nSrc,
USHORT nFlg, USHORT nFunc, BOOL bSkip, BOOL bLink )
//
- : ScSimpleUndo( pNewDocShell ),
+ : ScSimpleUndo( pNewDocShell ),
//
- aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
- aMarkData ( rMark ),
- pUndoDoc ( pNewUndoDoc ),
- nFlags ( nFlg ),
- nFunction ( nFunc ),
- nSrcTab ( nSrc ),
- bMulti ( bNewMulti ),
- bSkipEmpty ( bSkip ),
- bAsLink ( bLink )
+ aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
+ aMarkData ( rMark ),
+ pUndoDoc ( pNewUndoDoc ),
+ nFlags ( nFlg ),
+ nFunction ( nFunc ),
+ nSrcTab ( nSrc ),
+ bMulti ( bNewMulti ),
+ bSkipEmpty ( bSkip ),
+ bAsLink ( bLink )
{
SetChangeTrack();
}
@@ -346,7 +346,7 @@ void ScUndoFillTable::DoChange( const BOOL bUndo )
if (pViewShell)
pViewShell->SetMarkData( aMarkData );
- if (bUndo) // nur Undo
+ if (bUndo) // nur Undo
{
SCTAB nTabCount = pDoc->GetTableCount();
ScRange aWorkRange(aRange);
@@ -366,7 +366,7 @@ void ScUndoFillTable::DoChange( const BOOL bUndo )
if ( pChangeTrack )
pChangeTrack->Undo( nStartChangeAction, nEndChangeAction );
}
- else // nur Redo
+ else // nur Redo
{
aMarkData.MarkToMulti();
pDoc->FillTabMarked( nSrcTab, aMarkData, nFlags, nFunction, bSkipEmpty, bAsLink );
@@ -377,7 +377,7 @@ void ScUndoFillTable::DoChange( const BOOL bUndo )
pDocShell->PostPaint(0,0,0,MAXCOL,MAXROW,MAXTAB, PAINT_GRID|PAINT_EXTRAS);
pDocShell->PostDataChanged();
- // CellContentChanged kommt mit der Markierung
+ // CellContentChanged kommt mit der Markierung
if (pViewShell)
{
@@ -385,7 +385,7 @@ void ScUndoFillTable::DoChange( const BOOL bUndo )
if ( !aMarkData.GetTableSelect(nTab) )
pViewShell->SetTabNo( nSrcTab );
- pViewShell->DoneBlockMode(); // gibt sonst Probleme, weil Markierung auf falscher Tabelle
+ pViewShell->DoneBlockMode(); // gibt sonst Probleme, weil Markierung auf falscher Tabelle
}
}
@@ -428,9 +428,9 @@ BOOL __EXPORT ScUndoFillTable::CanRepeat(SfxRepeatTarget& rTarget) const
//============================================================================
-// class ScUndoSelectionAttr
+// class ScUndoSelectionAttr
//
-// Zellformat aendern
+// Zellformat aendern
//----------------------------------------------------------------------------
@@ -442,12 +442,12 @@ ScUndoSelectionAttr::ScUndoSelectionAttr( ScDocShell* pNewDocShell,
const ScPatternAttr* pNewApply,
const SvxBoxItem* pNewOuter, const SvxBoxInfoItem* pNewInner )
//
- : ScSimpleUndo( pNewDocShell ),
+ : ScSimpleUndo( pNewDocShell ),
//
- aMarkData ( rMark ),
- aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
- pUndoDoc ( pNewUndoDoc ),
- bMulti ( bNewMulti )
+ aMarkData ( rMark ),
+ aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
+ pUndoDoc ( pNewUndoDoc ),
+ bMulti ( bNewMulti )
{
ScDocumentPool* pPool = pDocShell->GetDocument()->GetPool();
pApplyPattern = (ScPatternAttr*) &pPool->Put( *pNewApply );
@@ -491,13 +491,13 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo )
pViewShell->SetMarkData( aMarkData );
ScRange aEffRange( aRange );
- if ( pDoc->HasAttrib( aEffRange, HASATTR_MERGED ) ) // zusammengefasste Zellen?
+ if ( pDoc->HasAttrib( aEffRange, HASATTR_MERGED ) ) // zusammengefasste Zellen?
pDoc->ExtendMerge( aEffRange );
USHORT nExtFlags = 0;
pDocShell->UpdatePaintExt( nExtFlags, aEffRange );
- if (bUndo) // nur bei Undo
+ if (bUndo) // nur bei Undo
{
ScRange aCopyRange = aRange;
SCTAB nTabCount = pDoc->GetTableCount();
@@ -505,7 +505,7 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo )
aCopyRange.aEnd.SetTab(nTabCount-1);
pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, bMulti, pDoc, &aMarkData );
}
- else // nur bei Redo
+ else // nur bei Redo
{
aMarkData.MarkToMulti();
pDoc->ApplySelectionPattern( *pApplyPattern, aMarkData );
@@ -516,7 +516,7 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo )
}
if ( !( (pViewShell) && pViewShell->AdjustBlockHeight() ) )
-/*A*/ pDocShell->PostPaint( aEffRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
+/*A*/ pDocShell->PostPaint( aEffRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
ShowTable( aRange );
}
@@ -566,9 +566,9 @@ BOOL __EXPORT ScUndoSelectionAttr::CanRepeat(SfxRepeatTarget& rTarget) const
//============================================================================
-// class ScUndoAutoFill
+// class ScUndoAutoFill
//
-// Auto-Fill (nur einfache Bloecke)
+// Auto-Fill (nur einfache Bloecke)
//----------------------------------------------------------------------------
@@ -579,18 +579,18 @@ ScUndoAutoFill::ScUndoAutoFill( ScDocShell* pNewDocShell,
double fNewStartValue, double fNewStepValue, double fNewMaxValue,
USHORT nMaxShIndex )
//
- : ScBlockUndo( pNewDocShell, rRange, SC_UNDO_AUTOHEIGHT ),
+ : ScBlockUndo( pNewDocShell, rRange, SC_UNDO_AUTOHEIGHT ),
//
- aSource ( rSourceArea ),
- aMarkData ( rMark ),
- pUndoDoc ( pNewUndoDoc ),
- eFillDir ( eNewFillDir ),
- eFillCmd ( eNewFillCmd ),
- eFillDateCmd ( eNewFillDateCmd ),
- fStartValue ( fNewStartValue ),
- fStepValue ( fNewStepValue ),
- fMaxValue ( fNewMaxValue ),
- nMaxSharedIndex ( nMaxShIndex)
+ aSource ( rSourceArea ),
+ aMarkData ( rMark ),
+ pUndoDoc ( pNewUndoDoc ),
+ eFillDir ( eNewFillDir ),
+ eFillCmd ( eNewFillCmd ),
+ eFillDateCmd ( eNewFillDateCmd ),
+ fStartValue ( fNewStartValue ),
+ fStepValue ( fNewStepValue ),
+ fMaxValue ( fNewMaxValue ),
+ nMaxSharedIndex ( nMaxShIndex)
{
SetChangeTrack();
}
@@ -696,7 +696,7 @@ void __EXPORT ScUndoAutoFill::Redo()
{
BeginRedo();
-//! Tabellen selektieren
+//! Tabellen selektieren
SCCOLROW nCount = 0;
switch (eFillDir)
@@ -766,9 +766,9 @@ BOOL __EXPORT ScUndoAutoFill::CanRepeat(SfxRepeatTarget& rTarget) const
//============================================================================
-// class ScUndoMerge
+// class ScUndoMerge
//
-// Zellen zusammenfassen / Zusammenfassung aufheben
+// Zellen zusammenfassen / Zusammenfassung aufheben
//----------------------------------------------------------------------------
@@ -777,7 +777,7 @@ ScUndoMerge::ScUndoMerge( ScDocShell* pNewDocShell,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo )
//
- : ScSimpleUndo( pNewDocShell ),
+ : ScSimpleUndo( pNewDocShell ),
//
maRange( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
mbMergeContents( bMergeContents ),
@@ -817,7 +817,7 @@ void ScUndoMerge::DoChange( bool bUndo ) const
pDoc->RemoveMerge( maRange.aStart.Col(), maRange.aStart.Row(), maRange.aStart.Tab() );
else
// repeat merge, but do not remove note captions (will be done by drawing redo below)
-/*!*/ pDoc->DoMerge( maRange.aStart.Tab(),
+/*!*/ pDoc->DoMerge( maRange.aStart.Tab(),
maRange.aStart.Col(), maRange.aStart.Row(),
maRange.aEnd.Col(), maRange.aEnd.Row(), false );
@@ -898,9 +898,9 @@ BOOL ScUndoMerge::CanRepeat(SfxRepeatTarget& rTarget) const
//============================================================================
-// class ScUndoAutoFormat
+// class ScUndoAutoFormat
//
-// Auto-Format (nur einfache Bloecke)
+// Auto-Format (nur einfache Bloecke)
//----------------------------------------------------------------------------
@@ -908,12 +908,12 @@ ScUndoAutoFormat::ScUndoAutoFormat( ScDocShell* pNewDocShell,
const ScRange& rRange, ScDocument* pNewUndoDoc,
const ScMarkData& rMark, BOOL bNewSize, USHORT nNewFormatNo )
//
- : ScBlockUndo( pNewDocShell, rRange, bNewSize ? SC_UNDO_MANUALHEIGHT : SC_UNDO_AUTOHEIGHT ),
+ : ScBlockUndo( pNewDocShell, rRange, bNewSize ? SC_UNDO_MANUALHEIGHT : SC_UNDO_AUTOHEIGHT ),
//
- pUndoDoc ( pNewUndoDoc ),
- aMarkData ( rMark ),
- bSize ( bNewSize ),
- nFormatNo ( nNewFormatNo )
+ pUndoDoc ( pNewUndoDoc ),
+ aMarkData ( rMark ),
+ bSize ( bNewSize ),
+ nFormatNo ( nNewFormatNo )
{
}
@@ -930,7 +930,7 @@ __EXPORT ScUndoAutoFormat::~ScUndoAutoFormat()
String __EXPORT ScUndoAutoFormat::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_AUTOFORMAT ); //"Auto-Format"
+ return ScGlobal::GetRscString( STR_UNDO_AUTOFORMAT ); //"Auto-Format"
}
@@ -943,8 +943,8 @@ void __EXPORT ScUndoAutoFormat::Undo()
ScDocument* pDoc = pDocShell->GetDocument();
// Attribute
-// pDoc->DeleteAreaTab( aBlockRange, IDF_ATTRIB );
-// pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, FALSE, pDoc );
+// pDoc->DeleteAreaTab( aBlockRange, IDF_ATTRIB );
+// pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, FALSE, pDoc );
SCTAB nTabCount = pDoc->GetTableCount();
pDoc->DeleteArea( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(),
@@ -1013,12 +1013,12 @@ void __EXPORT ScUndoAutoFormat::Redo()
}
else
{
- // Zoom auf 100 lassen
+ // Zoom auf 100 lassen
nPPTX = ScGlobal::nScreenPPTX;
nPPTY = ScGlobal::nScreenPPTY;
}
- BOOL bFormula = FALSE; //! merken
+ BOOL bFormula = FALSE; //! merken
for (SCTAB nTab=nStartZ; nTab<=nEndZ; nTab++)
{
@@ -1080,9 +1080,9 @@ BOOL __EXPORT ScUndoAutoFormat::CanRepeat(SfxRepeatTarget& rTarget) const
//============================================================================
-// class ScUndoReplace
+// class ScUndoReplace
//
-// Ersetzen
+// Ersetzen
//----------------------------------------------------------------------------
@@ -1091,12 +1091,12 @@ ScUndoReplace::ScUndoReplace( ScDocShell* pNewDocShell, const ScMarkData& rMark,
const String& rNewUndoStr, ScDocument* pNewUndoDoc,
const SvxSearchItem* pItem )
//
- : ScSimpleUndo( pNewDocShell ),
+ : ScSimpleUndo( pNewDocShell ),
//
- aCursorPos ( nCurX, nCurY, nCurZ ),
- aMarkData ( rMark ),
- aUndoStr ( rNewUndoStr ),
- pUndoDoc ( pNewUndoDoc )
+ aCursorPos ( nCurX, nCurY, nCurZ ),
+ aMarkData ( rMark ),
+ aUndoStr ( rNewUndoStr ),
+ pUndoDoc ( pNewUndoDoc )
{
pSearchItem = new SvxSearchItem( *pItem );
SetChangeTrack();
@@ -1121,10 +1121,10 @@ void ScUndoReplace::SetChangeTrack()
if ( pChangeTrack )
{
if ( pUndoDoc )
- { //! im UndoDoc stehen nur die geaenderten Zellen,
+ { //! im UndoDoc stehen nur die geaenderten Zellen,
// deswegen per Iterator moeglich
pChangeTrack->AppendContentsIfInRefDoc( pUndoDoc,
- nStartChangeAction, nEndChangeAction );
+ nStartChangeAction, nEndChangeAction );
}
else
{
@@ -1145,7 +1145,7 @@ void ScUndoReplace::SetChangeTrack()
String __EXPORT ScUndoReplace::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_REPLACE ); // "Ersetzen"
+ return ScGlobal::GetRscString( STR_UNDO_REPLACE ); // "Ersetzen"
}
@@ -1160,7 +1160,7 @@ void __EXPORT ScUndoReplace::Undo()
ShowTable( aCursorPos.Tab() );
- if (pUndoDoc) // nur bei ReplaceAll !!
+ if (pUndoDoc) // nur bei ReplaceAll !!
{
DBG_ASSERT(pSearchItem->GetCommand() == SVX_SEARCHCMD_REPLACE_ALL,
"ScUndoReplace:: Falscher Modus");
@@ -1168,22 +1168,22 @@ void __EXPORT ScUndoReplace::Undo()
if (pViewShell)
pViewShell->SetMarkData( aMarkData );
-//! markierte Tabellen
-//! Bereich merken ?
+//! markierte Tabellen
+//! Bereich merken ?
- // Undo-Dokument hat keine Zeilen-/Spalten-Infos, also mit bColRowFlags = FALSE
- // kopieren, um Outline-Gruppen nicht kaputtzumachen.
+ // Undo-Dokument hat keine Zeilen-/Spalten-Infos, also mit bColRowFlags = FALSE
+ // kopieren, um Outline-Gruppen nicht kaputtzumachen.
USHORT nUndoFlags = (pSearchItem->GetPattern()) ? IDF_ATTRIB : IDF_CONTENTS;
pUndoDoc->CopyToDocument( 0, 0, 0,
MAXCOL, MAXROW, MAXTAB,
- nUndoFlags, FALSE, pDoc, NULL, FALSE ); // ohne Row-Flags
+ nUndoFlags, FALSE, pDoc, NULL, FALSE ); // ohne Row-Flags
pDocShell->PostPaintGridAll();
}
else if (pSearchItem->GetPattern() &&
pSearchItem->GetCommand() == SVX_SEARCHCMD_REPLACE)
{
- String aTempStr = pSearchItem->GetSearchString(); // vertauschen
+ String aTempStr = pSearchItem->GetSearchString(); // vertauschen
pSearchItem->SetSearchString(pSearchItem->GetReplaceString());
pSearchItem->SetReplaceString(aTempStr);
pDoc->ReplaceStyle( *pSearchItem,
@@ -1284,9 +1284,9 @@ BOOL __EXPORT ScUndoReplace::CanRepeat(SfxRepeatTarget& rTarget) const
//============================================================================
-// class ScUndoTabOp
+// class ScUndoTabOp
//
-// Mehrfachoperation (nur einfache Bloecke)
+// Mehrfachoperation (nur einfache Bloecke)
//----------------------------------------------------------------------------
@@ -1299,15 +1299,15 @@ ScUndoTabOp::ScUndoTabOp( ScDocShell* pNewDocShell,
const ScRefAddress& rColCell,
BYTE nMd )
//
- : ScSimpleUndo( pNewDocShell ),
+ : ScSimpleUndo( pNewDocShell ),
//
- aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
- pUndoDoc ( pNewUndoDoc ),
- theFormulaCell ( rFormulaCell ),
- theFormulaEnd ( rFormulaEnd ),
- theRowCell ( rRowCell ),
- theColCell ( rColCell ),
- nMode ( nMd )
+ aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
+ pUndoDoc ( pNewUndoDoc ),
+ theFormulaCell ( rFormulaCell ),
+ theFormulaEnd ( rFormulaEnd ),
+ theRowCell ( rRowCell ),
+ theColCell ( rColCell ),
+ nMode ( nMd )
{
}
@@ -1324,7 +1324,7 @@ __EXPORT ScUndoTabOp::~ScUndoTabOp()
String __EXPORT ScUndoTabOp::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_TABOP ); // "Mehrfachoperation"
+ return ScGlobal::GetRscString( STR_UNDO_TABOP ); // "Mehrfachoperation"
}
@@ -1390,7 +1390,7 @@ BOOL __EXPORT ScUndoTabOp::CanRepeat(SfxRepeatTarget& /* rTarget */) const
//============================================================================
// class ScUndoConversion
//
-// Spelling
+// Spelling
//----------------------------------------------------------------------------
@@ -1471,7 +1471,7 @@ void ScUndoConversion::DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPo
pViewShell->SetMarkData( aMarkData );
SCTAB nTabCount = pDoc->GetTableCount();
- // Undo/Redo-doc has only selected tables
+ // Undo/Redo-doc has only selected tables
BOOL bMulti = aMarkData.IsMultiMarked();
pRefDoc->CopyToDocument( 0, 0, 0,
@@ -1530,7 +1530,7 @@ BOOL ScUndoConversion::CanRepeat(SfxRepeatTarget& rTarget) const
//============================================================================
// class ScUndoRefConversion
//
-// cell reference conversion
+// cell reference conversion
//----------------------------------------------------------------------------
@@ -1539,9 +1539,9 @@ ScUndoRefConversion::ScUndoRefConversion( ScDocShell* pNewDocShell,
ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, BOOL bNewMulti, USHORT nNewFlag) :
ScSimpleUndo( pNewDocShell ),
aMarkData ( rMark ),
-pUndoDoc ( pNewUndoDoc ),
-pRedoDoc ( pNewRedoDoc ),
-aRange ( aMarkRange ),
+pUndoDoc ( pNewUndoDoc ),
+pRedoDoc ( pNewRedoDoc ),
+aRange ( aMarkRange ),
bMulti ( bNewMulti ),
nFlags ( nNewFlag )
{
@@ -1620,16 +1620,16 @@ BOOL __EXPORT ScUndoRefConversion::CanRepeat(SfxRepeatTarget& rTarget) const
return (rTarget.ISA(ScTabViewTarget));
}
//============================================================================
-// class ScUndoRefreshLink
+// class ScUndoRefreshLink
//
-// Link aktualisieren / aendern
+// Link aktualisieren / aendern
//----------------------------------------------------------------------------
ScUndoRefreshLink::ScUndoRefreshLink( ScDocShell* pNewDocShell,
ScDocument* pNewUndoDoc )
//
- : ScSimpleUndo( pNewDocShell ),
+ : ScSimpleUndo( pNewDocShell ),
//
pUndoDoc( pNewUndoDoc ),
pRedoDoc( NULL )
@@ -1679,7 +1679,7 @@ void __EXPORT ScUndoRefreshLink::Undo()
pRedoDoc->AddUndoTab( nTab, nTab, TRUE, TRUE );
bFirst = FALSE;
pDoc->CopyToDocument(aRange, IDF_ALL, FALSE, pRedoDoc);
-// pRedoDoc->TransferDrawPage( pDoc, nTab, nTab );
+// pRedoDoc->TransferDrawPage( pDoc, nTab, nTab );
pRedoDoc->SetLink( nTab,
pDoc->GetLinkMode(nTab),
pDoc->GetLinkDoc(nTab),
@@ -1691,7 +1691,7 @@ void __EXPORT ScUndoRefreshLink::Undo()
pDoc->DeleteAreaTab( aRange,IDF_ALL );
pUndoDoc->CopyToDocument( aRange, IDF_ALL, FALSE, pDoc );
-// pDoc->TransferDrawPage( pUndoDoc, nTab, nTab );
+// pDoc->TransferDrawPage( pUndoDoc, nTab, nTab );
pDoc->SetLink( nTab, pUndoDoc->GetLinkMode(nTab), pUndoDoc->GetLinkDoc(nTab),
pUndoDoc->GetLinkFlt(nTab), pUndoDoc->GetLinkOpt(nTab),
pUndoDoc->GetLinkTab(nTab),
@@ -1721,7 +1721,7 @@ void __EXPORT ScUndoRefreshLink::Redo()
pDoc->DeleteAreaTab( aRange, IDF_ALL );
pRedoDoc->CopyToDocument( aRange, IDF_ALL, FALSE, pDoc );
-// pDoc->TransferDrawPage( pRedoDoc, nTab, nTab );
+// pDoc->TransferDrawPage( pRedoDoc, nTab, nTab );
pDoc->SetLink( nTab,
pRedoDoc->GetLinkMode(nTab),
pRedoDoc->GetLinkDoc(nTab),
@@ -1741,7 +1741,7 @@ void __EXPORT ScUndoRefreshLink::Redo()
void __EXPORT ScUndoRefreshLink::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // gippsnich
+ // gippsnich
}
@@ -1775,9 +1775,9 @@ ScAreaLink* lcl_FindAreaLink( sfx2::LinkManager* pLinkManager, const String& rDo
//============================================================================
-// class ScUndoInsertAreaLink
+// class ScUndoInsertAreaLink
//
-// Bereichs-Verknuepfung einfuegen
+// Bereichs-Verknuepfung einfuegen
//----------------------------------------------------------------------------
@@ -1787,14 +1787,14 @@ ScUndoInsertAreaLink::ScUndoInsertAreaLink( ScDocShell* pShell,
const String& rArea, const ScRange& rDestRange,
ULONG nRefresh )
//
- : ScSimpleUndo ( pShell ),
+ : ScSimpleUndo ( pShell ),
//
- aDocName ( rDoc ),
- aFltName ( rFlt ),
- aOptions ( rOpt ),
- aAreaName ( rArea ),
- aRange ( rDestRange ),
- nRefreshDelay ( nRefresh )
+ aDocName ( rDoc ),
+ aFltName ( rFlt ),
+ aOptions ( rOpt ),
+ aAreaName ( rArea ),
+ aRange ( rDestRange ),
+ nRefreshDelay ( nRefresh )
{
}
@@ -1826,7 +1826,7 @@ void __EXPORT ScUndoInsertAreaLink::Undo()
if (pLink)
pLinkManager->Remove( pLink );
- SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
}
@@ -1845,7 +1845,7 @@ void __EXPORT ScUndoInsertAreaLink::Redo()
pLink->Update();
pLink->SetInCreate( FALSE );
- SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
}
@@ -1853,7 +1853,7 @@ void __EXPORT ScUndoInsertAreaLink::Redo()
void __EXPORT ScUndoInsertAreaLink::Repeat(SfxRepeatTarget& /* rTarget */)
{
- //! ....
+ //! ....
}
@@ -1866,9 +1866,9 @@ BOOL __EXPORT ScUndoInsertAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) co
//============================================================================
-// class ScUndoRemoveAreaLink
+// class ScUndoRemoveAreaLink
//
-// Bereichs-Verknuepfung loeschen
+// Bereichs-Verknuepfung loeschen
//----------------------------------------------------------------------------
@@ -1877,14 +1877,14 @@ ScUndoRemoveAreaLink::ScUndoRemoveAreaLink( ScDocShell* pShell,
const String& rArea, const ScRange& rDestRange,
ULONG nRefresh )
//
- : ScSimpleUndo ( pShell ),
+ : ScSimpleUndo ( pShell ),
//
- aDocName ( rDoc ),
- aFltName ( rFlt ),
- aOptions ( rOpt ),
- aAreaName ( rArea ),
- aRange ( rDestRange ),
- nRefreshDelay ( nRefresh )
+ aDocName ( rDoc ),
+ aFltName ( rFlt ),
+ aOptions ( rOpt ),
+ aAreaName ( rArea ),
+ aRange ( rDestRange ),
+ nRefreshDelay ( nRefresh )
{
}
@@ -1900,7 +1900,7 @@ __EXPORT ScUndoRemoveAreaLink::~ScUndoRemoveAreaLink()
String __EXPORT ScUndoRemoveAreaLink::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_REMOVELINK ); //! eigener Text ??
+ return ScGlobal::GetRscString( STR_UNDO_REMOVELINK ); //! eigener Text ??
}
@@ -1919,7 +1919,7 @@ void __EXPORT ScUndoRemoveAreaLink::Undo()
pLink->Update();
pLink->SetInCreate( FALSE );
- SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
}
@@ -1935,7 +1935,7 @@ void __EXPORT ScUndoRemoveAreaLink::Redo()
if (pLink)
pLinkManager->Remove( pLink );
- SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
}
@@ -1943,7 +1943,7 @@ void __EXPORT ScUndoRemoveAreaLink::Redo()
void __EXPORT ScUndoRemoveAreaLink::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // gippsnich
+ // gippsnich
}
@@ -1956,9 +1956,9 @@ BOOL __EXPORT ScUndoRemoveAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) co
//============================================================================
-// class ScUndoUpdateAreaLink
+// class ScUndoUpdateAreaLink
//
-// Bereichs-Verknuepfung aktualisieren
+// Bereichs-Verknuepfung aktualisieren
//----------------------------------------------------------------------------
@@ -1969,23 +1969,23 @@ ScUndoUpdateAreaLink::ScUndoUpdateAreaLink( ScDocShell* pShell,
const String& rNewA, const ScRange& rNewR, ULONG nNewRD,
ScDocument* pUndo, ScDocument* pRedo, BOOL bDoInsert )
//
- : ScSimpleUndo( pShell ),
+ : ScSimpleUndo( pShell ),
//
- aOldDoc ( rOldD ),
- aOldFlt ( rOldF ),
- aOldOpt ( rOldO ),
- aOldArea ( rOldA ),
- aOldRange ( rOldR ),
- aNewDoc ( rNewD ),
- aNewFlt ( rNewF ),
- aNewOpt ( rNewO ),
- aNewArea ( rNewA ),
- aNewRange ( rNewR ),
- pUndoDoc ( pUndo ),
- pRedoDoc ( pRedo ),
- nOldRefresh ( nOldRD ),
- nNewRefresh ( nNewRD ),
- bWithInsert ( bDoInsert )
+ aOldDoc ( rOldD ),
+ aOldFlt ( rOldF ),
+ aOldOpt ( rOldO ),
+ aOldArea ( rOldA ),
+ aOldRange ( rOldR ),
+ aNewDoc ( rNewD ),
+ aNewFlt ( rNewF ),
+ aNewOpt ( rNewO ),
+ aNewArea ( rNewA ),
+ aNewRange ( rNewR ),
+ pUndoDoc ( pUndo ),
+ pRedoDoc ( pRedo ),
+ nOldRefresh ( nOldRD ),
+ nNewRefresh ( nNewRD ),
+ bWithInsert ( bDoInsert )
{
DBG_ASSERT( aOldRange.aStart == aNewRange.aStart, "AreaLink verschoben ?" );
}
@@ -2004,7 +2004,7 @@ __EXPORT ScUndoUpdateAreaLink::~ScUndoUpdateAreaLink()
String __EXPORT ScUndoUpdateAreaLink::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_UPDATELINK ); //! eigener Text ??
+ return ScGlobal::GetRscString( STR_UNDO_UPDATELINK ); //! eigener Text ??
}
@@ -2016,7 +2016,7 @@ void ScUndoUpdateAreaLink::DoChange( const BOOL bUndo ) const
SCCOL nEndX = Max( aOldRange.aEnd.Col(), aNewRange.aEnd.Col() );
SCROW nEndY = Max( aOldRange.aEnd.Row(), aNewRange.aEnd.Row() );
- SCTAB nEndZ = Max( aOldRange.aEnd.Tab(), aNewRange.aEnd.Tab() ); //?
+ SCTAB nEndZ = Max( aOldRange.aEnd.Tab(), aNewRange.aEnd.Tab() ); //?
if ( bUndo )
{
@@ -2052,7 +2052,7 @@ void ScUndoUpdateAreaLink::DoChange( const BOOL bUndo ) const
ScRange aWorkRange( aNewRange.aStart, ScAddress( nEndX, nEndY, nEndZ ) );
pDoc->ExtendMerge( aWorkRange, TRUE );
- // Paint
+ // Paint
if ( aNewRange.aEnd.Col() != aOldRange.aEnd.Col() )
aWorkRange.aEnd.SetCol(MAXCOL);
@@ -2079,7 +2079,7 @@ void __EXPORT ScUndoUpdateAreaLink::Undo()
aNewArea, aNewRange );
if (pLink)
{
- pLink->SetSource( aOldDoc, aOldFlt, aOldOpt, aOldArea ); // alte Werte im Link
+ pLink->SetSource( aOldDoc, aOldFlt, aOldOpt, aOldArea ); // alte Werte im Link
pLink->SetDestArea( aOldRange );
pLink->SetRefreshDelay( nOldRefresh );
}
@@ -2098,7 +2098,7 @@ void __EXPORT ScUndoUpdateAreaLink::Redo()
aOldArea, aOldRange );
if (pLink)
{
- pLink->SetSource( aNewDoc, aNewFlt, aNewOpt, aNewArea ); // neue Werte im Link
+ pLink->SetSource( aNewDoc, aNewFlt, aNewOpt, aNewArea ); // neue Werte im Link
pLink->SetDestArea( aNewRange );
pLink->SetRefreshDelay( nNewRefresh );
}
@@ -2111,7 +2111,7 @@ void __EXPORT ScUndoUpdateAreaLink::Redo()
void __EXPORT ScUndoUpdateAreaLink::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // gippsnich
+ // gippsnich
}
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index cc13ce9f1412..453bd15eeed0 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ TYPEINIT1(ScUndoRangeNames, ScSimpleUndo);
// -----------------------------------------------------------------------
//
-// Attribute auf Cursor anwenden
+// Attribute auf Cursor anwenden
//
ScUndoCursorAttr::ScUndoCursorAttr( ScDocShell* pNewDocShell,
@@ -100,9 +100,9 @@ __EXPORT ScUndoCursorAttr::~ScUndoCursorAttr()
String __EXPORT ScUndoCursorAttr::GetComment() const
{
- //! eigener Text fuer automatische Attributierung
+ //! eigener Text fuer automatische Attributierung
- USHORT nId = STR_UNDO_CURSORATTR; // "Attribute"
+ USHORT nId = STR_UNDO_CURSORATTR; // "Attribute"
return ScGlobal::GetRscString( nId );
}
@@ -138,8 +138,8 @@ void __EXPORT ScUndoCursorAttr::Undo()
if ( bIsAutomatic )
{
- // wenn automatische Formatierung rueckgaengig gemacht wird,
- // soll auch nicht weiter automatisch formatiert werden:
+ // wenn automatische Formatierung rueckgaengig gemacht wird,
+ // soll auch nicht weiter automatisch formatiert werden:
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
@@ -170,7 +170,7 @@ BOOL __EXPORT ScUndoCursorAttr::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Daten eingeben
+// Daten eingeben
//
ScUndoEnterData::ScUndoEnterData( ScDocShell* pNewDocShell,
@@ -214,8 +214,8 @@ String __EXPORT ScUndoEnterData::GetComment() const
void ScUndoEnterData::DoChange() const
{
- // Zeilenhoehe anpassen
- //! nur wenn noetig (alte oder neue EditZelle, oder Attribute) ??
+ // Zeilenhoehe anpassen
+ //! nur wenn noetig (alte oder neue EditZelle, oder Attribute) ??
for (USHORT i=0; i<nCount; i++)
pDocShell->AdjustRowHeight( nRow, nRow, pTabs[i] );
@@ -248,7 +248,7 @@ void ScUndoEnterData::SetChangeTrack()
pChangeTrack->AppendContent( aPos, ppOldCells[i], nFormat );
}
if ( nEndChangeAction > pChangeTrack->GetActionMax() )
- nEndChangeAction = 0; // nichts appended
+ nEndChangeAction = 0; // nichts appended
}
else
nEndChangeAction = 0;
@@ -349,16 +349,16 @@ BOOL __EXPORT ScUndoEnterData::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Wert aendern
+// Wert aendern
//
ScUndoEnterValue::ScUndoEnterValue( ScDocShell* pNewDocShell, const ScAddress& rNewPos,
ScBaseCell* pUndoCell, double nVal, BOOL bHeight ) :
ScSimpleUndo( pNewDocShell ),
- aPos ( rNewPos ),
- pOldCell ( pUndoCell ),
- nValue ( nVal ),
- bNeedHeight ( bHeight )
+ aPos ( rNewPos ),
+ pOldCell ( pUndoCell ),
+ nValue ( nVal ),
+ bNeedHeight ( bHeight )
{
SetChangeTrack();
}
@@ -383,7 +383,7 @@ void ScUndoEnterValue::SetChangeTrack()
nEndChangeAction = pChangeTrack->GetActionMax() + 1;
pChangeTrack->AppendContent( aPos, pOldCell );
if ( nEndChangeAction > pChangeTrack->GetActionMax() )
- nEndChangeAction = 0; // nichts appended
+ nEndChangeAction = 0; // nichts appended
}
else
nEndChangeAction = 0;
@@ -422,7 +422,7 @@ void __EXPORT ScUndoEnterValue::Redo()
void __EXPORT ScUndoEnterValue::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // gippsnich
+ // gippsnich
}
BOOL __EXPORT ScUndoEnterValue::CanRepeat(SfxRepeatTarget& /* rTarget */) const
@@ -433,16 +433,16 @@ BOOL __EXPORT ScUndoEnterValue::CanRepeat(SfxRepeatTarget& /* rTarget */) const
// -----------------------------------------------------------------------
//
-// Beliebige Zelle eingeben
+// Beliebige Zelle eingeben
//
ScUndoPutCell::ScUndoPutCell( ScDocShell* pNewDocShell, const ScAddress& rNewPos,
ScBaseCell* pUndoCell, ScBaseCell* pRedoCell, BOOL bHeight ) :
ScSimpleUndo( pNewDocShell ),
- aPos ( rNewPos ),
- pOldCell ( pUndoCell ),
+ aPos ( rNewPos ),
+ pOldCell ( pUndoCell ),
pEnteredCell( pRedoCell ),
- bNeedHeight ( bHeight )
+ bNeedHeight ( bHeight )
{
SetChangeTrack();
}
@@ -469,7 +469,7 @@ void ScUndoPutCell::SetChangeTrack()
nEndChangeAction = pChangeTrack->GetActionMax() + 1;
pChangeTrack->AppendContent( aPos, pOldCell );
if ( nEndChangeAction > pChangeTrack->GetActionMax() )
- nEndChangeAction = 0; // nichts appended
+ nEndChangeAction = 0; // nichts appended
}
else
nEndChangeAction = 0;
@@ -511,7 +511,7 @@ void __EXPORT ScUndoPutCell::Redo()
void __EXPORT ScUndoPutCell::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // gippsnich
+ // gippsnich
}
BOOL __EXPORT ScUndoPutCell::CanRepeat(SfxRepeatTarget& /* rTarget */) const
@@ -522,7 +522,7 @@ BOOL __EXPORT ScUndoPutCell::CanRepeat(SfxRepeatTarget& /* rTarget */) const
// -----------------------------------------------------------------------
//
-// Seitenumbrueche
+// Seitenumbrueche
//
ScUndoPageBreak::ScUndoPageBreak( ScDocShell* pNewDocShell,
@@ -607,7 +607,7 @@ BOOL __EXPORT ScUndoPageBreak::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Druck-Skalierung
+// Druck-Skalierung
//
ScUndoPrintZoom::ScUndoPrintZoom( ScDocShell* pNewDocShell,
@@ -683,7 +683,7 @@ BOOL __EXPORT ScUndoPrintZoom::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Thesaurus
+// Thesaurus
//
ScUndoThesaurus::ScUndoThesaurus( ScDocShell* pNewDocShell,
@@ -717,7 +717,7 @@ __EXPORT ScUndoThesaurus::~ScUndoThesaurus()
String __EXPORT ScUndoThesaurus::GetComment() const
{
- return ScGlobal::GetRscString( STR_UNDO_THESAURUS ); // "Thesaurus"
+ return ScGlobal::GetRscString( STR_UNDO_THESAURUS ); // "Thesaurus"
}
void ScUndoThesaurus::SetChangeTrack( ScBaseCell* pOldCell )
@@ -728,7 +728,7 @@ void ScUndoThesaurus::SetChangeTrack( ScBaseCell* pOldCell )
nEndChangeAction = pChangeTrack->GetActionMax() + 1;
pChangeTrack->AppendContent( ScAddress( nCol, nRow, nTab ), pOldCell );
if ( nEndChangeAction > pChangeTrack->GetActionMax() )
- nEndChangeAction = 0; // nichts appended
+ nEndChangeAction = 0; // nichts appended
}
else
nEndChangeAction = 0;
@@ -952,16 +952,16 @@ String ScUndoShowHideNote::GetComment() const
// -----------------------------------------------------------------------
//
-// Detektiv
+// Detektiv
//
ScUndoDetective::ScUndoDetective( ScDocShell* pNewDocShell,
SdrUndoAction* pDraw, const ScDetOpData* pOperation,
ScDetOpList* pUndoList ) :
ScSimpleUndo( pNewDocShell ),
- pOldList ( pUndoList ),
- nAction ( 0 ),
- pDrawUndo ( pDraw )
+ pOldList ( pUndoList ),
+ nAction ( 0 ),
+ pDrawUndo ( pDraw )
{
bIsDelete = ( pOperation == NULL );
if (!bIsDelete)
@@ -983,11 +983,11 @@ String __EXPORT ScUndoDetective::GetComment() const
if ( !bIsDelete )
switch ( (ScDetOpType) nAction )
{
- case SCDETOP_ADDSUCC: nId = STR_UNDO_DETADDSUCC; break;
- case SCDETOP_DELSUCC: nId = STR_UNDO_DETDELSUCC; break;
- case SCDETOP_ADDPRED: nId = STR_UNDO_DETADDPRED; break;
- case SCDETOP_DELPRED: nId = STR_UNDO_DETDELPRED; break;
- case SCDETOP_ADDERROR: nId = STR_UNDO_DETADDERROR; break;
+ case SCDETOP_ADDSUCC: nId = STR_UNDO_DETADDSUCC; break;
+ case SCDETOP_DELSUCC: nId = STR_UNDO_DETDELSUCC; break;
+ case SCDETOP_ADDPRED: nId = STR_UNDO_DETADDPRED; break;
+ case SCDETOP_DELPRED: nId = STR_UNDO_DETDELPRED; break;
+ case SCDETOP_ADDERROR: nId = STR_UNDO_DETADDERROR; break;
}
return ScGlobal::GetRscString( nId );
@@ -1008,7 +1008,7 @@ void __EXPORT ScUndoDetective::Undo()
}
else
{
- // Eintrag aus der Liste loeschen
+ // Eintrag aus der Liste loeschen
ScDetOpList* pList = pDoc->GetDetOpList();
if (pList && pList->Count())
@@ -1026,7 +1026,7 @@ void __EXPORT ScUndoDetective::Undo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
- pViewShell->RecalcPPT(); //! use broadcast instead?
+ pViewShell->RecalcPPT(); //! use broadcast instead?
EndUndo();
}
@@ -1046,14 +1046,14 @@ void __EXPORT ScUndoDetective::Redo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
- pViewShell->RecalcPPT(); //! use broadcast instead?
+ pViewShell->RecalcPPT(); //! use broadcast instead?
EndRedo();
}
void __EXPORT ScUndoDetective::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // hammanich
+ // hammanich
}
BOOL __EXPORT ScUndoDetective::CanRepeat(SfxRepeatTarget& /* rTarget */) const
@@ -1063,14 +1063,14 @@ BOOL __EXPORT ScUndoDetective::CanRepeat(SfxRepeatTarget& /* rTarget */) const
// -----------------------------------------------------------------------
//
-// Benannte Bereiche
+// Benannte Bereiche
//
ScUndoRangeNames::ScUndoRangeNames( ScDocShell* pNewDocShell,
ScRangeName* pOld, ScRangeName* pNew ) :
ScSimpleUndo( pNewDocShell ),
- pOldRanges ( pOld ),
- pNewRanges ( pNew )
+ pOldRanges ( pOld ),
+ pNewRanges ( pNew )
{
}
@@ -1088,14 +1088,14 @@ String __EXPORT ScUndoRangeNames::GetComment() const
void ScUndoRangeNames::DoChange( BOOL bUndo )
{
ScDocument* pDoc = pDocShell->GetDocument();
- pDoc->CompileNameFormula( TRUE ); // CreateFormulaString
+ pDoc->CompileNameFormula( TRUE ); // CreateFormulaString
if ( bUndo )
pDoc->SetRangeName( new ScRangeName( *pOldRanges ) );
else
pDoc->SetRangeName( new ScRangeName( *pNewRanges ) );
- pDoc->CompileNameFormula( FALSE ); // CompileFormulaString
+ pDoc->CompileNameFormula( FALSE ); // CompileFormulaString
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREAS_CHANGED ) );
}
@@ -1116,7 +1116,7 @@ void __EXPORT ScUndoRangeNames::Redo()
void __EXPORT ScUndoRangeNames::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // hammanich
+ // hammanich
}
BOOL __EXPORT ScUndoRangeNames::CanRepeat(SfxRepeatTarget& /* rTarget */) const
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index 0f7834b2a8df..d42dc6486c9c 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ TYPEINIT1(ScUndoChartData, ScSimpleUndo);
//
-// Outline-Gruppen ein- oder ausblenden
+// Outline-Gruppen ein- oder ausblenden
//
ScUndoDoOutline::ScUndoDoOutline( ScDocShell* pNewDocShell,
@@ -102,7 +102,7 @@ __EXPORT ScUndoDoOutline::~ScUndoDoOutline()
}
String __EXPORT ScUndoDoOutline::GetComment() const
-{ // Detail einblenden" "Detail ausblenden"
+{ // Detail einblenden" "Detail ausblenden"
return bShow ?
ScGlobal::GetRscString( STR_UNDO_DOOUTLINE ) :
ScGlobal::GetRscString( STR_UNDO_REDOOUTLINE );
@@ -115,20 +115,20 @@ void __EXPORT ScUndoDoOutline::Undo()
ScDocument* pDoc = pDocShell->GetDocument();
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
- // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
+ // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo();
if ( nVisTab != nTab )
pViewShell->SetTabNo( nTab );
- // inverse Funktion ausfuehren
+ // inverse Funktion ausfuehren
if (bShow)
pViewShell->HideOutline( bColumns, nLevel, nEntry, FALSE, FALSE );
else
pViewShell->ShowOutline( bColumns, nLevel, nEntry, FALSE, FALSE );
- // Original Spalten-/Zeilenstatus
+ // Original Spalten-/Zeilenstatus
if (bColumns)
pUndoDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab,
@@ -149,7 +149,7 @@ void __EXPORT ScUndoDoOutline::Redo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
- // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
+ // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo();
if ( nVisTab != nTab )
@@ -169,11 +169,11 @@ void __EXPORT ScUndoDoOutline::Repeat(SfxRepeatTarget& /* rTarget */)
BOOL __EXPORT ScUndoDoOutline::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- return FALSE; // geht nicht
+ return FALSE; // geht nicht
}
//
-// Outline-Gruppen erzeugen oder loeschen
+// Outline-Gruppen erzeugen oder loeschen
//
ScUndoMakeOutline::ScUndoMakeOutline( ScDocShell* pNewDocShell,
@@ -195,7 +195,7 @@ __EXPORT ScUndoMakeOutline::~ScUndoMakeOutline()
}
String __EXPORT ScUndoMakeOutline::GetComment() const
-{ // "Gruppierung" "Gruppierung aufheben"
+{ // "Gruppierung" "Gruppierung aufheben"
return bMake ?
ScGlobal::GetRscString( STR_UNDO_MAKEOUTLINE ) :
ScGlobal::GetRscString( STR_UNDO_REMAKEOUTLINE );
@@ -259,7 +259,7 @@ BOOL __EXPORT ScUndoMakeOutline::CanRepeat(SfxRepeatTarget& rTarget) const
}
//
-// Outline-Ebene auswaehlen
+// Outline-Ebene auswaehlen
//
ScUndoOutlineLevel::ScUndoOutlineLevel( ScDocShell* pNewDocShell,
@@ -284,7 +284,7 @@ __EXPORT ScUndoOutlineLevel::~ScUndoOutlineLevel()
}
String __EXPORT ScUndoOutlineLevel::GetComment() const
-{ // "Gliederungsebene auswaehlen";
+{ // "Gliederungsebene auswaehlen";
return ScGlobal::GetRscString( STR_UNDO_OUTLINELEVEL );
}
@@ -295,11 +295,11 @@ void __EXPORT ScUndoOutlineLevel::Undo()
ScDocument* pDoc = pDocShell->GetDocument();
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
- // Original Outline-Table
+ // Original Outline-Table
pDoc->SetOutlineTable( nTab, pUndoTable );
- // Original Spalten-/Zeilenstatus
+ // Original Spalten-/Zeilenstatus
if (bColumns)
pUndoDoc->CopyToDocument( static_cast<SCCOL>(nStart), 0, nTab,
@@ -326,7 +326,7 @@ void __EXPORT ScUndoOutlineLevel::Redo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
- // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
+ // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo();
if ( nVisTab != nTab )
@@ -349,7 +349,7 @@ BOOL __EXPORT ScUndoOutlineLevel::CanRepeat(SfxRepeatTarget& rTarget) const
}
//
-// Outline ueber Blockmarken ein- oder ausblenden
+// Outline ueber Blockmarken ein- oder ausblenden
//
ScUndoOutlineBlock::ScUndoOutlineBlock( ScDocShell* pNewDocShell,
@@ -372,7 +372,7 @@ __EXPORT ScUndoOutlineBlock::~ScUndoOutlineBlock()
}
String __EXPORT ScUndoOutlineBlock::GetComment() const
-{ // "Detail einblenden" "Detail ausblenden"
+{ // "Detail einblenden" "Detail ausblenden"
return bShow ?
ScGlobal::GetRscString( STR_UNDO_DOOUTLINEBLK ) :
ScGlobal::GetRscString( STR_UNDO_REDOOUTLINEBLK );
@@ -386,19 +386,19 @@ void __EXPORT ScUndoOutlineBlock::Undo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
SCTAB nTab = aBlockStart.Tab();
- // Original Outline-Table
+ // Original Outline-Table
pDoc->SetOutlineTable( nTab, pUndoTable );
- // Original Spalten-/Zeilenstatus
+ // Original Spalten-/Zeilenstatus
- SCCOLROW nStartCol = aBlockStart.Col();
- SCCOLROW nEndCol = aBlockEnd.Col();
- SCCOLROW nStartRow = aBlockStart.Row();
- SCCOLROW nEndRow = aBlockEnd.Row();
+ SCCOLROW nStartCol = aBlockStart.Col();
+ SCCOLROW nEndCol = aBlockEnd.Col();
+ SCCOLROW nStartRow = aBlockStart.Row();
+ SCCOLROW nEndRow = aBlockEnd.Row();
if (!bShow)
- { // Groesse des ausgeblendeten Blocks
+ { // Groesse des ausgeblendeten Blocks
USHORT nLevel;
pUndoTable->GetColArray()->FindTouchedLevel( nStartCol, nEndCol, nLevel );
pUndoTable->GetColArray()->ExtendBlock( nLevel, nStartCol, nEndCol );
@@ -457,7 +457,7 @@ BOOL __EXPORT ScUndoOutlineBlock::CanRepeat(SfxRepeatTarget& rTarget) const
}
//
-// alle Outlines loeschen
+// alle Outlines loeschen
//
ScUndoRemoveAllOutlines::ScUndoRemoveAllOutlines( ScDocShell* pNewDocShell,
@@ -479,7 +479,7 @@ __EXPORT ScUndoRemoveAllOutlines::~ScUndoRemoveAllOutlines()
}
String __EXPORT ScUndoRemoveAllOutlines::GetComment() const
-{ // "Gliederung entfernen"
+{ // "Gliederung entfernen"
return ScGlobal::GetRscString( STR_UNDO_REMOVEALLOTLNS );
}
@@ -491,16 +491,16 @@ void __EXPORT ScUndoRemoveAllOutlines::Undo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
SCTAB nTab = aBlockStart.Tab();
- // Original Outline-Table
+ // Original Outline-Table
pDoc->SetOutlineTable( nTab, pUndoTable );
- // Original Spalten-/Zeilenstatus
+ // Original Spalten-/Zeilenstatus
- SCCOL nStartCol = aBlockStart.Col();
- SCCOL nEndCol = aBlockEnd.Col();
- SCROW nStartRow = aBlockStart.Row();
- SCROW nEndRow = aBlockEnd.Row();
+ SCCOL nStartCol = aBlockStart.Col();
+ SCCOL nEndCol = aBlockEnd.Col();
+ SCROW nStartRow = aBlockStart.Row();
+ SCROW nEndRow = aBlockEnd.Row();
pUndoDoc->CopyToDocument( nStartCol, 0, nTab, nEndCol, MAXROW, nTab, IDF_NONE, FALSE, pDoc );
pUndoDoc->CopyToDocument( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab, IDF_NONE, FALSE, pDoc );
@@ -524,7 +524,7 @@ void __EXPORT ScUndoRemoveAllOutlines::Redo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
- // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
+ // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
SCTAB nTab = aBlockStart.Tab();
SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo();
@@ -548,7 +548,7 @@ BOOL __EXPORT ScUndoRemoveAllOutlines::CanRepeat(SfxRepeatTarget& rTarget) const
}
//
-// Auto-Outline
+// Auto-Outline
//
ScUndoAutoOutline::ScUndoAutoOutline( ScDocShell* pNewDocShell,
@@ -570,7 +570,7 @@ __EXPORT ScUndoAutoOutline::~ScUndoAutoOutline()
}
String __EXPORT ScUndoAutoOutline::GetComment() const
-{ // "Auto-Gliederung"
+{ // "Auto-Gliederung"
return ScGlobal::GetRscString( STR_UNDO_AUTOOUTLINE );
}
@@ -582,11 +582,11 @@ void __EXPORT ScUndoAutoOutline::Undo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
SCTAB nTab = aBlockStart.Tab();
- // Original Outline-Table
+ // Original Outline-Table
pDoc->SetOutlineTable( nTab, pUndoTable );
- // Original Spalten-/Zeilenstatus
+ // Original Spalten-/Zeilenstatus
if (pUndoDoc && pUndoTable)
{
@@ -623,7 +623,7 @@ void __EXPORT ScUndoAutoOutline::Redo()
SCTAB nTab = aBlockStart.Tab();
if (pViewShell)
{
- // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
+ // Tabelle muss vorher umgeschaltet sein (#46952#) !!!
SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo();
if ( nVisTab != nTab )
@@ -635,9 +635,9 @@ void __EXPORT ScUndoAutoOutline::Redo()
ScOutlineDocFunc aFunc( *pDocShell );
aFunc.AutoOutline( aRange, FALSE, FALSE );
- // auf der View markieren
- // Wenn's beim Aufruf eine Mehrfachselektion war, ist es jetzt der
- // umschliessende Bereich...
+ // auf der View markieren
+ // Wenn's beim Aufruf eine Mehrfachselektion war, ist es jetzt der
+ // umschliessende Bereich...
if (pViewShell)
pViewShell->MarkRange( aRange );
@@ -657,7 +657,7 @@ BOOL __EXPORT ScUndoAutoOutline::CanRepeat(SfxRepeatTarget& rTarget) const
}
//
-// Zwischenergebnisse
+// Zwischenergebnisse
//
ScUndoSubTotals::ScUndoSubTotals( ScDocShell* pNewDocShell, SCTAB nNewTab,
@@ -685,7 +685,7 @@ __EXPORT ScUndoSubTotals::~ScUndoSubTotals()
}
String __EXPORT ScUndoSubTotals::GetComment() const
-{ // "Teilergebnisse"
+{ // "Teilergebnisse"
return ScGlobal::GetRscString( STR_UNDO_SUBTOTALS );
}
@@ -696,8 +696,8 @@ void __EXPORT ScUndoSubTotals::Undo()
ScDocument* pDoc = pDocShell->GetDocument();
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
- // um einzelnen DB-Bereich anzupassen
-/* ScDBData* pOldDBData = ScUndoUtil::GetOldDBData( pUndoDBData, pDoc, nTab,
+ // um einzelnen DB-Bereich anzupassen
+/* ScDBData* pOldDBData = ScUndoUtil::GetOldDBData( pUndoDBData, pDoc, nTab,
aParam.nCol1, aParam.nRow1, aParam.nCol2, nNewEndRow );
*/
@@ -711,11 +711,11 @@ void __EXPORT ScUndoSubTotals::Undo()
}
- // Original Outline-Table
+ // Original Outline-Table
pDoc->SetOutlineTable( nTab, pUndoTable );
- // Original Spalten-/Zeilenstatus
+ // Original Spalten-/Zeilenstatus
if (pUndoDoc && pUndoTable)
{
@@ -734,7 +734,7 @@ void __EXPORT ScUndoSubTotals::Undo()
pViewShell->UpdateScrollBars();
}
- // Original-Daten & Referenzen
+ // Original-Daten & Referenzen
ScUndoUtil::MarkSimpleBlock( pDocShell, 0, aParam.nRow1+1, nTab,
MAXCOL, aParam.nRow2, nTab );
@@ -742,14 +742,14 @@ void __EXPORT ScUndoSubTotals::Undo()
pDoc->DeleteAreaTab( 0,aParam.nRow1+1, MAXCOL,aParam.nRow2, nTab, IDF_ALL );
pUndoDoc->CopyToDocument( 0, aParam.nRow1+1, nTab, MAXCOL, aParam.nRow2, nTab,
- IDF_NONE, FALSE, pDoc ); // Flags
+ IDF_NONE, FALSE, pDoc ); // Flags
pUndoDoc->UndoToDocument( 0, aParam.nRow1+1, nTab, MAXCOL, aParam.nRow2, nTab,
IDF_ALL, FALSE, pDoc );
ScUndoUtil::MarkSimpleBlock( pDocShell, aParam.nCol1,aParam.nRow1,nTab,
aParam.nCol2,aParam.nRow2,nTab );
-/* if (pUndoDBData)
+/* if (pUndoDBData)
*pOldDBData = *pUndoDBData;
*/
if (pUndoRange)
@@ -790,11 +790,11 @@ void __EXPORT ScUndoSubTotals::Repeat(SfxRepeatTarget& /* rTarget */)
BOOL __EXPORT ScUndoSubTotals::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- return FALSE; // geht nicht wegen Spaltennummern
+ return FALSE; // geht nicht wegen Spaltennummern
}
//
-// Sortieren
+// Sortieren
//
ScUndoSort::ScUndoSort( ScDocShell* pNewDocShell,
@@ -837,8 +837,8 @@ void __EXPORT ScUndoSort::Undo()
SCCOL nStartCol = aSortParam.nCol1;
SCROW nStartRow = aSortParam.nRow1;
- SCCOL nEndCol = aSortParam.nCol2;
- SCROW nEndRow = aSortParam.nRow2;
+ SCCOL nEndCol = aSortParam.nCol2;
+ SCROW nEndRow = aSortParam.nRow2;
SCTAB nSortTab = nTab;
if ( !aSortParam.bInplace )
{
@@ -864,9 +864,9 @@ void __EXPORT ScUndoSort::Undo()
pUndoDoc->CopyToDocument( aDestRange, IDF_ALL|IDF_NOCAPTIONS, FALSE, pDoc );
}
- // Zeilenhoehen immer (wegen automatischer Anpassung)
- //! auf ScBlockUndo umstellen
-// if (bRepeatQuery)
+ // Zeilenhoehen immer (wegen automatischer Anpassung)
+ //! auf ScBlockUndo umstellen
+// if (bRepeatQuery)
pUndoDoc->CopyToDocument( 0, nStartRow, nSortTab, MAXCOL, nEndRow, nSortTab,
IDF_NONE, FALSE, pDoc );
@@ -893,16 +893,16 @@ void __EXPORT ScUndoSort::Redo()
if ( nVisTab != nTab )
pViewShell->SetTabNo( nTab );
-// pViewShell->DoneBlockMode();
-// pViewShell->InitOwnBlockMode();
-// pViewShell->GetViewData()->GetMarkData() = aMarkData; // CopyMarksTo
+// pViewShell->DoneBlockMode();
+// pViewShell->InitOwnBlockMode();
+// pViewShell->GetViewData()->GetMarkData() = aMarkData; // CopyMarksTo
pViewShell->MarkRange( ScRange( aSortParam.nCol1, aSortParam.nRow1, nTab,
aSortParam.nCol2, aSortParam.nRow2, nTab ) );
pViewShell->Sort( aSortParam, FALSE );
- // Quellbereich painten wegen Markierung
+ // Quellbereich painten wegen Markierung
if ( !aSortParam.bInplace )
pDocShell->PostPaint( aSortParam.nCol1, aSortParam.nRow1, nTab,
aSortParam.nCol2, aSortParam.nRow2, nTab, PAINT_GRID );
@@ -916,11 +916,11 @@ void __EXPORT ScUndoSort::Repeat(SfxRepeatTarget& /* rTarget */)
BOOL __EXPORT ScUndoSort::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- return FALSE; // geht nicht wegen Spaltennummern
+ return FALSE; // geht nicht wegen Spaltennummern
}
//
-// Filtern
+// Filtern
//
ScUndoQuery::ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScQueryParam& rParam,
@@ -932,7 +932,7 @@ ScUndoQuery::ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScQuery
nTab( nNewTab ),
aQueryParam( rParam ),
pUndoDoc( pNewUndoDoc ),
-// pUndoDBData( pNewData )
+// pUndoDBData( pNewData )
pUndoDB( pNewUndoDB ),
bIsAdvanced( FALSE ),
bDestArea( FALSE ),
@@ -955,13 +955,13 @@ ScUndoQuery::ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScQuery
__EXPORT ScUndoQuery::~ScUndoQuery()
{
delete pUndoDoc;
-// delete pUndoDBData;
+// delete pUndoDBData;
delete pUndoDB;
DeleteSdrUndoAction( pDrawUndo );
}
String __EXPORT ScUndoQuery::GetComment() const
-{ // "Filtern";
+{ // "Filtern";
return ScGlobal::GetRscString( STR_UNDO_QUERY );
}
@@ -992,7 +992,7 @@ void __EXPORT ScUndoQuery::Undo()
if ( bDoSize && bDestArea )
{
- // aDestRange ist der alte Bereich
+ // aDestRange ist der alte Bereich
pDoc->FitBlock( ScRange(
aQueryParam.nDestCol, aQueryParam.nDestRow, aQueryParam.nDestTab,
nDestEndCol, nDestEndRow, aQueryParam.nDestTab ),
@@ -1010,9 +1010,9 @@ void __EXPORT ScUndoQuery::Undo()
pUndoDoc->CopyToDocument( aQueryParam.nDestCol, aQueryParam.nDestRow, aQueryParam.nDestTab,
nDestEndCol, nDestEndRow, aQueryParam.nDestTab,
IDF_ALL, FALSE, pDoc );
- // Attribute werden immer mitkopiert (#49287#)
+ // Attribute werden immer mitkopiert (#49287#)
- // Rest von altem Bereich
+ // Rest von altem Bereich
if ( bDestArea && !bDoSize )
{
pDoc->DeleteAreaTab( aOldDest, IDF_ALL );
@@ -1028,7 +1028,7 @@ void __EXPORT ScUndoQuery::Undo()
if (!bCopy)
{
- pDoc->InvalidatePageBreaks(nTab);
+ pDoc->InvalidatePageBreaks(nTab);
pDoc->UpdatePageBreaks( nTab );
}
@@ -1042,7 +1042,7 @@ void __EXPORT ScUndoQuery::Undo()
if ( nVisTab != nTab )
pViewShell->SetTabNo( nTab );
- // Paint
+ // Paint
if (bCopy)
{
@@ -1092,7 +1092,7 @@ void __EXPORT ScUndoQuery::Repeat(SfxRepeatTarget& /* rTarget */)
BOOL __EXPORT ScUndoQuery::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- return FALSE; // geht nicht wegen Spaltennummern
+ return FALSE; // geht nicht wegen Spaltennummern
}
//
@@ -1168,7 +1168,7 @@ BOOL ScUndoAutoFilter::CanRepeat(SfxRepeatTarget& /* rTarget */) const
}
//
-// Datenbankbereiche aendern (Dialog)
+// Datenbankbereiche aendern (Dialog)
//
ScUndoDBData::ScUndoDBData( ScDocShell* pNewDocShell,
@@ -1186,7 +1186,7 @@ __EXPORT ScUndoDBData::~ScUndoDBData()
}
String __EXPORT ScUndoDBData::GetComment() const
-{ // "Datenbankbereiche aendern";
+{ // "Datenbankbereiche aendern";
return ScGlobal::GetRscString( STR_UNDO_DBDATA );
}
@@ -1197,10 +1197,10 @@ void __EXPORT ScUndoDBData::Undo()
ScDocument* pDoc = pDocShell->GetDocument();
BOOL bOldAutoCalc = pDoc->GetAutoCalc();
- pDoc->SetAutoCalc( FALSE ); // unnoetige Berechnungen vermeiden
- pDoc->CompileDBFormula( TRUE ); // CreateFormulaString
+ pDoc->SetAutoCalc( FALSE ); // unnoetige Berechnungen vermeiden
+ pDoc->CompileDBFormula( TRUE ); // CreateFormulaString
pDoc->SetDBCollection( new ScDBCollection(*pUndoColl), TRUE );
- pDoc->CompileDBFormula( FALSE ); // CompileFormulaString
+ pDoc->CompileDBFormula( FALSE ); // CompileFormulaString
pDoc->SetAutoCalc( bOldAutoCalc );
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) );
@@ -1215,10 +1215,10 @@ void __EXPORT ScUndoDBData::Redo()
ScDocument* pDoc = pDocShell->GetDocument();
BOOL bOldAutoCalc = pDoc->GetAutoCalc();
- pDoc->SetAutoCalc( FALSE ); // unnoetige Berechnungen vermeiden
- pDoc->CompileDBFormula( TRUE ); // CreateFormulaString
+ pDoc->SetAutoCalc( FALSE ); // unnoetige Berechnungen vermeiden
+ pDoc->CompileDBFormula( TRUE ); // CreateFormulaString
pDoc->SetDBCollection( new ScDBCollection(*pRedoColl), TRUE );
- pDoc->CompileDBFormula( FALSE ); // CompileFormulaString
+ pDoc->CompileDBFormula( FALSE ); // CompileFormulaString
pDoc->SetAutoCalc( bOldAutoCalc );
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) );
@@ -1232,11 +1232,11 @@ void __EXPORT ScUndoDBData::Repeat(SfxRepeatTarget& /* rTarget */)
BOOL __EXPORT ScUndoDBData::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- return FALSE; // geht nicht
+ return FALSE; // geht nicht
}
//
-// Import
+// Import
//
ScUndoImportData::ScUndoImportData( ScDocShell* pNewDocShell, SCTAB nNewTab,
@@ -1268,7 +1268,7 @@ __EXPORT ScUndoImportData::~ScUndoImportData()
}
String __EXPORT ScUndoImportData::GetComment() const
-{ // "Importieren";
+{ // "Importieren";
return ScGlobal::GetRscString( STR_UNDO_IMPORTDATA );
}
@@ -1294,12 +1294,12 @@ void __EXPORT ScUndoImportData::Undo()
if ( !bRedoFilled )
{
- // read redo data from document at first undo
- // imported data is deleted later anyway,
- // so now delete each column after copying to save memory (#41216#)
+ // read redo data from document at first undo
+ // imported data is deleted later anyway,
+ // so now delete each column after copying to save memory (#41216#)
BOOL bOldAutoCalc = pDoc->GetAutoCalc();
- pDoc->SetAutoCalc( FALSE ); // outside of the loop
+ pDoc->SetAutoCalc( FALSE ); // outside of the loop
for (SCCOL nCopyCol = nCol1; nCopyCol <= nCol2; nCopyCol++)
{
pDoc->CopyToDocument( nCopyCol,nRow1,nTab, nCopyCol,nRow2,nTab,
@@ -1312,10 +1312,10 @@ void __EXPORT ScUndoImportData::Undo()
}
}
BOOL bMoveCells = pUndoDBData && pRedoDBData &&
- pRedoDBData->IsDoSize(); // in alt und neu gleich
+ pRedoDBData->IsDoSize(); // in alt und neu gleich
if (bMoveCells)
{
- // Undo: erst die neuen Daten loeschen, dann FitBlock rueckwaerts
+ // Undo: erst die neuen Daten loeschen, dann FitBlock rueckwaerts
ScRange aOld, aNew;
pUndoDBData->GetArea( aOld );
@@ -1324,9 +1324,9 @@ void __EXPORT ScUndoImportData::Undo()
pDoc->DeleteAreaTab( aNew.aStart.Col(), aNew.aStart.Row(),
aNew.aEnd.Col(), aNew.aEnd.Row(), nTab, IDF_ALL & ~IDF_NOTE );
- aOld.aEnd.SetCol( aOld.aEnd.Col() + nFormulaCols ); // FitBlock auch fuer Formeln
+ aOld.aEnd.SetCol( aOld.aEnd.Col() + nFormulaCols ); // FitBlock auch fuer Formeln
aNew.aEnd.SetCol( aNew.aEnd.Col() + nFormulaCols );
- pDoc->FitBlock( aNew, aOld, FALSE ); // rueckwaerts
+ pDoc->FitBlock( aNew, aOld, FALSE ); // rueckwaerts
}
else
pDoc->DeleteAreaTab( aImportParam.nCol1,aImportParam.nRow1,
@@ -1345,7 +1345,7 @@ void __EXPORT ScUndoImportData::Undo()
}
// erack! it's broadcasted
-// pDoc->SetDirty();
+// pDoc->SetDirty();
SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo();
if ( nVisTab != nTab )
@@ -1382,16 +1382,16 @@ void __EXPORT ScUndoImportData::Redo()
nCol1, nRow1, nCol2, nRow2 );
}
BOOL bMoveCells = pUndoDBData && pRedoDBData &&
- pRedoDBData->IsDoSize(); // in alt und neu gleich
+ pRedoDBData->IsDoSize(); // in alt und neu gleich
if (bMoveCells)
{
- // Redo: FitBlock, dann Daten loeschen (noetig fuer CopyToDocument)
+ // Redo: FitBlock, dann Daten loeschen (noetig fuer CopyToDocument)
ScRange aOld, aNew;
pUndoDBData->GetArea( aOld );
pRedoDBData->GetArea( aNew );
- aOld.aEnd.SetCol( aOld.aEnd.Col() + nFormulaCols ); // FitBlock auch fuer Formeln
+ aOld.aEnd.SetCol( aOld.aEnd.Col() + nFormulaCols ); // FitBlock auch fuer Formeln
aNew.aEnd.SetCol( aNew.aEnd.Col() + nFormulaCols );
pDoc->FitBlock( aOld, aNew );
@@ -1417,7 +1417,7 @@ void __EXPORT ScUndoImportData::Redo()
}
// erack! it's broadcasted
-// pDoc->SetDirty();
+// pDoc->SetDirty();
SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo();
if ( nVisTab != nTab )
@@ -1450,16 +1450,16 @@ void __EXPORT ScUndoImportData::Repeat(SfxRepeatTarget& rTarget)
BOOL __EXPORT ScUndoImportData::CanRepeat(SfxRepeatTarget& rTarget) const
{
- // Repeat nur fuer Import per DB-Bereich, dann ist pUndoDBData gesetzt
+ // Repeat nur fuer Import per DB-Bereich, dann ist pUndoDBData gesetzt
if (pUndoDBData)
return (rTarget.ISA(ScTabViewTarget));
else
- return FALSE; // Adressbuch
+ return FALSE; // Adressbuch
}
//
-// Operationen wiederholen
+// Operationen wiederholen
//
ScUndoRepeatDB::ScUndoRepeatDB( ScDocShell* pNewDocShell, SCTAB nNewTab,
@@ -1496,7 +1496,7 @@ __EXPORT ScUndoRepeatDB::~ScUndoRepeatDB()
}
String __EXPORT ScUndoRepeatDB::GetComment() const
-{ // "Wiederholen"; //! bessere Beschreibung!
+{ // "Wiederholen"; //! bessere Beschreibung!
return ScGlobal::GetRscString( STR_UNDO_REPEATDB );
}
@@ -1516,7 +1516,7 @@ void __EXPORT ScUndoRepeatDB::Undo()
{
SCCOL nFormulaCols = 0;
SCCOL nCol = aOldQuery.aEnd.Col() + 1;
- SCROW nRow = aOldQuery.aStart.Row() + 1; //! Header testen
+ SCROW nRow = aOldQuery.aStart.Row() + 1; //! Header testen
while ( nCol <= MAXCOL &&
pDoc->GetCellType(ScAddress( nCol, nRow, nTab )) == CELLTYPE_FORMULA )
++nCol, ++nFormulaCols;
@@ -1533,7 +1533,7 @@ void __EXPORT ScUndoRepeatDB::Undo()
}
}
- //! Daten von Filter in anderen Bereich fehlen noch !!!!!!!!!!!!!!!!!
+ //! Daten von Filter in anderen Bereich fehlen noch !!!!!!!!!!!!!!!!!
if (nNewEndRow > aBlockEnd.Row())
{
@@ -1544,11 +1544,11 @@ void __EXPORT ScUndoRepeatDB::Undo()
pDoc->InsertRow( 0,nTab, MAXCOL,nTab, nNewEndRow+1, static_cast<SCSIZE>(nNewEndRow-aBlockEnd.Row()) );
}
- // Original Outline-Table
+ // Original Outline-Table
pDoc->SetOutlineTable( nTab, pUndoTable );
- // Original Spalten-/Zeilenstatus
+ // Original Spalten-/Zeilenstatus
if (pUndoDoc && pUndoTable)
{
@@ -1567,7 +1567,7 @@ void __EXPORT ScUndoRepeatDB::Undo()
pViewShell->UpdateScrollBars();
}
- // Original-Daten & Referenzen
+ // Original-Daten & Referenzen
ScUndoUtil::MarkSimpleBlock( pDocShell, 0, aBlockStart.Row(), nTab,
MAXCOL, aBlockEnd.Row(), nTab );
@@ -1575,7 +1575,7 @@ void __EXPORT ScUndoRepeatDB::Undo()
MAXCOL, aBlockEnd.Row(), nTab, IDF_ALL );
pUndoDoc->CopyToDocument( 0, aBlockStart.Row(), nTab, MAXCOL, aBlockEnd.Row(), nTab,
- IDF_NONE, FALSE, pDoc ); // Flags
+ IDF_NONE, FALSE, pDoc ); // Flags
pUndoDoc->UndoToDocument( 0, aBlockStart.Row(), nTab, MAXCOL, aBlockEnd.Row(), nTab,
IDF_ALL, FALSE, pDoc );
@@ -1588,7 +1588,7 @@ void __EXPORT ScUndoRepeatDB::Undo()
pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), TRUE );
// erack! it's broadcasted
-// pDoc->SetDirty();
+// pDoc->SetDirty();
SCTAB nVisTab = pViewShell->GetViewData()->GetTabNo();
if ( nVisTab != nTab )
@@ -1632,7 +1632,7 @@ BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
}
//UNUSED2008-05 //
-//UNUSED2008-05 // Pivot-Tabellen
+//UNUSED2008-05 // Pivot-Tabellen
//UNUSED2008-05 //
//UNUSED2008-05
//UNUSED2008-05 ScUndoPivot::ScUndoPivot( ScDocShell* pNewDocShell,
@@ -1719,9 +1719,9 @@ BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
//UNUSED2008-05 pOldPivot->ReleaseData();
//UNUSED2008-05 pPivotCollection->Insert( pOldPivot );
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 // erack! it's broadcasted
-//UNUSED2008-05 // pDoc->SetDirty();
+//UNUSED2008-05 // pDoc->SetDirty();
//UNUSED2008-05 if (pNewUndoDoc)
//UNUSED2008-05 pDocShell->PostPaint( aNewArea.nColStart, aNewArea.nRowStart, aNewArea.nTab,
//UNUSED2008-05 aNewArea.nColEnd, aNewArea.nRowEnd, aNewArea.nTab,
@@ -1731,7 +1731,7 @@ BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
//UNUSED2008-05 aOldArea.nColEnd, aOldArea.nRowEnd, aOldArea.nTab,
//UNUSED2008-05 PAINT_GRID, SC_PF_LINES );
//UNUSED2008-05 pDocShell->PostDataChanged();
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
//UNUSED2008-05 if (pViewShell)
//UNUSED2008-05 {
@@ -1747,19 +1747,19 @@ BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
//UNUSED2008-05 pViewShell->SetTabNo( aNewArea.nTab );
//UNUSED2008-05 }
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 EndUndo();
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 void __EXPORT ScUndoPivot::Redo()
//UNUSED2008-05 {
//UNUSED2008-05 BeginRedo();
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 ScDocument* pDoc = pDocShell->GetDocument();
//UNUSED2008-05 ScPivotCollection* pPivotCollection = pDoc->GetPivotCollection();
//UNUSED2008-05 ScPivot* pOldPivot = pPivotCollection->GetPivotAtCursor(
//UNUSED2008-05 aOldParam.nCol, aOldParam.nRow, aOldParam.nTab );
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 ScPivot* pNewPivot = NULL;
//UNUSED2008-05 if (pNewUndoDoc)
//UNUSED2008-05 {
@@ -1768,29 +1768,29 @@ BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
//UNUSED2008-05 pNewPivot->SetName( aNewName );
//UNUSED2008-05 pNewPivot->SetTag( aNewTag );
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 pDocShell->PivotUpdate( pOldPivot, pNewPivot, FALSE );
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 EndRedo();
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 void __EXPORT ScUndoPivot::Repeat(SfxRepeatTarget& rTarget)
//UNUSED2008-05 {
//UNUSED2008-05 // Wiederholen: nur loeschen
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 if ( pOldUndoDoc && !pNewUndoDoc && rTarget.ISA(ScTabViewTarget) )
//UNUSED2008-05 ((ScTabViewTarget&)rTarget).GetViewShell()->DeletePivotTable();
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 BOOL __EXPORT ScUndoPivot::CanRepeat(SfxRepeatTarget& rTarget) const
//UNUSED2008-05 {
//UNUSED2008-05 // Wiederholen: nur loeschen
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 return ( pOldUndoDoc && !pNewUndoDoc && rTarget.ISA(ScTabViewTarget) );
//UNUSED2008-05 }
//
-// data pilot
+// data pilot
//
ScUndoDataPilot::ScUndoDataPilot( ScDocShell* pNewDocShell,
@@ -1852,12 +1852,12 @@ void __EXPORT ScUndoDataPilot::Undo()
pOldUndoDoc->CopyToDocument( aOldRange, IDF_ALL, FALSE, pDoc );
}
- // update objects in collection
+ // update objects in collection
if ( pNewDPObject )
{
- // find updated object
- //! find by name!
+ // find updated object
+ //! find by name!
ScDPObject* pDocObj = pDoc->GetDPAtCursor(
aNewRange.aStart.Col(), aNewRange.aStart.Row(), aNewRange.aStart.Tab() );
@@ -1866,7 +1866,7 @@ void __EXPORT ScUndoDataPilot::Undo()
{
if ( pOldDPObject )
{
- // restore old settings
+ // restore old settings
pOldDPObject->WriteSourceDataTo( *pDocObj );
ScDPSaveData* pData = pOldDPObject->GetSaveData();
if (pData)
@@ -1876,14 +1876,14 @@ void __EXPORT ScUndoDataPilot::Undo()
}
else
{
- // delete inserted object
+ // delete inserted object
pDoc->GetDPCollection()->FreeTable(pDocObj);
}
}
}
else if ( pOldDPObject )
{
- // re-insert deleted object
+ // re-insert deleted object
ScDPObject* pDestObj = new ScDPObject( *pOldDPObject );
pDestObj->SetAlive(TRUE);
@@ -1903,7 +1903,7 @@ void __EXPORT ScUndoDataPilot::Undo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
{
- //! set current sheet
+ //! set current sheet
}
if (pNewDPObject)
@@ -1919,16 +1919,16 @@ void __EXPORT ScUndoDataPilot::Redo()
{
BeginRedo();
- //! copy output data instead of repeating the change,
- //! in case external data have changed!
+ //! copy output data instead of repeating the change,
+ //! in case external data have changed!
ScDocument* pDoc = pDocShell->GetDocument();
ScDPObject* pSourceObj = NULL;
if ( pOldDPObject )
{
- // find object to modify
- //! find by name!
+ // find object to modify
+ //! find by name!
ScRange aOldRange = pOldDPObject->GetOutRange();
pSourceObj = pDoc->GetDPAtCursor(
@@ -1937,25 +1937,25 @@ void __EXPORT ScUndoDataPilot::Redo()
}
ScDBDocFunc aFunc( *pDocShell );
- aFunc.DataPilotUpdate( pSourceObj, pNewDPObject, FALSE, FALSE, bAllowMove ); // no new undo action
+ aFunc.DataPilotUpdate( pSourceObj, pNewDPObject, FALSE, FALSE, bAllowMove ); // no new undo action
EndRedo();
}
void __EXPORT ScUndoDataPilot::Repeat(SfxRepeatTarget& /* rTarget */)
{
- //! allow deletion
+ //! allow deletion
}
BOOL __EXPORT ScUndoDataPilot::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- //! allow deletion
+ //! allow deletion
return FALSE;
}
//
-// Konsolidieren
+// Konsolidieren
//
ScUndoConsolidate::ScUndoConsolidate( ScDocShell* pNewDocShell, const ScArea& rArea,
@@ -1998,22 +1998,22 @@ void __EXPORT ScUndoConsolidate::Undo()
if (bInsRef)
{
- // Zeilen loeschen
+ // Zeilen loeschen
pDoc->DeleteRow( 0,nTab, MAXCOL,nTab, aDestArea.nRowStart, nInsertCount );
- // Outlines
+ // Outlines
pDoc->SetOutlineTable( nTab, pUndoTab );
- // Zeilenstatus
+ // Zeilenstatus
pUndoDoc->CopyToDocument( 0,0,nTab, MAXCOL,MAXROW,nTab, IDF_NONE, FALSE, pDoc );
- // Daten & Referenzen
+ // Daten & Referenzen
pDoc->DeleteAreaTab( 0,aDestArea.nRowStart, MAXCOL,aDestArea.nRowEnd, nTab, IDF_ALL );
pUndoDoc->UndoToDocument( 0, aDestArea.nRowStart, nTab,
MAXCOL, aDestArea.nRowEnd, nTab,
IDF_ALL, FALSE, pDoc );
- // Original-Bereich
+ // Original-Bereich
if (pUndoData)
{
pDoc->DeleteAreaTab(aOldRange, IDF_ALL);
@@ -2031,7 +2031,7 @@ void __EXPORT ScUndoConsolidate::Undo()
aDestArea.nColEnd, aDestArea.nRowEnd, nTab,
IDF_ALL, FALSE, pDoc );
- // Original-Bereich
+ // Original-Bereich
if (pUndoData)
{
pDoc->DeleteAreaTab(aOldRange, IDF_ALL);
@@ -2051,10 +2051,10 @@ void __EXPORT ScUndoConsolidate::Undo()
nEndX, nEndY, nTab, PAINT_GRID );
}
- // DB-Bereich wieder anpassen
+ // DB-Bereich wieder anpassen
if (pUndoData)
{
- ScDBCollection* pColl = pDoc->GetDBCollection();
+ ScDBCollection* pColl = pDoc->GetDBCollection();
if (pColl)
{
USHORT nIndex;
@@ -2110,7 +2110,7 @@ BOOL __EXPORT ScUndoConsolidate::CanRepeat(SfxRepeatTarget& /* rTarget */) const
//
-// Quell-Daten von Chart aendern
+// Quell-Daten von Chart aendern
//
void ScUndoChartData::Init()
diff --git a/sc/source/ui/undo/undodraw.cxx b/sc/source/ui/undo/undodraw.cxx
index a10a7381d808..458cabec8de2 100644
--- a/sc/source/ui/undo/undodraw.cxx
+++ b/sc/source/ui/undo/undodraw.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +184,7 @@ __EXPORT ScUndoDraw::~ScUndoDraw()
void ScUndoDraw::ForgetDrawUndo()
{
- pDrawUndo = NULL; // nicht loeschen (Draw-Undo muss dann von aussen gemerkt werden)
+ pDrawUndo = NULL; // nicht loeschen (Draw-Undo muss dann von aussen gemerkt werden)
}
String __EXPORT ScUndoDraw::GetComment() const
diff --git a/sc/source/ui/undo/undoolk.cxx b/sc/source/ui/undo/undoolk.cxx
index 183b9d1cd7b4..8053f472cd6c 100644
--- a/sc/source/ui/undo/undoolk.cxx
+++ b/sc/source/ui/undo/undoolk.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ SdrUndoAction* GetSdrUndoAction( ScDocument* pDoc )
{
ScDrawLayer* pLayer = pDoc->GetDrawLayer();
if (pLayer)
- return pLayer->GetCalcUndo(); // muss vorhanden sein
+ return pLayer->GetCalcUndo(); // muss vorhanden sein
else
return NULL;
}
diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx
index b4ea7f35448c..7f85a38adebd 100644
--- a/sc/source/ui/undo/undostyl.cxx
+++ b/sc/source/ui/undo/undostyl.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ TYPEINIT1(ScUndoApplyPageStyle, ScSimpleUndo);
// -----------------------------------------------------------------------
//
-// modify style (cell or page style)
+// modify style (cell or page style)
//
ScStyleSaveData::ScStyleSaveData() :
@@ -98,7 +98,7 @@ void ScStyleSaveData::InitFromStyle( const SfxStyleSheetBase* pSource )
pItems = new SfxItemSet( ((SfxStyleSheetBase*)pSource)->GetItemSet() );
}
else
- *this = ScStyleSaveData(); // empty
+ *this = ScStyleSaveData(); // empty
}
// -----------------------------------------------------------------------
@@ -126,7 +126,7 @@ String ScUndoModifyStyle::GetComment() const
void lcl_DocStyleChanged( ScDocument* pDoc, SfxStyleSheetBase* pStyle, BOOL bRemoved )
{
- //! move to document or docshell
+ //! move to document or docshell
VirtualDevice aVDev;
Point aLogic = aVDev.LogicToPixel( Point(1000,1000), MAP_TWIP );
@@ -147,8 +147,8 @@ void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const String& rName,
ScDocument* pDoc = pDocSh->GetDocument();
ScStyleSheetPool* pStlPool = pDoc->GetStyleSheetPool();
String aNewName = rData.GetName();
- BOOL bDelete = ( aNewName.Len() == 0 ); // no new name -> delete style
- BOOL bNew = ( rName.Len() == 0 && !bDelete ); // creating new style
+ BOOL bDelete = ( aNewName.Len() == 0 ); // no new name -> delete style
+ BOOL bNew = ( rName.Len() == 0 && !bDelete ); // creating new style
SfxStyleSheetBase* pStyle = NULL;
if ( rName.Len() )
@@ -177,7 +177,7 @@ void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const String& rName,
if ( bDelete )
{
if ( eStyleFamily == SFX_STYLE_FAMILY_PARA )
- lcl_DocStyleChanged( pDoc, pStyle, TRUE ); // TRUE: remove usage of style
+ lcl_DocStyleChanged( pDoc, pStyle, TRUE ); // TRUE: remove usage of style
else
pDoc->RemovePageStyleInUse( rName );
@@ -200,7 +200,7 @@ void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const String& rName,
if ( eStyleFamily == SFX_STYLE_FAMILY_PARA )
{
- lcl_DocStyleChanged( pDoc, pStyle, FALSE ); // cell styles: row heights
+ lcl_DocStyleChanged( pDoc, pStyle, FALSE ); // cell styles: row heights
}
else
{
@@ -219,8 +219,8 @@ void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const String& rName,
pDocSh->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID|PAINT_LEFT );
- //! undo/redo document modifications for deleted styles
- //! undo/redo modifications of number formatter
+ //! undo/redo document modifications for deleted styles
+ //! undo/redo modifications of number formatter
}
void ScUndoModifyStyle::Undo()
@@ -243,12 +243,12 @@ void ScUndoModifyStyle::Repeat(SfxRepeatTarget& /* rTarget */)
BOOL ScUndoModifyStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- return FALSE; // no repeat possible
+ return FALSE; // no repeat possible
}
// -----------------------------------------------------------------------
//
-// apply page style
+// apply page style
//
ScUndoApplyPageStyle::ApplyStyleEntry::ApplyStyleEntry( SCTAB nTab, const String& rOldStyle ) :
mnTab( nTab ),
@@ -300,7 +300,7 @@ void ScUndoApplyPageStyle::Redo()
void ScUndoApplyPageStyle::Repeat(SfxRepeatTarget& /* rTarget */)
{
- //! set same page style to current tab
+ //! set same page style to current tab
}
BOOL ScUndoApplyPageStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index 70845f6c0bc9..1b4f94521624 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "drwlayer.hxx"
#include "scresid.hxx"
-extern BOOL bDrawIsInUndo; //! irgendwo als Member !!!
+extern BOOL bDrawIsInUndo; //! irgendwo als Member !!!
using namespace com::sun::star;
using ::com::sun::star::uno::Sequence;
@@ -64,27 +64,27 @@ using ::std::auto_ptr;
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1(ScUndoInsertTab, SfxUndoAction);
-TYPEINIT1(ScUndoInsertTables, SfxUndoAction);
-TYPEINIT1(ScUndoDeleteTab, SfxUndoAction);
-TYPEINIT1(ScUndoRenameTab, SfxUndoAction);
-TYPEINIT1(ScUndoMoveTab, SfxUndoAction);
-TYPEINIT1(ScUndoCopyTab, SfxUndoAction);
-TYPEINIT1(ScUndoMakeScenario, SfxUndoAction);
-TYPEINIT1(ScUndoImportTab, SfxUndoAction);
-TYPEINIT1(ScUndoRemoveLink, SfxUndoAction);
-TYPEINIT1(ScUndoShowHideTab, SfxUndoAction);
-TYPEINIT1(ScUndoPrintRange, SfxUndoAction);
-TYPEINIT1(ScUndoScenarioFlags, SfxUndoAction);
-TYPEINIT1(ScUndoRenameObject, SfxUndoAction);
-TYPEINIT1(ScUndoLayoutRTL, SfxUndoAction);
-//UNUSED2009-05 TYPEINIT1(ScUndoSetGrammar, SfxUndoAction);
+TYPEINIT1(ScUndoInsertTab, SfxUndoAction);
+TYPEINIT1(ScUndoInsertTables, SfxUndoAction);
+TYPEINIT1(ScUndoDeleteTab, SfxUndoAction);
+TYPEINIT1(ScUndoRenameTab, SfxUndoAction);
+TYPEINIT1(ScUndoMoveTab, SfxUndoAction);
+TYPEINIT1(ScUndoCopyTab, SfxUndoAction);
+TYPEINIT1(ScUndoMakeScenario, SfxUndoAction);
+TYPEINIT1(ScUndoImportTab, SfxUndoAction);
+TYPEINIT1(ScUndoRemoveLink, SfxUndoAction);
+TYPEINIT1(ScUndoShowHideTab, SfxUndoAction);
+TYPEINIT1(ScUndoPrintRange, SfxUndoAction);
+TYPEINIT1(ScUndoScenarioFlags, SfxUndoAction);
+TYPEINIT1(ScUndoRenameObject, SfxUndoAction);
+TYPEINIT1(ScUndoLayoutRTL, SfxUndoAction);
+//UNUSED2009-05 TYPEINIT1(ScUndoSetGrammar, SfxUndoAction);
TYPEINIT1(ScUndoTabColor, SfxUndoAction);
// -----------------------------------------------------------------------
//
-// Tabelle einfuegen
+// Tabelle einfuegen
//
ScUndoInsertTab::ScUndoInsertTab( ScDocShell* pNewDocShell,
@@ -132,11 +132,11 @@ void ScUndoInsertTab::Undo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
pViewShell->SetTabNo(nTab);
- pDocShell->SetInUndo( TRUE ); //! BeginUndo
+ pDocShell->SetInUndo( TRUE ); //! BeginUndo
bDrawIsInUndo = TRUE;
pViewShell->DeleteTable( nTab, FALSE );
bDrawIsInUndo = FALSE;
- pDocShell->SetInUndo( FALSE ); //! EndUndo
+ pDocShell->SetInUndo( FALSE ); //! EndUndo
DoSdrUndoAction( pDrawUndo, pDocShell->GetDocument() );
@@ -144,7 +144,7 @@ void ScUndoInsertTab::Undo()
if ( pChangeTrack )
pChangeTrack->Undo( nEndChangeAction, nEndChangeAction );
- // SetTabNo(...,TRUE) for all views to sync with drawing layer pages
+ // SetTabNo(...,TRUE) for all views to sync with drawing layer pages
pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) );
}
@@ -154,7 +154,7 @@ void ScUndoInsertTab::Redo()
RedoSdrUndoAction( pDrawUndo ); // Draw Redo first
- pDocShell->SetInUndo( TRUE ); //! BeginRedo
+ pDocShell->SetInUndo( TRUE ); //! BeginRedo
bDrawIsInUndo = TRUE;
if (bAppend)
pViewShell->AppendTable( sNewName, FALSE );
@@ -164,7 +164,7 @@ void ScUndoInsertTab::Redo()
pViewShell->InsertTable( sNewName, nTab, FALSE );
}
bDrawIsInUndo = FALSE;
- pDocShell->SetInUndo( FALSE ); //! EndRedo
+ pDocShell->SetInUndo( FALSE ); //! EndRedo
SetChangeTrack();
}
@@ -183,7 +183,7 @@ BOOL ScUndoInsertTab::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Tabellen einfuegen
+// Tabellen einfuegen
//
ScUndoInsertTables::ScUndoInsertTables( ScDocShell* pNewDocShell,
@@ -194,7 +194,7 @@ ScUndoInsertTables::ScUndoInsertTables( ScDocShell* pNewDocShell,
nTab( nTabNum ),
bAppend( bApp )
{
- pNameList = pNewNameList;
+ pNameList = pNewNameList;
pDrawUndo = GetSdrUndoAction( pDocShell->GetDocument() );
SetChangeTrack();
@@ -246,7 +246,7 @@ void ScUndoInsertTables::Undo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
pViewShell->SetTabNo(nTab);
- pDocShell->SetInUndo( TRUE ); //! BeginUndo
+ pDocShell->SetInUndo( TRUE ); //! BeginUndo
bDrawIsInUndo = TRUE;
SvShorts TheTabs;
@@ -259,7 +259,7 @@ void ScUndoInsertTables::Undo()
TheTabs.Remove(0,TheTabs.Count());
bDrawIsInUndo = FALSE;
- pDocShell->SetInUndo( FALSE ); //! EndUndo
+ pDocShell->SetInUndo( FALSE ); //! EndUndo
DoSdrUndoAction( pDrawUndo, pDocShell->GetDocument() );
@@ -267,7 +267,7 @@ void ScUndoInsertTables::Undo()
if ( pChangeTrack )
pChangeTrack->Undo( nStartChangeAction, nEndChangeAction );
- // SetTabNo(...,TRUE) for all views to sync with drawing layer pages
+ // SetTabNo(...,TRUE) for all views to sync with drawing layer pages
pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) );
}
@@ -277,13 +277,13 @@ void ScUndoInsertTables::Redo()
RedoSdrUndoAction( pDrawUndo ); // Draw Redo first
- pDocShell->SetInUndo( TRUE ); //! BeginRedo
+ pDocShell->SetInUndo( TRUE ); //! BeginRedo
bDrawIsInUndo = TRUE;
pViewShell->SetTabNo(nTab);
pViewShell->InsertTables( pNameList, nTab, static_cast<SCTAB>(pNameList->Count()),FALSE );
bDrawIsInUndo = FALSE;
- pDocShell->SetInUndo( FALSE ); //! EndRedo
+ pDocShell->SetInUndo( FALSE ); //! EndRedo
SetChangeTrack();
}
@@ -303,7 +303,7 @@ BOOL ScUndoInsertTables::CanRepeat(SfxRepeatTarget& rTarget) const
//----------------------------------------------------------------------------------
//
-// Tabelle loeschen
+// Tabelle loeschen
//
ScUndoDeleteTab::ScUndoDeleteTab( ScDocShell* pNewDocShell,const SvShorts &aTab, //SCTAB nNewTab,
@@ -374,8 +374,8 @@ void ScUndoDeleteTab::Undo()
bDrawIsInUndo = FALSE;
if (bOk)
{
- // Ref-Undo passiert in EndUndo
- // pUndoDoc->UndoToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,FALSE, pDoc );
+ // Ref-Undo passiert in EndUndo
+ // pUndoDoc->UndoToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,FALSE, pDoc );
pRefUndoDoc->CopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,FALSE, pDoc );
String aOldName;
@@ -407,16 +407,16 @@ void ScUndoDeleteTab::Undo()
if ( pRefUndoDoc->IsTabProtected( nTab ) )
pDoc->SetTabProtection(nTab, pRefUndoDoc->GetTabProtection(nTab));
- // Drawing-Layer passiert beim MoveUndo::EndUndo
- // pDoc->TransferDrawPage(pRefUndoDoc, nTab,nTab);
+ // Drawing-Layer passiert beim MoveUndo::EndUndo
+ // pDoc->TransferDrawPage(pRefUndoDoc, nTab,nTab);
}
}
if (bLink)
{
- pDocShell->UpdateLinks(); // Link-Manager updaten
+ pDocShell->UpdateLinks(); // Link-Manager updaten
}
- EndUndo(); // Draw-Undo muss vor dem Broadcast kommen!
+ EndUndo(); // Draw-Undo muss vor dem Broadcast kommen!
ScChangeTrack* pChangeTrack = pDocShell->GetDocument()->GetChangeTrack();
if ( pChangeTrack )
@@ -431,14 +431,14 @@ void ScUndoDeleteTab::Undo()
pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) );
pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
- pDocShell->PostPaint(0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_ALL ); // incl. Extras
+ pDocShell->PostPaint(0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_ALL ); // incl. Extras
- // nicht ShowTable wegen SetTabNo(..., TRUE):
+ // nicht ShowTable wegen SetTabNo(..., TRUE):
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
pViewShell->SetTabNo( lcl_GetVisibleTabBefore( *pDoc, theTabs[0] ), TRUE );
-// EndUndo();
+// EndUndo();
}
void ScUndoDeleteTab::Redo()
@@ -448,15 +448,15 @@ void ScUndoDeleteTab::Redo()
RedoSdrUndoAction( pDrawUndo ); // Draw Redo first
- pDocShell->SetInUndo( TRUE ); //! BeginRedo
+ pDocShell->SetInUndo( TRUE ); //! BeginRedo
bDrawIsInUndo = TRUE;
pViewShell->DeleteTables( theTabs, FALSE );
bDrawIsInUndo = FALSE;
- pDocShell->SetInUndo( TRUE ); //! EndRedo
+ pDocShell->SetInUndo( TRUE ); //! EndRedo
SetChangeTrack();
- // SetTabNo(...,TRUE) for all views to sync with drawing layer pages
+ // SetTabNo(...,TRUE) for all views to sync with drawing layer pages
pDocShell->Broadcast( SfxSimpleHint( SC_HINT_FORCESETTAB ) );
}
@@ -477,7 +477,7 @@ BOOL ScUndoDeleteTab::CanRepeat(SfxRepeatTarget& rTarget) const
//---------------------------------------------------------------------------------
//
-// Tabelle umbenennen
+// Tabelle umbenennen
//
ScUndoRenameTab::ScUndoRenameTab( ScDocShell* pNewDocShell,
@@ -485,7 +485,7 @@ ScUndoRenameTab::ScUndoRenameTab( ScDocShell* pNewDocShell,
const String& rOldName,
const String& rNewName) :
ScSimpleUndo( pNewDocShell ),
- nTab ( nT )
+ nTab ( nT )
{
sOldName = rOldName;
sNewName = rNewName;
@@ -505,13 +505,13 @@ void ScUndoRenameTab::DoChange( SCTAB nTabP, const String& rName ) const
ScDocument* pDoc = pDocShell->GetDocument();
pDoc->RenameTab( nTabP, rName );
- SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator
pDocShell->PostPaintGridAll();
pDocShell->PostPaintExtras();
pDocShell->PostDataChanged();
- // Der Tabellenname koennte in einer Formel vorkommen...
+ // Der Tabellenname koennte in einer Formel vorkommen...
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
pViewShell->UpdateInputHandler();
@@ -529,7 +529,7 @@ void ScUndoRenameTab::Redo()
void ScUndoRenameTab::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // Repeat macht keinen Sinn
+ // Repeat macht keinen Sinn
}
BOOL ScUndoRenameTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const
@@ -540,7 +540,7 @@ BOOL ScUndoRenameTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const
//----------------------------------------------------------------------------------
//
-// Tabelle verschieben
+// Tabelle verschieben
//
ScUndoMoveTab::ScUndoMoveTab( ScDocShell* pNewDocShell,
@@ -572,13 +572,13 @@ void ScUndoMoveTab::DoChange( BOOL bUndo ) const
ScDocument* pDoc = pDocShell->GetDocument();
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
- if (bUndo) // UnDo
+ if (bUndo) // UnDo
{
for(int i=theNewTabs.Count()-1;i>=0;i--)
{
SCTAB nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)];
SCTAB nOldTab = theOldTabs[sal::static_int_cast<USHORT>(i)];
- if (nDestTab > MAXTAB) // angehaengt ?
+ if (nDestTab > MAXTAB) // angehaengt ?
nDestTab = pDoc->GetTableCount() - 1;
pDoc->MoveTab( nDestTab, nOldTab );
@@ -593,7 +593,7 @@ void ScUndoMoveTab::DoChange( BOOL bUndo ) const
SCTAB nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)];
SCTAB nNewTab = theNewTabs[sal::static_int_cast<USHORT>(i)];
SCTAB nOldTab = theOldTabs[sal::static_int_cast<USHORT>(i)];
- if (nDestTab > MAXTAB) // angehaengt ?
+ if (nDestTab > MAXTAB) // angehaengt ?
nDestTab = pDoc->GetTableCount() - 1;
pDoc->MoveTab( nOldTab, nNewTab );
@@ -602,7 +602,7 @@ void ScUndoMoveTab::DoChange( BOOL bUndo ) const
}
}
- SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator
pDocShell->PostPaintGridAll();
pDocShell->PostPaintExtras();
@@ -632,7 +632,7 @@ BOOL ScUndoMoveTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const
//----------------------------------------------------------------------------------
//
-// Tabelle kopieren
+// Tabelle kopieren
//
ScUndoCopyTab::ScUndoCopyTab( ScDocShell* pNewDocShell,
@@ -668,7 +668,7 @@ void ScUndoCopyTab::DoChange() const
if (pViewShell)
pViewShell->SetTabNo(theOldTabs[0],TRUE);
- SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator
pDocShell->PostPaintGridAll();
pDocShell->PostPaintExtras();
@@ -685,7 +685,7 @@ void ScUndoCopyTab::Undo()
for(i=theNewTabs.Count()-1;i>=0;i--)
{
SCTAB nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)];
- if (nDestTab > MAXTAB) // append?
+ if (nDestTab > MAXTAB) // append?
nDestTab = pDoc->GetTableCount() - 1;
bDrawIsInUndo = TRUE;
@@ -693,13 +693,13 @@ void ScUndoCopyTab::Undo()
bDrawIsInUndo = FALSE;
}
- // ScTablesHint broadcasts after all sheets have been deleted,
- // so sheets and draw pages are in sync!
+ // ScTablesHint broadcasts after all sheets have been deleted,
+ // so sheets and draw pages are in sync!
for(i=theNewTabs.Count()-1;i>=0;i--)
{
SCTAB nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)];
- if (nDestTab > MAXTAB) // append?
+ if (nDestTab > MAXTAB) // append?
nDestTab = pDoc->GetTableCount() - 1;
pDocShell->Broadcast( ScTablesHint( SC_TAB_DELETED, nDestTab ) );
@@ -719,7 +719,7 @@ void ScUndoCopyTab::Redo()
nDestTab = theNewTabs[sal::static_int_cast<USHORT>(i)];
SCTAB nNewTab = theNewTabs[sal::static_int_cast<USHORT>(i)];
SCTAB nOldTab = theOldTabs[sal::static_int_cast<USHORT>(i)];
- if (nDestTab > MAXTAB) // angehaengt ?
+ if (nDestTab > MAXTAB) // angehaengt ?
nDestTab = pDoc->GetTableCount() - 1;
bDrawIsInUndo = TRUE;
@@ -730,7 +730,7 @@ void ScUndoCopyTab::Redo()
SCTAB nAdjSource = nOldTab;
if ( nNewTab <= nOldTab )
- ++nAdjSource; // new position of source table after CopyTab
+ ++nAdjSource; // new position of source table after CopyTab
if ( pDoc->IsScenario(nAdjSource) )
{
@@ -752,7 +752,7 @@ void ScUndoCopyTab::Redo()
RedoSdrUndoAction( pDrawUndo ); // after the sheets are inserted
- pViewShell->SetTabNo( nDestTab, TRUE ); // after draw-undo
+ pViewShell->SetTabNo( nDestTab, TRUE ); // after draw-undo
DoChange();
@@ -773,7 +773,7 @@ BOOL ScUndoCopyTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const
// Tab Bg Color
//
-ScUndoTabColor::ScUndoTabColor(
+ScUndoTabColor::ScUndoTabColor(
ScDocShell* pNewDocShell, SCTAB nT, const Color& aOTabBgColor, const Color& aNTabBgColor) :
ScSimpleUndo( pNewDocShell )
{
@@ -843,7 +843,7 @@ BOOL ScUndoTabColor::CanRepeat(SfxRepeatTarget& /* rTarget */) const
// -----------------------------------------------------------------------
//
-// Szenario anlegen
+// Szenario anlegen
//
ScUndoMakeScenario::ScUndoMakeScenario( ScDocShell* pNewDocShell,
@@ -937,7 +937,7 @@ BOOL ScUndoMakeScenario::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Tabelle einfuegen
+// Tabelle einfuegen
//
ScUndoImportTab::ScUndoImportTab( ScDocShell* pShell,
@@ -980,14 +980,14 @@ void ScUndoImportTab::DoChange() const
}
}
- SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); // Navigator
pDocShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB,
PAINT_GRID | PAINT_TOP | PAINT_LEFT | PAINT_EXTRAS );
}
void ScUndoImportTab::Undo()
{
- //! eingefuegte Bereichsnamen etc.
+ //! eingefuegte Bereichsnamen etc.
SCTAB i;
ScDocument* pDoc = pDocShell->GetDocument();
@@ -1047,7 +1047,7 @@ void ScUndoImportTab::Redo()
ScDocument* pDoc = pDocShell->GetDocument();
String aName;
SCTAB i;
- for (i=0; i<nCount; i++) // first insert all sheets (#63304#)
+ for (i=0; i<nCount; i++) // first insert all sheets (#63304#)
{
SCTAB nTabPos=nTab+i;
pRedoDoc->GetName(nTabPos,aName);
@@ -1055,7 +1055,7 @@ void ScUndoImportTab::Redo()
pDoc->InsertTab(nTabPos,aName);
bDrawIsInUndo = FALSE;
}
- for (i=0; i<nCount; i++) // then copy into inserted sheets
+ for (i=0; i<nCount; i++) // then copy into inserted sheets
{
SCTAB nTabPos=nTab+i;
pRedoDoc->CopyToDocument(0,0,nTabPos, MAXCOL,MAXROW,nTabPos, IDF_ALL,FALSE, pDoc );
@@ -1098,7 +1098,7 @@ BOOL ScUndoImportTab::CanRepeat(SfxRepeatTarget& rTarget) const
// -----------------------------------------------------------------------
//
-// Tabellen-Verknuepfung aufheben
+// Tabellen-Verknuepfung aufheben
//
ScUndoRemoveLink::ScUndoRemoveLink( ScDocShell* pShell, const String& rDoc ) :
@@ -1108,8 +1108,8 @@ ScUndoRemoveLink::ScUndoRemoveLink( ScDocShell* pShell, const String& rDoc ) :
{
ScDocument* pDoc = pDocShell->GetDocument();
SCTAB nTabCount = pDoc->GetTableCount();
- pTabs = new SCTAB[nTabCount];
- pModes = new BYTE[nTabCount];
+ pTabs = new SCTAB[nTabCount];
+ pModes = new BYTE[nTabCount];
pTabNames = new String[nTabCount];
for (SCTAB i=0; i<nTabCount; i++)
@@ -1155,9 +1155,9 @@ void ScUndoRemoveLink::DoChange( BOOL bLink ) const
ScDocument* pDoc = pDocShell->GetDocument();
String aEmpty;
for (USHORT i=0; i<nCount; i++)
- if (bLink) // establish link
+ if (bLink) // establish link
pDoc->SetLink( pTabs[i], pModes[i], aDocName, aFltName, aOptions, pTabNames[i], nRefreshDelay );
- else // remove link
+ else // remove link
pDoc->SetLink( pTabs[i], SC_LINK_NONE, aEmpty, aEmpty, aEmpty, aEmpty, 0 );
pDocShell->UpdateLinks();
}
@@ -1174,7 +1174,7 @@ void ScUndoRemoveLink::Redo()
void ScUndoRemoveLink::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // gippsnich
+ // gippsnich
}
BOOL ScUndoRemoveLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
@@ -1185,7 +1185,7 @@ BOOL ScUndoRemoveLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
// -----------------------------------------------------------------------
//
-// Tabellen ein-/ausblenden
+// Tabellen ein-/ausblenden
//
ScUndoShowHideTab::ScUndoShowHideTab( ScDocShell* pShell, SCTAB nNewTab, BOOL bNewShow ) :
@@ -1382,7 +1382,7 @@ String ScUndoTabProtect::GetComment() const
// -----------------------------------------------------------------------
//
-// Druck-/Wiederholungsbereiche aendern
+// Druck-/Wiederholungsbereiche aendern
//
ScUndoPrintRange::ScUndoPrintRange( ScDocShell* pShell, SCTAB nNewTab,
@@ -1433,12 +1433,12 @@ void ScUndoPrintRange::Redo()
void ScUndoPrintRange::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // gippsnich
+ // gippsnich
}
BOOL ScUndoPrintRange::CanRepeat(SfxRepeatTarget& /* rTarget */) const
{
- return FALSE; // gippsnich
+ return FALSE; // gippsnich
}
String ScUndoPrintRange::GetComment() const
@@ -1451,22 +1451,22 @@ String ScUndoPrintRange::GetComment() const
//---------------------------------------------------------------------------------
//
-// Szenario-Flags
+// Szenario-Flags
//
ScUndoScenarioFlags::ScUndoScenarioFlags( ScDocShell* pNewDocShell, SCTAB nT,
const String& rON, const String& rNN, const String& rOC, const String& rNC,
const Color& rOCol, const Color& rNCol, USHORT nOF, USHORT nNF ) :
ScSimpleUndo( pNewDocShell ),
- nTab ( nT ),
- aOldName ( rON ),
- aNewName ( rNN ),
- aOldComment ( rOC ),
- aNewComment ( rNC ),
- aOldColor ( rOCol ),
- aNewColor ( rNCol ),
- nOldFlags ( nOF ),
- nNewFlags ( nNF )
+ nTab ( nT ),
+ aOldName ( rON ),
+ aNewName ( rNN ),
+ aOldComment ( rOC ),
+ aNewComment ( rNC ),
+ aOldColor ( rOCol ),
+ aNewColor ( rNCol ),
+ nOldFlags ( nOF ),
+ nNewFlags ( nNF )
{
}
@@ -1487,7 +1487,7 @@ void ScUndoScenarioFlags::Undo()
pDoc->SetScenarioData( nTab, aOldComment, aOldColor, nOldFlags );
pDocShell->PostPaintGridAll();
- // Der Tabellenname koennte in einer Formel vorkommen...
+ // Der Tabellenname koennte in einer Formel vorkommen...
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
pViewShell->UpdateInputHandler();
@@ -1504,7 +1504,7 @@ void ScUndoScenarioFlags::Redo()
pDoc->SetScenarioData( nTab, aNewComment, aNewColor, nNewFlags );
pDocShell->PostPaintGridAll();
- // Der Tabellenname koennte in einer Formel vorkommen...
+ // Der Tabellenname koennte in einer Formel vorkommen...
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
pViewShell->UpdateInputHandler();
@@ -1515,7 +1515,7 @@ void ScUndoScenarioFlags::Redo()
void ScUndoScenarioFlags::Repeat(SfxRepeatTarget& /* rTarget */)
{
- // Repeat macht keinen Sinn
+ // Repeat macht keinen Sinn
}
BOOL ScUndoScenarioFlags::CanRepeat(SfxRepeatTarget& /* rTarget */) const
@@ -1526,16 +1526,16 @@ BOOL ScUndoScenarioFlags::CanRepeat(SfxRepeatTarget& /* rTarget */) const
//---------------------------------------------------------------------------------
//
-// rename object
-// (move to different file?)
+// rename object
+// (move to different file?)
//
ScUndoRenameObject::ScUndoRenameObject( ScDocShell* pNewDocShell, const String& rPN,
const String& rON, const String& rNN ) :
ScSimpleUndo( pNewDocShell ),
aPersistName( rPN ),
- aOldName ( rON ),
- aNewName ( rNN )
+ aOldName ( rON ),
+ aNewName ( rNN )
{
}
@@ -1545,7 +1545,7 @@ ScUndoRenameObject::~ScUndoRenameObject()
String ScUndoRenameObject::GetComment() const
{
- // string resource shared with title for dialog
+ // string resource shared with title for dialog
return String( ScResId(SCSTR_RENAMEOBJECT) );
}
@@ -1608,7 +1608,7 @@ BOOL ScUndoRenameObject::CanRepeat(SfxRepeatTarget& /* rTarget */) const
// -----------------------------------------------------------------------
//
-// Switch sheet between left-to-right and right-to-left
+// Switch sheet between left-to-right and right-to-left
//
ScUndoLayoutRTL::ScUndoLayoutRTL( ScDocShell* pShell, SCTAB nNewTab, BOOL bNewRTL ) :
@@ -1669,7 +1669,7 @@ String ScUndoLayoutRTL::GetComment() const
// -----------------------------------------------------------------------
//
-// Set the grammar used for the sheet
+// Set the grammar used for the sheet
//
//UNUSED2009-05 ScUndoSetGrammar::ScUndoSetGrammar( ScDocShell* pShell,
@@ -1679,11 +1679,11 @@ String ScUndoLayoutRTL::GetComment() const
//UNUSED2009-05 {
//UNUSED2009-05 meOldGrammar = pDocShell->GetDocument()->GetGrammar();
//UNUSED2009-05 }
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 __EXPORT ScUndoSetGrammar::~ScUndoSetGrammar()
//UNUSED2009-05 {
//UNUSED2009-05 }
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 void ScUndoSetGrammar::DoChange( formula::FormulaGrammar::Grammar eGrammar )
//UNUSED2009-05 {
//UNUSED2009-05 pDocShell->SetInUndo( TRUE );
@@ -1692,17 +1692,17 @@ String ScUndoLayoutRTL::GetComment() const
//UNUSED2009-05 pDocShell->SetDocumentModified();
//UNUSED2009-05 pDocShell->SetInUndo( FALSE );
//UNUSED2009-05 }
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 void __EXPORT ScUndoSetGrammar::Undo()
//UNUSED2009-05 {
//UNUSED2009-05 DoChange( meOldGrammar );
//UNUSED2009-05 }
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 void __EXPORT ScUndoSetGrammar::Redo()
//UNUSED2009-05 {
//UNUSED2009-05 DoChange( meNewGrammar );
//UNUSED2009-05 }
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 void __EXPORT ScUndoSetGrammar::Repeat(SfxRepeatTarget& /* rTarget */)
//UNUSED2009-05 {
//UNUSED2009-05 #if 0
@@ -1712,12 +1712,12 @@ String ScUndoLayoutRTL::GetComment() const
//UNUSED2009-05 Execute( FID_TAB_USE_R1C1, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
//UNUSED2009-05 #endif
//UNUSED2009-05 }
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 BOOL __EXPORT ScUndoSetGrammar::CanRepeat(SfxRepeatTarget& rTarget) const
//UNUSED2009-05 {
//UNUSED2009-05 return (rTarget.ISA(ScTabViewTarget));
//UNUSED2009-05 }
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 String __EXPORT ScUndoSetGrammar::GetComment() const
//UNUSED2009-05 {
//UNUSED2009-05 return ScGlobal::GetRscString( STR_UNDO_TAB_R1C1 );
diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx
index 168975cdda3a..c87fd8a54eaf 100644
--- a/sc/source/ui/undo/undoutil.cxx
+++ b/sc/source/ui/undo/undoutil.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/unoobj/ChartRangeSelectionListener.cxx b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
index e8000d71518b..1a832a122caf 100644
--- a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
+++ b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ void SAL_CALL ScChartRangeSelectionListener::selectionChanged( const lang::Event
// SfxViewShell* pSh = pFrame->GetViewShell();
// if (pSh && pSh->ISA(ScTabViewShell))
// {
-// ScTabViewShell* pViewSh = (ScTabViewShell*)pSh;
+// ScTabViewShell* pViewSh = (ScTabViewShell*)pSh;
// }
// pFrame = SfxViewFrame::GetNext( *pFrame, m_pDocShell );
// }
diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx
index 10627222be80..4bea38e7c39f 100644
--- a/sc/source/ui/unoobj/addruno.cxx
+++ b/sc/source/ui/unoobj/addruno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index 481c611773ed..0a174c00fbd0 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,29 +76,29 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-// ein AutoFormat hat immer 16 Eintraege
+// ein AutoFormat hat immer 16 Eintraege
#define SC_AF_FIELD_COUNT 16
//------------------------------------------------------------------------
-// AutoFormat-Map nur fuer PropertySetInfo, ohne Which-IDs
+// AutoFormat-Map nur fuer PropertySetInfo, ohne Which-IDs
const SfxItemPropertyMapEntry* lcl_GetAutoFormatMap()
{
static SfxItemPropertyMapEntry aAutoFormatMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_INCBACK), 0, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_INCBORD), 0, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_INCFONT), 0, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_INCJUST), 0, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_INCNUM), 0, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_INCWIDTH), 0, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_INCBACK), 0, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_INCBORD), 0, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_INCFONT), 0, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_INCJUST), 0, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_INCNUM), 0, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_INCWIDTH), 0, &::getBooleanCppuType(), 0, 0 },
{0,0,0,0,0,0}
};
return aAutoFormatMap_Impl;
}
-//! Zahlformat (String/Language) ??? (in XNumberFormat nur ReadOnly)
+//! Zahlformat (String/Language) ??? (in XNumberFormat nur ReadOnly)
//! table::TableBorder ??!?
const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap()
@@ -156,7 +156,7 @@ const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap()
//------------------------------------------------------------------------
-#define SCAUTOFORMATSOBJ_SERVICE "com.sun.star.sheet.TableAutoFormats"
+#define SCAUTOFORMATSOBJ_SERVICE "com.sun.star.sheet.TableAutoFormats"
SC_SIMPLE_SERVICE_INFO( ScAutoFormatFieldObj, "ScAutoFormatFieldObj", "com.sun.star.sheet.TableAutoFormatField" )
SC_SIMPLE_SERVICE_INFO( ScAutoFormatObj, "ScAutoFormatObj", "com.sun.star.sheet.TableAutoFormat" )
@@ -178,15 +178,15 @@ sal_Bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const String& rN
return sal_True;
}
}
- return sal_False; // is nich
+ return sal_False; // is nich
}
//------------------------------------------------------------------------
ScAutoFormatsObj::ScAutoFormatsObj()
{
- //! Dieses Objekt darf es nur einmal geben, und es muss an den Auto-Format-Daten
- //! bekannt sein, damit Aenderungen gebroadcasted werden koennen
+ //! Dieses Objekt darf es nur einmal geben, und es muss an den Auto-Format-Daten
+ //! bekannt sein, damit Aenderungen gebroadcasted werden koennen
}
ScAutoFormatsObj::~ScAutoFormatsObj()
@@ -195,7 +195,7 @@ ScAutoFormatsObj::~ScAutoFormatsObj()
// stuff for exService_...
-uno::Reference<uno::XInterface> SAL_CALL ScAutoFormatsObj_CreateInstance(
+uno::Reference<uno::XInterface> SAL_CALL ScAutoFormatsObj_CreateInstance(
const uno::Reference<lang::XMultiServiceFactory>& )
{
ScUnoGuard aGuard;
@@ -225,7 +225,7 @@ ScAutoFormatObj* ScAutoFormatsObj::GetObjectByIndex_Impl(sal_uInt16 nIndex)
if (pFormats && nIndex < pFormats->GetCount())
return new ScAutoFormatObj(nIndex);
- return NULL; // falscher Index
+ return NULL; // falscher Index
}
ScAutoFormatObj* ScAutoFormatsObj::GetObjectByName_Impl(const rtl::OUString& aName)
@@ -249,12 +249,12 @@ void SAL_CALL ScAutoFormatsObj::insertByName( const rtl::OUString& aName, const
{
ScUnoGuard aGuard;
sal_Bool bDone = sal_False;
- // Reflection muss nicht uno::XInterface sein, kann auch irgendein Interface sein...
+ // Reflection muss nicht uno::XInterface sein, kann auch irgendein Interface sein...
uno::Reference< uno::XInterface > xInterface(aElement, uno::UNO_QUERY);
if ( xInterface.is() )
{
ScAutoFormatObj* pFormatObj = ScAutoFormatObj::getImplementation( xInterface );
- if ( pFormatObj && !pFormatObj->IsInserted() ) // noch nicht eingefuegt?
+ if ( pFormatObj && !pFormatObj->IsInserted() ) // noch nicht eingefuegt?
{
String aNameStr(aName);
ScAutoFormat* pFormats = ScGlobal::GetAutoFormat();
@@ -267,13 +267,13 @@ void SAL_CALL ScAutoFormatsObj::insertByName( const rtl::OUString& aName, const
if (pFormats->Insert( pNew ))
{
- //! Notify fuer andere Objekte
- pFormats->Save(); // sofort speichern
+ //! Notify fuer andere Objekte
+ pFormats->Save(); // sofort speichern
sal_uInt16 nNewIndex;
if (lcl_FindAutoFormatIndex( *pFormats, aNameStr, nNewIndex ))
{
- pFormatObj->InitFormat( nNewIndex ); // kann jetzt benutzt werden
+ pFormatObj->InitFormat( nNewIndex ); // kann jetzt benutzt werden
bDone = sal_True;
}
}
@@ -293,7 +293,7 @@ void SAL_CALL ScAutoFormatsObj::insertByName( const rtl::OUString& aName, const
if (!bDone)
{
- // other errors are handled above
+ // other errors are handled above
throw lang::IllegalArgumentException();
}
}
@@ -303,7 +303,7 @@ void SAL_CALL ScAutoFormatsObj::replaceByName( const rtl::OUString& aName, const
lang::WrappedTargetException, uno::RuntimeException)
{
ScUnoGuard aGuard;
- //! zusammenfassen?
+ //! zusammenfassen?
removeByName( aName );
insertByName( aName, aElement );
}
@@ -321,8 +321,8 @@ void SAL_CALL ScAutoFormatsObj::removeByName( const rtl::OUString& aName )
{
pFormats->AtFree( nIndex );
- //! Notify fuer andere Objekte
- pFormats->Save(); // sofort speichern
+ //! Notify fuer andere Objekte
+ pFormats->Save(); // sofort speichern
}
else
{
@@ -365,7 +365,7 @@ uno::Any SAL_CALL ScAutoFormatsObj::getByIndex( sal_Int32 nIndex )
uno::Type SAL_CALL ScAutoFormatsObj::getElementType() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- return ::getCppuType((const uno::Reference< container::XNamed >*)0); // muss zu getByIndex passen
+ return ::getCppuType((const uno::Reference< container::XNamed >*)0); // muss zu getByIndex passen
}
sal_Bool SAL_CALL ScAutoFormatsObj::hasElements() throw(uno::RuntimeException)
@@ -428,13 +428,13 @@ ScAutoFormatObj::ScAutoFormatObj(sal_uInt16 nIndex) :
aPropSet( lcl_GetAutoFormatMap() ),
nFormatIndex( nIndex )
{
- //! Listening !!!
+ //! Listening !!!
}
ScAutoFormatObj::~ScAutoFormatObj()
{
- // Wenn ein AutoFormat-Objekt losgelassen wird, werden eventuelle Aenderungen
- // gespeichert, damit sie z.B. im Writer sichtbar sind
+ // Wenn ein AutoFormat-Objekt losgelassen wird, werden eventuelle Aenderungen
+ // gespeichert, damit sie z.B. im Writer sichtbar sind
if (IsInserted())
{
@@ -450,7 +450,7 @@ void ScAutoFormatObj::InitFormat( sal_uInt16 nNewIndex )
{
DBG_ASSERT( nFormatIndex == SC_AFMTOBJ_INVALID, "ScAutoFormatObj::InitFormat mehrfach" );
nFormatIndex = nNewIndex;
- //! Listening !!!
+ //! Listening !!!
}
// XUnoTunnel
@@ -497,7 +497,7 @@ ScAutoFormatObj* ScAutoFormatObj::getImplementation(
void ScAutoFormatObj::Notify( SfxBroadcaster& /* rBC */, const SfxHint& /* rHint */ )
{
- // spaeter...
+ // spaeter...
}
// XTableAutoFormat
@@ -525,7 +525,7 @@ sal_Int32 SAL_CALL ScAutoFormatObj::getCount() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
if (IsInserted())
- return SC_AF_FIELD_COUNT; // immer 16 Elemente
+ return SC_AF_FIELD_COUNT; // immer 16 Elemente
else
return 0;
}
@@ -547,7 +547,7 @@ uno::Any SAL_CALL ScAutoFormatObj::getByIndex( sal_Int32 nIndex )
uno::Type SAL_CALL ScAutoFormatObj::getElementType() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- return ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); // muss zu getByIndex passen
+ return ::getCppuType((const uno::Reference< beans::XPropertySet >*)0); // muss zu getByIndex passen
}
sal_Bool SAL_CALL ScAutoFormatObj::hasElements() throw(uno::RuntimeException)
@@ -591,21 +591,21 @@ void SAL_CALL ScAutoFormatObj::setName( const rtl::OUString& aNewName )
pFormats->AtFree( nFormatIndex );
if (pFormats->Insert( pNew ))
{
- nFormatIndex = pFormats->IndexOf( pNew ); // ist evtl. anders einsortiert...
+ nFormatIndex = pFormats->IndexOf( pNew ); // ist evtl. anders einsortiert...
- //! Notify fuer andere Objekte
+ //! Notify fuer andere Objekte
pFormats->SetSaveLater(sal_True);
}
else
{
delete pNew;
DBG_ERROR("AutoFormat konnte nicht eingefuegt werden");
- nFormatIndex = 0; //! alter Index ist ungueltig
+ nFormatIndex = 0; //! alter Index ist ungueltig
}
}
else
{
- // not inserted or name exists
+ // not inserted or name exists
throw uno::RuntimeException();
}
}
@@ -650,7 +650,7 @@ void SAL_CALL ScAutoFormatObj::setPropertyValue(
// else Fehler
- //! Notify fuer andere Objekte
+ //! Notify fuer andere Objekte
pFormats->SetSaveLater(sal_True);
}
}
@@ -685,7 +685,7 @@ uno::Any SAL_CALL ScAutoFormatObj::getPropertyValue( const rtl::OUString& aPrope
else if (aPropString.EqualsAscii( SC_UNONAME_INCWIDTH ))
bValue = pData->GetIncludeWidthHeight();
else
- bError = sal_True; // unbekannte Property
+ bError = sal_True; // unbekannte Property
if (!bError)
aAny <<= bValue;
@@ -703,7 +703,7 @@ ScAutoFormatFieldObj::ScAutoFormatFieldObj(sal_uInt16 nFormat, sal_uInt16 nField
nFormatIndex( nFormat ),
nFieldIndex( nField )
{
- //! Listening !!!
+ //! Listening !!!
}
ScAutoFormatFieldObj::~ScAutoFormatFieldObj()
@@ -712,7 +712,7 @@ ScAutoFormatFieldObj::~ScAutoFormatFieldObj()
void ScAutoFormatFieldObj::Notify( SfxBroadcaster& /* rBC */, const SfxHint& /* rHint */ )
{
- // spaeter...
+ // spaeter...
}
// beans::XPropertySet
@@ -798,14 +798,14 @@ void SAL_CALL ScAutoFormatFieldObj::setPropertyValue(
case SC_WID_UNO_TBLBORD:
{
table::TableBorder aBorder;
- if ( aValue >>= aBorder ) // empty = nothing to do
+ if ( aValue >>= aBorder ) // empty = nothing to do
{
SvxBoxItem aOuter(ATTR_BORDER);
SvxBoxInfoItem aInner(ATTR_BORDER_INNER);
ScHelperFunctions::FillBoxItems( aOuter, aInner, aBorder );
pData->PutItem( nFieldIndex, aOuter );
- //! Notify fuer andere Objekte?
+ //! Notify fuer andere Objekte?
pFormats->SetSaveLater(sal_True);
}
}
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 8b20d9849f47..d3a1b8879f03 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "inputopt.hxx"
#include "printopt.hxx"
#include "userlist.hxx"
-#include "sc.hrc" // VAR_ARGS
+#include "sc.hrc" // VAR_ARGS
#include "unoguard.hxx"
#include "unonames.hxx"
#include "funcdesc.hxx"
@@ -128,22 +128,22 @@ extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_crea
//------------------------------------------------------------------------
-// Anzahl der Funktionen, die als zuletzt benutzt gespeichert werden
-//! Define mit funcpage.hxx und dwfunctr.hxx zusammenfassen !!!
+// Anzahl der Funktionen, die als zuletzt benutzt gespeichert werden
+//! Define mit funcpage.hxx und dwfunctr.hxx zusammenfassen !!!
#define LRU_MAX 10
-// Spezial-Werte fuer Zoom
-//! irgendwo zentral
-#define SC_ZOOMVAL_OPTIMAL (-1)
-#define SC_ZOOMVAL_WHOLEPAGE (-2)
-#define SC_ZOOMVAL_PAGEWIDTH (-3)
+// Spezial-Werte fuer Zoom
+//! irgendwo zentral
+#define SC_ZOOMVAL_OPTIMAL (-1)
+#define SC_ZOOMVAL_WHOLEPAGE (-2)
+#define SC_ZOOMVAL_PAGEWIDTH (-3)
-// Anzahl der PropertyValues in einer Function-Description
-#define SC_FUNCDESC_PROPCOUNT 5
+// Anzahl der PropertyValues in einer Function-Description
+#define SC_FUNCDESC_PROPCOUNT 5
//------------------------------------------------------------------------
-// alles ohne Which-ID, Map nur fuer PropertySetInfo
+// alles ohne Which-ID, Map nur fuer PropertySetInfo
static const SfxItemPropertyMapEntry* lcl_GetSettingsPropertyMap()
{
@@ -174,9 +174,9 @@ static const SfxItemPropertyMapEntry* lcl_GetSettingsPropertyMap()
//------------------------------------------------------------------------
-#define SCFUNCTIONLISTOBJ_SERVICE "com.sun.star.sheet.FunctionDescriptions"
-#define SCRECENTFUNCTIONSOBJ_SERVICE "com.sun.star.sheet.RecentFunctions"
-#define SCSPREADSHEETSETTINGS_SERVICE "com.sun.star.sheet.GlobalSheetSettings"
+#define SCFUNCTIONLISTOBJ_SERVICE "com.sun.star.sheet.FunctionDescriptions"
+#define SCRECENTFUNCTIONSOBJ_SERVICE "com.sun.star.sheet.RecentFunctions"
+#define SCSPREADSHEETSETTINGS_SERVICE "com.sun.star.sheet.GlobalSheetSettings"
SC_SIMPLE_SERVICE_INFO( ScFunctionListObj, "ScFunctionListObj", SCFUNCTIONLISTOBJ_SERVICE )
SC_SIMPLE_SERVICE_INFO( ScRecentFunctionsObj, "ScRecentFunctionsObj", SCRECENTFUNCTIONSOBJ_SERVICE )
@@ -480,7 +480,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
return pRet;
}
-} // extern C
+} // extern C
//------------------------------------------------------------------------
@@ -493,7 +493,7 @@ ScSpreadsheetSettings::~ScSpreadsheetSettings()
{
}
-uno::Reference<uno::XInterface> SAL_CALL ScSpreadsheetSettings_CreateInstance(
+uno::Reference<uno::XInterface> SAL_CALL ScSpreadsheetSettings_CreateInstance(
const uno::Reference<lang::XMultiServiceFactory>& /* rSMgr */ )
{
ScUnoGuard aGuard;
@@ -615,9 +615,9 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue(
SvxZoomType eType = SVX_ZOOM_PERCENT;
switch (nVal)
{
- case SC_ZOOMVAL_OPTIMAL: eType = SVX_ZOOM_OPTIMAL; break;
- case SC_ZOOMVAL_WHOLEPAGE: eType = SVX_ZOOM_WHOLEPAGE; break;
- case SC_ZOOMVAL_PAGEWIDTH: eType = SVX_ZOOM_PAGEWIDTH; break;
+ case SC_ZOOMVAL_OPTIMAL: eType = SVX_ZOOM_OPTIMAL; break;
+ case SC_ZOOMVAL_WHOLEPAGE: eType = SVX_ZOOM_WHOLEPAGE; break;
+ case SC_ZOOMVAL_PAGEWIDTH: eType = SVX_ZOOM_PAGEWIDTH; break;
}
aAppOpt.SetZoomType( eType );
}
@@ -639,20 +639,20 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue(
uno::Sequence<rtl::OUString> aSeq;
if ( pUserList && ( aValue >>= aSeq ) )
{
- // es wird direkt die "lebende" Liste veraendert,
- // mehr tut ScGlobal::SetUserList auch nicht
+ // es wird direkt die "lebende" Liste veraendert,
+ // mehr tut ScGlobal::SetUserList auch nicht
- pUserList->FreeAll(); // alle Eintraege raus
+ pUserList->FreeAll(); // alle Eintraege raus
USHORT nCount = (USHORT)aSeq.getLength();
const rtl::OUString* pAry = aSeq.getConstArray();
for (USHORT i=0; i<nCount; i++)
{
String aEntry = pAry[i];
ScUserListData* pData = new ScUserListData(aEntry);
- if (!pUserList->Insert(pData)) // hinten anhaengen
- delete pData; // sollte nicht vorkommen
+ if (!pUserList->Insert(pData)) // hinten anhaengen
+ delete pData; // sollte nicht vorkommen
}
- bSaveApp = TRUE; // Liste wird mit den App-Optionen gespeichert
+ bSaveApp = TRUE; // Liste wird mit den App-Optionen gespeichert
}
}
else if (aString.EqualsAscii( SC_UNONAME_PRALLSH ))
@@ -664,9 +664,9 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue(
else if (aString.EqualsAscii( SC_UNONAME_PREMPTY ))
{
ScPrintOptions aPrintOpt(pScMod->GetPrintOptions());
- aPrintOpt.SetSkipEmpty( !ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); // reversed
+ aPrintOpt.SetSkipEmpty( !ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); // reversed
pScMod->SetPrintOptions( aPrintOpt );
- SFX_APP()->Broadcast( SfxSimpleHint( SID_SCPRINTOPTIONS ) ); // update previews
+ SFX_APP()->Broadcast( SfxSimpleHint( SID_SCPRINTOPTIONS ) ); // update previews
}
if ( bSaveApp )
@@ -688,27 +688,27 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const rtl::OUString&
ScInputOptions aInpOpt = pScMod->GetInputOptions();
// print options aren't loaded until needed
- if (aString.EqualsAscii( SC_UNONAME_DOAUTOCP )) ScUnoHelpFunctions::SetBoolInAny( aRet, aAppOpt.GetAutoComplete() );
- else if (aString.EqualsAscii( SC_UNONAME_ENTERED )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetEnterEdit() );
- else if (aString.EqualsAscii( SC_UNONAME_EXPREF )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetExpandRefs() );
- else if (aString.EqualsAscii( SC_UNONAME_EXTFMT )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetExtendFormat() );
- else if (aString.EqualsAscii( SC_UNONAME_LINKUPD )) aRet <<= (sal_Int16) aAppOpt.GetLinkMode();
- else if (aString.EqualsAscii( SC_UNONAME_MARKHDR )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetMarkHeader() );
- else if (aString.EqualsAscii( SC_UNONAME_MOVESEL )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetMoveSelection() );
+ if (aString.EqualsAscii( SC_UNONAME_DOAUTOCP )) ScUnoHelpFunctions::SetBoolInAny( aRet, aAppOpt.GetAutoComplete() );
+ else if (aString.EqualsAscii( SC_UNONAME_ENTERED )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetEnterEdit() );
+ else if (aString.EqualsAscii( SC_UNONAME_EXPREF )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetExpandRefs() );
+ else if (aString.EqualsAscii( SC_UNONAME_EXTFMT )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetExtendFormat() );
+ else if (aString.EqualsAscii( SC_UNONAME_LINKUPD )) aRet <<= (sal_Int16) aAppOpt.GetLinkMode();
+ else if (aString.EqualsAscii( SC_UNONAME_MARKHDR )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetMarkHeader() );
+ else if (aString.EqualsAscii( SC_UNONAME_MOVESEL )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetMoveSelection() );
else if (aString.EqualsAscii( SC_UNONAME_RANGEFIN )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetRangeFinder() );
else if (aString.EqualsAscii( SC_UNONAME_USETABCOL )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetUseTabCol() );
else if (aString.EqualsAscii( SC_UNONAME_PRMETRICS )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetTextWysiwyg() );
else if (aString.EqualsAscii( SC_UNONAME_REPLWARN )) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetReplaceCellsWarn() );
- else if (aString.EqualsAscii( SC_UNONAME_METRIC )) aRet <<= (sal_Int16) aAppOpt.GetAppMetric();
- else if (aString.EqualsAscii( SC_UNONAME_MOVEDIR )) aRet <<= (sal_Int16) aInpOpt.GetMoveDir();
- else if (aString.EqualsAscii( SC_UNONAME_STBFUNC )) aRet <<= (sal_Int16) aAppOpt.GetStatusFunc();
+ else if (aString.EqualsAscii( SC_UNONAME_METRIC )) aRet <<= (sal_Int16) aAppOpt.GetAppMetric();
+ else if (aString.EqualsAscii( SC_UNONAME_MOVEDIR )) aRet <<= (sal_Int16) aInpOpt.GetMoveDir();
+ else if (aString.EqualsAscii( SC_UNONAME_STBFUNC )) aRet <<= (sal_Int16) aAppOpt.GetStatusFunc();
else if (aString.EqualsAscii( SC_UNONAME_SCALE ))
{
INT16 nZoomVal = 0;
switch ( aAppOpt.GetZoomType() )
{
- case SVX_ZOOM_PERCENT: nZoomVal = aAppOpt.GetZoom(); break;
- case SVX_ZOOM_OPTIMAL: nZoomVal = SC_ZOOMVAL_OPTIMAL; break;
+ case SVX_ZOOM_PERCENT: nZoomVal = aAppOpt.GetZoom(); break;
+ case SVX_ZOOM_OPTIMAL: nZoomVal = SC_ZOOMVAL_OPTIMAL; break;
case SVX_ZOOM_WHOLEPAGE: nZoomVal = SC_ZOOMVAL_WHOLEPAGE; break;
case SVX_ZOOM_PAGEWIDTH: nZoomVal = SC_ZOOMVAL_PAGEWIDTH; break;
default:
@@ -737,7 +737,7 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const rtl::OUString&
else if (aString.EqualsAscii( SC_UNONAME_PRALLSH ))
ScUnoHelpFunctions::SetBoolInAny( aRet, pScMod->GetPrintOptions().GetAllSheets() );
else if (aString.EqualsAscii( SC_UNONAME_PREMPTY ))
- ScUnoHelpFunctions::SetBoolInAny( aRet, !pScMod->GetPrintOptions().GetSkipEmpty() ); // reversed
+ ScUnoHelpFunctions::SetBoolInAny( aRet, !pScMod->GetPrintOptions().GetSkipEmpty() ); // reversed
return aRet;
}
@@ -756,7 +756,7 @@ ScRecentFunctionsObj::~ScRecentFunctionsObj()
// stuff for exService_...
-uno::Reference<uno::XInterface> SAL_CALL ScRecentFunctionsObj_CreateInstance(
+uno::Reference<uno::XInterface> SAL_CALL ScRecentFunctionsObj_CreateInstance(
const uno::Reference<lang::XMultiServiceFactory>& /* rSMgr */ )
{
ScUnoGuard aGuard;
@@ -808,14 +808,14 @@ void SAL_CALL ScRecentFunctionsObj::setRecentFunctionIds(
USHORT* pFuncs = nCount ? new USHORT[nCount] : NULL;
for (USHORT i=0; i<nCount; i++)
- pFuncs[i] = (USHORT)pAry[i]; //! auf gueltige Werte testen?
+ pFuncs[i] = (USHORT)pAry[i]; //! auf gueltige Werte testen?
ScModule* pScMod = SC_MOD();
ScAppOptions aNewOpts(pScMod->GetAppOptions());
aNewOpts.SetLRUFuncList(pFuncs, nCount);
pScMod->SetAppOptions(aNewOpts);
- pScMod->RecentFunctionsChanged(); // update function list child window
+ pScMod->RecentFunctionsChanged(); // update function list child window
delete[] pFuncs;
}
@@ -837,7 +837,7 @@ ScFunctionListObj::~ScFunctionListObj()
// stuff for exService_...
-uno::Reference<uno::XInterface> SAL_CALL ScFunctionListObj_CreateInstance(
+uno::Reference<uno::XInterface> SAL_CALL ScFunctionListObj_CreateInstance(
const uno::Reference<lang::XMultiServiceFactory>& /* rSMgr */ )
{
ScUnoGuard aGuard;
@@ -905,7 +905,7 @@ static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, co
String aArgDesc;
if (rDesc.ppDefArgDescs[i]) aArgDesc = *rDesc.ppDefArgDescs[i];
sheet::FunctionArgument aArgument;
- aArgument.Name = aArgName;
+ aArgument.Name = aArgName;
aArgument.Description = aArgDesc;
aArgument.IsOptional = rDesc.pDefArgFlags[i].bOptional;
pArgAry[j++] = aArgument;
@@ -937,10 +937,10 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScFunctionListObj::getById( sal_Int
}
}
- throw lang::IllegalArgumentException(); // not found
+ throw lang::IllegalArgumentException(); // not found
}
else
- throw uno::RuntimeException(); // should not happen
+ throw uno::RuntimeException(); // should not happen
// return uno::Sequence<beans::PropertyValue>(0);
}
@@ -960,7 +960,7 @@ uno::Any SAL_CALL ScFunctionListObj::getByName( const rtl::OUString& aName )
for (USHORT nIndex=0; nIndex<nCount; nIndex++)
{
const ScFuncDesc* pDesc = pFuncList->GetFunction(nIndex);
- //! Case-insensitiv ???
+ //! Case-insensitiv ???
if ( pDesc && pDesc->pFuncName && aNameStr == *pDesc->pFuncName )
{
uno::Sequence<beans::PropertyValue> aSeq( SC_FUNCDESC_PROPCOUNT );
@@ -969,10 +969,10 @@ uno::Any SAL_CALL ScFunctionListObj::getByName( const rtl::OUString& aName )
}
}
- throw container::NoSuchElementException(); // not found
+ throw container::NoSuchElementException(); // not found
}
else
- throw uno::RuntimeException(); // should not happen
+ throw uno::RuntimeException(); // should not happen
// return uno::Any();
}
@@ -1008,10 +1008,10 @@ uno::Any SAL_CALL ScFunctionListObj::getByIndex( sal_Int32 nIndex )
}
}
- throw lang::IndexOutOfBoundsException(); // illegal index
+ throw lang::IndexOutOfBoundsException(); // illegal index
}
else
- throw uno::RuntimeException(); // should not happen
+ throw uno::RuntimeException(); // should not happen
// return uno::Any();
}
@@ -1071,7 +1071,7 @@ sal_Bool SAL_CALL ScFunctionListObj::hasByName( const rtl::OUString& aName )
for (USHORT nIndex=0; nIndex<nCount; nIndex++)
{
const ScFuncDesc* pDesc = pFuncList->GetFunction(nIndex);
- //! Case-insensitiv ???
+ //! Case-insensitiv ???
if ( pDesc && pDesc->pFuncName && aNameStr == *pDesc->pFuncName )
return TRUE;
}
diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx
index 246555d06f25..a8903adb8713 100644
--- a/sc/source/ui/unoobj/celllistsource.cxx
+++ b/sc/source/ui/unoobj/celllistsource.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -189,7 +189,7 @@ namespace calc
{
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sheet.OCellListSource" ) );
}
-
+
//--------------------------------------------------------------------
sal_Bool SAL_CALL OCellListSource::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
{
@@ -202,7 +202,7 @@ namespace calc
return sal_False;
}
-
+
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL OCellListSource::getSupportedServiceNames( ) throw (RuntimeException)
{
@@ -249,7 +249,7 @@ namespace calc
CellRangeAddress aAddress( getRangeAddress( ) );
return aAddress.EndRow - aAddress.StartRow + 1;
}
-
+
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL OCellListSource::getListEntry( sal_Int32 _nPosition ) throw (IndexOutOfBoundsException, RuntimeException)
{
@@ -263,7 +263,7 @@ namespace calc
return getCellTextContent_noCheck( 0, _nPosition );
}
-
+
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL OCellListSource::getAllListEntries( ) throw (RuntimeException)
{
@@ -281,7 +281,7 @@ namespace calc
return aAllEntries;
}
-
+
//--------------------------------------------------------------------
void SAL_CALL OCellListSource::addListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException)
{
@@ -295,7 +295,7 @@ namespace calc
m_aListEntryListeners.addInterface( _rxListener );
}
-
+
//--------------------------------------------------------------------
void SAL_CALL OCellListSource::removeListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException)
{
diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx
index f6b52f0b50f8..cbcefbc098f2 100644
--- a/sc/source/ui/unoobj/celllistsource.hxx
+++ b/sc/source/ui/unoobj/celllistsource.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index dea7cc056756..54bfeb7dc047 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +50,7 @@
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
#include <rtl/uuid.h>
-#include <float.h> // DBL_MIN
+#include <float.h> // DBL_MIN
#include <com/sun/star/awt/XBitmap.hpp>
#include <com/sun/star/util/CellProtection.hpp>
@@ -74,7 +74,7 @@
#include "editsrc.hxx"
#include "notesuno.hxx"
#include "fielduno.hxx"
-#include "docuno.hxx" // ScTableColumnsObj etc
+#include "docuno.hxx" // ScTableColumnsObj etc
#include "datauno.hxx"
#include "dapiuno.hxx"
#include "chartuno.hxx"
@@ -96,7 +96,7 @@
#include "cell.hxx"
#include "undocell.hxx"
#include "undotab.hxx"
-#include "undoblk.hxx" // fuer lcl_ApplyBorder - nach docfunc verschieben!
+#include "undoblk.hxx" // fuer lcl_ApplyBorder - nach docfunc verschieben!
#include "stlsheet.hxx"
#include "dbcolect.hxx"
#include "attrib.hxx"
@@ -133,427 +133,427 @@ using namespace com::sun::star;
class ScNamedEntry
{
- String aName;
- ScRange aRange;
+ String aName;
+ ScRange aRange;
public:
ScNamedEntry(const String& rN, const ScRange& rR) :
aName(rN), aRange(rR) {}
- const String& GetName() const { return aName; }
- const ScRange& GetRange() const { return aRange; }
+ const String& GetName() const { return aName; }
+ const ScRange& GetRange() const { return aRange; }
};
//------------------------------------------------------------------------
-// Die Namen in den Maps muessen (nach strcmp) sortiert sein!
-//! statt Which-ID 0 special IDs verwenden, und nicht ueber Namen vergleichen !!!!!!!!!
+// Die Namen in den Maps muessen (nach strcmp) sortiert sein!
+//! statt Which-ID 0 special IDs verwenden, und nicht ueber Namen vergleichen !!!!!!!!!
-// Left/Right/Top/BottomBorder are mapped directly to the core items,
-// not collected/applied to the borders of a range -> ATTR_BORDER can be used directly
+// Left/Right/Top/BottomBorder are mapped directly to the core items,
+// not collected/applied to the borders of a range -> ATTR_BORDER can be used directly
const SfxItemPropertySet* lcl_GetCellsPropertySet()
{
static SfxItemPropertyMapEntry aCellsPropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT },
- {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS },
- {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
- {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF },
- {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT },
+ {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS },
+ {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
+ {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF },
+ {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
- {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
- {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
+ {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &getCppuType((table::CellOrientation*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
- {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS
- {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
- {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((table::CellVertJustify*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((table::CellVertJustify*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS
+ {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((table::CellVertJustify*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((table::CellVertJustify*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
{0,0,0,0,0,0}
};
static SfxItemPropertySet aCellsPropertySet( aCellsPropertyMap_Impl );
return &aCellsPropertySet;
}
-// CellRange enthaelt alle Eintraege von Cells, zusaetzlich eigene Eintraege
-// mit Which-ID 0 (werden nur fuer getPropertySetInfo benoetigt).
+// CellRange enthaelt alle Eintraege von Cells, zusaetzlich eigene Eintraege
+// mit Which-ID 0 (werden nur fuer getPropertySetInfo benoetigt).
const SfxItemPropertySet* lcl_GetRangePropertySet()
{
static SfxItemPropertyMapEntry aRangePropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT },
- {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS },
- {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
- {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF },
- {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT },
+ {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS },
+ {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
+ {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF },
+ {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
- {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
- {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
+ {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &getCppuType((table::CellOrientation*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
- {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS
- {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
- {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((table::CellVertJustify*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((table::CellVertJustify*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS
+ {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((table::CellVertJustify*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((table::CellVertJustify*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
{0,0,0,0,0,0}
};
static SfxItemPropertySet aRangePropertySet( aRangePropertyMap_Impl );
return &aRangePropertySet;
}
-// Cell enthaelt alle Eintraege von CellRange, zusaetzlich eigene Eintraege
-// mit Which-ID 0 (werden nur fuer getPropertySetInfo benoetigt).
+// Cell enthaelt alle Eintraege von CellRange, zusaetzlich eigene Eintraege
+// mit Which-ID 0 (werden nur fuer getPropertySetInfo benoetigt).
const SfxItemPropertySet* lcl_GetCellPropertySet()
{
static SfxItemPropertyMapEntry aCellPropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT },
- {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS },
- {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
- {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF },
- {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT },
+ {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS },
+ {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
+ {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF },
+ {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_FORMLOC), SC_WID_UNO_FORMLOC, &getCppuType((rtl::OUString*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_FORMRT), SC_WID_UNO_FORMRT, &getCppuType((table::CellContentType*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
- {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
- {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_FORMLOC), SC_WID_UNO_FORMLOC, &getCppuType((rtl::OUString*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_FORMRT), SC_WID_UNO_FORMRT, &getCppuType((table::CellContentType*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
+ {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &getCppuType((table::CellOrientation*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
- {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS
- {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
- {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((table::CellVertJustify*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((table::CellVertJustify*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS
+ {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((table::CellVertJustify*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((table::CellVertJustify*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
{0,0,0,0,0,0}
};
static SfxItemPropertySet aCellPropertySet( aCellPropertyMap_Impl );
return &aCellPropertySet;
}
-// Column und Row enthalten alle Eintraege von CellRange, zusaetzlich eigene Eintraege
-// mit Which-ID 0 (werden nur fuer getPropertySetInfo benoetigt).
+// Column und Row enthalten alle Eintraege von CellRange, zusaetzlich eigene Eintraege
+// mit Which-ID 0 (werden nur fuer getPropertySetInfo benoetigt).
const SfxItemPropertySet* lcl_GetColumnPropertySet()
{
static SfxItemPropertyMapEntry aColumnPropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT },
- {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS },
- {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
- {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF },
- {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT },
+ {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS },
+ {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
+ {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF },
+ {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
- {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
-// {MAP_CHAR_LEN(SC_UNONAME_CELLFILT), SC_WID_UNO_CELLFILT,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_MANPAGE), SC_WID_UNO_MANPAGE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), SC_WID_UNO_NEWPAGE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), SC_WID_UNO_CELLVIS, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_OWIDTH), SC_WID_UNO_OWIDTH, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
+// {MAP_CHAR_LEN(SC_UNONAME_CELLFILT), SC_WID_UNO_CELLFILT,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_MANPAGE), SC_WID_UNO_MANPAGE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), SC_WID_UNO_NEWPAGE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), SC_WID_UNO_CELLVIS, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_OWIDTH), SC_WID_UNO_OWIDTH, &getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &getCppuType((table::CellOrientation*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
- {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS
- {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
- {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((table::CellVertJustify*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((table::CellVertJustify*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLWID), SC_WID_UNO_CELLWID, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS
+ {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((table::CellVertJustify*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((table::CellVertJustify*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLWID), SC_WID_UNO_CELLWID, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
{0,0,0,0,0,0}
};
static SfxItemPropertySet aColumnPropertySet( aColumnPropertyMap_Impl );
@@ -564,100 +564,100 @@ const SfxItemPropertySet* lcl_GetRowPropertySet()
{
static SfxItemPropertyMapEntry aRowPropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT },
- {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS },
- {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
- {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF },
- {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT },
+ {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS },
+ {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
+ {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF },
+ {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_CELLHGT), SC_WID_UNO_CELLHGT, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
- {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
- {MAP_CHAR_LEN(SC_UNONAME_CELLFILT), SC_WID_UNO_CELLFILT,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_MANPAGE), SC_WID_UNO_MANPAGE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), SC_WID_UNO_NEWPAGE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), SC_WID_UNO_CELLVIS, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_OHEIGHT), SC_WID_UNO_OHEIGHT, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLHGT), SC_WID_UNO_CELLHGT, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLFILT), SC_WID_UNO_CELLFILT,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_MANPAGE), SC_WID_UNO_MANPAGE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), SC_WID_UNO_NEWPAGE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), SC_WID_UNO_CELLVIS, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_OHEIGHT), SC_WID_UNO_OHEIGHT, &getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &getCppuType((table::CellOrientation*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
- {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS
- {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
- {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((table::CellVertJustify*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((table::CellVertJustify*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS
+ {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((table::CellVertJustify*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((table::CellVertJustify*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
{0,0,0,0,0,0}
};
static SfxItemPropertySet aRowPropertySet( aRowPropertyMap_Impl );
@@ -668,108 +668,108 @@ const SfxItemPropertySet* lcl_GetSheetPropertySet()
{
static SfxItemPropertyMapEntry aSheetPropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_AUTOPRINT),SC_WID_UNO_AUTOPRINT,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_BORDCOL), SC_WID_UNO_BORDCOL, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT },
- {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS },
- {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
- {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF },
- {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_COPYBACK), SC_WID_UNO_COPYBACK,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_COPYFORM), SC_WID_UNO_COPYFORM,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_COPYSTYL), SC_WID_UNO_COPYSTYL,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_AUTOPRINT),SC_WID_UNO_AUTOPRINT,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_BORDCOL), SC_WID_UNO_BORDCOL, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&getBooleanCppuType(), 0, MID_CROSSED_OUT },
+ {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS },
+ {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
+ {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF },
+ {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CHCOLHDR), SC_WID_UNO_CHCOLHDR,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CHROWHDR), SC_WID_UNO_CHROWHDR,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_COPYBACK), SC_WID_UNO_COPYBACK,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_COPYFORM), SC_WID_UNO_COPYFORM,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_COPYSTYL), SC_WID_UNO_COPYSTYL,&getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
- {MAP_CHAR_LEN(SC_UNONAME_ISACTIVE), SC_WID_UNO_ISACTIVE,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
- {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), SC_WID_UNO_CELLVIS, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), SC_WID_UNO_LINKDISPBIT,&getCppuType((uno::Reference<awt::XBitmap>*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), SC_WID_UNO_LINKDISPNAME,&getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_ISACTIVE), SC_WID_UNO_ISACTIVE,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
+ {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), SC_WID_UNO_CELLVIS, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), SC_WID_UNO_LINKDISPBIT,&getCppuType((uno::Reference<awt::XBitmap>*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), SC_WID_UNO_LINKDISPNAME,&getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &getCppuType((table::CellOrientation*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PAGESTL), SC_WID_UNO_PAGESTL, &getCppuType((rtl::OUString*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
- {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS
- {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
- {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PRINTBORD),SC_WID_UNO_PRINTBORD,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PROTECT), SC_WID_UNO_PROTECT, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((table::CellVertJustify*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_SHOWBORD), SC_WID_UNO_SHOWBORD,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PAGESTL), SC_WID_UNO_PAGESTL, &getCppuType((rtl::OUString*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &getCppuType((sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS
+ {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PRINTBORD),SC_WID_UNO_PRINTBORD,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PROTECT), SC_WID_UNO_PROTECT, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((table::CellVertJustify*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_SHOWBORD), SC_WID_UNO_SHOWBORD,&getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_TABLAYOUT),SC_WID_UNO_TABLAYOUT,&getCppuType((sal_Int16*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((table::CellVertJustify*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_TABLAYOUT),SC_WID_UNO_TABLAYOUT,&getCppuType((sal_Int16*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_VALIXML), SC_WID_UNO_VALIXML, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((table::CellVertJustify*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_TABCOLOR), SC_WID_UNO_TABCOLOR, &getCppuType((sal_Int32*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNO_CODENAME), SC_WID_UNO_CODENAME, &getCppuType(static_cast< const rtl::OUString * >(0)), 0, 0},
{0,0,0,0,0,0}
@@ -785,9 +785,9 @@ const SfxItemPropertyMapEntry* lcl_GetEditPropertyMap()
SVX_UNOEDIT_CHAR_PROPERTIES,
SVX_UNOEDIT_FONT_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
- SVX_UNOEDIT_NUMBERING_PROPERTIE, // for completeness of service ParagraphProperties
- {MAP_CHAR_LEN(SC_UNONAME_TEXTUSER), EE_CHAR_XMLATTRIBS, &getCppuType((const uno::Reference< container::XNameContainer >*)0), 0, 0},
- {MAP_CHAR_LEN(SC_UNONAME_USERDEF), EE_PARA_XMLATTRIBS, &getCppuType((const uno::Reference< container::XNameContainer >*)0), 0, 0},
+ SVX_UNOEDIT_NUMBERING_PROPERTIE, // for completeness of service ParagraphProperties
+ {MAP_CHAR_LEN(SC_UNONAME_TEXTUSER), EE_CHAR_XMLATTRIBS, &getCppuType((const uno::Reference< container::XNameContainer >*)0), 0, 0},
+ {MAP_CHAR_LEN(SC_UNONAME_USERDEF), EE_PARA_XMLATTRIBS, &getCppuType((const uno::Reference< container::XNameContainer >*)0), 0, 0},
{0,0,0,0,0,0}
};
return aEditPropertyMap_Impl;
@@ -801,21 +801,21 @@ const SvxItemPropertySet* lcl_GetEditPropertySet()
//------------------------------------------------------------------------
-//! diese Funktionen in einen allgemeinen Header verschieben
-inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
-inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
+//! diese Funktionen in einen allgemeinen Header verschieben
+inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
+inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
//------------------------------------------------------------------------
-#define SCCHARPROPERTIES_SERVICE "com.sun.star.style.CharacterProperties"
-#define SCPARAPROPERTIES_SERVICE "com.sun.star.style.ParagraphProperties"
-#define SCCELLPROPERTIES_SERVICE "com.sun.star.table.CellProperties"
-#define SCCELLRANGE_SERVICE "com.sun.star.table.CellRange"
-#define SCCELL_SERVICE "com.sun.star.table.Cell"
-#define SCSHEETCELLRANGES_SERVICE "com.sun.star.sheet.SheetCellRanges"
-#define SCSHEETCELLRANGE_SERVICE "com.sun.star.sheet.SheetCellRange"
-#define SCSPREADSHEET_SERVICE "com.sun.star.sheet.Spreadsheet"
-#define SCSHEETCELL_SERVICE "com.sun.star.sheet.SheetCell"
+#define SCCHARPROPERTIES_SERVICE "com.sun.star.style.CharacterProperties"
+#define SCPARAPROPERTIES_SERVICE "com.sun.star.style.ParagraphProperties"
+#define SCCELLPROPERTIES_SERVICE "com.sun.star.table.CellProperties"
+#define SCCELLRANGE_SERVICE "com.sun.star.table.CellRange"
+#define SCCELL_SERVICE "com.sun.star.table.Cell"
+#define SCSHEETCELLRANGES_SERVICE "com.sun.star.sheet.SheetCellRanges"
+#define SCSHEETCELLRANGE_SERVICE "com.sun.star.sheet.SheetCellRange"
+#define SCSPREADSHEET_SERVICE "com.sun.star.sheet.Spreadsheet"
+#define SCSHEETCELL_SERVICE "com.sun.star.sheet.SheetCell"
SC_SIMPLE_SERVICE_INFO( ScCellFormatsEnumeration, "ScCellFormatsEnumeration", "com.sun.star.sheet.CellFormatRangesEnumeration" )
SC_SIMPLE_SERVICE_INFO( ScCellFormatsObj, "ScCellFormatsObj", "com.sun.star.sheet.CellFormatRanges" )
@@ -834,7 +834,7 @@ SV_IMPL_PTRARR( ScNamedEntryArr_Impl, ScNamedEntryPtr );
//------------------------------------------------------------------------
-//! ScLinkListener in anderes File verschieben !!!
+//! ScLinkListener in anderes File verschieben !!!
ScLinkListener::~ScLinkListener()
{
@@ -870,7 +870,7 @@ SCTAB lcl_FirstTab( const ScRangeList& rRanges )
if (pFirst)
return pFirst->aStart.Tab();
- return 0; // soll nicht sein
+ return 0; // soll nicht sein
}
BOOL lcl_WholeSheet( const ScRangeList& rRanges )
@@ -939,7 +939,7 @@ ScSubTotalFunc lcl_SummaryToSubTotal( sheet::GeneralFunction eSummary )
const SvxBorderLine* ScHelperFunctions::GetBorderLine( SvxBorderLine& rLine, const table::BorderLine& rStruct )
{
- // Calc braucht Twips, im Uno-Struct sind 1/100mm
+ // Calc braucht Twips, im Uno-Struct sind 1/100mm
rLine.SetOutWidth( (USHORT)HMMToTwips( rStruct.OuterLineWidth ) );
rLine.SetInWidth( (USHORT)HMMToTwips( rStruct.InnerLineWidth ) );
@@ -956,18 +956,18 @@ void ScHelperFunctions::FillBoxItems( SvxBoxItem& rOuter, SvxBoxInfoItem& rInner
{
SvxBorderLine aLine;
rOuter.SetDistance( (USHORT)HMMToTwips( rBorder.Distance ) );
- rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.TopLine ), BOX_LINE_TOP );
- rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.BottomLine ), BOX_LINE_BOTTOM );
- rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.LeftLine ), BOX_LINE_LEFT );
- rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.RightLine ), BOX_LINE_RIGHT );
- rInner.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.HorizontalLine ), BOXINFO_LINE_HORI );
- rInner.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.VerticalLine ), BOXINFO_LINE_VERT );
- rInner.SetValid( VALID_TOP, rBorder.IsTopLineValid );
- rInner.SetValid( VALID_BOTTOM, rBorder.IsBottomLineValid );
- rInner.SetValid( VALID_LEFT, rBorder.IsLeftLineValid );
- rInner.SetValid( VALID_RIGHT, rBorder.IsRightLineValid );
- rInner.SetValid( VALID_HORI, rBorder.IsHorizontalLineValid );
- rInner.SetValid( VALID_VERT, rBorder.IsVerticalLineValid );
+ rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.TopLine ), BOX_LINE_TOP );
+ rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.BottomLine ), BOX_LINE_BOTTOM );
+ rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.LeftLine ), BOX_LINE_LEFT );
+ rOuter.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.RightLine ), BOX_LINE_RIGHT );
+ rInner.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.HorizontalLine ), BOXINFO_LINE_HORI );
+ rInner.SetLine( ScHelperFunctions::GetBorderLine( aLine, rBorder.VerticalLine ), BOXINFO_LINE_VERT );
+ rInner.SetValid( VALID_TOP, rBorder.IsTopLineValid );
+ rInner.SetValid( VALID_BOTTOM, rBorder.IsBottomLineValid );
+ rInner.SetValid( VALID_LEFT, rBorder.IsLeftLineValid );
+ rInner.SetValid( VALID_RIGHT, rBorder.IsRightLineValid );
+ rInner.SetValid( VALID_HORI, rBorder.IsHorizontalLineValid );
+ rInner.SetValid( VALID_VERT, rBorder.IsVerticalLineValid );
rInner.SetValid( VALID_DISTANCE, rBorder.IsDistanceValid );
rInner.SetTable( TRUE );
}
@@ -976,7 +976,7 @@ void ScHelperFunctions::FillBorderLine( table::BorderLine& rStruct, const SvxBor
{
if (pLine)
{
- rStruct.Color = pLine->GetColor().GetColor();
+ rStruct.Color = pLine->GetColor().GetColor();
rStruct.InnerLineWidth = (sal_Int16)TwipsToHMM( pLine->GetInWidth() );
rStruct.OuterLineWidth = (sal_Int16)TwipsToHMM( pLine->GetOutWidth() );
rStruct.LineDistance = (sal_Int16)TwipsToHMM( pLine->GetDistance() );
@@ -989,26 +989,26 @@ void ScHelperFunctions::FillBorderLine( table::BorderLine& rStruct, const SvxBor
void ScHelperFunctions::FillTableBorder( table::TableBorder& rBorder,
const SvxBoxItem& rOuter, const SvxBoxInfoItem& rInner )
{
- ScHelperFunctions::FillBorderLine( rBorder.TopLine, rOuter.GetTop() );
- ScHelperFunctions::FillBorderLine( rBorder.BottomLine, rOuter.GetBottom() );
- ScHelperFunctions::FillBorderLine( rBorder.LeftLine, rOuter.GetLeft() );
- ScHelperFunctions::FillBorderLine( rBorder.RightLine, rOuter.GetRight() );
- ScHelperFunctions::FillBorderLine( rBorder.HorizontalLine, rInner.GetHori() );
- ScHelperFunctions::FillBorderLine( rBorder.VerticalLine, rInner.GetVert() );
+ ScHelperFunctions::FillBorderLine( rBorder.TopLine, rOuter.GetTop() );
+ ScHelperFunctions::FillBorderLine( rBorder.BottomLine, rOuter.GetBottom() );
+ ScHelperFunctions::FillBorderLine( rBorder.LeftLine, rOuter.GetLeft() );
+ ScHelperFunctions::FillBorderLine( rBorder.RightLine, rOuter.GetRight() );
+ ScHelperFunctions::FillBorderLine( rBorder.HorizontalLine, rInner.GetHori() );
+ ScHelperFunctions::FillBorderLine( rBorder.VerticalLine, rInner.GetVert() );
- rBorder.Distance = rOuter.GetDistance();
- rBorder.IsTopLineValid = rInner.IsValid(VALID_TOP);
- rBorder.IsBottomLineValid = rInner.IsValid(VALID_BOTTOM);
- rBorder.IsLeftLineValid = rInner.IsValid(VALID_LEFT);
- rBorder.IsRightLineValid = rInner.IsValid(VALID_RIGHT);
- rBorder.IsHorizontalLineValid = rInner.IsValid(VALID_HORI);
- rBorder.IsVerticalLineValid = rInner.IsValid(VALID_VERT);
- rBorder.IsDistanceValid = rInner.IsValid(VALID_DISTANCE);
+ rBorder.Distance = rOuter.GetDistance();
+ rBorder.IsTopLineValid = rInner.IsValid(VALID_TOP);
+ rBorder.IsBottomLineValid = rInner.IsValid(VALID_BOTTOM);
+ rBorder.IsLeftLineValid = rInner.IsValid(VALID_LEFT);
+ rBorder.IsRightLineValid = rInner.IsValid(VALID_RIGHT);
+ rBorder.IsHorizontalLineValid = rInner.IsValid(VALID_HORI);
+ rBorder.IsVerticalLineValid = rInner.IsValid(VALID_VERT);
+ rBorder.IsDistanceValid = rInner.IsValid(VALID_DISTANCE);
}
//------------------------------------------------------------------------
-//! lcl_ApplyBorder nach docfunc verschieben!
+//! lcl_ApplyBorder nach docfunc verschieben!
void ScHelperFunctions::ApplyBorder( ScDocShell* pDocShell, const ScRangeList& rRanges,
const SvxBoxItem& rOuter, const SvxBoxInfoItem& rInner )
@@ -1055,12 +1055,12 @@ void ScHelperFunctions::ApplyBorder( ScDocShell* pDocShell, const ScRangeList& r
}
//! move lcl_PutDataArray to docfunc?
-//! merge loop with ScFunctionAccess::callFunction
+//! merge loop with ScFunctionAccess::callFunction
BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
const uno::Sequence< uno::Sequence<uno::Any> >& aData )
{
-// BOOL bApi = TRUE;
+// BOOL bApi = TRUE;
ScDocument* pDoc = rDocShell.GetDocument();
SCTAB nTab = rRange.aStart.Tab();
@@ -1072,7 +1072,7 @@ BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
if ( !pDoc->IsBlockEditable( nTab, nStartCol,nStartRow, nEndCol,nEndRow ) )
{
- //! error message
+ //! error message
return FALSE;
}
@@ -1084,7 +1084,7 @@ BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
if ( nCols != nEndCol-nStartCol+1 || nRows != nEndRow-nStartRow+1 )
{
- //! error message?
+ //! error message?
return FALSE;
}
@@ -1124,8 +1124,8 @@ BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
eElemClass == uno::TypeClass_FLOAT ||
eElemClass == uno::TypeClass_DOUBLE )
{
- // #87871# accept integer types because Basic passes a floating point
- // variable as byte, short or long if it's an integer number.
+ // #87871# accept integer types because Basic passes a floating point
+ // variable as byte, short or long if it's an integer number.
double fVal(0.0);
rElement >>= fVal;
pDoc->SetValue( nDocCol, nDocRow, nTab, fVal );
@@ -1138,13 +1138,13 @@ BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
pDoc->PutCell( nDocCol, nDocRow, nTab, new ScStringCell( aUStr ) );
}
else
- bError = TRUE; // invalid type
+ bError = TRUE; // invalid type
++nDocCol;
}
}
else
- bError = TRUE; // wrong size
+ bError = TRUE; // wrong size
++nDocRow;
}
@@ -1162,7 +1162,7 @@ BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
}
if (!bHeight)
- rDocShell.PostPaint( rRange, PAINT_GRID ); // AdjustRowHeight may have painted already
+ rDocShell.PostPaint( rRange, PAINT_GRID ); // AdjustRowHeight may have painted already
rDocShell.SetDocumentModified();
@@ -1173,7 +1173,7 @@ BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange,
const uno::Sequence< uno::Sequence<rtl::OUString> >& aData,
const ::rtl::OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar )
{
-// BOOL bApi = TRUE;
+// BOOL bApi = TRUE;
ScDocument* pDoc = rDocShell.GetDocument();
SCTAB nTab = rRange.aStart.Tab();
@@ -1185,7 +1185,7 @@ BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange,
if ( !pDoc->IsBlockEditable( nTab, nStartCol,nStartRow, nEndCol,nEndRow ) )
{
- //! error message
+ //! error message
return FALSE;
}
@@ -1197,7 +1197,7 @@ BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange,
if ( nCols != nEndCol-nStartCol+1 || nRows != nEndRow-nStartRow+1 )
{
- //! error message?
+ //! error message?
return FALSE;
}
@@ -1211,7 +1211,7 @@ BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange,
pDoc->DeleteAreaTab( nStartCol, nStartRow, nEndCol, nEndRow, nTab, IDF_CONTENTS );
- ScDocFunc aFunc( rDocShell ); // for InterpretEnglishString
+ ScDocFunc aFunc( rDocShell ); // for InterpretEnglishString
BOOL bError = FALSE;
SCROW nDocRow = nStartRow;
@@ -1233,7 +1233,7 @@ BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange,
}
}
else
- bError = TRUE; // wrong size
+ bError = TRUE; // wrong size
++nDocRow;
}
@@ -1251,14 +1251,14 @@ BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange,
}
if (!bHeight)
- rDocShell.PostPaint( rRange, PAINT_GRID ); // AdjustRowHeight may have painted already
+ rDocShell.PostPaint( rRange, PAINT_GRID ); // AdjustRowHeight may have painted already
rDocShell.SetDocumentModified();
return !bError;
}
-// used in ScCellRangeObj::getFormulaArray and ScCellObj::GetInputString_Impl
+// used in ScCellRangeObj::getFormulaArray and ScCellObj::GetInputString_Impl
String lcl_GetInputString( ScDocument* pDoc, const ScAddress& rPosition, BOOL bEnglish )
{
String aVal;
@@ -1281,14 +1281,14 @@ String lcl_GetInputString( ScDocument* pDoc, const ScAddress& rPosition, BOOL bE
// LANGUAGE_ENGLISH_US the "General" format has index key 0,
// we don't have to query.
sal_uInt32 nNumFmt = bEnglish ?
-// pFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US) :
+// pFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US) :
0 :
pDoc->GetNumberFormat( rPosition );
if ( eType == CELLTYPE_EDIT )
{
- // GetString an der EditCell macht Leerzeichen aus Umbruechen,
- // hier werden die Umbrueche aber gebraucht
+ // GetString an der EditCell macht Leerzeichen aus Umbruechen,
+ // hier werden die Umbrueche aber gebraucht
const EditTextObject* pData = ((ScEditCell*)pCell)->GetData();
if (pData)
{
@@ -1300,7 +1300,7 @@ String lcl_GetInputString( ScDocument* pDoc, const ScAddress& rPosition, BOOL bE
else
ScCellFormat::GetInputString( pCell, nNumFmt, aVal, *pFormatter );
- // ggf. ein ' davorhaengen wie in ScTabViewShell::UpdateInputHandler
+ // ggf. ein ' davorhaengen wie in ScTabViewShell::UpdateInputHandler
if ( eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT )
{
double fDummy;
@@ -1309,8 +1309,8 @@ String lcl_GetInputString( ScDocument* pDoc, const ScAddress& rPosition, BOOL bE
aVal.Insert('\'',0);
else if ( aVal.Len() && aVal.GetChar(0) == '\'' )
{
- // if the string starts with a "'", add another one because setFormula
- // strips one (like text input, except for "text" number formats)
+ // if the string starts with a "'", add another one because setFormula
+ // strips one (like text input, except for "text" number formats)
if ( bEnglish || ( pFormatter->GetType(nNumFmt) != NUMBERFORMAT_TEXT ) )
aVal.Insert('\'',0);
}
@@ -1397,8 +1397,8 @@ ScCellRangesBase::ScCellRangesBase(ScDocShell* pDocSh, const ScRangeList& rR) :
ScCellRangesBase::~ScCellRangesBase()
{
- // #107294# call RemoveUnoObject first, so no notification can happen
- // during ForgetCurrentAttrs
+ // #107294# call RemoveUnoObject first, so no notification can happen
+ // during ForgetCurrentAttrs
if (pDocShell)
pDocShell->GetDocument()->RemoveUnoObject(*this);
@@ -1408,8 +1408,8 @@ ScCellRangesBase::~ScCellRangesBase()
delete pValueListener;
- //! XChartDataChangeEventListener abmelden ??
- //! (ChartCollection haelt dann auch dieses Objekt fest!)
+ //! XChartDataChangeEventListener abmelden ??
+ //! (ChartCollection haelt dann auch dieses Objekt fest!)
}
void ScCellRangesBase::ForgetCurrentAttrs()
@@ -1434,7 +1434,7 @@ void ScCellRangesBase::ForgetMarkData()
const ScPatternAttr* ScCellRangesBase::GetCurrentAttrsFlat()
{
- // get and cache direct cell attributes for this object's range
+ // get and cache direct cell attributes for this object's range
if ( !pCurrentFlat && pDocShell )
{
@@ -1446,7 +1446,7 @@ const ScPatternAttr* ScCellRangesBase::GetCurrentAttrsFlat()
const ScPatternAttr* ScCellRangesBase::GetCurrentAttrsDeep()
{
- // get and cache cell attributes (incl. styles) for this object's range
+ // get and cache cell attributes (incl. styles) for this object's range
if ( !pCurrentDeep && pDocShell )
{
@@ -1463,7 +1463,7 @@ SfxItemSet* ScCellRangesBase::GetCurrentDataSet(bool bNoDflt)
const ScPatternAttr* pPattern = GetCurrentAttrsDeep();
if ( pPattern )
{
- // Dontcare durch Default ersetzen, damit man immer eine Reflection hat
+ // Dontcare durch Default ersetzen, damit man immer eine Reflection hat
pCurrentDataSet = new SfxItemSet( pPattern->GetItemSet() );
pNoDfltCurrentDataSet = new SfxItemSet( pPattern->GetItemSet() );
pCurrentDataSet->ClearInvalidItems();
@@ -1528,11 +1528,11 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
if ( nId == SFX_HINT_DYING )
{
ForgetCurrentAttrs();
- pDocShell = NULL; // invalid
+ pDocShell = NULL; // invalid
if ( aValueListeners.Count() != 0 )
{
- // dispose listeners
+ // dispose listeners
lang::EventObject aEvent;
aEvent.Source.set(static_cast<cppu::OWeakObject*>(this));
@@ -1541,8 +1541,8 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
aValueListeners.DeleteAndDestroy( 0, aValueListeners.Count() );
- // The listeners can't have the last ref to this, as it's still held
- // by the DocShell.
+ // The listeners can't have the last ref to this, as it's still held
+ // by the DocShell.
}
}
else if ( nId == SFX_HINT_DATACHANGED )
@@ -1552,13 +1552,13 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
if ( bGotDataChangedHint && pDocShell )
{
- // This object was notified of content changes, so one call
- // for each listener is generated now.
- // The calls can't be executed directly because the document's
- // UNO broadcaster list must not be modified.
- // Instead, add to the document's list of listener calls,
- // which will be executed directly after the broadcast of
- // SFX_HINT_DATACHANGED.
+ // This object was notified of content changes, so one call
+ // for each listener is generated now.
+ // The calls can't be executed directly because the document's
+ // UNO broadcaster list must not be modified.
+ // Instead, add to the document's list of listener calls,
+ // which will be executed directly after the broadcast of
+ // SFX_HINT_DATACHANGED.
lang::EventObject aEvent;
aEvent.Source.set((cppu::OWeakObject*)this);
@@ -1599,7 +1599,7 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
void ScCellRangesBase::RefChanged()
{
- //! adjust XChartDataChangeEventListener
+ //! adjust XChartDataChangeEventListener
if ( pValueListener && aValueListeners.Count() != 0 )
{
@@ -1636,7 +1636,7 @@ void ScCellRangesBase::InitInsertRange(ScDocShell* pDocSh, const ScRange& rR)
pDocShell->GetDocument()->AddUnoObject(*this);
- RefChanged(); // Range im Range-Objekt anpassen
+ RefChanged(); // Range im Range-Objekt anpassen
}
}
@@ -1667,8 +1667,8 @@ void ScCellRangesBase::SetNewRanges(const ScRangeList& rNew)
void ScCellRangesBase::SetCursorOnly( BOOL bSet )
{
- // set for a selection object that is created from the cursor position
- // without anything selected (may contain several sheets)
+ // set for a selection object that is created from the cursor position
+ // without anything selected (may contain several sheets)
bCursorOnly = bSet;
}
@@ -1760,15 +1760,15 @@ double SAL_CALL ScCellRangesBase::computeFunction( sheet::GeneralFunction nFunct
ScMarkData aMark(*GetMarkData());
aMark.MarkToSimple();
if (!aMark.IsMarked())
- aMark.SetMarkNegative(TRUE); // um Dummy Position angeben zu koennen
+ aMark.SetMarkNegative(TRUE); // um Dummy Position angeben zu koennen
- ScAddress aDummy; // wenn nicht Marked, ignoriert wegen Negative
+ ScAddress aDummy; // wenn nicht Marked, ignoriert wegen Negative
double fVal;
ScSubTotalFunc eFunc = lcl_SummaryToSubTotal( nFunction );
ScDocument* pDoc = pDocShell->GetDocument();
if ( !pDoc->GetSelectionFunction( eFunc, aDummy, aMark, fVal ) )
{
- throw uno::RuntimeException(); //! own exception?
+ throw uno::RuntimeException(); //! own exception?
}
return fVal;
@@ -1797,11 +1797,11 @@ const SfxItemPropertyMap* ScCellRangesBase::GetItemPropertyMap()
return pPropSet->getPropertyMap();
}
-void lcl_GetPropertyWhich( const SfxItemPropertySimpleEntry* pEntry,
+void lcl_GetPropertyWhich( const SfxItemPropertySimpleEntry* pEntry,
USHORT& rItemWhich )
{
- // Which-ID des betroffenen Items, auch wenn das Item die Property
- // nicht alleine behandeln kann
+ // Which-ID des betroffenen Items, auch wenn das Item die Property
+ // nicht alleine behandeln kann
if ( pEntry )
{
if ( IsScItemWid( pEntry->nWID ) )
@@ -1830,12 +1830,12 @@ void lcl_GetPropertyWhich( const SfxItemPropertySimpleEntry* pEntry,
beans::PropertyState ScCellRangesBase::GetOnePropertyState( USHORT nItemWhich, const SfxItemPropertySimpleEntry* pEntry )
{
beans::PropertyState eRet = beans::PropertyState_DIRECT_VALUE;
- if ( nItemWhich ) // item wid (from map or special case)
+ if ( nItemWhich ) // item wid (from map or special case)
{
- // For items that contain several properties (like background),
- // "ambiguous" is returned too often here
+ // For items that contain several properties (like background),
+ // "ambiguous" is returned too often here
- // for PropertyState, don't look at styles
+ // for PropertyState, don't look at styles
const ScPatternAttr* pPattern = GetCurrentAttrsFlat();
if ( pPattern )
{
@@ -1867,7 +1867,7 @@ beans::PropertyState ScCellRangesBase::GetOnePropertyState( USHORT nItemWhich, c
eRet = beans::PropertyState_DIRECT_VALUE;
else if ( pEntry->nWID == SC_WID_UNO_CELLSTYL )
{
- // a style is always set, there's no default state
+ // a style is always set, there's no default state
const ScStyleSheet* pStyle = pDocShell->GetDocument()->GetSelectionStyle(*GetMarkData());
if (pStyle)
eRet = beans::PropertyState_DIRECT_VALUE;
@@ -1875,7 +1875,7 @@ beans::PropertyState ScCellRangesBase::GetOnePropertyState( USHORT nItemWhich, c
eRet = beans::PropertyState_AMBIGUOUS_VALUE;
}
else if ( pEntry->nWID == SC_WID_UNO_NUMRULES )
- eRet = beans::PropertyState_DEFAULT_VALUE; // numbering rules are always default
+ eRet = beans::PropertyState_DEFAULT_VALUE; // numbering rules are always default
}
return eRet;
}
@@ -1924,14 +1924,14 @@ void SAL_CALL ScCellRangesBase::setPropertyToDefault( const rtl::OUString& aProp
USHORT nItemWhich = 0;
const SfxItemPropertySimpleEntry* pEntry = pPropertyMap->getByName( aPropertyName );
lcl_GetPropertyWhich( pEntry, nItemWhich );
- if ( nItemWhich ) // item wid (from map or special case)
+ if ( nItemWhich ) // item wid (from map or special case)
{
- if ( aRanges.Count() ) // leer = nichts zu tun
+ if ( aRanges.Count() ) // leer = nichts zu tun
{
ScDocFunc aFunc(*pDocShell);
- //! Bei Items, die mehrere Properties enthalten (z.B. Hintergrund)
- //! wird hier zuviel zurueckgesetzt
+ //! Bei Items, die mehrere Properties enthalten (z.B. Hintergrund)
+ //! wird hier zuviel zurueckgesetzt
// //! for ATTR_ROTATE_VALUE, also reset ATTR_ORIENTATION?
@@ -1939,7 +1939,7 @@ void SAL_CALL ScCellRangesBase::setPropertyToDefault( const rtl::OUString& aProp
aWIDs[0] = nItemWhich;
if ( nItemWhich == ATTR_VALUE_FORMAT )
{
- aWIDs[1] = ATTR_LANGUAGE_FORMAT; // #67847# language for number formats
+ aWIDs[1] = ATTR_LANGUAGE_FORMAT; // #67847# language for number formats
aWIDs[2] = 0;
}
else
@@ -1966,7 +1966,7 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const rtl::OUString& aPr
throw(beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
- //! mit getPropertyValue zusammenfassen
+ //! mit getPropertyValue zusammenfassen
ScUnoGuard aGuard;
uno::Any aAny;
@@ -1988,7 +1988,7 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const rtl::OUString& aPr
switch ( pEntry->nWID ) // fuer Item-Spezial-Behandlungen
{
case ATTR_VALUE_FORMAT:
- // default has no language set
+ // default has no language set
aAny <<= (sal_Int32)( ((const SfxUInt32Item&)rSet.Get(pEntry->nWID)).GetValue() );
break;
case ATTR_INDENT:
@@ -2113,7 +2113,7 @@ void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const uno::A
if ( nNewMod == ( nOldFormat % SV_COUNTRY_LANGUAGE_OFFSET ) &&
nNewMod <= SV_MAX_ANZ_STANDARD_FORMATE )
{
- rFirstItemId = 0; // don't use ATTR_VALUE_FORMAT value
+ rFirstItemId = 0; // don't use ATTR_VALUE_FORMAT value
}
rSecondItemId = ATTR_LANGUAGE_FORMAT;
@@ -2137,7 +2137,7 @@ void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const uno::A
sal_Int32 nRotVal = 0;
if ( rValue >>= nRotVal )
{
- // stored value is always between 0 and 360 deg.
+ // stored value is always between 0 and 360 deg.
nRotVal %= 36000;
if ( nRotVal < 0 )
nRotVal += 36000;
@@ -2212,17 +2212,17 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
{
if ( IsScItemWid( pEntry->nWID ) )
{
- if ( aRanges.Count() ) // leer = nichts zu tun
+ if ( aRanges.Count() ) // leer = nichts zu tun
{
ScDocument* pDoc = pDocShell->GetDocument();
ScDocFunc aFunc(*pDocShell);
- // Fuer Teile von zusammengesetzten Items mit mehreren Properties (z.B. Hintergrund)
- // muss vorher das alte Item aus dem Dokument geholt werden
- //! Das kann hier aber nicht erkannt werden
- //! -> eigenes Flag im PropertyMap-Eintrag, oder was ???
- //! Item direkt von einzelner Position im Bereich holen?
- // ClearInvalidItems, damit auf jeden Fall ein Item vom richtigen Typ da ist
+ // Fuer Teile von zusammengesetzten Items mit mehreren Properties (z.B. Hintergrund)
+ // muss vorher das alte Item aus dem Dokument geholt werden
+ //! Das kann hier aber nicht erkannt werden
+ //! -> eigenes Flag im PropertyMap-Eintrag, oder was ???
+ //! Item direkt von einzelner Position im Bereich holen?
+ // ClearInvalidItems, damit auf jeden Fall ein Item vom richtigen Typ da ist
ScPatternAttr aPattern( *GetCurrentAttrsDeep() );
SfxItemSet& rSet = aPattern.GetItemSet();
@@ -2238,7 +2238,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
aFunc.ApplyAttributes( *GetMarkData(), aPattern, TRUE, TRUE );
}
}
- else // implemented here
+ else // implemented here
switch ( pEntry->nWID )
{
case SC_WID_UNO_CHCOLHDR:
@@ -2261,13 +2261,13 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
case SC_WID_UNO_TBLBORD:
{
table::TableBorder aBorder;
- if ( aRanges.Count() && ( aValue >>= aBorder ) ) // empty = nothing to do
+ if ( aRanges.Count() && ( aValue >>= aBorder ) ) // empty = nothing to do
{
SvxBoxItem aOuter(ATTR_BORDER);
SvxBoxInfoItem aInner(ATTR_BORDER_INNER);
ScHelperFunctions::FillBoxItems( aOuter, aInner, aBorder );
- ScHelperFunctions::ApplyBorder( pDocShell, aRanges, aOuter, aInner ); //! docfunc
+ ScHelperFunctions::ApplyBorder( pDocShell, aRanges, aOuter, aInner ); //! docfunc
}
}
break;
@@ -2276,7 +2276,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
case SC_WID_UNO_CONDXML:
{
uno::Reference<sheet::XSheetConditionalEntries> xInterface(aValue, uno::UNO_QUERY);
- if ( aRanges.Count() && xInterface.is() ) // leer = nichts zu tun
+ if ( aRanges.Count() && xInterface.is() ) // leer = nichts zu tun
{
ScTableConditionalFormat* pFormat =
ScTableConditionalFormat::getImplementation( xInterface );
@@ -2289,7 +2289,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
formula::FormulaGrammar::GRAM_UNSPECIFIED :
formula::FormulaGrammar::mapAPItoGrammar( bEnglish, bXML));
- ScConditionalFormat aNew( 0, pDoc ); // Index wird beim Einfuegen gesetzt
+ ScConditionalFormat aNew( 0, pDoc ); // Index wird beim Einfuegen gesetzt
pFormat->FillFormat( aNew, pDoc, eGrammar );
ULONG nIndex = pDoc->AddCondFormat( aNew );
@@ -2307,7 +2307,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
case SC_WID_UNO_VALIXML:
{
uno::Reference<beans::XPropertySet> xInterface(aValue, uno::UNO_QUERY);
- if ( aRanges.Count() && xInterface.is() ) // leer = nichts zu tun
+ if ( aRanges.Count() && xInterface.is() ) // leer = nichts zu tun
{
ScTableValidationObj* pValidObj =
ScTableValidationObj::getImplementation( xInterface );
@@ -2400,7 +2400,7 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
}
}
}
- else // implemented here
+ else // implemented here
switch ( pEntry->nWID )
{
case SC_WID_UNO_CHCOLHDR:
@@ -2421,7 +2421,7 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
break;
case SC_WID_UNO_TBLBORD:
{
- //! loop throgh all ranges
+ //! loop throgh all ranges
const ScRange* pFirst = aRanges.GetObject(0);
if (pFirst)
{
@@ -2604,12 +2604,12 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< rtl::OUS
pNewPattern = new ScPatternAttr( pDoc->GetPool() );
}
- // collect items in pNewPattern, apply with one call after the loop
+ // collect items in pNewPattern, apply with one call after the loop
USHORT nFirstItem, nSecondItem;
lcl_SetCellProperty( *pEntry, pValues[i], *pOldPattern, pDoc, nFirstItem, nSecondItem );
- // put only affected items into new set
+ // put only affected items into new set
if ( nFirstItem )
pNewPattern->GetItemSet().Put( pOldPattern->GetItemSet().Get( nFirstItem ) );
if ( nSecondItem )
@@ -2617,7 +2617,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< rtl::OUS
}
else if ( pEntry->nWID != SC_WID_UNO_CELLSTYL ) // CellStyle is handled above
{
- // call virtual method to set a single property
+ // call virtual method to set a single property
SetOnePropertyValue( pEntry, pValues[i] );
}
}
@@ -2678,9 +2678,9 @@ IMPL_LINK( ScCellRangesBase, ValueListenerHdl, SfxHint*, pHint )
if ( pDocShell && pHint && pHint->ISA( SfxSimpleHint ) &&
((const SfxSimpleHint*)pHint)->GetId() & (SC_HINT_DATACHANGED | SC_HINT_DYING) )
{
- // This may be called several times for a single change, if several formulas
- // in the range are notified. So only a flag is set that is checked when
- // SFX_HINT_DATACHANGED is received.
+ // This may be called several times for a single change, if several formulas
+ // in the range are notified. So only a flag is set that is checked when
+ // SFX_HINT_DATACHANGED is received.
bGotDataChangedHint = TRUE;
}
@@ -2755,14 +2755,14 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set
pNewPattern = new ScPatternAttr( pDoc->GetPool() );
}
- // collect items in pNewPattern, apply with one call after the loop
+ // collect items in pNewPattern, apply with one call after the loop
USHORT nFirstItem, nSecondItem;
try
{
lcl_SetCellProperty( *pEntry, pValues[i], *pOldPattern, pDoc, nFirstItem, nSecondItem );
- // put only affected items into new set
+ // put only affected items into new set
if ( nFirstItem )
pNewPattern->GetItemSet().Put( pOldPattern->GetItemSet().Get( nFirstItem ) );
if ( nSecondItem )
@@ -2776,7 +2776,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set
}
else if ( pEntry->nWID != SC_WID_UNO_CELLSTYL ) // CellStyle is handled above
{
- // call virtual method to set a single property
+ // call virtual method to set a single property
try
{
SetOnePropertyValue( pEntry, pValues[i] );
@@ -2888,7 +2888,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBas
void SAL_CALL ScCellRangesBase::decrementIndent() throw(::com::sun::star::uno::RuntimeException)
{
ScUnoGuard aGuard;
- if ( pDocShell && aRanges.Count() ) // leer = nichts zu tun
+ if ( pDocShell && aRanges.Count() ) // leer = nichts zu tun
{
ScDocFunc aFunc(*pDocShell);
//#97041#; put only MultiMarked ScMarkData in ChangeIndent
@@ -2901,7 +2901,7 @@ void SAL_CALL ScCellRangesBase::decrementIndent() throw(::com::sun::star::uno::R
void SAL_CALL ScCellRangesBase::incrementIndent() throw(::com::sun::star::uno::RuntimeException)
{
ScUnoGuard aGuard;
- if ( pDocShell && aRanges.Count() ) // leer = nichts zu tun
+ if ( pDocShell && aRanges.Count() ) // leer = nichts zu tun
{
ScDocFunc aFunc(*pDocShell);
//#97041#; put only MultiMarked ScMarkData in ChangeIndent
@@ -2920,9 +2920,9 @@ ScMemChart* ScCellRangesBase::CreateMemChart_Impl() const
ScRangeListRef xChartRanges;
if ( aRanges.Count() == 1 )
{
- // ganze Tabelle sinnvoll begrenzen (auf belegten Datenbereich)
- // (nur hier, Listener werden auf den ganzen Bereich angemeldet)
- //! direkt testen, ob es ein ScTableSheetObj ist?
+ // ganze Tabelle sinnvoll begrenzen (auf belegten Datenbereich)
+ // (nur hier, Listener werden auf den ganzen Bereich angemeldet)
+ //! direkt testen, ob es ein ScTableSheetObj ist?
ScRange* pRange = aRanges.GetObject(0);
if ( pRange->aStart.Col() == 0 && pRange->aEnd.Col() == MAXCOL &&
@@ -2950,7 +2950,7 @@ ScMemChart* ScCellRangesBase::CreateMemChart_Impl() const
xChartRanges->Append( ScRange( nStartX, nStartY, nTab, nEndX, nEndY, nTab ) );
}
}
- if (!xChartRanges.Is()) // sonst Ranges direkt uebernehmen
+ if (!xChartRanges.Is()) // sonst Ranges direkt uebernehmen
xChartRanges = new ScRangeList(aRanges);
ScChartArray aArr( pDocShell->GetDocument(), xChartRanges, String() );
@@ -2999,7 +2999,7 @@ ScRangeListRef ScCellRangesBase::GetLimitedChartRanges_Impl( long nDataColumns,
if ( pRange->aStart.Col() == 0 && pRange->aEnd.Col() == MAXCOL &&
pRange->aStart.Row() == 0 && pRange->aEnd.Row() == MAXROW )
{
- // if aRanges is a complete sheet, limit to given size
+ // if aRanges is a complete sheet, limit to given size
SCTAB nTab = pRange->aStart.Tab();
@@ -3021,7 +3021,7 @@ ScRangeListRef ScCellRangesBase::GetLimitedChartRanges_Impl( long nDataColumns,
}
}
- return new ScRangeList(aRanges); // as-is
+ return new ScRangeList(aRanges); // as-is
}
void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<double> >& aData )
@@ -3036,7 +3036,7 @@ void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<doub
{
ScDocument* pDoc = pDocShell->GetDocument();
ScChartArray aArr( pDoc, xChartRanges, String() );
- aArr.SetHeaders( bChartRowAsHdr, bChartColAsHdr ); // RowAsHdr = ColHeaders
+ aArr.SetHeaders( bChartRowAsHdr, bChartColAsHdr ); // RowAsHdr = ColHeaders
const ScChartPositionMap* pPosMap = aArr.GetPositionMap();
if (pPosMap)
{
@@ -3057,17 +3057,17 @@ void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<doub
{
double fVal = pArray[nCol];
if ( fVal == DBL_MIN )
- pDoc->PutCell( *pPos, NULL ); // empty cell
+ pDoc->PutCell( *pPos, NULL ); // empty cell
else
pDoc->SetValue( pPos->Col(), pPos->Row(), pPos->Tab(), pArray[nCol] );
}
}
}
- //! undo
+ //! undo
PaintRanges_Impl( PAINT_GRID );
pDocShell->SetDocumentModified();
- ForceChartListener_Impl(); // call listeners for this object synchronously
+ ForceChartListener_Impl(); // call listeners for this object synchronously
bDone = TRUE;
}
}
@@ -3110,7 +3110,7 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions(
{
ScDocument* pDoc = pDocShell->GetDocument();
ScChartArray aArr( pDoc, xChartRanges, String() );
- aArr.SetHeaders( bChartRowAsHdr, bChartColAsHdr ); // RowAsHdr = ColHeaders
+ aArr.SetHeaders( bChartRowAsHdr, bChartColAsHdr ); // RowAsHdr = ColHeaders
const ScChartPositionMap* pPosMap = aArr.GetPositionMap();
if (pPosMap)
{
@@ -3127,14 +3127,14 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions(
if ( aStr.Len() )
pDoc->PutCell( *pPos, new ScStringCell( aStr ) );
else
- pDoc->PutCell( *pPos, NULL ); // empty cell
+ pDoc->PutCell( *pPos, NULL ); // empty cell
}
}
- //! undo
+ //! undo
PaintRanges_Impl( PAINT_GRID );
pDocShell->SetDocumentModified();
- ForceChartListener_Impl(); // call listeners for this object synchronously
+ ForceChartListener_Impl(); // call listeners for this object synchronously
bDone = TRUE;
}
}
@@ -3178,7 +3178,7 @@ void SAL_CALL ScCellRangesBase::setColumnDescriptions(
{
ScDocument* pDoc = pDocShell->GetDocument();
ScChartArray aArr( pDoc, xChartRanges, String() );
- aArr.SetHeaders( bChartRowAsHdr, bChartColAsHdr ); // RowAsHdr = ColHeaders
+ aArr.SetHeaders( bChartRowAsHdr, bChartColAsHdr ); // RowAsHdr = ColHeaders
const ScChartPositionMap* pPosMap = aArr.GetPositionMap();
if (pPosMap)
{
@@ -3195,14 +3195,14 @@ void SAL_CALL ScCellRangesBase::setColumnDescriptions(
if ( aStr.Len() )
pDoc->PutCell( *pPos, new ScStringCell( aStr ) );
else
- pDoc->PutCell( *pPos, NULL ); // empty cell
+ pDoc->PutCell( *pPos, NULL ); // empty cell
}
}
- //! undo
+ //! undo
PaintRanges_Impl( PAINT_GRID );
pDocShell->SetDocumentModified();
- ForceChartListener_Impl(); // call listeners for this object synchronously
+ ForceChartListener_Impl(); // call listeners for this object synchronously
bDone = TRUE;
}
}
@@ -3215,8 +3215,8 @@ void SAL_CALL ScCellRangesBase::setColumnDescriptions(
void ScCellRangesBase::ForceChartListener_Impl()
{
- // call Update immediately so the caller to setData etc. can
- // regognize the listener call
+ // call Update immediately so the caller to setData etc. can
+ // regognize the listener call
if ( pDocShell )
{
@@ -3264,7 +3264,7 @@ void SAL_CALL ScCellRangesBase::addChartDataChangeEventListener( const uno::Refe
ScUnoGuard aGuard;
if ( pDocShell && aRanges.Count() )
{
- //! auf doppelte testen?
+ //! auf doppelte testen?
ScDocument* pDoc = pDocShell->GetDocument();
ScRangeListRef aRangesRef( new ScRangeList(aRanges) );
@@ -3291,15 +3291,15 @@ void SAL_CALL ScCellRangesBase::removeChartDataChangeEventListener( const uno::R
}
}
-double SAL_CALL ScCellRangesBase::getNotANumber() throw(::com::sun::star::uno::RuntimeException)
+double SAL_CALL ScCellRangesBase::getNotANumber() throw(::com::sun::star::uno::RuntimeException)
{
- // im ScChartArray wird DBL_MIN verwendet, weil das Chart es so will
+ // im ScChartArray wird DBL_MIN verwendet, weil das Chart es so will
return DBL_MIN;
}
sal_Bool SAL_CALL ScCellRangesBase::isNotANumber( double nNumber ) throw(uno::RuntimeException)
{
- // im ScChartArray wird DBL_MIN verwendet, weil das Chart es so will
+ // im ScChartArray wird DBL_MIN verwendet, weil das Chart es so will
return (nNumber == DBL_MIN);
}
@@ -3326,7 +3326,7 @@ void SAL_CALL ScCellRangesBase::addModifyListener( const uno::Reference<util::XM
for (ULONG i=0; i<nCount; i++)
pDoc->StartListeningArea( *aRanges.GetObject(i), pValueListener );
- acquire(); // don't lose this object (one ref for all listeners)
+ acquire(); // don't lose this object (one ref for all listeners)
}
}
@@ -3338,7 +3338,7 @@ void SAL_CALL ScCellRangesBase::removeModifyListener( const uno::Reference<util:
if ( aRanges.Count() == 0 )
throw uno::RuntimeException();
- acquire(); // in case the listeners have the last ref - released below
+ acquire(); // in case the listeners have the last ref - released below
USHORT nCount = aValueListeners.Count();
for ( USHORT n=nCount; n--; )
@@ -3353,14 +3353,14 @@ void SAL_CALL ScCellRangesBase::removeModifyListener( const uno::Reference<util:
if (pValueListener)
pValueListener->EndListeningAll();
- release(); // release the ref for the listeners
+ release(); // release the ref for the listeners
}
break;
}
}
- release(); // might delete this object
+ release(); // might delete this object
}
// XCellRangesQuery
@@ -3371,7 +3371,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryVisibleC
ScUnoGuard aGuard;
if (pDocShell)
{
- //! fuer alle Tabellen getrennt, wenn Markierungen pro Tabelle getrennt sind!
+ //! fuer alle Tabellen getrennt, wenn Markierungen pro Tabelle getrennt sind!
SCTAB nTab = lcl_FirstTab(aRanges);
ScMarkData aMarkData(*GetMarkData());
@@ -3415,7 +3415,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryEmptyCel
ScMarkData aMarkData(*GetMarkData());
- // belegte Zellen wegmarkieren
+ // belegte Zellen wegmarkieren
ULONG nCount = aRanges.Count();
for (ULONG i=0; i<nCount; i++)
{
@@ -3425,7 +3425,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryEmptyCel
ScBaseCell* pCell = aIter.GetFirst();
while (pCell)
{
- // Notizen zaehlen als nicht-leer
+ // Notizen zaehlen als nicht-leer
if ( !pCell->IsBlank() )
aMarkData.SetMultiMarkArea(
ScRange( aIter.GetCol(), aIter.GetRow(), aIter.GetTab() ),
@@ -3436,11 +3436,11 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryEmptyCel
}
ScRangeList aNewRanges;
- // IsMultiMarked reicht hier nicht (wird beim deselektieren nicht zurueckgesetzt)
+ // IsMultiMarked reicht hier nicht (wird beim deselektieren nicht zurueckgesetzt)
if (aMarkData.HasAnyMultiMarks())
aMarkData.FillRangeListWithMarks( &aNewRanges, FALSE );
- return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges kann leer sein
+ return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges kann leer sein
}
return NULL;
@@ -3457,7 +3457,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC
ScMarkData aMarkData;
- // passende Zellen selektieren
+ // passende Zellen selektieren
ULONG nCount = aRanges.Count();
for (ULONG i=0; i<nCount; i++)
{
@@ -3491,7 +3491,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC
bAdd = TRUE;
else
{
- // Date/Time Erkennung
+ // Date/Time Erkennung
ULONG nIndex = (ULONG)((SfxUInt32Item*)pDoc->GetAttr(
aIter.GetCol(), aIter.GetRow(), aIter.GetTab(),
@@ -3529,7 +3529,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC
if (aMarkData.IsMultiMarked())
aMarkData.FillRangeListWithMarks( &aNewRanges, FALSE );
- return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges kann leer sein
+ return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges kann leer sein
}
return NULL;
@@ -3546,7 +3546,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryFormulaC
ScMarkData aMarkData;
- // passende Zellen selektieren
+ // passende Zellen selektieren
ULONG nCount = aRanges.Count();
for (ULONG i=0; i<nCount; i++)
{
@@ -3570,7 +3570,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryFormulaC
if ( nResultFlags & sheet::FormulaResult::VALUE )
bAdd = TRUE;
}
- else // String
+ else // String
{
if ( nResultFlags & sheet::FormulaResult::STRING )
bAdd = TRUE;
@@ -3590,7 +3590,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryFormulaC
if (aMarkData.IsMultiMarked())
aMarkData.FillRangeListWithMarks( &aNewRanges, FALSE );
- return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges kann leer sein
+ return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges kann leer sein
}
return NULL;
@@ -3608,10 +3608,10 @@ uno::Reference<sheet::XSheetCellRanges> ScCellRangesBase::QueryDifferences_Impl(
SCCOLROW nCmpPos = bColumnDiff ? (SCCOLROW)aCompare.Row : (SCCOLROW)aCompare.Column;
- // zuerst alles selektieren, wo ueberhaupt etwas in der Vergleichsspalte steht
- // (fuer gleiche Zellen wird die Selektion im zweiten Schritt aufgehoben)
+ // zuerst alles selektieren, wo ueberhaupt etwas in der Vergleichsspalte steht
+ // (fuer gleiche Zellen wird die Selektion im zweiten Schritt aufgehoben)
- SCTAB nTab = lcl_FirstTab(aRanges); //! fuer alle Tabellen, wenn Markierungen pro Tabelle!
+ SCTAB nTab = lcl_FirstTab(aRanges); //! fuer alle Tabellen, wenn Markierungen pro Tabelle!
ScRange aCmpRange, aCellRange;
if (bColumnDiff)
aCmpRange = ScRange( 0,nCmpPos,nTab, MAXCOL,nCmpPos,nTab );
@@ -3652,8 +3652,8 @@ uno::Reference<sheet::XSheetCellRanges> ScCellRangesBase::QueryDifferences_Impl(
pCmpCell = aCmpIter.GetNext();
}
- // alle nichtleeren Zellen mit der Vergleichsspalte vergleichen und entsprechend
- // selektieren oder aufheben
+ // alle nichtleeren Zellen mit der Vergleichsspalte vergleichen und entsprechend
+ // selektieren oder aufheben
ScAddress aCmpAddr;
for (i=0; i<nRangeCount; i++)
@@ -3684,7 +3684,7 @@ uno::Reference<sheet::XSheetCellRanges> ScCellRangesBase::QueryDifferences_Impl(
if (aMarkData.IsMultiMarked())
aMarkData.FillRangeListWithMarks( &aNewRanges, FALSE );
- return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges kann leer sein
+ return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges kann leer sein
}
return NULL;
}
@@ -3724,7 +3724,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryIntersec
Min( aTemp.aEnd.Tab(), aMask.aEnd.Tab() ) ) );
}
- return new ScCellRangesObj( pDocShell, aNew ); // kann leer sein
+ return new ScCellRangesObj( pDocShell, aNew ); // kann leer sein
}
// XFormulaQuery
@@ -3743,10 +3743,10 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryPreceden
{
bFound = FALSE;
- // #97205# aMarkData uses aNewRanges, not aRanges, so GetMarkData can't be used
+ // #97205# aMarkData uses aNewRanges, not aRanges, so GetMarkData can't be used
ScMarkData aMarkData;
aMarkData.MarkFromRangeList( aNewRanges, FALSE );
- aMarkData.MarkToMulti(); // needed for IsAllMarked
+ aMarkData.MarkToMulti(); // needed for IsAllMarked
ULONG nCount = aNewRanges.Count();
for (ULONG nR=0; nR<nCount; nR++)
@@ -3798,12 +3798,12 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryDependen
bFound = FALSE;
ULONG nRangesCount = aNewRanges.Count();
- // #97205# aMarkData uses aNewRanges, not aRanges, so GetMarkData can't be used
+ // #97205# aMarkData uses aNewRanges, not aRanges, so GetMarkData can't be used
ScMarkData aMarkData;
aMarkData.MarkFromRangeList( aNewRanges, FALSE );
- aMarkData.MarkToMulti(); // needed for IsAllMarked
+ aMarkData.MarkToMulti(); // needed for IsAllMarked
- SCTAB nTab = lcl_FirstTab(aNewRanges); //! alle Tabellen
+ SCTAB nTab = lcl_FirstTab(aNewRanges); //! alle Tabellen
ScCellIterator aCellIter( pDoc, 0,0, nTab, MAXCOL,MAXROW, nTab );
ScBaseCell* pCell = aCellIter.GetFirst();
@@ -3820,7 +3820,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryDependen
{
ScRange aRange(*aNewRanges.GetObject(nR));
if (aRange.Intersects(aRefRange))
- bMark = TRUE; // von Teil des Ranges abhaengig
+ bMark = TRUE; // von Teil des Ranges abhaengig
}
}
if (bMark)
@@ -3859,7 +3859,7 @@ uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangesBase::findAll(
const uno::Reference<util::XSearchDescriptor>& xDesc )
throw(uno::RuntimeException)
{
- // Wenn nichts gefunden wird, soll Null zurueckgegeben werden (?)
+ // Wenn nichts gefunden wird, soll Null zurueckgegeben werden (?)
uno::Reference<container::XIndexAccess> xRet;
if ( pDocShell && xDesc.is() )
{
@@ -3871,7 +3871,7 @@ uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangesBase::findAll(
{
ScDocument* pDoc = pDocShell->GetDocument();
pSearchItem->SetCommand( SVX_SEARCHCMD_FIND_ALL );
- // immer nur innerhalb dieses Objekts
+ // immer nur innerhalb dieses Objekts
pSearchItem->SetSelection( !lcl_WholeSheet(aRanges) );
ScMarkData aMark(*GetMarkData());
@@ -3886,7 +3886,7 @@ uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangesBase::findAll(
{
ScRangeList aNewRanges;
aMark.FillRangeListWithMarks( &aNewRanges, TRUE );
- // bei findAll immer CellRanges, egal wieviel gefunden wurde
+ // bei findAll immer CellRanges, egal wieviel gefunden wurde
xRet.set(new ScCellRangesObj( pDocShell, aNewRanges ));
}
}
@@ -3910,7 +3910,7 @@ uno::Reference<uno::XInterface> ScCellRangesBase::Find_Impl(
{
ScDocument* pDoc = pDocShell->GetDocument();
pSearchItem->SetCommand( SVX_SEARCHCMD_FIND );
- // immer nur innerhalb dieses Objekts
+ // immer nur innerhalb dieses Objekts
pSearchItem->SetSelection( !lcl_WholeSheet(aRanges) );
ScMarkData aMark(*GetMarkData());
@@ -3922,7 +3922,7 @@ uno::Reference<uno::XInterface> ScCellRangesBase::Find_Impl(
pLastPos->GetVars( nCol, nRow, nTab );
else
{
- nTab = lcl_FirstTab(aRanges); //! mehrere Tabellen?
+ nTab = lcl_FirstTab(aRanges); //! mehrere Tabellen?
ScDocument::GetSearchAndReplaceStart( *pSearchItem, nCol, nRow );
}
@@ -3995,7 +3995,7 @@ sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSea
ScDocument* pDoc = pDocShell->GetDocument();
BOOL bUndo(pDoc->IsUndoEnabled());
pSearchItem->SetCommand( SVX_SEARCHCMD_REPLACE_ALL );
- // immer nur innerhalb dieses Objekts
+ // immer nur innerhalb dieses Objekts
pSearchItem->SetSelection( !lcl_WholeSheet(aRanges) );
ScMarkData aMark(*GetMarkData());
@@ -4007,11 +4007,11 @@ sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSea
bProtected = TRUE;
if (bProtected)
{
- //! Exception, oder was?
+ //! Exception, oder was?
}
else
{
- SCTAB nTab = aMark.GetFirstSelected(); // bei SearchAndReplace nicht benutzt
+ SCTAB nTab = aMark.GetFirstSelected(); // bei SearchAndReplace nicht benutzt
SCCOL nCol = 0;
SCROW nRow = 0;
@@ -4113,7 +4113,7 @@ void ScCellRangesObj::RefChanged()
{
ScCellRangesBase::RefChanged();
- // nix weiter...
+ // nix weiter...
}
uno::Any SAL_CALL ScCellRangesObj::queryInterface( const uno::Type& rType )
@@ -4157,7 +4157,7 @@ uno::Sequence<uno::Type> SAL_CALL ScCellRangesObj::getTypes() throw(uno::Runtime
pPtr[nParentLen + 2] = getCppuType((const uno::Reference<container::XEnumerationAccess>*)0);
for (long i=0; i<nParentLen; i++)
- pPtr[i] = pParentPtr[i]; // parent types first
+ pPtr[i] = pParentPtr[i]; // parent types first
}
return aTypes;
}
@@ -4189,7 +4189,7 @@ ScCellRangeObj* ScCellRangesObj::GetObjectByIndex_Impl(sal_Int32 nIndex) const
return new ScCellRangeObj( pDocSh, aRange );
}
- return NULL; // keine DocShell oder falscher Index
+ return NULL; // keine DocShell oder falscher Index
}
uno::Sequence<table::CellRangeAddress> SAL_CALL ScCellRangesObj::getRangeAddresses()
@@ -4212,7 +4212,7 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScCellRangesObj::getRangeAddress
return aSeq;
}
- return uno::Sequence<table::CellRangeAddress>(0); // leer ist moeglich
+ return uno::Sequence<table::CellRangeAddress>(0); // leer ist moeglich
}
uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellRangesObj::getCells()
@@ -4220,10 +4220,10 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellRangesObj::getCells
{
ScUnoGuard aGuard;
- // getCells with empty range list is possible (no exception),
- // the resulting enumeration just has no elements
- // (same behaviour as a valid range with no cells)
- // This is handled in ScCellsEnumeration ctor.
+ // getCells with empty range list is possible (no exception),
+ // the resulting enumeration just has no elements
+ // (same behaviour as a valid range with no cells)
+ // This is handled in ScCellsEnumeration ctor.
const ScRangeList& rRanges = GetRangeList();
ScDocShell* pDocSh = GetDocShell();
@@ -4343,7 +4343,7 @@ void SAL_CALL ScCellRangesObj::removeRangeAddresses( const uno::Sequence<table::
::com::sun::star::uno::RuntimeException)
{
// with this implementation not needed
-// ScUnoGuard aGuard;
+// ScUnoGuard aGuard;
// use sometimes a better/faster implementation
@@ -4376,7 +4376,7 @@ void SAL_CALL ScCellRangesObj::insertByName( const rtl::OUString& aName, const u
ScDocShell* pDocSh = GetDocShell();
BOOL bDone = FALSE;
- //! Type of aElement can be some specific interface instead of XInterface
+ //! Type of aElement can be some specific interface instead of XInterface
uno::Reference<uno::XInterface> xInterface(aElement, uno::UNO_QUERY);
if ( pDocSh && xInterface.is() )
@@ -4384,7 +4384,7 @@ void SAL_CALL ScCellRangesObj::insertByName( const rtl::OUString& aName, const u
ScCellRangesBase* pRangesImp = ScCellRangesBase::getImplementation( xInterface );
if ( pRangesImp && pRangesImp->GetDocShell() == pDocSh )
{
- // if explicit name is given and already existing, throw exception
+ // if explicit name is given and already existing, throw exception
String aNamStr(aName);
if ( aNamStr.Len() )
@@ -4405,9 +4405,9 @@ void SAL_CALL ScCellRangesObj::insertByName( const rtl::OUString& aName, const u
if ( aName.getLength() && nAddCount == 1 )
{
- // if a name is given, also insert into list of named entries
- // (only possible for a single range)
- // name is not in aNamedEntries (tested above)
+ // if a name is given, also insert into list of named entries
+ // (only possible for a single range)
+ // name is not in aNamedEntries (tested above)
ScNamedEntry* pEntry = new ScNamedEntry( aNamStr, *rAddRanges.GetObject(0) );
aNamedEntries.Insert( pEntry, aNamedEntries.Count() );
@@ -4417,7 +4417,7 @@ void SAL_CALL ScCellRangesObj::insertByName( const rtl::OUString& aName, const u
if (!bDone)
{
- // invalid element - double names are handled above
+ // invalid element - double names are handled above
throw lang::IllegalArgumentException();
}
}
@@ -4440,14 +4440,14 @@ BOOL lcl_FindRangeByName( const ScRangeList& rRanges, ScDocShell* pDocSh,
}
}
}
- return FALSE; // nicht gefunden
+ return FALSE; // nicht gefunden
}
BOOL lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries,
const ScRangeList& rRanges, ScDocShell* pDocSh,
const String& rName, ScRange& rFound )
{
- // exact range in list?
+ // exact range in list?
ULONG nIndex = 0;
if ( lcl_FindRangeByName( rRanges, pDocSh, rName, nIndex ) )
@@ -4456,7 +4456,7 @@ BOOL lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries,
return TRUE;
}
- // range contained in selection? (sheet must be specified)
+ // range contained in selection? (sheet must be specified)
ScRange aCellRange;
USHORT nParse = aCellRange.ParseAny( rName, pDocSh->GetDocument() );
@@ -4464,7 +4464,7 @@ BOOL lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries,
{
ScMarkData aMarkData;
aMarkData.MarkFromRangeList( rRanges, FALSE );
- aMarkData.MarkToMulti(); // needed for IsAllMarked
+ aMarkData.MarkToMulti(); // needed for IsAllMarked
if ( aMarkData.IsAllMarked( aCellRange ) )
{
rFound = aCellRange;
@@ -4472,19 +4472,19 @@ BOOL lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries,
}
}
- // named entry in this object?
+ // named entry in this object?
if ( rNamedEntries.Count() )
{
for ( USHORT n=0; n<rNamedEntries.Count(); n++ )
if ( rNamedEntries[n]->GetName() == rName )
{
- // test if named entry is contained in rRanges
+ // test if named entry is contained in rRanges
const ScRange& rComp = rNamedEntries[n]->GetRange();
ScMarkData aMarkData;
aMarkData.MarkFromRangeList( rRanges, FALSE );
- aMarkData.MarkToMulti(); // needed for IsAllMarked
+ aMarkData.MarkToMulti(); // needed for IsAllMarked
if ( aMarkData.IsAllMarked( rComp ) )
{
rFound = rComp;
@@ -4493,7 +4493,7 @@ BOOL lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries,
}
}
- return FALSE; // not found
+ return FALSE; // not found
}
void SAL_CALL ScCellRangesObj::removeByName( const rtl::OUString& aName )
@@ -4508,7 +4508,7 @@ void SAL_CALL ScCellRangesObj::removeByName( const rtl::OUString& aName )
ULONG nIndex = 0;
if ( lcl_FindRangeByName( rRanges, pDocSh, aNameStr, nIndex ) )
{
- // einzelnen Range weglassen
+ // einzelnen Range weglassen
ScRangeList aNew;
ULONG nCount = rRanges.Count();
for (ULONG i=0; i<nCount; i++)
@@ -4519,7 +4519,7 @@ void SAL_CALL ScCellRangesObj::removeByName( const rtl::OUString& aName )
}
else if (pDocSh)
{
- // deselect any ranges (parsed or named entry)
+ // deselect any ranges (parsed or named entry)
ScRangeList aDiff;
BOOL bValid = ( aDiff.Parse( aNameStr, pDocSh->GetDocument() ) & SCA_VALID ) != 0;
if ( !bValid && aNamedEntries.Count() )
@@ -4550,15 +4550,15 @@ void SAL_CALL ScCellRangesObj::removeByName( const rtl::OUString& aName )
aMarkData.FillRangeListWithMarks( &aNew, FALSE );
SetNewRanges(aNew);
- bDone = TRUE; //! error if range was not selected before?
+ bDone = TRUE; //! error if range was not selected before?
}
}
if (aNamedEntries.Count())
- lcl_RemoveNamedEntry( aNamedEntries, aNameStr ); // remove named entry
+ lcl_RemoveNamedEntry( aNamedEntries, aNameStr ); // remove named entry
if (!bDone)
- throw container::NoSuchElementException(); // not found
+ throw container::NoSuchElementException(); // not found
}
// XNameReplace
@@ -4568,7 +4568,7 @@ void SAL_CALL ScCellRangesObj::replaceByName( const rtl::OUString& aName, const
lang::WrappedTargetException, uno::RuntimeException)
{
ScUnoGuard aGuard;
- //! zusammenfassen?
+ //! zusammenfassen?
removeByName( aName );
insertByName( aName, aElement );
}
@@ -4630,7 +4630,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesObj::getElementNames()
rtl::OUString* pAry = aSeq.getArray();
for (ULONG i=0; i<nCount; i++)
{
- // use given name if for exactly this range, otherwise just format
+ // use given name if for exactly this range, otherwise just format
ScRange aRange = *rRanges.GetObject(i);
if ( !aNamedEntries.Count() || !lcl_FindEntryName( aNamedEntries, aRange, aRangeStr ) )
aRange.Format( aRangeStr, SCA_VALID | SCA_TAB_3D, pDoc );
@@ -4743,7 +4743,7 @@ ScCellRangeObj::ScCellRangeObj(ScDocShell* pDocSh, const ScRange& rR) :
pRangePropSet( lcl_GetRangePropertySet() ),
aRange( rR )
{
- aRange.Justify(); // Anfang / Ende richtig
+ aRange.Justify(); // Anfang / Ende richtig
}
ScCellRangeObj::~ScCellRangeObj()
@@ -4830,7 +4830,7 @@ uno::Sequence<uno::Type> SAL_CALL ScCellRangeObj::getTypes() throw(uno::RuntimeE
pPtr[nParentLen +16] = getCppuType((const uno::Reference<sheet::XUniqueCellFormatRangesSupplier>*)0);
for (long i=0; i<nParentLen; i++)
- pPtr[i] = pParentPtr[i]; // parent types first
+ pPtr[i] = pParentPtr[i]; // parent types first
}
return aTypes;
}
@@ -4849,8 +4849,8 @@ uno::Sequence<sal_Int8> SAL_CALL ScCellRangeObj::getImplementationId()
// XCellRange
-// ColumnCount / RowCount sind weggefallen
-//! werden im Writer fuer Tabellen noch gebraucht ???
+// ColumnCount / RowCount sind weggefallen
+//! werden im Writer fuer Tabellen noch gebraucht ???
uno::Reference<table::XCell> ScCellRangeObj::GetCellByPosition_Impl(
sal_Int32 nColumn, sal_Int32 nRow )
@@ -4925,8 +4925,8 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByName(
uno::Reference<table::XCellRange> ScCellRangeObj::getCellRangeByName(
const rtl::OUString& aName, const ScAddress::Details& rDetails ) throw(uno::RuntimeException)
{
- // name refers to the whole document (with the range's table as default),
- // valid only if the range is within this range
+ // name refers to the whole document (with the range's table as default),
+ // valid only if the range is within this range
ScUnoGuard aGuard;
ScDocShell* pDocSh = GetDocShell();
@@ -4941,7 +4941,7 @@ uno::Reference<table::XCellRange> ScCellRangeObj::getCellRangeByName(
USHORT nParse = aCellRange.ParseAny( aString, pDoc, rDetails );
if ( nParse & SCA_VALID )
{
- if ( !(nParse & SCA_TAB_3D) ) // keine Tabelle angegeben -> auf dieser Tabelle
+ if ( !(nParse & SCA_TAB_3D) ) // keine Tabelle angegeben -> auf dieser Tabelle
{
aCellRange.aStart.SetTab(nTab);
aCellRange.aEnd.SetTab(nTab);
@@ -4956,7 +4956,7 @@ uno::Reference<table::XCellRange> ScCellRangeObj::getCellRangeByName(
bFound = TRUE;
}
- if (bFound) // valid only if within this object's range
+ if (bFound) // valid only if within this object's range
{
if (!aRange.In(aCellRange))
bFound = FALSE;
@@ -5031,9 +5031,9 @@ rtl::OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeExcep
{
ScUnoGuard aGuard;
- // Matrix-Formel, wenn eindeutig Teil einer Matrix,
- // also wenn Anfang und Ende des Blocks zur selben Matrix gehoeren.
- // Sonst Leerstring.
+ // Matrix-Formel, wenn eindeutig Teil einer Matrix,
+ // also wenn Anfang und Ende des Blocks zur selben Matrix gehoeren.
+ // Sonst Leerstring.
String aFormula;
ScDocShell* pDocSh = GetDocShell();
@@ -5051,8 +5051,8 @@ rtl::OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeExcep
ScAddress aStart2;
if ( pFCell1->GetMatrixOrigin( aStart1 ) && pFCell2->GetMatrixOrigin( aStart2 ) )
{
- if ( aStart1 == aStart2 ) // beides dieselbe Matrix
- pFCell1->GetFormula( aFormula ); // egal, von welcher Zelle
+ if ( aStart1 == aStart2 ) // beides dieselbe Matrix
+ pFCell1->GetFormula( aFormula ); // egal, von welcher Zelle
}
}
}
@@ -5070,7 +5070,7 @@ void ScCellRangeObj::SetArrayFormula_Impl( const rtl::OUString& rFormula,
{
if ( ScTableSheetObj::getImplementation( (cppu::OWeakObject*)this ) )
{
- // #74681# don't set array formula for sheet object
+ // #74681# don't set array formula for sheet object
throw uno::RuntimeException();
}
@@ -5078,7 +5078,7 @@ void ScCellRangeObj::SetArrayFormula_Impl( const rtl::OUString& rFormula,
}
else
{
- // empty string -> erase array formula
+ // empty string -> erase array formula
ScMarkData aMark;
aMark.SetMarkArea( aRange );
aMark.SelectTable( aRange.aStart.Tab(), TRUE );
@@ -5181,7 +5181,7 @@ uno::Sequence< uno::Sequence<uno::Any> > SAL_CALL ScCellRangeObj::getDataArray()
if ( ScTableSheetObj::getImplementation( (cppu::OWeakObject*)this ) )
{
- // don't create a data array for the sheet
+ // don't create a data array for the sheet
throw uno::RuntimeException();
}
@@ -5194,11 +5194,11 @@ uno::Sequence< uno::Sequence<uno::Any> > SAL_CALL ScCellRangeObj::getDataArray()
{
uno::Sequence< uno::Sequence<uno::Any> > aSeq;
if ( aAny >>= aSeq )
- return aSeq; // success
+ return aSeq; // success
}
}
- throw uno::RuntimeException(); // no other exceptions specified
+ throw uno::RuntimeException(); // no other exceptions specified
// return uno::Sequence< uno::Sequence<uno::Any> >(0);
}
@@ -5217,7 +5217,7 @@ void SAL_CALL ScCellRangeObj::setDataArray(
}
if (!bDone)
- throw uno::RuntimeException(); // no other exceptions specified
+ throw uno::RuntimeException(); // no other exceptions specified
}
// XCellRangeFormula
@@ -5229,7 +5229,7 @@ uno::Sequence< uno::Sequence<rtl::OUString> > SAL_CALL ScCellRangeObj::getFormul
if ( ScTableSheetObj::getImplementation( (cppu::OWeakObject*)this ) )
{
- // don't create a data array for the sheet
+ // don't create a data array for the sheet
throw uno::RuntimeException();
}
@@ -5260,7 +5260,7 @@ uno::Sequence< uno::Sequence<rtl::OUString> > SAL_CALL ScCellRangeObj::getFormul
return aRowSeq;
}
- throw uno::RuntimeException(); // no other exceptions specified
+ throw uno::RuntimeException(); // no other exceptions specified
// return uno::Sequence< uno::Sequence<rtl::OUString> >(0);
}
@@ -5281,7 +5281,7 @@ void SAL_CALL ScCellRangeObj::setFormulaArray(
}
if (!bDone)
- throw uno::RuntimeException(); // no other exceptions specified
+ throw uno::RuntimeException(); // no other exceptions specified
}
// XMultipleOperation
@@ -5304,10 +5304,10 @@ void SAL_CALL ScCellRangeObj::setTableOperation( const table::CellRangeAddress&
aParam.aRefFormulaEnd = ScRefAddress( (SCCOL)aFormulaRange.EndColumn,
(SCROW)aFormulaRange.EndRow, aFormulaRange.Sheet,
FALSE, FALSE, FALSE );
- aParam.aRefRowCell = ScRefAddress( (SCCOL)aRowCell.Column,
+ aParam.aRefRowCell = ScRefAddress( (SCCOL)aRowCell.Column,
(SCROW)aRowCell.Row, aRowCell.Sheet,
FALSE, FALSE, FALSE );
- aParam.aRefColCell = ScRefAddress( (SCCOL)aColumnCell.Column,
+ aParam.aRefColCell = ScRefAddress( (SCCOL)aColumnCell.Column,
(SCROW)aColumnCell.Row, aColumnCell.Sheet,
FALSE, FALSE, FALSE );
switch (nMode)
@@ -5347,7 +5347,7 @@ void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) throw(uno::RuntimeExcepti
else
aFunc.UnmergeCells( aRange, TRUE, TRUE );
- //! Fehler abfangen?
+ //! Fehler abfangen?
}
}
@@ -5370,7 +5370,7 @@ void SAL_CALL ScCellRangeObj::fillSeries( sheet::FillDirection nFillDirection,
{
BOOL bError = FALSE;
- FillDir eDir = FILL_TO_BOTTOM;
+ FillDir eDir = FILL_TO_BOTTOM;
switch (nFillDirection)
{
case sheet::FillDirection_TO_BOTTOM:
@@ -5411,7 +5411,7 @@ void SAL_CALL ScCellRangeObj::fillSeries( sheet::FillDirection nFillDirection,
bError = TRUE;
}
- FillDateCmd eDateCmd = FILL_DAY;
+ FillDateCmd eDateCmd = FILL_DAY;
switch ( nFillDateMode )
{
case sheet::FillDateMode_FILL_DATE_DAY:
@@ -5503,7 +5503,7 @@ void SAL_CALL ScCellRangeObj::autoFormat( const rtl::OUString& aName )
for (nIndex=0; nIndex<nCount; nIndex++)
{
(*pAutoFormat)[nIndex]->GetName(aCompare);
- if ( aCompare == aNameString ) //! Case-insensitiv ???
+ if ( aCompare == aNameString ) //! Case-insensitiv ???
break;
}
if (nIndex<nCount)
@@ -5532,7 +5532,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScCellRangeObj::createSortDescripto
{
pData->GetSortParam(aParam);
- // im SortDescriptor sind die Fields innerhalb des Bereichs gezaehlt
+ // im SortDescriptor sind die Fields innerhalb des Bereichs gezaehlt
ScRange aDBRange;
pData->GetArea(aDBRange);
SCCOLROW nFieldStart = aParam.bByRow ?
@@ -5558,10 +5558,10 @@ void SAL_CALL ScCellRangeObj::sort( const uno::Sequence<beans::PropertyValue>& a
{
USHORT i;
ScSortParam aParam;
- ScDBData* pData = pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen
+ ScDBData* pData = pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen
if (pData)
{
- // alten Einstellungen holen, falls nicht alles neu gesetzt wird
+ // alten Einstellungen holen, falls nicht alles neu gesetzt wird
pData->GetSortParam(aParam);
SCCOLROW nOldStart = aParam.bByRow ?
static_cast<SCCOLROW>(aRange.aStart.Col()) :
@@ -5573,8 +5573,8 @@ void SAL_CALL ScCellRangeObj::sort( const uno::Sequence<beans::PropertyValue>& a
ScSortDescriptor::FillSortParam( aParam, aDescriptor );
- // im SortDescriptor sind die Fields innerhalb des Bereichs gezaehlt
- // ByRow kann bei FillSortParam umgesetzt worden sein
+ // im SortDescriptor sind die Fields innerhalb des Bereichs gezaehlt
+ // ByRow kann bei FillSortParam umgesetzt worden sein
SCCOLROW nFieldStart = aParam.bByRow ?
static_cast<SCCOLROW>(aRange.aStart.Col()) :
static_cast<SCCOLROW>(aRange.aStart.Row());
@@ -5587,9 +5587,9 @@ void SAL_CALL ScCellRangeObj::sort( const uno::Sequence<beans::PropertyValue>& a
aParam.nCol2 = aRange.aEnd.Col();
aParam.nRow2 = aRange.aEnd.Row();
- pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen
+ pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen
- ScDBDocFunc aFunc(*pDocSh); // Bereich muss angelegt sein
+ ScDBDocFunc aFunc(*pDocSh); // Bereich muss angelegt sein
aFunc.Sort( nTab, aParam, TRUE, TRUE, TRUE );
}
}
@@ -5610,7 +5610,7 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil
{
ScQueryParam aParam;
pData->GetQueryParam(aParam);
- // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt
+ // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt
ScRange aDBRange;
pData->GetArea(aDBRange);
SCCOLROW nFieldStart = aParam.bByRow ?
@@ -5634,10 +5634,10 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe
{
ScUnoGuard aGuard;
- // das koennte theoretisch ein fremdes Objekt sein, also nur das
- // oeffentliche XSheetFilterDescriptor Interface benutzen, um
- // die Daten in ein ScFilterDescriptor Objekt zu kopieren:
- //! wenn es schon ein ScFilterDescriptor ist, direkt per getImplementation?
+ // das koennte theoretisch ein fremdes Objekt sein, also nur das
+ // oeffentliche XSheetFilterDescriptor Interface benutzen, um
+ // die Daten in ein ScFilterDescriptor Objekt zu kopieren:
+ //! wenn es schon ein ScFilterDescriptor ist, direkt per getImplementation?
ScDocShell* pDocSh = GetDocShell();
ScFilterDescriptor aImpl(pDocSh);
@@ -5650,20 +5650,20 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe
{
aImpl.setFilterFields( xDescriptor->getFilterFields() );
}
- // Rest sind jetzt Properties...
+ // Rest sind jetzt Properties...
uno::Reference<beans::XPropertySet> xPropSet( xDescriptor, uno::UNO_QUERY );
if (xPropSet.is())
lcl_CopyProperties( aImpl, *(beans::XPropertySet*)xPropSet.get() );
//
- // ausfuehren...
+ // ausfuehren...
//
if (pDocSh)
{
ScQueryParam aParam = aImpl.GetParam();
- // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt
+ // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt
SCCOLROW nFieldStart = aParam.bByRow ?
static_cast<SCCOLROW>(aRange.aStart.Col()) :
static_cast<SCCOLROW>(aRange.aStart.Row());
@@ -5674,7 +5674,7 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe
if (rEntry.bDoQuery)
{
rEntry.nField += nFieldStart;
- // Im Dialog wird immer der String angezeigt -> muss zum Wert passen
+ // Im Dialog wird immer der String angezeigt -> muss zum Wert passen
if ( !rEntry.bQueryByString )
pDocSh->GetDocument()->GetFormatTable()->
GetInputLineString( rEntry.nVal, 0, *rEntry.pStr );
@@ -5687,17 +5687,17 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe
aParam.nCol2 = aRange.aEnd.Col();
aParam.nRow2 = aRange.aEnd.Row();
- pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen
+ pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen
- //! keep source range in filter descriptor
- //! if created by createFilterDescriptorByObject ???
+ //! keep source range in filter descriptor
+ //! if created by createFilterDescriptorByObject ???
ScDBDocFunc aFunc(*pDocSh);
- aFunc.Query( nTab, aParam, NULL, TRUE, TRUE ); // Bereich muss angelegt sein
+ aFunc.Query( nTab, aParam, NULL, TRUE, TRUE ); // Bereich muss angelegt sein
}
}
-//! get/setAutoFilter als Properties!!!
+//! get/setAutoFilter als Properties!!!
// XAdvancedFilterSource
@@ -5707,17 +5707,17 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil
{
ScUnoGuard aGuard;
- // this ist hier nicht der Bereich, der gefiltert wird, sondern der
- // Bereich mit der Abfrage...
+ // this ist hier nicht der Bereich, der gefiltert wird, sondern der
+ // Bereich mit der Abfrage...
uno::Reference<sheet::XCellRangeAddressable> xAddr( xObject, uno::UNO_QUERY );
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh && xAddr.is() )
{
- //! Test, ob xObject im selben Dokument ist
+ //! Test, ob xObject im selben Dokument ist
- ScFilterDescriptor* pNew = new ScFilterDescriptor(pDocSh); //! stattdessen vom Objekt?
+ ScFilterDescriptor* pNew = new ScFilterDescriptor(pDocSh); //! stattdessen vom Objekt?
//XSheetFilterDescriptorRef xNew = xObject->createFilterDescriptor(TRUE);
ScQueryParam aParam = pNew->GetParam();
@@ -5737,7 +5737,7 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil
aRange.aStart.Tab(), aParam );
if ( bOk )
{
- // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt
+ // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt
SCCOLROW nFieldStart = aParam.bByRow ?
static_cast<SCCOLROW>(aDataAddress.StartColumn) :
static_cast<SCCOLROW>(aDataAddress.StartRow);
@@ -5755,7 +5755,7 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil
else
{
delete pNew;
- return NULL; // ungueltig -> null
+ return NULL; // ungueltig -> null
}
}
@@ -5779,7 +5779,7 @@ uno::Reference<sheet::XSubTotalDescriptor> SAL_CALL ScCellRangeObj::createSubTot
{
ScSubTotalParam aParam;
pData->GetSubTotalParam(aParam);
- // im SubTotalDescriptor sind die Fields innerhalb des Bereichs gezaehlt
+ // im SubTotalDescriptor sind die Fields innerhalb des Bereichs gezaehlt
ScRange aDBRange;
pData->GetArea(aDBRange);
SCCOL nFieldStart = aDBRange.aStart.Col();
@@ -5815,9 +5815,9 @@ void SAL_CALL ScCellRangeObj::applySubTotals(
if (pDocSh && pImp)
{
ScSubTotalParam aParam;
- pImp->GetData(aParam); // virtuelle Methode der Basisklasse
+ pImp->GetData(aParam); // virtuelle Methode der Basisklasse
- // im SubTotalDescriptor sind die Fields innerhalb des Bereichs gezaehlt
+ // im SubTotalDescriptor sind die Fields innerhalb des Bereichs gezaehlt
SCCOL nFieldStart = aRange.aStart.Col();
for (USHORT i=0; i<MAXSUBTOTAL; i++)
{
@@ -5837,10 +5837,10 @@ void SAL_CALL ScCellRangeObj::applySubTotals(
aParam.nCol2 = aRange.aEnd.Col();
aParam.nRow2 = aRange.aEnd.Row();
- pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen
+ pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen
ScDBDocFunc aFunc(*pDocSh);
- aFunc.DoSubTotals( nTab, aParam, NULL, TRUE, TRUE ); // Bereich muss angelegt sein
+ aFunc.DoSubTotals( nTab, aParam, NULL, TRUE, TRUE ); // Bereich muss angelegt sein
}
}
@@ -5854,7 +5854,7 @@ void SAL_CALL ScCellRangeObj::removeSubTotals() throw(uno::RuntimeException)
ScSubTotalParam aParam;
ScDBData* pData = pDocSh->GetDBData( aRange, SC_DB_OLD, SC_DBSEL_FORCE_MARK );
if (pData)
- pData->GetSubTotalParam(aParam); // auch bei Remove die Feld-Eintraege behalten
+ pData->GetSubTotalParam(aParam); // auch bei Remove die Feld-Eintraege behalten
aParam.bRemoveOnly = TRUE;
@@ -5864,10 +5864,10 @@ void SAL_CALL ScCellRangeObj::removeSubTotals() throw(uno::RuntimeException)
aParam.nCol2 = aRange.aEnd.Col();
aParam.nRow2 = aRange.aEnd.Row();
- pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen
+ pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen
ScDBDocFunc aFunc(*pDocSh);
- aFunc.DoSubTotals( nTab, aParam, NULL, TRUE, TRUE ); // Bereich muss angelegt sein
+ aFunc.DoSubTotals( nTab, aParam, NULL, TRUE, TRUE ); // Bereich muss angelegt sein
}
}
@@ -5909,10 +5909,10 @@ void SAL_CALL ScCellRangeObj::doImport( const uno::Sequence<beans::PropertyValue
//! TODO: could we get passed a valid result set by any means?
uno::Reference< sdbc::XResultSet > xResultSet;
- pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen
+ pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK ); // ggf. Bereich anlegen
- ScDBDocFunc aFunc(*pDocSh); // Bereich muss angelegt sein
- aFunc.DoImport( nTab, aParam, xResultSet, NULL, TRUE, FALSE ); //! Api-Flag als Parameter
+ ScDBDocFunc aFunc(*pDocSh); // Bereich muss angelegt sein
+ aFunc.DoImport( nTab, aParam, xResultSet, NULL, TRUE, FALSE ); //! Api-Flag als Parameter
}
}
@@ -5954,8 +5954,8 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellRangeObj::getPropertySetI
void ScCellRangeObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue )
throw(lang::IllegalArgumentException, uno::RuntimeException)
{
- // Range has only Position and Size in addition to ScCellRangesBase, both are ReadOnly
- // -> nothing to do here
+ // Range has only Position and Size in addition to ScCellRangesBase, both are ReadOnly
+ // -> nothing to do here
ScCellRangesBase::SetOnePropertyValue( pEntry, aValue );
}
@@ -5971,7 +5971,7 @@ void ScCellRangeObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEnt
ScDocShell* pDocSh = GetDocShell();
if (pDocSh)
{
- // GetMMRect converts using HMM_PER_TWIPS, like the DrawingLayer
+ // GetMMRect converts using HMM_PER_TWIPS, like the DrawingLayer
Rectangle aMMRect(pDocSh->GetDocument()->GetMMRect(
aRange.aStart.Col(), aRange.aStart.Row(),
aRange.aEnd.Col(), aRange.aEnd.Row(), aRange.aStart.Tab() ));
@@ -5984,7 +5984,7 @@ void ScCellRangeObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEnt
ScDocShell* pDocSh = GetDocShell();
if (pDocSh)
{
- // GetMMRect converts using HMM_PER_TWIPS, like the DrawingLayer
+ // GetMMRect converts using HMM_PER_TWIPS, like the DrawingLayer
Rectangle aMMRect = pDocSh->GetDocument()->GetMMRect(
aRange.aStart.Col(), aRange.aStart.Row(),
aRange.aEnd.Col(), aRange.aEnd.Row(), aRange.aStart.Tab() );
@@ -6053,11 +6053,11 @@ ScCellObj::ScCellObj(ScDocShell* pDocSh, const ScAddress& rP) :
aCellPos( rP ),
nActionLockCount( 0 )
{
- // pUnoText is allocated on demand (GetUnoText)
- // can't be aggregated because getString/setString is handled here
+ // pUnoText is allocated on demand (GetUnoText)
+ // can't be aggregated because getString/setString is handled here
}
-SvxUnoText& ScCellObj::GetUnoText()
+SvxUnoText& ScCellObj::GetUnoText()
{
if (!pUnoText)
{
@@ -6139,7 +6139,7 @@ uno::Sequence<uno::Type> SAL_CALL ScCellObj::getTypes() throw(uno::RuntimeExcept
pPtr[nParentLen + 7] = getCppuType((const uno::Reference<sheet::XFormulaTokens>*)0);
for (long i=0; i<nParentLen; i++)
- pPtr[i] = pParentPtr[i]; // parent types first
+ pPtr[i] = pParentPtr[i]; // parent types first
}
return aTypes;
}
@@ -6155,9 +6155,9 @@ uno::Sequence<sal_Int8> SAL_CALL ScCellObj::getImplementationId() throw(uno::Run
return aId;
}
-// Hilfsfunktionen
+// Hilfsfunktionen
-String ScCellObj::GetInputString_Impl(BOOL bEnglish) const // fuer getFormula / FormulaLocal
+String ScCellObj::GetInputString_Impl(BOOL bEnglish) const // fuer getFormula / FormulaLocal
{
if (GetDocShell())
return lcl_GetInputString( GetDocShell()->GetDocument(), aCellPos, bEnglish );
@@ -6174,8 +6174,8 @@ String ScCellObj::GetOutputString_Impl(ScDocument* pDoc, const ScAddress& aCellP
{
if ( pCell->GetCellType() == CELLTYPE_EDIT )
{
- // GetString an der EditCell macht Leerzeichen aus Umbruechen,
- // hier werden die Umbrueche aber gebraucht
+ // GetString an der EditCell macht Leerzeichen aus Umbruechen,
+ // hier werden die Umbrueche aber gebraucht
const EditTextObject* pData = ((ScEditCell*)pCell)->GetData();
if (pData)
{
@@ -6183,12 +6183,12 @@ String ScCellObj::GetOutputString_Impl(ScDocument* pDoc, const ScAddress& aCellP
rEngine.SetText( *pData );
aVal = rEngine.GetText( LINEEND_LF );
}
- // Edit-Zellen auch nicht per NumberFormatter formatieren
- // (passend zur Ausgabe)
+ // Edit-Zellen auch nicht per NumberFormatter formatieren
+ // (passend zur Ausgabe)
}
else
{
- // wie in GetString am Dokument (column)
+ // wie in GetString am Dokument (column)
Color* pColor;
ULONG nNumFmt = pDoc->GetNumberFormat( aCellPos );
ScCellFormat::GetString( pCell, nNumFmt, aVal, &pColor, *pDoc->GetFormatTable() );
@@ -6272,7 +6272,7 @@ void ScCellObj::SetFormulaWithGrammar( const ::rtl::OUString& rFormula,
}
}
-// XText
+// XText
uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursor()
throw(uno::RuntimeException)
@@ -6314,7 +6314,7 @@ void SAL_CALL ScCellObj::setString( const rtl::OUString& aText ) throw(uno::Runt
{
ScUnoGuard aGuard;
String aString(aText);
- SetString_Impl(aString, FALSE, FALSE); // immer Text
+ SetString_Impl(aString, FALSE, FALSE); // immer Text
// don't create pUnoText here if not there
if (pUnoText)
@@ -6356,7 +6356,7 @@ void SAL_CALL ScCellObj::insertTextContent( const uno::Reference<text::XTextRang
if (!pTextRange)
pTextRange = SvxUnoTextRangeBase::getImplementation( xRange );
- //! bei SvxUnoTextRange testen, ob in passendem Objekt !!!
+ //! bei SvxUnoTextRange testen, ob in passendem Objekt !!!
#endif
if ( pCellField && !pCellField->IsInserted() && pTextRange )
@@ -6366,7 +6366,7 @@ void SAL_CALL ScCellObj::insertTextContent( const uno::Reference<text::XTextRang
if (!bAbsorb)
{
- // nicht ersetzen -> hinten anhaengen
+ // nicht ersetzen -> hinten anhaengen
aSelection.Adjust();
aSelection.nStartPara = aSelection.nEndPara;
aSelection.nStartPos = aSelection.nEndPos;
@@ -6378,14 +6378,14 @@ void SAL_CALL ScCellObj::insertTextContent( const uno::Reference<text::XTextRang
pForwarder->QuickInsertField( aItem, aSelection );
pEditSource->UpdateData();
- // neue Selektion: ein Zeichen
+ // neue Selektion: ein Zeichen
aSelection.Adjust();
aSelection.nEndPara = aSelection.nStartPara;
aSelection.nEndPos = aSelection.nStartPos + 1;
pCellField->InitDoc( pDocSh, aCellPos, aSelection );
- // #91431# for bAbsorb=FALSE, the new selection must be behind the inserted content
- // (the xml filter relies on this)
+ // #91431# for bAbsorb=FALSE, the new selection must be behind the inserted content
+ // (the xml filter relies on this)
if (!bAbsorb)
aSelection.nStartPos = aSelection.nEndPos;
@@ -6406,7 +6406,7 @@ void SAL_CALL ScCellObj::removeTextContent( const uno::Reference<text::XTextCont
ScCellFieldObj* pCellField = ScCellFieldObj::getImplementation( xContent );
if ( pCellField && pCellField->IsInserted() )
{
- //! Testen, ob das Feld in dieser Zelle ist
+ //! Testen, ob das Feld in dieser Zelle ist
pCellField->DeleteField();
return;
}
@@ -6451,12 +6451,12 @@ sal_Bool SAL_CALL ScCellObj::hasElements() throw(uno::RuntimeException)
return GetUnoText().hasElements();
}
-// XCell
+// XCell
rtl::OUString SAL_CALL ScCellObj::getFormula() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- // TRUE = englisch
+ // TRUE = englisch
return GetInputString_Impl(TRUE);
}
@@ -6464,7 +6464,7 @@ void SAL_CALL ScCellObj::setFormula( const rtl::OUString& aFormula ) throw(uno::
{
ScUnoGuard aGuard;
String aString(aFormula);
- SetString_Impl(aString, TRUE, TRUE); // englisch interpretieren
+ SetString_Impl(aString, TRUE, TRUE); // englisch interpretieren
}
double SAL_CALL ScCellObj::getValue() throw(uno::RuntimeException)
@@ -6505,7 +6505,7 @@ table::CellContentType SAL_CALL ScCellObj::getType() throw(uno::RuntimeException
}
else
{
- DBG_ERROR("keine DocShell"); //! Exception oder so?
+ DBG_ERROR("keine DocShell"); //! Exception oder so?
}
return eRet;
@@ -6523,7 +6523,7 @@ table::CellContentType ScCellObj::GetResultType_Impl()
return bValue ? table::CellContentType_VALUE : table::CellContentType_TEXT;
}
}
- return getType(); // wenn keine Formel
+ return getType(); // wenn keine Formel
}
sal_Int32 SAL_CALL ScCellObj::getError() throw(uno::RuntimeException)
@@ -6540,7 +6540,7 @@ sal_Int32 SAL_CALL ScCellObj::getError() throw(uno::RuntimeException)
}
else
{
- DBG_ERROR("keine DocShell"); //! Exception oder so?
+ DBG_ERROR("keine DocShell"); //! Exception oder so?
}
return nError;
@@ -6589,9 +6589,9 @@ table::CellAddress SAL_CALL ScCellObj::getCellAddress() throw(uno::RuntimeExcept
{
ScUnoGuard aGuard;
table::CellAddress aAdr;
- aAdr.Sheet = aCellPos.Tab();
- aAdr.Column = aCellPos.Col();
- aAdr.Row = aCellPos.Row();
+ aAdr.Sheet = aCellPos.Tab();
+ aAdr.Column = aCellPos.Col();
+ aAdr.Row = aCellPos.Row();
return aAdr;
}
@@ -6625,7 +6625,7 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellObj::getTextFields(
uno::Reference<container::XNameAccess> SAL_CALL ScCellObj::getTextFieldMasters()
throw(uno::RuntimeException)
{
- // sowas gibts nicht im Calc (?)
+ // sowas gibts nicht im Calc (?)
return NULL;
}
@@ -6650,12 +6650,12 @@ void ScCellObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, c
rtl::OUString aStrVal;
aValue >>= aStrVal;
String aString(aStrVal);
- SetString_Impl(aString, TRUE, FALSE); // lokal interpretieren
+ SetString_Impl(aString, TRUE, FALSE); // lokal interpretieren
}
else if ( pEntry->nWID == SC_WID_UNO_FORMRT )
{
- // Read-Only
- //! Exception oder so...
+ // Read-Only
+ //! Exception oder so...
}
else
ScCellRangeObj::SetOnePropertyValue( pEntry, aValue );
@@ -6698,9 +6698,9 @@ rtl::OUString SAL_CALL ScCellObj::getImplementationName() throw(uno::RuntimeExce
sal_Bool SAL_CALL ScCellObj::supportsService( const rtl::OUString& rServiceName )
throw(uno::RuntimeException)
{
- // CellRange/SheetCellRange are not in SheetCell service description,
- // but ScCellObj is used instead of ScCellRangeObj in CellRanges collections,
- // so it must support them
+ // CellRange/SheetCellRange are not in SheetCell service description,
+ // but ScCellObj is used instead of ScCellRangeObj in CellRanges collections,
+ // so it must support them
String aServiceStr(rServiceName);
return aServiceStr.EqualsAscii( SCSHEETCELL_SERVICE ) ||
@@ -6892,7 +6892,7 @@ uno::Sequence<uno::Type> SAL_CALL ScTableSheetObj::getTypes() throw(uno::Runtime
pPtr[nParentLen +17] = getCppuType((const uno::Reference<document::XEventsSupplier>*)0);
for (long i=0; i<nParentLen; i++)
- pPtr[i] = pParentPtr[i]; // parent types first
+ pPtr[i] = pParentPtr[i]; // parent types first
}
return aTypes;
}
@@ -6908,7 +6908,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScTableSheetObj::getImplementationId() throw(un
return aId;
}
-// Hilfsfunktionen
+// Hilfsfunktionen
SCTAB ScTableSheetObj::GetTab_Impl() const
{
@@ -6918,7 +6918,7 @@ SCTAB ScTableSheetObj::GetTab_Impl() const
if (pFirst)
return pFirst->aStart.Tab();
- return 0; // soll nicht sein
+ return 0; // soll nicht sein
}
// former XSheet
@@ -6985,7 +6985,7 @@ uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursor()
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
{
- //! einzelne Zelle oder ganze Tabelle???????
+ //! einzelne Zelle oder ganze Tabelle???????
SCTAB nTab = GetTab_Impl();
return new ScCellCursorObj( pDocSh, ScRange( 0,0,nTab, MAXCOL,MAXROW,nTab ) );
}
@@ -7017,7 +7017,7 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTableSheetObj::getSpreadsheet()
throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- return this; //!???
+ return this; //!???
}
// XCellRange
@@ -7049,11 +7049,11 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPage
SCTAB nTab = GetTab_Impl();
Size aSize(pDoc->GetPageSize( nTab ));
- if (aSize.Width() && aSize.Height()) // effektive Groesse schon gesetzt?
+ if (aSize.Width() && aSize.Height()) // effektive Groesse schon gesetzt?
pDoc->UpdatePageBreaks( nTab );
else
{
- // Umbrueche updaten wie in ScDocShell::PageStyleModified:
+ // Umbrueche updaten wie in ScDocShell::PageStyleModified:
ScPrintFunc aPrintFunc( pDocSh, pDocSh->GetPrinter(), nTab );
aPrintFunc.UpdatePages();
}
@@ -7073,7 +7073,7 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPage
ScBreakType nBreak = pDoc->HasColBreak(nCol, nTab);
if (nBreak)
{
- aData.Position = nCol;
+ aData.Position = nCol;
aData.ManualBreak = (nBreak & BREAK_MANUAL);
pAry[nPos] = aData;
++nPos;
@@ -7095,11 +7095,11 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getRowPageBre
SCTAB nTab = GetTab_Impl();
Size aSize(pDoc->GetPageSize( nTab ));
- if (aSize.Width() && aSize.Height()) // effektive Groesse schon gesetzt?
+ if (aSize.Width() && aSize.Height()) // effektive Groesse schon gesetzt?
pDoc->UpdatePageBreaks( nTab );
else
{
- // Umbrueche updaten wie in ScDocShell::PageStyleModified:
+ // Umbrueche updaten wie in ScDocShell::PageStyleModified:
ScPrintFunc aPrintFunc( pDocSh, pDocSh->GetPrinter(), nTab );
aPrintFunc.UpdatePages();
}
@@ -7114,7 +7114,7 @@ void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() throw(uno::RuntimeExc
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
{
- //! docfunc Funktion, auch fuer ScViewFunc::RemoveManualBreaks
+ //! docfunc Funktion, auch fuer ScViewFunc::RemoveManualBreaks
ScDocument* pDoc = pDocSh->GetDocument();
BOOL bUndo (pDoc->IsUndoEnabled());
@@ -7181,8 +7181,8 @@ uno::Reference<drawing::XDrawPage> SAL_CALL ScTableSheetObj::getDrawPage()
if (pPage)
return uno::Reference<drawing::XDrawPage> (pPage->getUnoPage(), uno::UNO_QUERY);
- // Das DrawPage-Objekt meldet sich als Listener am SdrModel an
- // und sollte von dort alle Aktionen mitbekommen
+ // Das DrawPage-Objekt meldet sich als Listener am SdrModel an
+ // und sollte von dort alle Aktionen mitbekommen
}
return NULL;
}
@@ -7200,11 +7200,11 @@ void SAL_CALL ScTableSheetObj::insertCells( const table::CellRangeAddress& rRang
InsCellCmd eCmd = INS_NONE;
switch (nMode)
{
- case sheet::CellInsertMode_NONE: bDo = FALSE; break;
- case sheet::CellInsertMode_DOWN: eCmd = INS_CELLSDOWN; break;
- case sheet::CellInsertMode_RIGHT: eCmd = INS_CELLSRIGHT; break;
- case sheet::CellInsertMode_ROWS: eCmd = INS_INSROWS; break;
- case sheet::CellInsertMode_COLUMNS: eCmd = INS_INSCOLS; break;
+ case sheet::CellInsertMode_NONE: bDo = FALSE; break;
+ case sheet::CellInsertMode_DOWN: eCmd = INS_CELLSDOWN; break;
+ case sheet::CellInsertMode_RIGHT: eCmd = INS_CELLSRIGHT; break;
+ case sheet::CellInsertMode_ROWS: eCmd = INS_INSROWS; break;
+ case sheet::CellInsertMode_COLUMNS: eCmd = INS_INSCOLS; break;
default:
DBG_ERROR("insertCells: falscher Mode");
bDo = FALSE;
@@ -7232,11 +7232,11 @@ void SAL_CALL ScTableSheetObj::removeRange( const table::CellRangeAddress& rRang
DelCellCmd eCmd = DEL_NONE;
switch (nMode)
{
- case sheet::CellDeleteMode_NONE: bDo = FALSE; break;
- case sheet::CellDeleteMode_UP: eCmd = DEL_CELLSUP; break;
- case sheet::CellDeleteMode_LEFT: eCmd = DEL_CELLSLEFT; break;
- case sheet::CellDeleteMode_ROWS: eCmd = DEL_DELROWS; break;
- case sheet::CellDeleteMode_COLUMNS: eCmd = DEL_DELCOLS; break;
+ case sheet::CellDeleteMode_NONE: bDo = FALSE; break;
+ case sheet::CellDeleteMode_UP: eCmd = DEL_CELLSUP; break;
+ case sheet::CellDeleteMode_LEFT: eCmd = DEL_CELLSLEFT; break;
+ case sheet::CellDeleteMode_ROWS: eCmd = DEL_DELROWS; break;
+ case sheet::CellDeleteMode_COLUMNS: eCmd = DEL_DELCOLS; break;
default:
DBG_ERROR("deleteCells: falscher Mode");
bDo = FALSE;
@@ -7291,7 +7291,7 @@ void SAL_CALL ScTableSheetObj::copyRange( const table::CellAddress& aDestination
void ScTableSheetObj::PrintAreaUndo_Impl( ScPrintRangeSaver* pOldRanges )
{
- // Umbrueche und Undo
+ // Umbrueche und Undo
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
@@ -7375,7 +7375,7 @@ void SAL_CALL ScTableSheetObj::setPrintAreas(
}
}
- PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc.
+ PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc.
}
}
@@ -7406,18 +7406,18 @@ void SAL_CALL ScTableSheetObj::setPrintTitleColumns( sal_Bool bPrintTitleColumns
if ( bPrintTitleColumns )
{
- if ( !pDoc->GetRepeatColRange( nTab ) ) // keinen bestehenden Bereich veraendern
+ if ( !pDoc->GetRepeatColRange( nTab ) ) // keinen bestehenden Bereich veraendern
{
- ScRange aNew( 0, 0, nTab, 0, 0, nTab ); // Default
- pDoc->SetRepeatColRange( nTab, &aNew ); // einschalten
+ ScRange aNew( 0, 0, nTab, 0, 0, nTab ); // Default
+ pDoc->SetRepeatColRange( nTab, &aNew ); // einschalten
}
}
else
- pDoc->SetRepeatColRange( nTab, NULL ); // abschalten
+ pDoc->SetRepeatColRange( nTab, NULL ); // abschalten
- PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc.
+ PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc.
- //! zuletzt gesetzten Bereich beim Abschalten merken und beim Einschalten wiederherstellen ???
+ //! zuletzt gesetzten Bereich beim Abschalten merken und beim Einschalten wiederherstellen ???
}
}
@@ -7454,9 +7454,9 @@ void SAL_CALL ScTableSheetObj::setTitleColumns( const table::CellRangeAddress& a
ScRange aNew;
ScUnoConversion::FillScRange( aNew, aTitleColumns );
- pDoc->SetRepeatColRange( nTab, &aNew ); // immer auch einschalten
+ pDoc->SetRepeatColRange( nTab, &aNew ); // immer auch einschalten
- PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc.
+ PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc.
}
}
@@ -7487,18 +7487,18 @@ void SAL_CALL ScTableSheetObj::setPrintTitleRows( sal_Bool bPrintTitleRows )
if ( bPrintTitleRows )
{
- if ( !pDoc->GetRepeatRowRange( nTab ) ) // keinen bestehenden Bereich veraendern
+ if ( !pDoc->GetRepeatRowRange( nTab ) ) // keinen bestehenden Bereich veraendern
{
- ScRange aNew( 0, 0, nTab, 0, 0, nTab ); // Default
- pDoc->SetRepeatRowRange( nTab, &aNew ); // einschalten
+ ScRange aNew( 0, 0, nTab, 0, 0, nTab ); // Default
+ pDoc->SetRepeatRowRange( nTab, &aNew ); // einschalten
}
}
else
- pDoc->SetRepeatRowRange( nTab, NULL ); // abschalten
+ pDoc->SetRepeatRowRange( nTab, NULL ); // abschalten
- PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc.
+ PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc.
- //! zuletzt gesetzten Bereich beim Abschalten merken und beim Einschalten wiederherstellen ???
+ //! zuletzt gesetzten Bereich beim Abschalten merken und beim Einschalten wiederherstellen ???
}
}
@@ -7535,9 +7535,9 @@ void SAL_CALL ScTableSheetObj::setTitleRows( const table::CellRangeAddress& aTit
ScRange aNew;
ScUnoConversion::FillScRange( aNew, aTitleRows );
- pDoc->SetRepeatRowRange( nTab, &aNew ); // immer auch einschalten
+ pDoc->SetRepeatRowRange( nTab, &aNew ); // immer auch einschalten
- PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc.
+ PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc.
}
}
@@ -7564,7 +7564,7 @@ void SAL_CALL ScTableSheetObj::setLinkMode( sheet::SheetLinkMode nLinkMode )
{
ScUnoGuard aGuard;
- //! Filter und Options aus altem Link suchen
+ //! Filter und Options aus altem Link suchen
rtl::OUString aUrl(getLinkUrl());
rtl::OUString aSheet(getLinkSheetName());
@@ -7588,7 +7588,7 @@ void SAL_CALL ScTableSheetObj::setLinkUrl( const rtl::OUString& aLinkUrl )
{
ScUnoGuard aGuard;
- //! Filter und Options aus altem Link suchen
+ //! Filter und Options aus altem Link suchen
sheet::SheetLinkMode eMode = getLinkMode();
rtl::OUString aSheet(getLinkSheetName());
@@ -7612,7 +7612,7 @@ void SAL_CALL ScTableSheetObj::setLinkSheetName( const rtl::OUString& aLinkSheet
{
ScUnoGuard aGuard;
- //! Filter und Options aus altem Link suchen
+ //! Filter und Options aus altem Link suchen
sheet::SheetLinkMode eMode = getLinkMode();
rtl::OUString aUrl(getLinkUrl());
@@ -7632,17 +7632,17 @@ void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUStr
ScDocument* pDoc = pDocSh->GetDocument();
SCTAB nTab = GetTab_Impl();
- String aFileString (aUrl);
+ String aFileString (aUrl);
String aFilterString (aFilterName);
- String aOptString (aFilterOptions);
- String aSheetString (aSheetName);
+ String aOptString (aFilterOptions);
+ String aSheetString (aSheetName);
aFileString = ScGlobal::GetAbsDocName( aFileString, pDocSh );
if ( !aFilterString.Len() )
ScDocumentLoader::GetFilterName( aFileString, aFilterString, aOptString, TRUE, FALSE );
- // remove application prefix from filter name here, so the filter options
- // aren't reset when the filter name is changed in ScTableLink::DataChanged
+ // remove application prefix from filter name here, so the filter options
+ // aren't reset when the filter name is changed in ScTableLink::DataChanged
ScDocumentLoader::RemoveAppPrefix( aFilterString );
BYTE nLinkMode = SC_LINK_NONE;
@@ -7654,17 +7654,17 @@ void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUStr
ULONG nRefresh = 0;
pDoc->SetLink( nTab, nLinkMode, aFileString, aFilterString, aOptString, aSheetString, nRefresh );
- pDocSh->UpdateLinks(); // ggf. Link eintragen oder loeschen
+ pDocSh->UpdateLinks(); // ggf. Link eintragen oder loeschen
SfxBindings* pBindings = pDocSh->GetViewBindings();
if (pBindings)
pBindings->Invalidate(SID_LINKS);
- //! Undo fuer Link-Daten an der Table
+ //! Undo fuer Link-Daten an der Table
- if ( nLinkMode != SC_LINK_NONE && pDoc->IsExecuteLinkEnabled() ) // Link updaten
+ if ( nLinkMode != SC_LINK_NONE && pDoc->IsExecuteLinkEnabled() ) // Link updaten
{
- // Update immer, auch wenn der Link schon da war
- //! Update nur fuer die betroffene Tabelle???
+ // Update immer, auch wenn der Link schon da war
+ //! Update nur fuer die betroffene Tabelle???
sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
USHORT nCount = pLinkManager->GetLinks().Count();
@@ -7675,14 +7675,14 @@ void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUStr
{
ScTableLink* pTabLink = (ScTableLink*)pBase;
if ( pTabLink->GetFileName() == aFileString )
- pTabLink->Update(); // inkl. Paint&Undo
+ pTabLink->Update(); // inkl. Paint&Undo
- //! Der Dateiname sollte nur einmal vorkommen (?)
+ //! Der Dateiname sollte nur einmal vorkommen (?)
}
}
}
- //! Notify fuer ScSheetLinkObj Objekte!!!
+ //! Notify fuer ScSheetLinkObj Objekte!!!
}
}
@@ -7931,7 +7931,7 @@ sal_Bool SAL_CALL ScTableSheetObj::isProtected() throw(uno::RuntimeException)
if ( pDocSh )
return pDocSh->GetDocument()->IsTabProtected( GetTab_Impl() );
- DBG_ERROR("keine DocShell"); //! Exception oder so?
+ DBG_ERROR("keine DocShell"); //! Exception oder so?
return FALSE;
}
@@ -8014,7 +8014,7 @@ void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAd
}
}
- // Szenario-Ranges sind durch Attribut gekennzeichnet
+ // Szenario-Ranges sind durch Attribut gekennzeichnet
ScPatternAttr aPattern( pDoc->GetPool() );
aPattern.GetItemSet().Put( ScMergeFlagAttr( SC_MF_SCENARIO ) );
aPattern.GetItemSet().Put( ScProtectionAttr( TRUE ) );
@@ -8023,7 +8023,7 @@ void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAd
}
// don't use. We should use therefor a private interface, so we can also set the flags.
-/* else if (nTab > 0 && pDoc->IsImportingXML()) // make this sheet as an scenario and only if it is not the first sheet and only if it is ImportingXML,
+/* else if (nTab > 0 && pDoc->IsImportingXML()) // make this sheet as an scenario and only if it is not the first sheet and only if it is ImportingXML,
// because than no UNDO and repaint is necessary.
{
USHORT nRangeCount = (USHORT)rScenRanges.getLength();
@@ -8032,7 +8032,7 @@ void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAd
pDoc->SetScenario( nTab, TRUE );
// default flags
- Color aColor( COL_LIGHTGRAY ); // Default
+ Color aColor( COL_LIGHTGRAY ); // Default
USHORT nFlags = SC_SCENARIO_SHOWFRAME | SC_SCENARIO_PRINTFRAME | SC_SCENARIO_TWOWAY;
String aComment;
@@ -8076,7 +8076,7 @@ void SAL_CALL ScTableSheetObj::apply() throw(uno::RuntimeException)
ScDocument* pDoc = pDocSh->GetDocument();
SCTAB nTab = GetTab_Impl();
String aName;
- pDoc->GetName( nTab, aName ); // Name dieses Szenarios
+ pDoc->GetName( nTab, aName ); // Name dieses Szenarios
SCTAB nDestTab = nTab;
while ( nDestTab > 0 && pDoc->IsScenario(nDestTab) )
@@ -8085,7 +8085,7 @@ void SAL_CALL ScTableSheetObj::apply() throw(uno::RuntimeException)
if ( !pDoc->IsScenario(nDestTab) )
pDocSh->UseScenario( nDestTab, aName );
- //! sonst Fehler oder so
+ //! sonst Fehler oder so
}
}
@@ -8765,7 +8765,7 @@ uno::Sequence<uno::Type> SAL_CALL ScTableColumnObj::getTypes() throw(uno::Runtim
pPtr[nParentLen + 0] = getCppuType((const uno::Reference<container::XNamed>*)0);
for (long i=0; i<nParentLen; i++)
- pPtr[i] = pParentPtr[i]; // parent types first
+ pPtr[i] = pParentPtr[i]; // parent types first
}
return aTypes;
}
@@ -8791,14 +8791,14 @@ rtl::OUString SAL_CALL ScTableColumnObj::getName() throw(uno::RuntimeException)
DBG_ASSERT(rRange.aStart.Col() == rRange.aEnd.Col(), "too many columns");
SCCOL nCol = rRange.aStart.Col();
- return ScColToAlpha( nCol ); // from global.hxx
+ return ScColToAlpha( nCol ); // from global.hxx
}
void SAL_CALL ScTableColumnObj::setName( const rtl::OUString& /* aNewName */ )
throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- throw uno::RuntimeException(); // read-only
+ throw uno::RuntimeException(); // read-only
}
// XPropertySet erweitert fuer Spalten-Properties
@@ -8819,16 +8819,16 @@ void ScTableColumnObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
{
if ( IsScItemWid( pEntry->nWID ) )
{
- // for Item WIDs, call ScCellRangesBase directly
+ // for Item WIDs, call ScCellRangesBase directly
ScCellRangesBase::SetOnePropertyValue(pEntry, aValue);
return;
}
- // own properties
+ // own properties
ScDocShell* pDocSh = GetDocShell();
if (!pDocSh)
- return; //! Exception oder so?
+ return; //! Exception oder so?
const ScRange& rRange = GetRange();
DBG_ASSERT(rRange.aStart.Col() == rRange.aEnd.Col(), "zuviele Spalten");
SCCOL nCol = rRange.aStart.Col();
@@ -8843,7 +8843,7 @@ void ScTableColumnObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
sal_Int32 nNewWidth = 0;
if ( aValue >>= nNewWidth )
{
- // property is 1/100mm, column width is twips
+ // property is 1/100mm, column width is twips
nNewWidth = HMMToTwips(nNewWidth);
aFunc.SetWidthOrHeight( TRUE, 1, nColArr, nTab, SC_SIZE_ORIGINAL,
(USHORT)nNewWidth, TRUE, TRUE );
@@ -8854,7 +8854,7 @@ void ScTableColumnObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
BOOL bVis = ScUnoHelpFunctions::GetBoolFromAny( aValue );
ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT;
aFunc.SetWidthOrHeight( TRUE, 1, nColArr, nTab, eMode, 0, TRUE, TRUE );
- // SC_SIZE_DIRECT mit Groesse 0 blendet aus
+ // SC_SIZE_DIRECT mit Groesse 0 blendet aus
}
else if ( pEntry->nWID == SC_WID_UNO_OWIDTH )
{
@@ -8897,7 +8897,7 @@ void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
{
// for hidden column, return original height
USHORT nWidth = pDoc->GetOriginalWidth( nCol, nTab );
- // property is 1/100mm, column width is twips
+ // property is 1/100mm, column width is twips
nWidth = (USHORT) TwipsToHMM(nWidth);
rAny <<= (sal_Int32)( nWidth );
}
@@ -8909,7 +8909,7 @@ void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
}
else if ( pEntry->nWID == SC_WID_UNO_OWIDTH )
{
- //! momentan immer gesetzt ??!?!
+ //! momentan immer gesetzt ??!?!
BOOL bOpt = !(pDoc->GetColFlags( nCol, nTab ) & CR_MANUALSIZE);
ScUnoHelpFunctions::SetBoolInAny( rAny, bOpt );
}
@@ -8963,16 +8963,16 @@ void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr
{
if ( IsScItemWid( pEntry->nWID ) )
{
- // for Item WIDs, call ScCellRangesBase directly
+ // for Item WIDs, call ScCellRangesBase directly
ScCellRangesBase::SetOnePropertyValue(pEntry, aValue);
return;
}
- // own properties
+ // own properties
ScDocShell* pDocSh = GetDocShell();
if (!pDocSh)
- return; //! Exception oder so?
+ return; //! Exception oder so?
ScDocument* pDoc = pDocSh->GetDocument();
const ScRange& rRange = GetRange();
DBG_ASSERT(rRange.aStart.Row() == rRange.aEnd.Row(), "zuviele Zeilen");
@@ -8988,7 +8988,7 @@ void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr
sal_Int32 nNewHeight = 0;
if ( aValue >>= nNewHeight )
{
- // property is 1/100mm, row height is twips
+ // property is 1/100mm, row height is twips
nNewHeight = HMMToTwips(nNewHeight);
aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, SC_SIZE_ORIGINAL,
(USHORT)nNewHeight, TRUE, TRUE );
@@ -8999,14 +8999,14 @@ void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr
BOOL bVis = ScUnoHelpFunctions::GetBoolFromAny( aValue );
ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT;
aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, eMode, 0, TRUE, TRUE );
- // SC_SIZE_DIRECT mit Groesse 0 blendet aus
+ // SC_SIZE_DIRECT mit Groesse 0 blendet aus
}
else if ( pEntry->nWID == SC_WID_UNO_CELLFILT )
{
BOOL bFil = ScUnoHelpFunctions::GetBoolFromAny( aValue );
-// ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT;
-// aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, eMode, 0, TRUE, TRUE );
- // SC_SIZE_DIRECT mit Groesse 0 blendet aus
+// ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT;
+// aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, eMode, 0, TRUE, TRUE );
+ // SC_SIZE_DIRECT mit Groesse 0 blendet aus
pDoc->SetRowFiltered(nRow, nRow, nTab, bFil);
}
else if ( pEntry->nWID == SC_WID_UNO_OHEIGHT )
@@ -9016,7 +9016,7 @@ void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr
aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, SC_SIZE_OPTIMAL, 0, TRUE, TRUE );
else
{
- // set current height again manually
+ // set current height again manually
USHORT nHeight = pDoc->GetOriginalHeight( nRow, nTab );
aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, SC_SIZE_ORIGINAL, nHeight, TRUE, TRUE );
}
@@ -9053,7 +9053,7 @@ void ScTableRowObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr
{
// for hidden row, return original height
USHORT nHeight = pDoc->GetOriginalHeight( nRow, nTab );
- // property is 1/100mm, row height is twips
+ // property is 1/100mm, row height is twips
nHeight = (USHORT) TwipsToHMM(nHeight);
rAny <<= (sal_Int32)( nHeight );
}
@@ -9119,7 +9119,7 @@ void ScCellsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
else if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -9146,7 +9146,7 @@ sal_Bool SAL_CALL ScCellsObj::hasElements() throw(uno::RuntimeException)
BOOL bHas = FALSE;
if ( pDocShell )
{
- //! schneller selber testen?
+ //! schneller selber testen?
uno::Reference<container::XEnumeration> xEnum(new ScCellsEnumeration( pDocShell, aRanges ));
bHas = xEnum->hasMoreElements();
@@ -9174,7 +9174,7 @@ ScCellsEnumeration::ScCellsEnumeration(ScDocShell* pDocSh, const ScRangeList& rR
if (pFirst)
nTab = pFirst->aStart.Tab();
aPos = ScAddress(0,0,nTab);
- CheckPos_Impl(); // aPos auf erste passende Zelle setzen
+ CheckPos_Impl(); // aPos auf erste passende Zelle setzen
}
}
@@ -9191,7 +9191,7 @@ void ScCellsEnumeration::CheckPos_Impl()
{
pMark = new ScMarkData;
pMark->MarkFromRangeList( aRanges, FALSE );
- pMark->MarkToMulti(); // needed for GetNextMarkedCell
+ pMark->MarkToMulti(); // needed for GetNextMarkedCell
}
bFound = pMark->IsCellMarked( aPos.Col(), aPos.Row() );
}
@@ -9214,7 +9214,7 @@ void ScCellsEnumeration::Advance_Impl()
{
pMark = new ScMarkData;
pMark->MarkFromRangeList( aRanges, FALSE );
- pMark->MarkToMulti(); // needed for GetNextMarkedCell
+ pMark->MarkToMulti(); // needed for GetNextMarkedCell
}
SCCOL nCol = aPos.Col();
@@ -9224,7 +9224,7 @@ void ScCellsEnumeration::Advance_Impl()
if (bFound)
aPos.Set( nCol, nRow, nTab );
else
- bAtEnd = TRUE; // kommt nix mehr
+ bAtEnd = TRUE; // kommt nix mehr
}
void ScCellsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint )
@@ -9237,10 +9237,10 @@ void ScCellsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint )
aRanges.UpdateReference( rRef.GetMode(), pDocShell->GetDocument(), rRef.GetRange(),
rRef.GetDx(), rRef.GetDy(), rRef.GetDz() );
- delete pMark; // aus verschobenen Bereichen neu erzeugen
+ delete pMark; // aus verschobenen Bereichen neu erzeugen
pMark = NULL;
- if (!bAtEnd) // aPos anpassen
+ if (!bAtEnd) // aPos anpassen
{
ScRangeList aNew;
aNew.Append(ScRange(aPos));
@@ -9257,7 +9257,7 @@ void ScCellsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint )
else if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -9282,7 +9282,7 @@ uno::Any SAL_CALL ScCellsEnumeration::nextElement() throw(container::NoSuchEleme
return uno::makeAny(uno::Reference<table::XCell>(new ScCellObj( pDocShell, aTempPos )));
}
- throw container::NoSuchElementException(); // no more elements
+ throw container::NoSuchElementException(); // no more elements
// return uno::Any();
}
@@ -9308,18 +9308,18 @@ void ScCellFormatsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
if ( rHint.ISA( ScUpdateRefHint ) )
{
- //! aTotalRange...
+ //! aTotalRange...
}
else if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
ScCellRangeObj* ScCellFormatsObj::GetObjectByIndex_Impl(long nIndex) const
{
- //! direkt auf die AttrArrays zugreifen !!!!
+ //! direkt auf die AttrArrays zugreifen !!!!
ScCellRangeObj* pRet = NULL;
if (pDocShell)
@@ -9355,7 +9355,7 @@ sal_Int32 SAL_CALL ScCellFormatsObj::getCount() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- //! direkt auf die AttrArrays zugreifen !!!!
+ //! direkt auf die AttrArrays zugreifen !!!!
long nCount = 0;
if (pDocShell)
@@ -9395,7 +9395,7 @@ uno::Type SAL_CALL ScCellFormatsObj::getElementType() throw(uno::RuntimeExceptio
sal_Bool SAL_CALL ScCellFormatsObj::hasElements() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- return ( getCount() != 0 ); //! immer groesser 0 ??
+ return ( getCount() != 0 ); //! immer groesser 0 ??
}
// XEnumerationAccess
@@ -9445,7 +9445,7 @@ void ScCellFormatsEnumeration::Advance_Impl()
{
if ( bDirty )
{
- pIter->DataChanged(); // AttrArray-Index neu suchen
+ pIter->DataChanged(); // AttrArray-Index neu suchen
bDirty = FALSE;
}
@@ -9454,10 +9454,10 @@ void ScCellFormatsEnumeration::Advance_Impl()
if ( pIter->GetNext( nCol1, nCol2, nRow1, nRow2 ) )
aNext = ScRange( nCol1, nRow1, nTab, nCol2, nRow2, nTab );
else
- bAtEnd = TRUE; // kommt nix mehr
+ bAtEnd = TRUE; // kommt nix mehr
}
else
- bAtEnd = TRUE; // Dok weggekommen oder so
+ bAtEnd = TRUE; // Dok weggekommen oder so
}
ScCellRangeObj* ScCellFormatsEnumeration::NextObject_Impl()
@@ -9478,20 +9478,20 @@ void ScCellFormatsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
if ( rHint.ISA( ScUpdateRefHint ) )
{
- //! und nun ???
+ //! und nun ???
}
else if ( rHint.ISA( SfxSimpleHint ) )
{
ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
if ( nId == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
delete pIter;
pIter = NULL;
}
else if ( nId == SFX_HINT_DATACHANGED )
{
- bDirty = TRUE; // AttrArray-Index evtl. ungueltig geworden
+ bDirty = TRUE; // AttrArray-Index evtl. ungueltig geworden
}
}
}
@@ -9510,7 +9510,7 @@ uno::Any SAL_CALL ScCellFormatsEnumeration::nextElement() throw(container::NoSuc
ScUnoGuard aGuard;
if ( bAtEnd || !pDocShell )
- throw container::NoSuchElementException(); // no more elements
+ throw container::NoSuchElementException(); // no more elements
// Interface-Typ muss zu ScCellFormatsObj::getElementType passen
@@ -9541,13 +9541,13 @@ void ScUniqueCellFormatsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
if ( rHint.ISA( ScUpdateRefHint ) )
{
- //! aTotalRange...
+ //! aTotalRange...
}
else if ( rHint.ISA( SfxSimpleHint ) )
{
ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
if ( nId == SFX_HINT_DYING )
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -9808,13 +9808,13 @@ void ScUniqueCellFormatsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHi
{
if ( rHint.ISA( ScUpdateRefHint ) )
{
- //! und nun ???
+ //! und nun ???
}
else if ( rHint.ISA( SfxSimpleHint ) )
{
ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
if ( nId == SFX_HINT_DYING )
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -9832,7 +9832,7 @@ uno::Any SAL_CALL ScUniqueCellFormatsEnumeration::nextElement() throw(container:
ScUnoGuard aGuard;
if ( !hasMoreElements() || !pDocShell )
- throw container::NoSuchElementException(); // no more elements
+ throw container::NoSuchElementException(); // no more elements
// Interface-Typ muss zu ScCellFormatsObj::getElementType passen
diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx
index 3b806ccf80b7..7937f87a7a29 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.cxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ namespace calc
return aTypes;
}
-
+
//--------------------------------------------------------------------
sal_Bool SAL_CALL OCellValueBinding::supportsType( const Type& aType ) throw (RuntimeException)
{
@@ -226,7 +226,7 @@ namespace calc
return sal_False;
}
-
+
//--------------------------------------------------------------------
Any SAL_CALL OCellValueBinding::getValue( const Type& aType ) throw (IncompatibleTypesException, RuntimeException)
{
@@ -313,7 +313,7 @@ namespace calc
}
return aReturn;
}
-
+
//--------------------------------------------------------------------
void SAL_CALL OCellValueBinding::setValue( const Any& aValue ) throw (IncompatibleTypesException, NoSupportException, RuntimeException)
{
@@ -484,7 +484,7 @@ namespace calc
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sheet.OCellValueBinding" ) );
}
-
+
//--------------------------------------------------------------------
sal_Bool SAL_CALL OCellValueBinding::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
{
@@ -499,7 +499,7 @@ namespace calc
return sal_False;
}
-
+
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL OCellValueBinding::getSupportedServiceNames( ) throw (RuntimeException)
{
@@ -519,7 +519,7 @@ namespace calc
if ( _rxListener.is() )
m_aModifyListeners.addInterface( _rxListener );
}
-
+
//--------------------------------------------------------------------
void SAL_CALL OCellValueBinding::removeModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException)
{
diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx
index c9537d546f7b..a7247304bb3a 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.hxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 8a8081e412d3..cd7984d02bbf 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ const SfxItemPropertyMapEntry* lcl_GetDataProviderPropertyMap()
{
static SfxItemPropertyMapEntry aDataProviderPropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0, &getBooleanCppuType(), 0, 0 },
{0,0,0,0,0,0}
};
return aDataProviderPropertyMap_Impl;
@@ -101,9 +101,9 @@ const SfxItemPropertyMapEntry* lcl_GetDataSequencePropertyMap()
{
static SfxItemPropertyMapEntry aDataSequencePropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_HIDDENVALUES), 0, &getCppuType((uno::Sequence<sal_Int32>*)0 ), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_ROLE), 0, &getCppuType((::com::sun::star::chart2::data::DataSequenceRole*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_HIDDENVALUES), 0, &getCppuType((uno::Sequence<sal_Int32>*)0 ), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ROLE), 0, &getCppuType((::com::sun::star::chart2::data::DataSequenceRole*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0, &getBooleanCppuType(), 0, 0 },
{0,0,0,0,0,0}
};
return aDataSequencePropertyMap_Impl;
@@ -187,7 +187,7 @@ struct TokenTable
{
for_each(maTokens.begin(), maTokens.end(), DeleteInstance());
}
-
+
void push_back( FormulaToken* pToken )
{
maTokens.push_back( pToken );
@@ -833,7 +833,7 @@ void Chart2Positioner::createPositionMap()
// ============================================================================
-/**
+/**
* Function object to create a range string from a token list.
*/
class Tokens2RangeString : public unary_function<ScSharedTokenRef, void>
@@ -850,7 +850,7 @@ public:
Tokens2RangeString(const Tokens2RangeString& r) :
mpRangeStr(r.mpRangeStr),
- mpDoc(r.mpDoc),
+ mpDoc(r.mpDoc),
meGrammar(r.meGrammar),
mcRangeSep(r.mcRangeSep),
mbFirst(r.mbFirst)
@@ -886,12 +886,12 @@ private:
bool mbFirst;
};
-/**
+/**
* Function object to convert a list of tokens into a string form suitable
* for ODF export. In ODF, a range is expressed as
- *
+ *
* (start cell address):(end cell address)
- *
+ *
* and each address doesn't include any '$' symbols.
*/
class Tokens2RangeStringXML : public unary_function<ScSharedTokenRef, void>
@@ -1075,13 +1075,13 @@ ScChart2LabeledDataSequence* lcl_createScChart2DataSequenceFromTokens( auto_ptr<
}
//----------------------------------------------------
-/**
- * Check the current list of reference tokens, and add the upper left
- * corner of the minimum range that encloses all ranges if certain
- * conditions are met.
+/**
+ * Check the current list of reference tokens, and add the upper left
+ * corner of the minimum range that encloses all ranges if certain
+ * conditions are met.
*
* @param rRefTokens list of reference tokens
- *
+ *
* @return true if the corner was added, false otherwise.
*/
bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens,
@@ -1199,7 +1199,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens,
break;
case svExternalSingleRef:
{
- if (!bExternal)
+ if (!bExternal)
return false;
if (nFileId != pToken->GetIndex() || aExtTabName != pToken->GetString())
@@ -1215,7 +1215,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens,
break;
case svExternalDoubleRef:
{
- if (!bExternal)
+ if (!bExternal)
return false;
if (nFileId != pToken->GetIndex() || aExtTabName != pToken->GetString())
@@ -1239,7 +1239,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens,
}
}
- if (nMinRow >= nMaxRow || nMinCol >= nMaxCol ||
+ if (nMinRow >= nMaxRow || nMinCol >= nMaxCol ||
nMinRow >= MAXROWCOUNT || nMinCol >= MAXCOLCOUNT ||
nMaxRow >= MAXROWCOUNT || nMaxCol >= MAXCOLCOUNT)
{
@@ -1248,7 +1248,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens,
}
// Check if the following conditions are met:
- //
+ //
// 1) The upper-left corner cell is not included.
// 2) The three adjacent cells of that corner cell are included.
@@ -1340,7 +1340,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens,
vector<ScSharedTokenRef> aNewTokens;
aNewTokens.reserve(1);
if (bExternal)
- {
+ {
ScSharedTokenRef p(
new ScExternalDoubleRefToken(nFileId, aExtTabName, aData));
aNewTokens.push_back(p);
@@ -1400,7 +1400,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens,
ScRefTokenHelper::join(rRefTokens, pCorner);
}
}
-
+
return true;
}
@@ -1555,7 +1555,7 @@ ScChart2DataProvider::createDataSource(
namespace
{
-/**
+/**
* Function object to create a list of table numbers from a token list.
*/
class InsertTabNumber : public unary_function<ScSharedTokenRef, void>
@@ -1633,7 +1633,7 @@ void RangeAnalyzer::initRangeAnalyzer( const vector<ScSharedTokenRef>& rTokens )
return;
}
mbEmpty=false;
-
+
vector<ScSharedTokenRef>::const_iterator itr = rTokens.begin(), itrEnd = rTokens.end();
for (; itr != itrEnd ; ++itr)
{
@@ -1700,7 +1700,7 @@ void RangeAnalyzer::analyzeRange( sal_Int32& rnDataInRows,
bool RangeAnalyzer::inSameSingleRow( RangeAnalyzer& rOther )
{
- if( mnStartRow==rOther.mnStartRow &&
+ if( mnStartRow==rOther.mnStartRow &&
mnRowCount==1 && rOther.mnRowCount==1 )
return true;
return false;
@@ -1708,13 +1708,13 @@ bool RangeAnalyzer::inSameSingleRow( RangeAnalyzer& rOther )
bool RangeAnalyzer::inSameSingleColumn( RangeAnalyzer& rOther )
{
- if( mnStartColumn==rOther.mnStartColumn &&
+ if( mnStartColumn==rOther.mnStartColumn &&
mnColumnCount==1 && rOther.mnColumnCount==1 )
return true;
return false;
}
-} //end anonymous namespace
+} //end anonymous namespace
uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArguments(
const uno::Reference< chart2::data::XDataSource >& xDataSource )
@@ -1729,7 +1729,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
bool bHasCategoriesLabels = false;
vector<ScSharedTokenRef> aAllCategoriesValuesTokens;
vector<ScSharedTokenRef> aAllSeriesLabelTokens;
-
+
chart::ChartDataRowSource eRowSource = chart::ChartDataRowSource_COLUMNS;
vector<ScSharedTokenRef> aAllTokens;
@@ -1744,7 +1744,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
sal_Int32 nDataInRows = 0;
sal_Int32 nDataInCols = 0;
bool bRowSourceAmbiguous = false;
-
+
Sequence< Reference< chart2::data::XLabeledDataSequence > > aSequences( xDataSource->getDataSequences());
const sal_Int32 nCount( aSequences.getLength());
RangeAnalyzer aPrevLabel,aPrevValues;
@@ -1831,7 +1831,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum
aPrevLabel=aLabel;
}
}
-
+
if (!bRowSourceAmbiguous)
{
bRowSourceDetected = true;
@@ -2011,7 +2011,7 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL
if(!m_pDocument || (aRangeRepresentation.getLength() == 0))
return xResult;
- // Note: the range representation must be in Calc A1 format. The import
+ // Note: the range representation must be in Calc A1 format. The import
// filters use this method to pass data ranges, and they have no idea what
// the current formula syntax is. In the future we should add another
// method to allow the client code to directly pass tokens representing
@@ -2083,7 +2083,7 @@ rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const rtl::OUS
{
// #i74062# When loading flat XML, this is called before the referenced sheets are in the document,
// so the conversion has to take place directly with the strings, without looking up the sheets.
-
+
rtl::OUStringBuffer sRet;
sal_Int32 nOffset = 0;
while( nOffset >= 0 )
@@ -2093,23 +2093,23 @@ rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const rtl::OUS
if( nOffset >= 0 )
{
// convert one address (remove dots)
-
+
String aUIString(sToken);
-
+
sal_Int32 nIndex = ScRangeStringConverter::IndexOf( sToken, ':', 0, cQuote );
if ( nIndex >= 0 && nIndex < aUIString.Len() - 1 &&
aUIString.GetChar((xub_StrLen)nIndex + 1) == (sal_Unicode) '.' )
aUIString.Erase( (xub_StrLen)nIndex + 1, 1 );
-
+
if ( aUIString.GetChar(0) == (sal_Unicode) '.' )
aUIString.Erase( 0, 1 );
-
+
if( sRet.getLength() )
sRet.append( (sal_Unicode) ';' );
sRet.append( aUIString );
}
}
-
+
return sRet.makeStringAndClear();
}
@@ -2453,7 +2453,7 @@ void ScChart2DataSequence::HiddenRangeListener::notify()
}
ScChart2DataSequence::ScChart2DataSequence( ScDocument* pDoc,
- const uno::Reference < chart2::data::XDataProvider >& xDP,
+ const uno::Reference < chart2::data::XDataProvider >& xDP,
vector<ScSharedTokenRef>* pTokens,
bool bIncludeHiddenCells )
: m_bIncludeHiddenCells( bIncludeHiddenCells)
@@ -2480,8 +2480,8 @@ ScChart2DataSequence::ScChart2DataSequence( ScDocument* pDoc,
// Reuse ScChartListener?
// BM: don't use names of named ranges but the UI range strings
-// String aStr;
-// rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument );
+// String aStr;
+// rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument );
// m_aIdentifier = ::rtl::OUString( aStr );
// m_aIdentifier = ::rtl::OUString::createFromAscii( "ID_");
@@ -2555,7 +2555,7 @@ void ScChart2DataSequence::BuildDataCache()
::std::list<sal_Int32> aHiddenValues;
sal_Int32 nDataCount = 0;
sal_Int32 nHiddenValueCount = 0;
-
+
for (vector<ScSharedTokenRef>::const_iterator itr = m_pTokens->begin(), itrEnd = m_pTokens->end();
itr != itrEnd; ++itr)
{
@@ -2593,21 +2593,21 @@ void ScChart2DataSequence::BuildDataCache()
m_aDataArray.push_back(Item());
Item& rItem = m_aDataArray.back();
++nDataCount;
-
+
ScAddress aAdr(nCol, nRow, nTab);
ScBaseCell* pCell = m_pDocument->GetCell(aAdr);
if (!pCell)
continue;
-
+
if (pCell->HasStringData())
rItem.maString = pCell->GetStringData();
else
- {
+ {
String aStr;
m_pDocument->GetString(nCol, nRow, nTab, aStr);
rItem.maString = aStr;
}
-
+
switch (pCell->GetCellType())
{
case CELLTYPE_VALUE:
@@ -2620,7 +2620,7 @@ void ScChart2DataSequence::BuildDataCache()
USHORT nErr = pFCell->GetErrCode();
if (nErr)
break;
-
+
if (pFCell->HasValueData())
{
rItem.mfValue = pFCell->GetValue();
@@ -2690,14 +2690,14 @@ sal_Int32 ScChart2DataSequence::FillCacheFromExternalRef(const ScSharedTokenRef&
sal_Int32 nDataCount = 0;
for (FormulaToken* p = pArray->First(); p; p = pArray->Next())
{
- // Cached external range is always represented as a single
+ // Cached external range is always represented as a single
// matrix token, although that might change in the future when
// we introduce a new token type to store multi-table range
// data.
if (p->GetType() != svMatrix)
{
- DBG_ERROR("Cached array is not a matrix token.");
+ DBG_ERROR("Cached array is not a matrix token.");
continue;
}
@@ -2844,7 +2844,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
// delayed broadcast as in ScCellRangesBase
if ( m_bGotDataChangedHint && m_pDocument )
- {
+ {
m_aDataArray.clear();
lang::EventObject aEvent;
aEvent.Source.set((cppu::OWeakObject*)this);
@@ -2887,7 +2887,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
}
}
- DBG_ASSERT(m_pRangeIndices->size() == static_cast<size_t>(aRanges.Count()),
+ DBG_ASSERT(m_pRangeIndices->size() == static_cast<size_t>(aRanges.Count()),
"range list and range index list have different sizes.");
auto_ptr<ScRangeList> pUndoRanges;
@@ -2900,7 +2900,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
if (bChanged)
{
- DBG_ASSERT(m_pRangeIndices->size() == static_cast<size_t>(aRanges.Count()),
+ DBG_ASSERT(m_pRangeIndices->size() == static_cast<size_t>(aRanges.Count()),
"range list and range index list have different sizes after the reference update.");
// Bring the change back from the range list to the token list.
@@ -2936,7 +2936,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
DBG_ERROR("range count and range index count differ.");
break;
}
-
+
UpdateTokensFromRanges(rRanges);
}
while (false);
@@ -3098,7 +3098,7 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2DataSequence::getTextualData( )
namespace {
-/**
+/**
* This function object is used to accumulatively count the numbers of
* columns and rows in all reference tokens.
*/
@@ -3128,7 +3128,7 @@ private:
SCROW mnRows;
};
-/**
+/**
* This function object is used to generate label strings from a list of
* reference tokens.
*/
@@ -3136,14 +3136,14 @@ class GenerateLabelStrings : public unary_function<ScSharedTokenRef, void>
{
public:
GenerateLabelStrings(sal_Int32 nSize, chart2::data::LabelOrigin eOrigin, bool bColumn) :
- mpLabels(new Sequence<OUString>(nSize)),
- meOrigin(eOrigin),
- mnCount(0),
+ mpLabels(new Sequence<OUString>(nSize)),
+ meOrigin(eOrigin),
+ mnCount(0),
mbColumn(bColumn) {}
GenerateLabelStrings(const GenerateLabelStrings& r) :
- mpLabels(r.mpLabels),
- meOrigin(r.meOrigin),
+ mpLabels(r.mpLabels),
+ meOrigin(r.meOrigin),
mnCount(r.mnCount),
mbColumn(r.mbColumn) {}
@@ -3394,7 +3394,7 @@ void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference< uti
}
}
- acquire(); // don't lose this object (one ref for all listeners)
+ acquire(); // don't lose this object (one ref for all listeners)
}
}
@@ -3407,7 +3407,7 @@ void SAL_CALL ScChart2DataSequence::removeModifyListener( const uno::Reference<
if (!m_pTokens.get() || m_pTokens->empty())
return;
- acquire(); // in case the listeners have the last ref - released below
+ acquire(); // in case the listeners have the last ref - released below
USHORT nCount = m_aValueListeners.Count();
for ( USHORT n=nCount; n--; )
@@ -3429,14 +3429,14 @@ void SAL_CALL ScChart2DataSequence::removeModifyListener( const uno::Reference<
pCLC->EndListeningHiddenRange(m_pHiddenListener.get());
}
- release(); // release the ref for the listeners
+ release(); // release the ref for the listeners
}
break;
}
}
- release(); // might delete this object
+ release(); // might delete this object
}
// DataSequence XPropertySet -------------------------------------------------
@@ -3489,7 +3489,7 @@ uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue(
aRet <<= m_bIncludeHiddenCells;
else if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(SC_UNONAME_HIDDENVALUES)))
{
- // This property is read-only thus cannot be set externally via
+ // This property is read-only thus cannot be set externally via
// setPropertyValue(...).
BuildDataCache();
aRet <<= m_aHiddenValues;
@@ -3556,42 +3556,42 @@ void ScChart2DataSequence::setDataChangedHint(bool b)
// XUnoTunnel
// sal_Int64 SAL_CALL ScChart2DataSequence::getSomething(
-// const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException)
+// const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException)
// {
-// if ( rId.getLength() == 16 &&
+// if ( rId.getLength() == 16 &&
// 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
-// rId.getConstArray(), 16 ) )
-// {
-// return (sal_Int64)this;
-// }
-// return 0;
+// rId.getConstArray(), 16 ) )
+// {
+// return (sal_Int64)this;
+// }
+// return 0;
// }
// // static
// const uno::Sequence<sal_Int8>& ScChart2DataSequence::getUnoTunnelId()
// {
-// static uno::Sequence<sal_Int8> * pSeq = 0;
-// if( !pSeq )
-// {
-// osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
-// if( !pSeq )
-// {
-// static uno::Sequence< sal_Int8 > aSeq( 16 );
-// rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
-// pSeq = &aSeq;
-// }
-// }
-// return *pSeq;
+// static uno::Sequence<sal_Int8> * pSeq = 0;
+// if( !pSeq )
+// {
+// osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
+// if( !pSeq )
+// {
+// static uno::Sequence< sal_Int8 > aSeq( 16 );
+// rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
+// pSeq = &aSeq;
+// }
+// }
+// return *pSeq;
// }
// // static
// ScChart2DataSequence* ScChart2DataSequence::getImplementation( const uno::Reference<uno::XInterface> xObj )
// {
-// ScChart2DataSequence* pRet = NULL;
-// uno::Reference<lang::XUnoTunnel> xUT( xObj, uno::UNO_QUERY );
-// if (xUT.is())
-// pRet = (ScChart2DataSequence*) xUT->getSomething( getUnoTunnelId() );
-// return pRet;
+// ScChart2DataSequence* pRet = NULL;
+// uno::Reference<lang::XUnoTunnel> xUT( xObj, uno::UNO_QUERY );
+// if (xUT.is())
+// pRet = (ScChart2DataSequence*) xUT->getSomething( getUnoTunnelId() );
+// return pRet;
// }
#if USE_CHART2_EMPTYDATASEQUENCE
@@ -3614,8 +3614,8 @@ ScChart2EmptyDataSequence::ScChart2EmptyDataSequence( ScDocument* pDoc,
// Reuse ScChartListener?
// BM: don't use names of named ranges but the UI range strings
-// String aStr;
-// rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument );
+// String aStr;
+// rRangeList->Format( aStr, SCR_ABS_3D, m_pDocument );
// m_aIdentifier = ::rtl::OUString( aStr );
// m_aIdentifier = ::rtl::OUString::createFromAscii( "ID_");
@@ -3707,7 +3707,7 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2EmptyDataSequence::getTextualDat
throw ( uno::RuntimeException)
{
ScUnoGuard aGuard;
- String aStr;
+ String aStr;
DBG_ASSERT( m_pDocument, "No Document -> no SourceRangeRepresentation" );
if( m_pDocument )
m_xRanges->Format( aStr, SCR_ABS_3D, m_pDocument, m_pDocument->GetAddressConvention() );
@@ -3874,41 +3874,41 @@ void SAL_CALL ScChart2EmptyDataSequence::removeVetoableChangeListener(
// XUnoTunnel
// sal_Int64 SAL_CALL ScChart2EmptyDataSequence::getSomething(
-// const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException)
+// const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException)
// {
-// if ( rId.getLength() == 16 &&
+// if ( rId.getLength() == 16 &&
// 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
-// rId.getConstArray(), 16 ) )
-// {
-// return (sal_Int64)this;
-// }
-// return 0;
+// rId.getConstArray(), 16 ) )
+// {
+// return (sal_Int64)this;
+// }
+// return 0;
// }
// // static
// const uno::Sequence<sal_Int8>& ScChart2EmptyDataSequence::getUnoTunnelId()
// {
-// static uno::Sequence<sal_Int8> * pSeq = 0;
-// if( !pSeq )
-// {
-// osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
-// if( !pSeq )
-// {
-// static uno::Sequence< sal_Int8 > aSeq( 16 );
-// rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
-// pSeq = &aSeq;
-// }
-// }
-// return *pSeq;
+// static uno::Sequence<sal_Int8> * pSeq = 0;
+// if( !pSeq )
+// {
+// osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
+// if( !pSeq )
+// {
+// static uno::Sequence< sal_Int8 > aSeq( 16 );
+// rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
+// pSeq = &aSeq;
+// }
+// }
+// return *pSeq;
// }
// // static
// ScChart2DataSequence* ScChart2EmptyDataSequence::getImplementation( const uno::Reference<uno::XInterface> xObj )
// {
-// ScChart2DataSequence* pRet = NULL;
-// uno::Reference<lang::XUnoTunnel> xUT( xObj, uno::UNO_QUERY );
-// if (xUT.is())
-// pRet = (ScChart2EmptyDataSequence*) xUT->getSomething( getUnoTunnelId() );
-// return pRet;
+// ScChart2DataSequence* pRet = NULL;
+// uno::Reference<lang::XUnoTunnel> xUT( xObj, uno::UNO_QUERY );
+// if (xUT.is())
+// pRet = (ScChart2EmptyDataSequence*) xUT->getSomething( getUnoTunnelId() );
+// return pRet;
// }
#endif
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 86f59d66a7a4..b64834b6bed0 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -120,12 +120,12 @@ ScChartsObj::~ScChartsObj()
void ScChartsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- //! Referenz-Update
+ //! Referenz-Update
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -154,7 +154,7 @@ ScChartObj* ScChartsObj::GetObjectByIndex_Impl(long nIndex) const
uno::Reference < embed::XEmbeddedObject > xObj = ((SdrOle2Obj*)pObject)->GetObjRef();
if ( xObj.is() )
aName = pDocShell->GetEmbeddedObjectContainer().GetEmbeddedObjectName( xObj );
- break; // nicht weitersuchen
+ break; // nicht weitersuchen
}
++nPos;
}
@@ -196,14 +196,14 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName,
if (!pPage || !pDoc)
return;
- // chart can't be inserted if any ole object with that name exists on any table
- // (empty string: generate valid name)
+ // chart can't be inserted if any ole object with that name exists on any table
+ // (empty string: generate valid name)
String aNameString(aName);
SCTAB nDummy;
if ( aNameString.Len() && pModel->GetNamedObject( aNameString, OBJ_OLE2, nDummy ) )
{
- // object exists - only RuntimeException is specified
+ // object exists - only RuntimeException is specified
throw uno::RuntimeException();
}
@@ -229,13 +229,13 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName,
{
String aObjName = aTmp; // wirklich eingefuegter Name...
- // Rechteck anpassen
- //! Fehler/Exception, wenn leer/ungueltig ???
+ // Rechteck anpassen
+ //! Fehler/Exception, wenn leer/ungueltig ???
Point aRectPos( aRect.X, aRect.Y );
if (aRectPos.X() < 0) aRectPos.X() = 0;
if (aRectPos.Y() < 0) aRectPos.Y() = 0;
Size aRectSize( aRect.Width, aRect.Height );
- if (aRectSize.Width() <= 0) aRectSize.Width() = 5000; // Default-Groesse
+ if (aRectSize.Width() <= 0) aRectSize.Width() = 5000; // Default-Groesse
if (aRectSize.Height() <= 0) aRectSize.Height() = 5000;
Rectangle aInsRect( aRectPos, aRectSize );
@@ -298,7 +298,7 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName,
xObj->setVisualAreaSize( nAspect, aSz );
pPage->InsertObject( pObj );
- pModel->AddUndo( new SdrUndoInsertObj( *pObj ) ); //! Undo-Kommentar?
+ pModel->AddUndo( new SdrUndoInsertObj( *pObj ) ); //! Undo-Kommentar?
// Dies veranlaesst Chart zum sofortigen Update
//SvData aEmpty;
@@ -315,13 +315,13 @@ void SAL_CALL ScChartsObj::removeByName( const rtl::OUString& aName )
if (pObj)
{
ScDocument* pDoc = pDocShell->GetDocument();
- ScDrawLayer* pModel = pDoc->GetDrawLayer(); // ist nicht 0
+ ScDrawLayer* pModel = pDoc->GetDrawLayer(); // ist nicht 0
SdrPage* pPage = pModel->GetPage(static_cast<sal_uInt16>(nTab)); // ist nicht 0
- pModel->AddUndo( new SdrUndoRemoveObj( *pObj ) ); //! Undo-Kommentar?
+ pModel->AddUndo( new SdrUndoRemoveObj( *pObj ) ); //! Undo-Kommentar?
pPage->RemoveObject( pObj->GetOrdNum() );
- //! Notify etc.???
+ //! Notify etc.???
}
}
@@ -479,12 +479,12 @@ ScChartObj::~ScChartObj()
void ScChartObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- //! Referenz-Update
+ //! Referenz-Update
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -734,11 +734,11 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScChartObj::getRanges() throw(un
{
ScRange aRange(*xRanges->GetObject(i));
- aRangeAddress.Sheet = aRange.aStart.Tab();
+ aRangeAddress.Sheet = aRange.aStart.Tab();
aRangeAddress.StartColumn = aRange.aStart.Col();
- aRangeAddress.StartRow = aRange.aStart.Row();
- aRangeAddress.EndColumn = aRange.aEnd.Col();
- aRangeAddress.EndRow = aRange.aEnd.Row();
+ aRangeAddress.StartRow = aRange.aStart.Row();
+ aRangeAddress.EndColumn = aRange.aEnd.Col();
+ aRangeAddress.EndRow = aRange.aEnd.Row();
pAry[i] = aRangeAddress;
}
@@ -801,7 +801,7 @@ rtl::OUString SAL_CALL ScChartObj::getName() throw(uno::RuntimeException)
void SAL_CALL ScChartObj::setName( const rtl::OUString& /* aName */ ) throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- throw uno::RuntimeException(); // name cannot be changed
+ throw uno::RuntimeException(); // name cannot be changed
}
// XPropertySet
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index a680185a1d1c..6b33d1e0165a 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
using namespace com::sun::star;
-#define SCCOMPSCPREADSHEETSETTINGS_SERVICE "com.sun.star.comp.SpreadsheetSettings"
-#define SCDOCUMENTSETTINGS_SERVICE "com.sun.star.document.Settings"
-#define SCSAVEVERSION "SaveVersionOnClose"
+#define SCCOMPSCPREADSHEETSETTINGS_SERVICE "com.sun.star.comp.SpreadsheetSettings"
+#define SCDOCUMENTSETTINGS_SERVICE "com.sun.star.document.Settings"
+#define SCSAVEVERSION "SaveVersionOnClose"
const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap()
@@ -111,12 +111,12 @@ ScDocumentConfiguration::~ScDocumentConfiguration()
void ScDocumentConfiguration::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // Referenz-Update interessiert hier nicht
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -238,7 +238,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
}
else if ( aPropertyName.compareToAscii( SC_UNO_FORBIDDEN ) == 0 )
{
- // read-only - should not be set
+ // read-only - should not be set
}
else if ( aPropertyName.compareToAscii( SC_UNO_CHARCOMP ) == 0 )
{
@@ -282,7 +282,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
{
uno::Sequence< beans::PropertyValue > aInfo;
if ( !( aValue >>= aInfo ) )
- throw lang::IllegalArgumentException(
+ throw lang::IllegalArgumentException(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Value of type Sequence<PropertyValue> expected!" ) ),
uno::Reference< uno::XInterface >(),
2 );
@@ -317,7 +317,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
if ( bUpdateHeights && !pDoc->IsImportingXML() )
{
- // update automatic row heights and repaint
+ // update automatic row heights and repaint
SCTAB nTabCount = pDoc->GetTableCount();
for (SCTAB nTab=0; nTab<nTabCount; nTab++)
if ( !pDocShell->AdjustRowHeight( 0, MAXROW, nTab ) )
diff --git a/sc/source/ui/unoobj/convuno.cxx b/sc/source/ui/unoobj/convuno.cxx
index e3b0c09b25c2..c5cc05c8c44c 100644
--- a/sc/source/ui/unoobj/convuno.cxx
+++ b/sc/source/ui/unoobj/convuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,17 +40,17 @@ using namespace com::sun::star;
//------------------------------------------------------------------------
-// everything is static...
+// everything is static...
LanguageType ScUnoConversion::GetLanguage( const lang::Locale& rLocale )
{
- // empty language -> LANGUAGE_SYSTEM
+ // empty language -> LANGUAGE_SYSTEM
if ( rLocale.Language.getLength() == 0 )
return LANGUAGE_SYSTEM;
LanguageType eRet = MsLangId::convertLocaleToLanguage( rLocale );
if ( eRet == LANGUAGE_NONE )
- eRet = LANGUAGE_SYSTEM; //! or throw an exception?
+ eRet = LANGUAGE_SYSTEM; //! or throw an exception?
return eRet;
}
diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx
index daf075964a3a..638efe0b3065 100644
--- a/sc/source/ui/unoobj/cursuno.cxx
+++ b/sc/source/ui/unoobj/cursuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +48,8 @@ using namespace com::sun::star;
//------------------------------------------------------------------------
-#define SCSHEETCELLCURSOR_SERVICE "com.sun.star.sheet.SheetCellCursor"
-#define SCCELLCURSOR_SERVICE "com.sun.star.table.CellCursor"
+#define SCSHEETCELLCURSOR_SERVICE "com.sun.star.sheet.SheetCellCursor"
+#define SCCELLCURSOR_SERVICE "com.sun.star.table.CellCursor"
//------------------------------------------------------------------------
@@ -97,7 +97,7 @@ uno::Sequence<uno::Type> SAL_CALL ScCellCursorObj::getTypes() throw(uno::Runtime
pPtr[nParentLen + 2] = getCppuType((const uno::Reference<table::XCellCursor>*)0);
for (long i=0; i<nParentLen; i++)
- pPtr[i] = pParentPtr[i]; // parent types first
+ pPtr[i] = pParentPtr[i]; // parent types first
}
return aTypes;
}
@@ -148,7 +148,7 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentArray() throw(uno::RuntimeExcept
ScRange aOneRange(*rRanges.GetObject(0));
aOneRange.Justify();
- ScAddress aCursor(aOneRange.aStart); // use the start address of the range
+ ScAddress aCursor(aOneRange.aStart); // use the start address of the range
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
@@ -168,7 +168,7 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentArray() throw(uno::RuntimeExcept
/*if (!bFound)
{
DBG_ERROR("keine Matrix");
- //! Exception, oder was?
+ //! Exception, oder was?
}*/
}
@@ -184,7 +184,7 @@ void SAL_CALL ScCellCursorObj::collapseToMergedArea() throw(uno::RuntimeExceptio
ScDocument* pDoc = pDocSh->GetDocument();
pDoc->ExtendOverlapped( aNewRange );
- pDoc->ExtendMerge( aNewRange ); // after ExtendOverlapped!
+ pDoc->ExtendMerge( aNewRange ); // after ExtendOverlapped!
SetNewRange( aNewRange );
}
@@ -223,7 +223,7 @@ void SAL_CALL ScCellCursorObj::collapseToSize( sal_Int32 nColumns, sal_Int32 nRo
if ( nColumns <= 0 || nRows <= 0 )
{
DBG_ERROR("leerer Range geht nicht");
- //! und dann?
+ //! und dann?
}
else
{
@@ -231,20 +231,20 @@ void SAL_CALL ScCellCursorObj::collapseToSize( sal_Int32 nColumns, sal_Int32 nRo
DBG_ASSERT( rRanges.Count() == 1, "Range? Ranges?" );
ScRange aNewRange(*rRanges.GetObject(0));
- aNewRange.Justify(); //! wirklich?
+ aNewRange.Justify(); //! wirklich?
long nEndX = aNewRange.aStart.Col() + nColumns - 1;
long nEndY = aNewRange.aStart.Row() + nRows - 1;
- if ( nEndX < 0 ) nEndX = 0;
+ if ( nEndX < 0 ) nEndX = 0;
if ( nEndX > MAXCOL ) nEndX = MAXCOL;
- if ( nEndY < 0 ) nEndY = 0;
+ if ( nEndY < 0 ) nEndY = 0;
if ( nEndY > MAXROW ) nEndY = MAXROW;
- //! Fehler/Exception oder so, wenn zu gross/zu klein?
+ //! Fehler/Exception oder so, wenn zu gross/zu klein?
aNewRange.aEnd.SetCol((SCCOL)nEndX);
aNewRange.aEnd.SetRow((SCROW)nEndY);
- aNewRange.Justify(); //! wirklich?
+ aNewRange.Justify(); //! wirklich?
SetNewRange( aNewRange );
}
@@ -264,7 +264,7 @@ void SAL_CALL ScCellCursorObj::gotoStartOfUsedArea( sal_Bool bExpand )
ScRange aNewRange(*rRanges.GetObject(0));
SCTAB nTab = aNewRange.aStart.Tab();
- SCCOL nUsedX = 0; // Anfang holen
+ SCCOL nUsedX = 0; // Anfang holen
SCROW nUsedY = 0;
if (!pDocSh->GetDocument()->GetDataStart( nTab, nUsedX, nUsedY ))
{
@@ -292,7 +292,7 @@ void SAL_CALL ScCellCursorObj::gotoEndOfUsedArea( sal_Bool bExpand )
ScRange aNewRange(*rRanges.GetObject(0));
SCTAB nTab = aNewRange.aStart.Tab();
- SCCOL nUsedX = 0; // Ende holen
+ SCCOL nUsedX = 0; // Ende holen
SCROW nUsedY = 0;
if (!pDocSh->GetDocument()->GetTableArea( nTab, nUsedX, nUsedY ))
{
@@ -312,8 +312,8 @@ void SAL_CALL ScCellCursorObj::gotoEndOfUsedArea( sal_Bool bExpand )
void SAL_CALL ScCellCursorObj::gotoStart() throw(uno::RuntimeException)
{
- // this is similar to collapseToCurrentRegion
- //! something like gotoEdge with 4 possible directions is needed
+ // this is similar to collapseToCurrentRegion
+ //! something like gotoEdge with 4 possible directions is needed
ScUnoGuard aGuard;
const ScRangeList& rRanges = GetRangeList();
@@ -340,8 +340,8 @@ void SAL_CALL ScCellCursorObj::gotoStart() throw(uno::RuntimeException)
void SAL_CALL ScCellCursorObj::gotoEnd() throw(uno::RuntimeException)
{
- // this is similar to collapseToCurrentRegion
- //! something like gotoEdge with 4 possible directions is needed
+ // this is similar to collapseToCurrentRegion
+ //! something like gotoEdge with 4 possible directions is needed
ScUnoGuard aGuard;
const ScRangeList& rRanges = GetRangeList();
@@ -374,16 +374,16 @@ void SAL_CALL ScCellCursorObj::gotoNext() throw(uno::RuntimeException)
ScRange aOneRange(*rRanges.GetObject(0));
aOneRange.Justify();
- ScAddress aCursor(aOneRange.aStart); // bei Block immer den Start nehmen
+ ScAddress aCursor(aOneRange.aStart); // bei Block immer den Start nehmen
- ScMarkData aMark; // not used with bMarked=FALSE
+ ScMarkData aMark; // not used with bMarked=FALSE
SCCOL nNewX = aCursor.Col();
SCROW nNewY = aCursor.Row();
SCTAB nTab = aCursor.Tab();
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
pDocSh->GetDocument()->GetNextPos( nNewX,nNewY, nTab, 1,0, FALSE,TRUE, aMark );
- //! sonst Exception oder so
+ //! sonst Exception oder so
SetNewRange( ScRange( nNewX, nNewY, nTab ) );
}
@@ -396,16 +396,16 @@ void SAL_CALL ScCellCursorObj::gotoPrevious() throw(uno::RuntimeException)
ScRange aOneRange(*rRanges.GetObject(0));
aOneRange.Justify();
- ScAddress aCursor(aOneRange.aStart); // bei Block immer den Start nehmen
+ ScAddress aCursor(aOneRange.aStart); // bei Block immer den Start nehmen
- ScMarkData aMark; // not used with bMarked=FALSE
+ ScMarkData aMark; // not used with bMarked=FALSE
SCCOL nNewX = aCursor.Col();
SCROW nNewY = aCursor.Row();
SCTAB nTab = aCursor.Tab();
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
pDocSh->GetDocument()->GetNextPos( nNewX,nNewY, nTab, -1,0, FALSE,TRUE, aMark );
- //! sonst Exception oder so
+ //! sonst Exception oder so
SetNewRange( ScRange( nNewX, nNewY, nTab ) );
}
@@ -487,18 +487,18 @@ sal_Bool SAL_CALL ScCellCursorObj::supportsService( const rtl::OUString& rServic
uno::Sequence<rtl::OUString> SAL_CALL ScCellCursorObj::getSupportedServiceNames()
throw(uno::RuntimeException)
{
- // get all service names from cell range
+ // get all service names from cell range
uno::Sequence<rtl::OUString> aParentSeq(ScCellRangeObj::getSupportedServiceNames());
sal_Int32 nParentLen = aParentSeq.getLength();
const rtl::OUString* pParentArr = aParentSeq.getConstArray();
- // SheetCellCursor should be first (?)
+ // SheetCellCursor should be first (?)
uno::Sequence<rtl::OUString> aTotalSeq( nParentLen + 2 );
rtl::OUString* pTotalArr = aTotalSeq.getArray();
pTotalArr[0] = rtl::OUString::createFromAscii( SCSHEETCELLCURSOR_SERVICE );
pTotalArr[1] = rtl::OUString::createFromAscii( SCCELLCURSOR_SERVICE );
- // append cell range services
+ // append cell range services
for (long i=0; i<nParentLen; i++)
pTotalArr[i+2] = pParentArr[i];
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index c7bf89671161..2812e68314f7 100755
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -221,7 +221,7 @@ GeneralFunction ScDataPilotConversion::FirstFunc( USHORT nBits )
USHORT ScDataPilotConversion::FunctionBit( GeneralFunction eFunc )
{
- USHORT nRet = PIVOT_FUNC_NONE; // 0
+ USHORT nRet = PIVOT_FUNC_NONE; // 0
switch (eFunc)
{
case GeneralFunction_SUM: nRet = PIVOT_FUNC_SUM; break;
@@ -274,7 +274,7 @@ ScDPObject* lcl_GetDPObject( ScDocShell* pDocShell, SCTAB nTab, const String& rN
}
}
}
- return NULL; // nicht gefunden
+ return NULL; // nicht gefunden
}
String lcl_CreatePivotName( ScDocShell* pDocShell )
@@ -286,7 +286,7 @@ String lcl_CreatePivotName( ScDocShell* pDocShell )
if ( pColl )
return pColl->CreateNewName();
}
- return String(); // sollte nicht vorkommen
+ return String(); // sollte nicht vorkommen
}
sal_Int32 lcl_GetObjectIndex( ScDPObject* pDPObj, const ScFieldIdentifier& rFieldId )
@@ -323,12 +323,12 @@ ScDataPilotTablesObj::~ScDataPilotTablesObj()
void ScDataPilotTablesObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- //! Referenz-Update
+ //! Referenz-Update
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -342,9 +342,9 @@ ScDataPilotTableObj* ScDataPilotTablesObj::GetObjectByIndex_Impl( sal_Int32 nInd
ScDPCollection* pColl = pDoc->GetDPCollection();
if ( pColl )
{
- // count tables on this sheet
- // api only handles sheet data at this time
- //! allow all data sources!!!
+ // count tables on this sheet
+ // api only handles sheet data at this time
+ //! allow all data sources!!!
sal_Int32 nFound = 0;
USHORT nCount = pColl->GetCount();
for (USHORT i=0; i<nCount; i++)
@@ -468,7 +468,7 @@ void SAL_CALL ScDataPilotTablesObj::removeByName( const OUString& aName )
if (pDPObj && pDocShell)
{
ScDBDocFunc aFunc(*pDocShell);
- aFunc.DataPilotUpdate( pDPObj, NULL, TRUE, TRUE ); // remove - incl. undo etc.
+ aFunc.DataPilotUpdate( pDPObj, NULL, TRUE, TRUE ); // remove - incl. undo etc.
}
else
throw RuntimeException(); // no other exceptions specified
@@ -493,9 +493,9 @@ sal_Int32 SAL_CALL ScDataPilotTablesObj::getCount() throw(RuntimeException)
ScDPCollection* pColl = pDoc->GetDPCollection();
if ( pColl )
{
- // count tables on this sheet
- // api only handles sheet data at this time
- //! allow all data sources!!!
+ // count tables on this sheet
+ // api only handles sheet data at this time
+ //! allow all data sources!!!
USHORT nFound = 0;
USHORT nCount = pColl->GetCount();
@@ -556,9 +556,9 @@ Sequence<OUString> SAL_CALL ScDataPilotTablesObj::getElementNames()
ScDPCollection* pColl = pDoc->GetDPCollection();
if ( pColl )
{
- // count tables on this sheet
- // api only handles sheet data at this time
- //! allow all data sources!!!
+ // count tables on this sheet
+ // api only handles sheet data at this time
+ //! allow all data sources!!!
USHORT nFound = 0;
USHORT nCount = pColl->GetCount();
@@ -600,8 +600,8 @@ sal_Bool SAL_CALL ScDataPilotTablesObj::hasByName( const OUString& aName )
USHORT nCount = pColl->GetCount();
for (USHORT i=0; i<nCount; i++)
{
- // api only handles sheet data at this time
- //! allow all data sources!!!
+ // api only handles sheet data at this time
+ //! allow all data sources!!!
ScDPObject* pDPObj = (*pColl)[i];
if ( pDPObj->GetOutRange().aStart.Tab() == nTab &&
@@ -684,12 +684,12 @@ Sequence<sal_Int8> SAL_CALL ScDataPilotDescriptorBase::getImplementationId()
void ScDataPilotDescriptorBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- //! Referenz-Update?
+ //! Referenz-Update?
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -1220,13 +1220,13 @@ void SAL_CALL ScDataPilotTableObj::setName( const OUString& aNewName )
ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName);
if (pDPObj)
{
- //! test for existing names !!!
+ //! test for existing names !!!
String aString(aNewName);
- pDPObj->SetName( aString ); //! Undo - DBDocFunc ???
+ pDPObj->SetName( aString ); //! Undo - DBDocFunc ???
aName = aString;
- // DataPilotUpdate would do too much (output table is not changed)
+ // DataPilotUpdate would do too much (output table is not changed)
GetDocShell()->SetDocumentModified();
}
}
@@ -1248,9 +1248,9 @@ void SAL_CALL ScDataPilotTableObj::setTag( const OUString& aNewTag )
if (pDPObj)
{
String aString(aNewTag);
- pDPObj->SetTag( aString ); //! Undo - DBDocFunc ???
+ pDPObj->SetTag( aString ); //! Undo - DBDocFunc ???
- // DataPilotUpdate would do too much (output table is not changed)
+ // DataPilotUpdate would do too much (output table is not changed)
GetDocShell()->SetDocumentModified();
}
}
@@ -1265,11 +1265,11 @@ CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRange() throw(RuntimeExc
if (pDPObj)
{
ScRange aRange(pDPObj->GetOutRange());
- aRet.Sheet = aRange.aStart.Tab();
+ aRet.Sheet = aRange.aStart.Tab();
aRet.StartColumn = aRange.aStart.Col();
- aRet.StartRow = aRange.aStart.Row();
- aRet.EndColumn = aRange.aEnd.Col();
- aRet.EndRow = aRange.aEnd.Row();
+ aRet.StartRow = aRange.aStart.Row();
+ aRet.EndColumn = aRange.aEnd.Col();
+ aRet.EndRow = aRange.aEnd.Row();
}
return aRet;
}
@@ -1283,10 +1283,10 @@ void SAL_CALL ScDataPilotTableObj::refresh() throw(RuntimeException)
RefreshDPObject( pDPObj, NULL, GetDocShell(), TRUE, TRUE );
//if (pDPObj)
//{
- // ScDPObject* pNew = new ScDPObject(*pDPObj);
- // ScDBDocFunc aFunc(*GetDocShell());
- // aFunc.DataPilotUpdate( pDPObj, pNew, TRUE, TRUE );
- // delete pNew; // DataPilotUpdate copies settings from "new" object
+ // ScDPObject* pNew = new ScDPObject(*pDPObj);
+ // ScDBDocFunc aFunc(*GetDocShell());
+ // aFunc.DataPilotUpdate( pDPObj, pNew, TRUE, TRUE );
+ // delete pNew; // DataPilotUpdate copies settings from "new" object
//}
}
@@ -1850,12 +1850,12 @@ OUString SAL_CALL ScDataPilotFieldObj::getName() throw(RuntimeException)
if( pDim->IsDataLayout() )
aName = OUString( RTL_CONSTASCII_USTRINGPARAM( SC_DATALAYOUT_NAME ) );
else
- {
+ {
const rtl::OUString* pLayoutName = pDim->GetLayoutName();
- if (pLayoutName)
- aName = *pLayoutName;
- else
- aName = pDim->GetName();
+ if (pLayoutName)
+ aName = *pLayoutName;
+ else
+ aName = pDim->GetName();
} }
return aName;
}
@@ -1904,7 +1904,7 @@ void SAL_CALL ScDataPilotFieldObj::setPropertyValue( const OUString& aPropertyNa
}
else if ( aNameString.EqualsAscii( SC_UNONAME_ORIENT ) )
{
- //! test for correct enum type?
+ //! test for correct enum type?
DataPilotFieldOrientation eOrient = (DataPilotFieldOrientation)
ScUnoHelpFunctions::GetEnumFromAny( aValue );
setOrientation( eOrient );
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 6e416764eb76..68bd1dd0fde8 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ SV_IMPL_PTRARR( XDBRefreshListenerArr_Impl, XDBRefreshListenerPtr );
//------------------------------------------------------------------------
-// alles ohne Which-ID, Map nur fuer PropertySetInfo
+// alles ohne Which-ID, Map nur fuer PropertySetInfo
const SfxItemPropertyMapEntry* lcl_GetSubTotalPropertyMap()
{
@@ -139,7 +139,7 @@ const SfxItemPropertyMapEntry* lcl_GetDBRangePropertyMap()
//------------------------------------------------------------------------
-#define SCDATABASERANGEOBJ_SERVICE "com.sun.star.sheet.DatabaseRange"
+#define SCDATABASERANGEOBJ_SERVICE "com.sun.star.sheet.DatabaseRange"
SC_SIMPLE_SERVICE_INFO( ScConsolidationDescriptor, "ScConsolidationDescriptor", "com.sun.star.sheet.ConsolidationDescriptor" )
SC_SIMPLE_SERVICE_INFO( ScDatabaseRangesObj, "ScDatabaseRangesObj", "com.sun.star.sheet.DatabaseRanges" )
@@ -156,18 +156,18 @@ ScSubTotalFunc ScDataUnoConversion::GeneralToSubTotal( sheet::GeneralFunction eS
ScSubTotalFunc eSubTotal;
switch (eSummary)
{
- case sheet::GeneralFunction_NONE: eSubTotal = SUBTOTAL_FUNC_NONE; break;
- case sheet::GeneralFunction_SUM: eSubTotal = SUBTOTAL_FUNC_SUM; break;
- case sheet::GeneralFunction_COUNT: eSubTotal = SUBTOTAL_FUNC_CNT2; break;
- case sheet::GeneralFunction_AVERAGE: eSubTotal = SUBTOTAL_FUNC_AVE; break;
- case sheet::GeneralFunction_MAX: eSubTotal = SUBTOTAL_FUNC_MAX; break;
- case sheet::GeneralFunction_MIN: eSubTotal = SUBTOTAL_FUNC_MIN; break;
- case sheet::GeneralFunction_PRODUCT: eSubTotal = SUBTOTAL_FUNC_PROD; break;
- case sheet::GeneralFunction_COUNTNUMS: eSubTotal = SUBTOTAL_FUNC_CNT; break;
- case sheet::GeneralFunction_STDEV: eSubTotal = SUBTOTAL_FUNC_STD; break;
- case sheet::GeneralFunction_STDEVP: eSubTotal = SUBTOTAL_FUNC_STDP; break;
- case sheet::GeneralFunction_VAR: eSubTotal = SUBTOTAL_FUNC_VAR; break;
- case sheet::GeneralFunction_VARP: eSubTotal = SUBTOTAL_FUNC_VARP; break;
+ case sheet::GeneralFunction_NONE: eSubTotal = SUBTOTAL_FUNC_NONE; break;
+ case sheet::GeneralFunction_SUM: eSubTotal = SUBTOTAL_FUNC_SUM; break;
+ case sheet::GeneralFunction_COUNT: eSubTotal = SUBTOTAL_FUNC_CNT2; break;
+ case sheet::GeneralFunction_AVERAGE: eSubTotal = SUBTOTAL_FUNC_AVE; break;
+ case sheet::GeneralFunction_MAX: eSubTotal = SUBTOTAL_FUNC_MAX; break;
+ case sheet::GeneralFunction_MIN: eSubTotal = SUBTOTAL_FUNC_MIN; break;
+ case sheet::GeneralFunction_PRODUCT: eSubTotal = SUBTOTAL_FUNC_PROD; break;
+ case sheet::GeneralFunction_COUNTNUMS: eSubTotal = SUBTOTAL_FUNC_CNT; break;
+ case sheet::GeneralFunction_STDEV: eSubTotal = SUBTOTAL_FUNC_STD; break;
+ case sheet::GeneralFunction_STDEVP: eSubTotal = SUBTOTAL_FUNC_STDP; break;
+ case sheet::GeneralFunction_VAR: eSubTotal = SUBTOTAL_FUNC_VAR; break;
+ case sheet::GeneralFunction_VARP: eSubTotal = SUBTOTAL_FUNC_VARP; break;
case sheet::GeneralFunction_AUTO:
default:
DBG_ERROR("GeneralToSubTotal: falscher enum");
@@ -177,23 +177,23 @@ ScSubTotalFunc ScDataUnoConversion::GeneralToSubTotal( sheet::GeneralFunction eS
}
// static
-sheet::GeneralFunction ScDataUnoConversion::SubTotalToGeneral( ScSubTotalFunc eSubTotal )
+sheet::GeneralFunction ScDataUnoConversion::SubTotalToGeneral( ScSubTotalFunc eSubTotal )
{
sheet::GeneralFunction eGeneral;
switch (eSubTotal)
{
- case SUBTOTAL_FUNC_NONE: eGeneral = sheet::GeneralFunction_NONE; break;
- case SUBTOTAL_FUNC_AVE: eGeneral = sheet::GeneralFunction_AVERAGE; break;
+ case SUBTOTAL_FUNC_NONE: eGeneral = sheet::GeneralFunction_NONE; break;
+ case SUBTOTAL_FUNC_AVE: eGeneral = sheet::GeneralFunction_AVERAGE; break;
case SUBTOTAL_FUNC_CNT: eGeneral = sheet::GeneralFunction_COUNTNUMS; break;
- case SUBTOTAL_FUNC_CNT2: eGeneral = sheet::GeneralFunction_COUNT; break;
- case SUBTOTAL_FUNC_MAX: eGeneral = sheet::GeneralFunction_MAX; break;
- case SUBTOTAL_FUNC_MIN: eGeneral = sheet::GeneralFunction_MIN; break;
- case SUBTOTAL_FUNC_PROD: eGeneral = sheet::GeneralFunction_PRODUCT; break;
- case SUBTOTAL_FUNC_STD: eGeneral = sheet::GeneralFunction_STDEV; break;
- case SUBTOTAL_FUNC_STDP: eGeneral = sheet::GeneralFunction_STDEVP; break;
- case SUBTOTAL_FUNC_SUM: eGeneral = sheet::GeneralFunction_SUM; break;
- case SUBTOTAL_FUNC_VAR: eGeneral = sheet::GeneralFunction_VAR; break;
- case SUBTOTAL_FUNC_VARP: eGeneral = sheet::GeneralFunction_VARP; break;
+ case SUBTOTAL_FUNC_CNT2: eGeneral = sheet::GeneralFunction_COUNT; break;
+ case SUBTOTAL_FUNC_MAX: eGeneral = sheet::GeneralFunction_MAX; break;
+ case SUBTOTAL_FUNC_MIN: eGeneral = sheet::GeneralFunction_MIN; break;
+ case SUBTOTAL_FUNC_PROD: eGeneral = sheet::GeneralFunction_PRODUCT; break;
+ case SUBTOTAL_FUNC_STD: eGeneral = sheet::GeneralFunction_STDEV; break;
+ case SUBTOTAL_FUNC_STDP: eGeneral = sheet::GeneralFunction_STDEVP; break;
+ case SUBTOTAL_FUNC_SUM: eGeneral = sheet::GeneralFunction_SUM; break;
+ case SUBTOTAL_FUNC_VAR: eGeneral = sheet::GeneralFunction_VAR; break;
+ case SUBTOTAL_FUNC_VARP: eGeneral = sheet::GeneralFunction_VARP; break;
default:
DBG_ERROR("SubTotalToGeneral: falscher enum");
eGeneral = sheet::GeneralFunction_NONE;
@@ -204,7 +204,7 @@ sheet::GeneralFunction ScDataUnoConversion::SubTotalToGeneral( ScSubTotalFunc e
//------------------------------------------------------------------------
-// ScImportDescriptor: alles static
+// ScImportDescriptor: alles static
long ScImportDescriptor::GetPropertyCount()
{
@@ -225,7 +225,7 @@ void ScImportDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rS
else if ( rParam.nType == ScDbQuery )
eMode = sheet::DataImportMode_QUERY;
else
- eMode = sheet::DataImportMode_TABLE; // Type ist immer ScDbQuery oder ScDbTable
+ eMode = sheet::DataImportMode_TABLE; // Type ist immer ScDbQuery oder ScDbTable
}
::svx::ODataAccessDescriptor aDescriptor;
@@ -280,7 +280,7 @@ void ScImportDescriptor::FillImportParam( ScImportParam& rParam, const uno::Sequ
}
else if (aPropName.EqualsAscii( SC_UNONAME_SRCTYPE ))
{
- //! test for correct enum type?
+ //! test for correct enum type?
sheet::DataImportMode eMode = (sheet::DataImportMode)
ScUnoHelpFunctions::GetEnumFromAny( rProp.Value );
switch (eMode)
@@ -312,13 +312,13 @@ void ScImportDescriptor::FillImportParam( ScImportParam& rParam, const uno::Sequ
//------------------------------------------------------------------------
-// ScSortDescriptor: alles static
+// ScSortDescriptor: alles static
-//! SortAscending muss aus der SheetSortDescriptor service-Beschreibung raus
+//! SortAscending muss aus der SheetSortDescriptor service-Beschreibung raus
long ScSortDescriptor::GetPropertyCount()
{
- return 9; // TableSortDescriptor and SheetSortDescriptor
+ return 9; // TableSortDescriptor and SheetSortDescriptor
}
void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq, const ScSortParam& rParam )
@@ -327,7 +327,7 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq
beans::PropertyValue* pArray = rSeq.getArray();
- // Uno-Werte zusammensuchen
+ // Uno-Werte zusammensuchen
table::CellAddress aOutPos;
aOutPos.Sheet = rParam.nDestTab;
@@ -344,16 +344,16 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq
table::TableSortField* pFieldArray = aFields.getArray();
for (USHORT i=0; i<nSortCount; i++)
{
- pFieldArray[i].Field = rParam.nField[i];
+ pFieldArray[i].Field = rParam.nField[i];
pFieldArray[i].IsAscending = rParam.bAscending[i];
- pFieldArray[i].FieldType = table::TableSortFieldType_AUTOMATIC; // immer Automatic
+ pFieldArray[i].FieldType = table::TableSortFieldType_AUTOMATIC; // immer Automatic
pFieldArray[i].IsCaseSensitive = rParam.bCaseSens;
pFieldArray[i].CollatorLocale = rParam.aCollatorLocale;
pFieldArray[i].CollatorAlgorithm = rtl::OUString( rParam.aCollatorAlgorithm );
}
}
- // Sequence fuellen
+ // Sequence fuellen
pArray[0].Name = rtl::OUString::createFromAscii( SC_UNONAME_ISSORTCOLUMNS );
pArray[0].Value = ::cppu::bool2any(!rParam.bByRow);
@@ -397,7 +397,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
if (aPropName.EqualsAscii( SC_UNONAME_ORIENT ))
{
bOldSortDescriptor = sal_True;
- //! test for correct enum type?
+ //! test for correct enum type?
table::TableOrientation eOrient = (table::TableOrientation)
ScUnoHelpFunctions::GetEnumFromAny( rProp.Value );
rParam.bByRow = ( eOrient != table::TableOrientation_COLUMNS );
@@ -414,7 +414,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
sal_Int32 nVal;
if ( (rProp.Value >>= nVal) && nVal > MAXSORT )
{
- //! specify exceptions
+ //! specify exceptions
//! throw lang::IllegalArgumentException();
}
}
@@ -435,7 +435,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
const util::SortField* pFieldArray = aSeq.getConstArray();
for (i=0; i<nCount; i++)
{
- rParam.nField[i] = (SCCOLROW)pFieldArray[i].Field;
+ rParam.nField[i] = (SCCOLROW)pFieldArray[i].Field;
rParam.bAscending[i] = pFieldArray[i].SortAscending;
// FieldType wird ignoriert
@@ -457,7 +457,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
const table::TableSortField* pFieldArray = aNewSeq.getConstArray();
for (i=0; i<nCount; i++)
{
- rParam.nField[i] = (SCCOLROW)pFieldArray[i].Field;
+ rParam.nField[i] = (SCCOLROW)pFieldArray[i].Field;
rParam.bAscending[i] = pFieldArray[i].IsAscending;
// only one is possible, sometime we should make it possible to have different for every entry
@@ -517,7 +517,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
//------------------------------------------------------------------------
ScSubTotalFieldObj::ScSubTotalFieldObj( ScSubTotalDescriptorBase* pDesc, USHORT nP ) :
- xRef( pDesc ), // Objekt festhalten
+ xRef( pDesc ), // Objekt festhalten
rParent( *pDesc ),
nPos( nP )
{
@@ -601,7 +601,7 @@ void SAL_CALL ScSubTotalFieldObj::setSubTotalColumns(
aParam.pFunctions[nPos] = NULL;
}
}
- //! sonst Exception oder so? (zuviele Spalten)
+ //! sonst Exception oder so? (zuviele Spalten)
rParent.PutData(aParam);
}
@@ -647,7 +647,7 @@ void SAL_CALL ScSubTotalDescriptorBase::clear() throw(uno::RuntimeException)
for (USHORT i=0; i<MAXSUBTOTAL; i++)
aParam.bGroupActive[i] = FALSE;
- //! Notify oder so fuer die Field-Objekte???
+ //! Notify oder so fuer die Field-Objekte???
PutData(aParam);
}
@@ -695,13 +695,13 @@ void SAL_CALL ScSubTotalDescriptorBase::addNew(
aParam.pFunctions[nPos] = NULL;
}
}
- else // too many fields / columns
- throw uno::RuntimeException(); // no other exceptions specified
+ else // too many fields / columns
+ throw uno::RuntimeException(); // no other exceptions specified
PutData(aParam);
}
-// Flags/Einstellungen als Properties
+// Flags/Einstellungen als Properties
// XEnumerationAccess
@@ -895,17 +895,17 @@ ScSubTotalDescriptor::~ScSubTotalDescriptor()
void ScSubTotalDescriptor::GetData( ScSubTotalParam& rParam ) const
{
- rParam = aStoredParam; // Abfrage fuer Interface
+ rParam = aStoredParam; // Abfrage fuer Interface
}
void ScSubTotalDescriptor::PutData( const ScSubTotalParam& rParam )
{
- aStoredParam = rParam; // vom Interface gesetzt
+ aStoredParam = rParam; // vom Interface gesetzt
}
void ScSubTotalDescriptor::SetParam( const ScSubTotalParam& rNew )
{
- aStoredParam = rNew; // von aussen gesetzt
+ aStoredParam = rNew; // von aussen gesetzt
}
//------------------------------------------------------------------------
@@ -980,11 +980,11 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScConsolidationDescriptor::getSo
ScArea* pArea = aParam.ppDataAreas[i];
if (pArea)
{
- aRange.Sheet = pArea->nTab;
- aRange.StartColumn = pArea->nColStart;
- aRange.StartRow = pArea->nRowStart;
- aRange.EndColumn = pArea->nColEnd;
- aRange.EndRow = pArea->nRowEnd;
+ aRange.Sheet = pArea->nTab;
+ aRange.StartColumn = pArea->nColStart;
+ aRange.StartRow = pArea->nRowStart;
+ aRange.EndColumn = pArea->nColEnd;
+ aRange.EndRow = pArea->nRowEnd;
}
pAry[i] = aRange;
}
@@ -1007,7 +1007,7 @@ void SAL_CALL ScConsolidationDescriptor::setSources(
static_cast<SCCOL>(pAry[i].StartColumn), pAry[i].StartRow,
static_cast<SCCOL>(pAry[i].EndColumn), pAry[i].EndRow );
- aParam.SetAreas( pNew, nCount ); // kopiert alles
+ aParam.SetAreas( pNew, nCount ); // kopiert alles
for (i=0; i<nCount; i++)
delete pNew[i];
@@ -1022,9 +1022,9 @@ table::CellAddress SAL_CALL ScConsolidationDescriptor::getStartOutputPosition()
{
ScUnoGuard aGuard;
table::CellAddress aPos;
- aPos.Column = aParam.nCol;
- aPos.Row = aParam.nRow;
- aPos.Sheet = aParam.nTab;
+ aPos.Column = aParam.nCol;
+ aPos.Row = aParam.nRow;
+ aPos.Sheet = aParam.nTab;
return aPos;
}
@@ -1100,7 +1100,7 @@ void ScFilterDescriptorBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
if ( nId == SFX_HINT_DYING )
{
- pDocSh = NULL; // invalid
+ pDocSh = NULL; // invalid
}
}
}
@@ -1114,8 +1114,8 @@ uno::Sequence<sheet::TableFilterField> SAL_CALL ScFilterDescriptorBase::getFilte
ScQueryParam aParam;
GetData(aParam);
- SCSIZE nEntries = aParam.GetEntryCount(); // allozierte Eintraege im Param
- SCSIZE nCount = 0; // aktive
+ SCSIZE nEntries = aParam.GetEntryCount(); // allozierte Eintraege im Param
+ SCSIZE nCount = 0; // aktive
while ( nCount < nEntries &&
aParam.GetEntry(nCount).bDoQuery )
++nCount;
@@ -1131,14 +1131,14 @@ uno::Sequence<sheet::TableFilterField> SAL_CALL ScFilterDescriptorBase::getFilte
if (rEntry.pStr)
aStringValue = *rEntry.pStr;
- aField.Connection = (rEntry.eConnect == SC_AND) ? sheet::FilterConnection_AND :
+ aField.Connection = (rEntry.eConnect == SC_AND) ? sheet::FilterConnection_AND :
sheet::FilterConnection_OR;
- aField.Field = rEntry.nField;
- aField.IsNumeric = !rEntry.bQueryByString;
- aField.StringValue = aStringValue;
- aField.NumericValue = rEntry.nVal;
+ aField.Field = rEntry.nField;
+ aField.IsNumeric = !rEntry.bQueryByString;
+ aField.StringValue = aStringValue;
+ aField.NumericValue = rEntry.nVal;
- switch (rEntry.eOp) // ScQueryOp
+ switch (rEntry.eOp) // ScQueryOp
{
case SC_EQUAL:
{
@@ -1158,15 +1158,15 @@ uno::Sequence<sheet::TableFilterField> SAL_CALL ScFilterDescriptorBase::getFilte
}
}
break;
- case SC_LESS: aField.Operator = sheet::FilterOperator_LESS; break;
- case SC_GREATER: aField.Operator = sheet::FilterOperator_GREATER; break;
- case SC_LESS_EQUAL: aField.Operator = sheet::FilterOperator_LESS_EQUAL; break;
- case SC_GREATER_EQUAL: aField.Operator = sheet::FilterOperator_GREATER_EQUAL; break;
- case SC_NOT_EQUAL: aField.Operator = sheet::FilterOperator_NOT_EQUAL; break;
- case SC_TOPVAL: aField.Operator = sheet::FilterOperator_TOP_VALUES; break;
- case SC_BOTVAL: aField.Operator = sheet::FilterOperator_BOTTOM_VALUES; break;
- case SC_TOPPERC: aField.Operator = sheet::FilterOperator_TOP_PERCENT; break;
- case SC_BOTPERC: aField.Operator = sheet::FilterOperator_BOTTOM_PERCENT; break;
+ case SC_LESS: aField.Operator = sheet::FilterOperator_LESS; break;
+ case SC_GREATER: aField.Operator = sheet::FilterOperator_GREATER; break;
+ case SC_LESS_EQUAL: aField.Operator = sheet::FilterOperator_LESS_EQUAL; break;
+ case SC_GREATER_EQUAL: aField.Operator = sheet::FilterOperator_GREATER_EQUAL; break;
+ case SC_NOT_EQUAL: aField.Operator = sheet::FilterOperator_NOT_EQUAL; break;
+ case SC_TOPVAL: aField.Operator = sheet::FilterOperator_TOP_VALUES; break;
+ case SC_BOTVAL: aField.Operator = sheet::FilterOperator_BOTTOM_VALUES; break;
+ case SC_TOPPERC: aField.Operator = sheet::FilterOperator_TOP_PERCENT; break;
+ case SC_BOTPERC: aField.Operator = sheet::FilterOperator_BOTTOM_PERCENT; break;
default:
DBG_ERROR("Falscher Filter-enum");
aField.Operator = sheet::FilterOperator_EMPTY;
@@ -1183,8 +1183,8 @@ throw(uno::RuntimeException)
ScQueryParam aParam;
GetData(aParam);
- SCSIZE nEntries = aParam.GetEntryCount(); // allozierte Eintraege im Param
- SCSIZE nCount = 0; // aktive
+ SCSIZE nEntries = aParam.GetEntryCount(); // allozierte Eintraege im Param
+ SCSIZE nCount = 0; // aktive
while ( nCount < nEntries &&
aParam.GetEntry(nCount).bDoQuery )
++nCount;
@@ -1200,13 +1200,13 @@ throw(uno::RuntimeException)
if (rEntry.pStr)
aStringValue = *rEntry.pStr;
- aField.Connection = (rEntry.eConnect == SC_AND) ? sheet::FilterConnection_AND : sheet::FilterConnection_OR;
- aField.Field = rEntry.nField;
- aField.IsNumeric = !rEntry.bQueryByString;
- aField.StringValue = aStringValue;
- aField.NumericValue = rEntry.nVal;
+ aField.Connection = (rEntry.eConnect == SC_AND) ? sheet::FilterConnection_AND : sheet::FilterConnection_OR;
+ aField.Field = rEntry.nField;
+ aField.IsNumeric = !rEntry.bQueryByString;
+ aField.StringValue = aStringValue;
+ aField.NumericValue = rEntry.nVal;
- switch (rEntry.eOp) // ScQueryOp
+ switch (rEntry.eOp) // ScQueryOp
{
case SC_EQUAL:
{
@@ -1226,15 +1226,15 @@ throw(uno::RuntimeException)
}
}
break;
- case SC_LESS: aField.Operator = sheet::FilterOperator2::LESS; break;
- case SC_GREATER: aField.Operator = sheet::FilterOperator2::GREATER; break;
- case SC_LESS_EQUAL: aField.Operator = sheet::FilterOperator2::LESS_EQUAL; break;
- case SC_GREATER_EQUAL: aField.Operator = sheet::FilterOperator2::GREATER_EQUAL; break;
- case SC_NOT_EQUAL: aField.Operator = sheet::FilterOperator2::NOT_EQUAL; break;
- case SC_TOPVAL: aField.Operator = sheet::FilterOperator2::TOP_VALUES; break;
- case SC_BOTVAL: aField.Operator = sheet::FilterOperator2::BOTTOM_VALUES; break;
- case SC_TOPPERC: aField.Operator = sheet::FilterOperator2::TOP_PERCENT; break;
- case SC_BOTPERC: aField.Operator = sheet::FilterOperator2::BOTTOM_PERCENT; break;
+ case SC_LESS: aField.Operator = sheet::FilterOperator2::LESS; break;
+ case SC_GREATER: aField.Operator = sheet::FilterOperator2::GREATER; break;
+ case SC_LESS_EQUAL: aField.Operator = sheet::FilterOperator2::LESS_EQUAL; break;
+ case SC_GREATER_EQUAL: aField.Operator = sheet::FilterOperator2::GREATER_EQUAL; break;
+ case SC_NOT_EQUAL: aField.Operator = sheet::FilterOperator2::NOT_EQUAL; break;
+ case SC_TOPVAL: aField.Operator = sheet::FilterOperator2::TOP_VALUES; break;
+ case SC_BOTVAL: aField.Operator = sheet::FilterOperator2::BOTTOM_VALUES; break;
+ case SC_TOPPERC: aField.Operator = sheet::FilterOperator2::TOP_PERCENT; break;
+ case SC_BOTPERC: aField.Operator = sheet::FilterOperator2::BOTTOM_PERCENT; break;
case SC_CONTAINS: aField.Operator = sheet::FilterOperator2::CONTAINS; break;
case SC_DOES_NOT_CONTAIN: aField.Operator = sheet::FilterOperator2::DOES_NOT_CONTAIN; break;
case SC_BEGINS_WITH: aField.Operator = sheet::FilterOperator2::BEGINS_WITH; break;
@@ -1269,32 +1269,32 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields(
{
ScQueryEntry& rEntry = aParam.GetEntry(i);
if (!rEntry.pStr)
- rEntry.pStr = new String; // sollte nicht sein (soll immer initialisiert sein)
+ rEntry.pStr = new String; // sollte nicht sein (soll immer initialisiert sein)
- rEntry.bDoQuery = TRUE;
- rEntry.eConnect = (pAry[i].Connection == sheet::FilterConnection_AND) ? SC_AND : SC_OR;
- rEntry.nField = pAry[i].Field;
- rEntry.bQueryByString = !pAry[i].IsNumeric;
- *rEntry.pStr = String( pAry[i].StringValue );
- rEntry.nVal = pAry[i].NumericValue;
+ rEntry.bDoQuery = TRUE;
+ rEntry.eConnect = (pAry[i].Connection == sheet::FilterConnection_AND) ? SC_AND : SC_OR;
+ rEntry.nField = pAry[i].Field;
+ rEntry.bQueryByString = !pAry[i].IsNumeric;
+ *rEntry.pStr = String( pAry[i].StringValue );
+ rEntry.nVal = pAry[i].NumericValue;
if (!rEntry.bQueryByString && pDocSh)
{
pDocSh->GetDocument()->GetFormatTable()->GetInputLineString(rEntry.nVal, 0, *rEntry.pStr);
}
- switch (pAry[i].Operator) // FilterOperator
+ switch (pAry[i].Operator) // FilterOperator
{
- case sheet::FilterOperator_EQUAL: rEntry.eOp = SC_EQUAL; break;
- case sheet::FilterOperator_LESS: rEntry.eOp = SC_LESS; break;
- case sheet::FilterOperator_GREATER: rEntry.eOp = SC_GREATER; break;
- case sheet::FilterOperator_LESS_EQUAL: rEntry.eOp = SC_LESS_EQUAL; break;
- case sheet::FilterOperator_GREATER_EQUAL: rEntry.eOp = SC_GREATER_EQUAL; break;
- case sheet::FilterOperator_NOT_EQUAL: rEntry.eOp = SC_NOT_EQUAL; break;
- case sheet::FilterOperator_TOP_VALUES: rEntry.eOp = SC_TOPVAL; break;
- case sheet::FilterOperator_BOTTOM_VALUES: rEntry.eOp = SC_BOTVAL; break;
- case sheet::FilterOperator_TOP_PERCENT: rEntry.eOp = SC_TOPPERC; break;
- case sheet::FilterOperator_BOTTOM_PERCENT: rEntry.eOp = SC_BOTPERC; break;
+ case sheet::FilterOperator_EQUAL: rEntry.eOp = SC_EQUAL; break;
+ case sheet::FilterOperator_LESS: rEntry.eOp = SC_LESS; break;
+ case sheet::FilterOperator_GREATER: rEntry.eOp = SC_GREATER; break;
+ case sheet::FilterOperator_LESS_EQUAL: rEntry.eOp = SC_LESS_EQUAL; break;
+ case sheet::FilterOperator_GREATER_EQUAL: rEntry.eOp = SC_GREATER_EQUAL; break;
+ case sheet::FilterOperator_NOT_EQUAL: rEntry.eOp = SC_NOT_EQUAL; break;
+ case sheet::FilterOperator_TOP_VALUES: rEntry.eOp = SC_TOPVAL; break;
+ case sheet::FilterOperator_BOTTOM_VALUES: rEntry.eOp = SC_BOTVAL; break;
+ case sheet::FilterOperator_TOP_PERCENT: rEntry.eOp = SC_TOPPERC; break;
+ case sheet::FilterOperator_BOTTOM_PERCENT: rEntry.eOp = SC_BOTPERC; break;
case sheet::FilterOperator_EMPTY:
{
rEntry.eOp = SC_EQUAL;
@@ -1317,9 +1317,9 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields(
}
}
- SCSIZE nParamCount = aParam.GetEntryCount(); // Param wird nicht unter 8 resized
+ SCSIZE nParamCount = aParam.GetEntryCount(); // Param wird nicht unter 8 resized
for (i=nCount; i<nParamCount; i++)
- aParam.GetEntry(i).bDoQuery = FALSE; // ueberzaehlige Felder zuruecksetzen
+ aParam.GetEntry(i).bDoQuery = FALSE; // ueberzaehlige Felder zuruecksetzen
PutData(aParam);
}
@@ -1343,38 +1343,38 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields2(
{
ScQueryEntry& rEntry = aParam.GetEntry(i);
if (!rEntry.pStr)
- rEntry.pStr = new String; // sollte nicht sein (soll immer initialisiert sein)
+ rEntry.pStr = new String; // sollte nicht sein (soll immer initialisiert sein)
- rEntry.bDoQuery = TRUE;
- rEntry.eConnect = (pAry[i].Connection == sheet::FilterConnection_AND) ? SC_AND : SC_OR;
- rEntry.nField = pAry[i].Field;
- rEntry.bQueryByString = !pAry[i].IsNumeric;
- *rEntry.pStr = String( pAry[i].StringValue );
- rEntry.nVal = pAry[i].NumericValue;
+ rEntry.bDoQuery = TRUE;
+ rEntry.eConnect = (pAry[i].Connection == sheet::FilterConnection_AND) ? SC_AND : SC_OR;
+ rEntry.nField = pAry[i].Field;
+ rEntry.bQueryByString = !pAry[i].IsNumeric;
+ *rEntry.pStr = String( pAry[i].StringValue );
+ rEntry.nVal = pAry[i].NumericValue;
if (!rEntry.bQueryByString && pDocSh)
{
pDocSh->GetDocument()->GetFormatTable()->GetInputLineString(rEntry.nVal, 0, *rEntry.pStr);
}
- switch (pAry[i].Operator) // FilterOperator
+ switch (pAry[i].Operator) // FilterOperator
{
- case sheet::FilterOperator2::EQUAL: rEntry.eOp = SC_EQUAL; break;
- case sheet::FilterOperator2::LESS: rEntry.eOp = SC_LESS; break;
- case sheet::FilterOperator2::GREATER: rEntry.eOp = SC_GREATER; break;
- case sheet::FilterOperator2::LESS_EQUAL: rEntry.eOp = SC_LESS_EQUAL; break;
- case sheet::FilterOperator2::GREATER_EQUAL: rEntry.eOp = SC_GREATER_EQUAL; break;
- case sheet::FilterOperator2::NOT_EQUAL: rEntry.eOp = SC_NOT_EQUAL; break;
- case sheet::FilterOperator2::TOP_VALUES: rEntry.eOp = SC_TOPVAL; break;
- case sheet::FilterOperator2::BOTTOM_VALUES: rEntry.eOp = SC_BOTVAL; break;
- case sheet::FilterOperator2::TOP_PERCENT: rEntry.eOp = SC_TOPPERC; break;
- case sheet::FilterOperator2::BOTTOM_PERCENT: rEntry.eOp = SC_BOTPERC; break;
- case sheet::FilterOperator2::CONTAINS: rEntry.eOp = SC_CONTAINS; break;
- case sheet::FilterOperator2::DOES_NOT_CONTAIN: rEntry.eOp = SC_DOES_NOT_CONTAIN; break;
- case sheet::FilterOperator2::BEGINS_WITH: rEntry.eOp = SC_BEGINS_WITH; break;
- case sheet::FilterOperator2::DOES_NOT_BEGIN_WITH: rEntry.eOp = SC_DOES_NOT_BEGIN_WITH;break;
- case sheet::FilterOperator2::ENDS_WITH: rEntry.eOp = SC_ENDS_WITH; break;
- case sheet::FilterOperator2::DOES_NOT_END_WITH: rEntry.eOp = SC_DOES_NOT_END_WITH; break;
+ case sheet::FilterOperator2::EQUAL: rEntry.eOp = SC_EQUAL; break;
+ case sheet::FilterOperator2::LESS: rEntry.eOp = SC_LESS; break;
+ case sheet::FilterOperator2::GREATER: rEntry.eOp = SC_GREATER; break;
+ case sheet::FilterOperator2::LESS_EQUAL: rEntry.eOp = SC_LESS_EQUAL; break;
+ case sheet::FilterOperator2::GREATER_EQUAL: rEntry.eOp = SC_GREATER_EQUAL; break;
+ case sheet::FilterOperator2::NOT_EQUAL: rEntry.eOp = SC_NOT_EQUAL; break;
+ case sheet::FilterOperator2::TOP_VALUES: rEntry.eOp = SC_TOPVAL; break;
+ case sheet::FilterOperator2::BOTTOM_VALUES: rEntry.eOp = SC_BOTVAL; break;
+ case sheet::FilterOperator2::TOP_PERCENT: rEntry.eOp = SC_TOPPERC; break;
+ case sheet::FilterOperator2::BOTTOM_PERCENT: rEntry.eOp = SC_BOTPERC; break;
+ case sheet::FilterOperator2::CONTAINS: rEntry.eOp = SC_CONTAINS; break;
+ case sheet::FilterOperator2::DOES_NOT_CONTAIN: rEntry.eOp = SC_DOES_NOT_CONTAIN; break;
+ case sheet::FilterOperator2::BEGINS_WITH: rEntry.eOp = SC_BEGINS_WITH; break;
+ case sheet::FilterOperator2::DOES_NOT_BEGIN_WITH: rEntry.eOp = SC_DOES_NOT_BEGIN_WITH;break;
+ case sheet::FilterOperator2::ENDS_WITH: rEntry.eOp = SC_ENDS_WITH; break;
+ case sheet::FilterOperator2::DOES_NOT_END_WITH: rEntry.eOp = SC_DOES_NOT_END_WITH; break;
case sheet::FilterOperator2::EMPTY:
{
rEntry.eOp = SC_EQUAL;
@@ -1397,9 +1397,9 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields2(
}
}
- SCSIZE nParamCount = aParam.GetEntryCount(); // Param wird nicht unter 8 resized
+ SCSIZE nParamCount = aParam.GetEntryCount(); // Param wird nicht unter 8 resized
for (i=nCount; i<nParamCount; i++)
- aParam.GetEntry(i).bDoQuery = FALSE; // ueberzaehlige Felder zuruecksetzen
+ aParam.GetEntry(i).bDoQuery = FALSE; // ueberzaehlige Felder zuruecksetzen
PutData(aParam);
}
@@ -1444,7 +1444,7 @@ void SAL_CALL ScFilterDescriptorBase::setPropertyValue(
}
else if (aString.EqualsAscii( SC_UNONAME_ORIENT ))
{
- //! test for correct enum type?
+ //! test for correct enum type?
table::TableOrientation eOrient = (table::TableOrientation)
ScUnoHelpFunctions::GetEnumFromAny( aValue );
aParam.bByRow = ( eOrient != table::TableOrientation_COLUMNS );
@@ -1528,17 +1528,17 @@ ScFilterDescriptor::~ScFilterDescriptor()
void ScFilterDescriptor::GetData( ScQueryParam& rParam ) const
{
- rParam = aStoredParam; // Abfrage fuer Interface
+ rParam = aStoredParam; // Abfrage fuer Interface
}
void ScFilterDescriptor::PutData( const ScQueryParam& rParam )
{
- aStoredParam = rParam; // vom Interface gesetzt
+ aStoredParam = rParam; // vom Interface gesetzt
}
void ScFilterDescriptor::SetParam( const ScQueryParam& rNew )
{
- aStoredParam = rNew; // von aussen gesetzt
+ aStoredParam = rNew; // von aussen gesetzt
}
//------------------------------------------------------------------------
@@ -1632,7 +1632,7 @@ void ScDatabaseRangeObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
else if ( rHint.ISA (ScDBRangeRefreshedHint) )
{
ScDBData* pDBData = GetDBData_Impl();
@@ -1695,11 +1695,11 @@ table::CellRangeAddress SAL_CALL ScDatabaseRangeObj::getDataArea() throw(uno::Ru
{
ScRange aRange;
pData->GetArea(aRange);
- aAddress.Sheet = aRange.aStart.Tab();
+ aAddress.Sheet = aRange.aStart.Tab();
aAddress.StartColumn = aRange.aStart.Col();
- aAddress.StartRow = aRange.aStart.Row();
- aAddress.EndColumn = aRange.aEnd.Col();
- aAddress.EndRow = aRange.aEnd.Row();
+ aAddress.StartRow = aRange.aStart.Row();
+ aAddress.EndColumn = aRange.aEnd.Col();
+ aAddress.EndRow = aRange.aEnd.Row();
}
return aAddress;
}
@@ -1712,7 +1712,7 @@ void SAL_CALL ScDatabaseRangeObj::setDataArea( const table::CellRangeAddress& aD
if ( pDocShell && pData )
{
ScDBData aNewData( *pData );
- //! MoveTo ???
+ //! MoveTo ???
aNewData.SetArea( aDataArea.Sheet, (SCCOL)aDataArea.StartColumn, (SCROW)aDataArea.StartRow,
(SCCOL)aDataArea.EndColumn, (SCROW)aDataArea.EndRow );
ScDBDocFunc aFunc(*pDocShell);
@@ -1730,7 +1730,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScDatabaseRangeObj::getSortDescript
{
pData->GetSortParam(aParam);
- // im SortDescriptor sind die Fields innerhalb des Bereichs gezaehlt
+ // im SortDescriptor sind die Fields innerhalb des Bereichs gezaehlt
ScRange aDBRange;
pData->GetArea(aDBRange);
SCCOLROW nFieldStart = aParam.bByRow ? static_cast<SCCOLROW>(aDBRange.aStart.Col()) : static_cast<SCCOLROW>(aDBRange.aStart.Row());
@@ -1751,7 +1751,7 @@ void ScDatabaseRangeObj::GetQueryParam(ScQueryParam& rQueryParam) const
{
pData->GetQueryParam(rQueryParam);
- // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt
+ // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt
ScRange aDBRange;
pData->GetArea(aDBRange);
SCCOLROW nFieldStart = rQueryParam.bByRow ? static_cast<SCCOLROW>(aDBRange.aStart.Col()) : static_cast<SCCOLROW>(aDBRange.aStart.Row());
@@ -1770,7 +1770,7 @@ void ScDatabaseRangeObj::SetQueryParam(const ScQueryParam& rQueryParam)
const ScDBData* pData = GetDBData_Impl();
if (pData)
{
- // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt
+ // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt
ScQueryParam aParam(rQueryParam);
ScRange aDBRange;
pData->GetArea(aDBRange);
@@ -1786,7 +1786,7 @@ void ScDatabaseRangeObj::SetQueryParam(const ScQueryParam& rQueryParam)
ScDBData aNewData( *pData );
aNewData.SetQueryParam(aParam);
- aNewData.SetHeader(aParam.bHasHeader); // not in ScDBData::SetQueryParam
+ aNewData.SetHeader(aParam.bHasHeader); // not in ScDBData::SetQueryParam
ScDBDocFunc aFunc(*pDocShell);
aFunc.ModifyDBData(aNewData, TRUE);
}
@@ -1806,7 +1806,7 @@ void ScDatabaseRangeObj::GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const
{
pData->GetSubTotalParam(rSubTotalParam);
- // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt
+ // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt
ScRange aDBRange;
pData->GetArea(aDBRange);
SCCOL nFieldStart = aDBRange.aStart.Col();
@@ -1830,7 +1830,7 @@ void ScDatabaseRangeObj::SetSubTotalParam(const ScSubTotalParam& rSubTotalParam)
const ScDBData* pData = GetDBData_Impl();
if (pData)
{
- // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt
+ // im FilterDescriptor sind die Fields innerhalb des Bereichs gezaehlt
ScSubTotalParam aParam(rSubTotalParam);
ScRange aDBRange;
pData->GetArea(aDBRange);
@@ -1894,7 +1894,7 @@ void SAL_CALL ScDatabaseRangeObj::refresh() throw(uno::RuntimeException)
SCROW nDummyRow;
pData->GetArea( nTab, nDummyCol,nDummyRow,nDummyCol,nDummyRow );
uno::Reference< sdbc::XResultSet > xResultSet;
- bContinue = aFunc.DoImport( nTab, aImportParam, xResultSet, NULL, TRUE, FALSE ); //! Api-Flag als Parameter
+ bContinue = aFunc.DoImport( nTab, aImportParam, xResultSet, NULL, TRUE, FALSE ); //! Api-Flag als Parameter
}
// interne Operationen (sort, query, subtotal) nur, wenn kein Fehler
@@ -1912,7 +1912,7 @@ void SAL_CALL ScDatabaseRangeObj::addRefreshListener(
new uno::Reference<util::XRefreshListener>( xListener );
aRefreshListeners.Insert( pObj, aRefreshListeners.Count() );
- // hold one additional ref to keep this object alive as long as there are listeners
+ // hold one additional ref to keep this object alive as long as there are listeners
if ( aRefreshListeners.Count() == 1 )
acquire();
}
@@ -1930,7 +1930,7 @@ void SAL_CALL ScDatabaseRangeObj::removeRefreshListener(
{
aRefreshListeners.DeleteAndDestroy( n );
if ( aRefreshListeners.Count() == 0 )
- release(); // release ref for listeners
+ release(); // release ref for listeners
break;
}
}
@@ -1954,7 +1954,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScDatabaseRangeObj::getReferredCells(
ScDBData* pData = GetDBData_Impl();
if ( pData )
{
- //! static Funktion um ScCellObj/ScCellRangeObj zu erzeugen am ScCellRangeObj ???
+ //! static Funktion um ScCellObj/ScCellRangeObj zu erzeugen am ScCellRangeObj ???
pData->GetArea(aRange);
if ( aRange.aStart == aRange.aEnd )
@@ -2087,13 +2087,13 @@ uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const rtl::OUString& aPr
ScUnoHelpFunctions::SetBoolInAny( aRet, pData->IsStripData() );
else if ( aString.EqualsAscii( SC_UNONAME_ISUSER ) )
{
- // all database ranges except "unnamed" are user defined
+ // all database ranges except "unnamed" are user defined
ScUnoHelpFunctions::SetBoolInAny( aRet,
( pData->GetName() != ScGlobal::GetRscString(STR_DB_NONAME) ) );
}
else if ( aString.EqualsAscii( SC_UNO_LINKDISPBIT ) )
{
- // no target bitmaps for individual entries (would be all equal)
+ // no target bitmaps for individual entries (would be all equal)
// ScLinkTargetTypeObj::SetLinkTargetBitmap( aRet, SC_LINKTARGETTYPE_DBAREA );
}
else if ( aString.EqualsAscii( SC_UNO_LINKDISPNAME ) )
@@ -2184,12 +2184,12 @@ ScDatabaseRangesObj::~ScDatabaseRangesObj()
void ScDatabaseRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // Referenz-Update interessiert hier nicht
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -2233,7 +2233,7 @@ void SAL_CALL ScDatabaseRangesObj::addNewByName( const rtl::OUString& aName,
bDone = aFunc.AddDBRange( aString, aNameRange, TRUE );
}
if (!bDone)
- throw uno::RuntimeException(); // no other exceptions specified
+ throw uno::RuntimeException(); // no other exceptions specified
}
void SAL_CALL ScDatabaseRangesObj::removeByName( const rtl::OUString& aName )
@@ -2248,7 +2248,7 @@ void SAL_CALL ScDatabaseRangesObj::removeByName( const rtl::OUString& aName )
bDone = aFunc.DeleteDBRange( aString, TRUE );
}
if (!bDone)
- throw uno::RuntimeException(); // no other exceptions specified
+ throw uno::RuntimeException(); // no other exceptions specified
}
// XEnumerationAccess
@@ -2266,7 +2266,7 @@ sal_Int32 SAL_CALL ScDatabaseRangesObj::getCount() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- //! "unbenannt" weglassen ?
+ //! "unbenannt" weglassen ?
if (pDocShell)
{
@@ -2322,7 +2322,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScDatabaseRangesObj::getElementNames()
{
ScUnoGuard aGuard;
- //! "unbenannt" weglassen ?
+ //! "unbenannt" weglassen ?
if (pDocShell)
{
@@ -2347,7 +2347,7 @@ sal_Bool SAL_CALL ScDatabaseRangesObj::hasByName( const rtl::OUString& aName )
{
ScUnoGuard aGuard;
- //! "unbenannt" weglassen ?
+ //! "unbenannt" weglassen ?
if (pDocShell)
{
diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx
index f3f76685e5cb..f74e8b90301f 100644
--- a/sc/source/ui/unoobj/defltuno.cxx
+++ b/sc/source/ui/unoobj/defltuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,34 +56,34 @@ const SfxItemPropertyMapEntry* lcl_GetDocDefaultsMap()
{
static SfxItemPropertyMapEntry aDocDefaultsMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNO_STANDARDDEC), 0, &getCppuType((sal_Int16*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_TABSTOPDIS), 0, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNO_STANDARDDEC), 0, &getCppuType((sal_Int16*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_TABSTOPDIS), 0, &getCppuType((sal_Int32*)0), 0, 0 },
{0,0,0,0,0,0}
};
return aDocDefaultsMap_Impl;
}
-inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
-inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
-inline long TwipsToEvenHMM(long nTwips) { return ( (nTwips * 127 + 72) / 144 ) * 2; }
+inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
+inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
+inline long TwipsToEvenHMM(long nTwips) { return ( (nTwips * 127 + 72) / 144 ) * 2; }
//------------------------------------------------------------------------
@@ -109,7 +109,7 @@ void ScDocDefaultsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // document gone
+ pDocShell = NULL; // document gone
}
}
@@ -117,7 +117,7 @@ void ScDocDefaultsObj::ItemsChanged()
{
if (pDocShell)
{
- //! if not in XML import, adjust row heights
+ //! if not in XML import, adjust row heights
pDocShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID );
}
@@ -187,8 +187,8 @@ void SAL_CALL ScDocDefaultsObj::setPropertyValue(
pEntry->nWID == ATTR_CJK_FONT_LANGUAGE ||
pEntry->nWID == ATTR_CTL_FONT_LANGUAGE )
{
- // for getPropertyValue the PoolDefaults are sufficient,
- // but setPropertyValue has to be handled differently
+ // for getPropertyValue the PoolDefaults are sufficient,
+ // but setPropertyValue has to be handled differently
lang::Locale aLocale;
if ( aValue >>= aLocale )
@@ -222,7 +222,7 @@ void SAL_CALL ScDocDefaultsObj::setPropertyValue(
throw lang::IllegalArgumentException();
pPool->SetPoolDefaultItem( *pNewItem );
- delete pNewItem; // copied in SetPoolDefaultItem
+ delete pNewItem; // copied in SetPoolDefaultItem
ItemsChanged();
}
@@ -232,7 +232,7 @@ uno::Any SAL_CALL ScDocDefaultsObj::getPropertyValue( const rtl::OUString& aProp
throw(beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
- // use pool default if set
+ // use pool default if set
ScUnoGuard aGuard;
@@ -305,14 +305,14 @@ beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const rtl::OUS
USHORT nWID = pEntry->nWID;
if ( nWID == ATTR_FONT || nWID == ATTR_CJK_FONT || nWID == ATTR_CTL_FONT || !nWID )
{
- // static default for font is system-dependent,
- // so font default is always treated as "direct value".
+ // static default for font is system-dependent,
+ // so font default is always treated as "direct value".
eRet = beans::PropertyState_DIRECT_VALUE;
}
else
{
- // check if pool default is set
+ // check if pool default is set
ScDocumentPool* pPool = pDocShell->GetDocument()->GetPool();
if ( pPool->GetPoolDefaultItem( nWID ) != NULL )
@@ -326,7 +326,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScDocDefaultsObj::getPropertyStates
const uno::Sequence<rtl::OUString>& aPropertyNames )
throw(beans::UnknownPropertyException, uno::RuntimeException)
{
- // the simple way: call getPropertyState
+ // the simple way: call getPropertyState
ScUnoGuard aGuard;
const rtl::OUString* pNames = aPropertyNames.getConstArray();
@@ -362,7 +362,7 @@ uno::Any SAL_CALL ScDocDefaultsObj::getPropertyDefault( const rtl::OUString& aPr
throw(beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
- // always use static default
+ // always use static default
ScUnoGuard aGuard;
diff --git a/sc/source/ui/unoobj/detreg.cxx b/sc/source/ui/unoobj/detreg.cxx
index 498d0fc886ec..b8399ae20f18 100644
--- a/sc/source/ui/unoobj/detreg.cxx
+++ b/sc/source/ui/unoobj/detreg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -49,8 +49,8 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
}
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */ ,
- void* pRegistryKey )
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */ ,
+ void* pRegistryKey )
{
Reference< ::registry::XRegistryKey >
xKey( reinterpret_cast< ::registry::XRegistryKey* >( pRegistryKey ) ) ;
@@ -77,9 +77,9 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImple
// Set default return value for this operation - if it failed.
void* pReturn = NULL ;
- if (
- ( pImplementationName != NULL ) &&
- ( pServiceManager != NULL )
+ if (
+ ( pImplementationName != NULL ) &&
+ ( pServiceManager != NULL )
)
{
// Define variables which are used in following macros.
diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx
index 6c82871d02da..6696132fa8e6 100644
--- a/sc/source/ui/unoobj/dispuno.cxx
+++ b/sc/source/ui/unoobj/dispuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 3d3f0f479601..ccf3ddf14b04 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +50,7 @@
#include <toolkit/awt/vclxdevice.hxx>
#include <ctype.h>
-#include <float.h> // DBL_MAX
+#include <float.h> // DBL_MAX
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/sheet/XNamedRanges.hpp>
@@ -105,14 +105,14 @@ using namespace com::sun::star;
//------------------------------------------------------------------------
-// alles ohne Which-ID, Map nur fuer PropertySetInfo
+// alles ohne Which-ID, Map nur fuer PropertySetInfo
-//! umbenennen, sind nicht mehr nur Options
+//! umbenennen, sind nicht mehr nur Options
const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap()
{
static SfxItemPropertyMapEntry aDocOptPropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNO_APPLYFMDES), 0, &getBooleanCppuType(), 0, 0},
+ {MAP_CHAR_LEN(SC_UNO_APPLYFMDES), 0, &getBooleanCppuType(), 0, 0},
{MAP_CHAR_LEN(SC_UNO_AREALINKS), 0, &getCppuType((uno::Reference<sheet::XAreaLinks>*)0), 0, 0},
{MAP_CHAR_LEN(SC_UNO_AUTOCONTFOC), 0, &getBooleanCppuType(), 0, 0},
{MAP_CHAR_LEN(SC_UNO_BASICLIBRARIES), 0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0},
@@ -157,17 +157,17 @@ const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap()
return aDocOptPropertyMap_Impl;
}
-//! StandardDecimals als Property und vom NumberFormatter ????????
+//! StandardDecimals als Property und vom NumberFormatter ????????
const SfxItemPropertyMapEntry* lcl_GetColumnsPropertyMap()
{
static SfxItemPropertyMapEntry aColumnsPropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_MANPAGE), 0, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), 0, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), 0, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_OWIDTH), 0, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLWID), 0, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_MANPAGE), 0, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), 0, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), 0, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_OWIDTH), 0, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLWID), 0, &getCppuType((sal_Int32*)0), 0, 0 },
{0,0,0,0,0,0}
};
return aColumnsPropertyMap_Impl;
@@ -177,12 +177,12 @@ const SfxItemPropertyMapEntry* lcl_GetRowsPropertyMap()
{
static SfxItemPropertyMapEntry aRowsPropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_CELLHGT), 0, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLFILT), 0, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_OHEIGHT), 0, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_MANPAGE), 0, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), 0, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), 0, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLHGT), 0, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLFILT), 0, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_OHEIGHT), 0, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_MANPAGE), 0, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), 0, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLVIS), 0, &getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR },
{MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
// not sorted, not used with SfxItemPropertyMapEntry::GetByName
@@ -191,15 +191,15 @@ const SfxItemPropertyMapEntry* lcl_GetRowsPropertyMap()
return aRowsPropertyMap_Impl;
}
-//! move these functions to a header file
-inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
-inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
+//! move these functions to a header file
+inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
+inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
//------------------------------------------------------------------------
-#define SCMODELOBJ_SERVICE "com.sun.star.sheet.SpreadsheetDocument"
-#define SCDOCSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetDocumentSettings"
-#define SCDOC_SERVICE "com.sun.star.document.OfficeDocument"
+#define SCMODELOBJ_SERVICE "com.sun.star.sheet.SpreadsheetDocument"
+#define SCDOCSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetDocumentSettings"
+#define SCDOC_SERVICE "com.sun.star.document.OfficeDocument"
SC_SIMPLE_SERVICE_INFO( ScAnnotationsObj, "ScAnnotationsObj", "com.sun.star.sheet.CellAnnotations" )
SC_SIMPLE_SERVICE_INFO( ScDrawPagesObj, "ScDrawPagesObj", "com.sun.star.drawing.DrawPages" )
@@ -235,7 +235,7 @@ ScPrintUIOptions::ScPrintUIOptions()
SvtModuleOptions aOpt;
String aAppGroupname( aStrings.GetString( 18 ) );
aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ),
- aOpt.GetModuleName( SvtModuleOptions::E_SCALC ) );
+ aOpt.GetModuleName( SvtModuleOptions::E_SCALC ) );
m_aUIProperties[0].Value = getGroupControlOpt( aAppGroupname, rtl::OUString() );
// create subgroup for pages
@@ -254,7 +254,7 @@ ScPrintUIOptions::ScPrintUIOptions()
rtl::OUString(),
aPrintRangeOpt
);
-
+
// create a choice for the content to create
uno::Sequence< rtl::OUString > aChoices( 3 ), aHelpTexts( 3 );
aChoices[0] = aStrings.GetString( 7 );
@@ -268,7 +268,7 @@ ScPrintUIOptions::ScPrintUIOptions()
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) ),
aChoices,
nContent );
-
+
// create Subgroup for print range
aPrintRangeOpt.mbInternalOnly = sal_True;
m_aUIProperties[5].Value = getSubgroupControlOpt( rtl::OUString( aStrings.GetString( 13 ) ),
@@ -297,7 +297,7 @@ ScPrintUIOptions::ScPrintUIOptions()
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ),
rtl::OUString(),
aPageRangeOpt
- );
+ );
// "Print only selected sheets" isn't needed because of the "Selected Sheets" choice in "Print content"
#if 0
@@ -370,7 +370,7 @@ ScModelObj::ScModelObj( ScDocShell* pDocSh ) :
// pDocShell may be NULL if this is the base of a ScDocOptionsObj
if ( pDocShell )
{
- pDocShell->GetDocument()->AddUnoObject(*this); // SfxModel is derived from SfxListener
+ pDocShell->GetDocument()->AddUnoObject(*this); // SfxModel is derived from SfxListener
}
}
@@ -541,10 +541,10 @@ uno::Sequence<uno::Type> SAL_CALL ScModelObj::getTypes() throw(uno::RuntimeExcep
long i;
for (i=0; i<nParentLen; i++)
- pPtr[i] = pParentPtr[i]; // parent types first
+ pPtr[i] = pParentPtr[i]; // parent types first
for (i=0; i<nAggLen; i++)
- pPtr[nParentLen+nThisLen+i] = pAggPtr[i]; // aggregated types last
+ pPtr[nParentLen+nThisLen+i] = pAggPtr[i]; // aggregated types last
}
return aTypes;
}
@@ -563,14 +563,14 @@ uno::Sequence<sal_Int8> SAL_CALL ScModelObj::getImplementationId()
void ScModelObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
- // Not interested in reference update hints here
+ // Not interested in reference update hints here
if ( rHint.ISA( SfxSimpleHint ) )
{
ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
if ( nId == SFX_HINT_DYING )
{
- pDocShell = NULL; // has become invalid
+ pDocShell = NULL; // has become invalid
if (xNumberAgg.is())
{
SvNumberFormatsSupplierObj* pNumFmt =
@@ -580,12 +580,12 @@ void ScModelObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
pNumFmt->SetNumberFormatter( NULL );
}
- DELETEZ( pPrintFuncCache ); // must be deleted because it has a pointer to the DocShell
+ DELETEZ( pPrintFuncCache ); // must be deleted because it has a pointer to the DocShell
}
else if ( nId == SFX_HINT_DATACHANGED )
{
- // cached data for rendering become invalid when contents change
- // (if a broadcast is added to SetDrawModified, is has to be tested here, too)
+ // cached data for rendering become invalid when contents change
+ // (if a broadcast is added to SetDrawModified, is has to be tested here, too)
DELETEZ( pPrintFuncCache );
@@ -599,7 +599,7 @@ void ScModelObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
USHORT nFlags = ((const ScPointerChangedHint&)rHint).GetFlags();
if (nFlags & SC_POINTERCHANGED_NUMFMT)
{
- // NumberFormatter-Pointer am Uno-Objekt neu setzen
+ // NumberFormatter-Pointer am Uno-Objekt neu setzen
if (GetFormatter().is())
{
@@ -756,7 +756,7 @@ BOOL ScModelObj::FillRenderMarkData( const uno::Any& aSelection,
DBG_ASSERT( pDocShell, "FillRenderMarkData: DocShell must be set" );
BOOL bDone = FALSE;
-
+
uno::Reference<frame::XController> xView;
// defaults when no options are passed: all sheets, include empty pages
@@ -819,9 +819,9 @@ BOOL ScModelObj::FillRenderMarkData( const uno::Any& aSelection,
{
// a sheet object is treated like an empty selection: print the used area of the sheet
- if ( bCursor || bSheet ) // nothing selected -> use whole tables
+ if ( bCursor || bSheet ) // nothing selected -> use whole tables
{
- rMark.ResetMark(); // doesn't change table selection
+ rMark.ResetMark(); // doesn't change table selection
rStatus.SetMode( SC_PRINTSEL_CURSOR );
}
else
@@ -866,8 +866,8 @@ BOOL ScModelObj::FillRenderMarkData( const uno::Any& aSelection,
}
else if ( ScModelObj::getImplementation( xInterface ) == this )
{
- // render the whole document
- // -> no selection, all sheets
+ // render the whole document
+ // -> no selection, all sheets
SCTAB nTabCount = pDocShell->GetDocument()->GetTableCount();
for (SCTAB nTab = 0; nTab < nTabCount; nTab++)
@@ -925,9 +925,9 @@ sal_Int32 SAL_CALL ScModelObj::getRendererCount( const uno::Any& aSelection,
if ( !FillRenderMarkData( aSelection, rOptions, aMark, aStatus, aPagesStr ) )
return 0;
- // The same ScPrintFuncCache object in pPrintFuncCache is used as long as
- // the same selection is used (aStatus) and the document isn't changed
- // (pPrintFuncCache is cleared in Notify handler)
+ // The same ScPrintFuncCache object in pPrintFuncCache is used as long as
+ // the same selection is used (aStatus) and the document isn't changed
+ // (pPrintFuncCache is cleared in Notify handler)
if ( !pPrintFuncCache || !pPrintFuncCache->IsSameSelection( aStatus ) )
{
@@ -1011,7 +1011,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32
throw lang::IllegalArgumentException();
}
- // printer is used as device (just for page layout), draw view is not needed
+ // printer is used as device (just for page layout), draw view is not needed
SCTAB nTab = pPrintFuncCache->GetTabForPage( nRenderer );
@@ -1123,8 +1123,8 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec
pSelRange = &aRange;
}
- // to increase performance, ScPrintState might be used here for subsequent
- // pages of the same sheet
+ // to increase performance, ScPrintState might be used here for subsequent
+ // pages of the same sheet
ScPrintFunc aFunc( pDev, pDocShell, nTab, pPrintFuncCache->GetFirstAttr(nTab), nTotalPages, pSelRange, &aStatus.GetOptions() );
aFunc.SetDrawView( pDrawView );
@@ -1348,7 +1348,7 @@ void SAL_CALL ScModelObj::calculate() throw(uno::RuntimeException)
pDocShell->DoRecalc(TRUE);
else
{
- DBG_ERROR("keine DocShell"); //! Exception oder so?
+ DBG_ERROR("keine DocShell"); //! Exception oder so?
}
}
@@ -1359,7 +1359,7 @@ void SAL_CALL ScModelObj::calculateAll() throw(uno::RuntimeException)
pDocShell->DoHardRecalc(TRUE);
else
{
- DBG_ERROR("keine DocShell"); //! Exception oder so?
+ DBG_ERROR("keine DocShell"); //! Exception oder so?
}
}
@@ -1369,7 +1369,7 @@ sal_Bool SAL_CALL ScModelObj::isAutomaticCalculationEnabled() throw(uno::Runtime
if (pDocShell)
return pDocShell->GetDocument()->GetAutoCalc();
- DBG_ERROR("keine DocShell"); //! Exception oder so?
+ DBG_ERROR("keine DocShell"); //! Exception oder so?
return FALSE;
}
@@ -1388,7 +1388,7 @@ void SAL_CALL ScModelObj::enableAutomaticCalculation( sal_Bool bEnabled )
}
else
{
- DBG_ERROR("keine DocShell"); //! Exception oder so?
+ DBG_ERROR("keine DocShell"); //! Exception oder so?
}
}
@@ -1428,7 +1428,7 @@ sal_Bool SAL_CALL ScModelObj::isProtected() throw(uno::RuntimeException)
if (pDocShell)
return pDocShell->GetDocument()->IsDocProtected();
- DBG_ERROR("keine DocShell"); //! Exception oder so?
+ DBG_ERROR("keine DocShell"); //! Exception oder so?
return FALSE;
}
@@ -1440,7 +1440,7 @@ uno::Reference<drawing::XDrawPages> SAL_CALL ScModelObj::getDrawPages() throw(un
if (pDocShell)
return new ScDrawPagesObj(pDocShell);
- DBG_ERROR("keine DocShell"); //! Exception oder so?
+ DBG_ERROR("keine DocShell"); //! Exception oder so?
return NULL;
}
@@ -1464,7 +1464,7 @@ rtl::OUString ScModelObj::getPrinterName(void) const
void ScModelObj::setPrinterName(const rtl::OUString& PrinterName)
{
ScUnoGuard aGuard;
- // Drucker setzen - wie in SfxViewShell::ExecPrint_Impl
+ // Drucker setzen - wie in SfxViewShell::ExecPrint_Impl
if (pDocShell)
{
@@ -1484,7 +1484,7 @@ void ScModelObj::setPrinterName(const rtl::OUString& PrinterName)
XPropertySetRef ScModelObj::createPrintOptions(void)
{
ScUnoGuard aGuard;
- return new ScPrintSettingsObj; //! ScPrintSettingsObj implementieren!
+ return new ScPrintSettingsObj; //! ScPrintSettingsObj implementieren!
}
void ScModelObj::print(const XPropertySetRef& xOptions)
@@ -1492,9 +1492,9 @@ void ScModelObj::print(const XPropertySetRef& xOptions)
ScUnoGuard aGuard;
if (pDocShell)
{
- //! xOptions auswerten (wie denn?)
+ //! xOptions auswerten (wie denn?)
- //! muss noch
+ //! muss noch
}
}
#endif
@@ -1509,7 +1509,7 @@ sheet::GoalResult SAL_CALL ScModelObj::seekGoal(
{
ScUnoGuard aGuard;
sheet::GoalResult aResult;
- aResult.Divergence = DBL_MAX; // nichts gefunden
+ aResult.Divergence = DBL_MAX; // nichts gefunden
if (pDocShell)
{
WaitObject aWait( pDocShell->GetActiveDialogParent() );
@@ -1522,7 +1522,7 @@ sheet::GoalResult SAL_CALL ScModelObj::seekGoal(
aGoalString, fValue );
aResult.Result = fValue;
if (bFound)
- aResult.Divergence = 0.0; //! das ist gelogen
+ aResult.Divergence = 0.0; //! das ist gelogen
}
return aResult;
}
@@ -1549,10 +1549,10 @@ void SAL_CALL ScModelObj::consolidate(
throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- // das koennte theoretisch ein fremdes Objekt sein, also nur das
- // oeffentliche XConsolidationDescriptor Interface benutzen, um
- // die Daten in ein ScConsolidationDescriptor Objekt zu kopieren:
- //! wenn es schon ein ScConsolidationDescriptor ist, direkt per getImplementation?
+ // das koennte theoretisch ein fremdes Objekt sein, also nur das
+ // oeffentliche XConsolidationDescriptor Interface benutzen, um
+ // die Daten in ein ScConsolidationDescriptor Objekt zu kopieren:
+ //! wenn es schon ein ScConsolidationDescriptor ist, direkt per getImplementation?
ScConsolidationDescriptor aImpl;
aImpl.setFunction( xDescriptor->getFunction() );
@@ -1614,8 +1614,8 @@ uno::Reference< container::XIndexAccess > SAL_CALL ScModelObj::getViewData( )
return xRet;
}
-// XPropertySet (Doc-Optionen)
-//! auch an der Applikation anbieten?
+// XPropertySet (Doc-Optionen)
+//! auch an der Applikation anbieten?
uno::Reference<beans::XPropertySetInfo> SAL_CALL ScModelObj::getPropertySetInfo()
throw(uno::RuntimeException)
@@ -1662,7 +1662,7 @@ void SAL_CALL ScModelObj::setPropertyValue(
rtl::OUString sCodeName;
if ( aValue >>= sCodeName )
pDoc->SetCodeName( sCodeName );
- }
+ }
else if ( aString.EqualsAscii( SC_UNO_CJK_CLOCAL ) )
{
lang::Locale aLocale;
@@ -1687,7 +1687,7 @@ void SAL_CALL ScModelObj::setPropertyValue(
}
else if ( aString.EqualsAscii( SC_UNO_APPLYFMDES ) )
{
- // model is created if not there
+ // model is created if not there
ScDrawLayer* pModel = pDocShell->MakeDrawLayer();
pModel->SetOpenInDesignMode( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
@@ -1697,7 +1697,7 @@ void SAL_CALL ScModelObj::setPropertyValue(
}
else if ( aString.EqualsAscii( SC_UNO_AUTOCONTFOC ) )
{
- // model is created if not there
+ // model is created if not there
ScDrawLayer* pModel = pDocShell->MakeDrawLayer();
pModel->SetAutoControlFocus( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
@@ -1791,7 +1791,7 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyNa
{
rtl::OUString sCodeName = pDoc->GetCodeName();
aRet <<= sCodeName;
- }
+ }
else if ( aString.EqualsAscii( SC_UNO_CJK_CLOCAL ) )
{
@@ -1934,16 +1934,16 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance(
USHORT nType = ScServiceProvider::GetProviderType(aNameStr);
if ( nType != SC_SERVICE_INVALID )
{
- // drawing layer tables must be kept as long as the model is alive
- // return stored instance if already set
+ // drawing layer tables must be kept as long as the model is alive
+ // return stored instance if already set
switch ( nType )
{
- case SC_SERVICE_GRADTAB: xRet.set(xDrawGradTab); break;
- case SC_SERVICE_HATCHTAB: xRet.set(xDrawHatchTab); break;
- case SC_SERVICE_BITMAPTAB: xRet.set(xDrawBitmapTab); break;
- case SC_SERVICE_TRGRADTAB: xRet.set(xDrawTrGradTab); break;
- case SC_SERVICE_MARKERTAB: xRet.set(xDrawMarkerTab); break;
- case SC_SERVICE_DASHTAB: xRet.set(xDrawDashTab); break;
+ case SC_SERVICE_GRADTAB: xRet.set(xDrawGradTab); break;
+ case SC_SERVICE_HATCHTAB: xRet.set(xDrawHatchTab); break;
+ case SC_SERVICE_BITMAPTAB: xRet.set(xDrawBitmapTab); break;
+ case SC_SERVICE_TRGRADTAB: xRet.set(xDrawTrGradTab); break;
+ case SC_SERVICE_MARKERTAB: xRet.set(xDrawMarkerTab); break;
+ case SC_SERVICE_DASHTAB: xRet.set(xDrawDashTab); break;
case SC_SERVICE_CHDATAPROV: xRet.set(xChartDataProv); break;
}
@@ -1960,23 +1960,23 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance(
{
xRet.set(ScServiceProvider::MakeInstance( nType, pDocShell ));
- // store created instance
+ // store created instance
switch ( nType )
{
- case SC_SERVICE_GRADTAB: xDrawGradTab.set(xRet); break;
- case SC_SERVICE_HATCHTAB: xDrawHatchTab.set(xRet); break;
- case SC_SERVICE_BITMAPTAB: xDrawBitmapTab.set(xRet); break;
- case SC_SERVICE_TRGRADTAB: xDrawTrGradTab.set(xRet); break;
- case SC_SERVICE_MARKERTAB: xDrawMarkerTab.set(xRet); break;
- case SC_SERVICE_DASHTAB: xDrawDashTab.set(xRet); break;
+ case SC_SERVICE_GRADTAB: xDrawGradTab.set(xRet); break;
+ case SC_SERVICE_HATCHTAB: xDrawHatchTab.set(xRet); break;
+ case SC_SERVICE_BITMAPTAB: xDrawBitmapTab.set(xRet); break;
+ case SC_SERVICE_TRGRADTAB: xDrawTrGradTab.set(xRet); break;
+ case SC_SERVICE_MARKERTAB: xDrawMarkerTab.set(xRet); break;
+ case SC_SERVICE_DASHTAB: xDrawDashTab.set(xRet); break;
case SC_SERVICE_CHDATAPROV: xChartDataProv.set(xRet); break;
}
}
}
else
{
- // alles was ich nicht kenn, werf ich der SvxFmMSFactory an den Hals,
- // da wird dann 'ne Exception geworfen, wenn's nicht passt...
+ // alles was ich nicht kenn, werf ich der SvxFmMSFactory an den Hals,
+ // da wird dann 'ne Exception geworfen, wenn's nicht passt...
try
{
@@ -1987,14 +1987,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance(
{
}
- // #96117# if the drawing factory created a shape, a ScShapeObj has to be used
- // to support own properties like ImageMap:
+ // #96117# if the drawing factory created a shape, a ScShapeObj has to be used
+ // to support own properties like ImageMap:
uno::Reference<drawing::XShape> xShape( xRet, uno::UNO_QUERY );
if ( xShape.is() )
{
- xRet.clear(); // for aggregation, xShape must be the object's only ref
- new ScShapeObj( xShape ); // aggregates object and modifies xShape
+ xRet.clear(); // for aggregation, xShape must be the object's only ref
+ new ScShapeObj( xShape ); // aggregates object and modifies xShape
xRet.set(xShape);
}
}
@@ -2006,14 +2006,14 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstanceWithArguments
const uno::Sequence<uno::Any>& aArgs )
throw(uno::Exception, uno::RuntimeException)
{
- //! unterscheiden zwischen eigenen Services und denen vom Drawing-Layer?
+ //! unterscheiden zwischen eigenen Services und denen vom Drawing-Layer?
ScUnoGuard aGuard;
uno::Reference<uno::XInterface> xInt(createInstance(ServiceSpecifier));
if ( aArgs.getLength() )
{
- // used only for cell value binding so far - it can be initialized after creating
+ // used only for cell value binding so far - it can be initialized after creating
uno::Reference<lang::XInitialization> xInit( xInt, uno::UNO_QUERY );
if ( xInit.is() )
@@ -2028,9 +2028,9 @@ uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::getAvailableServiceNames()
{
ScUnoGuard aGuard;
- //! warum sind die Parameter bei concatServiceNames nicht const ???
- //! return concatServiceNames( ScServiceProvider::GetAllServiceNames(),
- //! SvxFmMSFactory::getAvailableServiceNames() );
+ //! warum sind die Parameter bei concatServiceNames nicht const ???
+ //! return concatServiceNames( ScServiceProvider::GetAllServiceNames(),
+ //! SvxFmMSFactory::getAvailableServiceNames() );
uno::Sequence<rtl::OUString> aMyServices(ScServiceProvider::GetAllServiceNames());
uno::Sequence<rtl::OUString> aDrawServices(SvxFmMSFactory::getAvailableServiceNames());
@@ -2083,8 +2083,8 @@ sal_Int64 SAL_CALL ScModelObj::getSomething(
return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(pDocShell ));
}
- // aggregated number formats supplier has XUnoTunnel, too
- // interface from aggregated object must be obtained via queryAggregation
+ // aggregated number formats supplier has XUnoTunnel, too
+ // interface from aggregated object must be obtained via queryAggregation
sal_Int64 nRet = SfxBaseModel::getSomething( rId );
if ( nRet )
@@ -2315,12 +2315,12 @@ ScDrawPagesObj::~ScDrawPagesObj()
void ScDrawPagesObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // Referenz-Update interessiert hier nicht
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -2429,12 +2429,12 @@ ScTableSheetsObj::~ScTableSheetsObj()
void ScTableSheetsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // Referenz-Update interessiert hier nicht
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -2472,7 +2472,7 @@ void SAL_CALL ScTableSheetsObj::insertNewByName( const rtl::OUString& aName, sal
bDone = aFunc.InsertTable( nPosition, aNamStr, TRUE, TRUE );
}
if (!bDone)
- throw uno::RuntimeException(); // no other exceptions specified
+ throw uno::RuntimeException(); // no other exceptions specified
}
void SAL_CALL ScTableSheetsObj::moveByName( const rtl::OUString& aName, sal_Int16 nDestination )
@@ -2488,7 +2488,7 @@ void SAL_CALL ScTableSheetsObj::moveByName( const rtl::OUString& aName, sal_Int1
bDone = pDocShell->MoveTable( nSource, nDestination, FALSE, TRUE );
}
if (!bDone)
- throw uno::RuntimeException(); // no other exceptions specified
+ throw uno::RuntimeException(); // no other exceptions specified
}
void SAL_CALL ScTableSheetsObj::copyByName( const rtl::OUString& aName,
@@ -2519,7 +2519,7 @@ void SAL_CALL ScTableSheetsObj::copyByName( const rtl::OUString& aName,
}
}
if (!bDone)
- throw uno::RuntimeException(); // no other exceptions specified
+ throw uno::RuntimeException(); // no other exceptions specified
}
void SAL_CALL ScTableSheetsObj::insertByName( const rtl::OUString& aName, const uno::Any& aElement )
@@ -2530,7 +2530,7 @@ void SAL_CALL ScTableSheetsObj::insertByName( const rtl::OUString& aName, const
BOOL bDone = FALSE;
BOOL bIllArg = FALSE;
- //! Type of aElement can be some specific interface instead of XInterface
+ //! Type of aElement can be some specific interface instead of XInterface
if ( pDocShell )
{
@@ -2538,14 +2538,14 @@ void SAL_CALL ScTableSheetsObj::insertByName( const rtl::OUString& aName, const
if ( xInterface.is() )
{
ScTableSheetObj* pSheetObj = ScTableSheetObj::getImplementation( xInterface );
- if ( pSheetObj && !pSheetObj->GetDocShell() ) // noch nicht eingefuegt?
+ if ( pSheetObj && !pSheetObj->GetDocShell() ) // noch nicht eingefuegt?
{
ScDocument* pDoc = pDocShell->GetDocument();
String aNamStr(aName);
SCTAB nDummy;
if ( pDoc->GetTable( aNamStr, nDummy ) )
{
- // name already exists
+ // name already exists
throw container::ElementExistException();
}
else
@@ -2555,7 +2555,7 @@ void SAL_CALL ScTableSheetsObj::insertByName( const rtl::OUString& aName, const
bDone = aFunc.InsertTable( nPosition, aNamStr, TRUE, TRUE );
if (bDone)
pSheetObj->InitInsertSheet( pDocShell, nPosition );
- // Dokument und neuen Range am Objekt setzen
+ // Dokument und neuen Range am Objekt setzen
}
}
else
@@ -2570,7 +2570,7 @@ void SAL_CALL ScTableSheetsObj::insertByName( const rtl::OUString& aName, const
if (bIllArg)
throw lang::IllegalArgumentException();
else
- throw uno::RuntimeException(); // ElementExistException is handled above
+ throw uno::RuntimeException(); // ElementExistException is handled above
}
}
@@ -2582,7 +2582,7 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const
BOOL bDone = FALSE;
BOOL bIllArg = FALSE;
- //! Type of aElement can be some specific interface instead of XInterface
+ //! Type of aElement can be some specific interface instead of XInterface
if ( pDocShell )
{
@@ -2590,7 +2590,7 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const
if ( xInterface.is() )
{
ScTableSheetObj* pSheetObj = ScTableSheetObj::getImplementation( xInterface );
- if ( pSheetObj && !pSheetObj->GetDocShell() ) // noch nicht eingefuegt?
+ if ( pSheetObj && !pSheetObj->GetDocShell() ) // noch nicht eingefuegt?
{
String aNamStr(aName);
SCTAB nPosition;
@@ -2599,7 +2599,7 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const
ScDocFunc aFunc(*pDocShell);
if ( aFunc.DeleteTable( nPosition, TRUE, TRUE ) )
{
- // InsertTable kann jetzt eigentlich nicht schiefgehen...
+ // InsertTable kann jetzt eigentlich nicht schiefgehen...
bDone = aFunc.InsertTable( nPosition, aNamStr, TRUE, TRUE );
if (bDone)
pSheetObj->InitInsertSheet( pDocShell, nPosition );
@@ -2607,7 +2607,7 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const
}
else
{
- // not found
+ // not found
throw container::NoSuchElementException();
}
}
@@ -2623,7 +2623,7 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const rtl::OUString& aName, const
if (bIllArg)
throw lang::IllegalArgumentException();
else
- throw uno::RuntimeException(); // NoSuchElementException is handled above
+ throw uno::RuntimeException(); // NoSuchElementException is handled above
}
}
@@ -2644,13 +2644,13 @@ void SAL_CALL ScTableSheetsObj::removeByName( const rtl::OUString& aName )
}
else
{
- // not found
+ // not found
throw container::NoSuchElementException();
}
}
if (!bDone)
- throw uno::RuntimeException(); // NoSuchElementException is handled above
+ throw uno::RuntimeException(); // NoSuchElementException is handled above
}
// XCellRangesAccess
@@ -2803,9 +2803,9 @@ sal_Bool SAL_CALL ScTableSheetsObj::hasByName( const rtl::OUString& aName )
ScTableColumnsObj::ScTableColumnsObj(ScDocShell* pDocSh, SCTAB nT, SCCOL nSC, SCCOL nEC) :
pDocShell( pDocSh ),
- nTab ( nT ),
+ nTab ( nT ),
nStartCol( nSC ),
- nEndCol ( nEC )
+ nEndCol ( nEC )
{
pDocShell->GetDocument()->AddUnoObject(*this);
}
@@ -2822,12 +2822,12 @@ void ScTableColumnsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
// const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint;
- //! Referenz-Update fuer Tab und Start/Ende
+ //! Referenz-Update fuer Tab und Start/Ende
}
else if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -2839,7 +2839,7 @@ ScTableColumnObj* ScTableColumnsObj::GetObjectByIndex_Impl(sal_Int32 nIndex) con
if ( pDocShell && nCol <= nEndCol )
return new ScTableColumnObj( pDocShell, nCol, nTab );
- return NULL; // falscher Index
+ return NULL; // falscher Index
}
ScTableColumnObj* ScTableColumnsObj::GetObjectByName_Impl(const rtl::OUString& aName) const
@@ -2867,7 +2867,7 @@ void SAL_CALL ScTableColumnsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 n
bDone = aFunc.InsertCells( aRange, NULL, INS_INSCOLS, TRUE, TRUE );
}
if (!bDone)
- throw uno::RuntimeException(); // no other exceptions specified
+ throw uno::RuntimeException(); // no other exceptions specified
}
void SAL_CALL ScTableColumnsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount )
@@ -2875,7 +2875,7 @@ void SAL_CALL ScTableColumnsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCou
{
ScUnoGuard aGuard;
BOOL bDone = FALSE;
- // Der zu loeschende Bereich muss innerhalb des Objekts liegen
+ // Der zu loeschende Bereich muss innerhalb des Objekts liegen
if ( pDocShell && nCount > 0 && nIndex >= 0 && nStartCol+nIndex+nCount-1 <= nEndCol )
{
ScDocFunc aFunc(*pDocShell);
@@ -2884,7 +2884,7 @@ void SAL_CALL ScTableColumnsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCou
bDone = aFunc.DeleteCells( aRange, NULL, DEL_DELCOLS, TRUE, TRUE );
}
if (!bDone)
- throw uno::RuntimeException(); // no other exceptions specified
+ throw uno::RuntimeException(); // no other exceptions specified
}
// XEnumerationAccess
@@ -2965,7 +2965,7 @@ sal_Bool SAL_CALL ScTableColumnsObj::hasByName( const rtl::OUString& aName )
if ( pDocShell && nCol >= nStartCol && nCol <= nEndCol )
return TRUE;
- return FALSE; // nicht gefunden
+ return FALSE; // nicht gefunden
}
// XPropertySet
@@ -3007,7 +3007,7 @@ void SAL_CALL ScTableColumnsObj::setPropertyValue(
BOOL bVis = ScUnoHelpFunctions::GetBoolFromAny( aValue );
ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT;
aFunc.SetWidthOrHeight( TRUE, 1, nColArr, nTab, eMode, 0, TRUE, TRUE );
- // SC_SIZE_DIRECT with size 0: hide
+ // SC_SIZE_DIRECT with size 0: hide
}
else if ( aNameString.EqualsAscii( SC_UNONAME_OWIDTH ) )
{
@@ -3019,7 +3019,7 @@ void SAL_CALL ScTableColumnsObj::setPropertyValue(
}
else if ( aNameString.EqualsAscii( SC_UNONAME_NEWPAGE ) || aNameString.EqualsAscii( SC_UNONAME_MANPAGE ) )
{
- //! single function to set/remove all breaks?
+ //! single function to set/remove all breaks?
BOOL bSet = ScUnoHelpFunctions::GetBoolFromAny( aValue );
for (SCCOL nCol=nStartCol; nCol<=nEndCol; nCol++)
if (bSet)
@@ -3041,7 +3041,7 @@ uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const rtl::OUString& aPro
String aNameString(aPropertyName);
uno::Any aAny;
- //! loop over all columns for current state?
+ //! loop over all columns for current state?
if ( aNameString.EqualsAscii( SC_UNONAME_CELLWID ) )
{
@@ -3080,9 +3080,9 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScTableColumnsObj )
ScTableRowsObj::ScTableRowsObj(ScDocShell* pDocSh, SCTAB nT, SCROW nSR, SCROW nER) :
pDocShell( pDocSh ),
- nTab ( nT ),
+ nTab ( nT ),
nStartRow( nSR ),
- nEndRow ( nER )
+ nEndRow ( nER )
{
pDocShell->GetDocument()->AddUnoObject(*this);
}
@@ -3099,12 +3099,12 @@ void ScTableRowsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
// const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint;
- //! Referenz-Update fuer Tab und Start/Ende
+ //! Referenz-Update fuer Tab und Start/Ende
}
else if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -3116,7 +3116,7 @@ ScTableRowObj* ScTableRowsObj::GetObjectByIndex_Impl(sal_Int32 nIndex) const
if ( pDocShell && nRow <= nEndRow )
return new ScTableRowObj( pDocShell, nRow, nTab );
- return NULL; // falscher Index
+ return NULL; // falscher Index
}
void SAL_CALL ScTableRowsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 nCount )
@@ -3133,7 +3133,7 @@ void SAL_CALL ScTableRowsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 nCou
bDone = aFunc.InsertCells( aRange, NULL, INS_INSROWS, TRUE, TRUE );
}
if (!bDone)
- throw uno::RuntimeException(); // no other exceptions specified
+ throw uno::RuntimeException(); // no other exceptions specified
}
void SAL_CALL ScTableRowsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount )
@@ -3141,7 +3141,7 @@ void SAL_CALL ScTableRowsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount
{
ScUnoGuard aGuard;
BOOL bDone = FALSE;
- // Der zu loeschende Bereich muss innerhalb des Objekts liegen
+ // Der zu loeschende Bereich muss innerhalb des Objekts liegen
if ( pDocShell && nCount > 0 && nIndex >= 0 && nStartRow+nIndex+nCount-1 <= nEndRow )
{
ScDocFunc aFunc(*pDocShell);
@@ -3150,7 +3150,7 @@ void SAL_CALL ScTableRowsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount
bDone = aFunc.DeleteCells( aRange, NULL, DEL_DELROWS, TRUE, TRUE );
}
if (!bDone)
- throw uno::RuntimeException(); // no other exceptions specified
+ throw uno::RuntimeException(); // no other exceptions specified
}
// XEnumerationAccess
@@ -3257,11 +3257,11 @@ void SAL_CALL ScTableRowsObj::setPropertyValue(
BOOL bVis = ScUnoHelpFunctions::GetBoolFromAny( aValue );
ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT;
aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, eMode, 0, TRUE, TRUE );
- // SC_SIZE_DIRECT with size 0: hide
+ // SC_SIZE_DIRECT with size 0: hide
}
else if ( aNameString.EqualsAscii( SC_UNONAME_CELLFILT ) )
{
- //! undo etc.
+ //! undo etc.
if (ScUnoHelpFunctions::GetBoolFromAny( aValue ))
pDoc->SetRowFiltered(nStartRow, nEndRow, nTab, true);
else
@@ -3269,7 +3269,7 @@ void SAL_CALL ScTableRowsObj::setPropertyValue(
}
else if ( aNameString.EqualsAscii( SC_UNONAME_NEWPAGE) || aNameString.EqualsAscii( SC_UNONAME_MANPAGE) )
{
- //! single function to set/remove all breaks?
+ //! single function to set/remove all breaks?
BOOL bSet = ScUnoHelpFunctions::GetBoolFromAny( aValue );
for (SCROW nRow=nStartRow; nRow<=nEndRow; nRow++)
if (bSet)
@@ -3303,7 +3303,7 @@ uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const rtl::OUString& aProper
String aNameString(aPropertyName);
uno::Any aAny;
- //! loop over all rows for current state?
+ //! loop over all rows for current state?
if ( aNameString.EqualsAscii( SC_UNONAME_CELLHGT ) )
{
@@ -3368,12 +3368,12 @@ ScSpreadsheetSettingsObj::~ScSpreadsheetSettingsObj()
void ScSpreadsheetSettingsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // Referenz-Update interessiert hier nicht
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -3382,7 +3382,7 @@ void ScSpreadsheetSettingsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettingsObj::getPropertySetInfo()
throw(uno::RuntimeException)
{
- //! muss noch
+ //! muss noch
return NULL;
}
@@ -3392,14 +3392,14 @@ void SAL_CALL ScSpreadsheetSettingsObj::setPropertyValue(
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException)
{
- //! muss noch
+ //! muss noch
}
uno::Any SAL_CALL ScSpreadsheetSettingsObj::getPropertyValue( const rtl::OUString& /* aPropertyName */ )
throw(beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
- //! muss noch
+ //! muss noch
return uno::Any();
}
@@ -3422,12 +3422,12 @@ ScAnnotationsObj::~ScAnnotationsObj()
void ScAnnotationsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- //! nTab bei Referenz-Update anpassen!!!
+ //! nTab bei Referenz-Update anpassen!!!
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -3505,7 +3505,7 @@ void SAL_CALL ScAnnotationsObj::removeByIndex( sal_Int32 nIndex ) throw(uno::Run
uno::Reference<container::XEnumeration> SAL_CALL ScAnnotationsObj::createEnumeration()
throw(uno::RuntimeException)
{
- //! iterate directly (more efficiently)?
+ //! iterate directly (more efficiently)?
ScUnoGuard aGuard;
return new ScIndexEnumeration(this, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.CellAnnotationsEnumeration")));
@@ -3556,7 +3556,7 @@ sal_Bool SAL_CALL ScAnnotationsObj::hasElements() throw(uno::RuntimeException)
ScScenariosObj::ScScenariosObj(ScDocShell* pDocSh, SCTAB nT) :
pDocShell( pDocSh ),
- nTab ( nT )
+ nTab ( nT )
{
pDocShell->GetDocument()->AddUnoObject(*this);
}
@@ -3573,12 +3573,12 @@ void ScScenariosObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
// const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint;
- //! Referenz-Update fuer Tab und Start/Ende
+ //! Referenz-Update fuer Tab und Start/Ende
}
else if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -3586,7 +3586,7 @@ void ScScenariosObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
BOOL ScScenariosObj::GetScenarioIndex_Impl( const rtl::OUString& rName, SCTAB& rIndex )
{
- //! Case-insensitiv ????
+ //! Case-insensitiv ????
if ( pDocShell )
{
@@ -3613,7 +3613,7 @@ ScTableSheetObj* ScScenariosObj::GetObjectByIndex_Impl(sal_Int32 nIndex)
if ( pDocShell && nIndex >= 0 && nIndex < nCount )
return new ScTableSheetObj( pDocShell, nTab+static_cast<SCTAB>(nIndex)+1 );
- return NULL; // kein Dokument oder falscher Index
+ return NULL; // kein Dokument oder falscher Index
}
ScTableSheetObj* ScScenariosObj::GetObjectByName_Impl(const rtl::OUString& aName)
@@ -3622,7 +3622,7 @@ ScTableSheetObj* ScScenariosObj::GetObjectByName_Impl(const rtl::OUString& aName
if ( pDocShell && GetScenarioIndex_Impl( aName, nIndex ) )
return new ScTableSheetObj( pDocShell, nTab+nIndex+1 );
- return NULL; // nicht gefunden
+ return NULL; // nicht gefunden
}
void SAL_CALL ScScenariosObj::addNewByName( const rtl::OUString& aName,
@@ -3653,7 +3653,7 @@ void SAL_CALL ScScenariosObj::addNewByName( const rtl::OUString& aName,
String aNameStr(aName);
String aCommStr(aComment);
- Color aColor( COL_LIGHTGRAY ); // Default
+ Color aColor( COL_LIGHTGRAY ); // Default
USHORT nFlags = SC_SCENARIO_SHOWFRAME | SC_SCENARIO_PRINTFRAME | SC_SCENARIO_TWOWAY | SC_SCENARIO_PROTECT;
pDocShell->MakeScenario( nTab, aNameStr, aCommStr, aColor, nFlags, aMarkData );
@@ -3749,7 +3749,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScScenariosObj::getElementNames()
SCTAB nCount = (SCTAB)getCount();
uno::Sequence<rtl::OUString> aSeq(nCount);
- if ( pDocShell ) // sonst ist auch Count = 0
+ if ( pDocShell ) // sonst ist auch Count = 0
{
String aTabName;
ScDocument* pDoc = pDocShell->GetDocument();
diff --git a/sc/source/ui/unoobj/drdefuno.cxx b/sc/source/ui/unoobj/drdefuno.cxx
index 52fce55dfc58..f60ef0edbeb6 100644
--- a/sc/source/ui/unoobj/drdefuno.cxx
+++ b/sc/source/ui/unoobj/drdefuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScDrawDefaultsObj::ScDrawDefaultsObj(ScDocShell* pDocSh) :
SvxUnoDrawPool( NULL ),
pDocShell( pDocSh )
{
- // SvxUnoDrawPool is initialized without model,
- // draw layer is created on demand in getModelPool
+ // SvxUnoDrawPool is initialized without model,
+ // draw layer is created on demand in getModelPool
pDocShell->GetDocument()->AddUnoObject(*this);
}
@@ -59,7 +59,7 @@ void ScDrawDefaultsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // document gone
+ pDocShell = NULL; // document gone
}
}
@@ -75,7 +75,7 @@ SfxItemPool* ScDrawDefaultsObj::getModelPool( sal_Bool bReadOnly ) throw()
pRet = &pModel->GetItemPool();
}
if ( !pRet )
- pRet = SvxUnoDrawPool::getModelPool( bReadOnly ); // uses default pool
+ pRet = SvxUnoDrawPool::getModelPool( bReadOnly ); // uses default pool
return pRet;
}
diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx
index 7febe374d0d9..b7adabd64f95 100644
--- a/sc/source/ui/unoobj/editsrc.cxx
+++ b/sc/source/ui/unoobj/editsrc.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +69,9 @@ ScHeaderFooterChangedHint::~ScHeaderFooterChangedHint()
ScSharedHeaderFooterEditSource::ScSharedHeaderFooterEditSource( ScHeaderFooterTextData* pData ) :
pTextData( pData )
{
- // pTextData is held by the ScHeaderFooterTextObj.
- // Text range and cursor keep a reference to their parent text, so the text object is
- // always alive and the TextData is valid as long as there are children.
+ // pTextData is held by the ScHeaderFooterTextObj.
+ // Text range and cursor keep a reference to their parent text, so the text object is
+ // always alive and the TextData is valid as long as there are children.
}
ScSharedHeaderFooterEditSource::~ScSharedHeaderFooterEditSource()
@@ -100,7 +100,7 @@ ScEditEngineDefaulter* ScSharedHeaderFooterEditSource::GetEditEngine()
//------------------------------------------------------------------------
-// each ScHeaderFooterEditSource object has its own ScHeaderFooterTextData
+// each ScHeaderFooterEditSource object has its own ScHeaderFooterTextData
ScHeaderFooterEditSource::ScHeaderFooterEditSource( ScHeaderFooterContentObj* pContent,
USHORT nP ) :
@@ -116,7 +116,7 @@ ScHeaderFooterEditSource::ScHeaderFooterEditSource( ScHeaderFooterContentObj& rC
ScHeaderFooterEditSource::~ScHeaderFooterEditSource()
{
- delete GetTextData(); // not accessed in ScSharedHeaderFooterEditSource dtor
+ delete GetTextData(); // not accessed in ScSharedHeaderFooterEditSource dtor
}
SvxEditSource* ScHeaderFooterEditSource::Clone() const
@@ -130,9 +130,9 @@ SvxEditSource* ScHeaderFooterEditSource::Clone() const
ScSharedCellEditSource::ScSharedCellEditSource( ScCellTextData* pData ) :
pCellTextData( pData )
{
- // pCellTextData is part of the ScCellTextObj.
- // Text range and cursor keep a reference to their parent text, so the text object is
- // always alive and the CellTextData is valid as long as there are children.
+ // pCellTextData is part of the ScCellTextObj.
+ // Text range and cursor keep a reference to their parent text, so the text object is
+ // always alive and the CellTextData is valid as long as there are children.
}
ScSharedCellEditSource::~ScSharedCellEditSource()
@@ -171,7 +171,7 @@ ScEditEngineDefaulter* ScSharedCellEditSource::GetEditEngine()
//------------------------------------------------------------------------
-// each ScCellEditSource object has its own ScCellTextData
+// each ScCellEditSource object has its own ScCellTextData
ScCellEditSource::ScCellEditSource( ScDocShell* pDocSh, const ScAddress& rP ) :
ScSharedCellEditSource( new ScCellTextData( pDocSh, rP ) )
@@ -180,7 +180,7 @@ ScCellEditSource::ScCellEditSource( ScDocShell* pDocSh, const ScAddress& rP ) :
ScCellEditSource::~ScCellEditSource()
{
- delete GetCellTextData(); // not accessed in ScSharedCellEditSource dtor
+ delete GetCellTextData(); // not accessed in ScSharedCellEditSource dtor
}
SvxEditSource* ScCellEditSource::Clone() const
@@ -204,7 +204,7 @@ ScAnnotationEditSource::ScAnnotationEditSource(ScDocShell* pDocSh, const ScAddre
ScAnnotationEditSource::~ScAnnotationEditSource()
{
- ScUnoGuard aGuard; // needed for EditEngine dtor
+ ScUnoGuard aGuard; // needed for EditEngine dtor
if (pDocShell)
pDocShell->GetDocument()->RemoveUnoObject(*this);
@@ -248,7 +248,7 @@ SvxTextForwarder* ScAnnotationEditSource::GetTextForwarder()
if ( pDocShell )
if ( ScPostIt* pNote = pDocShell->GetDocument()->GetNote( aCellPos ) )
if ( const EditTextObject* pEditObj = pNote->GetEditTextObject() )
- pEditEngine->SetText( *pEditObj ); // incl. Umbrueche
+ pEditEngine->SetText( *pEditObj ); // incl. Umbrueche
bDataValid = TRUE;
return pForwarder;
@@ -270,7 +270,7 @@ void ScAnnotationEditSource::UpdateData()
pObj->ActionChanged();
}
- //! Undo !!!
+ //! Undo !!!
aModificator.SetDocumentModified();
@@ -284,20 +284,20 @@ void ScAnnotationEditSource::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
// const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint;
- //! Ref-Update
+ //! Ref-Update
}
else if ( rHint.ISA( SfxSimpleHint ) )
{
ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
if ( nId == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
DELETEZ( pForwarder );
- DELETEZ( pEditEngine ); // EditEngine uses document's pool
+ DELETEZ( pEditEngine ); // EditEngine uses document's pool
}
else if ( nId == SFX_HINT_DATACHANGED )
- bDataValid = FALSE; // Text muss neu geholt werden
+ bDataValid = FALSE; // Text muss neu geholt werden
}
}
@@ -306,9 +306,9 @@ void ScAnnotationEditSource::Notify( SfxBroadcaster&, const SfxHint& rHint )
ScSimpleEditSource::ScSimpleEditSource( SvxTextForwarder* pForw ) :
pForwarder( pForw )
{
- // The same forwarder (and EditEngine) is shared by all children of the same Text object.
- // Text range and cursor keep a reference to their parent text, so the text object is
- // always alive and the forwarder is valid as long as there are children.
+ // The same forwarder (and EditEngine) is shared by all children of the same Text object.
+ // Text range and cursor keep a reference to their parent text, so the text object is
+ // always alive and the forwarder is valid as long as there are children.
}
ScSimpleEditSource::~ScSimpleEditSource()
@@ -327,7 +327,7 @@ SvxTextForwarder* ScSimpleEditSource::GetTextForwarder()
void ScSimpleEditSource::UpdateData()
{
- // nothing
+ // nothing
}
//------------------------------------------------------------------------
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 8e3e39d07ef4..94e22b67cc39 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "hints.hxx"
#include "editsrc.hxx"
#include "cellsuno.hxx"
-#include "servuno.hxx" // fuer IDs
+#include "servuno.hxx" // fuer IDs
#include "unoguard.hxx"
#include "unonames.hxx"
#include "editutil.hxx"
@@ -58,7 +58,7 @@ using namespace com::sun::star;
//------------------------------------------------------------------------
-// alles ohne Which-ID, Map nur fuer PropertySetInfo
+// alles ohne Which-ID, Map nur fuer PropertySetInfo
const SfxItemPropertySet* lcl_GetURLPropertySet()
{
@@ -105,15 +105,15 @@ const SfxItemPropertySet* lcl_GetFileFieldPropertySet()
//------------------------------------------------------------------------
-#define SCTEXTFIELD_SERVICE "com.sun.star.text.TextField"
-#define SCTEXTCONTENT_SERVICE "com.sun.star.text.TextContent"
+#define SCTEXTFIELD_SERVICE "com.sun.star.text.TextField"
+#define SCTEXTCONTENT_SERVICE "com.sun.star.text.TextContent"
SC_SIMPLE_SERVICE_INFO( ScCellFieldsObj, "ScCellFieldsObj", "com.sun.star.text.TextFields" )
SC_SIMPLE_SERVICE_INFO( ScHeaderFieldsObj, "ScHeaderFieldsObj", "com.sun.star.text.TextFields" )
//------------------------------------------------------------------------
-// ScUnoEditEngine nur um aus einer EditEngine die Felder herauszubekommen...
+// ScUnoEditEngine nur um aus einer EditEngine die Felder herauszubekommen...
enum ScUnoCollectMode
{
@@ -125,28 +125,28 @@ enum ScUnoCollectMode
class ScUnoEditEngine : public ScEditEngineDefaulter
{
- ScUnoCollectMode eMode;
- USHORT nFieldCount;
- TypeId aFieldType;
- SvxFieldData* pFound; // lokale Kopie
- USHORT nFieldPar;
- xub_StrLen nFieldPos;
- USHORT nFieldIndex;
+ ScUnoCollectMode eMode;
+ USHORT nFieldCount;
+ TypeId aFieldType;
+ SvxFieldData* pFound; // lokale Kopie
+ USHORT nFieldPar;
+ xub_StrLen nFieldPos;
+ USHORT nFieldIndex;
public:
ScUnoEditEngine(ScEditEngineDefaulter* pSource);
~ScUnoEditEngine();
- //! nPos should be xub_StrLen
- virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos,
+ //! nPos should be xub_StrLen
+ virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos,
Color*& rTxtColor, Color*& rFldColor );
- USHORT CountFields(TypeId aType);
- SvxFieldData* FindByIndex(USHORT nIndex, TypeId aType);
- SvxFieldData* FindByPos(USHORT nPar, xub_StrLen nPos, TypeId aType);
+ USHORT CountFields(TypeId aType);
+ SvxFieldData* FindByIndex(USHORT nIndex, TypeId aType);
+ SvxFieldData* FindByPos(USHORT nPar, xub_StrLen nPos, TypeId aType);
- USHORT GetFieldPar() const { return nFieldPar; }
- xub_StrLen GetFieldPos() const { return nFieldPos; }
+ USHORT GetFieldPar() const { return nFieldPar; }
+ xub_StrLen GetFieldPos() const { return nFieldPos; }
};
ScUnoEditEngine::ScUnoEditEngine(ScEditEngineDefaulter* pSource) :
@@ -175,7 +175,7 @@ String ScUnoEditEngine::CalcFieldValue( const SvxFieldItem& rField,
String aRet(EditEngine::CalcFieldValue( rField, nPara, nPos, rTxtColor, rFldColor ));
if (eMode != SC_UNO_COLLECT_NONE)
{
- const SvxFieldData* pFieldData = rField.GetField();
+ const SvxFieldData* pFieldData = rField.GetField();
if ( pFieldData )
{
if ( !aFieldType || pFieldData->Type() == aFieldType )
@@ -278,30 +278,30 @@ void ScCellFieldsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
// const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint;
- //! Ref-Update
+ //! Ref-Update
}
else if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
- // EditSource hat sich selber als Listener angemeldet
+ // EditSource hat sich selber als Listener angemeldet
}
// XIndexAccess (via XTextFields)
ScCellFieldObj* ScCellFieldsObj::GetObjectByIndex_Impl(INT32 Index) const
{
- //! Feld-Funktionen muessen an den Forwarder !!!
+ //! Feld-Funktionen muessen an den Forwarder !!!
ScEditEngineDefaulter* pEditEngine = ((ScCellEditSource*)pEditSource)->GetEditEngine();
ScUnoEditEngine aTempEngine(pEditEngine);
- if ( aTempEngine.FindByIndex( (USHORT)Index, NULL ) ) // in der Zelle ist der Typ egal
+ if ( aTempEngine.FindByIndex( (USHORT)Index, NULL ) ) // in der Zelle ist der Typ egal
{
USHORT nPar = aTempEngine.GetFieldPar();
xub_StrLen nPos = aTempEngine.GetFieldPos();
- ESelection aSelection( nPar, nPos, nPar, nPos+1 ); // Feld ist 1 Zeichen
+ ESelection aSelection( nPar, nPos, nPar, nPos+1 ); // Feld ist 1 Zeichen
return new ScCellFieldObj( pDocShell, aCellPos, aSelection );
}
return NULL;
@@ -311,11 +311,11 @@ sal_Int32 SAL_CALL ScCellFieldsObj::getCount() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- //! Feld-Funktionen muessen an den Forwarder !!!
+ //! Feld-Funktionen muessen an den Forwarder !!!
ScEditEngineDefaulter* pEditEngine = ((ScCellEditSource*)pEditSource)->GetEditEngine();
ScUnoEditEngine aTempEngine(pEditEngine);
- return aTempEngine.CountFields(NULL); // Felder zaehlen, in Zelle ist der Typ egal
+ return aTempEngine.CountFields(NULL); // Felder zaehlen, in Zelle ist der Typ egal
}
uno::Any SAL_CALL ScCellFieldsObj::getByIndex( sal_Int32 nIndex )
@@ -394,7 +394,7 @@ void SAL_CALL ScCellFieldsObj::refresh( )
}
catch(uno::RuntimeException&)
{
-// DBG_ERROR("a object is gone without to remove from Broadcaster");
+// DBG_ERROR("a object is gone without to remove from Broadcaster");
++pInterfaces;
++i;
}
@@ -429,7 +429,7 @@ void SAL_CALL ScCellFieldsObj::removeRefreshListener( const uno::Reference<util:
//------------------------------------------------------------------------
-// Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht
+// Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht
//UNUSED2008-05 ScCellFieldObj::ScCellFieldObj() :
@@ -448,7 +448,7 @@ ScCellFieldObj::ScCellFieldObj(ScDocShell* pDocSh, const ScAddress& rPos,
aCellPos( rPos ),
aSelection( rSel )
{
- // pDocShell ist Null, wenn per ServiceProvider erzeugt
+ // pDocShell ist Null, wenn per ServiceProvider erzeugt
if (pDocShell)
{
@@ -463,12 +463,12 @@ uno::Any SAL_CALL ScCellFieldObj::queryAggregation( const uno::Type& rType )
throw(uno::RuntimeException)
{
SC_QUERYINTERFACE( text::XTextField )
- SC_QUERYINTERFACE( text::XTextContent ) // parent of XTextField
+ SC_QUERYINTERFACE( text::XTextContent ) // parent of XTextField
SC_QUERYINTERFACE( beans::XPropertySet )
SC_QUERYINTERFACE( lang::XUnoTunnel )
SC_QUERYINTERFACE( lang::XServiceInfo )
- return OComponentHelper::queryAggregation( rType ); // XComponent
+ return OComponentHelper::queryAggregation( rType ); // XComponent
}
uno::Sequence<uno::Type> SAL_CALL ScCellFieldObj::getTypes() throw(uno::RuntimeException)
@@ -488,7 +488,7 @@ uno::Sequence<uno::Type> SAL_CALL ScCellFieldObj::getTypes() throw(uno::RuntimeE
pPtr[nParentLen + 3] = getCppuType((const uno::Reference<lang::XServiceInfo>*)0);
for (long i=0; i<nParentLen; i++)
- pPtr[i] = pParentPtr[i]; // parent types first
+ pPtr[i] = pParentPtr[i]; // parent types first
}
return aTypes;
}
@@ -545,21 +545,21 @@ ScCellFieldObj::~ScCellFieldObj()
void ScCellFieldObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- //! Updates fuer aSelection (muessen erst noch erzeugt werden) !!!!!!
+ //! Updates fuer aSelection (muessen erst noch erzeugt werden) !!!!!!
if ( rHint.ISA( ScUpdateRefHint ) )
{
// const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint;
- //! Ref-Update
+ //! Ref-Update
}
else if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
- // EditSource hat sich selber als Listener angemeldet
+ // EditSource hat sich selber als Listener angemeldet
}
// per getImplementation gerufen:
@@ -581,7 +581,7 @@ void ScCellFieldObj::DeleteField()
if (pEditSource)
{
SvxTextForwarder* pForwarder = pEditSource->GetTextForwarder();
-// pEditEngine->QuickDelete( aSelection );
+// pEditEngine->QuickDelete( aSelection );
pForwarder->QuickInsertText( String(), aSelection );
pEditSource->UpdateData();
@@ -589,7 +589,7 @@ void ScCellFieldObj::DeleteField()
aSelection.nEndPos = aSelection.nStartPos;
//! Broadcast, um Selektion in anderen Objekten anzupassen
- //! (auch bei anderen Aktionen)
+ //! (auch bei anderen Aktionen)
}
}
@@ -603,11 +603,11 @@ rtl::OUString SAL_CALL ScCellFieldObj::getPresentation( sal_Bool bShowCommand )
if (pEditSource)
{
- //! Feld-Funktionen muessen an den Forwarder !!!
+ //! Feld-Funktionen muessen an den Forwarder !!!
ScEditEngineDefaulter* pEditEngine = ((ScCellEditSource*)pEditSource)->GetEditEngine();
ScUnoEditEngine aTempEngine(pEditEngine);
- // Typ egal (in Zellen gibts nur URLs)
+ // Typ egal (in Zellen gibts nur URLs)
SvxFieldData* pField = aTempEngine.FindByPos( aSelection.nStartPara, aSelection.nStartPos, 0 );
DBG_ASSERT(pField,"getPresentation: Feld nicht gefunden");
if (pField)
@@ -689,16 +689,16 @@ void SAL_CALL ScCellFieldObj::setPropertyValue(
rtl::OUString aStrVal;
if (pEditSource)
{
- //! Feld-Funktionen muessen an den Forwarder !!!
+ //! Feld-Funktionen muessen an den Forwarder !!!
ScEditEngineDefaulter* pEditEngine = ((ScCellEditSource*)pEditSource)->GetEditEngine();
ScUnoEditEngine aTempEngine(pEditEngine);
- // Typ egal (in Zellen gibts nur URLs)
+ // Typ egal (in Zellen gibts nur URLs)
SvxFieldData* pField = aTempEngine.FindByPos( aSelection.nStartPara, aSelection.nStartPos, 0 );
DBG_ASSERT(pField,"setPropertyValue: Feld nicht gefunden");
if (pField)
{
- SvxURLField* pURL = (SvxURLField*)pField; // ist eine Kopie in der ScUnoEditEngine
+ SvxURLField* pURL = (SvxURLField*)pField; // ist eine Kopie in der ScUnoEditEngine
BOOL bOk = TRUE;
if ( aNameString.EqualsAscii( SC_UNONAME_URL ) )
@@ -726,7 +726,7 @@ void SAL_CALL ScCellFieldObj::setPropertyValue(
}
}
}
- else // noch nicht eingefuegt
+ else // noch nicht eingefuegt
{
if ( aNameString.EqualsAscii( SC_UNONAME_URL ) )
{
@@ -768,11 +768,11 @@ uno::Any SAL_CALL ScCellFieldObj::getPropertyValue( const rtl::OUString& aProper
aRet <<= text::WrapTextMode_NONE;
else if (pEditSource)
{
- //! Feld-Funktionen muessen an den Forwarder !!!
+ //! Feld-Funktionen muessen an den Forwarder !!!
ScEditEngineDefaulter* pEditEngine = ((ScCellEditSource*)pEditSource)->GetEditEngine();
ScUnoEditEngine aTempEngine(pEditEngine);
- // Typ egal (in Zellen gibts nur URLs)
+ // Typ egal (in Zellen gibts nur URLs)
SvxFieldData* pField = aTempEngine.FindByPos( aSelection.nStartPara, aSelection.nStartPos, 0 );
DBG_ASSERT(pField,"getPropertyValue: Feld nicht gefunden");
if (pField)
@@ -787,7 +787,7 @@ uno::Any SAL_CALL ScCellFieldObj::getPropertyValue( const rtl::OUString& aProper
aRet <<= rtl::OUString( pURL->GetTargetFrame() );
}
}
- else // noch nicht eingefuegt
+ else // noch nicht eingefuegt
{
if ( aNameString.EqualsAscii( SC_UNONAME_URL ) )
aRet <<= rtl::OUString( aUrl );
@@ -880,7 +880,7 @@ ScHeaderFieldsObj::ScHeaderFieldsObj(ScHeaderFooterContentObj* pContent, USHORT
if (pContentObj)
{
- pContentObj->acquire(); // darf nicht wegkommen
+ pContentObj->acquire(); // darf nicht wegkommen
pEditSource = new ScHeaderFooterEditSource( pContentObj, nPart );
}
else
@@ -913,20 +913,20 @@ ScHeaderFieldsObj::~ScHeaderFieldsObj()
ScHeaderFieldObj* ScHeaderFieldsObj::GetObjectByIndex_Impl(INT32 Index) const
{
- //! Feld-Funktionen muessen an den Forwarder !!!
+ //! Feld-Funktionen muessen an den Forwarder !!!
ScEditEngineDefaulter* pEditEngine = ((ScHeaderFooterEditSource*)pEditSource)->GetEditEngine();
ScUnoEditEngine aTempEngine(pEditEngine);
TypeId aTypeId = NULL;
switch (nType)
{
- case SC_SERVICE_PAGEFIELD: aTypeId = TYPE(SvxPageField); break;
- case SC_SERVICE_PAGESFIELD: aTypeId = TYPE(SvxPagesField); break;
- case SC_SERVICE_DATEFIELD: aTypeId = TYPE(SvxDateField); break;
- case SC_SERVICE_TIMEFIELD: aTypeId = TYPE(SvxTimeField); break;
- case SC_SERVICE_TITLEFIELD: aTypeId = TYPE(SvxFileField); break;
- case SC_SERVICE_FILEFIELD: aTypeId = TYPE(SvxExtFileField); break;
- case SC_SERVICE_SHEETFIELD: aTypeId = TYPE(SvxTableField); break;
+ case SC_SERVICE_PAGEFIELD: aTypeId = TYPE(SvxPageField); break;
+ case SC_SERVICE_PAGESFIELD: aTypeId = TYPE(SvxPagesField); break;
+ case SC_SERVICE_DATEFIELD: aTypeId = TYPE(SvxDateField); break;
+ case SC_SERVICE_TIMEFIELD: aTypeId = TYPE(SvxTimeField); break;
+ case SC_SERVICE_TITLEFIELD: aTypeId = TYPE(SvxFileField); break;
+ case SC_SERVICE_FILEFIELD: aTypeId = TYPE(SvxExtFileField); break;
+ case SC_SERVICE_SHEETFIELD: aTypeId = TYPE(SvxTableField); break;
// bei SC_SERVICE_INVALID bleibt TypeId Null
}
SvxFieldData* pData = aTempEngine.FindByIndex( (USHORT)Index, aTypeId );
@@ -938,16 +938,16 @@ ScHeaderFieldObj* ScHeaderFieldsObj::GetObjectByIndex_Impl(INT32 Index) const
USHORT nFieldType = nType;
if ( nFieldType == SC_SERVICE_INVALID )
{
- if ( pData->ISA( SvxPageField ) ) nFieldType = SC_SERVICE_PAGEFIELD;
- else if ( pData->ISA( SvxPagesField ) ) nFieldType = SC_SERVICE_PAGESFIELD;
- else if ( pData->ISA( SvxDateField ) ) nFieldType = SC_SERVICE_DATEFIELD;
- else if ( pData->ISA( SvxTimeField ) ) nFieldType = SC_SERVICE_TIMEFIELD;
- else if ( pData->ISA( SvxFileField ) ) nFieldType = SC_SERVICE_TITLEFIELD;
+ if ( pData->ISA( SvxPageField ) ) nFieldType = SC_SERVICE_PAGEFIELD;
+ else if ( pData->ISA( SvxPagesField ) ) nFieldType = SC_SERVICE_PAGESFIELD;
+ else if ( pData->ISA( SvxDateField ) ) nFieldType = SC_SERVICE_DATEFIELD;
+ else if ( pData->ISA( SvxTimeField ) ) nFieldType = SC_SERVICE_TIMEFIELD;
+ else if ( pData->ISA( SvxFileField ) ) nFieldType = SC_SERVICE_TITLEFIELD;
else if ( pData->ISA( SvxExtFileField ) ) nFieldType = SC_SERVICE_FILEFIELD;
- else if ( pData->ISA( SvxTableField ) ) nFieldType = SC_SERVICE_SHEETFIELD;
+ else if ( pData->ISA( SvxTableField ) ) nFieldType = SC_SERVICE_SHEETFIELD;
}
- ESelection aSelection( nPar, nPos, nPar, nPos+1 ); // Field is 1 character
+ ESelection aSelection( nPar, nPos, nPar, nPos+1 ); // Field is 1 character
return new ScHeaderFieldObj( pContentObj, nPart, nFieldType, aSelection );
}
return NULL;
@@ -957,22 +957,22 @@ sal_Int32 SAL_CALL ScHeaderFieldsObj::getCount() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- //! Feld-Funktionen muessen an den Forwarder !!!
+ //! Feld-Funktionen muessen an den Forwarder !!!
ScEditEngineDefaulter* pEditEngine = ((ScHeaderFooterEditSource*)pEditSource)->GetEditEngine();
ScUnoEditEngine aTempEngine(pEditEngine);
TypeId aTypeId = NULL;
switch (nType)
{
- case SC_SERVICE_PAGEFIELD: aTypeId = TYPE(SvxPageField); break;
- case SC_SERVICE_PAGESFIELD: aTypeId = TYPE(SvxPagesField); break;
- case SC_SERVICE_DATEFIELD: aTypeId = TYPE(SvxDateField); break;
- case SC_SERVICE_TIMEFIELD: aTypeId = TYPE(SvxTimeField); break;
- case SC_SERVICE_TITLEFIELD: aTypeId = TYPE(SvxFileField); break;
- case SC_SERVICE_FILEFIELD: aTypeId = TYPE(SvxExtFileField); break;
- case SC_SERVICE_SHEETFIELD: aTypeId = TYPE(SvxTableField); break;
+ case SC_SERVICE_PAGEFIELD: aTypeId = TYPE(SvxPageField); break;
+ case SC_SERVICE_PAGESFIELD: aTypeId = TYPE(SvxPagesField); break;
+ case SC_SERVICE_DATEFIELD: aTypeId = TYPE(SvxDateField); break;
+ case SC_SERVICE_TIMEFIELD: aTypeId = TYPE(SvxTimeField); break;
+ case SC_SERVICE_TITLEFIELD: aTypeId = TYPE(SvxFileField); break;
+ case SC_SERVICE_FILEFIELD: aTypeId = TYPE(SvxExtFileField); break;
+ case SC_SERVICE_SHEETFIELD: aTypeId = TYPE(SvxTableField); break;
}
- return aTempEngine.CountFields(aTypeId); // Felder zaehlen
+ return aTempEngine.CountFields(aTypeId); // Felder zaehlen
}
uno::Any SAL_CALL ScHeaderFieldsObj::getByIndex( sal_Int32 nIndex )
@@ -1051,7 +1051,7 @@ void SAL_CALL ScHeaderFieldsObj::refresh( )
}
catch(uno::RuntimeException&)
{
-// DBG_ERROR("a object is gone without to remove from Broadcaster");
+// DBG_ERROR("a object is gone without to remove from Broadcaster");
++pInterfaces;
++i;
}
@@ -1090,10 +1090,10 @@ SvxFileFormat lcl_UnoToSvxFileFormat( sal_Int16 nUnoValue )
{
switch( nUnoValue )
{
- case text::FilenameDisplayFormat::FULL: return SVXFILEFORMAT_FULLPATH;
- case text::FilenameDisplayFormat::PATH: return SVXFILEFORMAT_PATH;
- case text::FilenameDisplayFormat::NAME: return SVXFILEFORMAT_NAME;
-// case text::FilenameDisplayFormat::NAME_AND_EXT:
+ case text::FilenameDisplayFormat::FULL: return SVXFILEFORMAT_FULLPATH;
+ case text::FilenameDisplayFormat::PATH: return SVXFILEFORMAT_PATH;
+ case text::FilenameDisplayFormat::NAME: return SVXFILEFORMAT_NAME;
+// case text::FilenameDisplayFormat::NAME_AND_EXT:
default:
return SVXFILEFORMAT_NAME_EXT;
}
@@ -1103,17 +1103,17 @@ sal_Int16 lcl_SvxToUnoFileFormat( SvxFileFormat nSvxValue )
{
switch( nSvxValue )
{
- case SVXFILEFORMAT_NAME_EXT: return text::FilenameDisplayFormat::NAME_AND_EXT;
- case SVXFILEFORMAT_FULLPATH: return text::FilenameDisplayFormat::FULL;
- case SVXFILEFORMAT_PATH: return text::FilenameDisplayFormat::PATH;
-// case SVXFILEFORMAT_NAME:
+ case SVXFILEFORMAT_NAME_EXT: return text::FilenameDisplayFormat::NAME_AND_EXT;
+ case SVXFILEFORMAT_FULLPATH: return text::FilenameDisplayFormat::FULL;
+ case SVXFILEFORMAT_PATH: return text::FilenameDisplayFormat::PATH;
+// case SVXFILEFORMAT_NAME:
default:
return text::FilenameDisplayFormat::NAME;
}
}
-// Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht
+// Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht
//UNUSED2008-05 ScHeaderFieldObj::ScHeaderFieldObj() :
//UNUSED2008-05 OComponentHelper( getMutex() ),
//UNUSED2008-05 aPropSet( lcl_GetHeaderFieldPropertyMap() ),
@@ -1135,11 +1135,11 @@ ScHeaderFieldObj::ScHeaderFieldObj(ScHeaderFooterContentObj* pContent, USHORT nP
aSelection( rSel ),
nFileFormat( SVXFILEFORMAT_NAME_EXT )
{
- // pContent ist Null, wenn per ServiceProvider erzeugt
+ // pContent ist Null, wenn per ServiceProvider erzeugt
if (pContentObj)
{
- pContentObj->acquire(); // darf nicht wegkommen
+ pContentObj->acquire(); // darf nicht wegkommen
pEditSource = new ScHeaderFooterEditSource( pContentObj, nPart );
}
else
@@ -1150,12 +1150,12 @@ uno::Any SAL_CALL ScHeaderFieldObj::queryAggregation( const uno::Type& rType )
throw(uno::RuntimeException)
{
SC_QUERYINTERFACE( text::XTextField )
- SC_QUERYINTERFACE( text::XTextContent ) // parent of XTextField
+ SC_QUERYINTERFACE( text::XTextContent ) // parent of XTextField
SC_QUERYINTERFACE( beans::XPropertySet )
SC_QUERYINTERFACE( lang::XUnoTunnel )
SC_QUERYINTERFACE( lang::XServiceInfo )
- return OComponentHelper::queryAggregation( rType ); // XComponent
+ return OComponentHelper::queryAggregation( rType ); // XComponent
}
uno::Sequence<uno::Type> SAL_CALL ScHeaderFieldObj::getTypes() throw(uno::RuntimeException)
@@ -1175,7 +1175,7 @@ uno::Sequence<uno::Type> SAL_CALL ScHeaderFieldObj::getTypes() throw(uno::Runtim
pPtr[nParentLen + 3] = getCppuType((const uno::Reference<lang::XServiceInfo>*)0);
for (long i=0; i<nParentLen; i++)
- pPtr[i] = pParentPtr[i]; // parent types first
+ pPtr[i] = pParentPtr[i]; // parent types first
}
return aTypes;
}
@@ -1219,7 +1219,7 @@ void ScHeaderFieldObj::InitDoc( ScHeaderFooterContentObj* pContent, USHORT nP,
nPart = nP;
pContentObj = pContent;
- pContentObj->acquire(); // darf nicht wegkommen
+ pContentObj->acquire(); // darf nicht wegkommen
pEditSource = new ScHeaderFooterEditSource( pContentObj, nPart );
}
}
@@ -1286,7 +1286,7 @@ void ScHeaderFieldObj::DeleteField()
if (pEditSource)
{
SvxTextForwarder* pForwarder = pEditSource->GetTextForwarder();
-// pEditEngine->QuickDelete( aSelection );
+// pEditEngine->QuickDelete( aSelection );
pForwarder->QuickInsertText( String(), aSelection );
pEditSource->UpdateData();
@@ -1294,7 +1294,7 @@ void ScHeaderFieldObj::DeleteField()
aSelection.nEndPos = aSelection.nStartPos;
//! Broadcast, um Selektion in anderen Objekten anzupassen
- //! (auch bei anderen Aktionen)
+ //! (auch bei anderen Aktionen)
}
}
@@ -1379,7 +1379,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScHeaderFieldObj::getPropertySe
ScUnoGuard aGuard;
if (nType == SC_SERVICE_FILEFIELD)
{
- // file field has different properties
+ // file field has different properties
static uno::Reference<beans::XPropertySetInfo> aFileFieldInfo = pPropSet->getPropertySetInfo();
return aFileFieldInfo;
}
@@ -1413,7 +1413,7 @@ void SAL_CALL ScHeaderFieldObj::setPropertyValue(
DBG_ASSERT(pField,"setPropertyValue: Field not found");
if (pField)
{
- SvxExtFileField* pExtFile = (SvxExtFileField*)pField; // local to the ScUnoEditEngine
+ SvxExtFileField* pExtFile = (SvxExtFileField*)pField; // local to the ScUnoEditEngine
pExtFile->SetFormat( eFormat );
pEditEngine->QuickInsertField( SvxFieldItem(*pField, EE_FEATURE_FIELD), aSelection );
pEditSource->UpdateData();
@@ -1431,7 +1431,7 @@ uno::Any SAL_CALL ScHeaderFieldObj::getPropertyValue( const rtl::OUString& aProp
{
ScUnoGuard aGuard;
- //! Properties?
+ //! Properties?
uno::Any aRet;
String aNameString(aPropertyName);
@@ -1464,7 +1464,7 @@ uno::Any SAL_CALL ScHeaderFieldObj::getPropertyValue( const rtl::OUString& aProp
}
}
else
- eFormat = (SvxFileFormat) nFileFormat; // not inserted yet - use stored value
+ eFormat = (SvxFileFormat) nFileFormat; // not inserted yet - use stored value
sal_Int16 nIntVal = lcl_SvxToUnoFileFormat( eFormat );
aRet <<= nIntVal;
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index efe804784a40..6a472b181151 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +57,15 @@ using ::rtl::OUStringBuffer;
//------------------------------------------------------------------------
-#define SCFILTEROPTIONSOBJ_SERVICE "com.sun.star.ui.dialogs.FilterOptionsDialog"
-#define SCFILTEROPTIONSOBJ_IMPLNAME "com.sun.star.comp.Calc.FilterOptionsDialog"
+#define SCFILTEROPTIONSOBJ_SERVICE "com.sun.star.ui.dialogs.FilterOptionsDialog"
+#define SCFILTEROPTIONSOBJ_IMPLNAME "com.sun.star.comp.Calc.FilterOptionsDialog"
SC_SIMPLE_SERVICE_INFO( ScFilterOptionsObj, SCFILTEROPTIONSOBJ_IMPLNAME, SCFILTEROPTIONSOBJ_SERVICE )
#define SC_UNONAME_FILENAME "URL"
-#define SC_UNONAME_FILTERNAME "FilterName"
-#define SC_UNONAME_FILTEROPTIONS "FilterOptions"
-#define SC_UNONAME_INPUTSTREAM "InputStream"
+#define SC_UNONAME_FILTERNAME "FilterName"
+#define SC_UNONAME_FILTEROPTIONS "FilterOptions"
+#define SC_UNONAME_INPUTSTREAM "InputStream"
//------------------------------------------------------------------------
@@ -80,7 +80,7 @@ ScFilterOptionsObj::~ScFilterOptionsObj()
// stuff for exService_...
-uno::Reference<uno::XInterface> SAL_CALL ScFilterOptionsObj_CreateInstance(
+uno::Reference<uno::XInterface> SAL_CALL ScFilterOptionsObj_CreateInstance(
const uno::Reference<lang::XMultiServiceFactory>& )
{
ScUnoGuard aGuard;
@@ -154,7 +154,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
if ( !bExport && aFilterString == ScDocShell::GetAsciiFilterName() )
{
- // ascii import is special...
+ // ascii import is special...
INetURLObject aURL( aFileName );
String aExt(aURL.getExtension());
@@ -192,12 +192,12 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
// HTML import.
::std::auto_ptr<AbstractScTextImportOptionsDlg> pDlg(
pFact->CreateScTextImportOptionsDlg(NULL, RID_SCDLG_TEXT_IMPORT_OPTIONS));
-
+
if (pDlg->Execute() == RET_OK)
{
LanguageType eLang = pDlg->GetLanguageType();
OUStringBuffer aBuf;
-
+
aBuf.append(String::CreateFromInt32(static_cast<sal_Int32>(eLang)));
aBuf.append(sal_Unicode(' '));
aBuf.append(pDlg->IsDateConversionSet() ? sal_Unicode('1') : sal_Unicode('0'));
@@ -220,7 +220,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
if ( aFilterString == ScDocShell::GetAsciiFilterName() )
{
- // ascii export (import is handled above)
+ // ascii export (import is handled above)
INetURLObject aURL( aFileName );
String aExt(aURL.getExtension());
@@ -234,7 +234,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
}
else if ( aFilterString == ScDocShell::GetLotusFilterName() )
{
- // lotus is only imported
+ // lotus is only imported
DBG_ASSERT( !bExport, "Filter Options for Lotus Export is not implemented" );
aTitle = ScGlobal::GetRscString( STR_IMPORT_LOTUS );
@@ -244,12 +244,12 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
{
if ( bExport )
{
- // dBase export
+ // dBase export
aTitle = ScGlobal::GetRscString( STR_EXPORT_DBF );
}
else
{
- // dBase import
+ // dBase import
aTitle = ScGlobal::GetRscString( STR_IMPORT_DBF );
}
// common for dBase import/export
@@ -260,12 +260,12 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
{
if ( bExport )
{
- // DIF export
+ // DIF export
aTitle = ScGlobal::GetRscString( STR_EXPORT_DIF );
}
else
{
- // DIF import
+ // DIF import
aTitle = ScGlobal::GetRscString( STR_IMPORT_DIF );
}
// common for DIF import/export
@@ -273,10 +273,10 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
}
ScImportOptions aOptions( cAsciiDel, cStrDel, eEncoding);
-//CHINA001 ScImportOptionsDlg* pDlg = new ScImportOptionsDlg( NULL, bAscii,
-//CHINA001 &aOptions, &aTitle, bMultiByte, bDBEnc,
-//CHINA001 !bExport );
-//CHINA001
+//CHINA001 ScImportOptionsDlg* pDlg = new ScImportOptionsDlg( NULL, bAscii,
+//CHINA001 &aOptions, &aTitle, bMultiByte, bDBEnc,
+//CHINA001 !bExport );
+//CHINA001
AbstractScImportOptionsDlg* pDlg = pFact->CreateScImportOptionsDlg( NULL, RID_SCDLG_IMPORTOPT,
bAscii, &aOptions, &aTitle, bMultiByte, bDBEnc,
@@ -294,7 +294,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
delete pDlg;
}
- xInputStream.clear(); // don't hold the stream longer than necessary
+ xInputStream.clear(); // don't hold the stream longer than necessary
return nRet;
}
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 392533c7cf93..38bda7df8fe4 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "document.hxx"
#include "unoguard.hxx"
#include "unonames.hxx"
-#include "styleuno.hxx" // ScStyleNameConversion
+#include "styleuno.hxx" // ScStyleNameConversion
#include "tokenarray.hxx"
#include "tokenuno.hxx"
@@ -52,7 +52,7 @@ using namespace ::formula;
//------------------------------------------------------------------------
-// Map nur fuer PropertySetInfo
+// Map nur fuer PropertySetInfo
const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap()
{
@@ -86,15 +86,15 @@ sheet::ConditionOperator lcl_ConditionModeToOperator( ScConditionMode eMode )
sheet::ConditionOperator eOper = sheet::ConditionOperator_NONE;
switch (eMode)
{
- case SC_COND_EQUAL: eOper = sheet::ConditionOperator_EQUAL; break;
- case SC_COND_LESS: eOper = sheet::ConditionOperator_LESS; break;
- case SC_COND_GREATER: eOper = sheet::ConditionOperator_GREATER; break;
- case SC_COND_EQLESS: eOper = sheet::ConditionOperator_LESS_EQUAL; break;
- case SC_COND_EQGREATER: eOper = sheet::ConditionOperator_GREATER_EQUAL; break;
- case SC_COND_NOTEQUAL: eOper = sheet::ConditionOperator_NOT_EQUAL; break;
- case SC_COND_BETWEEN: eOper = sheet::ConditionOperator_BETWEEN; break;
- case SC_COND_NOTBETWEEN: eOper = sheet::ConditionOperator_NOT_BETWEEN; break;
- case SC_COND_DIRECT: eOper = sheet::ConditionOperator_FORMULA; break;
+ case SC_COND_EQUAL: eOper = sheet::ConditionOperator_EQUAL; break;
+ case SC_COND_LESS: eOper = sheet::ConditionOperator_LESS; break;
+ case SC_COND_GREATER: eOper = sheet::ConditionOperator_GREATER; break;
+ case SC_COND_EQLESS: eOper = sheet::ConditionOperator_LESS_EQUAL; break;
+ case SC_COND_EQGREATER: eOper = sheet::ConditionOperator_GREATER_EQUAL; break;
+ case SC_COND_NOTEQUAL: eOper = sheet::ConditionOperator_NOT_EQUAL; break;
+ case SC_COND_BETWEEN: eOper = sheet::ConditionOperator_BETWEEN; break;
+ case SC_COND_NOTBETWEEN: eOper = sheet::ConditionOperator_NOT_BETWEEN; break;
+ case SC_COND_DIRECT: eOper = sheet::ConditionOperator_FORMULA; break;
default:
{
// added to avoid warnings
@@ -108,15 +108,15 @@ ScConditionMode lcl_ConditionOperatorToMode( sheet::ConditionOperator eOper )
ScConditionMode eMode = SC_COND_NONE;
switch (eOper)
{
- case sheet::ConditionOperator_EQUAL: eMode = SC_COND_EQUAL; break;
- case sheet::ConditionOperator_LESS: eMode = SC_COND_LESS; break;
- case sheet::ConditionOperator_GREATER: eMode = SC_COND_GREATER; break;
- case sheet::ConditionOperator_LESS_EQUAL: eMode = SC_COND_EQLESS; break;
+ case sheet::ConditionOperator_EQUAL: eMode = SC_COND_EQUAL; break;
+ case sheet::ConditionOperator_LESS: eMode = SC_COND_LESS; break;
+ case sheet::ConditionOperator_GREATER: eMode = SC_COND_GREATER; break;
+ case sheet::ConditionOperator_LESS_EQUAL: eMode = SC_COND_EQLESS; break;
case sheet::ConditionOperator_GREATER_EQUAL: eMode = SC_COND_EQGREATER; break;
- case sheet::ConditionOperator_NOT_EQUAL: eMode = SC_COND_NOTEQUAL; break;
- case sheet::ConditionOperator_BETWEEN: eMode = SC_COND_BETWEEN; break;
- case sheet::ConditionOperator_NOT_BETWEEN: eMode = SC_COND_NOTBETWEEN; break;
- case sheet::ConditionOperator_FORMULA: eMode = SC_COND_DIRECT; break;
+ case sheet::ConditionOperator_NOT_EQUAL: eMode = SC_COND_NOTEQUAL; break;
+ case sheet::ConditionOperator_BETWEEN: eMode = SC_COND_BETWEEN; break;
+ case sheet::ConditionOperator_NOT_BETWEEN: eMode = SC_COND_NOTBETWEEN; break;
+ case sheet::ConditionOperator_FORMULA: eMode = SC_COND_DIRECT; break;
default:
{
// added to avoid warnings
@@ -139,7 +139,7 @@ ScCondFormatEntryItem::ScCondFormatEntryItem() :
ScTableConditionalFormat::ScTableConditionalFormat(
ScDocument* pDoc, ULONG nKey, FormulaGrammar::Grammar eGrammar)
{
- // Eintrag aus dem Dokument lesen...
+ // Eintrag aus dem Dokument lesen...
if ( pDoc && nKey )
{
@@ -187,7 +187,7 @@ FormulaGrammar::Grammar lclResolveGrammar( FormulaGrammar::Grammar eExtGrammar,
void ScTableConditionalFormat::FillFormat( ScConditionalFormat& rFormat,
ScDocument* pDoc, FormulaGrammar::Grammar eGrammar) const
{
- // ScConditionalFormat = Core-Struktur, muss leer sein
+ // ScConditionalFormat = Core-Struktur, muss leer sein
DBG_ASSERT( rFormat.IsEmpty(), "FillFormat: Format nicht leer" );
USHORT nCount = (USHORT)aEntries.Count();
@@ -243,7 +243,7 @@ void ScTableConditionalFormat::AddEntry_Impl(const ScCondFormatEntryItem& aEntry
void ScTableConditionalFormat::DataChanged()
{
- // wenn's mal das "lebende Objekt" ist, muss hier was passieren...
+ // wenn's mal das "lebende Objekt" ist, muss hier was passieren...
}
// XSheetConditionalFormat
@@ -343,7 +343,7 @@ void SAL_CALL ScTableConditionalFormat::addNew(
else
{
DBG_ERROR("falsche Property");
- //! Exception...
+ //! Exception...
}
}
@@ -417,8 +417,8 @@ sal_Bool SAL_CALL ScTableConditionalFormat::hasElements() throw(uno::RuntimeExce
return ( getCount() != 0 );
}
-// conditional format entries have no real names
-// -> generate name from index
+// conditional format entries have no real names
+// -> generate name from index
rtl::OUString lcl_GetEntryNameFromIndex( sal_Int32 nIndex )
{
@@ -635,12 +635,12 @@ ScTableValidationObj::ScTableValidationObj(ScDocument* pDoc, ULONG nKey,
const formula::FormulaGrammar::Grammar eGrammar) :
aPropSet( lcl_GetValidatePropertyMap() )
{
- // Eintrag aus dem Dokument lesen...
+ // Eintrag aus dem Dokument lesen...
BOOL bFound = FALSE;
if ( pDoc && nKey )
{
- const ScValidationData* pData = pDoc->GetValidationEntry( nKey );
+ const ScValidationData* pData = pDoc->GetValidationEntry( nKey );
if (pData)
{
nMode = sal::static_int_cast<USHORT>( pData->GetOperation() );
@@ -667,13 +667,13 @@ ScTableValidationObj::ScTableValidationObj(ScDocument* pDoc, ULONG nKey,
}
}
if (!bFound)
- ClearData_Impl(); // Defaults
+ ClearData_Impl(); // Defaults
}
ScValidationData* ScTableValidationObj::CreateValidationData( ScDocument* pDoc,
formula::FormulaGrammar::Grammar eGrammar ) const
{
- // ScValidationData = Core-Struktur
+ // ScValidationData = Core-Struktur
FormulaGrammar::Grammar eGrammar1 = lclResolveGrammar( eGrammar, meGrammar1 );
FormulaGrammar::Grammar eGrammar2 = lclResolveGrammar( eGrammar, meGrammar2 );
@@ -716,13 +716,13 @@ ScValidationData* ScTableValidationObj::CreateValidationData( ScDocument* pDoc,
void ScTableValidationObj::ClearData_Impl()
{
- nMode = SC_COND_NONE;
- nValMode = SC_VALID_ANY;
+ nMode = SC_COND_NONE;
+ nValMode = SC_VALID_ANY;
bIgnoreBlank = TRUE;
nShowList = sheet::TableValidationVisibility::UNSORTED;
- bShowInput = FALSE;
- bShowError = FALSE;
- nErrorStyle = SC_VALERR_STOP;
+ bShowInput = FALSE;
+ bShowError = FALSE;
+ nErrorStyle = SC_VALERR_STOP;
aSrcPos.Set(0,0,0);
aExpr1.Erase();
aExpr2.Erase();
@@ -741,7 +741,7 @@ ScTableValidationObj::~ScTableValidationObj()
void ScTableValidationObj::DataChanged()
{
- // wenn's mal das "lebende Objekt" ist, muss hier was passieren...
+ // wenn's mal das "lebende Objekt" ist, muss hier was passieren...
}
// XSheetCondition
@@ -859,7 +859,7 @@ void SAL_CALL ScTableValidationObj::setPropertyValue(
ScUnoGuard aGuard;
String aString(aPropertyName);
- if ( aString.EqualsAscii( SC_UNONAME_SHOWINP ) ) bShowInput = ScUnoHelpFunctions::GetBoolFromAny( aValue );
+ if ( aString.EqualsAscii( SC_UNONAME_SHOWINP ) ) bShowInput = ScUnoHelpFunctions::GetBoolFromAny( aValue );
else if ( aString.EqualsAscii( SC_UNONAME_SHOWERR ) ) bShowError = ScUnoHelpFunctions::GetBoolFromAny( aValue );
else if ( aString.EqualsAscii( SC_UNONAME_IGNOREBL ) ) bIgnoreBlank = ScUnoHelpFunctions::GetBoolFromAny( aValue );
else if ( aString.EqualsAscii( SC_UNONAME_SHOWLIST ) ) aValue >>= nShowList;
@@ -893,14 +893,14 @@ void SAL_CALL ScTableValidationObj::setPropertyValue(
ScUnoHelpFunctions::GetEnumFromAny( aValue );
switch (eType)
{
- case sheet::ValidationType_ANY: nValMode = SC_VALID_ANY; break;
- case sheet::ValidationType_WHOLE: nValMode = SC_VALID_WHOLE; break;
+ case sheet::ValidationType_ANY: nValMode = SC_VALID_ANY; break;
+ case sheet::ValidationType_WHOLE: nValMode = SC_VALID_WHOLE; break;
case sheet::ValidationType_DECIMAL: nValMode = SC_VALID_DECIMAL; break;
- case sheet::ValidationType_DATE: nValMode = SC_VALID_DATE; break;
- case sheet::ValidationType_TIME: nValMode = SC_VALID_TIME; break;
+ case sheet::ValidationType_DATE: nValMode = SC_VALID_DATE; break;
+ case sheet::ValidationType_TIME: nValMode = SC_VALID_TIME; break;
case sheet::ValidationType_TEXT_LEN: nValMode = SC_VALID_TEXTLEN; break;
- case sheet::ValidationType_LIST: nValMode = SC_VALID_LIST; break;
- case sheet::ValidationType_CUSTOM: nValMode = SC_VALID_CUSTOM; break;
+ case sheet::ValidationType_LIST: nValMode = SC_VALID_LIST; break;
+ case sheet::ValidationType_CUSTOM: nValMode = SC_VALID_CUSTOM; break;
default:
{
// added to avoid warnings
@@ -913,9 +913,9 @@ void SAL_CALL ScTableValidationObj::setPropertyValue(
ScUnoHelpFunctions::GetEnumFromAny( aValue );
switch (eStyle)
{
- case sheet::ValidationAlertStyle_STOP: nErrorStyle = SC_VALERR_STOP; break;
+ case sheet::ValidationAlertStyle_STOP: nErrorStyle = SC_VALERR_STOP; break;
case sheet::ValidationAlertStyle_WARNING: nErrorStyle = SC_VALERR_WARNING; break;
- case sheet::ValidationAlertStyle_INFO: nErrorStyle = SC_VALERR_INFO; break;
+ case sheet::ValidationAlertStyle_INFO: nErrorStyle = SC_VALERR_INFO; break;
case sheet::ValidationAlertStyle_MACRO: nErrorStyle = SC_VALERR_MACRO; break;
default:
{
@@ -975,7 +975,7 @@ uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const rtl::OUString& a
String aString(aPropertyName);
uno::Any aRet;
- if ( aString.EqualsAscii( SC_UNONAME_SHOWINP ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, bShowInput );
+ if ( aString.EqualsAscii( SC_UNONAME_SHOWINP ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, bShowInput );
else if ( aString.EqualsAscii( SC_UNONAME_SHOWERR ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, bShowError );
else if ( aString.EqualsAscii( SC_UNONAME_IGNOREBL ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, bIgnoreBlank );
else if ( aString.EqualsAscii( SC_UNONAME_SHOWLIST ) ) aRet <<= nShowList;
@@ -988,14 +988,14 @@ uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const rtl::OUString& a
sheet::ValidationType eType = sheet::ValidationType_ANY;
switch (nValMode)
{
- case SC_VALID_ANY: eType = sheet::ValidationType_ANY; break;
- case SC_VALID_WHOLE: eType = sheet::ValidationType_WHOLE; break;
- case SC_VALID_DECIMAL: eType = sheet::ValidationType_DECIMAL; break;
- case SC_VALID_DATE: eType = sheet::ValidationType_DATE; break;
- case SC_VALID_TIME: eType = sheet::ValidationType_TIME; break;
- case SC_VALID_TEXTLEN: eType = sheet::ValidationType_TEXT_LEN; break;
- case SC_VALID_LIST: eType = sheet::ValidationType_LIST; break;
- case SC_VALID_CUSTOM: eType = sheet::ValidationType_CUSTOM; break;
+ case SC_VALID_ANY: eType = sheet::ValidationType_ANY; break;
+ case SC_VALID_WHOLE: eType = sheet::ValidationType_WHOLE; break;
+ case SC_VALID_DECIMAL: eType = sheet::ValidationType_DECIMAL; break;
+ case SC_VALID_DATE: eType = sheet::ValidationType_DATE; break;
+ case SC_VALID_TIME: eType = sheet::ValidationType_TIME; break;
+ case SC_VALID_TEXTLEN: eType = sheet::ValidationType_TEXT_LEN; break;
+ case SC_VALID_LIST: eType = sheet::ValidationType_LIST; break;
+ case SC_VALID_CUSTOM: eType = sheet::ValidationType_CUSTOM; break;
}
aRet <<= eType;
}
@@ -1004,10 +1004,10 @@ uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const rtl::OUString& a
sheet::ValidationAlertStyle eStyle = sheet::ValidationAlertStyle_STOP;
switch (nErrorStyle)
{
- case SC_VALERR_STOP: eStyle = sheet::ValidationAlertStyle_STOP; break;
- case SC_VALERR_WARNING: eStyle = sheet::ValidationAlertStyle_WARNING; break;
- case SC_VALERR_INFO: eStyle = sheet::ValidationAlertStyle_INFO; break;
- case SC_VALERR_MACRO: eStyle = sheet::ValidationAlertStyle_MACRO; break;
+ case SC_VALERR_STOP: eStyle = sheet::ValidationAlertStyle_STOP; break;
+ case SC_VALERR_WARNING: eStyle = sheet::ValidationAlertStyle_WARNING; break;
+ case SC_VALERR_INFO: eStyle = sheet::ValidationAlertStyle_INFO; break;
+ case SC_VALERR_MACRO: eStyle = sheet::ValidationAlertStyle_MACRO; break;
}
aRet <<= eStyle;
}
diff --git a/sc/source/ui/unoobj/forbiuno.cxx b/sc/source/ui/unoobj/forbiuno.cxx
index 2807a12f7dac..6333bafbd604 100644
--- a/sc/source/ui/unoobj/forbiuno.cxx
+++ b/sc/source/ui/unoobj/forbiuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +48,8 @@ vos::ORef<SvxForbiddenCharactersTable> lcl_GetForbidden( ScDocShell* pDocSh )
xRet = pDoc->GetForbiddenCharacters();
if ( !xRet.isValid() )
{
- // create an empty SvxForbiddenCharactersTable for SvxUnoForbiddenCharsTable,
- // so changes can be stored.
+ // create an empty SvxForbiddenCharactersTable for SvxUnoForbiddenCharsTable,
+ // so changes can be stored.
xRet = new SvxForbiddenCharactersTable( pDoc->GetServiceManager() );
pDoc->SetForbiddenCharacters( xRet );
@@ -77,7 +77,7 @@ void ScForbiddenCharsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // document gone
+ pDocShell = NULL; // document gone
}
}
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index 7012b477050c..bcac6e286c6d 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +62,11 @@ using namespace com::sun::star;
//------------------------------------------------------------------------
-// registered as implementation for service FunctionAccess,
-// also supports service SpreadsheetDocumentSettings (to set null date etc.)
+// registered as implementation for service FunctionAccess,
+// also supports service SpreadsheetDocumentSettings (to set null date etc.)
-#define SCFUNCTIONACCESS_SERVICE "com.sun.star.sheet.FunctionAccess"
-#define SCDOCSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetDocumentSettings"
+#define SCFUNCTIONACCESS_SERVICE "com.sun.star.sheet.FunctionAccess"
+#define SCDOCSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetDocumentSettings"
//------------------------------------------------------------------------
@@ -75,16 +75,16 @@ using namespace com::sun::star;
class ScTempDocSource
{
private:
- ScTempDocCache& rCache;
- ScDocument* pTempDoc;
+ ScTempDocCache& rCache;
+ ScDocument* pTempDoc;
- static ScDocument* CreateDocument(); // create and initialize doc
+ static ScDocument* CreateDocument(); // create and initialize doc
public:
ScTempDocSource( ScTempDocCache& rDocCache );
~ScTempDocSource();
- ScDocument* GetDocument();
+ ScDocument* GetDocument();
};
//------------------------------------------------------------------------
@@ -92,7 +92,7 @@ public:
// static
ScDocument* ScTempDocSource::CreateDocument()
{
- ScDocument* pDoc = new ScDocument; // SCDOCMODE_DOCUMENT
+ ScDocument* pDoc = new ScDocument; // SCDOCMODE_DOCUMENT
pDoc->MakeTable( 0 );
return pDoc;
}
@@ -156,9 +156,9 @@ void ScTempDocCache::Clear()
//------------------------------------------------------------------------
-// copy results from one document into another
-//! merge this with ScAreaLink::Refresh
-//! copy directly without a clipboard document?
+// copy results from one document into another
+//! merge this with ScAreaLink::Refresh
+//! copy directly without a clipboard document?
BOOL lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange,
ScDocument* pDestDoc, const ScAddress& rDestPos )
@@ -173,7 +173,7 @@ BOOL lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange,
ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP );
ScMarkData aSourceMark;
- aSourceMark.SelectOneTable( nSrcTab ); // for CopyToClip
+ aSourceMark.SelectOneTable( nSrcTab ); // for CopyToClip
aSourceMark.SetMarkArea( rSrcRange );
ScClipParam aClipParam(rSrcRange, false);
pSrcDoc->CopyToClip(aClipParam, pClipDoc, &aSourceMark, false);
@@ -182,7 +182,7 @@ BOOL lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange,
HASATTR_MERGED | HASATTR_OVERLAPPED ) )
{
ScPatternAttr aPattern( pSrcDoc->GetPool() );
- aPattern.GetItemSet().Put( ScMergeAttr() ); // Defaults
+ aPattern.GetItemSet().Put( ScMergeAttr() ); // Defaults
aPattern.GetItemSet().Put( ScMergeFlagAttr() );
pClipDoc->ApplyPatternAreaTab( 0,0, MAXCOL,MAXROW, nSrcTab, aPattern );
}
@@ -230,7 +230,7 @@ ScFunctionAccess::ScFunctionAccess() :
mbArray( true ), // default according to behaviour of older Office versions
mbValid( true )
{
- StartListening( *SFX_APP() ); // for SFX_HINT_DEINITIALIZING
+ StartListening( *SFX_APP() ); // for SFX_HINT_DEINITIALIZING
}
ScFunctionAccess::~ScFunctionAccess()
@@ -243,7 +243,7 @@ void ScFunctionAccess::Notify( SfxBroadcaster&, const SfxHint& rHint )
if ( rHint.ISA(SfxSimpleHint) &&
((SfxSimpleHint&)rHint).GetId() == SFX_HINT_DEINITIALIZING )
{
- // document must not be used anymore
+ // document must not be used anymore
aDocCache.Clear();
mbValid = false;
}
@@ -251,7 +251,7 @@ void ScFunctionAccess::Notify( SfxBroadcaster&, const SfxHint& rHint )
// stuff for exService_...
-uno::Reference<uno::XInterface> SAL_CALL ScFunctionAccess_CreateInstance(
+uno::Reference<uno::XInterface> SAL_CALL ScFunctionAccess_CreateInstance(
const uno::Reference<lang::XMultiServiceFactory>& )
{
ScUnoGuard aGuard;
@@ -385,11 +385,11 @@ BOOL lcl_AddFunctionToken( ScTokenArray& rArray, const rtl::OUString& rName,cons
String aIntName(ScGlobal::GetAddInCollection()->FindFunction( aUpper, FALSE ));
if (aIntName.Len())
{
- rArray.AddExternal( aIntName.GetBuffer() ); // international name
+ rArray.AddExternal( aIntName.GetBuffer() ); // international name
return TRUE;
}
- return FALSE; // no valid function name
+ return FALSE; // no valid function name
}
void lcl_AddRef( ScTokenArray& rArray, long nStartRow, long nColCount, long nRowCount )
@@ -416,8 +416,8 @@ public:
// 1) virtual void visitElem( long& nCol, long& nRow, const double& elem )
// 2) virtual void visitElem( long& nCol, long& nRow, const rtl::OUString& elem )
// 3) virtual void visitElem( long& nCol, long& nRow, const uno::Any& elem )
- // the other types methods are here just to reflect the orig code and for
- // completeness.
+ // the other types methods are here just to reflect the orig code and for
+ // completeness.
void visitElem( long nCol, long nRow, const sal_Int16& elem )
{
@@ -452,8 +452,8 @@ public:
eElemClass == uno::TypeClass_FLOAT ||
eElemClass == uno::TypeClass_DOUBLE )
{
- // #87871# accept integer types because Basic passes a floating point
- // variable as byte, short or long if it's an integer number.
+ // #87871# accept integer types because Basic passes a floating point
+ // variable as byte, short or long if it's an integer number.
double fVal(0.0);
rElement >>= fVal;
visitElem( nCol, nRow, fVal );
@@ -469,23 +469,23 @@ public:
}
bool hasArgError() { return mbArgError; }
};
-
+
template< class seq >
-class SequencesContainer
+class SequencesContainer
{
uno::Sequence< uno::Sequence< seq > > maSeq;
-
+
long& mrDocRow;
bool mbOverflow;
bool mbArgError;
ScDocument* mpDoc;
ScTokenArray& mrTokenArr;
-
+
public:
SequencesContainer( const uno::Any& rArg, ScTokenArray& rTokenArr, long& rDocRow, ScDocument* pDoc ) :
mrDocRow( rDocRow ), mbOverflow(false), mbArgError(false), mpDoc( pDoc ), mrTokenArr( rTokenArr )
- {
- rArg >>= maSeq;
+ {
+ rArg >>= maSeq;
}
void process()
@@ -494,7 +494,7 @@ public:
long nStartRow = mrDocRow;
long nRowCount = maSeq.getLength();
long nMaxColCount = 0;
- const uno::Sequence< seq >* pRowArr = maSeq.getConstArray();
+ const uno::Sequence< seq >* pRowArr = maSeq.getConstArray();
for ( long nRow=0; nRow<nRowCount; nRow++ )
{
long nColCount = pRowArr[nRow].getLength();
@@ -503,7 +503,7 @@ public:
const seq* pColArr = pRowArr[nRow].getConstArray();
for (long nCol=0; nCol<nColCount; nCol++)
if ( nCol <= MAXCOL && mrDocRow <= MAXROW )
- aVisitor.visitElem( nCol, mrDocRow, pColArr[ nCol ] );
+ aVisitor.visitElem( nCol, mrDocRow, pColArr[ nCol ] );
else
mbOverflow=true;
mrDocRow++;
@@ -527,7 +527,7 @@ static void processSequences( ScDocument* pDoc, const uno::Any& rArg, ScTokenArr
aContainer.process();
rArgErr = aContainer.getArgError();
rOverflow = aContainer.getOverflow();
-}
+}
};
uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName,
@@ -541,7 +541,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName,
throw uno::RuntimeException();
// use cached document if not in use, temporary document otherwise
- // (deleted in ScTempDocSource dtor)
+ // (deleted in ScTempDocSource dtor)
ScTempDocSource aSource( aDocCache );
ScDocument* pDoc = aSource.GetDocument();
const static SCTAB nTempSheet = 1;
@@ -558,7 +558,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName,
// ScCompiler::InitSymbolsEnglish();
//
- // find function
+ // find function
//
ScTokenArray aTokenArr;
@@ -569,14 +569,14 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName,
}
//
- // set options (null date, etc.)
+ // set options (null date, etc.)
//
if ( pOptions )
pDoc->SetDocOptions( *pOptions );
//
- // add arguments to token array
+ // add arguments to token array
//
BOOL bArgErr = FALSE;
@@ -604,8 +604,8 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName,
eClass == uno::TypeClass_FLOAT ||
eClass == uno::TypeClass_DOUBLE )
{
- // #87871# accept integer types because Basic passes a floating point
- // variable as byte, short or long if it's an integer number.
+ // #87871# accept integer types because Basic passes a floating point
+ // variable as byte, short or long if it's an integer number.
double fVal = 0;
rArg >>= fVal;
aTokenArr.AddDouble( fVal );
@@ -619,23 +619,23 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName,
}
else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<sal_Int16> > *)0 ) ) )
{
- ArrayOfArrayProc<sal_Int16>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow );
+ ArrayOfArrayProc<sal_Int16>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow );
}
else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<sal_Int32> > *)0 ) ) )
{
- ArrayOfArrayProc<sal_Int32>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow );
+ ArrayOfArrayProc<sal_Int32>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow );
}
else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<double> > *)0 ) ) )
{
- ArrayOfArrayProc<double>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow );
+ ArrayOfArrayProc<double>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow );
}
else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<rtl::OUString> > *)0 ) ) )
{
- ArrayOfArrayProc<rtl::OUString>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow );
+ ArrayOfArrayProc<rtl::OUString>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow );
}
else if ( aType.equals( getCppuType( (uno::Sequence< uno::Sequence<uno::Any> > *)0 ) ) )
{
- ArrayOfArrayProc<uno::Any>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow );
+ ArrayOfArrayProc<uno::Any>::processSequences( pDoc, rArg, aTokenArr, nDocRow, bArgErr, bOverflow );
}
else if ( aType.equals( getCppuType( (uno::Reference<table::XCellRange>*)0 ) ) )
{
@@ -675,13 +675,13 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName,
bArgErr = TRUE;
}
else
- bArgErr = TRUE; // invalid type
+ bArgErr = TRUE; // invalid type
}
aTokenArr.AddOpCode(ocClose);
aTokenArr.AddOpCode(ocStop);
//
- // execute formula
+ // execute formula
//
uno::Any aRet;
@@ -692,10 +692,10 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName,
// other API compatibility grammars.
ScFormulaCell* pFormula = new ScFormulaCell( pDoc, aFormulaPos,
&aTokenArr, formula::FormulaGrammar::GRAM_PODF_A1, (BYTE)(mbArray ? MM_FORMULA : MM_NONE) );
- pDoc->PutCell( aFormulaPos, pFormula ); //! necessary?
+ pDoc->PutCell( aFormulaPos, pFormula ); //! necessary?
- // call GetMatrix before GetErrCode because GetMatrix always recalculates
- // if there is no matrix result
+ // call GetMatrix before GetErrCode because GetMatrix always recalculates
+ // if there is no matrix result
const ScMatrix* pMat = mbArray ? pFormula->GetMatrix() : 0;
USHORT nErrCode = pFormula->GetErrCode();
@@ -725,7 +725,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName,
}
else
{
- // any other error: IllegalArgumentException
+ // any other error: IllegalArgumentException
bArgErr = TRUE;
}
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index a119eda13a32..b6dd5d039665 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +64,16 @@ using ::std::vector;
//------------------------------------------------------------------------
-// fuer Sheet- und Area-Links benutzt:
+// fuer Sheet- und Area-Links benutzt:
const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap()
{
static SfxItemPropertyMapEntry aSheetLinkMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_FILTER), 0, &getCppuType((rtl::OUString*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_FILTOPT), 0, &getCppuType((rtl::OUString*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_LINKURL), 0, &getCppuType((rtl::OUString*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_REFDELAY), 0, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_REFPERIOD), 0, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_FILTER), 0, &getCppuType((rtl::OUString*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_FILTOPT), 0, &getCppuType((rtl::OUString*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_LINKURL), 0, &getCppuType((rtl::OUString*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_REFDELAY), 0, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_REFPERIOD), 0, &getCppuType((sal_Int32*)0), 0, 0 },
{0,0,0,0,0,0}
};
return aSheetLinkMap_Impl;
@@ -108,13 +108,13 @@ ScSheetLinkObj::~ScSheetLinkObj()
void ScSheetLinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- //! notify if links in document are changed
- // UpdateRef is not needed here
+ //! notify if links in document are changed
+ // UpdateRef is not needed here
if ( rHint.ISA( SfxSimpleHint ) )
{
if ( ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
- pDocShell = NULL; // pointer is invalid
+ pDocShell = NULL; // pointer is invalid
}
else if ( rHint.ISA( ScLinkRefreshedHint ) )
{
@@ -141,7 +141,7 @@ ScTableLink* ScSheetLinkObj::GetLink_Impl() const
}
}
}
- return NULL; // nicht gefunden
+ return NULL; // nicht gefunden
}
// XNamed
@@ -149,13 +149,13 @@ ScTableLink* ScSheetLinkObj::GetLink_Impl() const
rtl::OUString SAL_CALL ScSheetLinkObj::getName() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- return getFileName(); // Name ist der Dateiname (URL)
+ return getFileName(); // Name ist der Dateiname (URL)
}
void SAL_CALL ScSheetLinkObj::setName( const rtl::OUString& aName ) throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- setFileName(aName); // Name ist der Dateiname (URL)
+ setFileName(aName); // Name ist der Dateiname (URL)
}
// XRefreshable
@@ -177,7 +177,7 @@ void SAL_CALL ScSheetLinkObj::addRefreshListener(
new uno::Reference<util::XRefreshListener>( xListener );
aRefreshListeners.Insert( pObj, aRefreshListeners.Count() );
- // hold one additional ref to keep this object alive as long as there are listeners
+ // hold one additional ref to keep this object alive as long as there are listeners
if ( aRefreshListeners.Count() == 1 )
acquire();
}
@@ -195,7 +195,7 @@ void SAL_CALL ScSheetLinkObj::removeRefreshListener(
{
aRefreshListeners.DeleteAndDestroy( n );
if ( aRefreshListeners.Count() == 0 )
- release(); // release ref for listeners
+ release(); // release ref for listeners
break;
}
}
@@ -301,34 +301,34 @@ void ScSheetLinkObj::setFileName(const rtl::OUString& rNewName)
ScTableLink* pLink = GetLink_Impl();
if (pLink)
{
- // pLink->Refresh mit neuem Dateinamen bringt sfx2::LinkManager durcheinander
- // darum per Hand die Tabellen umsetzen und Link per UpdateLinks neu erzeugen
+ // pLink->Refresh mit neuem Dateinamen bringt sfx2::LinkManager durcheinander
+ // darum per Hand die Tabellen umsetzen und Link per UpdateLinks neu erzeugen
String aNewStr(ScGlobal::GetAbsDocName( String(rNewName), pDocShell ));
- // zuerst Tabellen umsetzen
+ // zuerst Tabellen umsetzen
ScDocument* pDoc = pDocShell->GetDocument();
SCTAB nTabCount = pDoc->GetTableCount();
for (SCTAB nTab=0; nTab<nTabCount; nTab++)
- if ( pDoc->IsLinked(nTab) && pDoc->GetLinkDoc(nTab) == aFileName ) // alte Datei
+ if ( pDoc->IsLinked(nTab) && pDoc->GetLinkDoc(nTab) == aFileName ) // alte Datei
pDoc->SetLink( nTab, pDoc->GetLinkMode(nTab), aNewStr,
pDoc->GetLinkFlt(nTab), pDoc->GetLinkOpt(nTab),
pDoc->GetLinkTab(nTab),
- pDoc->GetLinkRefreshDelay(nTab) ); // nur Datei aendern
+ pDoc->GetLinkRefreshDelay(nTab) ); // nur Datei aendern
- // Links updaten
- //! Undo !!!
+ // Links updaten
+ //! Undo !!!
- pLink = NULL; // wird bei UpdateLinks ungueltig
- pDocShell->UpdateLinks(); // alter Link raus, evtl. neuen Link anlegen
+ pLink = NULL; // wird bei UpdateLinks ungueltig
+ pDocShell->UpdateLinks(); // alter Link raus, evtl. neuen Link anlegen
- // Daten kopieren
+ // Daten kopieren
aFileName = aNewStr;
- pLink = GetLink_Impl(); // neuer Link mit neuem Namen
+ pLink = GetLink_Impl(); // neuer Link mit neuem Namen
if (pLink)
- pLink->Update(); // inkl. Paint & Undo fuer Daten
+ pLink->Update(); // inkl. Paint & Undo fuer Daten
}
}
@@ -406,12 +406,12 @@ ScSheetLinksObj::~ScSheetLinksObj()
void ScSheetLinksObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // Referenz-Update interessiert hier nicht
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -422,7 +422,7 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByIndex_Impl(INT32 nIndex)
if (pDocShell)
{
INT32 nCount = 0;
- ScStrCollection aNames; // um doppelte wegzulassen
+ ScStrCollection aNames; // um doppelte wegzulassen
ScDocument* pDoc = pDocShell->GetDocument();
SCTAB nTabCount = pDoc->GetTableCount();
for (SCTAB nTab=0; nTab<nTabCount; nTab++)
@@ -440,12 +440,12 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByIndex_Impl(INT32 nIndex)
delete pData;
}
}
- return NULL; // kein Dokument oder Index zu gross
+ return NULL; // kein Dokument oder Index zu gross
}
ScSheetLinkObj* ScSheetLinksObj::GetObjectByName_Impl(const rtl::OUString& aName)
{
- // Name ist der Dateiname
+ // Name ist der Dateiname
if (pDocShell)
{
@@ -456,7 +456,7 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByName_Impl(const rtl::OUString& aName
for (SCTAB nTab=0; nTab<nTabCount; nTab++)
if (pDoc->IsLinked(nTab))
{
- //! case-insensitiv ???
+ //! case-insensitiv ???
String aLinkDoc = pDoc->GetLinkDoc( nTab );
if ( aLinkDoc == aNameStr )
return new ScSheetLinkObj( pDocShell, aNameStr );
@@ -483,7 +483,7 @@ sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException)
INT32 nCount = 0;
if (pDocShell)
{
- ScStrCollection aNames; // um doppelte wegzulassen
+ ScStrCollection aNames; // um doppelte wegzulassen
ScDocument* pDoc = pDocShell->GetDocument();
SCTAB nTabCount = pDoc->GetTableCount();
for (SCTAB nTab=0; nTab<nTabCount; nTab++)
@@ -542,7 +542,7 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const rtl::OUString& aName )
throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- // Name ist der Dateiname
+ // Name ist der Dateiname
if (pDocShell)
{
@@ -553,7 +553,7 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const rtl::OUString& aName )
for (SCTAB nTab=0; nTab<nTabCount; nTab++)
if (pDoc->IsLinked(nTab))
{
- //! case-insensitiv ???
+ //! case-insensitiv ???
String aLinkDoc(pDoc->GetLinkDoc( nTab ));
if ( aLinkDoc == aNameStr )
return TRUE;
@@ -565,11 +565,11 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const rtl::OUString& aName )
uno::Sequence<rtl::OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- // Name ist der Dateiname
+ // Name ist der Dateiname
if (pDocShell)
{
- ScStrCollection aNames; // um doppelte wegzulassen
+ ScStrCollection aNames; // um doppelte wegzulassen
ScDocument* pDoc = pDocShell->GetDocument();
SCTAB nTabCount = pDoc->GetTableCount();
String aName;
@@ -616,7 +616,7 @@ ScAreaLink* lcl_GetAreaLink( ScDocShell* pDocShell, USHORT nPos )
}
}
}
- return NULL; // nicht gefunden
+ return NULL; // nicht gefunden
}
ScAreaLinkObj::ScAreaLinkObj(ScDocShell* pDocSh, USHORT nP) :
@@ -635,20 +635,20 @@ ScAreaLinkObj::~ScAreaLinkObj()
void ScAreaLinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- //! notify if links in document are changed
- // UpdateRef is not needed here
+ //! notify if links in document are changed
+ // UpdateRef is not needed here
if ( rHint.ISA( SfxSimpleHint ) )
{
if ( ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
- pDocShell = NULL; // pointer is invalid
+ pDocShell = NULL; // pointer is invalid
}
else if ( rHint.ISA( ScLinkRefreshedHint ) )
{
const ScLinkRefreshedHint& rLH = (const ScLinkRefreshedHint&) rHint;
if ( rLH.GetLinkType() == SC_LINKREFTYPE_AREA )
{
- // get this link to compare dest position
+ // get this link to compare dest position
ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos);
if ( pLink && pLink->GetDestArea().aStart == rLH.GetDestPos() )
Refreshed_Impl();
@@ -665,25 +665,25 @@ void ScAreaLinkObj::Modify_Impl( const rtl::OUString* pNewFile, const rtl::OUStr
ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos);
if (pLink)
{
- String aFile (pLink->GetFile());
+ String aFile (pLink->GetFile());
String aFilter (pLink->GetFilter());
String aOptions (pLink->GetOptions());
String aSource (pLink->GetSource());
ScRange aDest (pLink->GetDestArea());
- ULONG nRefresh = pLink->GetRefreshDelay();
+ ULONG nRefresh = pLink->GetRefreshDelay();
- //! Undo fuer Loeschen
- //! Undo zusammenfassen
+ //! Undo fuer Loeschen
+ //! Undo zusammenfassen
sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();
pLinkManager->Remove( pLink );
- pLink = NULL; // bei Remove geloescht
+ pLink = NULL; // bei Remove geloescht
- BOOL bFitBlock = TRUE; // verschieben, wenn durch Update Groesse geaendert
+ BOOL bFitBlock = TRUE; // verschieben, wenn durch Update Groesse geaendert
if (pNewFile)
{
aFile = String( *pNewFile );
- aFile = ScGlobal::GetAbsDocName( aFile, pDocShell ); //! in InsertAreaLink?
+ aFile = ScGlobal::GetAbsDocName( aFile, pDocShell ); //! in InsertAreaLink?
}
if (pNewFilter)
aFilter = String( *pNewFilter );
@@ -694,7 +694,7 @@ void ScAreaLinkObj::Modify_Impl( const rtl::OUString* pNewFile, const rtl::OUStr
if (pNewDest)
{
ScUnoConversion::FillScRange( aDest, *pNewDest );
- bFitBlock = FALSE; // neuer Bereich angegeben -> keine Inhalte verschieben
+ bFitBlock = FALSE; // neuer Bereich angegeben -> keine Inhalte verschieben
}
ScDocFunc aFunc(*pDocShell);
@@ -728,7 +728,7 @@ void SAL_CALL ScAreaLinkObj::addRefreshListener(
new uno::Reference<util::XRefreshListener>( xListener );
aRefreshListeners.Insert( pObj, aRefreshListeners.Count() );
- // hold one additional ref to keep this object alive as long as there are listeners
+ // hold one additional ref to keep this object alive as long as there are listeners
if ( aRefreshListeners.Count() == 1 )
acquire();
}
@@ -746,7 +746,7 @@ void SAL_CALL ScAreaLinkObj::removeRefreshListener(
{
aRefreshListeners.DeleteAndDestroy( n );
if ( aRefreshListeners.Count() == 0 )
- release(); // release ref for listeners
+ release(); // release ref for listeners
break;
}
}
@@ -831,7 +831,7 @@ uno::Any SAL_CALL ScAreaLinkObj::getPropertyValue( const rtl::OUString& aPropert
SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAreaLinkObj )
-// internal:
+// internal:
rtl::OUString ScAreaLinkObj::getFileName(void) const
{
@@ -949,12 +949,12 @@ ScAreaLinksObj::~ScAreaLinksObj()
void ScAreaLinksObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // Referenz-Update interessiert hier nicht
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -965,7 +965,7 @@ ScAreaLinkObj* ScAreaLinksObj::GetObjectByIndex_Impl(INT32 nIndex)
if ( pDocShell && nIndex >= 0 && nIndex < getCount() )
return new ScAreaLinkObj( pDocShell, (USHORT)nIndex );
- return NULL; // nicht gefunden
+ return NULL; // nicht gefunden
}
void SAL_CALL ScAreaLinksObj::insertAtPosition( const table::CellAddress& aDestPos,
@@ -984,12 +984,12 @@ void SAL_CALL ScAreaLinksObj::insertAtPosition( const table::CellAddress& aDestP
String aSourceStr (aSourceArea);
ScAddress aDestAddr( (SCCOL)aDestPos.Column, (SCROW)aDestPos.Row, aDestPos.Sheet );
- aFileStr = ScGlobal::GetAbsDocName( aFileStr, pDocShell ); //! in InsertAreaLink ???
+ aFileStr = ScGlobal::GetAbsDocName( aFileStr, pDocShell ); //! in InsertAreaLink ???
ScDocFunc aFunc(*pDocShell);
aFunc.InsertAreaLink( aFileStr, aFilterStr, aOptionStr,
aSourceStr, ScRange(aDestAddr),
- 0, FALSE, TRUE ); // keine Inhalte verschieben
+ 0, FALSE, TRUE ); // keine Inhalte verschieben
}
}
@@ -999,7 +999,7 @@ void SAL_CALL ScAreaLinksObj::removeByIndex( sal_Int32 nIndex ) throw(uno::Runti
ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, (USHORT)nIndex);
if (pLink)
{
- //! SetAddUndo oder so
+ //! SetAddUndo oder so
sfx2::LinkManager* pLinkManager = pDocShell->GetDocument()->GetLinkManager();
pLinkManager->Remove( pLink );
@@ -1080,13 +1080,13 @@ ScDDELinkObj::~ScDDELinkObj()
void ScDDELinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- //! notify if links in document are changed
- // UpdateRef is not needed here
+ //! notify if links in document are changed
+ // UpdateRef is not needed here
if ( rHint.ISA( SfxSimpleHint ) )
{
if ( ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
- pDocShell = NULL; // pointer is invalid
+ pDocShell = NULL; // pointer is invalid
}
else if ( rHint.ISA( ScLinkRefreshedHint ) )
{
@@ -1094,7 +1094,7 @@ void ScDDELinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
if ( rLH.GetLinkType() == SC_LINKREFTYPE_DDE &&
rLH.GetDdeAppl() == aAppl &&
rLH.GetDdeTopic() == aTopic &&
- rLH.GetDdeItem() == aItem ) //! mode is ignored
+ rLH.GetDdeItem() == aItem ) //! mode is ignored
Refreshed_Impl();
}
}
@@ -1103,7 +1103,7 @@ void ScDDELinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
String lcl_BuildDDEName( const String& rAppl, const String& rTopic, const String& rItem )
{
- // Appl|Topic!Item (wie Excel)
+ // Appl|Topic!Item (wie Excel)
String aRet = rAppl;
aRet += '|';
aRet += rTopic;
@@ -1120,7 +1120,7 @@ rtl::OUString SAL_CALL ScDDELinkObj::getName() throw(uno::RuntimeException)
void SAL_CALL ScDDELinkObj::setName( const rtl::OUString& /* aName */ ) throw(uno::RuntimeException)
{
- // name can't be changed (formulas wouldn't find the link)
+ // name can't be changed (formulas wouldn't find the link)
throw uno::RuntimeException();
}
@@ -1129,7 +1129,7 @@ void SAL_CALL ScDDELinkObj::setName( const rtl::OUString& /* aName */ ) throw(un
rtl::OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- //! Test, ob Link noch im Dokument enthalten?
+ //! Test, ob Link noch im Dokument enthalten?
return aAppl;
}
@@ -1137,7 +1137,7 @@ rtl::OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeExceptio
rtl::OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- //! Test, ob Link noch im Dokument enthalten?
+ //! Test, ob Link noch im Dokument enthalten?
return aTopic;
}
@@ -1145,7 +1145,7 @@ rtl::OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException)
rtl::OUString SAL_CALL ScDDELinkObj::getItem() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- //! Test, ob Link noch im Dokument enthalten?
+ //! Test, ob Link noch im Dokument enthalten?
return aItem;
}
@@ -1159,7 +1159,7 @@ void SAL_CALL ScDDELinkObj::refresh() throw(uno::RuntimeException)
{
ScDocument* pDoc = pDocShell->GetDocument();
(void)pDoc->UpdateDdeLink( aAppl, aTopic, aItem );
- //! Fehler abfragen
+ //! Fehler abfragen
}
}
@@ -1172,7 +1172,7 @@ void SAL_CALL ScDDELinkObj::addRefreshListener(
new uno::Reference<util::XRefreshListener>( xListener );
aRefreshListeners.Insert( pObj, aRefreshListeners.Count() );
- // hold one additional ref to keep this object alive as long as there are listeners
+ // hold one additional ref to keep this object alive as long as there are listeners
if ( aRefreshListeners.Count() == 1 )
acquire();
}
@@ -1190,7 +1190,7 @@ void SAL_CALL ScDDELinkObj::removeRefreshListener(
{
aRefreshListeners.DeleteAndDestroy( n );
if ( aRefreshListeners.Count() == 0 )
- release(); // release ref for listeners
+ release(); // release ref for listeners
break;
}
}
@@ -1291,12 +1291,12 @@ ScDDELinksObj::~ScDDELinksObj()
void ScDDELinksObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // Referenz-Update interessiert hier nicht
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
diff --git a/sc/source/ui/unoobj/listenercalls.cxx b/sc/source/ui/unoobj/listenercalls.cxx
index 9abc8e0ab826..64776ec6722b 100644
--- a/sc/source/ui/unoobj/listenercalls.cxx
+++ b/sc/source/ui/unoobj/listenercalls.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx
index 4fdac0288796..84b6d4a2e4f8 100644
--- a/sc/source/ui/unoobj/miscuno.cxx
+++ b/sc/source/ui/unoobj/miscuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,17 +51,17 @@ SC_SIMPLE_SERVICE_INFO( ScNameToIndexAccess, "ScNameToIndexAccess", "stardiv.unk
//------------------------------------------------------------------------
-// static
+// static
uno::Reference<uno::XInterface> ScUnoHelpFunctions::AnyToInterface( const uno::Any& rAny )
{
if ( rAny.getValueTypeClass() == uno::TypeClass_INTERFACE )
{
return uno::Reference<uno::XInterface>(rAny, uno::UNO_QUERY);
}
- return uno::Reference<uno::XInterface>(); //! Exception?
+ return uno::Reference<uno::XInterface>(); //! Exception?
}
-// static
+// static
sal_Bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPropertySet>& xProp,
const rtl::OUString& rName, sal_Bool bDefault )
{
@@ -71,11 +71,11 @@ sal_Bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPrope
try
{
uno::Any aAny(xProp->getPropertyValue( rName ));
- //! type conversion???
- // operator >>= shouldn't be used for bool (?)
+ //! type conversion???
+ // operator >>= shouldn't be used for bool (?)
if ( aAny.getValueTypeClass() == uno::TypeClass_BOOLEAN )
{
- //! safe way to get bool value from any???
+ //! safe way to get bool value from any???
bRet = *(sal_Bool*)aAny.getValue();
}
}
@@ -87,7 +87,7 @@ sal_Bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPrope
return bRet;
}
-// static
+// static
sal_Int32 ScUnoHelpFunctions::GetLongProperty( const uno::Reference<beans::XPropertySet>& xProp,
const rtl::OUString& rName, long nDefault )
{
@@ -96,7 +96,7 @@ sal_Int32 ScUnoHelpFunctions::GetLongProperty( const uno::Reference<beans::XProp
{
try
{
- //! type conversion???
+ //! type conversion???
xProp->getPropertyValue( rName ) >>= nRet;
}
catch(uno::Exception&)
@@ -107,7 +107,7 @@ sal_Int32 ScUnoHelpFunctions::GetLongProperty( const uno::Reference<beans::XProp
return nRet;
}
-// static
+// static
sal_Int32 ScUnoHelpFunctions::GetEnumProperty( const uno::Reference<beans::XPropertySet>& xProp,
const rtl::OUString& rName, long nDefault )
{
@@ -120,12 +120,12 @@ sal_Int32 ScUnoHelpFunctions::GetEnumProperty( const uno::Reference<beans::XProp
if ( aAny.getValueTypeClass() == uno::TypeClass_ENUM )
{
- //! get enum value from any???
+ //! get enum value from any???
nRet = *(sal_Int32*)aAny.getValue();
}
else
{
- //! type conversion???
+ //! type conversion???
aAny >>= nRet;
}
}
@@ -157,7 +157,7 @@ OUString ScUnoHelpFunctions::GetStringProperty(
return aRet;
}
-// static
+// static
sal_Bool ScUnoHelpFunctions::GetBoolFromAny( const uno::Any& aAny )
{
if ( aAny.getValueTypeClass() == uno::TypeClass_BOOLEAN )
@@ -165,7 +165,7 @@ sal_Bool ScUnoHelpFunctions::GetBoolFromAny( const uno::Any& aAny )
return FALSE;
}
-// static
+// static
sal_Int16 ScUnoHelpFunctions::GetInt16FromAny( const uno::Any& aAny )
{
sal_Int16 nRet = 0;
@@ -174,7 +174,7 @@ sal_Int16 ScUnoHelpFunctions::GetInt16FromAny( const uno::Any& aAny )
return 0;
}
-// static
+// static
sal_Int32 ScUnoHelpFunctions::GetInt32FromAny( const uno::Any& aAny )
{
sal_Int32 nRet = 0;
@@ -183,7 +183,7 @@ sal_Int32 ScUnoHelpFunctions::GetInt32FromAny( const uno::Any& aAny )
return 0;
}
-// static
+// static
sal_Int32 ScUnoHelpFunctions::GetEnumFromAny( const uno::Any& aAny )
{
sal_Int32 nRet = 0;
@@ -194,14 +194,14 @@ sal_Int32 ScUnoHelpFunctions::GetEnumFromAny( const uno::Any& aAny )
return nRet;
}
-// static
+// static
void ScUnoHelpFunctions::SetBoolInAny( uno::Any& rAny, sal_Bool bValue )
{
rAny.setValue( &bValue, getBooleanCppuType() );
}
// static
-void ScUnoHelpFunctions::SetOptionalPropertyValue(
+void ScUnoHelpFunctions::SetOptionalPropertyValue(
Reference<beans::XPropertySet>& rPropSet, const sal_Char* pPropName, const Any& rVal )
{
try
@@ -279,26 +279,26 @@ sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const ::rtl::OUString& Se
//UNUSED2008-05 ScEmptyEnumerationAccess::ScEmptyEnumerationAccess()
//UNUSED2008-05 {
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 ScEmptyEnumerationAccess::~ScEmptyEnumerationAccess()
//UNUSED2008-05 {
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 // XEnumerationAccess
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 uno::Reference<container::XEnumeration> SAL_CALL ScEmptyEnumerationAccess::createEnumeration()
//UNUSED2008-05 throw(uno::RuntimeException)
//UNUSED2008-05 {
//UNUSED2008-05 ScUnoGuard aGuard;
//UNUSED2008-05 return new ScEmptyEnumeration;
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 uno::Type SAL_CALL ScEmptyEnumerationAccess::getElementType() throw(uno::RuntimeException)
//UNUSED2008-05 {
//UNUSED2008-05 ScUnoGuard aGuard;
//UNUSED2008-05 return getCppuType((uno::Reference<uno::XInterface>*)0); // or what?
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 sal_Bool SAL_CALL ScEmptyEnumerationAccess::hasElements() throw(uno::RuntimeException)
//UNUSED2008-05 {
//UNUSED2008-05 return FALSE;
@@ -309,19 +309,19 @@ sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const ::rtl::OUString& Se
//UNUSED2008-05 ScEmptyEnumeration::ScEmptyEnumeration()
//UNUSED2008-05 {
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 ScEmptyEnumeration::~ScEmptyEnumeration()
//UNUSED2008-05 {
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 // XEnumeration
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 sal_Bool SAL_CALL ScEmptyEnumeration::hasMoreElements() throw(uno::RuntimeException)
//UNUSED2008-05 {
//UNUSED2008-05 ScUnoGuard aGuard;
//UNUSED2008-05 return FALSE;
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 uno::Any SAL_CALL ScEmptyEnumeration::nextElement() throw(container::NoSuchElementException,
//UNUSED2008-05 lang::WrappedTargetException, uno::RuntimeException)
//UNUSED2008-05 {
@@ -335,7 +335,7 @@ ScNameToIndexAccess::ScNameToIndexAccess( const com::sun::star::uno::Reference<
com::sun::star::container::XNameAccess>& rNameObj ) :
xNameAccess( rNameObj )
{
- //! test for XIndexAccess interface at rNameObj, use that instead!
+ //! test for XIndexAccess interface at rNameObj, use that instead!
if ( xNameAccess.is() )
aNames = xNameAccess->getElementNames();
@@ -385,19 +385,19 @@ sal_Bool SAL_CALL ScNameToIndexAccess::hasElements( ) throw(::com::sun::star::u
//UNUSED2008-05 ScPrintSettingsObj::ScPrintSettingsObj()
//UNUSED2008-05 {
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 ScPrintSettingsObj::~ScPrintSettingsObj()
//UNUSED2008-05 {
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 // XPropertySet
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScPrintSettingsObj::getPropertySetInfo()
//UNUSED2008-05 throw(uno::RuntimeException)
//UNUSED2008-05 {
//UNUSED2008-05 return NULL;
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 void SAL_CALL ScPrintSettingsObj::setPropertyValue(
//UNUSED2008-05 const rtl::OUString& /* aPropertyName */, const uno::Any& /* aValue */ )
//UNUSED2008-05 throw(beans::UnknownPropertyException, beans::PropertyVetoException,
@@ -406,7 +406,7 @@ sal_Bool SAL_CALL ScNameToIndexAccess::hasElements( ) throw(::com::sun::star::u
//UNUSED2008-05 {
//UNUSED2008-05 //! later...
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 uno::Any SAL_CALL ScPrintSettingsObj::getPropertyValue( const rtl::OUString& /* aPropertyName */ )
//UNUSED2008-05 throw(beans::UnknownPropertyException, lang::WrappedTargetException,
//UNUSED2008-05 uno::RuntimeException)
@@ -414,7 +414,7 @@ sal_Bool SAL_CALL ScNameToIndexAccess::hasElements( ) throw(::com::sun::star::u
//UNUSED2008-05 //! later...
//UNUSED2008-05 return uno::Any();
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 SC_IMPL_DUMMY_PROPERTY_LISTENER( ScPrintSettingsObj )
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 75686df460d6..6f2f6055670a 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 namespace ::com::sun::star;
#include "docsh.hxx"
#include "docfunc.hxx"
#include "rangenam.hxx"
-//CHINA001 #include "namecrea.hxx" // NAME_TOP etc.
+//CHINA001 #include "namecrea.hxx" // NAME_TOP etc.
#include "unoguard.hxx"
#include "unonames.hxx"
@@ -72,7 +72,7 @@ const SfxItemPropertyMapEntry* lcl_GetNamedRangeMap()
//------------------------------------------------------------------------
-#define SCNAMEDRANGEOBJ_SERVICE "com.sun.star.sheet.NamedRange"
+#define SCNAMEDRANGEOBJ_SERVICE "com.sun.star.sheet.NamedRange"
SC_SIMPLE_SERVICE_INFO( ScLabelRangeObj, "ScLabelRangeObj", "com.sun.star.sheet.LabelRange" )
SC_SIMPLE_SERVICE_INFO( ScLabelRangesObj, "ScLabelRangesObj", "com.sun.star.sheet.LabelRanges" )
@@ -82,7 +82,7 @@ SC_SIMPLE_SERVICE_INFO( ScNamedRangesObj, "ScNamedRangesObj", "com.sun.star.shee
sal_Bool lcl_UserVisibleName( const ScRangeData* pData )
{
- //! als Methode an ScRangeData
+ //! als Methode an ScRangeData
return ( pData && !pData->HasType( RT_DATABASE ) && !pData->HasType( RT_SHARED ) );
}
@@ -104,10 +104,10 @@ ScNamedRangeObj::~ScNamedRangeObj()
void ScNamedRangeObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Ref-Update interessiert nicht
+ // Ref-Update interessiert nicht
if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
// Hilfsfuntionen
@@ -124,7 +124,7 @@ ScRangeData* ScNamedRangeObj::GetRangeData_Impl()
if (pNames->SearchName( aName, nPos ))
{
pRet = (*pNames)[nPos];
- pRet->ValidateTabRefs(); // adjust relative tab refs to valid tables
+ pRet->ValidateTabRefs(); // adjust relative tab refs to valid tables
}
}
}
@@ -176,11 +176,11 @@ void ScNamedRangeObj::Modify_Impl( const String* pNewName, const ScTokenArray* p
ScDocFunc aFunc(*pDocShell);
aFunc.SetNewRangeNames( pNewRanges, sal_True );
- aName = aInsName; //! broadcast?
+ aName = aInsName; //! broadcast?
}
else
{
- delete pNew; //! uno::Exception/Fehler oder so
+ delete pNew; //! uno::Exception/Fehler oder so
delete pNewRanges;
}
}
@@ -199,14 +199,14 @@ void SAL_CALL ScNamedRangeObj::setName( const rtl::OUString& aNewName )
throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- //! Formeln anpassen ?????
+ //! Formeln anpassen ?????
String aNewStr(aNewName);
// GRAM_PODF_A1 for API compatibility.
Modify_Impl( &aNewStr, NULL, NULL, NULL, NULL,formula::FormulaGrammar::GRAM_PODF_A1 );
- if ( aName != aNewStr ) // some error occured...
- throw uno::RuntimeException(); // no other exceptions specified
+ if ( aName != aNewStr ) // some error occured...
+ throw uno::RuntimeException(); // no other exceptions specified
}
rtl::OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException)
@@ -246,17 +246,17 @@ table::CellAddress SAL_CALL ScNamedRangeObj::getReferencePosition()
if (pData)
aPos = pData->GetPos();
table::CellAddress aAddress;
- aAddress.Column = aPos.Col();
- aAddress.Row = aPos.Row();
- aAddress.Sheet = aPos.Tab();
+ aAddress.Column = aPos.Col();
+ aAddress.Row = aPos.Row();
+ aAddress.Sheet = aPos.Tab();
if (pDocShell)
{
SCTAB nDocTabs = pDocShell->GetDocument()->GetTableCount();
if ( aAddress.Sheet >= nDocTabs && nDocTabs > 0 )
{
- // Even after ValidateTabRefs, the position can be invalid if
- // the content points to preceding tables. The resulting string
- // is invalid in any case, so the position is just shifted.
+ // Even after ValidateTabRefs, the position can be invalid if
+ // the content points to preceding tables. The resulting string
+ // is invalid in any case, so the position is just shifted.
aAddress.Sheet = nDocTabs - 1;
}
}
@@ -281,10 +281,10 @@ sal_Int32 SAL_CALL ScNamedRangeObj::getType() throw(uno::RuntimeException)
{
// do not return internal RT_* flags
// see property 'IsSharedFormula' for RT_SHARED
- if ( pData->HasType(RT_CRITERIA) ) nType |= sheet::NamedRangeFlag::FILTER_CRITERIA;
- if ( pData->HasType(RT_PRINTAREA) ) nType |= sheet::NamedRangeFlag::PRINT_AREA;
- if ( pData->HasType(RT_COLHEADER) ) nType |= sheet::NamedRangeFlag::COLUMN_HEADER;
- if ( pData->HasType(RT_ROWHEADER) ) nType |= sheet::NamedRangeFlag::ROW_HEADER;
+ if ( pData->HasType(RT_CRITERIA) ) nType |= sheet::NamedRangeFlag::FILTER_CRITERIA;
+ if ( pData->HasType(RT_PRINTAREA) ) nType |= sheet::NamedRangeFlag::PRINT_AREA;
+ if ( pData->HasType(RT_COLHEADER) ) nType |= sheet::NamedRangeFlag::COLUMN_HEADER;
+ if ( pData->HasType(RT_ROWHEADER) ) nType |= sheet::NamedRangeFlag::ROW_HEADER;
}
return nType;
}
@@ -294,10 +294,10 @@ void SAL_CALL ScNamedRangeObj::setType( sal_Int32 nUnoType ) throw(uno::RuntimeE
// see property 'IsSharedFormula' for RT_SHARED
ScUnoGuard aGuard;
sal_uInt16 nNewType = RT_NAME;
- if ( nUnoType & sheet::NamedRangeFlag::FILTER_CRITERIA ) nNewType |= RT_CRITERIA;
- if ( nUnoType & sheet::NamedRangeFlag::PRINT_AREA ) nNewType |= RT_PRINTAREA;
- if ( nUnoType & sheet::NamedRangeFlag::COLUMN_HEADER ) nNewType |= RT_COLHEADER;
- if ( nUnoType & sheet::NamedRangeFlag::ROW_HEADER ) nNewType |= RT_ROWHEADER;
+ if ( nUnoType & sheet::NamedRangeFlag::FILTER_CRITERIA ) nNewType |= RT_CRITERIA;
+ if ( nUnoType & sheet::NamedRangeFlag::PRINT_AREA ) nNewType |= RT_PRINTAREA;
+ if ( nUnoType & sheet::NamedRangeFlag::COLUMN_HEADER ) nNewType |= RT_COLHEADER;
+ if ( nUnoType & sheet::NamedRangeFlag::ROW_HEADER ) nNewType |= RT_ROWHEADER;
// GRAM_PODF_A1 for API compatibility.
Modify_Impl( NULL, NULL, NULL, NULL, &nNewType,formula::FormulaGrammar::GRAM_PODF_A1 );
@@ -342,7 +342,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScNamedRangeObj::getReferredCells()
ScRangeData* pData = GetRangeData_Impl();
if ( pData && pData->IsValidReference( aRange ) )
{
- //! static Funktion um ScCellObj/ScCellRangeObj zu erzeugen am ScCellRangeObj ???
+ //! static Funktion um ScCellObj/ScCellRangeObj zu erzeugen am ScCellRangeObj ???
if ( aRange.aStart == aRange.aEnd )
return new ScCellObj( pDocShell, aRange.aStart );
@@ -388,7 +388,7 @@ uno::Any SAL_CALL ScNamedRangeObj::getPropertyValue( const rtl::OUString& rPrope
uno::Any aRet;
if ( rPropertyName.equalsAscii( SC_UNO_LINKDISPBIT ) )
{
- // no target bitmaps for individual entries (would be all equal)
+ // no target bitmaps for individual entries (would be all equal)
// ScLinkTargetTypeObj::SetLinkTargetBitmap( aRet, SC_LINKTARGETTYPE_RANGENAME );
}
else if ( rPropertyName.equalsAscii( SC_UNO_LINKDISPNAME ) )
@@ -491,12 +491,12 @@ ScNamedRangesObj::~ScNamedRangesObj()
void ScNamedRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // Referenz-Update interessiert hier nicht
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -514,7 +514,7 @@ ScNamedRangeObj* ScNamedRangesObj::GetObjectByIndex_Impl(sal_uInt16 nIndex)
for (sal_uInt16 i=0; i<nCount; i++)
{
ScRangeData* pData = (*pNames)[i];
- if (lcl_UserVisibleName(pData)) // interne weglassen
+ if (lcl_UserVisibleName(pData)) // interne weglassen
{
if ( nPos == nIndex )
return new ScNamedRangeObj( pDocShell, pData->GetName() );
@@ -543,10 +543,10 @@ void SAL_CALL ScNamedRangesObj::addNewByName( const rtl::OUString& aName,
ScAddress aPos( (SCCOL)aPosition.Column, (SCROW)aPosition.Row, aPosition.Sheet );
sal_uInt16 nNewType = RT_NAME;
- if ( nUnoType & sheet::NamedRangeFlag::FILTER_CRITERIA ) nNewType |= RT_CRITERIA;
- if ( nUnoType & sheet::NamedRangeFlag::PRINT_AREA ) nNewType |= RT_PRINTAREA;
- if ( nUnoType & sheet::NamedRangeFlag::COLUMN_HEADER ) nNewType |= RT_COLHEADER;
- if ( nUnoType & sheet::NamedRangeFlag::ROW_HEADER ) nNewType |= RT_ROWHEADER;
+ if ( nUnoType & sheet::NamedRangeFlag::FILTER_CRITERIA ) nNewType |= RT_CRITERIA;
+ if ( nUnoType & sheet::NamedRangeFlag::PRINT_AREA ) nNewType |= RT_PRINTAREA;
+ if ( nUnoType & sheet::NamedRangeFlag::COLUMN_HEADER ) nNewType |= RT_COLHEADER;
+ if ( nUnoType & sheet::NamedRangeFlag::ROW_HEADER ) nNewType |= RT_ROWHEADER;
BOOL bDone = FALSE;
if (pDocShell)
@@ -575,14 +575,14 @@ void SAL_CALL ScNamedRangesObj::addNewByName( const rtl::OUString& aName,
}
if (!bDone)
- throw uno::RuntimeException(); // no other exceptions specified
+ throw uno::RuntimeException(); // no other exceptions specified
}
void SAL_CALL ScNamedRangesObj::addNewFromTitles( const table::CellRangeAddress& aSource,
sheet::Border aBorder ) throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- //! das darf kein enum sein, weil mehrere Bits gesetzt sein koennen !!!
+ //! das darf kein enum sein, weil mehrere Bits gesetzt sein koennen !!!
sal_Bool bTop = ( aBorder == sheet::Border_TOP );
sal_Bool bLeft = ( aBorder == sheet::Border_LEFT );
@@ -593,10 +593,10 @@ void SAL_CALL ScNamedRangesObj::addNewFromTitles( const table::CellRangeAddress&
ScUnoConversion::FillScRange( aRange, aSource );
sal_uInt16 nFlags = 0;
- if (bTop) nFlags |= NAME_TOP;
- if (bLeft) nFlags |= NAME_LEFT;
+ if (bTop) nFlags |= NAME_TOP;
+ if (bLeft) nFlags |= NAME_LEFT;
if (bBottom) nFlags |= NAME_BOTTOM;
- if (bRight) nFlags |= NAME_RIGHT;
+ if (bRight) nFlags |= NAME_RIGHT;
if (nFlags)
{
@@ -630,7 +630,7 @@ void SAL_CALL ScNamedRangesObj::removeByName( const rtl::OUString& aName )
}
if (!bDone)
- throw uno::RuntimeException(); // no other exceptions specified
+ throw uno::RuntimeException(); // no other exceptions specified
}
void SAL_CALL ScNamedRangesObj::outputList( const table::CellAddress& aOutputPosition )
@@ -667,7 +667,7 @@ sal_Int32 SAL_CALL ScNamedRangesObj::getCount() throw(uno::RuntimeException)
{
sal_uInt16 nCount = pNames->GetCount();
for (sal_uInt16 i=0; i<nCount; i++)
- if (lcl_UserVisibleName( (*pNames)[i] )) // interne weglassen
+ if (lcl_UserVisibleName( (*pNames)[i] )) // interne weglassen
++nRet;
}
}
@@ -690,7 +690,7 @@ uno::Any SAL_CALL ScNamedRangesObj::getByIndex( sal_Int32 nIndex )
uno::Type SAL_CALL ScNamedRangesObj::getElementType() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- return ::getCppuType((const uno::Reference< sheet::XNamedRange >*)0); // muss zu getByIndex passen
+ return ::getCppuType((const uno::Reference< sheet::XNamedRange >*)0); // muss zu getByIndex passen
}
sal_Bool SAL_CALL ScNamedRangesObj::hasElements() throw(uno::RuntimeException)
@@ -721,7 +721,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScNamedRangesObj::getElementNames()
ScRangeName* pNames = pDocShell->GetDocument()->GetRangeName();
if (pNames)
{
- long nVisCount = getCount(); // Namen mit lcl_UserVisibleName
+ long nVisCount = getCount(); // Namen mit lcl_UserVisibleName
uno::Sequence<rtl::OUString> aSeq(nVisCount);
rtl::OUString* pAry = aSeq.getArray();
@@ -733,7 +733,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScNamedRangesObj::getElementNames()
if ( lcl_UserVisibleName(pData) )
pAry[nVisPos++] = pData->GetName();
}
-// DBG_ASSERT(nVisPos == nVisCount, "huch, verzaehlt?");
+// DBG_ASSERT(nVisPos == nVisCount, "huch, verzaehlt?");
return aSeq;
}
}
@@ -857,10 +857,10 @@ ScLabelRangeObj::~ScLabelRangeObj()
void ScLabelRangeObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- //! Ref-Update !!!
+ //! Ref-Update !!!
if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
// Hilfsfuntionen
@@ -890,7 +890,7 @@ void ScLabelRangeObj::Modify_Impl( const ScRange* pLabel, const ScRange* pData )
ScRangePair* pEntry = xNewList->Find( aRange );
if (pEntry)
{
- xNewList->Remove( pEntry ); // nur aus der Liste entfernt, nicht geloescht
+ xNewList->Remove( pEntry ); // nur aus der Liste entfernt, nicht geloescht
if ( pLabel )
pEntry->GetRange(0) = *pLabel;
@@ -909,10 +909,10 @@ void ScLabelRangeObj::Modify_Impl( const ScRange* pLabel, const ScRange* pData )
pDocShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID );
pDocShell->SetDocumentModified();
- //! Undo ?!?! (hier und aus Dialog)
+ //! Undo ?!?! (hier und aus Dialog)
if ( pLabel )
- aRange = *pLabel; // Objekt anpassen, um Range wiederzufinden
+ aRange = *pLabel; // Objekt anpassen, um Range wiederzufinden
}
}
}
@@ -977,12 +977,12 @@ ScLabelRangesObj::~ScLabelRangesObj()
void ScLabelRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // Referenz-Update interessiert hier nicht
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -1032,7 +1032,7 @@ void SAL_CALL ScLabelRangesObj::addNew( const table::CellRangeAddress& aLabelAre
pDocShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID );
pDocShell->SetDocumentModified();
- //! Undo ?!?! (hier und aus Dialog)
+ //! Undo ?!?! (hier und aus Dialog)
}
}
}
@@ -1067,12 +1067,12 @@ void SAL_CALL ScLabelRangesObj::removeByIndex( sal_Int32 nIndex )
pDocShell->SetDocumentModified();
bDone = TRUE;
- //! Undo ?!?! (hier und aus Dialog)
+ //! Undo ?!?! (hier und aus Dialog)
}
}
}
if (!bDone)
- throw uno::RuntimeException(); // no other exceptions specified
+ throw uno::RuntimeException(); // no other exceptions specified
}
// container::XEnumerationAccess
@@ -1115,7 +1115,7 @@ uno::Any SAL_CALL ScLabelRangesObj::getByIndex( sal_Int32 nIndex )
uno::Type SAL_CALL ScLabelRangesObj::getElementType() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- return ::getCppuType((const uno::Reference< sheet::XLabelRange >*)0); // muss zu getByIndex passen
+ return ::getCppuType((const uno::Reference< sheet::XLabelRange >*)0); // muss zu getByIndex passen
}
diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx
index c5dd11977478..a6fa9fe16ac7 100644
--- a/sc/source/ui/unoobj/notesuno.cxx
+++ b/sc/source/ui/unoobj/notesuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include <svx/svdobj.hxx>
#include "notesuno.hxx"
#include "textuno.hxx"
-#include "cellsuno.hxx" // getParent
+#include "cellsuno.hxx" // getParent
#include "docsh.hxx"
#include "docfunc.hxx"
#include "hints.hxx"
@@ -61,14 +61,14 @@ using namespace com::sun::star;
//------------------------------------------------------------------------
-// keine Properties fuer Text in Notizen
+// keine Properties fuer Text in Notizen
const SvxItemPropertySet* lcl_GetAnnotationPropertySet()
{
static SfxItemPropertyMapEntry aAnnotationPropertyMap_Impl[] =
{
{0,0,0,0,0,0}
};
- static SvxItemPropertySet aAnnotationPropertySet_Impl( aAnnotationPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
+ static SvxItemPropertySet aAnnotationPropertySet_Impl( aAnnotationPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
return &aAnnotationPropertySet_Impl;
}
@@ -86,8 +86,8 @@ ScAnnotationObj::ScAnnotationObj(ScDocShell* pDocSh, const ScAddress& rPos) :
{
pDocShell->GetDocument()->AddUnoObject(*this);
- // pUnoText is allocated on demand (GetUnoText)
- // can't be aggregated because getString/setString is handled here
+ // pUnoText is allocated on demand (GetUnoText)
+ // can't be aggregated because getString/setString is handled here
}
ScAnnotationObj::~ScAnnotationObj()
@@ -105,12 +105,12 @@ void ScAnnotationObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
// const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint;
- //! Ref-Update
+ //! Ref-Update
}
else if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -121,8 +121,8 @@ uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent() throw(uno:
{
ScUnoGuard aGuard;
- // Parent der Notiz ist die zugehoerige Zelle
- //! existierendes Objekt finden und zurueckgeben ???
+ // Parent der Notiz ist die zugehoerige Zelle
+ //! existierendes Objekt finden und zurueckgeben ???
if (pDocShell)
return (cppu::OWeakObject*)new ScCellObj( pDocShell, aCellPos );
@@ -133,8 +133,8 @@ uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent() throw(uno:
void SAL_CALL ScAnnotationObj::setParent( const uno::Reference<uno::XInterface>& /* Parent */ )
throw(lang::NoSupportException, uno::RuntimeException)
{
- // hamma nich
- //! Exception oder so ??!
+ // hamma nich
+ //! Exception oder so ??!
}
// XSimpleText
@@ -143,7 +143,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursor()
throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- // Notizen brauchen keine Extrawurst
+ // Notizen brauchen keine Extrawurst
return GetUnoText().createTextCursor();
}
@@ -152,7 +152,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursorByRa
throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- // Notizen brauchen keine Extrawurst
+ // Notizen brauchen keine Extrawurst
return GetUnoText().createTextCursorByRange(aTextPosition);
}
@@ -208,9 +208,9 @@ table::CellAddress SAL_CALL ScAnnotationObj::getPosition() throw(uno::RuntimeExc
{
ScUnoGuard aGuard;
table::CellAddress aAdr;
- aAdr.Sheet = aCellPos.Tab();
- aAdr.Column = aCellPos.Col();
- aAdr.Row = aCellPos.Row();
+ aAdr.Sheet = aCellPos.Tab();
+ aAdr.Column = aCellPos.Col();
+ aAdr.Row = aCellPos.Row();
return aAdr;
}
@@ -276,11 +276,11 @@ ScAnnotationShapeObj::ScAnnotationShapeObj(ScDocShell* pDocSh, const ScAddress&
{
pDocShell->GetDocument()->AddUnoObject(*this);
- // pUnoText is allocated on demand (GetUnoText)
- // can't be aggregated because getString/setString is handled here
+ // pUnoText is allocated on demand (GetUnoText)
+ // can't be aggregated because getString/setString is handled here
}
-SvxUnoText& ScAnnotationShapeObj::GetUnoText()
+SvxUnoText& ScAnnotationShapeObj::GetUnoText()
{
if (!pUnoText)
{
@@ -315,12 +315,12 @@ void ScAnnotationShapeObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
// const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint;
- //! Ref-Update
+ //! Ref-Update
}
else if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -331,8 +331,8 @@ uno::Reference<uno::XInterface> SAL_CALL ScAnnotationShapeObj::getParent() throw
{
ScUnoGuard aGuard;
- // Parent der Notiz ist die zugehoerige Zelle
- //! existierendes Objekt finden und zurueckgeben ???
+ // Parent der Notiz ist die zugehoerige Zelle
+ //! existierendes Objekt finden und zurueckgeben ???
if (pDocShell)
return (cppu::OWeakObject*)new ScCellObj( pDocShell, aCellPos );
@@ -343,8 +343,8 @@ uno::Reference<uno::XInterface> SAL_CALL ScAnnotationShapeObj::getParent() throw
void SAL_CALL ScAnnotationShapeObj::setParent( const uno::Reference<uno::XInterface>& /* Parent */ )
throw(lang::NoSupportException, uno::RuntimeException)
{
- // hamma nich
- //! Exception oder so ??!
+ // hamma nich
+ //! Exception oder so ??!
}
// XElementAccess
@@ -405,7 +405,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationShapeObj::createTextCurso
throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- // Notizen brauchen keine Extrawurst
+ // Notizen brauchen keine Extrawurst
return GetUnoText().createTextCursor();
}
@@ -414,7 +414,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationShapeObj::createTextCurso
throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- // Notizen brauchen keine Extrawurst
+ // Notizen brauchen keine Extrawurst
return GetUnoText().createTextCursorByRange(aTextPosition);
}
diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx
index 0d277fdb19fe..f98a0b53f99f 100644
--- a/sc/source/ui/unoobj/optuno.cxx
+++ b/sc/source/ui/unoobj/optuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +67,10 @@ const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap()
// static
sal_Bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions,
- const SfxItemPropertyMap& rPropMap,
+ const SfxItemPropertyMap& rPropMap,
const rtl::OUString& aPropertyName, const uno::Any& aValue )
{
- //! use map (with new identifiers)
+ //! use map (with new identifiers)
const SfxItemPropertySimpleEntry* pEntry = rPropMap.getByName(aPropertyName );
if( !pEntry || !pEntry->nWID )
@@ -90,7 +90,7 @@ sal_Bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions,
case PROP_UNO_IGNORECASE :
rOptions.SetIgnoreCase( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
break;
- case PROP_UNO_ITERENABLED:
+ case PROP_UNO_ITERENABLED:
rOptions.SetIter( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
break;
case PROP_UNO_ITERCOUNT :
@@ -113,17 +113,17 @@ sal_Bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions,
case PROP_UNO_MATCHWHOLE :
rOptions.SetMatchWholeCell( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
break;
- case PROP_UNO_NULLDATE:
+ case PROP_UNO_NULLDATE:
{
util::Date aDate;
if ( aValue >>= aDate )
rOptions.SetDate( aDate.Day, aDate.Month, aDate.Year );
}
break;
- case PROP_UNO_SPELLONLINE:
+ case PROP_UNO_SPELLONLINE:
rOptions.SetAutoSpell( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
break;
- case PROP_UNO_STANDARDDEC:
+ case PROP_UNO_STANDARDDEC:
{
sal_Int16 nIntVal = 0;
if ( aValue >>= nIntVal )
@@ -140,8 +140,8 @@ sal_Bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions,
// static
uno::Any ScDocOptionsHelper::getPropertyValue(
- const ScDocOptions& rOptions,
- const SfxItemPropertyMap& rPropMap,
+ const ScDocOptions& rOptions,
+ const SfxItemPropertyMap& rPropMap,
const rtl::OUString& aPropertyName )
{
uno::Any aRet;
@@ -153,28 +153,28 @@ uno::Any ScDocOptionsHelper::getPropertyValue(
case PROP_UNO_CALCASSHOWN :
ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsCalcAsShown() );
break;
- case PROP_UNO_DEFTABSTOP :
+ case PROP_UNO_DEFTABSTOP :
aRet <<= (sal_Int16)( rOptions.GetTabDistance() );
break;
- case PROP_UNO_IGNORECASE :
+ case PROP_UNO_IGNORECASE :
ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsIgnoreCase() );
break;
- case PROP_UNO_ITERENABLED:
+ case PROP_UNO_ITERENABLED:
ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsIter() );
break;
- case PROP_UNO_ITERCOUNT:
+ case PROP_UNO_ITERCOUNT:
aRet <<= (sal_Int32)( rOptions.GetIterCount() );
break;
- case PROP_UNO_ITEREPSILON:
+ case PROP_UNO_ITEREPSILON:
aRet <<= (double)( rOptions.GetIterEps() );
break;
case PROP_UNO_LOOKUPLABELS:
ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsLookUpColRowNames() );
break;
- case PROP_UNO_MATCHWHOLE:
+ case PROP_UNO_MATCHWHOLE:
ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsMatchWholeCell() );
break;
- case PROP_UNO_NULLDATE:
+ case PROP_UNO_NULLDATE:
{
USHORT nD, nM, nY;
rOptions.GetDate( nD, nM, nY );
diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx
index 4687683a8ef4..57a37ed9d434 100644
--- a/sc/source/ui/unoobj/pageuno.cxx
+++ b/sc/source/ui/unoobj/pageuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +50,7 @@ uno::Reference<drawing::XShape > ScPageObj::_CreateShape( SdrObject *pObj ) cons
{
uno::Reference<drawing::XShape> xShape(SvxFmDrawPage::_CreateShape( pObj ));
- new ScShapeObj( xShape ); // aggregates object and modifies xShape
+ new ScShapeObj( xShape ); // aggregates object and modifies xShape
return xShape;
}
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 03d6d14a3ac7..e8c51122f455 100755
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,31 +98,31 @@ ScFilterDetect::~ScFilterDetect()
{
}
-static const sal_Char __FAR_DATA pFilterSc50[] = "StarCalc 5.0";
-static const sal_Char __FAR_DATA pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterSc40[] = "StarCalc 4.0";
-static const sal_Char __FAR_DATA pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterSc30[] = "StarCalc 3.0";
-static const sal_Char __FAR_DATA pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterSc10[] = "StarCalc 1.0";
-static const sal_Char __FAR_DATA pFilterXML[] = "StarOffice XML (Calc)";
-static const sal_Char __FAR_DATA pFilterAscii[] = "Text - txt - csv (StarCalc)";
-static const sal_Char __FAR_DATA pFilterLotus[] = "Lotus";
-static const sal_Char __FAR_DATA pFilterQPro6[] = "Quattro Pro 6.0";
-static const sal_Char __FAR_DATA pFilterExcel4[] = "MS Excel 4.0";
-static const sal_Char __FAR_DATA pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterExcel5[] = "MS Excel 5.0/95";
-static const sal_Char __FAR_DATA pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterExcel95[] = "MS Excel 95";
-static const sal_Char __FAR_DATA pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterExcel97[] = "MS Excel 97";
-static const sal_Char __FAR_DATA pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template";
-static const sal_Char __FAR_DATA pFilterDBase[] = "dBase";
-static const sal_Char __FAR_DATA pFilterDif[] = "DIF";
-static const sal_Char __FAR_DATA pFilterSylk[] = "SYLK";
-static const sal_Char __FAR_DATA pFilterHtml[] = "HTML (StarCalc)";
-static const sal_Char __FAR_DATA pFilterHtmlWeb[] = "calc_HTML_WebQuery";
-static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCalc)";
+static const sal_Char __FAR_DATA pFilterSc50[] = "StarCalc 5.0";
+static const sal_Char __FAR_DATA pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template";
+static const sal_Char __FAR_DATA pFilterSc40[] = "StarCalc 4.0";
+static const sal_Char __FAR_DATA pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template";
+static const sal_Char __FAR_DATA pFilterSc30[] = "StarCalc 3.0";
+static const sal_Char __FAR_DATA pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template";
+static const sal_Char __FAR_DATA pFilterSc10[] = "StarCalc 1.0";
+static const sal_Char __FAR_DATA pFilterXML[] = "StarOffice XML (Calc)";
+static const sal_Char __FAR_DATA pFilterAscii[] = "Text - txt - csv (StarCalc)";
+static const sal_Char __FAR_DATA pFilterLotus[] = "Lotus";
+static const sal_Char __FAR_DATA pFilterQPro6[] = "Quattro Pro 6.0";
+static const sal_Char __FAR_DATA pFilterExcel4[] = "MS Excel 4.0";
+static const sal_Char __FAR_DATA pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template";
+static const sal_Char __FAR_DATA pFilterExcel5[] = "MS Excel 5.0/95";
+static const sal_Char __FAR_DATA pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template";
+static const sal_Char __FAR_DATA pFilterExcel95[] = "MS Excel 95";
+static const sal_Char __FAR_DATA pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template";
+static const sal_Char __FAR_DATA pFilterExcel97[] = "MS Excel 97";
+static const sal_Char __FAR_DATA pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template";
+static const sal_Char __FAR_DATA pFilterDBase[] = "dBase";
+static const sal_Char __FAR_DATA pFilterDif[] = "DIF";
+static const sal_Char __FAR_DATA pFilterSylk[] = "SYLK";
+static const sal_Char __FAR_DATA pFilterHtml[] = "HTML (StarCalc)";
+static const sal_Char __FAR_DATA pFilterHtmlWeb[] = "calc_HTML_WebQuery";
+static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCalc)";
static BOOL lcl_MayBeAscii( SvStream& rStream )
@@ -216,8 +216,8 @@ static BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
if ( !pFilter )
return FALSE;
- // TRUE for XML file or template
- // (template filter has no internal name -> allow configuration key names)
+ // TRUE for XML file or template
+ // (template filter has no internal name -> allow configuration key names)
String aName(pFilter->GetFilterName());
return aName.EqualsAscii(pFilterXML) ||
diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx
index a652d11df951..a8382da4c949 100644
--- a/sc/source/ui/unoobj/scdetect.hxx
+++ b/sc/source/ui/unoobj/scdetect.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index a173e6d1e051..a9a83b7eefe4 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include <com/sun/star/document/XCodeNameQuery.hpp>
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
#include <com/sun/star/form/XFormsSupplier.hpp>
-#include <svx/unomod.hxx>
+#include <svx/unomod.hxx>
#include <vbahelper/vbaaccesshelper.hxx>
#include <comphelper/processfactory.hxx>
@@ -103,7 +103,7 @@ public:
throw uno::RuntimeException();
if ( sName == pDoc->GetCodeName() )
maCachedObject = maWorkbook;
- else
+ else
{
String sCodeName;
SCTAB nCount = pDoc->GetTableCount();
@@ -150,7 +150,7 @@ public:
if ( !pDoc )
throw uno::RuntimeException();
SCTAB nCount = pDoc->GetTableCount();
- uno::Sequence< rtl::OUString > aNames( nCount + 1 );
+ uno::Sequence< rtl::OUString > aNames( nCount + 1 );
SCTAB index = 0;
String sCodeName;
for( ; index < nCount; ++index )
@@ -197,7 +197,7 @@ public:
sal_Int32 nCntrls = xFormControls->getCount();
for( sal_Int32 cIndex = 0; cIndex < nCntrls; ++cIndex )
{
- uno::Reference< uno::XInterface > xControl( xFormControls->getByIndex( cIndex ), uno::UNO_QUERY_THROW );
+ uno::Reference< uno::XInterface > xControl( xFormControls->getByIndex( cIndex ), uno::UNO_QUERY_THROW );
bMatched = ( xControl == xIf );
if ( bMatched )
{
@@ -289,51 +289,51 @@ static const ProvNamesId_Type __FAR_DATA aProvNamesId[] =
};
//
-// old service names that were in 567 still work in createInstance,
-// in case some macro is still using them
+// old service names that were in 567 still work in createInstance,
+// in case some macro is still using them
//
static const sal_Char* __FAR_DATA aOldNames[SC_SERVICE_COUNT] =
{
- "", // SC_SERVICE_SHEET
- "stardiv.one.text.TextField.URL", // SC_SERVICE_URLFIELD
- "stardiv.one.text.TextField.PageNumber", // SC_SERVICE_PAGEFIELD
- "stardiv.one.text.TextField.PageCount", // SC_SERVICE_PAGESFIELD
- "stardiv.one.text.TextField.Date", // SC_SERVICE_DATEFIELD
- "stardiv.one.text.TextField.Time", // SC_SERVICE_TIMEFIELD
- "stardiv.one.text.TextField.DocumentTitle", // SC_SERVICE_TITLEFIELD
- "stardiv.one.text.TextField.FileName", // SC_SERVICE_FILEFIELD
- "stardiv.one.text.TextField.SheetName", // SC_SERVICE_SHEETFIELD
- "stardiv.one.style.CellStyle", // SC_SERVICE_CELLSTYLE
- "stardiv.one.style.PageStyle", // SC_SERVICE_PAGESTYLE
- "", // SC_SERVICE_AUTOFORMAT
- "", // SC_SERVICE_CELLRANGES
- "", // SC_SERVICE_GRADTAB
- "", // SC_SERVICE_HATCHTAB
- "", // SC_SERVICE_BITMAPTAB
- "", // SC_SERVICE_TRGRADTAB
- "", // SC_SERVICE_MARKERTAB
- "", // SC_SERVICE_DASHTAB
- "", // SC_SERVICE_NUMRULES
- "", // SC_SERVICE_DOCDEFLTS
- "", // SC_SERVICE_DRAWDEFLTS
- "", // SC_SERVICE_DOCSPRSETT
- "", // SC_SERVICE_DOCCONF
- "", // SC_SERVICE_IMAP_RECT
- "", // SC_SERVICE_IMAP_CIRC
- "", // SC_SERVICE_IMAP_POLY
+ "", // SC_SERVICE_SHEET
+ "stardiv.one.text.TextField.URL", // SC_SERVICE_URLFIELD
+ "stardiv.one.text.TextField.PageNumber", // SC_SERVICE_PAGEFIELD
+ "stardiv.one.text.TextField.PageCount", // SC_SERVICE_PAGESFIELD
+ "stardiv.one.text.TextField.Date", // SC_SERVICE_DATEFIELD
+ "stardiv.one.text.TextField.Time", // SC_SERVICE_TIMEFIELD
+ "stardiv.one.text.TextField.DocumentTitle", // SC_SERVICE_TITLEFIELD
+ "stardiv.one.text.TextField.FileName", // SC_SERVICE_FILEFIELD
+ "stardiv.one.text.TextField.SheetName", // SC_SERVICE_SHEETFIELD
+ "stardiv.one.style.CellStyle", // SC_SERVICE_CELLSTYLE
+ "stardiv.one.style.PageStyle", // SC_SERVICE_PAGESTYLE
+ "", // SC_SERVICE_AUTOFORMAT
+ "", // SC_SERVICE_CELLRANGES
+ "", // SC_SERVICE_GRADTAB
+ "", // SC_SERVICE_HATCHTAB
+ "", // SC_SERVICE_BITMAPTAB
+ "", // SC_SERVICE_TRGRADTAB
+ "", // SC_SERVICE_MARKERTAB
+ "", // SC_SERVICE_DASHTAB
+ "", // SC_SERVICE_NUMRULES
+ "", // SC_SERVICE_DOCDEFLTS
+ "", // SC_SERVICE_DRAWDEFLTS
+ "", // SC_SERVICE_DOCSPRSETT
+ "", // SC_SERVICE_DOCCONF
+ "", // SC_SERVICE_IMAP_RECT
+ "", // SC_SERVICE_IMAP_CIRC
+ "", // SC_SERVICE_IMAP_POLY
// #100263# Support creation of GraphicObjectResolver and EmbeddedObjectResolver
- "", // SC_SERVICE_EXPORT_GOR
- "", // SC_SERVICE_IMPORT_GOR
- "", // SC_SERVICE_EXPORT_EOR
- "", // SC_SERVICE_IMPORT_EOR
-
- "", // SC_SERVICE_VALBIND
- "", // SC_SERVICE_LISTCELLBIND
- "", // SC_SERVICE_LISTSOURCE
- "", // SC_SERVICE_CELLADDRESS
- "", // SC_SERVICE_RANGEADDRESS
+ "", // SC_SERVICE_EXPORT_GOR
+ "", // SC_SERVICE_IMPORT_GOR
+ "", // SC_SERVICE_EXPORT_EOR
+ "", // SC_SERVICE_IMPORT_EOR
+
+ "", // SC_SERVICE_VALBIND
+ "", // SC_SERVICE_LISTCELLBIND
+ "", // SC_SERVICE_LISTSOURCE
+ "", // SC_SERVICE_CELLADDRESS
+ "", // SC_SERVICE_RANGEADDRESS
"", // SC_SERVICE_SHEETDOCSET
"", // SC_SERVICE_CHDATAPROV
"", // SC_SERVICE_FORMULAPARS
@@ -348,7 +348,7 @@ static const sal_Char* __FAR_DATA aOldNames[SC_SERVICE_COUNT] =
//------------------------------------------------------------------------
-// alles static
+// alles static
//UNUSED2008-05 String ScServiceProvider::GetProviderName(sal_uInt16 nObjectType)
//UNUSED2008-05 {
@@ -393,7 +393,7 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance(
switch (nType)
{
case SC_SERVICE_SHEET:
- // noch nicht eingefuegt - DocShell=Null
+ // noch nicht eingefuegt - DocShell=Null
xRet.set((sheet::XSpreadsheet*)new ScTableSheetObj(NULL,0));
break;
case SC_SERVICE_URLFIELD:
@@ -418,8 +418,8 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance(
xRet.set((container::XIndexAccess*)new ScAutoFormatObj( SC_AFMTOBJ_INVALID ));
break;
case SC_SERVICE_CELLRANGES:
- // wird nicht eingefuegt, sondern gefuellt
- // -> DocShell muss gesetzt sein, aber leere Ranges
+ // wird nicht eingefuegt, sondern gefuellt
+ // -> DocShell muss gesetzt sein, aber leere Ranges
if (pDocShell)
xRet.set((sheet::XSheetCellRanges*)new ScCellRangesObj( pDocShell, ScRangeList() ));
break;
@@ -433,9 +433,9 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance(
xRet.set((beans::XPropertySet*)new ScDrawDefaultsObj( pDocShell ));
break;
- // Drawing layer tables are not in SvxUnoDrawMSFactory,
- // because SvxUnoDrawMSFactory doesn't have a SdrModel pointer.
- // Drawing layer is always allocated if not there (MakeDrawLayer).
+ // Drawing layer tables are not in SvxUnoDrawMSFactory,
+ // because SvxUnoDrawMSFactory doesn't have a SdrModel pointer.
+ // Drawing layer is always allocated if not there (MakeDrawLayer).
case SC_SERVICE_GRADTAB:
if (pDocShell)
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 1ed384ed2ebd..253335403eba 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ const SfxItemPropertyMapEntry* lcl_GetShapeMap()
{
{MAP_CHAR_LEN(SC_UNONAME_ANCHOR), 0, &getCppuType((uno::Reference<uno::XInterface>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_HORIPOS), 0, &getCppuType((sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_IMAGEMAP), 0, &getCppuType((uno::Reference<container::XIndexContainer>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_IMAGEMAP), 0, &getCppuType((uno::Reference<container::XIndexContainer>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_VERTPOS), 0, &getCppuType((sal_Int32*)0), 0, 0 },
{0,0,0,0,0,0}
};
@@ -114,7 +114,7 @@ ScShapeObj::ScShapeObj( uno::Reference<drawing::XShape>& xShape ) :
if (mxShapeAgg.is())
{
- xShape = NULL; // during setDelegator, mxShapeAgg must be the only ref
+ xShape = NULL; // during setDelegator, mxShapeAgg must be the only ref
mxShapeAgg->setDelegator( (cppu::OWeakObject*)this );
@@ -137,8 +137,8 @@ ScShapeObj::ScShapeObj( uno::Reference<drawing::XShape>& xShape ) :
ScShapeObj::~ScShapeObj()
{
-// if (mxShapeAgg.is())
-// mxShapeAgg->setDelegator(uno::Reference<uno::XInterface>());
+// if (mxShapeAgg.is())
+// mxShapeAgg->setDelegator(uno::Reference<uno::XInterface>());
}
// XInterface
@@ -227,7 +227,7 @@ uno::Reference<text::XTextRange> lcl_GetTextRange( const uno::Reference<uno::XAg
return xRet;
}
-// XPropertySet
+// XPropertySet
uno::Reference<beans::XPropertySetInfo> SAL_CALL ScShapeObj::getPropertySetInfo()
throw(uno::RuntimeException)
@@ -237,7 +237,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScShapeObj::getPropertySetInfo(
// #i61527# cache property set info for this object
if ( !mxPropSetInfo.is() )
{
- // mix own and aggregated properties:
+ // mix own and aggregated properties:
GetShapePropertySet();
if (pShapePropertySet)
{
@@ -886,7 +886,7 @@ void SAL_CALL ScShapeObj::removeVetoableChangeListener( const rtl::OUString& aPr
pShapePropertySet->removeVetoableChangeListener( aPropertyName, aListener );
}
-// XPropertyState
+// XPropertyState
beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const rtl::OUString& aPropertyName )
throw(beans::UnknownPropertyException, uno::RuntimeException)
@@ -927,7 +927,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScShapeObj::getPropertyStates(
{
ScUnoGuard aGuard;
- // simple loop to get own and aggregated states
+ // simple loop to get own and aggregated states
const rtl::OUString* pNames = aPropertyNames.getConstArray();
uno::Sequence<beans::PropertyState> aRet(aPropertyNames.getLength());
@@ -952,7 +952,7 @@ void SAL_CALL ScShapeObj::setPropertyToDefault( const rtl::OUString& aPropertyNa
if( pIMapInfo )
{
ImageMap aEmpty;
- pIMapInfo->SetImageMap( aEmpty ); // replace with empty image map
+ pIMapInfo->SetImageMap( aEmpty ); // replace with empty image map
}
else
{
@@ -978,7 +978,7 @@ uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const rtl::OUString& aProperty
uno::Any aAny;
if ( aNameString.EqualsAscii( SC_UNONAME_IMAGEMAP ) )
{
- // default: empty ImageMap
+ // default: empty ImageMap
uno::Reference< uno::XInterface > xImageMap(SvUnoImageMap_createInstance( GetSupportedMacroItems() ));
aAny <<= uno::Reference< container::XIndexContainer >::query( xImageMap );
}
@@ -999,7 +999,7 @@ void SAL_CALL ScShapeObj::attach( const uno::Reference<text::XTextRange>& /* xTe
{
ScUnoGuard aGuard;
- throw lang::IllegalArgumentException(); // anchor cannot be changed
+ throw lang::IllegalArgumentException(); // anchor cannot be changed
}
uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getAnchor() throw(uno::RuntimeException)
@@ -1029,7 +1029,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getAnchor() throw(uno::Run
Point aPos(pObj->GetCurrentBoundRect().TopLeft());
ScRange aRange(pDoc->GetRange( nTab, Rectangle( aPos, aPos ) ));
- // anchor is always the cell
+ // anchor is always the cell
xRet.set(new ScCellObj( pDocSh, aRange.aStart ));
}
@@ -1102,9 +1102,9 @@ void SAL_CALL ScShapeObj::insertTextContent( const uno::Reference<text::XTextRan
ScCellFieldObj* pCellField = ScCellFieldObj::getImplementation( xContent );
if ( pCellField )
{
- // #105585# createInstance("TextField.URL") from the document creates a ScCellFieldObj.
- // To insert it into drawing text, a SvxUnoTextField is needed instead.
- // The ScCellFieldObj object is left in non-inserted state.
+ // #105585# createInstance("TextField.URL") from the document creates a ScCellFieldObj.
+ // To insert it into drawing text, a SvxUnoTextField is needed instead.
+ // The ScCellFieldObj object is left in non-inserted state.
SvxUnoTextField* pDrawField = new SvxUnoTextField( ID_URLFIELD );
xEffContent.set(pDrawField);
@@ -1125,7 +1125,7 @@ void SAL_CALL ScShapeObj::removeTextContent( const uno::Reference<text::XTextCon
{
ScUnoGuard aGuard;
- // ScCellFieldObj can't be used here.
+ // ScCellFieldObj can't be used here.
uno::Reference<text::XText> xAggText(lcl_GetText(mxShapeAgg));
if ( xAggText.is() )
@@ -1142,7 +1142,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursor()
if ( mxShapeAgg.is() )
{
- // ScDrawTextCursor must be used to ensure the ScShapeObj is returned by getText
+ // ScDrawTextCursor must be used to ensure the ScShapeObj is returned by getText
SvxUnoTextBase* pText = SvxUnoTextBase::getImplementation( mxShapeAgg );
if (pText)
@@ -1160,7 +1160,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursorByRange(
if ( mxShapeAgg.is() && aTextPosition.is() )
{
- // ScDrawTextCursor must be used to ensure the ScShapeObj is returned by getText
+ // ScDrawTextCursor must be used to ensure the ScShapeObj is returned by getText
SvxUnoTextBase* pText = SvxUnoTextBase::getImplementation( mxShapeAgg );
SvxUnoTextRangeBase* pRange = SvxUnoTextRangeBase::getImplementation( aTextPosition );
@@ -1302,8 +1302,8 @@ uno::Sequence<sal_Int8> SAL_CALL ScShapeObj::getImplementationId()
{
// we need to create a new implementation id for this
// note: this memory is not free'd until application exists
- // but since we have a fixed set of shapetypes and the
- // memory will be reused this is ok.
+ // but since we have a fixed set of shapetypes and the
+ // memory will be reused this is ok.
pImplementationId = new uno::Sequence< sal_Int8 >( 16 );
rtl_createUuid( (sal_uInt8 *) pImplementationId->getArray(), 0, sal_True );
aImplementationIdMap[ aShapeType ] = pImplementationId;
diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx
index b005d16ce482..15f45ce7095e 100644
--- a/sc/source/ui/unoobj/srchuno.cxx
+++ b/sc/source/ui/unoobj/srchuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using namespace com::sun::star;
//------------------------------------------------------------------------
-//! SearchWords sucht in ganzen Zellen - umbenennen ???
+//! SearchWords sucht in ganzen Zellen - umbenennen ???
// SfxItemPropertyMapEntry nur fuer GetPropertySetInfo
@@ -56,18 +56,18 @@ const SfxItemPropertyMapEntry* lcl_GetSearchPropertyMap()
{
static SfxItemPropertyMapEntry aSearchPropertyMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNO_SRCHBACK), 0, &getBooleanCppuType(), 0, 0},
- {MAP_CHAR_LEN(SC_UNO_SRCHBYROW), 0, &getBooleanCppuType(), 0, 0},
- {MAP_CHAR_LEN(SC_UNO_SRCHCASE), 0, &getBooleanCppuType(), 0, 0},
- {MAP_CHAR_LEN(SC_UNO_SRCHREGEXP), 0, &getBooleanCppuType(), 0, 0},
- {MAP_CHAR_LEN(SC_UNO_SRCHSIM), 0, &getBooleanCppuType(), 0, 0},
- {MAP_CHAR_LEN(SC_UNO_SRCHSIMADD), 0, &getCppuType((sal_Int16*)0), 0, 0},
- {MAP_CHAR_LEN(SC_UNO_SRCHSIMEX), 0, &getCppuType((sal_Int16*)0), 0, 0},
- {MAP_CHAR_LEN(SC_UNO_SRCHSIMREL), 0, &getBooleanCppuType(), 0, 0},
- {MAP_CHAR_LEN(SC_UNO_SRCHSIMREM), 0, &getCppuType((sal_Int16*)0), 0, 0},
- {MAP_CHAR_LEN(SC_UNO_SRCHSTYLES), 0, &getBooleanCppuType(), 0, 0},
- {MAP_CHAR_LEN(SC_UNO_SRCHTYPE), 0, &getCppuType((sal_Int16*)0), 0, 0}, // enum TableSearch ist weg
- {MAP_CHAR_LEN(SC_UNO_SRCHWORDS), 0, &getBooleanCppuType(), 0, 0},
+ {MAP_CHAR_LEN(SC_UNO_SRCHBACK), 0, &getBooleanCppuType(), 0, 0},
+ {MAP_CHAR_LEN(SC_UNO_SRCHBYROW), 0, &getBooleanCppuType(), 0, 0},
+ {MAP_CHAR_LEN(SC_UNO_SRCHCASE), 0, &getBooleanCppuType(), 0, 0},
+ {MAP_CHAR_LEN(SC_UNO_SRCHREGEXP), 0, &getBooleanCppuType(), 0, 0},
+ {MAP_CHAR_LEN(SC_UNO_SRCHSIM), 0, &getBooleanCppuType(), 0, 0},
+ {MAP_CHAR_LEN(SC_UNO_SRCHSIMADD), 0, &getCppuType((sal_Int16*)0), 0, 0},
+ {MAP_CHAR_LEN(SC_UNO_SRCHSIMEX), 0, &getCppuType((sal_Int16*)0), 0, 0},
+ {MAP_CHAR_LEN(SC_UNO_SRCHSIMREL), 0, &getBooleanCppuType(), 0, 0},
+ {MAP_CHAR_LEN(SC_UNO_SRCHSIMREM), 0, &getCppuType((sal_Int16*)0), 0, 0},
+ {MAP_CHAR_LEN(SC_UNO_SRCHSTYLES), 0, &getBooleanCppuType(), 0, 0},
+ {MAP_CHAR_LEN(SC_UNO_SRCHTYPE), 0, &getCppuType((sal_Int16*)0), 0, 0}, // enum TableSearch ist weg
+ {MAP_CHAR_LEN(SC_UNO_SRCHWORDS), 0, &getBooleanCppuType(), 0, 0},
{0,0,0,0,0,0}
};
return aSearchPropertyMap_Impl;
@@ -75,8 +75,8 @@ const SfxItemPropertyMapEntry* lcl_GetSearchPropertyMap()
//------------------------------------------------------------------------
-#define SCSEARCHDESCRIPTOR_SERVICE "com.sun.star.util.SearchDescriptor"
-#define SCREPLACEDESCRIPTOR_SERVICE "com.sun.star.util.ReplaceDescriptor"
+#define SCSEARCHDESCRIPTOR_SERVICE "com.sun.star.util.SearchDescriptor"
+#define SCREPLACEDESCRIPTOR_SERVICE "com.sun.star.util.ReplaceDescriptor"
//------------------------------------------------------------------------
@@ -84,11 +84,11 @@ ScCellSearchObj::ScCellSearchObj() :
aPropSet(lcl_GetSearchPropertyMap())
{
pSearchItem = new SvxSearchItem( SCITEM_SEARCHDATA );
- // Defaults:
+ // Defaults:
pSearchItem->SetWordOnly(FALSE);
pSearchItem->SetExact(FALSE);
pSearchItem->SetMatchFullHalfWidthForms(FALSE);
- pSearchItem->SetUseAsianOptions(FALSE); // or all asian bits would have to be handled
+ pSearchItem->SetUseAsianOptions(FALSE); // or all asian bits would have to be handled
pSearchItem->SetBackward(FALSE);
pSearchItem->SetSelection(FALSE);
pSearchItem->SetRegExp(FALSE);
@@ -98,11 +98,11 @@ ScCellSearchObj::ScCellSearchObj() :
pSearchItem->SetLEVOther(2);
pSearchItem->SetLEVShorter(2);
pSearchItem->SetLEVLonger(2);
- // Calc-Flags
+ // Calc-Flags
pSearchItem->SetRowDirection(FALSE);
pSearchItem->SetCellType(SVX_SEARCHIN_FORMULA);
- // Selection-Flag wird beim Aufruf gesetzt
+ // Selection-Flag wird beim Aufruf gesetzt
}
ScCellSearchObj::~ScCellSearchObj()
@@ -160,11 +160,11 @@ void SAL_CALL ScCellSearchObj::setPropertyValue(
ScUnoGuard aGuard;
String aString(aPropertyName);
- if (aString.EqualsAscii( SC_UNO_SRCHBACK )) pSearchItem->SetBackward( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
+ if (aString.EqualsAscii( SC_UNO_SRCHBACK )) pSearchItem->SetBackward( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
else if (aString.EqualsAscii( SC_UNO_SRCHBYROW )) pSearchItem->SetRowDirection( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
else if (aString.EqualsAscii( SC_UNO_SRCHCASE )) pSearchItem->SetExact( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
else if (aString.EqualsAscii( SC_UNO_SRCHREGEXP )) pSearchItem->SetRegExp( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
- else if (aString.EqualsAscii( SC_UNO_SRCHSIM )) pSearchItem->SetLevenshtein( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
+ else if (aString.EqualsAscii( SC_UNO_SRCHSIM )) pSearchItem->SetLevenshtein( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
else if (aString.EqualsAscii( SC_UNO_SRCHSIMREL )) pSearchItem->SetLEVRelaxed( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
else if (aString.EqualsAscii( SC_UNO_SRCHSTYLES )) pSearchItem->SetPattern( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
else if (aString.EqualsAscii( SC_UNO_SRCHWORDS )) pSearchItem->SetWordOnly( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
@@ -182,11 +182,11 @@ uno::Any SAL_CALL ScCellSearchObj::getPropertyValue( const rtl::OUString& aPrope
String aString(aPropertyName);
uno::Any aRet;
- if (aString.EqualsAscii( SC_UNO_SRCHBACK )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetBackward() );
+ if (aString.EqualsAscii( SC_UNO_SRCHBACK )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetBackward() );
else if (aString.EqualsAscii( SC_UNO_SRCHBYROW )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetRowDirection() );
else if (aString.EqualsAscii( SC_UNO_SRCHCASE )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetExact() );
else if (aString.EqualsAscii( SC_UNO_SRCHREGEXP )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetRegExp() );
- else if (aString.EqualsAscii( SC_UNO_SRCHSIM )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->IsLevenshtein() );
+ else if (aString.EqualsAscii( SC_UNO_SRCHSIM )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->IsLevenshtein() );
else if (aString.EqualsAscii( SC_UNO_SRCHSIMREL )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->IsLEVRelaxed() );
else if (aString.EqualsAscii( SC_UNO_SRCHSTYLES )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetPattern() );
else if (aString.EqualsAscii( SC_UNO_SRCHWORDS )) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetWordOnly() );
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 50aecbe7f2e3..e3936b7db334 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,281 +86,281 @@ const SfxItemPropertySet* lcl_GetCellStyleSet()
{
static SfxItemPropertyMapEntry aCellStyleMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &::getCppuType((const util::CellProtection*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&::getBooleanCppuType(), 0, MID_CROSSED_OUT },
- {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS },
- {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
- {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
- {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
- {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
- {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
- {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &::getCppuType((const lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&::getCppuType((const lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&::getCppuType((const lang::Locale*)0), 0, MID_LANG_LOCALE },
- {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE },
- {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &::getCppuType((const awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&::getCppuType((const awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&::getCppuType((const awt::FontSlant*)0), 0, MID_POSTURE },
- {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF },
- {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR },
- {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &::getCppuType((const float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&::getCppuType((const float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&::getCppuType((const float*)0), 0, MID_WEIGHT },
- {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_BOTTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &::getCppuType((const util::CellProtection*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CCOLOR), ATTR_FONT_COLOR, &::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_COUTL), ATTR_FONT_CONTOUR, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CCROSS), ATTR_FONT_CROSSEDOUT,&::getBooleanCppuType(), 0, MID_CROSSED_OUT },
+ {MAP_CHAR_LEN(SC_UNONAME_CEMPHAS), ATTR_FONT_EMPHASISMARK,&getCppuType((sal_Int16*)0), 0, MID_EMPHASIS },
+ {MAP_CHAR_LEN(SC_UNONAME_CFONT), ATTR_FONT, &::getCppuType((const sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNONAME_CFCHARS), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFCHARS), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFCHARS), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_CHAR_SET },
+ {MAP_CHAR_LEN(SC_UNONAME_CFFAMIL), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFFAMIL), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFFAMIL), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_FAMILY },
+ {MAP_CHAR_LEN(SC_UNONAME_CFNAME), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFNAME), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFNAME), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_FAMILY_NAME },
+ {MAP_CHAR_LEN(SC_UNONAME_CFPITCH), ATTR_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFPITCH), ATTR_CJK_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFPITCH), ATTR_CTL_FONT, &getCppuType((sal_Int16*)0), 0, MID_FONT_PITCH },
+ {MAP_CHAR_LEN(SC_UNONAME_CFSTYLE), ATTR_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CFSTYLE), ATTR_CJK_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CFSTYLE), ATTR_CTL_FONT, &getCppuType((rtl::OUString*)0), 0, MID_FONT_STYLE_NAME },
+ {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT,&::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT,&::getCppuType((const float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &::getCppuType((const lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&::getCppuType((const lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&::getCppuType((const lang::Locale*)0), 0, MID_LANG_LOCALE },
+ {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE },
+ {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &::getCppuType((const awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&::getCppuType((const awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&::getCppuType((const awt::FontSlant*)0), 0, MID_POSTURE },
+ {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF },
+ {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR },
+ {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &::getCppuType((const float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&::getCppuType((const float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&::getCppuType((const float*)0), 0, MID_WEIGHT },
+ {MAP_CHAR_LEN(SC_UNONAME_CWORDMOD), ATTR_FONT_WORDLINE, &getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_BLTR), ATTR_BORDER_BLTR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_DIAGONAL_TLBR), ATTR_BORDER_TLBR, &::getCppuType((const table::BorderLine*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &::getCppuType((const table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
- {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
- {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &::getCppuType((const sal_Int32*)0), 0, 0 },
-// {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &::getCppuType((const table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
+ {MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_LEFTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &::getCppuType((const sal_Int32*)0), 0, 0 },
+// {MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &::getCppuType((const table::CellOrientation*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
- {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &::getCppuType((const sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &::getCppuType((const sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS
- {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
- {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &::getCppuType((const sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &::getCppuType((const sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &::getCppuType((const sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &::getCppuType((const table::CellVertJustify*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &::getCppuType((const table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PADJUST), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_PBMARGIN), ATTR_MARGIN, &::getCppuType((const sal_Int32*)0), 0, MID_MARGIN_LO_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PINDENT), ATTR_INDENT, &::getCppuType((const sal_Int16*)0), 0, 0 }, //! CONVERT_TWIPS
+ {MAP_CHAR_LEN(SC_UNONAME_PISCHDIST),ATTR_SCRIPTSPACE, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISFORBID),ATTR_FORBIDDEN_RULES,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISHANG), ATTR_HANGPUNCTUATION,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PISHYPHEN),ATTR_HYPHENATE, &getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_PLASTADJ), ATTR_HOR_JUSTIFY, &::getCppuType((const sal_Int16*)0), 0, MID_HORJUST_ADJUST },
+ {MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &::getCppuType((const sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &::getCppuType((const sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &::getCppuType((const sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_RIGHTBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &::getCppuType((const table::CellVertJustify*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &::getCppuType((const table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_SHRINK_TO_FIT), ATTR_SHRINKTOFIT, &getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &::getCppuType((const table::TableBorder*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &::getCppuType((const table::CellVertJustify*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &::getCppuType((const table::TableBorder*)0), 0, 0 | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_TOPBORDER),ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &::getCppuType((const table::CellVertJustify*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
{0,0,0,0,0,0}
};
static SfxItemPropertySet aCellStyleSet_Impl( aCellStyleMap_Impl );
return &aCellStyleSet_Impl;
}
-// Map mit allen Seitenattributen, incl. Kopf-/Fusszeilenattribute
+// Map mit allen Seitenattributen, incl. Kopf-/Fusszeilenattribute
const SfxItemPropertySet * lcl_GetPageStyleSet()
{
static SfxItemPropertyMapEntry aPageStyleMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNO_PAGE_BACKCOLOR), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR },
- {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER },
- {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION },
- {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL },
- {MAP_CHAR_LEN(SC_UNO_PAGE_BACKTRANS), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_BACKCOLOR), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR },
- {MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BORDER_DISTANCE | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_BOTTMARGIN), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_LO_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_CENTERHOR), ATTR_PAGE_HORCENTER,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_CENTERVER), ATTR_PAGE_VERCENTER,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FIRSTPAGE), ATTR_PAGE_FIRSTPAGENO,&::getCppuType((const sal_Int16*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_BACKCOLOR), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_BACKTRANS), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_BACKCOLOR), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BORDER_DISTANCE | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_BOTTMARGIN), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_LO_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_CENTERHOR), ATTR_PAGE_HORCENTER,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_CENTERVER), ATTR_PAGE_VERCENTER,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,&::getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FIRSTPAGE), ATTR_PAGE_FIRSTPAGENO,&::getCppuType((const sal_Int16*)0), 0, 0 },
//
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), SC_WID_UNO_FOOTERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), SC_WID_UNO_FOOTERSET,&::getCppuType((const style::GraphicLocation*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), SC_WID_UNO_FOOTERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRON), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHARED), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBDIS),SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::ShadowFormat*)0), 0, 0 },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), SC_WID_UNO_FOOTERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), SC_WID_UNO_FOOTERSET,&::getCppuType((const style::GraphicLocation*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), SC_WID_UNO_FOOTERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRON), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHARED), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBDIS),SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::ShadowFormat*)0), 0, 0 },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED), SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR), SC_WID_UNO_FOOTERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), SC_WID_UNO_FOOTERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
//
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), SC_WID_UNO_HEADERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), SC_WID_UNO_HEADERSET,&::getCppuType((const style::GraphicLocation*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), SC_WID_UNO_HEADERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR), SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRON), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHARED), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR), SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR), SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBDIS),SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW), SC_WID_UNO_HEADERSET,&::getCppuType((const table::ShadowFormat*)0), 0, 0 },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR), SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), SC_WID_UNO_HEADERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), SC_WID_UNO_HEADERSET,&::getCppuType((const style::GraphicLocation*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), SC_WID_UNO_HEADERSET,&::getCppuType((const ::rtl::OUString*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR), SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRON), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHARED), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR), SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR), SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBDIS),SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW), SC_WID_UNO_HEADERSET,&::getCppuType((const table::ShadowFormat*)0), 0, 0 },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED), SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR), SC_WID_UNO_HEADERSET,&::getCppuType((const table::BorderLine*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS), SC_WID_UNO_HEADERSET,&::getCppuType((const sal_Int32*)0), 0, 0 },
//
- {MAP_CHAR_LEN(SC_UNO_PAGE_HEIGHT), ATTR_PAGE_SIZE, &::getCppuType((const sal_Int32*)0), 0, MID_SIZE_HEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_BACKTRANS), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
- {MAP_CHAR_LEN(SC_UNO_PAGE_LANDSCAPE), ATTR_PAGE, &::getBooleanCppuType(), 0, MID_PAGE_ORIENTATION },
- {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBORDER), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTMARGIN), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_L_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTFTRCONT), ATTR_PAGE_FOOTERLEFT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTHDRCONT), ATTR_PAGE_HEADERLEFT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_NUMBERTYPE), ATTR_PAGE, &::getCppuType((const sal_Int16*)0), 0, MID_PAGE_NUMTYPE },
- {MAP_CHAR_LEN(SC_UNO_PAGE_SCALEVAL), ATTR_PAGE_SCALE, &::getCppuType((const sal_Int16*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_SYTLELAYOUT), ATTR_PAGE, &::getCppuType((const style::PageStyleLayout*)0), 0, MID_PAGE_LAYOUT },
- {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTANNOT), ATTR_PAGE_NOTES, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTCHARTS), ATTR_PAGE_CHARTS, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTDOWN), ATTR_PAGE_TOPDOWN, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTDRAW), ATTR_PAGE_DRAWINGS, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTFORMUL), ATTR_PAGE_FORMULAS, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTGRID), ATTR_PAGE_GRID, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTHEADER), ATTR_PAGE_HEADERS, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTOBJS), ATTR_PAGE_OBJECTS, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTZERO), ATTR_PAGE_NULLVALS, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ATTR_PAGE_PAPERBIN, &::getCppuType((const ::rtl::OUString*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBRDDIST),ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTMARGIN), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_R_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTFTRCON), ATTR_PAGE_FOOTERRIGHT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTHDRCON), ATTR_PAGE_HEADERRIGHT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOPAG), ATTR_PAGE_SCALETOPAGES,&::getCppuType((const sal_Int16*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOX), ATTR_PAGE_SCALETO, &::getCppuType((const sal_Int16*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOY), ATTR_PAGE_SCALETO, &::getCppuType((const sal_Int16*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_SHADOWFORM), ATTR_SHADOW, &::getCppuType((const table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_SIZE), ATTR_PAGE_SIZE, &::getCppuType((const awt::Size*)0), 0, MID_SIZE_SIZE | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_TOPBORDER), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_TOPBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_TOPMARGIN), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_UP_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKTRAN),SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKTRAN),SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_WIDTH), ATTR_PAGE_SIZE, &::getCppuType((const sal_Int32*)0), 0, MID_SIZE_WIDTH | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HEIGHT), ATTR_PAGE_SIZE, &::getCppuType((const sal_Int32*)0), 0, MID_SIZE_HEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_BACKTRANS), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_LANDSCAPE), ATTR_PAGE, &::getBooleanCppuType(), 0, MID_PAGE_ORIENTATION },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBORDER), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTMARGIN), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_L_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTFTRCONT), ATTR_PAGE_FOOTERLEFT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_LEFTHDRCONT), ATTR_PAGE_HEADERLEFT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_NUMBERTYPE), ATTR_PAGE, &::getCppuType((const sal_Int16*)0), 0, MID_PAGE_NUMTYPE },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_SCALEVAL), ATTR_PAGE_SCALE, &::getCppuType((const sal_Int16*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_SYTLELAYOUT), ATTR_PAGE, &::getCppuType((const style::PageStyleLayout*)0), 0, MID_PAGE_LAYOUT },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTANNOT), ATTR_PAGE_NOTES, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTCHARTS), ATTR_PAGE_CHARTS, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTDOWN), ATTR_PAGE_TOPDOWN, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTDRAW), ATTR_PAGE_DRAWINGS, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTFORMUL), ATTR_PAGE_FORMULAS, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTGRID), ATTR_PAGE_GRID, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTHEADER), ATTR_PAGE_HEADERS, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTOBJS), ATTR_PAGE_OBJECTS, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_PRINTZERO), ATTR_PAGE_NULLVALS, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ATTR_PAGE_PAPERBIN, &::getCppuType((const ::rtl::OUString*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBRDDIST),ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTMARGIN), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_R_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTFTRCON), ATTR_PAGE_FOOTERRIGHT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTHDRCON), ATTR_PAGE_HEADERRIGHT,&::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOPAG), ATTR_PAGE_SCALETOPAGES,&::getCppuType((const sal_Int16*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOX), ATTR_PAGE_SCALETO, &::getCppuType((const sal_Int16*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOY), ATTR_PAGE_SCALETO, &::getCppuType((const sal_Int16*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_SHADOWFORM), ATTR_SHADOW, &::getCppuType((const table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_SIZE), ATTR_PAGE_SIZE, &::getCppuType((const awt::Size*)0), 0, MID_SIZE_SIZE | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_TOPBORDER), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_TOPBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_TOPMARGIN), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_UP_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKTRAN),SC_WID_UNO_FOOTERSET,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKTRAN),SC_WID_UNO_HEADERSET,&::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_WIDTH), ATTR_PAGE_SIZE, &::getCppuType((const sal_Int32*)0), 0, MID_SIZE_WIDTH | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
{0,0,0,0,0,0}
};
- static SfxItemPropertySet aPageStyleSet_Impl( aPageStyleMap_Impl );
+ static SfxItemPropertySet aPageStyleSet_Impl( aPageStyleMap_Impl );
return &aPageStyleSet_Impl;
}
-// Map mit Inhalten des Header-Item-Sets
+// Map mit Inhalten des Header-Item-Sets
const SfxItemPropertyMap* lcl_GetHeaderStyleMap()
{
static SfxItemPropertyMapEntry aHeaderStyleMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_LO_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BORDER_DISTANCE | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC), ATTR_PAGE_DYNAMIC, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT), ATTR_PAGE_SIZE, &::getCppuType((const sal_Int32*)0), 0, MID_SIZE_HEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC), ATTR_PAGE_DYNAMIC, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRON), ATTR_PAGE_ON, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHARED), ATTR_PAGE_SHARED, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_L_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON), ATTR_PAGE_ON, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBDIS),ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_R_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW), ATTR_SHADOW, &::getCppuType((const table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED), ATTR_PAGE_SHARED, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKTRAN),ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_LO_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BORDER_DISTANCE | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC), ATTR_PAGE_DYNAMIC, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT), ATTR_PAGE_SIZE, &::getCppuType((const sal_Int32*)0), 0, MID_SIZE_HEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC), ATTR_PAGE_DYNAMIC, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRON), ATTR_PAGE_ON, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHARED), ATTR_PAGE_SHARED, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_L_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON), ATTR_PAGE_ON, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBDIS),ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_R_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW), ATTR_SHADOW, &::getCppuType((const table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED), ATTR_PAGE_SHARED, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKTRAN),ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
{0,0,0,0,0,0}
};
static SfxItemPropertyMap aHeaderStyleMap( aHeaderStyleMap_Impl );
return &aHeaderStyleMap;
}
-// Map mit Inhalten des Footer-Item-Sets
+// Map mit Inhalten des Footer-Item-Sets
const SfxItemPropertyMap* lcl_GetFooterStyleMap()
{
static SfxItemPropertyMapEntry aFooterStyleMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_UP_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BORDER_DISTANCE | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC), ATTR_PAGE_DYNAMIC, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT), ATTR_PAGE_SIZE, &::getCppuType((const sal_Int32*)0), 0, MID_SIZE_HEIGHT | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC), ATTR_PAGE_DYNAMIC, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRON), ATTR_PAGE_ON, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHARED), ATTR_PAGE_SHARED, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_L_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON), ATTR_PAGE_ON, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBDIS),ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_R_MARGIN | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW), ATTR_SHADOW, &::getCppuType((const table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED), ATTR_PAGE_SHARED, &::getBooleanCppuType(), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
- {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
- {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKTRAN),ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_FILTER },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), ATTR_BACKGROUND, &::getCppuType((const style::GraphicLocation*)0), 0, MID_GRAPHIC_POSITION },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ATTR_BACKGROUND, &::getCppuType((const ::rtl::OUString*)0), 0, MID_GRAPHIC_URL },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), ATTR_BACKGROUND, &::getCppuType((const sal_Int32*)0), 0, MID_BACK_COLOR },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), ATTR_ULSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_UP_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BORDER_DISTANCE | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, BOTTOM_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC), ATTR_PAGE_DYNAMIC, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT), ATTR_PAGE_SIZE, &::getCppuType((const sal_Int32*)0), 0, MID_SIZE_HEIGHT | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC), ATTR_PAGE_DYNAMIC, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRON), ATTR_PAGE_ON, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHARED), ATTR_PAGE_SHARED, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, LEFT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, LEFT_BORDER_DISTANCE | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_L_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON), ATTR_PAGE_ON, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, RIGHT_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBDIS),ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, RIGHT_BORDER_DISTANCE | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR), ATTR_LRSPACE, &::getCppuType((const sal_Int32*)0), 0, MID_R_MARGIN | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW), ATTR_SHADOW, &::getCppuType((const table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED), ATTR_PAGE_SHARED, &::getBooleanCppuType(), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR), ATTR_BORDER, &::getCppuType((const table::BorderLine*)0), 0, TOP_BORDER | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), ATTR_BORDER, &::getCppuType((const sal_Int32*)0), 0, TOP_BORDER_DISTANCE | CONVERT_TWIPS },
+ {MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKTRAN),ATTR_BACKGROUND, &::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
{0,0,0,0,0,0}
};
static SfxItemPropertyMap aFooterStyleMap( aFooterStyleMap_Impl );
@@ -370,52 +370,52 @@ const SfxItemPropertyMap* lcl_GetFooterStyleMap()
//------------------------------------------------------------------------
-// Index-Access auf die Style-Typen: 0 = Cell, 1 = Page
+// Index-Access auf die Style-Typen: 0 = Cell, 1 = Page
#define SC_STYLE_FAMILY_COUNT 2
-#define SC_FAMILYNAME_CELL "CellStyles"
-#define SC_FAMILYNAME_PAGE "PageStyles"
+#define SC_FAMILYNAME_CELL "CellStyles"
+#define SC_FAMILYNAME_PAGE "PageStyles"
static UINT16 aStyleFamilyTypes[SC_STYLE_FAMILY_COUNT] = { SFX_STYLE_FAMILY_PARA, SFX_STYLE_FAMILY_PAGE };
//------------------------------------------------------------------------
-//! diese Funktionen in einen allgemeinen Header verschieben
-inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
-inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
+//! diese Funktionen in einen allgemeinen Header verschieben
+inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
+inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
//------------------------------------------------------------------------
-#define SCSTYLE_SERVICE "com.sun.star.style.Style"
-#define SCCELLSTYLE_SERVICE "com.sun.star.style.CellStyle"
-#define SCPAGESTYLE_SERVICE "com.sun.star.style.PageStyle"
+#define SCSTYLE_SERVICE "com.sun.star.style.Style"
+#define SCCELLSTYLE_SERVICE "com.sun.star.style.CellStyle"
+#define SCPAGESTYLE_SERVICE "com.sun.star.style.PageStyle"
SC_SIMPLE_SERVICE_INFO( ScStyleFamiliesObj, "ScStyleFamiliesObj", "com.sun.star.style.StyleFamilies" )
SC_SIMPLE_SERVICE_INFO( ScStyleFamilyObj, "ScStyleFamilyObj", "com.sun.star.style.StyleFamily" )
//------------------------------------------------------------------------
-#define SC_PAPERBIN_DEFAULTNAME "[From printer settings]"
+#define SC_PAPERBIN_DEFAULTNAME "[From printer settings]"
//------------------------------------------------------------------------
-// conversion programmatic <-> display (visible) name
-// currently, the core always has the visible names
-// the api is required to use programmatic names for default styles
-// these programmatic names must never change!
+// conversion programmatic <-> display (visible) name
+// currently, the core always has the visible names
+// the api is required to use programmatic names for default styles
+// these programmatic names must never change!
-#define SC_STYLE_PROG_STANDARD "Default"
-#define SC_STYLE_PROG_RESULT "Result"
-#define SC_STYLE_PROG_RESULT1 "Result2"
-#define SC_STYLE_PROG_HEADLINE "Heading"
-#define SC_STYLE_PROG_HEADLINE1 "Heading1"
-#define SC_STYLE_PROG_REPORT "Report"
+#define SC_STYLE_PROG_STANDARD "Default"
+#define SC_STYLE_PROG_RESULT "Result"
+#define SC_STYLE_PROG_RESULT1 "Result2"
+#define SC_STYLE_PROG_HEADLINE "Heading"
+#define SC_STYLE_PROG_HEADLINE1 "Heading1"
+#define SC_STYLE_PROG_REPORT "Report"
struct ScDisplayNameMap
{
- String aDispName;
- String aProgName;
+ String aDispName;
+ String aProgName;
};
const ScDisplayNameMap* lcl_GetStyleNameMap( UINT16 nType )
@@ -441,7 +441,7 @@ const ScDisplayNameMap* lcl_GetStyleNameMap( UINT16 nType )
aCellMap[4].aDispName = ScGlobal::GetRscString( STR_STYLENAME_HEADLINE1 );
aCellMap[4].aProgName = String::CreateFromAscii( SC_STYLE_PROG_HEADLINE1 );
- // last entry remains empty
+ // last entry remains empty
bCellMapFilled = TRUE;
}
@@ -459,7 +459,7 @@ const ScDisplayNameMap* lcl_GetStyleNameMap( UINT16 nType )
aPageMap[1].aDispName = ScGlobal::GetRscString( STR_STYLENAME_REPORT );
aPageMap[1].aProgName = String::CreateFromAscii( SC_STYLE_PROG_REPORT );
- // last entry remains empty
+ // last entry remains empty
bPageMapFilled = TRUE;
}
@@ -469,11 +469,11 @@ const ScDisplayNameMap* lcl_GetStyleNameMap( UINT16 nType )
return NULL;
}
-// programmatic name suffix for display names that match other programmatic names
-// is " (user)" including a space
+// programmatic name suffix for display names that match other programmatic names
+// is " (user)" including a space
-#define SC_SUFFIX_USER " (user)"
-#define SC_SUFFIX_USER_LEN 7
+#define SC_SUFFIX_USER " (user)"
+#define SC_SUFFIX_USER_LEN 7
BOOL lcl_EndsWithUser( const String& rString )
{
@@ -502,15 +502,15 @@ String ScStyleNameConversion::DisplayToProgrammaticName( const String& rDispName
if (pNames->aDispName == rDispName)
return pNames->aProgName;
else if (pNames->aProgName == rDispName)
- bDisplayIsProgrammatic = TRUE; // display name matches any programmatic name
+ bDisplayIsProgrammatic = TRUE; // display name matches any programmatic name
}
while( (++pNames)->aDispName.Len() );
}
if ( bDisplayIsProgrammatic || lcl_EndsWithUser( rDispName ) )
{
- // add the (user) suffix if the display name matches any style's programmatic name
- // or if it already contains the suffix
+ // add the (user) suffix if the display name matches any style's programmatic name
+ // or if it already contains the suffix
String aRet(rDispName);
aRet.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SC_SUFFIX_USER ) );
@@ -525,7 +525,7 @@ String ScStyleNameConversion::ProgrammaticToDisplayName( const String& rProgName
{
if ( lcl_EndsWithUser( rProgName ) )
{
- // remove the (user) suffix, don't compare to map entries
+ // remove the (user) suffix, don't compare to map entries
return rProgName.Copy( 0, rProgName.Len() - SC_SUFFIX_USER_LEN );
}
@@ -569,12 +569,12 @@ ScStyleFamiliesObj::~ScStyleFamiliesObj()
void ScStyleFamiliesObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // Referenz-Update interessiert hier nicht
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -598,7 +598,7 @@ ScStyleFamilyObj* ScStyleFamiliesObj::GetObjectByIndex_Impl(UINT32 nIndex) const
if ( nIndex < SC_STYLE_FAMILY_COUNT )
return GetObjectByType_Impl(aStyleFamilyTypes[nIndex]);
- return NULL; // ungueltiger Index
+ return NULL; // ungueltiger Index
}
ScStyleFamilyObj* ScStyleFamiliesObj::GetObjectByName_Impl(const rtl::OUString& aName) const
@@ -638,7 +638,7 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByIndex( sal_Int32 nIndex )
uno::Type SAL_CALL ScStyleFamiliesObj::getElementType() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- return ::getCppuType((const uno::Reference< container::XNameContainer >*)0); // muss zu getByIndex passen
+ return ::getCppuType((const uno::Reference< container::XNameContainer >*)0); // muss zu getByIndex passen
}
sal_Bool SAL_CALL ScStyleFamiliesObj::hasElements() throw(uno::RuntimeException)
@@ -687,19 +687,19 @@ void SAL_CALL ScStyleFamiliesObj::loadStylesFromURL( const rtl::OUString& aURL,
const uno::Sequence<beans::PropertyValue>& aOptions )
throw(io::IOException, uno::RuntimeException)
{
- //! use aOptions (like Writer)
- //! set flag to disable filter option dialogs when importing
+ //! use aOptions (like Writer)
+ //! set flag to disable filter option dialogs when importing
- String aFilter; // empty - detect
+ String aFilter; // empty - detect
String aFiltOpt;
ScDocumentLoader aLoader( aURL, aFilter, aFiltOpt );
ScDocShell* pSource = aLoader.GetDocShell();
if ( pSource && pDocShell )
{
- // collect options
+ // collect options
- BOOL bLoadReplace = TRUE; // defaults
+ BOOL bLoadReplace = TRUE; // defaults
BOOL bLoadCellStyles = TRUE;
BOOL bLoadPageStyles = TRUE;
@@ -719,14 +719,14 @@ void SAL_CALL ScStyleFamiliesObj::loadStylesFromURL( const rtl::OUString& aURL,
}
pDocShell->LoadStylesArgs( *pSource, bLoadReplace, bLoadCellStyles, bLoadPageStyles );
- pDocShell->SetDocumentModified(); // paint is inside LoadStyles
+ pDocShell->SetDocumentModified(); // paint is inside LoadStyles
}
}
uno::Sequence<beans::PropertyValue> SAL_CALL ScStyleFamiliesObj::getStyleLoaderOptions()
throw(uno::RuntimeException)
{
- // return defaults for options (?)
+ // return defaults for options (?)
uno::Sequence<beans::PropertyValue> aSequence(3);
beans::PropertyValue* pArray = aSequence.getArray();
@@ -760,12 +760,12 @@ ScStyleFamilyObj::~ScStyleFamilyObj()
void ScStyleFamilyObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // Referenz-Update interessiert hier nicht
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -811,32 +811,32 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const rtl::OUString& aName, const
{
ScUnoGuard aGuard;
sal_Bool bDone = sal_False;
- // Reflection muss nicht uno::XInterface sein, kann auch irgendein Interface sein...
+ // Reflection muss nicht uno::XInterface sein, kann auch irgendein Interface sein...
uno::Reference< uno::XInterface > xInterface(aElement, uno::UNO_QUERY);
if ( xInterface.is() )
{
ScStyleObj* pStyleObj = ScStyleObj::getImplementation( xInterface );
if ( pStyleObj && pStyleObj->GetFamily() == eFamily &&
- !pStyleObj->IsInserted() ) // noch nicht eingefuegt?
+ !pStyleObj->IsInserted() ) // noch nicht eingefuegt?
{
String aNameStr(ScStyleNameConversion::ProgrammaticToDisplayName( aName, sal::static_int_cast<UINT16>(eFamily) ));
ScDocument* pDoc = pDocShell->GetDocument();
ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
- //! DocFunc-Funktion??
- //! Undo ?????????????
+ //! DocFunc-Funktion??
+ //! Undo ?????????????
- if ( !pStylePool->Find( aNameStr, eFamily ) ) // noch nicht vorhanden
+ if ( !pStylePool->Find( aNameStr, eFamily ) ) // noch nicht vorhanden
{
(void)pStylePool->Make( aNameStr, eFamily, SFXSTYLEBIT_USERDEF );
if ( eFamily == SFX_STYLE_FAMILY_PARA && !pDoc->IsImportingXML() )
pDoc->GetPool()->CellStyleCreated( aNameStr );
- pStyleObj->InitDoc( pDocShell, aNameStr ); // Objekt kann benutzt werden
+ pStyleObj->InitDoc( pDocShell, aNameStr ); // Objekt kann benutzt werden
- pDocShell->SetDocumentModified(); // verwendet wird der neue Style noch nicht
+ pDocShell->SetDocumentModified(); // verwendet wird der neue Style noch nicht
bDone = sal_True;
}
else
@@ -846,7 +846,7 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const rtl::OUString& aName, const
if (!bDone)
{
- // other errors are handled above
+ // other errors are handled above
throw lang::IllegalArgumentException();
}
}
@@ -856,7 +856,7 @@ void SAL_CALL ScStyleFamilyObj::replaceByName( const rtl::OUString& aName, const
lang::WrappedTargetException, uno::RuntimeException)
{
ScUnoGuard aGuard;
- //! zusammenfassen?
+ //! zusammenfassen?
removeByName( aName );
insertByName( aName, aElement );
}
@@ -874,8 +874,8 @@ void SAL_CALL ScStyleFamilyObj::removeByName( const rtl::OUString& aName )
ScDocument* pDoc = pDocShell->GetDocument();
ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
- //! DocFunc-Funktion??
- //! Undo ?????????????
+ //! DocFunc-Funktion??
+ //! Undo ?????????????
SfxStyleSheetBase* pStyle = pStylePool->Find( aString, eFamily );
if (pStyle)
@@ -895,7 +895,7 @@ void SAL_CALL ScStyleFamilyObj::removeByName( const rtl::OUString& aName )
pStylePool->Remove( pStyle );
- //! InvalidateAttribs(); // Bindings-Invalidate
+ //! InvalidateAttribs(); // Bindings-Invalidate
}
else
{
@@ -948,7 +948,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByIndex( sal_Int32 nIndex )
uno::Type SAL_CALL ScStyleFamilyObj::getElementType() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- return ::getCppuType((const uno::Reference< style::XStyle >*)0); // muss zu getByIndex passen
+ return ::getCppuType((const uno::Reference< style::XStyle >*)0); // muss zu getByIndex passen
}
sal_Bool SAL_CALL ScStyleFamilyObj::hasElements() throw(uno::RuntimeException)
@@ -1085,7 +1085,7 @@ void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const ::rtl::OUStr
//------------------------------------------------------------------------
-// Default-ctor wird fuer die Reflection gebraucht
+// Default-ctor wird fuer die Reflection gebraucht
//UNUSED2008-05 ScStyleObj::ScStyleObj() :
//UNUSED2008-05 aPropSet( lcl_GetCellStyleMap() ),
@@ -1100,7 +1100,7 @@ ScStyleObj::ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const String& rN
eFamily( eFam ),
aStyleName( rName )
{
- // pDocShell ist Null, wenn per ServiceProvider erzeugt
+ // pDocShell ist Null, wenn per ServiceProvider erzeugt
if (pDocShell)
pDocShell->GetDocument()->AddUnoObject(*this);
@@ -1166,12 +1166,12 @@ ScStyleObj* ScStyleObj::getImplementation(
void ScStyleObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // Referenz-Update interessiert hier nicht
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // ungueltig geworden
}
}
@@ -1222,23 +1222,23 @@ void SAL_CALL ScStyleObj::setParentStyle( const rtl::OUString& rParentStyle )
SfxStyleSheetBase* pStyle = GetStyle_Impl();
if (pStyle)
{
- // #70909# cell styles cannot be modified if any sheet is protected
+ // #70909# cell styles cannot be modified if any sheet is protected
if ( eFamily == SFX_STYLE_FAMILY_PARA && lcl_AnyTabProtected( *pDocShell->GetDocument() ) )
- return; //! exception?
+ return; //! exception?
- //! DocFunc-Funktion??
- //! Undo ?????????????
+ //! DocFunc-Funktion??
+ //! Undo ?????????????
String aString(ScStyleNameConversion::ProgrammaticToDisplayName( rParentStyle, sal::static_int_cast<UINT16>(eFamily) ));
sal_Bool bOk = pStyle->SetParent( aString );
if (bOk)
{
- // wie bei setPropertyValue
+ // wie bei setPropertyValue
ScDocument* pDoc = pDocShell->GetDocument();
if ( eFamily == SFX_STYLE_FAMILY_PARA )
{
- // Zeilenhoehen anpassen...
+ // Zeilenhoehen anpassen...
VirtualDevice aVDev;
Point aLogic = aVDev.LogicToPixel( Point(1000,1000), MAP_TWIP );
@@ -1252,7 +1252,7 @@ void SAL_CALL ScStyleObj::setParentStyle( const rtl::OUString& rParentStyle )
}
else
{
- //! ModifyStyleSheet am Dokument (alte Werte merken)
+ //! ModifyStyleSheet am Dokument (alte Werte merken)
pDocShell->PageStyleModified( aStyleName, sal_True );
}
@@ -1278,24 +1278,24 @@ void SAL_CALL ScStyleObj::setName( const rtl::OUString& aNewName )
SfxStyleSheetBase* pStyle = GetStyle_Impl();
if (pStyle)
{
- // #71225# cell styles cannot be renamed if any sheet is protected
+ // #71225# cell styles cannot be renamed if any sheet is protected
if ( eFamily == SFX_STYLE_FAMILY_PARA && lcl_AnyTabProtected( *pDocShell->GetDocument() ) )
- return; //! exception?
+ return; //! exception?
- //! DocFunc-Funktion??
- //! Undo ?????????????
+ //! DocFunc-Funktion??
+ //! Undo ?????????????
String aString(aNewName);
sal_Bool bOk = pStyle->SetName( aString );
if (bOk)
{
- aStyleName = aString; //! notify other objects for this style?
+ aStyleName = aString; //! notify other objects for this style?
ScDocument* pDoc = pDocShell->GetDocument();
if ( eFamily == SFX_STYLE_FAMILY_PARA && !pDoc->IsImportingXML() )
pDoc->GetPool()->CellStyleCreated( aString );
- // Zellvorlagen = 2, Seitenvorlagen = 4
+ // Zellvorlagen = 2, Seitenvorlagen = 4
UINT16 nId = ( eFamily == SFX_STYLE_FAMILY_PARA ) ?
SID_STYLE_FAMILY2 : SID_STYLE_FAMILY4;
SfxBindings* pBindings = pDocShell->GetViewBindings();
@@ -1311,7 +1311,7 @@ void SAL_CALL ScStyleObj::setName( const rtl::OUString& aNewName )
// static
uno::Reference<container::XIndexReplace> ScStyleObj::CreateEmptyNumberingRules()
{
- SvxNumRule aRule( 0, 0, TRUE ); // nothing supported
+ SvxNumRule aRule( 0, 0, TRUE ); // nothing supported
return SvxCreateNumRule( &aRule );
}
@@ -1320,7 +1320,7 @@ uno::Reference<container::XIndexReplace> ScStyleObj::CreateEmptyNumberingRules()
const SfxItemSet* ScStyleObj::GetStyleItemSet_Impl( const ::rtl::OUString& rPropName,
const SfxItemPropertySimpleEntry*& rpResultEntry )
{
- //! OUString as argument?
+ //! OUString as argument?
SfxStyleSheetBase* pStyle = GetStyle_Impl();
if (pStyle)
@@ -1383,7 +1383,7 @@ beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const rtl::OUString&
else if ( eState == SFX_ITEM_DEFAULT )
eRet = beans::PropertyState_DEFAULT_VALUE;
else if ( eState == SFX_ITEM_DONTCARE )
- eRet = beans::PropertyState_AMBIGUOUS_VALUE; // kann eigentlich nicht sein...
+ eRet = beans::PropertyState_AMBIGUOUS_VALUE; // kann eigentlich nicht sein...
else
{
DBG_ERROR("unbekannter ItemState");
@@ -1397,8 +1397,8 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScStyleObj::getPropertyStates(
const uno::Sequence<rtl::OUString>& aPropertyNames )
throw(beans::UnknownPropertyException, uno::RuntimeException)
{
- // duemmliche Default-Implementierung: alles einzeln per getPropertyState holen
- //! sollte optimiert werden!
+ // duemmliche Default-Implementierung: alles einzeln per getPropertyState holen
+ //! sollte optimiert werden!
ScUnoGuard aGuard;
const rtl::OUString* pNames = aPropertyNames.getConstArray();
@@ -1438,11 +1438,11 @@ uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const rtl::OUString& aProperty
if ( IsScItemWid( nWhich ) )
{
- // Default ist Default vom ItemPool, nicht vom Standard-Style,
- // damit es zu setPropertyToDefault passt
+ // Default ist Default vom ItemPool, nicht vom Standard-Style,
+ // damit es zu setPropertyToDefault passt
SfxItemSet aEmptySet( *pStyleSet->GetPool(), pStyleSet->GetRanges() );
- // #65253# Default-Items mit falscher Slot-ID funktionieren im SfxItemPropertySet3 nicht
- //! Slot-IDs aendern...
+ // #65253# Default-Items mit falscher Slot-ID funktionieren im SfxItemPropertySet3 nicht
+ //! Slot-IDs aendern...
if ( aEmptySet.GetPool()->GetSlotId(nWhich) == nWhich &&
aEmptySet.GetItemState(nWhich, sal_False) == SFX_ITEM_DEFAULT )
{
@@ -1450,10 +1450,10 @@ uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const rtl::OUString& aProperty
}
const SfxItemSet* pItemSet = &aEmptySet;
- switch ( nWhich ) // fuer Item-Spezial-Behandlungen
+ switch ( nWhich ) // fuer Item-Spezial-Behandlungen
{
case ATTR_VALUE_FORMAT:
- // default has no language set
+ // default has no language set
aAny <<= sal_Int32( ((const SfxUInt32Item&)pItemSet->Get(nWhich)).GetValue() );
break;
case ATTR_INDENT:
@@ -1468,7 +1468,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const rtl::OUString& aProperty
case ATTR_PAGE_CHARTS:
case ATTR_PAGE_OBJECTS:
case ATTR_PAGE_DRAWINGS:
- //! sal_Bool-MID fuer ScViewObjectModeItem definieren?
+ //! sal_Bool-MID fuer ScViewObjectModeItem definieren?
aAny <<= sal_Bool( ((const ScViewObjectModeItem&)pItemSet->Get(nWhich)).
GetValue() == VOBJ_MODE_SHOW );
break;
@@ -1546,7 +1546,7 @@ uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyValues(
{
ScUnoGuard aGuard;
- //! optimize
+ //! optimize
sal_Int32 nCount = aPropertyNames.getLength();
uno::Sequence<uno::Any> aSequence( nCount );
@@ -1590,19 +1590,19 @@ void SAL_CALL ScStyleObj::setAllPropertiesToDefault() throw (uno::RuntimeExcepti
SfxStyleSheetBase* pStyle = GetStyle_Impl();
if ( pStyle )
{
- // #70909# cell styles cannot be modified if any sheet is protected
+ // #70909# cell styles cannot be modified if any sheet is protected
if ( eFamily == SFX_STYLE_FAMILY_PARA && lcl_AnyTabProtected( *pDocShell->GetDocument() ) )
throw uno::RuntimeException();
SfxItemSet& rSet = pStyle->GetItemSet();
- rSet.ClearItem(); // set all items to default
+ rSet.ClearItem(); // set all items to default
- //! merge with SetOneProperty
+ //! merge with SetOneProperty
ScDocument* pDoc = pDocShell->GetDocument();
if ( eFamily == SFX_STYLE_FAMILY_PARA )
{
- // row heights
+ // row heights
VirtualDevice aVDev;
Point aLogic = aVDev.LogicToPixel( Point(1000,1000), MAP_TWIP );
@@ -1655,7 +1655,7 @@ uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyDefaults(
{
ScUnoGuard aGuard;
- //! optimize
+ //! optimize
sal_Int32 nCount = aPropertyNames.getLength();
uno::Sequence<uno::Any> aSequence( nCount );
@@ -1698,11 +1698,11 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons
SfxStyleSheetBase* pStyle = GetStyle_Impl();
if ( pStyle && pEntry )
{
- // #70909# cell styles cannot be modified if any sheet is protected
+ // #70909# cell styles cannot be modified if any sheet is protected
if ( eFamily == SFX_STYLE_FAMILY_PARA && lcl_AnyTabProtected( *pDocShell->GetDocument() ) )
throw uno::RuntimeException();
- SfxItemSet& rSet = pStyle->GetItemSet(); // direkt im lebenden Style aendern...
+ SfxItemSet& rSet = pStyle->GetItemSet(); // direkt im lebenden Style aendern...
sal_Bool bDone = sal_False;
if ( eFamily == SFX_STYLE_FAMILY_PAGE )
{
@@ -1767,7 +1767,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons
if ( eNewLang != eOldLang && eNewLang != LANGUAGE_DONTKNOW )
rSet.Put( SvxLanguageItem( eNewLang, ATTR_LANGUAGE_FORMAT ) );
- //! keep default state of number format if only language changed?
+ //! keep default state of number format if only language changed?
}
break;
case ATTR_INDENT:
@@ -1782,7 +1782,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons
sal_Int32 nRotVal = 0;
if ( *pValue >>= nRotVal )
{
- // stored value is always between 0 and 360 deg.
+ // stored value is always between 0 and 360 deg.
nRotVal %= 36000;
if ( nRotVal < 0 )
nRotVal += 36000;
@@ -1843,7 +1843,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons
{
sal_Bool bBool = sal_False;
*pValue >>= bBool;
- //! sal_Bool-MID fuer ScViewObjectModeItem definieren?
+ //! sal_Bool-MID fuer ScViewObjectModeItem definieren?
rSet.Put( ScViewObjectModeItem( pEntry->nWID,
bBool ? VOBJ_MODE_SHOW : VOBJ_MODE_HIDE ) );
}
@@ -1898,9 +1898,9 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons
}
break;
default:
- // #65253# Default-Items mit falscher Slot-ID
- // funktionieren im SfxItemPropertySet3 nicht
- //! Slot-IDs aendern...
+ // #65253# Default-Items mit falscher Slot-ID
+ // funktionieren im SfxItemPropertySet3 nicht
+ //! Slot-IDs aendern...
if ( rSet.GetPool()->GetSlotId(pEntry->nWID) == pEntry->nWID &&
rSet.GetItemState(pEntry->nWID, sal_False) == SFX_ITEM_DEFAULT )
{
@@ -1916,7 +1916,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons
if ( pEntry->nWID == ATTR_VALUE_FORMAT )
rSet.ClearItem( ATTR_LANGUAGE_FORMAT );
- //! for ATTR_ROTATE_VALUE, also reset ATTR_ORIENTATION?
+ //! for ATTR_ROTATE_VALUE, also reset ATTR_ORIENTATION?
}
}
else if ( IsScUnoWid( pEntry->nWID ) )
@@ -1947,13 +1947,13 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons
}
}
- //! DocFunc-Funktion??
- //! Undo ?????????????
+ //! DocFunc-Funktion??
+ //! Undo ?????????????
ScDocument* pDoc = pDocShell->GetDocument();
if ( eFamily == SFX_STYLE_FAMILY_PARA )
{
- // Zeilenhoehen anpassen...
+ // Zeilenhoehen anpassen...
VirtualDevice aVDev;
Point aLogic = aVDev.LogicToPixel( Point(1000,1000), MAP_TWIP );
@@ -1967,7 +1967,7 @@ void ScStyleObj::SetOnePropertyValue( const ::rtl::OUString& rPropertyName, cons
}
else
{
- //! ModifyStyleSheet am Dokument (alte Werte merken)
+ //! ModifyStyleSheet am Dokument (alte Werte merken)
pDocShell->PageStyleModified( aStyleName, sal_True );
}
@@ -2119,7 +2119,7 @@ sal_Bool SAL_CALL ScStyleObj::supportsService( const rtl::OUString& rServiceName
{
BOOL bPage = ( eFamily == SFX_STYLE_FAMILY_PAGE );
return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SCSTYLE_SERVICE ) )||
- rServiceName.equalsAsciiL(
+ rServiceName.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM ( bPage ? SCPAGESTYLE_SERVICE : SCCELLSTYLE_SERVICE ));
}
diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx
index aa4cdf58882d..5d6602b40b2b 100644
--- a/sc/source/ui/unoobj/targuno.cxx
+++ b/sc/source/ui/unoobj/targuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,17 +58,17 @@ using namespace ::com::sun::star;
sal_uInt16 nTypeResIds[SC_LINKTARGETTYPE_COUNT] =
{
- SCSTR_CONTENT_TABLE, // SC_LINKTARGETTYPE_SHEET
- SCSTR_CONTENT_RANGENAME, // SC_LINKTARGETTYPE_RANGENAME
- SCSTR_CONTENT_DBAREA // SC_LINKTARGETTYPE_DBAREA
+ SCSTR_CONTENT_TABLE, // SC_LINKTARGETTYPE_SHEET
+ SCSTR_CONTENT_RANGENAME, // SC_LINKTARGETTYPE_RANGENAME
+ SCSTR_CONTENT_DBAREA // SC_LINKTARGETTYPE_DBAREA
};
const SfxItemPropertyMapEntry* lcl_GetLinkTargetMap()
{
static SfxItemPropertyMapEntry aLinkTargetMap_Impl[] =
{
- {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), 0, &getCppuType((const uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), 0, &getCppuType((const uno::Reference<awt::XBitmap>*)0), beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), 0, &getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 },
{0,0,0,0,0,0}
};
return aLinkTargetMap_Impl;
@@ -77,7 +77,7 @@ const SfxItemPropertyMapEntry* lcl_GetLinkTargetMap()
//------------------------------------------------------------------------
// service for ScLinkTargetTypeObj is not defined
-// must not support document::LinkTarget because the target type cannot be used as a target
+// must not support document::LinkTarget because the target type cannot be used as a target
SC_SIMPLE_SERVICE_INFO( ScLinkTargetTypesObj, "ScLinkTargetTypesObj", "com.sun.star.document.LinkTargets" )
SC_SIMPLE_SERVICE_INFO( ScLinkTargetTypeObj, "ScLinkTargetTypeObj", "com.sun.star.document.LinkTargetSupplier" )
@@ -103,7 +103,7 @@ ScLinkTargetTypesObj::~ScLinkTargetTypesObj()
void ScLinkTargetTypesObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
- pDocShell = NULL; // document gone
+ pDocShell = NULL; // document gone
}
// container::XNameAccess
@@ -160,7 +160,7 @@ ScLinkTargetTypeObj::ScLinkTargetTypeObj(ScDocShell* pDocSh, sal_uInt16 nT) :
nType( nT )
{
pDocShell->GetDocument()->AddUnoObject(*this);
- aName = String( ScResId( nTypeResIds[nType] ) ); //! on demand?
+ aName = String( ScResId( nTypeResIds[nType] ) ); //! on demand?
}
ScLinkTargetTypeObj::~ScLinkTargetTypeObj()
@@ -172,7 +172,7 @@ ScLinkTargetTypeObj::~ScLinkTargetTypeObj()
void ScLinkTargetTypeObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
- pDocShell = NULL; // document gone
+ pDocShell = NULL; // document gone
}
// document::XLinkTargetSupplier
@@ -199,8 +199,8 @@ uno::Reference< container::XNameAccess > SAL_CALL ScLinkTargetTypeObj::getLinks
}
}
- // wrap collection in ScLinkTargetsObj because service document::LinkTargets requires
- // beans::XPropertySet as ElementType in container::XNameAccess.
+ // wrap collection in ScLinkTargetsObj because service document::LinkTargets requires
+ // beans::XPropertySet as ElementType in container::XNameAccess.
if ( xCollection.is() )
return new ScLinkTargetsObj( xCollection );
return NULL;
@@ -217,17 +217,17 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScLinkTargetTypeObj::getProp
void SAL_CALL ScLinkTargetTypeObj::setPropertyValue(const rtl::OUString& /* aPropertyName */,
const uno::Any& /* aValue */)
- throw( beans::UnknownPropertyException,
+ throw( beans::UnknownPropertyException,
beans::PropertyVetoException,
lang::IllegalArgumentException,
lang::WrappedTargetException,
uno::RuntimeException )
{
- // everything is read-only
- //! exception?
+ // everything is read-only
+ //! exception?
}
-// static
+// static
void ScLinkTargetTypeObj::SetLinkTargetBitmap( uno::Any& rRet, sal_uInt16 nType )
{
sal_uInt16 nImgId = 0;
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 5c45195621d8..e8e1295c8c3c 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +72,15 @@ const SvxItemPropertySet * lcl_GetHdFtPropertySet()
SVX_UNOEDIT_CHAR_PROPERTIES,
SVX_UNOEDIT_FONT_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
- SVX_UNOEDIT_NUMBERING_PROPERTIE, // for completeness of service ParagraphProperties
+ SVX_UNOEDIT_NUMBERING_PROPERTIE, // for completeness of service ParagraphProperties
{0,0,0,0,0,0}
};
static BOOL bTwipsSet = FALSE;
if (!bTwipsSet)
{
- // modify PropertyMap to include CONVERT_TWIPS flag for font height
- // (headers/footers are in twips)
+ // modify PropertyMap to include CONVERT_TWIPS flag for font height
+ // (headers/footers are in twips)
SfxItemPropertyMapEntry* pEntry = aHdFtPropertyMap_Impl;
while (pEntry->pName)
@@ -97,7 +97,7 @@ const SvxItemPropertySet * lcl_GetHdFtPropertySet()
}
bTwipsSet = TRUE;
}
- static SvxItemPropertySet aHdFtPropertySet_Impl( aHdFtPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
+ static SvxItemPropertySet aHdFtPropertySet_Impl( aHdFtPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
return &aHdFtPropertySet_Impl;
}
@@ -111,16 +111,16 @@ SC_SIMPLE_SERVICE_INFO( ScHeaderFooterTextObj, "ScHeaderFooterTextObj", "stardiv
ScHeaderFooterContentObj::ScHeaderFooterContentObj( const EditTextObject* pLeft,
const EditTextObject* pCenter,
const EditTextObject* pRight ) :
- pLeftText ( NULL ),
- pCenterText ( NULL ),
- pRightText ( NULL )
+ pLeftText ( NULL ),
+ pCenterText ( NULL ),
+ pRightText ( NULL )
{
if ( pLeft )
- pLeftText = pLeft->Clone();
+ pLeftText = pLeft->Clone();
if ( pCenter )
- pCenterText = pCenter->Clone();
+ pCenterText = pCenter->Clone();
if ( pRight )
- pRightText = pRight->Clone();
+ pRightText = pRight->Clone();
}
ScHeaderFooterContentObj::~ScHeaderFooterContentObj()
@@ -153,7 +153,7 @@ void ScHeaderFooterContentObj::UpdateText( USHORT nPart, EditEngine& rSource )
delete pCenterText;
pCenterText = pNew;
break;
- default: // SC_HDFT_RIGHT
+ default: // SC_HDFT_RIGHT
delete pRightText;
pRightText = pNew;
break;
@@ -239,13 +239,13 @@ ScHeaderFooterTextData::ScHeaderFooterTextData( ScHeaderFooterContentObj& rConte
bDataValid( FALSE ),
bInUpdate( FALSE )
{
- rContentObj.acquire(); // must not go away
+ rContentObj.acquire(); // must not go away
rContentObj.AddListener( *this );
}
ScHeaderFooterTextData::~ScHeaderFooterTextData()
{
- ScUnoGuard aGuard; // needed for EditEngine dtor
+ ScUnoGuard aGuard; // needed for EditEngine dtor
rContentObj.RemoveListener( *this );
@@ -261,8 +261,8 @@ void ScHeaderFooterTextData::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
if ( ((const ScHeaderFooterChangedHint&)rHint).GetPart() == nPart )
{
- if (!bInUpdate) // not for own updates
- bDataValid = FALSE; // text has to be fetched again
+ if (!bInUpdate) // not for own updates
+ bDataValid = FALSE; // text has to be fetched again
}
}
}
@@ -278,14 +278,14 @@ SvxTextForwarder* ScHeaderFooterTextData::GetTextForwarder()
pHdrEngine->EnableUndo( FALSE );
pHdrEngine->SetRefMapMode( MAP_TWIP );
- // default font must be set, independently of document
- // -> use global pool from module
+ // default font must be set, independently of document
+ // -> use global pool from module
SfxItemSet aDefaults( pHdrEngine->GetEmptyItemSet() );
const ScPatternAttr& rPattern = (const ScPatternAttr&)SC_MOD()->GetPool().GetDefaultItem(ATTR_PATTERN);
rPattern.FillEditItemSet( &aDefaults );
- // FillEditItemSet adjusts font height to 1/100th mm,
- // but for header/footer twips is needed, as in the PatternAttr:
+ // FillEditItemSet adjusts font height to 1/100th mm,
+ // but for header/footer twips is needed, as in the PatternAttr:
aDefaults.Put( rPattern.GetItem(ATTR_FONT_HEIGHT), EE_CHAR_FONTHEIGHT );
aDefaults.Put( rPattern.GetItem(ATTR_CJK_FONT_HEIGHT), EE_CHAR_FONTHEIGHT_CJK );
aDefaults.Put( rPattern.GetItem(ATTR_CTL_FONT_HEIGHT), EE_CHAR_FONTHEIGHT_CTL );
@@ -321,7 +321,7 @@ void ScHeaderFooterTextData::UpdateData()
{
if ( pEditEngine )
{
- bInUpdate = TRUE; // don't reset bDataValid during UpdateText
+ bInUpdate = TRUE; // don't reset bDataValid during UpdateText
rContentObj.UpdateText( nPart, *pEditEngine );
@@ -336,15 +336,15 @@ ScHeaderFooterTextObj::ScHeaderFooterTextObj( ScHeaderFooterContentObj& rContent
aTextData( rContent, nP ),
pUnoText( NULL )
{
- // ScHeaderFooterTextData acquires rContent
- // pUnoText is created on demand (getString/setString work without it)
+ // ScHeaderFooterTextData acquires rContent
+ // pUnoText is created on demand (getString/setString work without it)
}
void ScHeaderFooterTextObj::CreateUnoText_Impl()
{
if ( !pUnoText )
{
- // can't be aggregated because getString/setString is handled here
+ // can't be aggregated because getString/setString is handled here
ScSharedHeaderFooterEditSource aEditSource( &aTextData );
pUnoText = new SvxUnoText( &aEditSource, lcl_GetHdFtPropertySet(), uno::Reference<text::XText>() );
pUnoText->acquire();
@@ -381,18 +381,18 @@ uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCurs
if (!pUnoText)
CreateUnoText_Impl();
return pUnoText->createTextCursorByRange(aTextPosition);
- //! wie ScCellObj::createTextCursorByRange, wenn SvxUnoTextRange_getReflection verfuegbar
+ //! wie ScCellObj::createTextCursorByRange, wenn SvxUnoTextRange_getReflection verfuegbar
}
-void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData ) // static
+void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData ) // static
{
String aDummy(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( "???" )));
- rData.aTitle = aDummy;
- rData.aLongDocName = aDummy;
- rData.aShortDocName = aDummy;
- rData.aTabName = aDummy;
- rData.nPageNo = 1;
- rData.nTotalPages = 99;
+ rData.aTitle = aDummy;
+ rData.aLongDocName = aDummy;
+ rData.aShortDocName = aDummy;
+ rData.aTabName = aDummy;
+ rData.nPageNo = 1;
+ rData.nTotalPages = 99;
}
rtl::OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException)
@@ -476,7 +476,7 @@ void SAL_CALL ScHeaderFooterTextObj::insertTextContent(
if (!pTextRange)
pTextRange = (SvxUnoTextRange*)xRange->getImplementation(
SvxUnoTextRange_getReflection() );
- //! bei SvxUnoTextRange testen, ob in passendem Objekt !!!
+ //! bei SvxUnoTextRange testen, ob in passendem Objekt !!!
#endif
if ( pHeaderField && !pHeaderField->IsInserted() && pTextRange )
@@ -486,7 +486,7 @@ void SAL_CALL ScHeaderFooterTextObj::insertTextContent(
if (!bAbsorb)
{
- // don't replace -> append at end
+ // don't replace -> append at end
aSelection.Adjust();
aSelection.nStartPara = aSelection.nEndPara;
aSelection.nStartPos = aSelection.nEndPos;
@@ -498,14 +498,14 @@ void SAL_CALL ScHeaderFooterTextObj::insertTextContent(
pForwarder->QuickInsertField( aItem, aSelection );
pEditSource->UpdateData();
- // neue Selektion: ein Zeichen
+ // neue Selektion: ein Zeichen
aSelection.Adjust();
aSelection.nEndPara = aSelection.nStartPara;
aSelection.nEndPos = aSelection.nStartPos + 1;
pHeaderField->InitDoc( &aTextData.GetContentObj(), aTextData.GetPart(), aSelection );
- // #91431# for bAbsorb=FALSE, the new selection must be behind the inserted content
- // (the xml filter relies on this)
+ // #91431# for bAbsorb=FALSE, the new selection must be behind the inserted content
+ // (the xml filter relies on this)
if (!bAbsorb)
aSelection.nStartPos = aSelection.nEndPos;
@@ -530,7 +530,7 @@ void SAL_CALL ScHeaderFooterTextObj::removeTextContent(
ScHeaderFieldObj* pHeaderField = ScHeaderFieldObj::getImplementation( xContent );
if ( pHeaderField && pHeaderField->IsInserted() )
{
- //! Testen, ob das Feld in dieser Zelle ist
+ //! Testen, ob das Feld in dieser Zelle ist
pHeaderField->DeleteField();
return;
}
@@ -577,7 +577,7 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScHeaderFooterTextObj::ge
uno::Reference<container::XNameAccess> SAL_CALL ScHeaderFooterTextObj::getTextFieldMasters()
throw(uno::RuntimeException)
{
- // sowas gibts nicht im Calc (?)
+ // sowas gibts nicht im Calc (?)
return NULL;
}
@@ -656,7 +656,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getStart() throw(uno
{
ScUnoGuard aGuard;
- //! use other object for range than cursor?
+ //! use other object for range than cursor?
ScCellTextCursor* pNew = new ScCellTextCursor( *this );
uno::Reference<text::XTextRange> xRange( static_cast<SvxUnoTextRangeBase*>(pNew) );
@@ -673,7 +673,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getEnd() throw(uno::
{
ScUnoGuard aGuard;
- //! use other object for range than cursor?
+ //! use other object for range than cursor?
ScCellTextCursor* pNew = new ScCellTextCursor( *this );
uno::Reference<text::XTextRange> xRange( static_cast<SvxUnoTextRangeBase*>(pNew) );
@@ -760,7 +760,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getStart() t
{
ScUnoGuard aGuard;
- //! use other object for range than cursor?
+ //! use other object for range than cursor?
ScHeaderFooterTextCursor* pNew = new ScHeaderFooterTextCursor( *this );
uno::Reference<text::XTextRange> xRange( static_cast<SvxUnoTextRangeBase*>(pNew) );
@@ -777,7 +777,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getEnd() thr
{
ScUnoGuard aGuard;
- //! use other object for range than cursor?
+ //! use other object for range than cursor?
ScHeaderFooterTextCursor* pNew = new ScHeaderFooterTextCursor( *this );
uno::Reference<text::XTextRange> xRange( static_cast<SvxUnoTextRangeBase*>(pNew) );
@@ -864,7 +864,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getStart() throw(uno
{
ScUnoGuard aGuard;
- //! use other object for range than cursor?
+ //! use other object for range than cursor?
ScDrawTextCursor* pNew = new ScDrawTextCursor( *this );
uno::Reference<text::XTextRange> xRange( static_cast<SvxUnoTextRangeBase*>(pNew) );
@@ -881,7 +881,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getEnd() throw(uno::
{
ScUnoGuard aGuard;
- //! use other object for range than cursor?
+ //! use other object for range than cursor?
ScDrawTextCursor* pNew = new ScDrawTextCursor( *this );
uno::Reference<text::XTextRange> xRange( static_cast<SvxUnoTextRangeBase*>(pNew) );
@@ -943,14 +943,14 @@ ScSimpleEditSourceHelper::ScSimpleEditSourceHelper()
pEnginePool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM );
pEnginePool->FreezeIdRanges();
- pEditEngine = new ScFieldEditEngine( pEnginePool, NULL, TRUE ); // TRUE: become owner of pool
+ pEditEngine = new ScFieldEditEngine( pEnginePool, NULL, TRUE ); // TRUE: become owner of pool
pForwarder = new SvxEditEngineForwarder( *pEditEngine );
pOriginalSource = new ScSimpleEditSource( pForwarder );
}
ScSimpleEditSourceHelper::~ScSimpleEditSourceHelper()
{
- ScUnoGuard aGuard; // needed for EditEngine dtor
+ ScUnoGuard aGuard; // needed for EditEngine dtor
delete pOriginalSource;
delete pForwarder;
@@ -999,7 +999,7 @@ ScCellTextData::ScCellTextData(ScDocShell* pDocSh, const ScAddress& rP) :
ScCellTextData::~ScCellTextData()
{
- ScUnoGuard aGuard; // needed for EditEngine dtor
+ ScUnoGuard aGuard; // needed for EditEngine dtor
if (pDocShell)
{
@@ -1045,9 +1045,9 @@ SvxTextForwarder* ScCellTextData::GetTextForwarder()
pEnginePool->FreezeIdRanges();
pEditEngine = new ScFieldEditEngine( pEnginePool, NULL, TRUE );
}
- // currently, GetPortions doesn't work if UpdateMode is FALSE,
- // this will be fixed (in EditEngine) by src600
-// pEditEngine->SetUpdateMode( FALSE );
+ // currently, GetPortions doesn't work if UpdateMode is FALSE,
+ // this will be fixed (in EditEngine) by src600
+// pEditEngine->SetUpdateMode( FALSE );
pEditEngine->EnableUndo( FALSE );
if (pDocShell)
pEditEngine->SetRefDevice(pDocShell->GetRefDevice());
@@ -1097,14 +1097,14 @@ void ScCellTextData::UpdateData()
DBG_ASSERT(pEditEngine != NULL, "no EditEngine for UpdateData()");
if ( pDocShell && pEditEngine )
{
- // during the own UpdateData call, bDataValid must not be reset,
- // or things like attributes after the text would be lost
- // (are not stored in the cell)
+ // during the own UpdateData call, bDataValid must not be reset,
+ // or things like attributes after the text would be lost
+ // (are not stored in the cell)
- bInUpdate = TRUE; // prevents bDataValid from being reset
+ bInUpdate = TRUE; // prevents bDataValid from being reset
ScDocFunc aFunc(*pDocShell);
- aFunc.PutData( aCellPos, *pEditEngine, FALSE, TRUE ); // always as text
+ aFunc.PutData( aCellPos, *pEditEngine, FALSE, TRUE ); // always as text
bInUpdate = FALSE;
bDirty = FALSE;
@@ -1120,22 +1120,22 @@ void ScCellTextData::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
// const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint;
- //! Ref-Update
+ //! Ref-Update
}
else if ( rHint.ISA( SfxSimpleHint ) )
{
ULONG nId = ((const SfxSimpleHint&)rHint).GetId();
if ( nId == SFX_HINT_DYING )
{
- pDocShell = NULL; // invalid now
+ pDocShell = NULL; // invalid now
DELETEZ( pForwarder );
- DELETEZ( pEditEngine ); // EditEngine uses document's pool
+ DELETEZ( pEditEngine ); // EditEngine uses document's pool
}
else if ( nId == SFX_HINT_DATACHANGED )
{
- if (!bInUpdate) // not for own UpdateData calls
- bDataValid = FALSE; // text has to be read from the cell again
+ if (!bInUpdate) // not for own UpdateData calls
+ bDataValid = FALSE; // text has to be read from the cell again
}
}
}
diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx
index 5e3b3102e14a..91f7fedc57e8 100644
--- a/sc/source/ui/unoobj/tokenuno.cxx
+++ b/sc/source/ui/unoobj/tokenuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx
index d3d755e8b495..7909c0e45818 100644
--- a/sc/source/ui/unoobj/unodoc.cxx
+++ b/sc/source/ui/unoobj/unodoc.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/unoobj/unoguard.cxx b/sc/source/ui/unoobj/unoguard.cxx
index ff1c94338b72..6e406cf65dde 100644
--- a/sc/source/ui/unoobj/unoguard.cxx
+++ b/sc/source/ui/unoobj/unoguard.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/unoobj/unoreflist.cxx b/sc/source/ui/unoobj/unoreflist.cxx
index 65f43273f6e7..7b84c1155402 100644
--- a/sc/source/ui/unoobj/unoreflist.cxx
+++ b/sc/source/ui/unoobj/unoreflist.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index fd1e655b8ffb..0a3fe3f9ef07 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +78,9 @@ using namespace com::sun::star;
//------------------------------------------------------------------------
-//! Clipping-Markierungen
+//! Clipping-Markierungen
-// alles ohne Which-ID, Map nur fuer PropertySetInfo
+// alles ohne Which-ID, Map nur fuer PropertySetInfo
const SfxItemPropertyMapEntry* lcl_GetViewOptPropertyMap()
{
@@ -128,8 +128,8 @@ SV_IMPL_PTRARR( XViewPropertyChangeListenerArr_Impl, XViewPropertyChangeListener
SV_IMPL_PTRARR( XMouseClickHandlerArr_Impl, XMouseClickHandlerPtr );
SV_IMPL_PTRARR( XActivationEventListenerArr_Impl, XActivationEventListenerPtr );
-#define SCTABVIEWOBJ_SERVICE "com.sun.star.sheet.SpreadsheetView"
-#define SCVIEWSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetViewSettings"
+#define SCTABVIEWOBJ_SERVICE "com.sun.star.sheet.SpreadsheetView"
+#define SCVIEWSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetViewSettings"
SC_SIMPLE_SERVICE_INFO( ScViewPaneBase, "ScViewPaneObj", "com.sun.star.sheet.SpreadsheetViewPane" )
@@ -166,7 +166,7 @@ uno::Any SAL_CALL ScViewPaneBase::queryInterface( const uno::Type& rType )
SC_QUERYINTERFACE( lang::XServiceInfo )
SC_QUERYINTERFACE( lang::XTypeProvider )
- return uno::Any(); // OWeakObject is in derived objects
+ return uno::Any(); // OWeakObject is in derived objects
}
uno::Sequence<uno::Type> SAL_CALL ScViewPaneBase::getTypes() throw(uno::RuntimeException)
@@ -212,7 +212,7 @@ sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleColumn() throw(uno::RuntimeExc
return pViewData->GetPosX( eWhichH );
}
- DBG_ERROR("keine View ?!?"); //! Exception?
+ DBG_ERROR("keine View ?!?"); //! Exception?
return 0;
}
@@ -246,7 +246,7 @@ sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleRow() throw(uno::RuntimeExcept
return pViewData->GetPosY( eWhichV );
}
- DBG_ERROR("keine View ?!?"); //! Exception?
+ DBG_ERROR("keine View ?!?"); //! Exception?
return 0;
}
@@ -280,19 +280,19 @@ table::CellRangeAddress SAL_CALL ScViewPaneBase::getVisibleRange() throw(uno::Ru
ScHSplitPos eWhichH = WhichH( eWhich );
ScVSplitPos eWhichV = WhichV( eWhich );
- // VisibleCellsX gibt nur komplett sichtbare Zellen,
- // VisibleRange in Excel auch teilweise sichtbare.
- //! anpassen ???
+ // VisibleCellsX gibt nur komplett sichtbare Zellen,
+ // VisibleRange in Excel auch teilweise sichtbare.
+ //! anpassen ???
SCCOL nVisX = pViewData->VisibleCellsX( eWhichH );
SCROW nVisY = pViewData->VisibleCellsY( eWhichV );
- if (!nVisX) nVisX = 1; // irgendwas muss ja im Range sein
+ if (!nVisX) nVisX = 1; // irgendwas muss ja im Range sein
if (!nVisY) nVisY = 1;
- aAdr.Sheet = pViewData->GetTabNo();
+ aAdr.Sheet = pViewData->GetTabNo();
aAdr.StartColumn = pViewData->GetPosX( eWhichH );
- aAdr.StartRow = pViewData->GetPosY( eWhichV );
- aAdr.EndColumn = aAdr.StartColumn + nVisX - 1;
- aAdr.EndRow = aAdr.StartRow + nVisY - 1;
+ aAdr.StartRow = pViewData->GetPosY( eWhichV );
+ aAdr.EndColumn = aAdr.StartColumn + nVisX - 1;
+ aAdr.EndRow = aAdr.StartRow + nVisY - 1;
}
return aAdr;
}
@@ -307,7 +307,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScViewPaneBase::getReferredCells()
{
ScDocShell* pDocSh = pViewShell->GetViewData()->GetDocShell();
- table::CellRangeAddress aAdr(getVisibleRange()); //! Hilfsfunktion mit ScRange?
+ table::CellRangeAddress aAdr(getVisibleRange()); //! Hilfsfunktion mit ScRange?
ScRange aRange( (SCCOL)aAdr.StartColumn, (SCROW)aAdr.StartRow, aAdr.Sheet,
(SCCOL)aAdr.EndColumn, (SCROW)aAdr.EndRow, aAdr.Sheet );
if ( aRange.aStart == aRange.aEnd )
@@ -394,7 +394,7 @@ uno::Reference<awt::XControl> SAL_CALL ScViewPaneBase::getControl(
pFormShell->GetFormControl( xModel, *pSdrView, *pWindow, xRet );
if ( !xRet.is() )
- throw container::NoSuchElementException(); // no control found
+ throw container::NoSuchElementException(); // no control found
return xRet;
}
@@ -442,7 +442,7 @@ ScViewPaneObj::~ScViewPaneObj()
uno::Any SAL_CALL ScViewPaneObj::queryInterface( const uno::Type& rType )
throw(uno::RuntimeException)
{
- // ScViewPaneBase has everything except OWeakObject
+ // ScViewPaneBase has everything except OWeakObject
uno::Any aRet(ScViewPaneBase::queryInterface( rType ));
if (!aRet.hasValue())
@@ -462,7 +462,7 @@ void SAL_CALL ScViewPaneObj::release() throw()
//------------------------------------------------------------------------
-// Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht
+// Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht
//UNUSED2008-05 ScTabViewObj::ScTabViewObj() :
//UNUSED2008-05 ScViewPaneBase( NULL, SC_VIEWPANE_ACTIVE ),
@@ -490,7 +490,7 @@ ScTabViewObj::ScTabViewObj( ScTabViewShell* pViewSh ) :
ScTabViewObj::~ScTabViewObj()
{
- //! Listening oder so
+ //! Listening oder so
if (aMouseClickHandlers.Count())
{
acquire();
@@ -642,7 +642,7 @@ uno::Sequence<uno::Type> SAL_CALL ScTabViewObj::getTypes() throw(uno::RuntimeExc
long i;
for (i=0; i<nViewPaneLen; i++)
- pPtr[i] = pViewPanePtr[i]; // parent types first
+ pPtr[i] = pViewPanePtr[i]; // parent types first
for (i=0; i<nControllerLen; i++)
pPtr[nViewPaneLen+i] = pControllerPtr[i];
}
@@ -717,7 +717,7 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection )
if ( !pViewSh )
return FALSE;
- //! Type of aSelection can be some specific interface instead of XInterface
+ //! Type of aSelection can be some specific interface instead of XInterface
BOOL bRet = FALSE;
uno::Reference<uno::XInterface> xInterface(aSelection, uno::UNO_QUERY);
@@ -750,13 +750,13 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection )
uno::Reference<drawing::XShape> xShapeSel( xInterface, uno::UNO_QUERY );
SvxShape* pShapeImp = SvxShape::getImplementation( xShapeSel );
- if (pRangesImp) // Zell-Ranges
+ if (pRangesImp) // Zell-Ranges
{
ScViewData* pViewData = pViewSh->GetViewData();
if ( pViewData->GetDocShell() == pRangesImp->GetDocShell() )
{
- // Zuerst evtl. Drawing-Selektion aufheben
- // (MarkListHasChanged hebt Tabellen-Selektion auf)
+ // Zuerst evtl. Drawing-Selektion aufheben
+ // (MarkListHasChanged hebt Tabellen-Selektion auf)
ScDrawView* pDrawView = pViewSh->GetScDrawView();
if (pDrawView)
@@ -767,15 +767,15 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection )
FuPoor* pFunc = pViewSh->GetDrawFuncPtr();
if ( pFunc && pFunc->GetSlotID() != SID_OBJECT_SELECT )
{
- // Slot der Zeichenfunktion nochmal ausfuehren -> abschalten
+ // Slot der Zeichenfunktion nochmal ausfuehren -> abschalten
SfxDispatcher* pDisp = pViewSh->GetDispatcher();
if (pDisp)
pDisp->Execute( pFunc->GetSlotID(), SFX_CALLMODE_SYNCHRON );
}
pViewSh->SetDrawShell(FALSE);
- pViewSh->SetDrawSelMode(FALSE); // nach dem Dispatcher-Execute
+ pViewSh->SetDrawSelMode(FALSE); // nach dem Dispatcher-Execute
- // Ranges selektieren
+ // Ranges selektieren
const ScRangeList& rRanges = pRangesImp->GetRangeList();
ULONG nRangeCount = rRanges.Count();
@@ -786,7 +786,7 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection )
pViewSh->MarkRange( *rRanges.GetObject(0) );
else
{
- // Mehrfachselektion
+ // Mehrfachselektion
const ScRange* pFirst = rRanges.GetObject(0);
if ( pFirst && !lcl_TabInRanges( pViewData->GetTabNo(), rRanges ) )
@@ -795,7 +795,7 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection )
pViewSh->InitOwnBlockMode();
pViewData->GetMarkData().MarkFromRangeList( rRanges, TRUE );
pViewSh->MarkDataChanged();
- pViewData->GetDocShell()->PostPaintGridAll(); // Markierung (alt&neu)
+ pViewData->GetDocShell()->PostPaintGridAll(); // Markierung (alt&neu)
if ( pFirst )
{
pViewSh->AlignToCursor( pFirst->aStart.Col(), pFirst->aStart.Row(),
@@ -803,12 +803,12 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection )
pViewSh->SetCursor( pFirst->aStart.Col(), pFirst->aStart.Row() );
}
- //! Methode an der View, um RangeList zu selektieren
+ //! Methode an der View, um RangeList zu selektieren
}
bRet = TRUE;
}
}
- else if ( pShapeImp || xShapeColl.is() ) // Drawing-Layer
+ else if ( pShapeImp || xShapeColl.is() ) // Drawing-Layer
{
ScDrawView* pDrawView = pViewSh->GetScDrawView();
if (pDrawView)
@@ -816,7 +816,7 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection )
pDrawView->ScEndTextEdit();
pDrawView->UnmarkAll();
- if (pShapeImp) // einzelnes Shape
+ if (pShapeImp) // einzelnes Shape
{
SdrObject *pObj = pShapeImp->GetSdrObject();
if (pObj)
@@ -830,11 +830,11 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection )
}
}
}
- else // Shape-Collection (xShapeColl ist nicht 0)
+ else // Shape-Collection (xShapeColl ist nicht 0)
{
- // Es wird auf die Tabelle des ersten Objekts umgeschaltet,
- // und alle Objekte selektiert, die auf dieser Tabelle liegen
- //! Exception, wenn Objekte auf verschiedenen Tabellen?
+ // Es wird auf die Tabelle des ersten Objekts umgeschaltet,
+ // und alle Objekte selektiert, die auf dieser Tabelle liegen
+ //! Exception, wenn Objekte auf verschiedenen Tabellen?
SdrPageView* pPV = NULL;
long nCount = xShapeColl->getCount();
@@ -858,7 +858,7 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection )
pViewSh->UpdateLayerLocks();
bDrawSelModeSet = sal_True;
}
- if (!pPV) // erstes Objekt
+ if (!pPV) // erstes Objekt
{
lcl_ShowObject( *pViewSh, *pDrawView, pObj );
pPV = pDrawView->GetSdrPageView();
@@ -899,7 +899,7 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException)
ScCellRangesBase* pObj = NULL;
if (pViewSh)
{
- // Ist auf dem Drawing-Layer etwas selektiert?
+ // Ist auf dem Drawing-Layer etwas selektiert?
SdrView* pDrawView = pViewSh->GetSdrView();
if (pDrawView)
@@ -908,8 +908,8 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException)
ULONG nMarkCount = rMarkList.GetMarkCount();
if (nMarkCount)
{
- // ShapeCollection erzeugen (wie in SdXImpressView::getSelection im Draw)
- // Zurueckgegeben wird XInterfaceRef, das muss das UsrObject-XInterface sein
+ // ShapeCollection erzeugen (wie in SdXImpressView::getSelection im Draw)
+ // Zurueckgegeben wird XInterfaceRef, das muss das UsrObject-XInterface sein
SvxShapeCollection* pShapes = new SvxShapeCollection();
uno::Reference<uno::XInterface> xRet(static_cast<cppu::OWeakObject*>(pShapes));
@@ -928,7 +928,7 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException)
}
}
- // sonst Tabellen-(Zellen-)Selektion
+ // sonst Tabellen-(Zellen-)Selektion
ScViewData* pViewData = pViewSh->GetViewData();
ScDocShell* pDocSh = pViewData->GetDocShell();
@@ -972,13 +972,13 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException)
pObj = new ScCellRangesObj( pDocSh, aRangeList );
}
}
- else // Mehrfachselektion
+ else // Mehrfachselektion
{
ScRangeListRef xRanges;
pViewData->GetMultiArea( xRanges );
- // bei mehreren Tabellen Ranges kopieren
- //! sollte eigentlich schon in ScMarkData::FillRangeListWithMarks passieren?
+ // bei mehreren Tabellen Ranges kopieren
+ //! sollte eigentlich schon in ScMarkData::FillRangeListWithMarks passieren?
if ( nTabs > 1 )
rMark.ExtendRangeListTables( xRanges );
@@ -987,8 +987,8 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException)
if ( !rMark.IsMarked() && !rMark.IsMultiMarked() )
{
- // remember if the selection was from the cursor position without anything selected
- // (used when rendering the selection)
+ // remember if the selection was from the cursor position without anything selected
+ // (used when rendering the selection)
pObj->SetCursorOnly( TRUE );
}
@@ -1019,7 +1019,7 @@ rtl::OUString ScTabViewObj::getPrinterName(void) const
void ScTabViewObj::setPrinterName(const rtl::OUString& PrinterName)
{
ScUnoGuard aGuard;
- // Drucker setzen - wie in SfxViewShell::ExecPrint_Impl
+ // Drucker setzen - wie in SfxViewShell::ExecPrint_Impl
ScTabViewShell* pViewSh = GetViewShell();
if (pViewSh)
@@ -1040,7 +1040,7 @@ void ScTabViewObj::setPrinterName(const rtl::OUString& PrinterName)
XPropertySetRef ScTabViewObj::createPrintOptions(void)
{
ScUnoGuard aGuard;
- return new ScPrintSettingsObj; //! ScPrintSettingsObj implementieren!
+ return new ScPrintSettingsObj; //! ScPrintSettingsObj implementieren!
}
void ScTabViewObj::print(const XPropertySetRef& xOptions)
@@ -1049,7 +1049,7 @@ void ScTabViewObj::print(const XPropertySetRef& xOptions)
ScTabViewShell* pViewSh = GetViewShell();
if (pViewSh)
{
- //! xOptions auswerten (wie denn?)
+ //! xOptions auswerten (wie denn?)
SfxRequest aReq( SID_PRINTDOCDIRECT, SFX_CALLMODE_SYNCHRON, pViewSh->GetPool() );
pViewSh->ExecuteSlot( aReq );
@@ -1120,14 +1120,14 @@ ScViewPaneObj* ScTabViewObj::GetObjectByIndex_Impl(USHORT nIndex) const
ScTabViewShell* pViewSh = GetViewShell();
if (pViewSh)
{
- ScSplitPos eWhich = SC_SPLIT_BOTTOMLEFT; // default Position
+ ScSplitPos eWhich = SC_SPLIT_BOTTOMLEFT; // default Position
BOOL bError = FALSE;
ScViewData* pViewData = pViewSh->GetViewData();
BOOL bHor = ( pViewData->GetHSplitMode() != SC_SPLIT_NONE );
BOOL bVer = ( pViewData->GetVSplitMode() != SC_SPLIT_NONE );
if ( bHor && bVer )
{
- // links oben, links unten, rechts oben, rechts unten - wie in Excel
+ // links oben, links unten, rechts oben, rechts unten - wie in Excel
if ( nIndex < 4 )
eWhich = ePosHV[nIndex];
else
@@ -1150,7 +1150,7 @@ ScViewPaneObj* ScTabViewObj::GetObjectByIndex_Impl(USHORT nIndex) const
// sonst SC_SPLIT_BOTTOMLEFT
}
else if ( nIndex > 0 )
- bError = TRUE; // nicht geteilt: nur 0 gueltig
+ bError = TRUE; // nicht geteilt: nur 0 gueltig
if (!bError)
return new ScViewPaneObj( pViewSh, sal::static_int_cast<USHORT>(eWhich) );
@@ -1181,7 +1181,7 @@ void SAL_CALL ScTabViewObj::setActiveSheet( const uno::Reference<sheet::XSpreads
ScTabViewShell* pViewSh = GetViewShell();
if ( pViewSh && xActiveSheet.is() )
{
- // XSpreadsheet und ScCellRangesBase -> muss ein Sheet sein
+ // XSpreadsheet und ScCellRangesBase -> muss ein Sheet sein
ScCellRangesBase* pRangesImp = ScCellRangesBase::getImplementation( xActiveSheet );
if ( pRangesImp && pViewSh->GetViewData()->GetDocShell() == pRangesImp->GetDocShell() )
@@ -1506,7 +1506,7 @@ void SAL_CALL ScTabViewObj::removeActivationEventListener( const uno::Reference<
EndActivationListening();
}
-// PageBreakMode / Zoom sind Properties
+// PageBreakMode / Zoom sind Properties
#if 0
@@ -1534,7 +1534,7 @@ INT16 ScTabViewObj::GetZoom(void) const
ScTabViewShell* pViewSh = GetViewShell();
if (pViewSh)
{
- const Fraction& rZoomY = pViewSh->GetViewData()->GetZoomY(); // Y wird angezeigt
+ const Fraction& rZoomY = pViewSh->GetViewData()->GetZoomY(); // Y wird angezeigt
return (INT16)(( rZoomY.GetNumerator() * 100 ) / rZoomY.GetDenominator());
}
return 0;
@@ -1628,8 +1628,8 @@ void ScTabViewObj::SetZoomType(INT16 aZoomType)
sal_Int16 nOldZoom(nZoom);
if ( eZoomType == SVX_ZOOM_PERCENT )
{
- if ( nZoom < MINZOOM ) nZoom = MINZOOM;
- if ( nZoom > MAXZOOM ) nZoom = MAXZOOM;
+ if ( nZoom < MINZOOM ) nZoom = MINZOOM;
+ if ( nZoom > MAXZOOM ) nZoom = MAXZOOM;
}
else
nZoom = pView->CalcZoom( eZoomType, nOldZoom );
@@ -1652,7 +1652,7 @@ void ScTabViewObj::SetZoomType(INT16 aZoomType)
sal_Bool SAL_CALL ScTabViewObj::getIsWindowSplit() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- // wie Menue-Slot SID_WINDOW_SPLIT
+ // wie Menue-Slot SID_WINDOW_SPLIT
ScTabViewShell* pViewSh = GetViewShell();
if (pViewSh)
@@ -1668,7 +1668,7 @@ sal_Bool SAL_CALL ScTabViewObj::getIsWindowSplit() throw(uno::RuntimeException)
sal_Bool SAL_CALL ScTabViewObj::hasFrozenPanes() throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- // wie Menue-Slot SID_WINDOW_FIX
+ // wie Menue-Slot SID_WINDOW_FIX
ScTabViewShell* pViewSh = GetViewShell();
if (pViewSh)
@@ -1743,7 +1743,7 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitRow() throw(uno::RuntimeException)
{
long nSplit = pViewData->GetVSplitPos();
- ScSplitPos ePos = SC_SPLIT_TOPLEFT; // es ist vertikal geteilt
+ ScSplitPos ePos = SC_SPLIT_TOPLEFT; // es ist vertikal geteilt
SCsCOL nCol;
SCsROW nRow;
pViewData->GetPosFromPixel( 0, nSplit, ePos, nCol, nRow, FALSE );
@@ -1774,7 +1774,7 @@ void SAL_CALL ScTabViewObj::freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRow
ScTabViewShell* pViewSh = GetViewShell();
if (pViewSh)
{
- // erst alles aufheben -> kein Stress mit Scrolling zwischendurch o.ae.
+ // erst alles aufheben -> kein Stress mit Scrolling zwischendurch o.ae.
pViewSh->RemoveSplit();
@@ -1812,7 +1812,7 @@ void SAL_CALL ScTabViewObj::removeSelectionChangeListener(
for ( USHORT n=nCount; n--; )
{
uno::Reference<view::XSelectionChangeListener> *pObj = aSelectionListeners[n];
- if ( *pObj == xListener ) //! wozu der Mumpitz mit queryInterface?
+ if ( *pObj == xListener ) //! wozu der Mumpitz mit queryInterface?
{
aSelectionListeners.DeleteAndDestroy( n );
break;
@@ -1864,8 +1864,8 @@ void ScTabViewObj::SelectionChanged()
}
-// XPropertySet (View-Optionen)
-//! auch an der Applikation anbieten?
+// XPropertySet (View-Optionen)
+//! auch an der Applikation anbieten?
uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTabViewObj::getPropertySetInfo()
throw(uno::RuntimeException)
@@ -1927,7 +1927,7 @@ void SAL_CALL ScTabViewObj::setPropertyValue(
{
//#i80528# adapt to new range eventually
if((sal_Int16)VOBJ_MODE_HIDE < nIntVal) nIntVal = (sal_Int16)VOBJ_MODE_SHOW;
-
+
aNewOpt.SetObjMode( VOBJ_TYPE_OLE, (ScVObjMode)nIntVal);
}
}
@@ -1938,7 +1938,7 @@ void SAL_CALL ScTabViewObj::setPropertyValue(
{
//#i80528# adapt to new range eventually
if((sal_Int16)VOBJ_MODE_HIDE < nIntVal) nIntVal = (sal_Int16)VOBJ_MODE_SHOW;
-
+
aNewOpt.SetObjMode( VOBJ_TYPE_CHART, (ScVObjMode)nIntVal);
}
}
@@ -1949,7 +1949,7 @@ void SAL_CALL ScTabViewObj::setPropertyValue(
{
//#i80528# adapt to new range eventually
if((sal_Int16)VOBJ_MODE_HIDE < nIntVal) nIntVal = (sal_Int16)VOBJ_MODE_SHOW;
-
+
aNewOpt.SetObjMode( VOBJ_TYPE_DRAW, (ScVObjMode)nIntVal);
}
}
@@ -1972,16 +1972,16 @@ void SAL_CALL ScTabViewObj::setPropertyValue(
SetZoom(nIntVal);
}
- // Optionen werden an der View und am Dokument (fuer neue Views) gesetzt,
- // damit sie beim Speichern erhalten bleiben.
- //! An der App (Module) braeuchte man noch eine Extra-Moeglichkeit,
- //! das einzustellen (fuer neue Dokumente)
+ // Optionen werden an der View und am Dokument (fuer neue Views) gesetzt,
+ // damit sie beim Speichern erhalten bleiben.
+ //! An der App (Module) braeuchte man noch eine Extra-Moeglichkeit,
+ //! das einzustellen (fuer neue Dokumente)
if ( aNewOpt != rOldOpt )
{
pViewData->SetOptions( aNewOpt );
pViewData->GetDocument()->SetViewOptions( aNewOpt );
- pViewData->GetDocShell()->SetDocumentModified(); //! wirklich?
+ pViewData->GetDocShell()->SetDocumentModified(); //! wirklich?
pViewSh->UpdateFixPos();
pViewSh->PaintGrid();
@@ -2019,21 +2019,21 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const rtl::OUString& aProperty
else if ( aString.EqualsAscii( SC_UNO_SHEETTABS ) || aString.EqualsAscii( OLD_UNO_SHEETTABS ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_TABCONTROLS ) );
else if ( aString.EqualsAscii( SC_UNO_SHOWANCHOR ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_ANCHOR ) );
- else if ( aString.EqualsAscii( SC_UNO_SHOWFORM ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_FORMULAS ) );
- else if ( aString.EqualsAscii( SC_UNO_SHOWGRID ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_GRID ) );
- else if ( aString.EqualsAscii( SC_UNO_SHOWHELP ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_HELPLINES ) );
- else if ( aString.EqualsAscii( SC_UNO_SHOWNOTES ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_NOTES ) );
+ else if ( aString.EqualsAscii( SC_UNO_SHOWFORM ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_FORMULAS ) );
+ else if ( aString.EqualsAscii( SC_UNO_SHOWGRID ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_GRID ) );
+ else if ( aString.EqualsAscii( SC_UNO_SHOWHELP ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_HELPLINES ) );
+ else if ( aString.EqualsAscii( SC_UNO_SHOWNOTES ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_NOTES ) );
else if ( aString.EqualsAscii( SC_UNO_SHOWPAGEBR ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_PAGEBREAKS ) );
- else if ( aString.EqualsAscii( SC_UNO_SHOWZERO ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_NULLVALS ) );
- else if ( aString.EqualsAscii( SC_UNO_SHOWSOLID ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_SOLIDHANDLES ) );
+ else if ( aString.EqualsAscii( SC_UNO_SHOWZERO ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_NULLVALS ) );
+ else if ( aString.EqualsAscii( SC_UNO_SHOWSOLID ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_SOLIDHANDLES ) );
else if ( aString.EqualsAscii( SC_UNO_VALUEHIGH ) || aString.EqualsAscii( OLD_UNO_VALUEHIGH ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_SYNTAX ) );
else if ( aString.EqualsAscii( SC_UNO_VERTSCROLL ) || aString.EqualsAscii( OLD_UNO_VERTSCROLL ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_VSCROLL ) );
- else if ( aString.EqualsAscii( SC_UNO_SHOWOBJ ) ) aRet <<= (sal_Int16)( rOpt.GetObjMode( VOBJ_TYPE_OLE ) );
+ else if ( aString.EqualsAscii( SC_UNO_SHOWOBJ ) ) aRet <<= (sal_Int16)( rOpt.GetObjMode( VOBJ_TYPE_OLE ) );
else if ( aString.EqualsAscii( SC_UNO_SHOWCHARTS ) ) aRet <<= (sal_Int16)( rOpt.GetObjMode( VOBJ_TYPE_CHART ) );
- else if ( aString.EqualsAscii( SC_UNO_SHOWDRAW ) ) aRet <<= (sal_Int16)( rOpt.GetObjMode( VOBJ_TYPE_DRAW ) );
- else if ( aString.EqualsAscii( SC_UNO_GRIDCOLOR ) ) aRet <<= (sal_Int32)( rOpt.GetGridColor().GetColor() );
+ else if ( aString.EqualsAscii( SC_UNO_SHOWDRAW ) ) aRet <<= (sal_Int16)( rOpt.GetObjMode( VOBJ_TYPE_DRAW ) );
+ else if ( aString.EqualsAscii( SC_UNO_GRIDCOLOR ) ) aRet <<= (sal_Int32)( rOpt.GetGridColor().GetColor() );
else if ( aString.EqualsAscii( SC_UNO_VISAREA ) ) aRet <<= GetVisArea();
else if ( aString.EqualsAscii( SC_UNO_ZOOMTYPE ) ) aRet <<= GetZoomType();
else if ( aString.EqualsAscii( SC_UNO_ZOOMVALUE ) ) aRet <<= GetZoom();
@@ -2065,7 +2065,7 @@ void SAL_CALL ScTabViewObj::removePropertyChangeListener( const ::rtl::OUString&
for ( USHORT n=nCount; n--; )
{
uno::Reference<beans::XPropertyChangeListener> *pObj = aPropertyChgListeners[n];
- if ( *pObj == xListener ) //! wozu der Mumpitz mit queryInterface?
+ if ( *pObj == xListener ) //! wozu der Mumpitz mit queryInterface?
{
aPropertyChgListeners.DeleteAndDestroy( n );
break;
diff --git a/sc/source/ui/unoobj/warnpassword.cxx b/sc/source/ui/unoobj/warnpassword.cxx
index ce81fd2645c4..5a41d57d5ac5 100644
--- a/sc/source/ui/unoobj/warnpassword.cxx
+++ b/sc/source/ui/unoobj/warnpassword.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ bool ScWarnPassword::WarningOnPassword( SfxMedium& rMedium )
{
OUString empty;
- Any xException( makeAny(InteractiveAppException(empty,
- Reference <XInterface> (),
- InteractionClassification_QUERY,
- ERRCODE_SVX_EXPORT_FILTER_CRYPT)));
+ Any xException( makeAny(InteractiveAppException(empty,
+ Reference <XInterface> (),
+ InteractionClassification_QUERY,
+ ERRCODE_SVX_EXPORT_FILTER_CRYPT)));
Reference< ucbhelper::SimpleInteractionRequest > xRequest
= new ucbhelper::SimpleInteractionRequest(
@@ -82,7 +82,7 @@ bool ScWarnPassword::WarningOnPassword( SfxMedium& rMedium )
break;
case ucbhelper::CONTINUATION_APPROVE:
- // Continue
+ // Continue
break;
case ucbhelper::CONTINUATION_DISAPPROVE:
diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx
index 2c39d7154b4b..5fc1b3c4061e 100644
--- a/sc/source/ui/vba/excelvbahelper.cxx
+++ b/sc/source/ui/vba/excelvbahelper.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -153,7 +153,7 @@ implnCopy( const uno::Reference< frame::XModel>& xModel )
pViewShell->CopyToClip(NULL,false,false,true);
}
-void
+void
implnCut( const uno::Reference< frame::XModel>& xModel )
{
ScTabViewShell* pViewShell = getBestViewShell( xModel );
@@ -170,18 +170,18 @@ void implnPasteSpecial( const uno::Reference< frame::XModel>& xModel, USHORT nFl
ScTabViewShell* pTabViewShell = getBestViewShell( xModel );
if ( pTabViewShell )
{
- ScViewData* pView = pTabViewShell->GetViewData();
+ ScViewData* pView = pTabViewShell->GetViewData();
Window* pWin = ( pView != NULL ) ? pView->GetActiveWin() : NULL;
if ( pView && pWin )
{
if ( bAsLink && bOtherDoc )
pTabViewShell->PasteFromSystem(0);//SOT_FORMATSTR_ID_LINK
- else
+ else
{
ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
- ScDocument* pDoc = NULL;
+ ScDocument* pDoc = NULL;
if ( pOwnClip )
- pDoc = pOwnClip->GetDocument();
+ pDoc = pOwnClip->GetDocument();
pTabViewShell->PasteFromClip( nFlags, pDoc,
nFunction, bSkipEmpty, bTranspose, bAsLink,
eMoveMode, IDF_NONE, TRUE );
@@ -192,8 +192,8 @@ void implnPasteSpecial( const uno::Reference< frame::XModel>& xModel, USHORT nFl
}
-ScDocShell*
-getDocShell( const css::uno::Reference< css::frame::XModel>& xModel )
+ScDocShell*
+getDocShell( const css::uno::Reference< css::frame::XModel>& xModel )
{
uno::Reference< uno::XInterface > xIf( xModel, uno::UNO_QUERY_THROW );
ScModelObj* pModel = dynamic_cast< ScModelObj* >( xIf.get() );
@@ -204,7 +204,7 @@ getDocShell( const css::uno::Reference< css::frame::XModel>& xModel )
}
-ScTabViewShell*
+ScTabViewShell*
getBestViewShell( const css::uno::Reference< css::frame::XModel>& xModel )
{
ScDocShell* pDocShell = getDocShell( xModel );
@@ -213,23 +213,23 @@ getBestViewShell( const css::uno::Reference< css::frame::XModel>& xModel )
return NULL;
}
-ScTabViewShell*
+ScTabViewShell*
getCurrentBestViewShell( const uno::Reference< uno::XComponentContext >& xContext )
-{
+{
uno::Reference< frame::XModel > xModel = getCurrentExcelDoc( xContext );
return getBestViewShell( xModel );
}
-SfxViewFrame*
+SfxViewFrame*
getViewFrame( const uno::Reference< frame::XModel >& xModel )
{
- ScTabViewShell* pViewShell = getBestViewShell( xModel );
+ ScTabViewShell* pViewShell = getBestViewShell( xModel );
if ( pViewShell )
return pViewShell->GetViewFrame();
return NULL;
}
-uno::Reference< XHelperInterface >
+uno::Reference< XHelperInterface >
getUnoSheetModuleObj( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException )
{
uno::Reference< sheet::XSheetCellRange > xSheetRange( xRange, uno::UNO_QUERY_THROW );
@@ -238,15 +238,15 @@ getUnoSheetModuleObj( const uno::Reference< table::XCellRange >& xRange ) throw
xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CodeName") ) ) >>= sCodeName;
// #TODO #FIXME ideally we should 'throw' here if we don't get a valid parent, but... it is possible
// to create a module ( and use 'Option VBASupport 1' ) for a calc document, in this scenario there
- // are *NO* special document module objects ( of course being able to switch between vba/non vba mode at
- // the document in the future could fix this, especially IF the switching of the vba mode takes care to
+ // are *NO* special document module objects ( of course being able to switch between vba/non vba mode at
+ // the document in the future could fix this, especially IF the switching of the vba mode takes care to
// create the special document module objects if they don't exist.
uno::Reference< XHelperInterface > xParent( ov::getUnoDocModule( sCodeName, GetDocShellFromRange( xRange ) ), uno::UNO_QUERY );
return xParent;
}
-uno::Reference< XHelperInterface >
+uno::Reference< XHelperInterface >
getUnoSheetModuleObj( const uno::Reference< sheet::XSheetCellRangeContainer >& xRanges ) throw ( uno::RuntimeException )
{
uno::Reference< container::XEnumerationAccess > xEnumAccess( xRanges, uno::UNO_QUERY_THROW );
@@ -264,5 +264,5 @@ ScVbaCellRangeAccess::GetDataSet( ScCellRangesBase* pRangeObj )
} //excel
-} //vba
-} //ooo
+} //vba
+} //ooo
diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx
index da0474e6ceb0..528457a0f6cc 100644
--- a/sc/source/ui/vba/excelvbahelper.hxx
+++ b/sc/source/ui/vba/excelvbahelper.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +35,12 @@
class ScCellRangesBase;
-namespace ooo
+namespace ooo
{
- namespace vba
+ namespace vba
{
namespace excel
- {
+ {
// nTabs empty means apply zoom to all sheets
void implSetZoom( const css::uno::Reference< css::frame::XModel >& xModel, sal_Int16 nZoom, std::vector< SCTAB >& nTabs );
void implnCopy( const css::uno::Reference< css::frame::XModel>& xModel );
diff --git a/sc/source/ui/vba/helperdecl.hxx b/sc/source/ui/vba/helperdecl.hxx
index a9969179d52f..585350c16e8c 100644
--- a/sc/source/ui/vba/helperdecl.hxx
+++ b/sc/source/ui/vba/helperdecl.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +39,7 @@ struct vba_service_class_ : public serviceimpl_base< detail::OwnServiceImpl<Impl
vba_service_class_() : baseT() {}
template <typename PostProcessFuncT>
/** Ctor to pass a post processing function/functor.
-
+
@tpl PostProcessDefaultT let your compiler deduce this
@param postProcessFunc function/functor that gets the yet unacquired
ImplT_ pointer returning a
diff --git a/sc/source/ui/vba/makefile.mk b/sc/source/ui/vba/makefile.mk
index 4cb7e3eb064b..92bb3fd39db0 100644
--- a/sc/source/ui/vba/makefile.mk
+++ b/sc/source/ui/vba/makefile.mk
@@ -47,63 +47,63 @@ INCPRE=$(INCCOM)$/$(TARGET)
# ------------------------------------------------------------------
SLOFILES= \
- $(SLO)$/vbaglobals.obj \
- $(SLO)$/vbaworkbook.obj \
- $(SLO)$/vbaworksheets.obj \
+ $(SLO)$/excelvbahelper.obj \
+ $(SLO)$/service.obj \
$(SLO)$/vbaapplication.obj \
- $(SLO)$/vbarange.obj \
- $(SLO)$/vbaname.obj \
- $(SLO)$/vbanames.obj \
- $(SLO)$/vbacomment.obj \
- $(SLO)$/vbacomments.obj \
- $(SLO)$/vbaworkbooks.obj \
- $(SLO)$/vbaworksheet.obj \
- $(SLO)$/vbaoutline.obj \
- $(SLO)$/vbafont.obj\
- $(SLO)$/excelvbahelper.obj\
- $(SLO)$/vbainterior.obj\
- $(SLO)$/vbawsfunction.obj\
- $(SLO)$/vbawindow.obj\
- $(SLO)$/vbachart.obj\
- $(SLO)$/vbachartobject.obj\
- $(SLO)$/vbachartobjects.obj\
- $(SLO)$/vbaseriescollection.obj\
- $(SLO)$/vbadialogs.obj \
- $(SLO)$/vbadialog.obj \
- $(SLO)$/vbapivottable.obj \
- $(SLO)$/vbapivotcache.obj \
- $(SLO)$/vbapivottables.obj \
- $(SLO)$/vbawindows.obj \
- $(SLO)$/vbapalette.obj \
+ $(SLO)$/vbaassistant.obj \
+ $(SLO)$/vbaaxes.obj \
+ $(SLO)$/vbaaxis.obj \
+ $(SLO)$/vbaaxistitle.obj \
$(SLO)$/vbaborders.obj \
$(SLO)$/vbacharacters.obj \
- $(SLO)$/vbavalidation.obj \
- $(SLO)$/vbasheetobject.obj \
- $(SLO)$/vbasheetobjects.obj \
- $(SLO)$/vbaoleobject.obj \
- $(SLO)$/vbaoleobjects.obj \
- $(SLO)$/vbatextboxshape.obj \
- $(SLO)$/vbapane.obj \
- $(SLO)$/vbatextframe.obj \
- $(SLO)$/vbacharttitle.obj \
+ $(SLO)$/vbachart.obj \
+ $(SLO)$/vbachartobject.obj \
+ $(SLO)$/vbachartobjects.obj \
$(SLO)$/vbacharts.obj \
- $(SLO)$/vbaaxistitle.obj \
- $(SLO)$/vbaaxes.obj \
- $(SLO)$/vbaaxis.obj \
- $(SLO)$/vbaformat.obj \
+ $(SLO)$/vbacharttitle.obj \
+ $(SLO)$/vbacomment.obj \
+ $(SLO)$/vbacomments.obj \
$(SLO)$/vbacondition.obj \
+ $(SLO)$/vbadialog.obj \
+ $(SLO)$/vbadialogs.obj \
+ $(SLO)$/vbaeventshelper.obj \
+ $(SLO)$/vbafont.obj \
+ $(SLO)$/vbaformat.obj \
$(SLO)$/vbaformatcondition.obj \
$(SLO)$/vbaformatconditions.obj \
- $(SLO)$/vbastyle.obj \
- $(SLO)$/vbastyles.obj \
- $(SLO)$/vbaassistant.obj \
+ $(SLO)$/vbaglobals.obj \
$(SLO)$/vbahyperlink.obj \
$(SLO)$/vbahyperlinks.obj \
- $(SLO)$/vbapagesetup.obj \
+ $(SLO)$/vbainterior.obj \
+ $(SLO)$/vbaname.obj \
+ $(SLO)$/vbanames.obj \
+ $(SLO)$/vbaoleobject.obj \
+ $(SLO)$/vbaoleobjects.obj \
+ $(SLO)$/vbaoutline.obj \
$(SLO)$/vbapagebreak.obj \
$(SLO)$/vbapagebreaks.obj \
- $(SLO)$/vbaeventshelper.obj \
- $(SLO)$/service.obj
+ $(SLO)$/vbapagesetup.obj \
+ $(SLO)$/vbapalette.obj \
+ $(SLO)$/vbapane.obj \
+ $(SLO)$/vbapivotcache.obj \
+ $(SLO)$/vbapivottable.obj \
+ $(SLO)$/vbapivottables.obj \
+ $(SLO)$/vbarange.obj \
+ $(SLO)$/vbaseriescollection.obj \
+ $(SLO)$/vbasheetobject.obj \
+ $(SLO)$/vbasheetobjects.obj \
+ $(SLO)$/vbastyle.obj \
+ $(SLO)$/vbastyles.obj \
+ $(SLO)$/vbatextboxshape.obj \
+ $(SLO)$/vbatextframe.obj \
+ $(SLO)$/vbavalidation.obj \
+ $(SLO)$/vbawindow.obj \
+ $(SLO)$/vbawindows.obj \
+ $(SLO)$/vbaworkbook.obj \
+ $(SLO)$/vbaworkbooks.obj \
+ $(SLO)$/vbaworksheet.obj \
+ $(SLO)$/vbaworksheets.obj \
+ $(SLO)$/vbawsfunction.obj
.ENDIF
# --- Targets ------------------------------------------------------
diff --git a/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxx
index 2b1f14cf154a..b21b55f6ae9b 100644
--- a/sc/source/ui/vba/service.cxx
+++ b/sc/source/ui/vba/service.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +50,7 @@ namespace worksheet
{
extern sdecl::ServiceDecl const serviceDecl;
}
-namespace window
+namespace window
{
extern sdecl::ServiceDecl const serviceDecl;
}
@@ -58,11 +58,11 @@ namespace globals
{
extern sdecl::ServiceDecl const serviceDecl;
}
-namespace hyperlink
+namespace hyperlink
{
extern sdecl::ServiceDecl const serviceDecl;
}
-namespace application
+namespace application
{
extern sdecl::ServiceDecl const serviceDecl;
}
@@ -70,27 +70,27 @@ namespace vbaeventshelper
{
extern sdecl::ServiceDecl const serviceDecl;
}
-namespace textframe
+namespace textframe
{
extern sdecl::ServiceDecl const serviceDecl;
}
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
+ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
OSL_TRACE("In component_getImplementationEnv");
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
- SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
+ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
{
OSL_TRACE("In component_writeInfo");
#if 0
// Component registration
- if ( component_writeInfoHelper( pServiceManager, pRegistryKey,
+ if ( component_writeInfoHelper( pServiceManager, pRegistryKey,
range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl ) )
{
// Singleton registration
@@ -101,7 +101,7 @@ extern "C"
Reference< registry::XRegistryKey >xKey = pKey->createKey(
rtl::OUString::createFromAscii( ("ooo.vba.Globals/UNO/SINGLETONS/ooo.vba.theGlobals") ) );
- xKey->setStringValue( ::rtl::OUString::createFromAscii(
+ xKey->setStringValue( ::rtl::OUString::createFromAscii(
("ooo.vba.Globals") ) );
return sal_True;
}
@@ -113,13 +113,13 @@ extern "C"
return sal_False;
#else
// Component registration
- return component_writeInfoHelper( pServiceManager, pRegistryKey,
+ return component_writeInfoHelper( pServiceManager, pRegistryKey,
range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl, textframe::serviceDecl );
#endif
-
+
}
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey )
{
diff --git a/sc/source/ui/vba/testvba/launchTest.pl b/sc/source/ui/vba/testvba/launchTest.pl
index 243798616052..5b64f7522c09 100644
--- a/sc/source/ui/vba/testvba/launchTest.pl
+++ b/sc/source/ui/vba/testvba/launchTest.pl
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER 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,14 +31,14 @@ my $test_class = shift || die 'must provide a ext name';
my $TESTDOCUMENT = shift || die 'must provide a path to testdocument dirs';
my $OUTPUTDIR = shift || die 'must provide an output path to deposit logs in';
-die "can't access TestClass $test_class/TestVBA.class" unless -f "$test_class/TestVBA.class";
-die "can't access officepath env variable \$OFFICEPATH" unless -d $ENV{OFFICEPATH};
-die "can't access testdocuments" unless -d $TESTDOCUMENT;
-die "testdocument not of the correct structure $TESTDOCUMENT/logs/excel" unless -d "$TESTDOCUMENT/logs/excel";
-die "can't access output dir" unless -d $OUTPUTDIR;
+die "can't access TestClass $test_class/TestVBA.class" unless -f "$test_class/TestVBA.class";
+die "can't access officepath env variable \$OFFICEPATH" unless -d $ENV{OFFICEPATH};
+die "can't access testdocuments" unless -d $TESTDOCUMENT;
+die "testdocument not of the correct structure $TESTDOCUMENT/logs/excel" unless -d "$TESTDOCUMENT/logs/excel";
+die "can't access output dir" unless -d $OUTPUTDIR;
-my $officeclasspath = "$ENV{OFFICEPATH}/program/classes/";
+my $officeclasspath = "$ENV{OFFICEPATH}/program/classes/";
my $classpath = "$officeclasspath/jurt.jar:$officeclasspath/unoil.jar:$officeclasspath/juh.jar:$officeclasspath/java_uno.jar:$officeclasspath/ridl.jar:$test_class:$ENV{CLASSPATH}";
$ENV{CLASSPATH}=$classpath;
print "classpath $ENV{CLASSPATH}\n";
diff --git a/sc/source/ui/vba/testvba/runTests.pl b/sc/source/ui/vba/testvba/runTests.pl
index e686a1d4cb89..70f80329cfeb 100755
--- a/sc/source/ui/vba/testvba/runTests.pl
+++ b/sc/source/ui/vba/testvba/runTests.pl
@@ -51,7 +51,7 @@ $failed = ( $exit_value || $signal_num || $dumped_core );
print "$failed = ( $exit_value || $signal_num || $dumped_core )\n";
if ( !$failed && open(UNAME, "uname -a|") ) {
- $theResult = <UNAME>;
+ $theResult = <UNAME>;
close(UNAME);
if ( $theResult =~ /^CYGWIN/ ) {
# windows under cygwin
@@ -62,7 +62,7 @@ if ( !$failed && open(UNAME, "uname -a|") ) {
uri_escape($testDocDir);
# hacky windows url construction
$testDocDir="file:///$testDocDir";
-
+
chomp($testDocDir);
#print "*** doc dir is $testDocDir\n";
$testLogDir = `cygpath -m "$testLogDir"`;
diff --git a/sc/source/ui/vba/testvba/testResult.pl b/sc/source/ui/vba/testvba/testResult.pl
index 5f065924d5c4..171be2597ddb 100644
--- a/sc/source/ui/vba/testvba/testResult.pl
+++ b/sc/source/ui/vba/testvba/testResult.pl
@@ -11,13 +11,13 @@ my $timestampclean= "perl $binDir/timestampsClean.pl";
sub testLog
{
# 2 No Log to compare against
- # 1 Log passed
+ # 1 Log passed
# 0 Log failed
my $result = 0;
my $testfile = shift;
my $dirtocheck = shift;
my $filename = basename($testfile);
- $filename = "$logdir/$filename";
+ $filename = "$logdir/$filename";
print "processing $testfile $filename\n";
if ( -f $filename ) {
my $tmpFile;
@@ -29,9 +29,9 @@ sub testLog
my $info = stat($tmpFile) or die "no $tmpFile: $!";
if ( ($status >>=8) == 0 && ( $info->size == 0) ) {
#print "diff worked size is 0\n";
- $result = 1;
+ $result = 1;
}
- elsif ( ($status >>=8) == 0 && ( $info->size > 0) )
+ elsif ( ($status >>=8) == 0 && ( $info->size > 0) )
{
#print "diff worked size > 0\n";
$result = 0;
@@ -106,9 +106,9 @@ sub slurp_dir($)
while ($fname = readdir ($dirhandle)) {
$fname = filter_crud($fname);
defined $fname || next;
-# if (-d "$dir/$fname") {
-# push @files, slurp_dir("$dir/$fname");
-# } else
+# if (-d "$dir/$fname") {
+# push @files, slurp_dir("$dir/$fname");
+# } else
{
push @files, "$dir/$fname";
}
@@ -136,9 +136,9 @@ print "$testfilepath\n";
for $a (@files) {
$filename = $a;
if ( "$testfilepath" eq "$filename" )
- {
+ {
$processed++;
- my $testcase = $a;
+ my $testcase = $a;
$testcase =~ s/\.log/\.xls/;
my $result = testLog( $a, $logdir );
if ( $result == 0 ) {
@@ -148,13 +148,13 @@ for $a (@files) {
elsif ( $result == 2 ) {
#print "skipped $a\n";
push @skippedTests, $testcase;
- }
+ }
else {
$passed++;
push @passedTests, $testcase;
- #print "Test document for $a \t \t passed. \n";
- }
+ #print "Test document for $a \t \t passed. \n";
}
+ }
}
my $compared=@passedTests+@failedTests;
my $skip = @skippedTests;
@@ -163,7 +163,7 @@ print "compared $compared test-case documents\n";
print "\t \t $passed tests $@passedTests\n";
if ( @failedTests > 0 ) {
print "the following test-case documents failed, please examine the logs manually\n";
-
+
for $a (@failedTests) {
print "\t$a\n";
}
diff --git a/sc/source/ui/vba/testvba/testResults.pl b/sc/source/ui/vba/testvba/testResults.pl
index 39ec26ba38be..6f731327e76b 100755
--- a/sc/source/ui/vba/testvba/testResults.pl
+++ b/sc/source/ui/vba/testvba/testResults.pl
@@ -11,13 +11,13 @@ my $timestampclean= "perl $binDir/timestampsClean.pl";
sub testLog
{
# 2 No Log to compare against
- # 1 Log passed
+ # 1 Log passed
# 0 Log failed
my $result = 0;
my $testfile = shift;
my $dirtocheck = shift;
my $filename = basename($testfile);
- $filename = "$logdir/$filename";
+ $filename = "$logdir/$filename";
print "processing $testfile $filename\n";
if ( -f $filename ) {
my $tmpFile;
@@ -29,9 +29,9 @@ sub testLog
my $info = stat($tmpFile) or die "no $tmpFile: $!";
if ( ($status >>=8) == 0 && ( $info->size == 0) ) {
#print "diff worked size is 0\n";
- $result = 1;
+ $result = 1;
}
- elsif ( ($status >>=8) == 0 && ( $info->size > 0) )
+ elsif ( ($status >>=8) == 0 && ( $info->size > 0) )
{
#print "diff worked size > 0\n";
$result = 0;
@@ -106,9 +106,9 @@ sub slurp_dir($)
while ($fname = readdir ($dirhandle)) {
$fname = filter_crud($fname);
defined $fname || next;
-# if (-d "$dir/$fname") {
-# push @files, slurp_dir("$dir/$fname");
-# } else
+# if (-d "$dir/$fname") {
+# push @files, slurp_dir("$dir/$fname");
+# } else
{
push @files, "$dir/$fname";
}
@@ -131,7 +131,7 @@ my @failedTests=();
my $failureCmd="";
for $a (@files) {
$processed++;
- my $testcase = $a;
+ my $testcase = $a;
$testcase =~ s/\.log/\.xls/;
my $result = testLog( $a, $logdir );
if ( $result == 0 ) {
@@ -141,12 +141,12 @@ for $a (@files) {
elsif ( $result == 2 ) {
#print "skipped $a\n";
push @skippedTests, $testcase;
- }
+ }
else {
$passed++;
push @passedTests, $testcase;
- #print "Test document for $a \t \t passed. \n";
- }
+ #print "Test document for $a \t \t passed. \n";
+ }
}
my $compared=@passedTests+@failedTests;
my $skip = @skippedTests;
@@ -155,7 +155,7 @@ print "compared $compared test-case documents\n";
print "\t \t $passed tests $@passedTests\n";
if ( @failedTests > 0 ) {
print "the following test-case documents failed, please examine the logs manually\n";
-
+
for $a (@failedTests) {
print "\t$a\n";
}
diff --git a/sc/source/ui/vba/testvba/testvba.cxx b/sc/source/ui/vba/testvba/testvba.cxx
index 686b3e47eaa9..990a37aead3f 100644
--- a/sc/source/ui/vba/testvba/testvba.cxx
+++ b/sc/source/ui/vba/testvba/testvba.cxx
@@ -44,7 +44,7 @@ using ::rtl::OUString;
using ::std::auto_ptr;
-const OUString EXTN = rtl::OUString::createFromAscii(".xls");
+const OUString EXTN = rtl::OUString::createFromAscii(".xls");
OUString convertToURL( const OUString& rPath )
{
@@ -91,16 +91,16 @@ private:
rtl::OUString msOutDirPath;
protected:
public:
- TestVBA( const Reference< XComponentContext >& _xContext,
- const Reference< XMultiComponentFactory >& _xMCF,
- const Reference< XComponentLoader >& _xCompLoader,
- const rtl::OUString& _outDirPath ) : mxContext( _xContext ), mxMCF( _xMCF ),
-mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) )
+ TestVBA( const Reference< XComponentContext >& _xContext,
+ const Reference< XMultiComponentFactory >& _xMCF,
+ const Reference< XComponentLoader >& _xCompLoader,
+ const rtl::OUString& _outDirPath ) : mxContext( _xContext ), mxMCF( _xMCF ),
+mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) )
{
mxSFA.set( mxMCF->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ), mxContext), uno::UNO_QUERY_THROW );
- }
+ }
- rtl::OUString getLogLocation() throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception )
+ rtl::OUString getLogLocation() throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception )
{
rtl::OUString sLogLocation;
Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString::createFromAscii( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW );
@@ -108,7 +108,7 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) )
sLogLocation = sLogLocation.concat( rtl::OUString::createFromAscii( "/" ) ).concat( rtl::OUString::createFromAscii( "HelperAPI-test.log" ) );
return sLogLocation;
}
- rtl::OUString getLogLocationWithName( OUString fileName ) throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception )
+ rtl::OUString getLogLocationWithName( OUString fileName ) throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception )
{
printf("%s\n", getenv("HOME") );
printf("file name %s\n", rtl::OUStringToOString( fileName, RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -120,17 +120,17 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) )
return sLogLocation;
}
- void init()
+ void init()
{
// blow away previous logs?
}
- void proccessDocument( const rtl::OUString& sUrl )
+ void proccessDocument( const rtl::OUString& sUrl )
{
- if ( !mxSFA->isFolder( sUrl ) && sUrl.endsWithIgnoreAsciiCaseAsciiL( ".xls", 4 ) )
-
+ if ( !mxSFA->isFolder( sUrl ) && sUrl.endsWithIgnoreAsciiCaseAsciiL( ".xls", 4 ) )
+
{
- try
+ try
{
OSL_TRACE( "processing %s", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() );
printf( "processing %s\n", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -141,17 +141,17 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) )
rtl::OUString sfileUrl = convertToURL( sUrl );
printf( "try to get xDoc %s\n", rtl::OUStringToOString( sfileUrl, RTL_TEXTENCODING_UTF8 ).getStr() );
- Reference< uno::XInterface > xDoc =
+ Reference< uno::XInterface > xDoc =
mxCompLoader->loadComponentFromURL( sfileUrl, rtl::OUString::createFromAscii( "_blank" ), 0, propertyValues);
printf( "got xDoc\n" );
OUString logFileURL = convertToURL( getLogLocation() );
try
{
- Reference< script::provider::XScriptProviderSupplier > xSupplier( xDoc, uno::UNO_QUERY_THROW ) ;
- if ( mxSFA->exists( logFileURL ) )
+ Reference< script::provider::XScriptProviderSupplier > xSupplier( xDoc, uno::UNO_QUERY_THROW ) ;
+ if ( mxSFA->exists( logFileURL ) )
mxSFA->kill( logFileURL );
-
+
printf("try to get the ScriptProvider\n");
Reference< script::provider::XScriptProvider > xProv = xSupplier->getScriptProvider();
printf("get the ScriptProvider\n");
@@ -175,9 +175,9 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) )
Sequence< uno::Any > aArgs;
Sequence< sal_Int16 > aOutArgsIndex;
Sequence< uno::Any > aOutArgs;
-
- xScript->invoke(aArgs, aOutArgsIndex, aOutArgs);
-
+
+ xScript->invoke(aArgs, aOutArgsIndex, aOutArgs);
+
OUString fileName = sUrl.copy ( sUrl.lastIndexOf( '/' ) );
OUString newLocation = msOutDirPath + fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString::createFromAscii( ".log" );
try
@@ -195,7 +195,7 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) )
OSL_TRACE("new logfile location is %s ", rtl::OUStringToOString( newLocation, RTL_TEXTENCODING_UTF8 ).getStr() );
printf("moved to new location\n");
}
-
+
}
catch ( uno::Exception& e )
{
@@ -204,8 +204,8 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) )
// interface is supported, otherwise use XComponent.dispose
Reference< util::XCloseable > xCloseable ( xDoc, uno::UNO_QUERY );
-
- if ( xCloseable.is() )
+
+ if ( xCloseable.is() )
{
printf("try to close\n");
// will close application. and only run a test case for 3.0
@@ -215,8 +215,8 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) )
// so, for run all test cases, it should not close the document at this moment.
xCloseable->close(sal_False);
printf("closed\n");
- }
- else
+ }
+ else
{
printf("try to dispose\n");
Reference< XComponent > xComp( xDoc, uno::UNO_QUERY_THROW );
@@ -225,32 +225,32 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) )
printf("disposed\n");
}
}
- catch( uno::Exception& e )
+ catch( uno::Exception& e )
{
std::cerr << "Caught exception " << rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl;
}
-
+
}
printf("complete processing %s\n", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() );
}
- void traverse( const rtl::OUString& sFileDirectory )
+ void traverse( const rtl::OUString& sFileDirectory )
{
- rtl::OUString sFileDirectoryURL = convertToURL( sFileDirectory );
- if ( !mxSFA->isFolder( sFileDirectoryURL) )
+ rtl::OUString sFileDirectoryURL = convertToURL( sFileDirectory );
+ if ( !mxSFA->isFolder( sFileDirectoryURL) )
{
throw lang::IllegalArgumentException( rtl::OUString::createFromAscii( "not a directory: ").concat( sFileDirectoryURL ), Reference<uno::XInterface>(), 1 );
- }
+ }
// Getting all files and directories in the current directory
Sequence<OUString> entries = mxSFA->getFolderContents( sFileDirectoryURL, sal_False );
-
+
// Iterating for each file and directory
printf( "Entries %d\n", (int)entries.getLength() );
- for ( sal_Int32 i = 0; i < entries.getLength(); ++i )
+ for ( sal_Int32 i = 0; i < entries.getLength(); ++i )
{
proccessDocument( entries[ i ] );
}
- }
+ }
};
void tryDispose( Reference< uno::XInterface > xIF, const char* sComp )
@@ -261,7 +261,7 @@ void tryDispose( Reference< uno::XInterface > xIF, const char* sComp )
try
{
xComponent->dispose();
- }
+ }
catch( uno::Exception& e )
{
std::cerr << "tryDispose caught exception " <<rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << " while disposing " << sComp << std::endl;
@@ -297,8 +297,8 @@ int main( int argv, char** argc )
dTest->traverse( ascii( argc[ 1 ] ) );
}
delete dTest;
-// tryDispose( xLoader, "desktop" );
-// tryDispose( xCC, "remote context" );
+// tryDispose( xLoader, "desktop" );
+// tryDispose( xCC, "remote context" );
}
catch( uno::Exception& e )
diff --git a/sc/source/ui/vba/testvba/timestampsClean.pl b/sc/source/ui/vba/testvba/timestampsClean.pl
index dade65c7200f..2c947d0cc6d5 100755
--- a/sc/source/ui/vba/testvba/timestampsClean.pl
+++ b/sc/source/ui/vba/testvba/timestampsClean.pl
@@ -65,7 +65,7 @@ while (<>) {
output_lines(\@lines);
# $detectedSomeGuff contains the skipped hunks that contain acceptable diff
-# e.g. a timestamp or an OK assertion that contains different content
+# e.g. a timestamp or an OK assertion that contains different content
# like perhaps a path
#print "frag_count = $frag_count fragstocount = $fragstocount detectedSomeGuff = $detectedSomeGuff \n";
if ($frag_count > $detectedSomeGuff) {
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index 8f5aba5c4acb..624fb610dfd7 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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.
*
************************************************************************/
-
+
#include <stdio.h>
#include <com/sun/star/sheet/XSpreadsheetView.hpp>
@@ -88,18 +88,12 @@
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-// Enable our own join detection for Intersection and Union
-// should be more efficient than using ScRangeList::Join ( because
-// we already are testing the same things )
-
-#define OWN_JOIN 1
-
// #TODO is this defined somewhere else?
#if ( defined UNX ) || ( defined OS2 ) //unix
#define FILE_PATH_SEPERATOR "/"
#else // windows
#define FILE_PATH_SEPERATOR "\\"
-#endif
+#endif
uno::Any sbxToUnoValue( SbxVariable* pVar );
@@ -107,8 +101,8 @@ class ActiveWorkbook : public ScVbaWorkbook
{
protected:
virtual uno::Reference< frame::XModel > getModel()
- {
- return getCurrentExcelDoc(mxContext);
+ {
+ return getCurrentExcelDoc(mxContext);
}
public:
ActiveWorkbook( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext) : ScVbaWorkbook( xParent, xContext ){}
@@ -125,7 +119,7 @@ ScVbaApplication::ScVbaApplication( const uno::Reference<uno::XComponentContext
ScVbaApplication::~ScVbaApplication()
{
}
-
+
SfxObjectShell* ScVbaApplication::GetDocShell( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
{
return static_cast< SfxObjectShell* >( excel::getDocShell( xModel ) );
@@ -205,16 +199,16 @@ ScVbaApplication::getActiveWorkbook() throw (uno::RuntimeException)
xWrkbk.set( getUnoDocModule( aName, pShell ), uno::UNO_QUERY );
// fallback ( e.g. it's possible a new document was created via the api )
// in that case the document will not have the appropriate Document Modules
- // #TODO #FIXME ( needs to be fixes as part of providing support for an overall document
+ // #TODO #FIXME ( needs to be fixes as part of providing support for an overall document
// vba mode etc. )
if ( !xWrkbk.is() )
return new ActiveWorkbook( this, mxContext );
}
}
- return xWrkbk;
+ return xWrkbk;
}
-uno::Reference< excel::XWorkbook > SAL_CALL
+uno::Reference< excel::XWorkbook > SAL_CALL
ScVbaApplication::getThisWorkbook() throw (uno::RuntimeException)
{
uno::Reference< excel::XWorkbook > xWrkbk;
@@ -228,7 +222,7 @@ ScVbaApplication::getThisWorkbook() throw (uno::RuntimeException)
xWrkbk.set( getUnoDocModule( aName, pShell ), uno::UNO_QUERY );
// fallback ( e.g. it's possible a new document was created via the api )
// in that case the document will not have the appropriate Document Modules
- // #TODO #FIXME ( needs to be fixes as part of providing support for an overall document
+ // #TODO #FIXME ( needs to be fixes as part of providing support for an overall document
// vba mode etc. )
if ( !xWrkbk.is() )
return new ActiveWorkbook( this, mxContext );
@@ -302,7 +296,8 @@ ScVbaApplication::getActiveCell() throw (uno::RuntimeException )
sal_Int32 nCursorX = pTabView->GetCurX();
sal_Int32 nCursorY = pTabView->GetCurY();
- return new ScVbaRange( this, mxContext, xRange->getCellRangeByPosition( nCursorX, nCursorY, nCursorX, nCursorY ) );
+ uno::Reference< XHelperInterface > xParent( excel::getUnoSheetModuleObj( xRange ), uno::UNO_QUERY_THROW );
+ return new ScVbaRange( xParent, mxContext, xRange->getCellRangeByPosition( nCursorX, nCursorY, nCursorX, nCursorY ) );
}
uno::Any SAL_CALL
@@ -340,17 +335,17 @@ ScVbaApplication::WorksheetFunction( ) throw (::com::sun::star::uno::RuntimeExce
return uno::makeAny( uno::Reference< script::XInvocation >( new ScVbaWSFunction( this, mxContext ) ) );
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaApplication::Evaluate( const ::rtl::OUString& Name ) throw (uno::RuntimeException)
{
// #TODO Evaluate allows other things to be evaluated, e.g. functions
// I think ( like SIN(3) etc. ) need to investigate that
// named Ranges also? e.g. [MyRange] if so need a list of named ranges
uno::Any aVoid;
- return uno::Any( getActiveWorkbook()->getActiveSheet()->Range( uno::Any( Name ), aVoid ) );
+ return uno::Any( getActiveWorkbook()->getActiveSheet()->Range( uno::Any( Name ), aVoid ) );
}
-uno::Any
+uno::Any
ScVbaApplication::Dialogs( const uno::Any &aIndex ) throw (uno::RuntimeException)
{
uno::Reference< excel::XDialogs > xDialogs( new ScVbaDialogs( uno::Reference< XHelperInterface >( this ), mxContext, getCurrentDocument() ) );
@@ -359,7 +354,7 @@ ScVbaApplication::Dialogs( const uno::Any &aIndex ) throw (uno::RuntimeException
return uno::Any( xDialogs->Item( aIndex ) );
}
-uno::Reference< excel::XWindow > SAL_CALL
+uno::Reference< excel::XWindow > SAL_CALL
ScVbaApplication::getActiveWindow() throw (uno::RuntimeException)
{
// #FIXME sofar can't determine Parent
@@ -369,7 +364,7 @@ ScVbaApplication::getActiveWindow() throw (uno::RuntimeException)
return xWin;
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaApplication::getCutCopyMode() throw (uno::RuntimeException)
{
//# FIXME TODO, implementation
@@ -378,7 +373,7 @@ ScVbaApplication::getCutCopyMode() throw (uno::RuntimeException)
return result;
}
-void SAL_CALL
+void SAL_CALL
ScVbaApplication::setCutCopyMode( const uno::Any& /*_cutcopymode*/ ) throw (uno::RuntimeException)
{
//# FIXME TODO, implementation
@@ -390,7 +385,7 @@ ScVbaApplication::getStatusBar() throw (uno::RuntimeException)
return uno::makeAny( !getDisplayStatusBar() );
}
-void SAL_CALL
+void SAL_CALL
ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::RuntimeException)
{
rtl::OUString sText;
@@ -427,7 +422,7 @@ ScVbaApplication::getCalculation() throw (uno::RuntimeException)
return excel::XlCalculation::xlCalculationManual;
}
-void SAL_CALL
+void SAL_CALL
ScVbaApplication::setCalculation( ::sal_Int32 _calculation ) throw (uno::RuntimeException)
{
uno::Reference< sheet::XCalculatable > xCalc(getCurrentDocument(), uno::UNO_QUERY_THROW);
@@ -443,15 +438,15 @@ ScVbaApplication::setCalculation( ::sal_Int32 _calculation ) throw (uno::Runtime
}
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaApplication::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException)
{
uno::Reference< excel::XWindows > xWindows( new ScVbaWindows( this, mxContext ) );
if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID )
return uno::Any( xWindows );
- return uno::Any( xWindows->Item( aIndex, uno::Any() ) );
+ return uno::Any( xWindows->Item( aIndex, uno::Any() ) );
}
-void SAL_CALL
+void SAL_CALL
ScVbaApplication::wait( double time ) throw (uno::RuntimeException)
{
StarBASIC* pBasic = SFX_APP()->GetBasic();
@@ -461,7 +456,7 @@ ScVbaApplication::wait( double time ) throw (uno::RuntimeException)
aRef->PutDouble( time );
aArgs->Put( aRef, 1 );
SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("WaitUntil") ), SbxCLASS_METHOD );
-
+
if ( pMeth )
{
pMeth->SetParameters( aArgs );
@@ -473,11 +468,11 @@ ScVbaApplication::wait( double time ) throw (uno::RuntimeException)
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaApplication::Range( const uno::Any& Cell1, const uno::Any& Cell2 ) throw (uno::RuntimeException)
{
- uno::Reference< excel::XRange > xVbRange = ScVbaRange::ApplicationRange( mxContext, Cell1, Cell2 );
- return uno::makeAny( xVbRange );
+ uno::Reference< excel::XRange > xVbRange = ScVbaRange::ApplicationRange( mxContext, Cell1, Cell2 );
+ return uno::makeAny( xVbRange );
}
uno::Any SAL_CALL
@@ -495,19 +490,19 @@ ScVbaApplication::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeExcep
}
-uno::Reference< excel::XWorksheet > SAL_CALL
+uno::Reference< excel::XWorksheet > SAL_CALL
ScVbaApplication::getActiveSheet() throw (uno::RuntimeException)
{
uno::Reference< excel::XWorksheet > result;
uno::Reference< excel::XWorkbook > xWorkbook( getActiveWorkbook(), uno::UNO_QUERY );
if ( xWorkbook.is() )
{
- uno::Reference< excel::XWorksheet > xWorksheet(
+ uno::Reference< excel::XWorksheet > xWorksheet(
xWorkbook->getActiveSheet(), uno::UNO_QUERY );
if ( xWorksheet.is() )
{
result = xWorksheet;
- }
+ }
}
if ( !result.is() )
@@ -517,26 +512,26 @@ ScVbaApplication::getActiveSheet() throw (uno::RuntimeException)
"No activeSheet available" ), uno::Reference< uno::XInterface >() );
}
return result;
-
+
}
/*******************************************************************************
- * In msdn:
- * Reference Optional Variant. The destination. Can be a Range
+ * In msdn:
+ * Reference Optional Variant. The destination. Can be a Range
* object, a string that contains a cell reference in R1C1-style notation,
* or a string that contains a Visual Basic procedure name.
- * Scroll Optional Variant. True to scrol, False to not scroll through
+ * Scroll Optional Variant. True to scrol, False to not scroll through
* the window. The default is False.
* Parser is split to three parts, Range, R1C1 string and procedure name.
- * by test excel, it seems Scroll no effect. ???
+ * by test excel, it seems Scroll no effect. ???
*******************************************************************************/
-void SAL_CALL
+void SAL_CALL
ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) throw (uno::RuntimeException)
{
//test Scroll is a boolean
sal_Bool bScroll = sal_False;
//R1C1-style string or a string of procedure name.
-
+
if( Scroll.hasValue() )
{
sal_Bool aScroll = sal_False;
@@ -558,7 +553,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro
uno::Reference< sheet::XSpreadsheet > xDoc = xSpreadsheet->getActiveSheet();
ScTabViewShell* pShell = excel::getCurrentBestViewShell( mxContext );
- ScGridWindow* gridWindow = (ScGridWindow*)pShell->GetWindow();
+ ScGridWindow* gridWindow = (ScGridWindow*)pShell->GetWindow();
try
{
uno::Reference< excel::XRange > xVbaSheetRange = ScVbaRange::getRangeObjectForName(
@@ -571,9 +566,9 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro
ScSplitPos eWhich = pShell->GetViewData()->GetActivePart();
sal_Int32 nValueX = pShell->GetViewData()->GetPosX(WhichH(eWhich));
sal_Int32 nValueY = pShell->GetViewData()->GetPosY(WhichV(eWhich));
- xWindow->SmallScroll( uno::makeAny( (sal_Int16)(xVbaSheetRange->getRow() - 1) ),
+ xWindow->SmallScroll( uno::makeAny( (sal_Int16)(xVbaSheetRange->getRow() - 1) ),
uno::makeAny( (sal_Int16)nValueY ),
- uno::makeAny( (sal_Int16)(xVbaSheetRange->getColumn() - 1) ),
+ uno::makeAny( (sal_Int16)(xVbaSheetRange->getColumn() - 1) ),
uno::makeAny( (sal_Int16)nValueX ) );
gridWindow->GrabFocus();
}
@@ -601,7 +596,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro
{
uno::Reference< excel::XRange > xVbaRange( Reference, uno::UNO_QUERY );
ScTabViewShell* pShell = excel::getCurrentBestViewShell( mxContext );
- ScGridWindow* gridWindow = (ScGridWindow*)pShell->GetWindow();
+ ScGridWindow* gridWindow = (ScGridWindow*)pShell->GetWindow();
if ( xVbaRange.is() )
{
//TODO bScroll should be using, In this time, it doesenot have effection
@@ -612,9 +607,9 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro
ScSplitPos eWhich = pShell->GetViewData()->GetActivePart();
sal_Int32 nValueX = pShell->GetViewData()->GetPosX(WhichH(eWhich));
sal_Int32 nValueY = pShell->GetViewData()->GetPosY(WhichV(eWhich));
- xWindow->SmallScroll( uno::makeAny( (sal_Int16)(xVbaRange->getRow() - 1) ),
+ xWindow->SmallScroll( uno::makeAny( (sal_Int16)(xVbaRange->getRow() - 1) ),
uno::makeAny( (sal_Int16)nValueY ),
- uno::makeAny( (sal_Int16)(xVbaRange->getColumn() - 1) ),
+ uno::makeAny( (sal_Int16)(xVbaRange->getColumn() - 1) ),
uno::makeAny( (sal_Int16)nValueX ) );
gridWindow->GrabFocus();
}
@@ -650,7 +645,7 @@ ScVbaApplication::getCursor() throw (uno::RuntimeException)
}
}
-void SAL_CALL
+void SAL_CALL
ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException)
{
try
@@ -679,11 +674,11 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException)
break;
}
default:
- throw uno::RuntimeException( rtl::OUString(
+ throw uno::RuntimeException( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("Unknown value for Cursor pointer")), uno::Reference< uno::XInterface >() );
// TODO: isn't this a flaw in the API? It should be allowed to throw an
// IllegalArgumentException, or so
- }
+ }
}
catch( const uno::Exception& )
{
@@ -691,7 +686,7 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException)
}
}
-// #TODO perhaps we should switch the return type depending of the filter
+// #TODO perhaps we should switch the return type depending of the filter
// type, e.g. return Calc for Calc and Excel if its an imported doc
rtl::OUString SAL_CALL
ScVbaApplication::getName() throw (uno::RuntimeException)
@@ -700,10 +695,10 @@ ScVbaApplication::getName() throw (uno::RuntimeException)
return appName;
}
-// #TODO #FIXME get/setDisplayAlerts are just stub impl
+// #TODO #FIXME get/setDisplayAlerts are just stub impl
// here just the status of the switch is set
-// the function that throws an error message needs to
-// evaluate this switch in order to know whether it has to disable the
+// the function that throws an error message needs to
+// evaluate this switch in order to know whether it has to disable the
// error message thrown by OpenOffice
void SAL_CALL
@@ -760,16 +755,16 @@ rtl::OUString ScVbaApplication::getOfficePath( const rtl::OUString& _sPathType )
// if its a list of paths then use the last one
sal_Int32 nIndex = sUrl.lastIndexOf( ';' ) ;
if ( nIndex > 0 )
- sUrl = sUrl.copy( nIndex + 1 );
+ sUrl = sUrl.copy( nIndex + 1 );
::osl::File::getSystemPathFromFileURL( sUrl, sRetPath );
}
catch (uno::Exception&)
{
- DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
- }
+ DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
+ }
return sRetPath;
}
-void SAL_CALL
+void SAL_CALL
ScVbaApplication::setDefaultFilePath( const ::rtl::OUString& DefaultFilePath ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps = lcl_getPathSettingsService( mxContext );
@@ -777,440 +772,317 @@ ScVbaApplication::setDefaultFilePath( const ::rtl::OUString& DefaultFilePath ) t
osl::FileBase::getFileURLFromSystemPath( DefaultFilePath, aURL );
xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Work")), uno::makeAny( aURL ) );
-
+
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
ScVbaApplication::getDefaultFilePath( ) throw (script::BasicErrorException, uno::RuntimeException)
{
return getOfficePath( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Work")));
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
ScVbaApplication::LibraryPath( ) throw (script::BasicErrorException, uno::RuntimeException)
{
return getOfficePath( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Basic")));
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
ScVbaApplication::TemplatesPath( ) throw (script::BasicErrorException, uno::RuntimeException)
{
return getOfficePath( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Template")));
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
ScVbaApplication::PathSeparator( ) throw (script::BasicErrorException, uno::RuntimeException)
{
static rtl::OUString sPathSep( RTL_CONSTASCII_USTRINGPARAM( FILE_PATH_SEPERATOR ) );
return sPathSep;
}
-typedef std::list< ScRange > Ranges;
-typedef std::list< ScRangeList > RangesList;
+// ----------------------------------------------------------------------------
+// Helpers for Intersect and Union
+
+namespace {
-void lcl_addRangesToVec( RangesList& vRanges, const uno::Any& aArg ) throw ( script::BasicErrorException, uno::RuntimeException )
+typedef ::std::list< ScRange > ListOfScRange;
+
+/** Appends all ranges of a VBA Range object in the passed Any to the list of ranges. */
+void lclAddToListOfScRange( ListOfScRange& rList, const uno::Any& rArg )
+ throw (script::BasicErrorException, uno::RuntimeException)
{
- ScRangeList theRanges;
- uno::Reference< excel::XRange > xRange( aArg, uno::UNO_QUERY_THROW );
- uno::Reference< XCollection > xCol( xRange->Areas( uno::Any() ), uno::UNO_QUERY_THROW );
- sal_Int32 nCount = xCol->getCount();
- for( sal_Int32 i = 1; i <= nCount; ++i )
+ if( rArg.hasValue() )
{
- uno::Reference< excel::XRange > xAreaRange( xCol->Item( uno::makeAny( sal_Int32(i) ), uno::Any() ), uno::UNO_QUERY_THROW );
- uno::Reference< sheet::XCellRangeAddressable > xAddressable( xAreaRange->getCellRange(), uno::UNO_QUERY_THROW );
- table::CellRangeAddress addr = xAddressable->getRangeAddress();
- ScRange refRange;
- ScUnoConversion::FillScRange( refRange, addr );
- theRanges.Append( refRange );
+ uno::Reference< excel::XRange > xRange( rArg, uno::UNO_QUERY_THROW );
+ uno::Reference< XCollection > xCol( xRange->Areas( uno::Any() ), uno::UNO_QUERY_THROW );
+ for( sal_Int32 nIdx = 1, nCount = xCol->getCount(); nIdx <= nCount; ++nIdx )
+ {
+ uno::Reference< excel::XRange > xAreaRange( xCol->Item( uno::Any( nIdx ), uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< sheet::XCellRangeAddressable > xAddressable( xAreaRange->getCellRange(), uno::UNO_QUERY_THROW );
+ ScRange aScRange;
+ ScUnoConversion::FillScRange( aScRange, xAddressable->getRangeAddress() );
+ rList.push_back( aScRange );
+ }
}
- vRanges.push_back( theRanges );
}
-void lcl_addRangeToVec( Ranges& vRanges, const uno::Any& aArg ) throw ( script::BasicErrorException, uno::RuntimeException )
+/** Returns true, if the passed ranges can be expressed by a single range. The
+ new range will be contained in r1 then, the range r2 can be removed. */
+bool lclTryJoin( ScRange& r1, const ScRange& r2 )
{
- uno::Reference< excel::XRange > xRange( aArg, uno::UNO_QUERY_THROW );
- uno::Reference< XCollection > xCol( xRange->Areas( uno::Any() ), uno::UNO_QUERY_THROW );
- sal_Int32 nCount = xCol->getCount();
- for( sal_Int32 i = 1; i <= nCount; ++i )
+ // 1) r2 is completely inside r1
+ if( r1.In( r2 ) )
+ return true;
+
+ // 2) r1 is completely inside r2
+ if( r2.In( r1 ) )
{
- uno::Reference< excel::XRange > xAreaRange( xCol->Item( uno::makeAny( sal_Int32(i) ), uno::Any() ), uno::UNO_QUERY_THROW );
- uno::Reference< sheet::XCellRangeAddressable > xAddressable( xAreaRange->getCellRange(), uno::UNO_QUERY_THROW );
- table::CellRangeAddress addr = xAddressable->getRangeAddress();
- ScRange refRange;
- ScUnoConversion::FillScRange( refRange, addr );
- vRanges.push_back( refRange );
+ r1 = r2;
+ return true;
}
-}
-bool lcl_canJoin( ScRange& r1, ScRange& r2 )
-{
- bool bCanJoin = false;
- SCCOL startEndColDiff = r2.aStart.Col() - r1.aEnd.Col();
- SCROW startEndRowDiff = r2.aStart.Row() - r1.aEnd.Row();
- SCCOL startColDiff = r2.aStart.Col() - r1.aStart.Col();
- SCCOL endColDiff = r2.aEnd.Col() - r1.aEnd.Col();
- SCROW startRowDiff = r2.aStart.Row() - r1.aStart.Row();
- SCROW endRowDiff = r2.aEnd.Row() - r1.aEnd.Row();
- if ( ( startRowDiff == endRowDiff ) && startRowDiff == 0 && startColDiff >=0 && endColDiff > 0 && ( startEndColDiff <= 1 && startEndColDiff >= -r1.aEnd.Col() ) )
- bCanJoin = true;
- else if ( ( startColDiff == endColDiff ) && startColDiff == 0 && startRowDiff >= 0 && endRowDiff > 0 && ( startEndRowDiff <= 1 && startEndRowDiff >= -r1.aEnd.Row() ) )
- bCanJoin = true;
-#ifdef DEBUG
- String sr1;
- String sr2;
- r1.Format( sr1, SCA_VALID ) ;
- r2.Format( sr2, SCA_VALID ) ;
- OSL_TRACE(" canJoin address %s with %s %s ( startRowDiff(%d), endRowDiff(%d), startColDiff(%d) endColDiff(%d) startEndRowDiff(%d), startEndColDiff(%d) ",
- rtl::OUStringToOString( sr1, RTL_TEXTENCODING_UTF8 ).getStr(),
- rtl::OUStringToOString( sr2, RTL_TEXTENCODING_UTF8 ).getStr(), bCanJoin ? "true" : "false", startRowDiff, endRowDiff, startColDiff, endColDiff, startEndRowDiff, startEndColDiff );
-#endif
- return bCanJoin;
-}
-// strips out ranges that contain other ranges, also
-// if the borders of the intersecting ranges are alligned
-// then the the range is extended to the larger
-// e.g. Range("A4:D10"), Range("B4:E10") would be combined
-// to Range("A4:E10")
-void lcl_strip_containedRanges( Ranges& vRanges )
-{
- // get rid of ranges that are surrounded by other ranges
- Ranges::iterator it_outer = vRanges.begin();
- while( it_outer != vRanges.end() )
+ SCCOL n1L = r1.aStart.Col();
+ SCCOL n1R = r1.aEnd.Col();
+ SCROW n1T = r1.aStart.Row();
+ SCROW n1B = r1.aEnd.Row();
+ SCCOL n2L = r2.aStart.Col();
+ SCCOL n2R = r2.aEnd.Col();
+ SCROW n2T = r2.aStart.Row();
+ SCROW n2B = r2.aEnd.Row();
+
+ // 3) r1 and r2 have equal upper and lower border
+ if( (n1T == n2T) && (n1B == n2B) )
{
- bool it_outer_erased = false; // true = it_outer erased from vRanges
- Ranges::iterator it_inner = vRanges.begin();
- /* Exit the inner loop if outer iterator has been erased in its last
- iteration (this means it has been joined to last it_inner, or that
- the it_inner contains it completely). The inner loop will restart
- with next element of the outer loop, and all elements (from the
- beginning of the list) will be checked against that new element. */
- while( !it_outer_erased && (it_inner != vRanges.end()) )
+ // check that r1 overlaps or touches r2
+ if( ((n1L < n2L) && (n2L - 1 <= n1R)) || ((n2L < n1L) && (n1L - 1 <= n2R)) )
{
- bool it_inner_erased = false; // true = it_inner erased from vRanges
- if ( it_outer != it_inner )
- {
-#ifdef DEBUG
- String r1;
- String r2;
- it_outer->Format( r1, SCA_VALID ) ;
- it_inner->Format( r2, SCA_VALID ) ;
- OSL_TRACE( "try strip/join address %s with %s ",
- rtl::OUStringToOString( r1, RTL_TEXTENCODING_UTF8 ).getStr(),
- rtl::OUStringToOString( r2, RTL_TEXTENCODING_UTF8 ).getStr() );
-#endif
- if ( it_outer->In( *it_inner ) )
- {
- it_inner = vRanges.erase( it_inner );
- it_inner_erased = true;
- }
- else if ( it_inner->In( *it_outer ) )
- {
- it_outer = vRanges.erase( it_outer );
- it_outer_erased = true;
- }
-#ifndef OWN_JOIN
- else if ( (*it_inner).aStart.Row() == (*it_outer).aStart.Row()
- && (*it_inner).aEnd.Row() == (*it_outer).aEnd.Row() )
- {
- it_outer->ExtendTo( *it_inner );
- it_inner = vRanges.erase( it_inner );
- it_inner_erased = true;
- }
-#else
- else if ( lcl_canJoin( *it_outer, *it_inner ) )
- {
- it_outer->ExtendTo( *it_inner );
- it_inner = vRanges.erase( it_inner );
- it_inner_erased = true;
- }
- else if ( lcl_canJoin( *it_inner, *it_outer) )
- {
- it_inner->ExtendTo( *it_outer );
- it_outer = vRanges.erase( it_outer );
- it_outer_erased = true;
- }
-#endif
- }
- /* If it_inner has not been erased from vRanges, continue inner
- loop with next element. Otherwise, it_inner already points to
- the next element (return value of list::erase()). */
- if( !it_inner_erased )
- ++it_inner;
+ r1.aStart.SetCol( ::std::min( n1L, n2L ) );
+ r1.aEnd.SetCol( ::std::max( n1R, n2R ) );
+ return true;
+ }
+ return false;
+ }
+
+ // 4) r1 and r2 have equal left and right border
+ if( (n1L == n2L) && (n1R == n2R) )
+ {
+ // check that r1 overlaps or touches r2
+ if( ((n1T < n2T) && (n2T + 1 <= n1B)) || ((n2T < n1T) && (n1T + 1 <= n2B)) )
+ {
+ r1.aStart.SetRow( ::std::min( n1T, n2T ) );
+ r1.aEnd.SetRow( ::std::max( n1B, n2B ) );
+ return true;
}
- /* If it_outer has not been erased from vRanges, continue outer loop
- with next element. Otherwise, it_outer already points to the next
- element (return value of list::erase()). */
- if( !it_outer_erased )
- ++it_outer;
+ return false;
}
+ // 5) cannot join these ranges
+ return false;
}
-Ranges
-lcl_intersectionImpl( ScRangeList& rl1, ScRangeList& rl2 )
+/** Strips out ranges that are contained by other ranges, joins ranges that can be joined
+ together (aligned borders, e.g. A4:D10 and B4:E10 would be combined to A4:E10. */
+void lclJoinRanges( ListOfScRange& rList )
{
- Ranges intersections;
- for ( USHORT x = 0 ; x < rl1.Count(); ++x )
+ ListOfScRange::iterator aOuterIt = rList.begin();
+ while( aOuterIt != rList.end() )
{
- for ( USHORT y = 0 ; y < rl2.Count(); ++y )
+ bool bAnyErased = false; // true = any range erased from rList
+ ListOfScRange::iterator aInnerIt = rList.begin();
+ while( aInnerIt != rList.end() )
{
-#ifdef DEBUG
- String r1;
- String r2;
- rl1.GetObject( x )->Format( r1, SCA_VALID ) ;
- rl2.GetObject( y )->Format( r2, SCA_VALID ) ;
- OSL_TRACE( "comparing address %s with %s ",
- rtl::OUStringToOString( r1, RTL_TEXTENCODING_UTF8 ).getStr(),
- rtl::OUStringToOString( r2, RTL_TEXTENCODING_UTF8 ).getStr() );
-#endif
- if( rl1.GetObject( x )->Intersects( *rl2.GetObject( y ) ) )
+ bool bInnerErased = false; // true = aInnerIt erased from rList
+ // do not compare a range with itself
+ if( (aOuterIt != aInnerIt) && lclTryJoin( *aOuterIt, *aInnerIt ) )
{
- ScRange aIntersection = ScRange( Max( rl1.GetObject( x )->aStart.Col(), rl2.GetObject( y )->aStart.Col() ),
- Max( rl1.GetObject( x )->aStart.Row(), rl2.GetObject( y )->aStart.Row() ),
- Max( rl1.GetObject( x )->aStart.Tab(), rl2.GetObject( y )->aStart.Tab() ),
- Min( rl1.GetObject( x )->aEnd.Col(), rl2.GetObject( y )->aEnd.Col() ),
- Min( rl1.GetObject( x )->aEnd.Row(), rl2.GetObject( y )->aEnd.Row() ),
- Min( rl1.GetObject( x )->aEnd.Tab(), rl2.GetObject( y )->aEnd.Tab() ) );
- intersections.push_back( aIntersection );
+ // aOuterIt points to joined range, aInnerIt will be removed
+ aInnerIt = rList.erase( aInnerIt );
+ bInnerErased = bAnyErased = true;
}
+ /* If aInnerIt has been erased from rList, it already points to
+ the next element (return value of list::erase()). */
+ if( !bInnerErased )
+ ++aInnerIt;
}
+ // if any range has been erased, repeat outer loop with the same range
+ if( !bAnyErased )
+ ++aOuterIt;
}
- lcl_strip_containedRanges( intersections );
- return intersections;
}
-// Intersection of a set of ranges ( where each range is represented by a ScRangeList e.g.
-// any range can be a multi-area range )
-// An intersection is performed between each range in the set of ranges.
-// The resulting set of intersections is then processed to strip out any
-// intersections that contain other intersections ( and also ranges that directly line up
-// are joined ) ( see lcl_strip_containedRanges )
-RangesList lcl_intersections( RangesList& vRanges )
+/** Intersects the passed list with all ranges of a VBA Range object in the passed Any. */
+void lclIntersectRanges( ListOfScRange& rList, const uno::Any& rArg )
+ throw (script::BasicErrorException, uno::RuntimeException)
{
- RangesList intersections;
- RangesList::iterator it = vRanges.begin();
- while( it != vRanges.end() )
+ // extract the ranges from the passed argument, will throw on invalid data
+ ListOfScRange aList2;
+ lclAddToListOfScRange( aList2, rArg );
+ // do nothing, if the passed list is already empty
+ if( !rList.empty() && !aList2.empty() )
{
- Ranges intermediateList;
- for( RangesList::iterator it_inner = vRanges.begin(); it_inner != vRanges.end(); ++it_inner )
+ // save original list in a local
+ ListOfScRange aList1;
+ aList1.swap( rList );
+ // join ranges from passed argument
+ lclJoinRanges( aList2 );
+ // calculate intersection of the ranges in both lists
+ for( ListOfScRange::const_iterator aOuterIt = aList1.begin(), aOuterEnd = aList1.end(); aOuterIt != aOuterEnd; ++aOuterIt )
{
- if ( it != it_inner )
+ for( ListOfScRange::const_iterator aInnerIt = aList2.begin(), aInnerEnd = aList2.end(); aInnerIt != aInnerEnd; ++aInnerIt )
{
- Ranges ranges = lcl_intersectionImpl( *it, *it_inner );
- for ( Ranges::iterator range_it = ranges.begin(); range_it != ranges.end(); ++range_it )
- intermediateList.push_back( *range_it );
+ if( aOuterIt->Intersects( *aInnerIt ) )
+ {
+ ScRange aIsectRange(
+ Max( aOuterIt->aStart.Col(), aInnerIt->aStart.Col() ),
+ Max( aOuterIt->aStart.Row(), aInnerIt->aStart.Row() ),
+ Max( aOuterIt->aStart.Tab(), aInnerIt->aStart.Tab() ),
+ Min( aOuterIt->aEnd.Col(), aInnerIt->aEnd.Col() ),
+ Min( aOuterIt->aEnd.Row(), aInnerIt->aEnd.Row() ),
+ Min( aOuterIt->aEnd.Tab(), aInnerIt->aEnd.Tab() ) );
+ rList.push_back( aIsectRange );
+ }
}
}
- it = vRanges.erase( it ); // remove it so we don't include it in the next pass.
- // 'it' is removed uncontidionally from vRanges, so the while loop will terminate
-
- ScRangeList argIntersect;
- lcl_strip_containedRanges( intermediateList );
-
- for( Ranges::iterator it_inter = intermediateList.begin(); it_inter != intermediateList.end(); ++it_inter )
-#ifndef OWN_JOIN
- argIntersect.Join( *it_inter );
-#else
- argIntersect.Append( *it_inter );
-#endif
-
- intersections.push_back( argIntersect );
+ // again, join the result ranges
+ lclJoinRanges( rList );
}
- return intersections;
-}
-
-uno::Reference< excel::XRange > SAL_CALL
-ScVbaApplication::Intersect( const uno::Reference< excel::XRange >& Arg1, const uno::Reference< excel::XRange >& Arg2, const uno::Any& Arg3, const uno::Any& Arg4, const uno::Any& Arg5, const uno::Any& Arg6, const uno::Any& Arg7, const uno::Any& Arg8, const uno::Any& Arg9, const uno::Any& Arg10, const uno::Any& Arg11, const uno::Any& Arg12, const uno::Any& Arg13, const uno::Any& Arg14, const uno::Any& Arg15, const uno::Any& Arg16, const uno::Any& Arg17, const uno::Any& Arg18, const uno::Any& Arg19, const uno::Any& Arg20, const uno::Any& Arg21, const uno::Any& Arg22, const uno::Any& Arg23, const uno::Any& Arg24, const uno::Any& Arg25, const uno::Any& Arg26, const uno::Any& Arg27, const uno::Any& Arg28, const uno::Any& Arg29, const uno::Any& Arg30 ) throw (script::BasicErrorException, uno::RuntimeException)
-{
- if ( !Arg1.is() || !Arg2.is() )
- DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
-
- RangesList vRanges;
- lcl_addRangesToVec( vRanges, uno::makeAny( Arg1 ) );
- lcl_addRangesToVec( vRanges, uno::makeAny( Arg2 ) );
-
- if ( Arg3.hasValue() )
- lcl_addRangesToVec( vRanges, Arg3 );
- if ( Arg4.hasValue() )
- lcl_addRangesToVec( vRanges, Arg4 );
- if ( Arg5.hasValue() )
- lcl_addRangesToVec( vRanges, Arg5 );
- if ( Arg6.hasValue() )
- lcl_addRangesToVec( vRanges, Arg6 );
- if ( Arg7.hasValue() )
- lcl_addRangesToVec( vRanges, Arg7 );
- if ( Arg8.hasValue() )
- lcl_addRangesToVec( vRanges, Arg8 );
- if ( Arg9.hasValue() )
- lcl_addRangesToVec( vRanges, Arg9 );
- if ( Arg10.hasValue() )
- lcl_addRangesToVec( vRanges, Arg10 );
- if ( Arg11.hasValue() )
- lcl_addRangesToVec( vRanges, Arg11 );
- if ( Arg12.hasValue() )
- lcl_addRangesToVec( vRanges, Arg12 );
- if ( Arg13.hasValue() )
- lcl_addRangesToVec( vRanges, Arg13 );
- if ( Arg14.hasValue() )
- lcl_addRangesToVec( vRanges, Arg14 );
- if ( Arg15.hasValue() )
- lcl_addRangesToVec( vRanges, Arg15 );
- if ( Arg16.hasValue() )
- lcl_addRangesToVec( vRanges, Arg16 );
- if ( Arg17.hasValue() )
- lcl_addRangesToVec( vRanges, Arg17 );
- if ( Arg18.hasValue() )
- lcl_addRangesToVec( vRanges, Arg18 );
- if ( Arg19.hasValue() )
- lcl_addRangesToVec( vRanges, Arg19 );
- if ( Arg20.hasValue() )
- lcl_addRangesToVec( vRanges, Arg20 );
- if ( Arg21.hasValue() )
- lcl_addRangesToVec( vRanges, Arg21 );
- if ( Arg22.hasValue() )
- lcl_addRangesToVec( vRanges, Arg22 );
- if ( Arg23.hasValue() )
- lcl_addRangesToVec( vRanges, Arg23 );
- if ( Arg24.hasValue() )
- lcl_addRangesToVec( vRanges, Arg24 );
- if ( Arg25.hasValue() )
- lcl_addRangesToVec( vRanges, Arg25 );
- if ( Arg26.hasValue() )
- lcl_addRangesToVec( vRanges, Arg26 );
- if ( Arg27.hasValue() )
- lcl_addRangesToVec( vRanges, Arg27 );
- if ( Arg28.hasValue() )
- lcl_addRangesToVec( vRanges, Arg28 );
- if ( Arg29.hasValue() )
- lcl_addRangesToVec( vRanges, Arg29 );
- if ( Arg30.hasValue() )
- lcl_addRangesToVec( vRanges, Arg30 );
-
- uno::Reference< excel::XRange > xRefRange;
-
- ScRangeList aCellRanges;
- // first pass - gets the set of all possible interections of Arg1..ArgN
- RangesList intersections = lcl_intersections( vRanges );
- // second pass - gets the intersections of the intersections ( don't ask, but this
- // is what seems to happen )
- if ( intersections.size() > 1)
- intersections = lcl_intersections( intersections );
- for( RangesList::iterator it = intersections.begin(); it != intersections.end(); ++it )
- {
- for ( USHORT x = 0 ; x < it->Count(); ++x )
-#ifndef OWN_JOIN
- aCellRanges.Join( *it->GetObject(x) );
-#else
- aCellRanges.Append( *it->GetObject(x) );
-#endif
- }
-
- uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
- ScDocShell* pDocShell = excel::getDocShell( xModel );
- if ( aCellRanges.Count() == 1 )
- {
- uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pDocShell, *aCellRanges.First() ));
- xRefRange = new ScVbaRange( excel::getUnoSheetModuleObj( xRange ), mxContext, xRange );
- }
- else if ( aCellRanges.Count() > 1 )
- {
- uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( pDocShell, aCellRanges ) );
- xRefRange = new ScVbaRange( excel::getUnoSheetModuleObj( xRanges ) , mxContext, xRanges );
-
- }
- return xRefRange;
}
-uno::Reference< excel::XRange > SAL_CALL
-ScVbaApplication::Union( const uno::Reference< excel::XRange >& Arg1, const uno::Reference< excel::XRange >& Arg2, const uno::Any& Arg3, const uno::Any& Arg4, const uno::Any& Arg5, const uno::Any& Arg6, const uno::Any& Arg7, const uno::Any& Arg8, const uno::Any& Arg9, const uno::Any& Arg10, const uno::Any& Arg11, const uno::Any& Arg12, const uno::Any& Arg13, const uno::Any& Arg14, const uno::Any& Arg15, const uno::Any& Arg16, const uno::Any& Arg17, const uno::Any& Arg18, const uno::Any& Arg19, const uno::Any& Arg20, const uno::Any& Arg21, const uno::Any& Arg22, const uno::Any& Arg23, const uno::Any& Arg24, const uno::Any& Arg25, const uno::Any& Arg26, const uno::Any& Arg27, const uno::Any& Arg28, const uno::Any& Arg29, const uno::Any& Arg30 ) throw (script::BasicErrorException, uno::RuntimeException)
+/** Creates a VBA Range object from the passed list of ranges. */
+uno::Reference< excel::XRange > lclCreateVbaRange(
+ const uno::Reference< uno::XComponentContext >& rxContext,
+ const uno::Reference< frame::XModel >& rxModel,
+ const ListOfScRange& rList ) throw (uno::RuntimeException)
{
- if ( !Arg1.is() || !Arg2.is() )
- DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
-
- uno::Reference< excel::XRange > xRange;
- Ranges vRanges;
- lcl_addRangeToVec( vRanges, uno::makeAny( Arg1 ) );
- lcl_addRangeToVec( vRanges, uno::makeAny( Arg2 ) );
-
- if ( Arg3.hasValue() )
- lcl_addRangeToVec( vRanges, Arg3 );
- if ( Arg4.hasValue() )
- lcl_addRangeToVec( vRanges, Arg4 );
- if ( Arg5.hasValue() )
- lcl_addRangeToVec( vRanges, Arg5 );
- if ( Arg6.hasValue() )
- lcl_addRangeToVec( vRanges, Arg6 );
- if ( Arg7.hasValue() )
- lcl_addRangeToVec( vRanges, Arg7 );
- if ( Arg8.hasValue() )
- lcl_addRangeToVec( vRanges, Arg8 );
- if ( Arg9.hasValue() )
- lcl_addRangeToVec( vRanges, Arg9 );
- if ( Arg10.hasValue() )
- lcl_addRangeToVec( vRanges, Arg10 );
- if ( Arg11.hasValue() )
- lcl_addRangeToVec( vRanges, Arg11 );
- if ( Arg12.hasValue() )
- lcl_addRangeToVec( vRanges, Arg12 );
- if ( Arg13.hasValue() )
- lcl_addRangeToVec( vRanges, Arg13 );
- if ( Arg14.hasValue() )
- lcl_addRangeToVec( vRanges, Arg14 );
- if ( Arg15.hasValue() )
- lcl_addRangeToVec( vRanges, Arg15 );
- if ( Arg16.hasValue() )
- lcl_addRangeToVec( vRanges, Arg16 );
- if ( Arg17.hasValue() )
- lcl_addRangeToVec( vRanges, Arg17 );
- if ( Arg18.hasValue() )
- lcl_addRangeToVec( vRanges, Arg18 );
- if ( Arg19.hasValue() )
- lcl_addRangeToVec( vRanges, Arg19 );
- if ( Arg20.hasValue() )
- lcl_addRangeToVec( vRanges, Arg20 );
- if ( Arg21.hasValue() )
- lcl_addRangeToVec( vRanges, Arg21 );
- if ( Arg22.hasValue() )
- lcl_addRangeToVec( vRanges, Arg22 );
- if ( Arg23.hasValue() )
- lcl_addRangeToVec( vRanges, Arg23 );
- if ( Arg24.hasValue() )
- lcl_addRangeToVec( vRanges, Arg24 );
- if ( Arg25.hasValue() )
- lcl_addRangeToVec( vRanges, Arg25 );
- if ( Arg26.hasValue() )
- lcl_addRangeToVec( vRanges, Arg26 );
- if ( Arg27.hasValue() )
- lcl_addRangeToVec( vRanges, Arg27 );
- if ( Arg28.hasValue() )
- lcl_addRangeToVec( vRanges, Arg28 );
- if ( Arg29.hasValue() )
- lcl_addRangeToVec( vRanges, Arg29 );
- if ( Arg30.hasValue() )
- lcl_addRangeToVec( vRanges, Arg30 );
+ ScDocShell* pDocShell = excel::getDocShell( rxModel );
+ if( !pDocShell ) throw uno::RuntimeException();
ScRangeList aCellRanges;
- lcl_strip_containedRanges( vRanges );
+ for( ListOfScRange::const_iterator aIt = rList.begin(), aEnd = rList.end(); aIt != aEnd; ++aIt )
+ aCellRanges.Append( *aIt );
- for( Ranges::iterator it = vRanges.begin(); it != vRanges.end(); ++it )
- aCellRanges.Append( *it );
-
- uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
- ScDocShell* pDocShell = excel::getDocShell( xModel );
- if ( aCellRanges.Count() == 1 )
+ if( aCellRanges.Count() == 1 )
{
- // normal range
- uno::Reference< table::XCellRange > xCalcRange( new ScCellRangeObj( pDocShell, *aCellRanges.First() ) );
- xRange = new ScVbaRange( excel::getUnoSheetModuleObj( xCalcRange ), mxContext, xCalcRange );
+ uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pDocShell, *aCellRanges.First() ) );
+ return new ScVbaRange( excel::getUnoSheetModuleObj( xRange ), rxContext, xRange );
}
- else if ( aCellRanges.Count() > 1 ) // Multi-Area
+ if( aCellRanges.Count() > 1 )
{
uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( pDocShell, aCellRanges ) );
- xRange = new ScVbaRange( excel::getUnoSheetModuleObj( xRanges ), mxContext, xRanges );
+ return new ScVbaRange( excel::getUnoSheetModuleObj( xRanges ), rxContext, xRanges );
}
-
- // #FIXME need proper (WorkSheet) parent
- return xRange;
+ return 0;
+}
+
+} // namespace
+
+// ----------------------------------------------------------------------------
+
+uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Intersect(
+ const uno::Reference< excel::XRange >& rArg1, const uno::Reference< excel::XRange >& rArg2,
+ const uno::Any& rArg3, const uno::Any& rArg4, const uno::Any& rArg5, const uno::Any& rArg6,
+ const uno::Any& rArg7, const uno::Any& rArg8, const uno::Any& rArg9, const uno::Any& rArg10,
+ const uno::Any& rArg11, const uno::Any& rArg12, const uno::Any& rArg13, const uno::Any& rArg14,
+ const uno::Any& rArg15, const uno::Any& rArg16, const uno::Any& rArg17, const uno::Any& rArg18,
+ const uno::Any& rArg19, const uno::Any& rArg20, const uno::Any& rArg21, const uno::Any& rArg22,
+ const uno::Any& rArg23, const uno::Any& rArg24, const uno::Any& rArg25, const uno::Any& rArg26,
+ const uno::Any& rArg27, const uno::Any& rArg28, const uno::Any& rArg29, const uno::Any& rArg30 )
+ throw (script::BasicErrorException, uno::RuntimeException)
+{
+ if( !rArg1.is() || !rArg2.is() )
+ DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
+
+ // initialize the result list with 1st parameter, join its ranges together
+ ListOfScRange aList;
+ lclAddToListOfScRange( aList, uno::Any( rArg1 ) );
+ lclJoinRanges( aList );
+
+ // process all other parameters, this updates the list with intersection
+ lclIntersectRanges( aList, uno::Any( rArg2 ) );
+ lclIntersectRanges( aList, rArg3 );
+ lclIntersectRanges( aList, rArg4 );
+ lclIntersectRanges( aList, rArg5 );
+ lclIntersectRanges( aList, rArg6 );
+ lclIntersectRanges( aList, rArg7 );
+ lclIntersectRanges( aList, rArg8 );
+ lclIntersectRanges( aList, rArg9 );
+ lclIntersectRanges( aList, rArg10 );
+ lclIntersectRanges( aList, rArg11 );
+ lclIntersectRanges( aList, rArg12 );
+ lclIntersectRanges( aList, rArg13 );
+ lclIntersectRanges( aList, rArg14 );
+ lclIntersectRanges( aList, rArg15 );
+ lclIntersectRanges( aList, rArg16 );
+ lclIntersectRanges( aList, rArg17 );
+ lclIntersectRanges( aList, rArg18 );
+ lclIntersectRanges( aList, rArg19 );
+ lclIntersectRanges( aList, rArg20 );
+ lclIntersectRanges( aList, rArg21 );
+ lclIntersectRanges( aList, rArg22 );
+ lclIntersectRanges( aList, rArg23 );
+ lclIntersectRanges( aList, rArg24 );
+ lclIntersectRanges( aList, rArg25 );
+ lclIntersectRanges( aList, rArg26 );
+ lclIntersectRanges( aList, rArg27 );
+ lclIntersectRanges( aList, rArg28 );
+ lclIntersectRanges( aList, rArg29 );
+ lclIntersectRanges( aList, rArg30 );
+
+ // create the VBA Range object
+ return lclCreateVbaRange( mxContext, getCurrentDocument(), aList );
+}
+
+uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Union(
+ const uno::Reference< excel::XRange >& rArg1, const uno::Reference< excel::XRange >& rArg2,
+ const uno::Any& rArg3, const uno::Any& rArg4, const uno::Any& rArg5, const uno::Any& rArg6,
+ const uno::Any& rArg7, const uno::Any& rArg8, const uno::Any& rArg9, const uno::Any& rArg10,
+ const uno::Any& rArg11, const uno::Any& rArg12, const uno::Any& rArg13, const uno::Any& rArg14,
+ const uno::Any& rArg15, const uno::Any& rArg16, const uno::Any& rArg17, const uno::Any& rArg18,
+ const uno::Any& rArg19, const uno::Any& rArg20, const uno::Any& rArg21, const uno::Any& rArg22,
+ const uno::Any& rArg23, const uno::Any& rArg24, const uno::Any& rArg25, const uno::Any& rArg26,
+ const uno::Any& rArg27, const uno::Any& rArg28, const uno::Any& rArg29, const uno::Any& rArg30 )
+ throw (script::BasicErrorException, uno::RuntimeException)
+{
+ if( !rArg1.is() || !rArg2.is() )
+ DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
+
+ ListOfScRange aList;
+ lclAddToListOfScRange( aList, uno::Any( rArg1 ) );
+ lclAddToListOfScRange( aList, uno::Any( rArg2 ) );
+ lclAddToListOfScRange( aList, rArg3 );
+ lclAddToListOfScRange( aList, rArg4 );
+ lclAddToListOfScRange( aList, rArg5 );
+ lclAddToListOfScRange( aList, rArg6 );
+ lclAddToListOfScRange( aList, rArg7 );
+ lclAddToListOfScRange( aList, rArg8 );
+ lclAddToListOfScRange( aList, rArg9 );
+ lclAddToListOfScRange( aList, rArg10 );
+ lclAddToListOfScRange( aList, rArg11 );
+ lclAddToListOfScRange( aList, rArg12 );
+ lclAddToListOfScRange( aList, rArg13 );
+ lclAddToListOfScRange( aList, rArg14 );
+ lclAddToListOfScRange( aList, rArg15 );
+ lclAddToListOfScRange( aList, rArg16 );
+ lclAddToListOfScRange( aList, rArg17 );
+ lclAddToListOfScRange( aList, rArg18 );
+ lclAddToListOfScRange( aList, rArg19 );
+ lclAddToListOfScRange( aList, rArg20 );
+ lclAddToListOfScRange( aList, rArg21 );
+ lclAddToListOfScRange( aList, rArg22 );
+ lclAddToListOfScRange( aList, rArg23 );
+ lclAddToListOfScRange( aList, rArg24 );
+ lclAddToListOfScRange( aList, rArg25 );
+ lclAddToListOfScRange( aList, rArg26 );
+ lclAddToListOfScRange( aList, rArg27 );
+ lclAddToListOfScRange( aList, rArg28 );
+ lclAddToListOfScRange( aList, rArg29 );
+ lclAddToListOfScRange( aList, rArg30 );
+
+ // simply join together all ranges as much as possible, strip out covered ranges etc.
+ lclJoinRanges( aList );
+
+ // create the VBA Range object
+ return lclCreateVbaRange( mxContext, getCurrentDocument(), aList );
}
void
@@ -1218,14 +1090,14 @@ ScVbaApplication::Volatile( const uno::Any& aVolatile ) throw ( uno::RuntimeExc
{
sal_Bool bVolatile = sal_True;
aVolatile >>= bVolatile;
- return;
+ return;
}
void SAL_CALL
ScVbaApplication::DoEvents() throw ( uno::RuntimeException )
{
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaApplication::getDisplayFormulaBar() throw ( css::uno::RuntimeException )
{
sal_Bool bRes = sal_False;
@@ -1244,7 +1116,7 @@ ScVbaApplication::getDisplayFormulaBar() throw ( css::uno::RuntimeException )
return bRes;
}
-void SAL_CALL
+void SAL_CALL
ScVbaApplication::setDisplayFormulaBar( ::sal_Bool _displayformulabar ) throw ( css::uno::RuntimeException )
{
ScTabViewShell* pViewShell = excel::getCurrentBestViewShell( mxContext );
@@ -1254,16 +1126,16 @@ ScVbaApplication::setDisplayFormulaBar( ::sal_Bool _displayformulabar ) throw (
SfxAllItemSet reqList( SFX_APP()->GetPool() );
SfxRequest aReq( FID_TOGGLEINPUTLINE, 0, reqList );
pViewShell->Execute( aReq );
- }
+ }
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeException )
{
StarBASIC* pBasic = SFX_APP()->GetBasic();
SFX_APP()->EnterBasicCall();
SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FuncCaller") ), SbxCLASS_METHOD );
- uno::Any aRet;
+ uno::Any aRet;
if ( pMeth )
{
SbxVariableRef refTemp = pMeth;
@@ -1276,20 +1148,20 @@ ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeExcep
return aRet;
}
-uno::Reference< frame::XModel >
+uno::Reference< frame::XModel >
ScVbaApplication::getCurrentDocument() throw (css::uno::RuntimeException)
{
return getCurrentExcelDoc(mxContext);
}
-rtl::OUString&
+rtl::OUString&
ScVbaApplication::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaApplication") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaApplication::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx
index a7be5feb1d27..e6ebe28a8c10 100644
--- a/sc/source/ui/vba/vbaapplication.hxx
+++ b/sc/source/ui/vba/vbaapplication.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +47,10 @@ private:
sal_Bool m_bEnableEvents;
rtl::OUString getOfficePath( const rtl::OUString& sPath ) throw ( css::uno::RuntimeException );
-
+
protected:
virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException);
-
+
public:
ScVbaApplication( const css::uno::Reference< css::uno::XComponentContext >& m_xContext );
virtual ~ScVbaApplication();
@@ -74,7 +74,7 @@ public:
virtual ::rtl::OUString SAL_CALL getDefaultFilePath( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual ::rtl::OUString SAL_CALL LibraryPath( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual ::rtl::OUString SAL_CALL TemplatesPath( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-
+
virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL getDisplayAlerts() throw (css::uno::RuntimeException);
virtual void SAL_CALL setDisplayAlerts( sal_Bool displayAlerts ) throw (css::uno::RuntimeException);
@@ -93,7 +93,7 @@ public:
virtual css::uno::Any SAL_CALL Workbooks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL WorksheetFunction( ) throw (css::uno::RuntimeException);
- virtual css::uno::Any SAL_CALL Evaluate( const ::rtl::OUString& Name ) throw (css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL Evaluate( const ::rtl::OUString& Name ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& DialogIndex ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getCutCopyMode() throw (css::uno::RuntimeException);
virtual void SAL_CALL setCutCopyMode( const css::uno::Any& _cutcopymode ) throw (css::uno::RuntimeException);
diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx
index 51105d60b0d4..e2bb5f7aa26f 100644
--- a/sc/source/ui/vba/vbaassistant.cxx
+++ b/sc/source/ui/vba/vbaassistant.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,51 +75,51 @@ void SAL_CALL ScVbaAssistant::setOn( sal_Bool bOn ) throw (uno::RuntimeException
}
-::sal_Int32 SAL_CALL
+::sal_Int32 SAL_CALL
ScVbaAssistant::getTop() throw (css::uno::RuntimeException)
{
return m_nPointsTop;
}
-void SAL_CALL
+void SAL_CALL
ScVbaAssistant::setTop( ::sal_Int32 _top ) throw (css::uno::RuntimeException)
{
m_nPointsTop = _top;
}
-::sal_Int32 SAL_CALL
+::sal_Int32 SAL_CALL
ScVbaAssistant::getLeft() throw (css::uno::RuntimeException)
{
return m_nPointsLeft;
}
-void SAL_CALL
+void SAL_CALL
ScVbaAssistant::setLeft( ::sal_Int32 _left ) throw (css::uno::RuntimeException)
{
m_nPointsLeft = _left;
}
-::sal_Int32 SAL_CALL
+::sal_Int32 SAL_CALL
ScVbaAssistant::getAnimation() throw (css::uno::RuntimeException)
{
return m_nAnimation;
}
-void SAL_CALL
+void SAL_CALL
ScVbaAssistant::setAnimation( ::sal_Int32 _animation ) throw (css::uno::RuntimeException)
{
m_nAnimation = _animation;
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
ScVbaAssistant::Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
{
return m_sName;
}
-rtl::OUString&
+rtl::OUString&
ScVbaAssistant::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaAssistant") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaAssistant::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbaassistant.hxx b/sc/source/ui/vba/vbaassistant.hxx
index dbb95af4b689..e6707b7ccf28 100644
--- a/sc/source/ui/vba/vbaassistant.hxx
+++ b/sc/source/ui/vba/vbaassistant.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ private:
public:
ScVbaAssistant( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext );
virtual ~ScVbaAssistant();
- // XAssistant
+ // XAssistant
virtual sal_Bool SAL_CALL getOn() throw (css::uno::RuntimeException);
virtual void SAL_CALL setOn( sal_Bool _on ) throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx
index d563ba105108..43743e4926a9 100644
--- a/sc/source/ui/vba/vbaaxes.cxx
+++ b/sc/source/ui/vba/vbaaxes.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +41,7 @@ using namespace ::ooo::vba::excel::XlAxisGroup;
// each 'Item' in the Axes collection is indexed via 2 indexes, group and type.
// We need to 'flatten' this into a single index in order to be able to wrap
// iteration over the set of Axis(s) in a XIndexAccess implementation
-//
+//
typedef ::std::pair<sal_Int32, sal_Int32 > AxesCoordinate; // type and group combination
typedef ::std::vector< AxesCoordinate > vecAxesIndices;
@@ -70,7 +70,7 @@ public:
uno::Reference< excel::XAxis >
ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( uno::RuntimeException )
{
- ScVbaChart* pChart = static_cast< ScVbaChart* >( xChart.get() );
+ ScVbaChart* pChart = static_cast< ScVbaChart* >( xChart.get() );
if ( !pChart )
throw uno::RuntimeException( rtl::OUString::createFromAscii( "Object failure, can't access chart implementation" ), uno::Reference< uno::XInterface >() );
@@ -89,18 +89,18 @@ ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno:
class AxisIndexWrapper : public AxisIndexWrapper_BASE
{
- // if necessary for better performance we could change this into a map and cache the
+ // if necessary for better performance we could change this into a map and cache the
// indices -> Axis, currently we create a new Axis object
// on each getByIndex
uno::Reference< uno::XComponentContext > mxContext;
vecAxesIndices mCoordinates;
uno::Reference< excel::XChart > mxChart;
-public:
+public:
AxisIndexWrapper( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< excel::XChart >& xChart ) : mxContext( xContext ), mxChart( xChart )
{
if ( mxChart.is() )
{
- ScVbaChart* pChart = static_cast< ScVbaChart* >( mxChart.get() );
+ ScVbaChart* pChart = static_cast< ScVbaChart* >( mxChart.get() );
// primary
sal_Bool bBool = false;
uno::Reference< beans::XPropertySet > xDiagramPropertySet( pChart->xDiagramPropertySet() );
@@ -108,7 +108,7 @@ public:
mCoordinates.push_back( AxesCoordinate( xlPrimary, xlCategory ) );
if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasYAxis" ) ) ) >>= bBool ) && bBool )
mCoordinates.push_back( AxesCoordinate( xlPrimary, xlSeriesAxis ) );
-
+
if ( pChart->is3D() )
mCoordinates.push_back( AxesCoordinate( xlPrimary, xlValue ) );
@@ -118,7 +118,7 @@ public:
if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxis" ) ) ) >>= bBool ) && bBool )
mCoordinates.push_back( AxesCoordinate( xlSecondary, xlSeriesAxis ) );
}
-
+
}
virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException) { return mCoordinates.size(); }
virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, ::uno::RuntimeException)
@@ -147,19 +147,19 @@ ScVbaAxes::ScVbaAxes( const uno::Reference< XHelperInterface >& xParent,const un
{
}
-uno::Type SAL_CALL
+uno::Type SAL_CALL
ScVbaAxes::getElementType() throw (css::uno::RuntimeException)
{
- return excel::XAxes::static_type(0);
+ return excel::XAxes::static_type(0);
}
-uno::Reference< container::XEnumeration > SAL_CALL
+uno::Reference< container::XEnumeration > SAL_CALL
ScVbaAxes::createEnumeration() throw (css::uno::RuntimeException)
{
return new EnumWrapper( m_xIndexAccess );
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup) throw (css::uno::RuntimeException)
{
// #TODO map the possible index combinations to a container::XIndexAccess wrapper impl
@@ -176,20 +176,20 @@ ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup)
return uno::makeAny( createAxis( moChartParent, mxContext, nType, nAxisGroup ) );
}
-uno::Any
+uno::Any
ScVbaAxes::createCollectionObject(const css::uno::Any& aSource)
{
return aSource; // pass through ( it's already an XAxis object
}
-rtl::OUString&
+rtl::OUString&
ScVbaAxes::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaAxes") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaAxes::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbaaxes.hxx b/sc/source/ui/vba/vbaaxes.hxx
index 5b5f88e2b72f..11f266128676 100644
--- a/sc/source/ui/vba/vbaaxes.hxx
+++ b/sc/source/ui/vba/vbaaxes.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +39,7 @@ public:
ScVbaAxes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< ov::excel::XChart >& xChart );
// XEnumerationAccess
virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
- virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& aIndex2 ) throw (css::uno::RuntimeException);
virtual css::uno::Any createCollectionObject(const css::uno::Any&);
// XHelperInterface
diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx
index a9c91a4cea31..5ee7607627b3 100644
--- a/sc/source/ui/vba/vbaaxis.cxx
+++ b/sc/source/ui/vba/vbaaxis.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +41,7 @@ const rtl::OUString ORIGIN( RTL_CONSTASCII_USTRINGPARAM("Origin") );
const rtl::OUString AUTOORIGIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
const rtl::OUString VBA_MIN( RTL_CONSTASCII_USTRINGPARAM("Max") );
const rtl::OUString VBA_MAX( RTL_CONSTASCII_USTRINGPARAM("Min") );
-ScVbaChart*
+ScVbaChart*
ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
{
ScVbaChart* pChart = static_cast< ScVbaChart* >( moChartParent.get() );
@@ -50,7 +50,7 @@ ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
return pChart;
}
-sal_Bool
+sal_Bool
ScVbaAxis::isValueAxis() throw( script::BasicErrorException )
{
if ( getType() == xlCategory )
@@ -60,29 +60,29 @@ ScVbaAxis::isValueAxis() throw( script::BasicErrorException )
return sal_True;
}
-ScVbaAxis::ScVbaAxis( const uno::Reference< XHelperInterface >& xParent,const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, sal_Int32 _nType, sal_Int32 _nGroup ) : ScVbaAxis_BASE( xParent, xContext ), mxPropertySet( _xPropertySet ), mnType( _nType ), mnGroup( _nGroup ), bCrossesAreCustomized( sal_False )
+ScVbaAxis::ScVbaAxis( const uno::Reference< XHelperInterface >& xParent,const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, sal_Int32 _nType, sal_Int32 _nGroup ) : ScVbaAxis_BASE( xParent, xContext ), mxPropertySet( _xPropertySet ), mnType( _nType ), mnGroup( _nGroup ), bCrossesAreCustomized( sal_False )
{
oShapeHelper.reset( new ShapeHelper( uno::Reference< drawing::XShape >( mxPropertySet, uno::UNO_QUERY ) ) );
moChartParent.set( xParent, uno::UNO_QUERY_THROW );
setType(_nType);
- setCrosses(xlAxisCrossesAutomatic);
+ setCrosses(xlAxisCrossesAutomatic);
}
-void SAL_CALL
+void SAL_CALL
ScVbaAxis::Delete( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Reference< lang::XComponent > xComponent( mxPropertySet, uno::UNO_QUERY_THROW );
xComponent->dispose();
}
- uno::Reference< ::ooo::vba::excel::XAxisTitle > SAL_CALL
+ uno::Reference< ::ooo::vba::excel::XAxisTitle > SAL_CALL
ScVbaAxis::getAxisTitle( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Reference< excel::XAxisTitle > xAxisTitle;
try
{
ScVbaChart* pChart = getChartPtr();
-
+
if (getHasTitle() )
{
int nType = getType();
@@ -97,7 +97,7 @@ ScVbaAxis::getAxisTitle( ) throw (script::BasicErrorException, uno::RuntimeExce
default: // xlValue:
xAxisTitle = new ScVbaAxisTitle(this, mxContext, pChart->xAxisYSupplier->getYAxisTitle());
break;
- }
+ }
}
}
catch (uno::Exception& e)
@@ -108,20 +108,20 @@ ScVbaAxis::getAxisTitle( ) throw (script::BasicErrorException, uno::RuntimeExce
}
-void SAL_CALL
+void SAL_CALL
ScVbaAxis::setDisplayUnit( ::sal_Int32 /*DisplayUnit*/ ) throw (script::BasicErrorException, uno::RuntimeException)
{
DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString());
}
-::sal_Int32 SAL_CALL
+::sal_Int32 SAL_CALL
ScVbaAxis::getDisplayUnit( ) throw (script::BasicErrorException, uno::RuntimeException)
{
DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString());
return -1;
}
-void SAL_CALL
+void SAL_CALL
ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -129,16 +129,16 @@ ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) throw (script::BasicErrorExceptio
double fNum = 0.0;
switch (_nCrosses)
{
- case xlAxisCrossesAutomatic: //Microsoft Excel sets the axis crossing point.
+ case xlAxisCrossesAutomatic: //Microsoft Excel sets the axis crossing point.
mxPropertySet->setPropertyValue(AUTOORIGIN, uno::makeAny( sal_True ) );
bCrossesAreCustomized = sal_False;
return;
- case xlAxisCrossesMinimum: // The axis crosses at the minimum value.
+ case xlAxisCrossesMinimum: // The axis crosses at the minimum value.
mxPropertySet->getPropertyValue(VBA_MIN) >>= fNum;
setCrossesAt( fNum );
bCrossesAreCustomized = sal_False;
break;
- case xlAxisCrossesMaximum: // The axis crosses at the maximum value.
+ case xlAxisCrossesMaximum: // The axis crosses at the maximum value.
mxPropertySet->getPropertyValue(VBA_MAX) >>= fNum;
setCrossesAt(fNum);
bCrossesAreCustomized = sal_False;
@@ -147,14 +147,14 @@ ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) throw (script::BasicErrorExceptio
bCrossesAreCustomized = sal_True;
break;
}
- mxPropertySet->setPropertyValue(AUTOORIGIN, uno::makeAny(sal_False) );
+ mxPropertySet->setPropertyValue(AUTOORIGIN, uno::makeAny(sal_False) );
}
catch (uno::Exception& )
{
DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
}
}
-::sal_Int32 SAL_CALL
+::sal_Int32 SAL_CALL
ScVbaAxis::getCrosses( ) throw (script::BasicErrorException, uno::RuntimeException)
{
sal_Int32 nCrosses = xlAxisCrossesCustom;
@@ -167,7 +167,7 @@ ScVbaAxis::getCrosses( ) throw (script::BasicErrorException, uno::RuntimeExcept
else
{
if (bCrossesAreCustomized)
- nCrosses = xlAxisCrossesCustom;
+ nCrosses = xlAxisCrossesCustom;
else
{
double forigin = 0.0;
@@ -189,7 +189,7 @@ ScVbaAxis::getCrosses( ) throw (script::BasicErrorException, uno::RuntimeExcept
return nCrosses;
}
- void SAL_CALL
+ void SAL_CALL
ScVbaAxis::setCrossesAt( double _fCrossesAt ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -206,7 +206,7 @@ ScVbaAxis::setCrossesAt( double _fCrossesAt ) throw (script::BasicErrorException
}
}
- double SAL_CALL
+ double SAL_CALL
ScVbaAxis::getCrossesAt( ) throw (script::BasicErrorException, uno::RuntimeException)
{
double fCrosses = 0.0;
@@ -221,19 +221,19 @@ ScVbaAxis::getCrossesAt( ) throw (script::BasicErrorException, uno::RuntimeExce
return fCrosses;
}
-void SAL_CALL
+void SAL_CALL
ScVbaAxis::setType( ::sal_Int32 _nType ) throw (script::BasicErrorException, uno::RuntimeException)
{
mnType = _nType;
}
-::sal_Int32 SAL_CALL
+::sal_Int32 SAL_CALL
ScVbaAxis::getType( ) throw (script::BasicErrorException, uno::RuntimeException)
{
return mnType;
}
-void SAL_CALL
+void SAL_CALL
ScVbaAxis::setHasTitle( ::sal_Bool _bHasTitle ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -250,16 +250,16 @@ ScVbaAxis::setHasTitle( ::sal_Bool _bHasTitle ) throw (script::BasicErrorExcepti
break;
default: // xlValue:
pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasYAxisTitle")), uno::makeAny(_bHasTitle));
- }
+ }
}
catch (uno::Exception& e)
{
DebugHelper::exception(e);
- }
+ }
}
- ::sal_Bool SAL_CALL
+ ::sal_Bool SAL_CALL
ScVbaAxis::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeException)
{
sal_Bool bHasTitle = sal_False;
@@ -277,7 +277,7 @@ ScVbaAxis::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExcep
break;
default: // xlValue:
pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HasYAxisTitle")) ) >>= bHasTitle;
- }
+ }
}
catch (uno::Exception& e)
{
@@ -286,13 +286,13 @@ ScVbaAxis::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExcep
return bHasTitle;
}
-void SAL_CALL
+void SAL_CALL
ScVbaAxis::setMinorUnit( double _fMinorUnit ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
{
if (isValueAxis())
- mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepHelp") ), uno::makeAny(_fMinorUnit));
+ mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepHelp") ), uno::makeAny(_fMinorUnit));
}
catch (uno::Exception& )
{
@@ -300,7 +300,7 @@ ScVbaAxis::setMinorUnit( double _fMinorUnit ) throw (script::BasicErrorException
}
}
-double SAL_CALL
+double SAL_CALL
ScVbaAxis::getMinorUnit( ) throw (script::BasicErrorException, uno::RuntimeException)
{
double fMinor = 1.0;
@@ -316,7 +316,7 @@ ScVbaAxis::getMinorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce
return fMinor;
}
-void SAL_CALL
+void SAL_CALL
ScVbaAxis::setMinorUnitIsAuto( ::sal_Bool _bMinorUnitIsAuto ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -330,7 +330,7 @@ ScVbaAxis::setMinorUnitIsAuto( ::sal_Bool _bMinorUnitIsAuto ) throw (script::Bas
}
}
- ::sal_Bool SAL_CALL
+ ::sal_Bool SAL_CALL
ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::RuntimeException)
{
sal_Bool bIsAuto = sal_False;
@@ -348,27 +348,27 @@ ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti
return bIsAuto;
}
-void SAL_CALL
+void SAL_CALL
ScVbaAxis::setReversePlotOrder( ::sal_Bool /*ReversePlotOrder*/ ) throw (script::BasicErrorException, uno::RuntimeException)
{
DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString());
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaAxis::getReversePlotOrder( ) throw (script::BasicErrorException, uno::RuntimeException)
{
DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString());
return sal_False;
}
-void SAL_CALL
+void SAL_CALL
ScVbaAxis::setMajorUnit( double _fMajorUnit ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
{
if (isValueAxis())
{
- mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepMain")), uno::makeAny(_fMajorUnit));
+ mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StepMain")), uno::makeAny(_fMajorUnit));
}
}
catch (uno::Exception& )
@@ -377,7 +377,7 @@ ScVbaAxis::setMajorUnit( double _fMajorUnit ) throw (script::BasicErrorException
}
}
-double SAL_CALL
+double SAL_CALL
ScVbaAxis::getMajorUnit( ) throw (script::BasicErrorException, uno::RuntimeException)
{
double fMax = 1.0;
@@ -393,7 +393,7 @@ ScVbaAxis::getMajorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce
return fMax;
}
-void SAL_CALL
+void SAL_CALL
ScVbaAxis::setMajorUnitIsAuto( ::sal_Bool _bMajorUnitIsAuto ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -409,7 +409,7 @@ ScVbaAxis::setMajorUnitIsAuto( ::sal_Bool _bMajorUnitIsAuto ) throw (script::Bas
}
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaAxis::getMajorUnitIsAuto( ) throw (script::BasicErrorException, uno::RuntimeException)
{
sal_Bool bIsAuto = sal_False;
@@ -427,14 +427,14 @@ ScVbaAxis::getMajorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti
return bIsAuto;
}
-void SAL_CALL
+void SAL_CALL
ScVbaAxis::setMaximumScale( double _fMaximumScale ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
{
if ( isValueAxis() )
{
- mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Max" ) ), uno::makeAny(_fMaximumScale));
+ mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Max" ) ), uno::makeAny(_fMaximumScale));
}
}
catch ( uno::Exception& )
@@ -443,7 +443,7 @@ ScVbaAxis::setMaximumScale( double _fMaximumScale ) throw (script::BasicErrorExc
}
}
-double SAL_CALL
+double SAL_CALL
ScVbaAxis::getMaximumScale( ) throw (script::BasicErrorException, uno::RuntimeException)
{
double fMax = 1.0;
@@ -451,7 +451,7 @@ ScVbaAxis::getMaximumScale( ) throw (script::BasicErrorException, uno::RuntimeE
{
if (isValueAxis())
{
- mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Max" ))) >>= fMax;
+ mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Max" ))) >>= fMax;
}
}
catch (uno::Exception& )
@@ -462,23 +462,23 @@ ScVbaAxis::getMaximumScale( ) throw (script::BasicErrorException, uno::RuntimeE
}
-void SAL_CALL
+void SAL_CALL
ScVbaAxis::setMaximumScaleIsAuto( ::sal_Bool _bMaximumScaleIsAuto ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
{
if ( isValueAxis() )
mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoMax" ) ), uno::makeAny( _bMaximumScaleIsAuto ));
-
+
}
catch ( uno::Exception& )
{
DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
- }
+ }
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaAxis::getMaximumScaleIsAuto( ) throw (script::BasicErrorException, uno::RuntimeException)
{
sal_Bool bIsAuto = sal_False;
@@ -494,7 +494,7 @@ ScVbaAxis::getMaximumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru
return bIsAuto;
}
-void SAL_CALL
+void SAL_CALL
ScVbaAxis::setMinimumScale( double _fMinimumScale ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -508,7 +508,7 @@ ScVbaAxis::setMinimumScale( double _fMinimumScale ) throw (script::BasicErrorExc
}
}
-double SAL_CALL
+double SAL_CALL
ScVbaAxis::getMinimumScale( ) throw (script::BasicErrorException, uno::RuntimeException)
{
double fMin = 0.0;
@@ -524,7 +524,7 @@ ScVbaAxis::getMinimumScale( ) throw (script::BasicErrorException, uno::RuntimeE
return fMin;
}
-void SAL_CALL
+void SAL_CALL
ScVbaAxis::setMinimumScaleIsAuto( ::sal_Bool _bMinimumScaleIsAuto ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -540,7 +540,7 @@ ScVbaAxis::setMinimumScaleIsAuto( ::sal_Bool _bMinimumScaleIsAuto ) throw (scrip
}
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaAxis::getMinimumScaleIsAuto( ) throw (script::BasicErrorException, uno::RuntimeException)
{
sal_Bool bIsAuto = sal_False;
@@ -548,7 +548,7 @@ ScVbaAxis::getMinimumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru
{
if (isValueAxis())
{
- mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoMin")) ) >>= bIsAuto;
+ mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoMin")) ) >>= bIsAuto;
}
}
catch (uno::Exception& )
@@ -558,13 +558,13 @@ ScVbaAxis::getMinimumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru
return bIsAuto;
}
-::sal_Int32 SAL_CALL
+::sal_Int32 SAL_CALL
ScVbaAxis::getAxisGroup( ) throw (uno::RuntimeException)
{
return mnGroup;
}
-void SAL_CALL
+void SAL_CALL
ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -591,10 +591,10 @@ ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorExce
}
}
-::sal_Int32 SAL_CALL
+::sal_Int32 SAL_CALL
ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeException)
{
- sal_Int32 nScaleType = xlScaleLinear;
+ sal_Int32 nScaleType = xlScaleLinear;
try
{
if (isValueAxis())
@@ -604,7 +604,7 @@ ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeExce
if (bisLogarithmic)
nScaleType = xlScaleLogarithmic;
else
- nScaleType = xlScaleLinear;
+ nScaleType = xlScaleLinear;
}
}
catch (uno::Exception& )
@@ -614,7 +614,7 @@ ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeExce
return nScaleType;
}
-double SAL_CALL
+double SAL_CALL
ScVbaAxis::getHeight( ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
{
return oShapeHelper->getHeight();
@@ -649,14 +649,14 @@ void SAL_CALL ScVbaAxis::setLeft( double left ) throw (css::script::BasicErrorEx
oShapeHelper->setLeft( left );
}
-rtl::OUString&
+rtl::OUString&
ScVbaAxis::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaAxis") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaAxis::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx
index 13432b231a27..7638bdc45e5a 100644
--- a/sc/source/ui/vba/vbaaxis.hxx
+++ b/sc/source/ui/vba/vbaaxis.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +40,11 @@ class ScVbaAxis : public ScVbaAxis_BASE
sal_Int32 mnType;
sal_Int32 mnGroup;
sal_Int32 mnCrosses;
- sal_Bool bCrossesAreCustomized;
+ sal_Bool bCrossesAreCustomized;
ScVbaChart* getChartPtr() throw( css::uno::RuntimeException );
sal_Bool isValueAxis() throw( css::script::BasicErrorException );
std::auto_ptr<ov::ShapeHelper> oShapeHelper;
-
+
public:
ScVbaAxis( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, sal_Int32 _nType, sal_Int32 _nGroup );
// Methods
diff --git a/sc/source/ui/vba/vbaaxistitle.cxx b/sc/source/ui/vba/vbaaxistitle.cxx
index 89b12b6e2870..2184956d876f 100644
--- a/sc/source/ui/vba/vbaaxistitle.cxx
+++ b/sc/source/ui/vba/vbaaxistitle.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScVbaAxisTitle::getServiceImplName()
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaAxisTitle::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbaaxistitle.hxx b/sc/source/ui/vba/vbaaxistitle.hxx
index 59ba71d99a87..e53a6daeb3f2 100644
--- a/sc/source/ui/vba/vbaaxistitle.hxx
+++ b/sc/source/ui/vba/vbaaxistitle.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx
index 5424da041f84..5ecdc5f64880 100644
--- a/sc/source/ui/vba/vbaborders.cxx
+++ b/sc/source/ui/vba/vbaborders.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ class ScVbaBorder : public ScVbaBorder_Base
{
private:
uno::Reference< beans::XPropertySet > m_xProps;
- sal_Int32 m_LineType;
+ sal_Int32 m_LineType;
ScVbaPalette m_Palette;
bool setBorderLine( table::BorderLine& rBorderLine )
{
@@ -78,7 +78,7 @@ private:
aTableBorder.IsTopLineValid = sal_True;
aTableBorder.TopLine = rBorderLine;
break;
-
+
case XlBordersIndex::xlEdgeBottom:
aTableBorder.IsBottomLineValid = sal_True;
aTableBorder.BottomLine = rBorderLine;
@@ -99,13 +99,13 @@ private:
case XlBordersIndex::xlDiagonalUp:
// #TODO have to ignore at the momement, would be
// nice to investigate what we can do here
- break;
+ break;
default:
return false;
}
m_xProps->setPropertyValue( sTableBorder, uno::makeAny(aTableBorder) );
return true;
- }
+ }
bool getBorderLine( table::BorderLine& rBorderLine )
{
@@ -121,7 +121,7 @@ private:
if ( aTableBorder.IsTopLineValid )
rBorderLine = aTableBorder.TopLine;
break;
-
+
case XlBordersIndex::xlEdgeBottom:
if ( aTableBorder.IsBottomLineValid )
rBorderLine = aTableBorder.BottomLine;
@@ -143,18 +143,18 @@ private:
case XlBordersIndex::xlDiagonalUp:
// #TODO have to ignore at the momement, would be
// nice to investigate what we can do here
- break;
+ break;
default:
return false;
}
return true;
- }
+ }
ScVbaBorder(); // no impl
-protected:
+protected:
virtual rtl::OUString& getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaBorder") );
- return sImplName;
+ return sImplName;
}
virtual css::uno::Sequence<rtl::OUString> getServiceNames()
{
@@ -164,17 +164,17 @@ protected:
aServiceNames.realloc( 1 );
aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Border" ) );
}
- return aServiceNames;
+ return aServiceNames;
}
public:
- ScVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType, ScVbaPalette& rPalette) : ScVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ), m_Palette( rPalette ) {}
+ ScVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType, ScVbaPalette& rPalette) : ScVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ), m_Palette( rPalette ) {}
// XBorder
uno::Any SAL_CALL getColor() throw (uno::RuntimeException)
{
table::BorderLine aBorderLine;
if ( getBorderLine( aBorderLine ) )
- return uno::makeAny( OORGBToXLRGB( aBorderLine.Color ) );
+ return uno::makeAny( OORGBToXLRGB( aBorderLine.Color ) );
throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No Implementation available" ) ), uno::Reference< uno::XInterface >() );
}
void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException)
@@ -185,7 +185,7 @@ public:
if ( getBorderLine( aBorderLine ) )
{
aBorderLine.Color = XLRGBToOORGB( nColor );
- setBorderLine( aBorderLine );
+ setBorderLine( aBorderLine );
}
else
throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No Implementation available" ) ), uno::Reference< uno::XInterface >() );
@@ -203,7 +203,7 @@ public:
sal_Int32 nPaletteColor = 0;
xIndex->getByIndex( count ) >>= nPaletteColor;
if ( nPaletteColor == nColor )
- {
+ {
nIndex = count + 1;
break;
}
@@ -226,16 +226,16 @@ public:
{
switch ( aBorderLine.OuterLineWidth )
{
- case 0: // Thin = default OO thickness
- case OOLineThin:
+ case 0: // Thin = default OO thickness
+ case OOLineThin:
return uno::makeAny( XlBorderWeight::xlThin );
- case OOLineMedium:
+ case OOLineMedium:
return uno::makeAny( XlBorderWeight::xlMedium );
- case OOLineThick:
+ case OOLineThick:
return uno::makeAny( XlBorderWeight::xlThick );
- case OOLineHairline:
+ case OOLineHairline:
return uno::makeAny( XlBorderWeight::xlHairline );
- default:
+ default:
break;
}
}
@@ -250,7 +250,7 @@ public:
{
switch ( nWeight )
{
- case XlBorderWeight::xlThin:
+ case XlBorderWeight::xlThin:
aBorderLine.OuterLineWidth = OOLineThin;
break;
case XlBorderWeight::xlMedium:
@@ -262,7 +262,7 @@ public:
case XlBorderWeight::xlHairline:
aBorderLine.OuterLineWidth = OOLineHairline;
break;
- default:
+ default:
throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Bad param" ) ), uno::Reference< uno::XInterface >() );
}
setBorderLine( aBorderLine );
@@ -276,7 +276,7 @@ public:
// always return xlContinuous;
return uno::makeAny( XlLineStyle::xlContinuous );
}
- void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException)
+ void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException)
{
// Urk no choice but to silently ignore we don't support this attribute
// #TODO would be nice to support the excel line styles
@@ -329,14 +329,14 @@ public:
RangeBorders( const uno::Reference< table::XCellRange >& xRange, const uno::Reference< uno::XComponentContext > & xContext, ScVbaPalette& rPalette ) : m_xRange( xRange ), m_xContext( xContext ), m_Palette( rPalette )
{
}
- // XIndexAccess
+ // XIndexAccess
virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException)
{
return sizeof( supportedIndexTable ) / sizeof( supportedIndexTable[0] );
}
- virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
+ virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
{
-
+
sal_Int32 nIndex = getTableIndex( Index );
if ( nIndex >= 0 && nIndex < getCount() )
{
@@ -355,7 +355,7 @@ public:
}
};
-uno::Reference< container::XIndexAccess >
+uno::Reference< container::XIndexAccess >
rangeToBorderIndexAccess( const uno::Reference< table::XCellRange >& xRange, const uno::Reference< uno::XComponentContext > & xContext, ScVbaPalette& rPalette )
{
return new RangeBorders( xRange, xContext, rPalette );
@@ -380,11 +380,11 @@ public:
}
};
-ScVbaBorders::ScVbaBorders( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< table::XCellRange >& xRange, ScVbaPalette& rPalette ): ScVbaBorders_BASE( xParent, xContext, rangeToBorderIndexAccess( xRange ,xContext, rPalette ) ), bRangeIsSingleCell( false )
+ScVbaBorders::ScVbaBorders( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< table::XCellRange >& xRange, ScVbaPalette& rPalette ): ScVbaBorders_BASE( xParent, xContext, rangeToBorderIndexAccess( xRange ,xContext, rPalette ) ), bRangeIsSingleCell( false )
{
uno::Reference< table::XColumnRowRange > xColumnRowRange(xRange, uno::UNO_QUERY_THROW );
- if ( xColumnRowRange->getRows()->getCount() == 1 && xColumnRowRange->getColumns()->getCount() == 1 )
- bRangeIsSingleCell = true;
+ if ( xColumnRowRange->getRows()->getCount() == 1 && xColumnRowRange->getColumns()->getCount() == 1 )
+ bRangeIsSingleCell = true;
m_xProps.set( xRange, uno::UNO_QUERY_THROW );
}
@@ -400,7 +400,7 @@ ScVbaBorders::createCollectionObject( const css::uno::Any& aSource )
return aSource; // its already a Border object
}
-uno::Type
+uno::Type
ScVbaBorders::getElementType() throw (uno::RuntimeException)
{
return excel::XBorders::static_type(0);
@@ -475,20 +475,20 @@ void SAL_CALL ScVbaBorders::setColorIndex( const uno::Any& _colorindex ) throw (
bool
lcl_areAllLineWidthsSame( const table::TableBorder& maTableBorder, bool bIsCell )
{
-
+
bool bRes = false;
- if (bIsCell)
+ if (bIsCell)
{
- bRes = ((maTableBorder.TopLine.OuterLineWidth == maTableBorder.BottomLine.OuterLineWidth) &&
+ bRes = ((maTableBorder.TopLine.OuterLineWidth == maTableBorder.BottomLine.OuterLineWidth) &&
(maTableBorder.TopLine.OuterLineWidth == maTableBorder.LeftLine.OuterLineWidth) &&
(maTableBorder.TopLine.OuterLineWidth == maTableBorder.RightLine.OuterLineWidth));
}
else
{
- bRes = ((maTableBorder.TopLine.OuterLineWidth == maTableBorder.BottomLine.OuterLineWidth) &&
-(maTableBorder.TopLine.OuterLineWidth == maTableBorder.LeftLine.OuterLineWidth) &&
-(maTableBorder.TopLine.OuterLineWidth == maTableBorder.HorizontalLine.OuterLineWidth) &&
-(maTableBorder.TopLine.OuterLineWidth == maTableBorder.VerticalLine.OuterLineWidth) &&
+ bRes = ((maTableBorder.TopLine.OuterLineWidth == maTableBorder.BottomLine.OuterLineWidth) &&
+(maTableBorder.TopLine.OuterLineWidth == maTableBorder.LeftLine.OuterLineWidth) &&
+(maTableBorder.TopLine.OuterLineWidth == maTableBorder.HorizontalLine.OuterLineWidth) &&
+(maTableBorder.TopLine.OuterLineWidth == maTableBorder.VerticalLine.OuterLineWidth) &&
(maTableBorder.TopLine.OuterLineWidth == maTableBorder.RightLine.OuterLineWidth));
}
return bRes;
@@ -503,14 +503,14 @@ uno::Any SAL_CALL ScVbaBorders::getLineStyle() throw (uno::RuntimeException)
if ( lcl_areAllLineWidthsSame( maTableBorder, bRangeIsSingleCell ))
{
- if (maTableBorder.TopLine.LineDistance != 0)
+ if (maTableBorder.TopLine.LineDistance != 0)
{
aLinestyle = XlLineStyle::xlDouble;
- }
+ }
else if ( maTableBorder.TopLine.OuterLineWidth != 0 )
{
aLinestyle = XlLineStyle::xlContinuous;
- }
+ }
}
return uno::makeAny( aLinestyle );
}
@@ -543,7 +543,7 @@ uno::Any SAL_CALL ScVbaBorders::getWeight() throw (uno::RuntimeException)
}
return weight;
}
-void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::RuntimeException)
+void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::RuntimeException)
{
sal_Int32 count = getCount();
for( sal_Int32 i = 0; i < count ; i++ )
@@ -554,14 +554,14 @@ void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::Run
}
-rtl::OUString&
+rtl::OUString&
ScVbaBorders::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaBorders") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaBorders::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxx
index a385ad2e7a14..d8308f44d347 100644
--- a/sc/source/ui/vba/vbaborders.hxx
+++ b/sc/source/ui/vba/vbaborders.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-
+
#include <vbahelper/vbacollectionimpl.hxx>
typedef CollTestImplHelper< ov::excel::XBorders > ScVbaBorders_BASE;
@@ -56,9 +56,9 @@ public:
// XBorders
- // ScVbaCollectionBaseImpl
- virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
-
+ // ScVbaCollectionBaseImpl
+ virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+
virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException);
virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException);
@@ -67,7 +67,7 @@ public:
virtual void SAL_CALL setLineStyle( const css::uno::Any& _linestyle ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getWeight() throw (css::uno::RuntimeException);
virtual void SAL_CALL setWeight( const css::uno::Any& ) throw (css::uno::RuntimeException);
- // xxxxBASE
+ // xxxxBASE
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx
index 6c0079ac7a82..3786598a1800 100644
--- a/sc/source/ui/vba/vbacharacters.cxx
+++ b/sc/source/ui/vba/vbacharacters.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +39,7 @@ ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xPar
if ( nStart < 1 )
nStart = 1; // silently correct user error ( as ms )
nStart--; // OOo is 0 based
- Length >>=nLength;
+ Length >>=nLength;
uno::Reference< text::XTextCursor > xTextCursor( m_xSimpleText->createTextCursor(), uno::UNO_QUERY_THROW );
xTextCursor->collapseToStart();
if ( nStart )
@@ -57,41 +57,41 @@ ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xPar
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
ScVbaCharacters::getCaption() throw (css::uno::RuntimeException)
{
return m_xTextRange->getString();
}
-void SAL_CALL
+void SAL_CALL
ScVbaCharacters::setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException)
{
m_xTextRange->setString( _caption );
}
-::sal_Int32 SAL_CALL
+::sal_Int32 SAL_CALL
ScVbaCharacters::getCount() throw (css::uno::RuntimeException)
{
- return getCaption().getLength();
+ return getCaption().getLength();
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
ScVbaCharacters::getText() throw (css::uno::RuntimeException)
{
return getCaption();
}
-void SAL_CALL
+void SAL_CALL
ScVbaCharacters::setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException)
{
setCaption( _text );
}
-uno::Reference< excel::XFont > SAL_CALL
-ScVbaCharacters::getFont() throw (css::uno::RuntimeException)
+uno::Reference< excel::XFont > SAL_CALL
+ScVbaCharacters::getFont() throw (css::uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( m_xTextRange, uno::UNO_QUERY_THROW );
return uno::Reference< excel::XFont >( new ScVbaFont( this, mxContext, m_aPalette, xProps ) );
}
-void SAL_CALL
+void SAL_CALL
ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) throw (css::uno::RuntimeException)
{
// #TODO #FIXME needs implementation, or can't be done?
@@ -100,29 +100,29 @@ ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) thro
// Methods
-void SAL_CALL
+void SAL_CALL
ScVbaCharacters::Insert( const ::rtl::OUString& String ) throw (css::uno::RuntimeException)
{
m_xSimpleText->insertString( m_xTextRange, String, bReplace );
}
-void SAL_CALL
+void SAL_CALL
ScVbaCharacters::Delete( ) throw (css::uno::RuntimeException)
{
- // #FIXME #TODO is this a bit suspect?, I wonder should the contents
+ // #FIXME #TODO is this a bit suspect?, I wonder should the contents
// of the cell be deleted from the parent ( range )
- m_xSimpleText->setString(rtl::OUString());
+ m_xSimpleText->setString(rtl::OUString());
}
-rtl::OUString&
+rtl::OUString&
ScVbaCharacters::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCharacters") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaCharacters::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx
index 3400ff159d5e..0bc1931229e9 100644
--- a/sc/source/ui/vba/vbacharacters.hxx
+++ b/sc/source/ui/vba/vbacharacters.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx
index e2f446f93f2b..3824d53dc350 100644
--- a/sc/source/ui/vba/vbachart.cxx
+++ b/sc/source/ui/vba/vbachart.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScVbaChart::ScVbaChart( const css::uno::Reference< ov::XHelperInterface >& _xPar
mxChartPropertySet.set( _xChartComponent, uno::UNO_QUERY_THROW ) ;
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
ScVbaChart::getName() throw (css::uno::RuntimeException)
{
rtl::OUString sName;
@@ -107,7 +107,7 @@ ScVbaChart::SeriesCollection(const uno::Any&) throw (uno::RuntimeException)
return uno::Any();
}
-::sal_Int32 SAL_CALL
+::sal_Int32 SAL_CALL
ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorException)
{
sal_Int32 nChartType = -1;
@@ -135,7 +135,7 @@ ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorExce
else if (sDiagramType.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.BarDiagram"))))
{
sal_Int32 nSolidType = chart::ChartSolidType::RECTANGULAR_SOLID;
- if (mxDiagramPropertySet->getPropertySetInfo()->hasPropertyByName(SOLIDTYPE))
+ if (mxDiagramPropertySet->getPropertySetInfo()->hasPropertyByName(SOLIDTYPE))
{ //in 2D diagrams 'SolidType' may not be set
if (is3D())
mxDiagramPropertySet->getPropertyValue(SOLIDTYPE) >>= nSolidType;
@@ -226,7 +226,7 @@ ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorExce
return nChartType;
}
-void SAL_CALL
+void SAL_CALL
ScVbaChart::setChartType( ::sal_Int32 _nChartType ) throw ( uno::RuntimeException, script::BasicErrorException)
{
try
@@ -302,7 +302,7 @@ try
mxDiagramPropertySet->setPropertyValue( UPDOWN, uno::makeAny(sal_Bool((_nChartType == xlStockOHLC) || (_nChartType == xlStockVOHLC))));
mxDiagramPropertySet->setPropertyValue(VOLUME, uno::makeAny(sal_Bool((_nChartType == xlStockVHLC) || (_nChartType == xlStockVOHLC))));
break;
-
+
case xlPieOfPie: // not possible
case xlPieExploded: // SegmentOffset an ChartDataPointProperties ->am XDiagram abholen //wie macht Excel das?
case xl3DPieExploded:
@@ -311,7 +311,7 @@ try
case xlBarOfPie: // not possible (Zoom pie)
setDiagram( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.PieDiagram")));
break;
-
+
case xlRadar:
case xlRadarMarkers:
case xlRadarFilled:
@@ -347,8 +347,8 @@ try
default:
throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_CONVERSION, rtl::OUString() );
}
-
- switch (_nChartType)
+
+ switch (_nChartType)
{
case xlLineMarkers:
case xlLineMarkersStacked:
@@ -458,7 +458,7 @@ try
}
break;
}
-
+
switch (_nChartType)
{
case xlColumnStacked:
@@ -500,7 +500,7 @@ try
mxDiagramPropertySet->setPropertyValue(STACKED, uno::makeAny( sal_False));
break;
}
- switch (_nChartType)
+ switch (_nChartType)
{
case xl3DArea:
case xl3DAreaStacked:
@@ -567,7 +567,7 @@ ScVbaChart::Activate() throw (script::BasicErrorException, uno::RuntimeException
throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no ChartObject as parent" ) ) );
}
-void SAL_CALL
+void SAL_CALL
ScVbaChart::setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange >& _xCalcRange, const css::uno::Any& _aPlotBy ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
{
try
@@ -635,7 +635,7 @@ ScVbaChart::setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange
}
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaChart::getDefaultSeriesDescriptions( sal_Int32 _nCount )
{
uno::Sequence< rtl::OUString > sDescriptions ( _nCount );
@@ -675,10 +675,10 @@ ScVbaChart::setPlotBy( ::sal_Int32 _nPlotBy ) throw (css::script::BasicErrorExce
catch (uno::Exception& )
{
throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
- }
+ }
}
-::sal_Int32 SAL_CALL
+::sal_Int32 SAL_CALL
ScVbaChart::getPlotBy( ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -697,7 +697,7 @@ ScVbaChart::getPlotBy( ) throw (script::BasicErrorException, uno::RuntimeExcept
catch (uno::Exception& )
{
throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
- }
+ }
}
void
@@ -718,23 +718,23 @@ ScVbaChart::setDiagram( const rtl::OUString& _sDiagramType ) throw( script::Basi
// #TODO find out why we have Location/getLocation ? there is afaiks no
// Location property, just a Location function for the Chart object
-sal_Int32 SAL_CALL
+sal_Int32 SAL_CALL
ScVbaChart::Location() throw (css::script::BasicErrorException, css::uno::RuntimeException)
{
- return getLocation();
+ return getLocation();
}
-sal_Int32 SAL_CALL
+sal_Int32 SAL_CALL
ScVbaChart::getLocation() throw (css::script::BasicErrorException, css::uno::RuntimeException)
{
return -1;
}
-void SAL_CALL
+void SAL_CALL
ScVbaChart::setLocation( ::sal_Int32 /*where*/, const css::uno::Any& /*Name*/ ) throw (script::BasicErrorException, uno::RuntimeException)
{
// Helper api just stubs out the code <shrug>
- // #TODO come back and make sense out of this
+ // #TODO come back and make sense out of this
// String sheetName = null;
//
// if ((name != null) && name instanceof String) {
@@ -818,7 +818,7 @@ ScVbaChart::setLocation( ::sal_Int32 /*where*/, const css::uno::Any& /*Name*/ )
}
-sal_Bool SAL_CALL
+sal_Bool SAL_CALL
ScVbaChart::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeException)
{
sal_Bool bHasTitle = sal_False;
@@ -833,7 +833,7 @@ ScVbaChart::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExce
return bHasTitle;
}
-void SAL_CALL
+void SAL_CALL
ScVbaChart::setHasTitle( ::sal_Bool bTitle ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -844,10 +844,10 @@ ScVbaChart::setHasTitle( ::sal_Bool bTitle ) throw (script::BasicErrorException,
{
throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
}
-
+
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaChart::getHasLegend( ) throw (script::BasicErrorException, uno::RuntimeException)
{
sal_Bool bHasLegend = sal_False;
@@ -862,7 +862,7 @@ ScVbaChart::getHasLegend( ) throw (script::BasicErrorException, uno::RuntimeExc
return bHasLegend;
}
-void SAL_CALL
+void SAL_CALL
ScVbaChart::setHasLegend( ::sal_Bool bLegend ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -875,15 +875,15 @@ ScVbaChart::setHasLegend( ::sal_Bool bLegend ) throw (script::BasicErrorExceptio
}
}
-uno::Reference< excel::XChartTitle > SAL_CALL
+uno::Reference< excel::XChartTitle > SAL_CALL
ScVbaChart::getChartTitle( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Reference< drawing::XShape > xTitleShape = mxChartDocument->getTitle();
// #TODO check parent
- return new ScVbaChartTitle(this, mxContext, xTitleShape);
+ return new ScVbaChartTitle(this, mxContext, xTitleShape);
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaChart::Axes( const uno::Any& Type, const uno::Any& AxisGroup ) throw (script::BasicErrorException, uno::RuntimeException)
{
// mmm chart probably is the parent, #TODO check parent
@@ -899,7 +899,7 @@ ScVbaChart::is3D() throw ( uno::RuntimeException )
sal_Bool is3d = sal_False;
mxDiagramPropertySet->getPropertyValue(DIM3D) >>= is3d;
return is3d;
-}
+}
sal_Int32
ScVbaChart::getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked, sal_Int32 _nUnStacked ) throw ( uno::RuntimeException )
@@ -934,7 +934,7 @@ ScVbaChart::is100PercentStacked() throw ( uno::RuntimeException )
return b100Percent;
}
-sal_Int32
+sal_Int32
ScVbaChart::getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _nVerti100PercentStacked, sal_Int32 _nVertiUnStacked, sal_Int32 _nHoriStacked, sal_Int32 _nHori100PercentStacked, sal_Int32 _nHoriUnStacked) throw ( script::BasicErrorException )
{
sal_Bool bIsVertical = true;
@@ -967,7 +967,7 @@ ScVbaChart::getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _
}
-sal_Int32
+sal_Int32
ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw (script::BasicErrorException)
{
sal_Bool bUpDown = sal_False;
@@ -986,12 +986,12 @@ ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw
catch (uno::Exception& )
{
rtl::OUString aTemp; // temporary needed for g++ 3.3.5
- script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
+ script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
}
return _nNotUpDown;
}
-bool
+bool
ScVbaChart::hasMarkers() throw ( script::BasicErrorException )
{
bool bHasMarkers = false;
@@ -1004,12 +1004,12 @@ ScVbaChart::hasMarkers() throw ( script::BasicErrorException )
catch ( uno::Exception& )
{
rtl::OUString aTemp; // temporary needed for g++ 3.3.5
- script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
+ script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
}
return bHasMarkers;
}
-sal_Int32
+sal_Int32
ScVbaChart::getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers) throw ( script::BasicErrorException )
{
if (hasMarkers())
@@ -1017,7 +1017,7 @@ ScVbaChart::getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers) t
return _nWithoutMarkers;
}
-void
+void
ScVbaChart::assignDiagramAttributes()
{
xAxisXSupplier.set( mxDiagramPropertySet, uno::UNO_QUERY_THROW );
@@ -1049,8 +1049,8 @@ ScVbaChart::isSeriesIndexValid(sal_Int32 _seriesindex) throw( script::BasicError
bret = true;
}
}
- }
- catch (uno::Exception& )
+ }
+ catch (uno::Exception& )
{
throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
}
@@ -1093,9 +1093,9 @@ ScVbaChart::setSeriesName(sal_Int32 _index, rtl::OUString _sname) throw ( script
}
}
-sal_Int32
+sal_Int32
ScVbaChart::getSeriesCount() throw ( script::BasicErrorException )
-{
+{
uno::Reference< chart::XChartDataArray > xChartDataArray( mxChartDocument->getData(), uno::UNO_QUERY_THROW );
if (getPlotBy() == xlRows)
@@ -1118,10 +1118,10 @@ ScVbaChart::getSeriesName(sal_Int32 _index) throw ( script::BasicErrorException
sDescriptions = xChartDataArray->getColumnDescriptions();
sName = sDescriptions[_index];
}
- return sName;
+ return sName;
}
-double
+double
ScVbaChart::getValue(sal_Int32 _seriesindex, sal_Int32 _valindex) throw ( script::BasicErrorException )
{
double result = -1.0;
@@ -1135,7 +1135,7 @@ ScVbaChart::getValue(sal_Int32 _seriesindex, sal_Int32 _valindex) throw ( script
return result;
}
-sal_Int32
+sal_Int32
ScVbaChart::getValuesCount(sal_Int32 _seriesIndex) throw ( script::BasicErrorException )
{
sal_Int32 nCount = 0;
@@ -1148,11 +1148,11 @@ ScVbaChart::getValuesCount(sal_Int32 _seriesIndex) throw ( script::BasicErrorExc
else
nCount = dblValues.getLength();
}
- return nCount;
+ return nCount;
}
-uno::Reference< excel::XDataLabels >
+uno::Reference< excel::XDataLabels >
ScVbaChart::DataLabels( const uno::Reference< ov::excel::XSeries > /*_oSeries*/ ) throw ( css::script::BasicErrorException )
{
if ( true )
@@ -1161,7 +1161,7 @@ ScVbaChart::DataLabels( const uno::Reference< ov::excel::XSeries > /*_oSeries*/
return uno::Reference< excel::XDataLabels > ();
}
-bool
+bool
ScVbaChart::getHasDataCaption( const uno::Reference< css::beans::XPropertySet >& _xPropertySet )throw ( script::BasicErrorException )
{
bool bResult = false;
@@ -1170,15 +1170,15 @@ ScVbaChart::getHasDataCaption( const uno::Reference< css::beans::XPropertySet >&
sal_Int32 nChartDataCaption = 0;
_xPropertySet->getPropertyValue(DATACAPTION) >>= nChartDataCaption;
bResult = (nChartDataCaption != chart::ChartDataCaption::NONE);
- }
- catch (uno::Exception& )
+ }
+ catch (uno::Exception& )
{
throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
}
return bResult;
}
-void
+void
ScVbaChart::setHasDataCaption( const uno::Reference< beans::XPropertySet >& _xPropertySet, bool _bHasDataLabels )throw ( script::BasicErrorException )
{
try
@@ -1187,14 +1187,14 @@ ScVbaChart::setHasDataCaption( const uno::Reference< beans::XPropertySet >& _xPr
_xPropertySet->setPropertyValue(DATACAPTION, uno::makeAny ( chart::ChartDataCaption::VALUE) );
else
_xPropertySet->setPropertyValue(DATACAPTION, uno::makeAny ( chart::ChartDataCaption::NONE) );
- }
- catch (uno::Exception& )
+ }
+ catch (uno::Exception& )
{
throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
}
}
-uno::Reference< beans::XPropertySet >
+uno::Reference< beans::XPropertySet >
ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( script::BasicErrorException )
{
assignDiagramAttributes();
@@ -1226,7 +1226,7 @@ ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) thro
xAxisProps = xTwoAxisYSupplier->getSecondaryYAxis();
break;
default:
- return xAxisProps;
+ return xAxisProps;
}
return xAxisProps;
}
@@ -1239,7 +1239,7 @@ ScVbaChart::getServiceImplName()
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaChart::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx
index d0b53c34421f..98d931c4eb59 100644
--- a/sc/source/ui/vba/vbachart.hxx
+++ b/sc/source/ui/vba/vbachart.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
typedef InheritedHelperInterfaceImpl1<ov::excel::XChart > ChartImpl_BASE;
class ScVbaChart : public ChartImpl_BASE
-{
+{
friend class ScVbaAxis;
css::uno::Reference< css::chart::XChartDocument > mxChartDocument;
@@ -66,7 +66,7 @@ friend class ScVbaAxis;
sal_Int32 getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _nVerti100PercentStacked, sal_Int32 _nVertiUnStacked, sal_Int32 _nHoriStacked, sal_Int32 _nHori100PercentStacked, sal_Int32 _nHoriUnStacked) throw ( css::script::BasicErrorException );
sal_Int32 getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw (css::script::BasicErrorException);
bool hasMarkers() throw ( css::script::BasicErrorException );
- sal_Int32 getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers) throw ( css::script::BasicErrorException );
+ sal_Int32 getMarkerType(sal_Int32 _nWithMarkers, sal_Int32 _nWithoutMarkers) throw ( css::script::BasicErrorException );
void assignDiagramAttributes();
void setDefaultSeriesDescriptionLabels(){}
public:
@@ -92,7 +92,7 @@ public:
virtual css::uno::Any SAL_CALL SeriesCollection(const css::uno::Any&) throw (css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getChartType() throw ( css::uno::RuntimeException, css::script::BasicErrorException);
virtual void SAL_CALL setChartType( ::sal_Int32 _charttype ) throw ( css::uno::RuntimeException, css::script::BasicErrorException);
- virtual void SAL_CALL Activate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+ virtual void SAL_CALL Activate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual void SAL_CALL setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange >& range, const css::uno::Any& PlotBy ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL Location( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getLocation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx
index 617a090b6d7a..3d4180266ee6 100644
--- a/sc/source/ui/vba/vbachartobject.cxx
+++ b/sc/source/ui/vba/vbachartobject.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +41,7 @@ const rtl::OUString PERSIST_NAME( RTL_CONSTASCII_USTRINGPARAM("PersistName") );
ScVbaChartObject::ScVbaChartObject( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableChart >& _xTableChart, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ) : ChartObjectImpl_BASE( _xParent, _xContext ), xTableChart( _xTableChart ), xDrawPageSupplier( _xDrawPageSupplier )
{
- xDrawPage = xDrawPageSupplier->getDrawPage();
+ xDrawPage = xDrawPageSupplier->getDrawPage();
xEmbeddedObjectSupplier.set( xTableChart, uno::UNO_QUERY_THROW );
xNamed.set( xTableChart, uno::UNO_QUERY_THROW );
sPersistName = getPersistName();
@@ -57,7 +57,7 @@ rtl::OUString ScVbaChartObject::getPersistName()
return sPersistName;
}
-uno::Reference< drawing::XShape >
+uno::Reference< drawing::XShape >
ScVbaChartObject::setShape() throw ( script::BasicErrorException )
{
try
@@ -86,14 +86,14 @@ ScVbaChartObject::setShape() throw ( script::BasicErrorException )
return NULL;
}
-void SAL_CALL
+void SAL_CALL
ScVbaChartObject::setName( const rtl::OUString& sName ) throw (css::uno::RuntimeException)
{
xNamedShape->setName(sName);
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
ScVbaChartObject::getName() throw (css::uno::RuntimeException)
{
return xNamedShape->getName();
@@ -106,19 +106,19 @@ ScVbaChartObject::Delete() throw ( css::script::BasicErrorException )
uno::Reference< excel::XWorksheet > xParent( getParent(), uno::UNO_QUERY_THROW );
uno::Reference< excel::XChartObjects > xColl( xParent->ChartObjects( uno::Any() ), uno::UNO_QUERY_THROW );
ScVbaChartObjects* pChartObjectsImpl = static_cast< ScVbaChartObjects* >( xColl.get() );
- if (pChartObjectsImpl)
+ if (pChartObjectsImpl)
pChartObjectsImpl->removeByName( getPersistName() );
- else
+ else
throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Parent is not ChartObjects" ) ) );
}
-
-void
+
+void
ScVbaChartObject::Activate() throw ( script::BasicErrorException )
{
try
{
// #TODO #FIXME should be ThisWorkbook or equivelant, or in
- // fact probably the chart object should be created with
+ // fact probably the chart object should be created with
// the XModel owner
//uno::Reference< view::XSelectionSupplier > xSelectionSupplier( getXModel().getCurrentController());
uno::Reference< view::XSelectionSupplier > xSelectionSupplier( getCurrentExcelDoc(mxContext)->getCurrentController(), uno::UNO_QUERY_THROW );
@@ -130,20 +130,20 @@ ScVbaChartObject::Activate() throw ( script::BasicErrorException )
}
}
-uno::Reference< excel::XChart > SAL_CALL
+uno::Reference< excel::XChart > SAL_CALL
ScVbaChartObject::getChart() throw (css::uno::RuntimeException)
{
return new ScVbaChart( this, mxContext, xEmbeddedObjectSupplier->getEmbeddedObject(), xTableChart );
}
-rtl::OUString&
+rtl::OUString&
ScVbaChartObject::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObject") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaChartObject::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
@@ -155,56 +155,56 @@ ScVbaChartObject::getServiceNames()
return aServiceNames;
}
-double
+double
ScVbaChartObject::getHeight()
{
return oShapeHelper->getHeight();
}
-void
+void
ScVbaChartObject::setHeight(double _fheight) throw ( script::BasicErrorException )
{
oShapeHelper->setHeight(_fheight);
}
-
-double
+
+double
ScVbaChartObject::getWidth()
{
return oShapeHelper->getWidth();
}
-void
+void
ScVbaChartObject::setWidth(double _fWidth) throw ( script::BasicErrorException )
{
oShapeHelper->setWidth(_fWidth);
}
-
-double
+
+double
ScVbaChartObject::getLeft()
{
return oShapeHelper->getLeft();
}
-void
+void
ScVbaChartObject::setLeft(double _fLeft)
{
oShapeHelper->setLeft(_fLeft);
}
-
-double
+
+double
ScVbaChartObject::getTop()
{
return oShapeHelper->getTop();
-}
+}
-void
+void
ScVbaChartObject::setTop(double _fTop)
{
oShapeHelper->setTop(_fTop);
}
-uno::Reference< uno::XInterface >
-ScVbaChartObject::getUnoObject() throw (script::BasicErrorException)
+uno::Reference< uno::XInterface >
+ScVbaChartObject::getUnoObject() throw (script::BasicErrorException)
{
return uno::Reference< uno::XInterface >( xShape, uno::UNO_QUERY );
}
diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx
index 3c1e224728ee..ff2a80305ec5 100644
--- a/sc/source/ui/vba/vbachartobject.hxx
+++ b/sc/source/ui/vba/vbachartobject.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +39,7 @@
typedef InheritedHelperInterfaceImpl1<ov::excel::XChartObject > ChartObjectImpl_BASE;
class ScVbaChartObject : public ChartObjectImpl_BASE
-{
+{
css::uno::Reference< css::table::XTableChart > xTableChart;
css::uno::Reference< css::document::XEmbeddedObjectSupplier > xEmbeddedObjectSupplier;
@@ -58,8 +58,8 @@ public:
virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
virtual void SAL_CALL setName( const ::rtl::OUString& sName ) throw (css::uno::RuntimeException);
virtual css::uno::Reference< ov::excel::XChart > SAL_CALL getChart() throw (css::uno::RuntimeException);
- virtual void SAL_CALL Delete() throw ( css::script::BasicErrorException );
- virtual void Activate() throw ( css::script::BasicErrorException );
+ virtual void SAL_CALL Delete() throw ( css::script::BasicErrorException );
+ virtual void Activate() throw ( css::script::BasicErrorException );
// XHelperInterface
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx
index 5117cfd75858..cb5a669d945e 100644
--- a/sc/source/ui/vba/vbachartobjects.cxx
+++ b/sc/source/ui/vba/vbachartobjects.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +47,12 @@ using namespace ::ooo::vba;
class ChartObjectEnumerationImpl : public EnumerationHelperImpl
{
uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier;
-
+
public:
ChartObjectEnumerationImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< drawing::XDrawPageSupplier >& _xDrawPageSupplier, const uno::Reference< XHelperInterface >& _xParent ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( _xParent, xContext, xEnumeration ), xDrawPageSupplier( _xDrawPageSupplier ) {}
- virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
- {
+ virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ {
uno::Reference< table::XTableChart > xTableChart( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
// parent Object is sheet
return uno::makeAny( uno::Reference< excel::XChartObject > ( new ScVbaChartObject( m_xParent, m_xContext, xTableChart, xDrawPageSupplier ) ) );
@@ -83,10 +83,10 @@ ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException
ScDocShell* pDocShell = NULL;
if ( !pUno )
throw uno::RuntimeException( rtl::OUString::createFromAscii("Failed to obtain the impl class from the drawpage"), uno::Reference< uno::XInterface >() );
- pDocShell = pUno->GetDocShell();
+ pDocShell = pUno->GetDocShell();
if ( !pDocShell )
throw uno::RuntimeException( rtl::OUString::createFromAscii("Failed to obtain the docshell implclass"), uno::Reference< uno::XInterface >() );
-
+
uno::Reference< sheet::XSpreadsheetDocument > xSpreadsheetDocument( pDocShell->GetModel(), uno::UNO_QUERY_THROW );
uno::Reference< sheet::XSpreadsheets > xSpreadsheets = xSpreadsheetDocument->getSheets();
std::vector< rtl::OUString > aChartNamesVector;
@@ -106,8 +106,8 @@ ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException
std::vector< rtl::OUString > ::const_iterator it_end = aChartNamesVector.end();
for ( sal_Int32 index = 0 ; it != it_end; ++it, ++index )
sChartNames[index] = *it;
- }
- catch (uno::Exception& )
+ }
+ catch (uno::Exception& )
{
throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
}
@@ -115,25 +115,25 @@ ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException
}
// XChartObjects
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight ) throw (script::BasicErrorException)
{
- try
+ try
{
uno::Sequence< table::CellRangeAddress > aCellRangeAddress( 1 );
awt::Rectangle aRectangle;
aRectangle.X = Millimeter::getInHundredthsOfOneMillimeter(_nX);
aRectangle.Y = Millimeter::getInHundredthsOfOneMillimeter(_nY);
aRectangle.Width = Millimeter::getInHundredthsOfOneMillimeter(_nWidth);
- aRectangle.Height = Millimeter::getInHundredthsOfOneMillimeter(_nHeight);
+ aRectangle.Height = Millimeter::getInHundredthsOfOneMillimeter(_nHeight);
// Note the space at the end of the stem ("Chart "). In ChartSheets only "Chart" is the stem
rtl::OUString sPersistChartName = ContainerUtilities::getUniqueName( getChartObjectNames(), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Chart " ) ) , rtl::OUString(), 1);
xTableCharts->addNewByName(sPersistChartName, aRectangle, aCellRangeAddress, true, false );
- uno::Reference< excel::XChartObject > xChartObject( getItemByStringIndex( sPersistChartName ), uno::UNO_QUERY_THROW );
+ uno::Reference< excel::XChartObject > xChartObject( getItemByStringIndex( sPersistChartName ), uno::UNO_QUERY_THROW );
xChartObject->getChart()->setChartType(excel::XlChartType::xlColumnClustered);
return uno::makeAny( xChartObject );
- }
- catch ( uno::Exception& ex)
+ }
+ catch ( uno::Exception& ex)
{
OSL_TRACE("AddItem caught exception ->%s", rtl::OUStringToOString( ex.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
}
@@ -158,7 +158,7 @@ ScVbaChartObjects::createEnumeration() throw (uno::RuntimeException)
// XElementAccess
-uno::Type
+uno::Type
ScVbaChartObjects::getElementType() throw (uno::RuntimeException)
{
return excel::XChartObject::static_type(0);
@@ -167,20 +167,20 @@ ScVbaChartObjects::getElementType() throw (uno::RuntimeException)
// ScVbaCollectionBaseImpl
uno::Any
ScVbaChartObjects::createCollectionObject( const css::uno::Any& aSource )
-{
+{
uno::Reference< table::XTableChart > xTableChart( aSource, uno::UNO_QUERY_THROW );
// correct parent object is sheet
return uno::makeAny( uno::Reference< excel::XChartObject > ( new ScVbaChartObject( getParent(), mxContext, xTableChart, xDrawPageSupplier ) ) );
}
-rtl::OUString&
+rtl::OUString&
ScVbaChartObjects::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaChartObjects") );
return sImplName;
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<rtl::OUString>
ScVbaChartObjects::getServiceNames()
{
static uno::Sequence< rtl::OUString > sNames;
diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx
index 80ea038bb15d..2427f6b06331 100644
--- a/sc/source/ui/vba/vbachartobjects.hxx
+++ b/sc/source/ui/vba/vbachartobjects.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +39,14 @@
typedef CollTestImplHelper< ov::excel::XChartObjects > ChartObjects_BASE;
/* #TODO see if this hash table is 'really' necessary
-typedef ::std::hash_map< ::rtl::OUString,
+typedef ::std::hash_map< ::rtl::OUString,
css::uno::Reference< ov::excel::XChartObject >,
::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > aHashTable;
*/
class ScVbaChartObjects : public ChartObjects_BASE
-{
+{
css::uno::Reference< css::table::XTableCharts > xTableCharts;
css::uno::Reference< css::drawing::XDrawPageSupplier > xDrawPageSupplier;
@@ -65,8 +65,8 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
// XElementAccess
virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
- // ScVbaCollectionBaseImpl
- virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+ // ScVbaCollectionBaseImpl
+ virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
// ChartObjects_BASE
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
diff --git a/sc/source/ui/vba/vbacharts.cxx b/sc/source/ui/vba/vbacharts.cxx
index da0c7789134b..c11e6786f71b 100644
--- a/sc/source/ui/vba/vbacharts.cxx
+++ b/sc/source/ui/vba/vbacharts.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,33 +38,33 @@ ScVbaCharts::ScVbaCharts( const css::uno::Reference< ov::XHelperInterface >& _xP
xSpreadsheetDocument.set( xComponent, uno::UNO_QUERY_THROW );
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaCharts::Add() throw (css::script::BasicErrorException, css::uno::RuntimeException)
{
// Not implemented in the helperapi ( see ChartsImpl.java )
if ( true )
- throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_BAD_METHOD, rtl::OUString() );
+ throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_BAD_METHOD, rtl::OUString() );
return aNULL();
}
-uno::Reference< excel::XChart > SAL_CALL
+uno::Reference< excel::XChart > SAL_CALL
ScVbaCharts::getActiveChart() throw (script::BasicErrorException, uno::RuntimeException)
{
return xActiveChart;
}
-uno::Reference< container::XEnumeration > SAL_CALL
+uno::Reference< container::XEnumeration > SAL_CALL
ScVbaCharts::createEnumeration() throw (uno::RuntimeException)
{
// #FIXME not implemented
if ( true )
- throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_BAD_METHOD, rtl::OUString() );
+ throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_BAD_METHOD, rtl::OUString() );
return uno::Reference< container::XEnumeration >();
}
// #FIXME #TODO this method shouldn't appear in this class directly
// a XIndexAccess/XNameAccess wrapper should be passed to the base class instead
-::sal_Int32 SAL_CALL
+::sal_Int32 SAL_CALL
ScVbaCharts::getCount() throw (uno::RuntimeException)
{
sal_Int32 ncount = 0;
@@ -87,14 +87,14 @@ ScVbaCharts::getCount() throw (uno::RuntimeException)
{
throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
}
- return ncount;
+ return ncount;
}
uno::Any
ScVbaCharts::createCollectionObject( const uno::Any& aSource )
{
if ( true )
- throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_BAD_METHOD, rtl::OUString() );
+ throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_BAD_METHOD, rtl::OUString() );
// #TODO implementation please
return aSource;
}
@@ -106,7 +106,7 @@ ScVbaCharts::getServiceImplName()
return sImplName;
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<rtl::OUString>
ScVbaCharts::getServiceNames()
{
static uno::Sequence< rtl::OUString > sNames;
diff --git a/sc/source/ui/vba/vbacharts.hxx b/sc/source/ui/vba/vbacharts.hxx
index b2ecfe23270f..621c5ad9bff0 100644
--- a/sc/source/ui/vba/vbacharts.hxx
+++ b/sc/source/ui/vba/vbacharts.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
typedef CollTestImplHelper< ov::excel::XCharts > Charts_BASE;
class ScVbaCharts : public Charts_BASE
-{
+{
css::uno::Reference< ov::excel::XChart > xActiveChart;
css::uno::Reference< css::sheet::XSpreadsheetDocument > xSpreadsheetDocument;
css::uno::Reference< css::lang::XComponent > xComponent;
@@ -50,11 +50,11 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
// XElementAccess
virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) { return ov::excel::XChart::static_type(0); }
- // ScVbaCollectionBaseImpl
- virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+ // ScVbaCollectionBaseImpl
+ virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
// Charts_BASE or HelperInterface
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
-#endif
+#endif
diff --git a/sc/source/ui/vba/vbacharttitle.cxx b/sc/source/ui/vba/vbacharttitle.cxx
index e797c4a0269e..b6e5f5e5ef1a 100644
--- a/sc/source/ui/vba/vbacharttitle.cxx
+++ b/sc/source/ui/vba/vbacharttitle.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScVbaChartTitle::getServiceImplName()
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaChartTitle::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbacharttitle.hxx b/sc/source/ui/vba/vbacharttitle.hxx
index 4d6ed34a86b6..994fd3fe1199 100644
--- a/sc/source/ui/vba/vbacharttitle.hxx
+++ b/sc/source/ui/vba/vbacharttitle.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx
index 9c50a25b8b7c..797b0806dadb 100644
--- a/sc/source/ui/vba/vbacomment.cxx
+++ b/sc/source/ui/vba/vbacomment.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScVbaComment::getAnnotationIndex() throw (uno::RuntimeException)
{
uno::Reference< sheet::XSheetAnnotation > xAnno( xAnnos->getByIndex( aIndex ), uno::UNO_QUERY_THROW );
table::CellAddress xAddress = xAnno->getPosition();
-
+
if ( xAddress.Column == aAddress.Column && xAddress.Row == aAddress.Row && xAddress.Sheet == aAddress.Sheet )
{
OSL_TRACE("** terminating search, index is %d", aIndex );
@@ -219,14 +219,14 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An
return sAnnoText;
}
-rtl::OUString&
+rtl::OUString&
ScVbaComment::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaComment") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaComment::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxx
index 4a7d2fab91ef..59d9e45ba719 100644
--- a/sc/source/ui/vba/vbacomment.hxx
+++ b/sc/source/ui/vba/vbacomment.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/vba/vbacomments.cxx b/sc/source/ui/vba/vbacomments.cxx
index 7a6d3d774937..13036e2b2597 100644
--- a/sc/source/ui/vba/vbacomments.cxx
+++ b/sc/source/ui/vba/vbacomments.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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:
{}
virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
- {
+ {
return AnnotationToComment( m_xEnumeration->nextElement(), m_xContext, mxModel );
}
@@ -90,20 +90,20 @@ ScVbaComments::createCollectionObject( const css::uno::Any& aSource )
return AnnotationToComment( aSource, mxContext, mxModel );
}
-uno::Type
+uno::Type
ScVbaComments::getElementType() throw (uno::RuntimeException)
{
return excel::XComment::static_type(0);
}
-rtl::OUString&
+rtl::OUString&
ScVbaComments::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaComments") );
return sImplName;
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<rtl::OUString>
ScVbaComments::getServiceNames()
{
static uno::Sequence< rtl::OUString > sNames;
diff --git a/sc/source/ui/vba/vbacomments.hxx b/sc/source/ui/vba/vbacomments.hxx
index 2f98e5b71897..b787f10c600c 100644
--- a/sc/source/ui/vba/vbacomments.hxx
+++ b/sc/source/ui/vba/vbacomments.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -53,7 +53,7 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
// ScVbaComments_BASE
- virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+ virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx
index 590d649ae561..89e892e35368 100644
--- a/sc/source/ui/vba/vbacondition.cxx
+++ b/sc/source/ui/vba/vbacondition.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +39,16 @@ const sal_Int32 ISFORMULA = 98765432;
template< typename Ifc1 >
ScVbaCondition< Ifc1 >::ScVbaCondition( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< sheet::XSheetCondition >& _xSheetCondition ) : ScVbaCondition_BASE( xParent, xContext ), mxSheetCondition( _xSheetCondition )
{
- mxAddressable.set( xParent, uno::UNO_QUERY_THROW );
+ mxAddressable.set( xParent, uno::UNO_QUERY_THROW );
}
template< typename Ifc1 >
-sheet::ConditionOperator
+sheet::ConditionOperator
ScVbaCondition< Ifc1 >::retrieveAPIOperator( const uno::Any& _aOperator) throw ( script::BasicErrorException )
{
sheet::ConditionOperator aRetAPIOperator = sheet::ConditionOperator_NONE;
sal_Int32 nOperator = 0;
- if ( (_aOperator >>= nOperator ) )
+ if ( (_aOperator >>= nOperator ) )
{
switch(nOperator)
{
@@ -85,21 +85,21 @@ ScVbaCondition< Ifc1 >::retrieveAPIOperator( const uno::Any& _aOperator) throw (
}
template< typename Ifc1 >
-rtl::OUString
+rtl::OUString
ScVbaCondition< Ifc1 >::Formula1( ) throw ( script::BasicErrorException, uno::RuntimeException )
{
return mxSheetCondition->getFormula1();
}
template< typename Ifc1 >
-rtl::OUString
+rtl::OUString
ScVbaCondition< Ifc1 >::Formula2( ) throw ( script::BasicErrorException, uno::RuntimeException )
{
return mxSheetCondition->getFormula2();
}
template< typename Ifc1 >
-void
+void
ScVbaCondition< Ifc1 >::setFormula1( const uno::Any& _aFormula1) throw ( script::BasicErrorException )
{
rtl::OUString sFormula;
@@ -113,18 +113,18 @@ ScVbaCondition< Ifc1 >::setFormula1( const uno::Any& _aFormula1) throw ( script:
}
template< typename Ifc1 >
-void
+void
ScVbaCondition< Ifc1 >::setFormula2( const uno::Any& _aFormula2) throw ( script::BasicErrorException )
{
rtl::OUString sFormula2;
- // #TODO surely this can't be right?
+ // #TODO surely this can't be right?
// ( from helperapi/impl/.../calc/ConditionImpl.java
if ( (_aFormula2 >>= sFormula2 ))
mxSheetCondition->setFormula1(sFormula2);
}
template< typename Ifc1 >
-sal_Int32
+sal_Int32
ScVbaCondition< Ifc1 >::Operator(sal_Bool _bIncludeFormulaValue) throw ( script::BasicErrorException )
{
sal_Int32 retvalue = -1;
@@ -159,13 +159,13 @@ ScVbaCondition< Ifc1 >::Operator(sal_Bool _bIncludeFormulaValue) throw ( script:
if (_bIncludeFormulaValue)
{
//#FIXME huh what's this all about
- // from helperapi/impl/.../calc/ConditionImpl
+ // from helperapi/impl/.../calc/ConditionImpl
retvalue = ISFORMULA;
break;
}
case sheet::ConditionOperator_NONE:
default:
- DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Operator not supported")));
+ DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Operator not supported")));
break;
}
return retvalue;
diff --git a/sc/source/ui/vba/vbacondition.hxx b/sc/source/ui/vba/vbacondition.hxx
index 36052fe217ee..f22cc6a30517 100644
--- a/sc/source/ui/vba/vbacondition.hxx
+++ b/sc/source/ui/vba/vbacondition.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +26,8 @@
************************************************************************/
#ifndef SC_VBA_CONDITION_HXX
#define SC_VBA_CONDITION_HXX
-#include <com/sun/star/sheet/XSheetCondition.hpp>
-#include <com/sun/star/sheet/XCellRangeAddressable.hpp>
+#include <com/sun/star/sheet/XSheetCondition.hpp>
+#include <com/sun/star/sheet/XCellRangeAddressable.hpp>
#include <vbahelper/vbahelperinterface.hxx>
#include <com/sun/star/sheet/ConditionOperator.hpp>
@@ -49,6 +49,6 @@ public:
virtual void setFormula2( const css::uno::Any& _aFormula2) throw ( css::script::BasicErrorException );
virtual sal_Int32 Operator(sal_Bool _bIncludeFormulaValue) throw ( css::script::BasicErrorException );
virtual sal_Int32 SAL_CALL Operator() throw ( css::script::BasicErrorException, css::uno::RuntimeException ) = 0;
-
+
};
-#endif
+#endif
diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx
index 3c578a04e5d0..891ac75af4b2 100644
--- a/sc/source/ui/vba/vbadialog.cxx
+++ b/sc/source/ui/vba/vbadialog.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +55,12 @@ static const rtl::OUString aStringList[]=
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DefineLabelRange" ) ),
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataFilterAutoFilter" ) ),
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DataFilterSpecialFilter" ) ),
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AutoFormat" ) )
+ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AutoFormat" ) )
};
const sal_Int32 nDialogSize = sizeof( aStringList ) / sizeof( aStringList[ 0 ] );
-rtl::OUString
+rtl::OUString
ScVbaDialog::mapIndexToName( sal_Int32 nIndex )
{
if( nIndex < nDialogSize )
@@ -68,14 +68,14 @@ ScVbaDialog::mapIndexToName( sal_Int32 nIndex )
return rtl::OUString();
}
-rtl::OUString&
+rtl::OUString&
ScVbaDialog::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaDialog") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaDialog::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbadialog.hxx b/sc/source/ui/vba/vbadialog.hxx
index 40f4a4a83a11..a886fe3cff43 100644
--- a/sc/source/ui/vba/vbadialog.hxx
+++ b/sc/source/ui/vba/vbadialog.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxx
index 67070879535b..16d3dcba03f1 100644
--- a/sc/source/ui/vba/vbadialogs.cxx
+++ b/sc/source/ui/vba/vbadialogs.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +45,14 @@ ScVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException)
return uno::Any( aDialog );
}
-rtl::OUString&
+rtl::OUString&
ScVbaDialogs::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaDialogs") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaDialogs::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx
index 9aab5daf11fe..20fae2d27118 100644
--- a/sc/source/ui/vba/vbadialogs.hxx
+++ b/sc/source/ui/vba/vbadialogs.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +39,7 @@ typedef cppu::ImplInheritanceHelper1< VbaDialogsBase, ov::excel::XDialogs > ScVb
class ScVbaDialogs : public ScVbaDialogs_BASE
{
public:
- ScVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): ScVbaDialogs_BASE( xParent, xContext, xModel ) {}
+ ScVbaDialogs( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): ScVbaDialogs_BASE( xParent, xContext, xModel ) {}
virtual ~ScVbaDialogs() {}
// XCollection
diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx
index 45667adf2f2c..bd71c9eb3c35 100755
--- a/sc/source/ui/vba/vbaeventshelper.cxx
+++ b/sc/source/ui/vba/vbaeventshelper.cxx
@@ -383,7 +383,7 @@ ScVbaEventsHelper::ScVbaEventsHelper( const uno::Sequence< uno::Any >& rArgs, co
{
mpDocShell = dynamic_cast< ScDocShell* >( mpShell ); // mpShell from base class
mpDoc = mpDocShell ? mpDocShell->GetDocument() : 0;
-
+
if( !mxModel.is() || !mpDocShell || !mpDoc )
return;
@@ -683,7 +683,7 @@ uno::Any ScVbaEventsHelper::createWorksheet( const uno::Sequence< uno::Any >& rA
// extract sheet index, will throw, if parameter is invalid
SCTAB nTab = getTabFromArgs( rArgs, nIndex );
-
+
// create Workbook
uno::Sequence< uno::Any > aArgs( 2 );
aArgs[ 0 ] <<= uno::Reference< uno::XInterface >();
diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx
index a77f5128b3e9..dd704a1415f2 100755
--- a/sc/source/ui/vba/vbaeventshelper.hxx
+++ b/sc/source/ui/vba/vbaeventshelper.hxx
@@ -49,7 +49,7 @@ public:
// XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) throw (css::uno::RuntimeException);
-
+
protected:
virtual bool implEventsEnabled() throw (css::uno::RuntimeException);
virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException);
@@ -73,7 +73,7 @@ private:
css::uno::Any createHyperlink( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
/** Creates a VBA Window object. */
css::uno::Any createWindow() const throw (css::uno::RuntimeException);
-
+
private:
mutable css::uno::WeakReference< ov::excel::XApplication > mxApplication;
::rtl::Reference< ScVbaEventsListener > mxListener;
diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx
index 5894d3ea8c71..02dbf74bffcd 100644
--- a/sc/source/ui/vba/vbafont.cxx
+++ b/sc/source/ui/vba/vbafont.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScVbaFont::ScVbaFont(
{
}
-SfxItemSet*
+SfxItemSet*
ScVbaFont::GetDataSet()
{
return mpRangeObj ? excel::ScVbaCellRangeAccess::GetDataSet( mpRangeObj ) : 0;
@@ -77,7 +77,7 @@ uno::Reference< beans::XPropertySet > lcl_TextProperties( uno::Reference< table:
void SAL_CALL
ScVbaFont::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeException )
{
- // #FIXEME create some sort of generic get/set code where
+ // #FIXEME create some sort of generic get/set code where
// you can pass a functor
// get/set - Super/sub script code is exactly the same
// except for the call applied at each cell position
@@ -316,7 +316,7 @@ ScVbaFont::setFontStyle( const uno::Any& aValue ) throw( uno::RuntimeException )
rtl::OUString aToken = aStyles.getToken( 0, ' ', nIndex );
aTokens.push_back( aToken );
}while( nIndex >= 0 );
-
+
std::vector< rtl::OUString >::iterator it;
for( it = aTokens.begin(); it != aTokens.end(); ++it )
{
@@ -340,7 +340,7 @@ ScVbaFont::getFontStyle() throw ( uno::RuntimeException )
getBold() >>= bValue;
if( bValue )
aStyles.appendAscii("Bold");
-
+
getItalic() >>= bValue;
if( bValue )
{
diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx
index 3ef52c6d240f..b800bf338d73 100644
--- a/sc/source/ui/vba/vbafont.hxx
+++ b/sc/source/ui/vba/vbafont.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index d08451af63f4..c9df5c256a00 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScVbaFormat< Ifc1 >::ScVbaFormat( const uno::Reference< XHelperInterface >& xPar
mxServiceInfo.set( mxPropertySet, uno::UNO_QUERY_THROW );
if ( !mxModel.is() )
DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XModel Interface could not be retrieved") ) );
- mxNumberFormatsSupplier.set( mxModel, uno::UNO_QUERY_THROW );
+ mxNumberFormatsSupplier.set( mxModel, uno::UNO_QUERY_THROW );
}
catch (uno::Exception& )
{
@@ -74,16 +74,16 @@ ScVbaFormat< Ifc1 >::ScVbaFormat( const uno::Reference< XHelperInterface >& xPar
}
template< typename Ifc1 >
-void SAL_CALL
+void SAL_CALL
ScVbaFormat<Ifc1>::setVerticalAlignment( const uno::Any& _oAlignment) throw (script::BasicErrorException, uno::RuntimeException)
{
- try
+ try
{
uno::Any aVal;
sal_Int32 nAlignment = 0;
if ( !(_oAlignment >>= nAlignment ))
throw uno::RuntimeException();
- switch (nAlignment)
+ switch (nAlignment)
{
case excel::XlVAlign::xlVAlignBottom :
aVal = uno::makeAny( table::CellVertJustify_BOTTOM );
@@ -95,12 +95,12 @@ ScVbaFormat<Ifc1>::setVerticalAlignment( const uno::Any& _oAlignment) throw (s
case excel::XlVAlign::xlVAlignJustify:
aVal = uno::makeAny( table::CellVertJustify_STANDARD );
break;
-
+
case excel::XlVAlign::xlVAlignTop:
aVal = uno::makeAny( table::CellVertJustify_TOP);
break;
default:
- aVal = uno::makeAny( table::CellVertJustify_STANDARD );
+ aVal = uno::makeAny( table::CellVertJustify_STANDARD );
break;
}
mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ), aVal );
@@ -112,7 +112,7 @@ ScVbaFormat<Ifc1>::setVerticalAlignment( const uno::Any& _oAlignment) throw (s
}
template< typename Ifc1 >
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaFormat<Ifc1>::getVerticalAlignment( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Any aResult = aNULL();
@@ -149,10 +149,10 @@ ScVbaFormat<Ifc1>::getVerticalAlignment( ) throw (script::BasicErrorException,
}
template< typename Ifc1 >
-void SAL_CALL
+void SAL_CALL
ScVbaFormat<Ifc1>::setHorizontalAlignment( const uno::Any& HorizontalAlignment ) throw (script::BasicErrorException, uno::RuntimeException)
{
- try
+ try
{
uno::Any aVal;
sal_Int32 nAlignment = 0;
@@ -189,7 +189,7 @@ ScVbaFormat<Ifc1>::setHorizontalAlignment( const uno::Any& HorizontalAlignment )
}
template< typename Ifc1 >
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaFormat<Ifc1>::getHorizontalAlignment( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Any NRetAlignment = aNULL();
@@ -199,7 +199,7 @@ ScVbaFormat<Ifc1>::getHorizontalAlignment( ) throw (script::BasicErrorException
if (!isAmbiguous(sHoriJust))
{
table::CellHoriJustify aAPIAlignment = table::CellHoriJustify_BLOCK;
-
+
if ( mxPropertySet->getPropertyValue(sHoriJust) >>= aAPIAlignment )
{
switch( aAPIAlignment )
@@ -230,10 +230,10 @@ ScVbaFormat<Ifc1>::getHorizontalAlignment( ) throw (script::BasicErrorException
}
template< typename Ifc1 >
-void SAL_CALL
+void SAL_CALL
ScVbaFormat<Ifc1>::setOrientation( const uno::Any& _aOrientation ) throw (script::BasicErrorException, uno::RuntimeException)
{
- try
+ try
{
sal_Int32 nOrientation = 0;
if ( !( _aOrientation >>= nOrientation ) )
@@ -267,11 +267,11 @@ ScVbaFormat<Ifc1>::setOrientation( const uno::Any& _aOrientation ) throw (script
}
}
template< typename Ifc1 >
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaFormat<Ifc1>::getOrientation( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Any NRetOrientation = aNULL();
- try
+ try
{
if (!isAmbiguous(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) )))
{
@@ -292,7 +292,7 @@ ScVbaFormat<Ifc1>::getOrientation( ) throw (script::BasicErrorException, uno::R
break;
case table::CellOrientation_STACKED:
NRetOrientation = uno::makeAny( excel::XlOrientation::xlVertical );
- break;
+ break;
default:
NRetOrientation = uno::makeAny( excel::XlOrientation::xlHorizontal );
}
@@ -306,25 +306,25 @@ ScVbaFormat<Ifc1>::getOrientation( ) throw (script::BasicErrorException, uno::R
}
template< typename Ifc1 >
-void SAL_CALL
+void SAL_CALL
ScVbaFormat<Ifc1>::setWrapText( const uno::Any& _aWrapText ) throw (script::BasicErrorException, uno::RuntimeException)
{
- try
+ try
{
mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ), _aWrapText);
}
catch (uno::Exception& )
{
DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() );
- }
+ }
}
template< typename Ifc1 >
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaFormat<Ifc1>::getWrapText( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Any aWrap = aNULL();
- try
+ try
{
rtl::OUString aPropName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ) );
if (!isAmbiguous( aPropName ))
@@ -340,21 +340,21 @@ ScVbaFormat<Ifc1>::getWrapText( ) throw (script::BasicErrorException, uno::Runt
}
template< typename Ifc1 >
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaFormat<Ifc1>::Borders( const uno::Any& Index ) throw (script::BasicErrorException, uno::RuntimeException )
{
- ScVbaPalette aPalette( excel::getDocShell( mxModel ) );
+ ScVbaPalette aPalette( excel::getDocShell( mxModel ) );
uno::Reference< XCollection > xColl = new ScVbaBorders( thisHelperIface(), ScVbaFormat_BASE::mxContext, uno::Reference< table::XCellRange >( mxPropertySet, uno::UNO_QUERY_THROW ), aPalette );
if ( Index.hasValue() )
- {
+ {
return xColl->Item( Index, uno::Any() );
- }
+ }
return uno::makeAny( xColl );
}
template< typename Ifc1 >
-uno::Reference< excel::XFont > SAL_CALL
+uno::Reference< excel::XFont > SAL_CALL
ScVbaFormat<Ifc1>::Font( ) throw (script::BasicErrorException, uno::RuntimeException)
{
ScVbaPalette aPalette( excel::getDocShell( mxModel ) );
@@ -362,33 +362,33 @@ ScVbaFormat<Ifc1>::Font( ) throw (script::BasicErrorException, uno::RuntimeExce
}
template< typename Ifc1 >
-uno::Reference< excel::XInterior > SAL_CALL
+uno::Reference< excel::XInterior > SAL_CALL
ScVbaFormat<Ifc1>::Interior( ) throw (script::BasicErrorException, uno::RuntimeException)
{
- return new ScVbaInterior( thisHelperIface(), ScVbaFormat_BASE::mxContext, mxPropertySet );
+ return new ScVbaInterior( thisHelperIface(), ScVbaFormat_BASE::mxContext, mxPropertySet );
}
template< typename Ifc1 >
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaFormat<Ifc1>::getNumberFormatLocal( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Any aRet = uno::makeAny( rtl::OUString() );
- try
- {
+ try
+ {
rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_NUMBERFO ) );
if (!isAmbiguous( sPropName ))
{
-
+
initializeNumberFormats();
-
+
sal_Int32 nFormat = 0;
if ( ! (mxPropertySet->getPropertyValue( sPropName ) >>= nFormat ) )
throw uno::RuntimeException();
-
+
rtl::OUString sFormat;
xNumberFormats->getByKey(nFormat)->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( FORMATSTRING ))) >>= sFormat;
aRet = uno::makeAny( sFormat.toAsciiLowerCase() );
-
+
}
}
catch (uno::Exception& )
@@ -400,7 +400,7 @@ ScVbaFormat<Ifc1>::getNumberFormatLocal( ) throw (script::BasicErrorException,
}
template< typename Ifc1 >
-void
+void
ScVbaFormat<Ifc1>::setNumberFormat( lang::Locale _aLocale, const rtl::OUString& _sFormatString) throw( script::BasicErrorException )
{
try
@@ -420,10 +420,10 @@ ScVbaFormat<Ifc1>::setNumberFormat( lang::Locale _aLocale, const rtl::OUString&
}
template< typename Ifc1 >
-void SAL_CALL
+void SAL_CALL
ScVbaFormat<Ifc1>::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) throw (script::BasicErrorException, uno::RuntimeException)
{
- try
+ try
{
rtl::OUString sLocalFormatString;
sal_Int32 nFormat = -1;
@@ -449,15 +449,15 @@ ScVbaFormat<Ifc1>::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) t
}
template< typename Ifc1 >
-void SAL_CALL
+void SAL_CALL
ScVbaFormat<Ifc1>::setNumberFormat( const uno::Any& _oFormatString ) throw (script::BasicErrorException, uno::RuntimeException)
{
- try
+ try
{
rtl::OUString sFormatString;
if ( !( _oFormatString >>= sFormatString ) )
throw uno::RuntimeException();
-
+
sFormatString = sFormatString.toAsciiUpperCase();
lang::Locale aDefaultLocale = m_aDefaultLocale;
@@ -476,24 +476,24 @@ ScVbaFormat<Ifc1>::setNumberFormat( const uno::Any& _oFormatString ) throw (scri
{
DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
}
-
+
}
template< typename Ifc1 >
-void SAL_CALL
+void SAL_CALL
ScVbaFormat<Ifc1>::setIndentLevel( const uno::Any& _aLevel ) throw (script::BasicErrorException, uno::RuntimeException)
{
- try
+ try
{
sal_Int32 nLevel = 0;
if ( !(_aLevel >>= nLevel ) )
throw uno::RuntimeException();
- table::CellHoriJustify aAPIAlignment = table::CellHoriJustify_STANDARD;
-
+ table::CellHoriJustify aAPIAlignment = table::CellHoriJustify_STANDARD;
+
rtl::OUString sHoriJust( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) );
if ( !( mxPropertySet->getPropertyValue(sHoriJust) >>= aAPIAlignment ) )
throw uno::RuntimeException();
- if (aAPIAlignment == table::CellHoriJustify_STANDARD)
+ if (aAPIAlignment == table::CellHoriJustify_STANDARD)
mxPropertySet->setPropertyValue( sHoriJust, uno::makeAny( table::CellHoriJustify_LEFT) ) ;
mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) ), uno::makeAny( sal_Int16(nLevel * 352.8) ) );
}
@@ -504,11 +504,11 @@ ScVbaFormat<Ifc1>::setIndentLevel( const uno::Any& _aLevel ) throw (script::Basi
}
template< typename Ifc1 >
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaFormat<Ifc1>::getIndentLevel( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Any NRetIndentLevel = aNULL();
- try
+ try
{
rtl::OUString sParaIndent( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) );
if (!isAmbiguous(sParaIndent))
@@ -516,9 +516,9 @@ ScVbaFormat<Ifc1>::getIndentLevel( ) throw (script::BasicErrorException, uno::R
sal_Int16 IndentLevel = 0;
if ( ( mxPropertySet->getPropertyValue(sParaIndent) >>= IndentLevel ) )
NRetIndentLevel = uno::makeAny( sal_Int32( rtl::math::round(static_cast<double>( IndentLevel ) / 352.8)) );
- else
+ else
NRetIndentLevel = uno::makeAny( sal_Int32(0) );
- }
+ }
}
catch (uno::Exception& )
{
@@ -528,7 +528,7 @@ ScVbaFormat<Ifc1>::getIndentLevel( ) throw (script::BasicErrorException, uno::R
}
template< typename Ifc1 >
-void SAL_CALL
+void SAL_CALL
ScVbaFormat<Ifc1>::setLocked( const uno::Any& _aLocked ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -549,7 +549,7 @@ ScVbaFormat<Ifc1>::setLocked( const uno::Any& _aLocked ) throw (script::BasicErr
}
template< typename Ifc1 >
-void SAL_CALL
+void SAL_CALL
ScVbaFormat<Ifc1>::setFormulaHidden( const uno::Any& FormulaHidden ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -558,25 +558,25 @@ ScVbaFormat<Ifc1>::setFormulaHidden( const uno::Any& FormulaHidden ) throw (scri
FormulaHidden >>= bIsFormulaHidden;
util::CellProtection aCellProtection;
rtl::OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) );
- mxPropertySet->getPropertyValue(sCellProt) >>= aCellProtection;
+ mxPropertySet->getPropertyValue(sCellProt) >>= aCellProtection;
aCellProtection.IsFormulaHidden = bIsFormulaHidden;
mxPropertySet->setPropertyValue(sCellProt,uno::makeAny(aCellProtection));
}
catch (uno::Exception& )
{
- DebugHelper::exception( SbERR_METHOD_FAILED, rtl::OUString() );
+ DebugHelper::exception( SbERR_METHOD_FAILED, rtl::OUString() );
}
}
template< typename Ifc1 >
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaFormat<Ifc1>::getLocked( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Any aCellProtection = aNULL();
- try
+ try
{
rtl::OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) );
-
+
if (!isAmbiguous(sCellProt))
{
SfxItemSet* pDataSet = getCurrentDataSet();
@@ -597,13 +597,13 @@ ScVbaFormat<Ifc1>::getLocked( ) throw (script::BasicErrorException, uno::Runtim
}
catch (uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
+ DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
}
return aCellProtection;
}
template< typename Ifc1 >
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaFormat<Ifc1>::getFormulaHidden( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Any aBoolRet = aNULL();
@@ -623,20 +623,20 @@ ScVbaFormat<Ifc1>::getFormulaHidden( ) throw (script::BasicErrorException, uno:
else
{
util::CellProtection aCellProtection;
- mxPropertySet->getPropertyValue(sCellProt) >>= aCellProtection;
- aBoolRet = uno::makeAny( aCellProtection.IsFormulaHidden );
+ mxPropertySet->getPropertyValue(sCellProt) >>= aCellProtection;
+ aBoolRet = uno::makeAny( aCellProtection.IsFormulaHidden );
}
}
}
catch (uno::Exception e)
{
DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
- }
+ }
return aBoolRet;
}
template< typename Ifc1 >
-void SAL_CALL
+void SAL_CALL
ScVbaFormat<Ifc1>::setShrinkToFit( const uno::Any& ShrinkToFit ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -651,7 +651,7 @@ ScVbaFormat<Ifc1>::setShrinkToFit( const uno::Any& ShrinkToFit ) throw (script::
}
template< typename Ifc1 >
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaFormat<Ifc1>::getShrinkToFit( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Any aRet = aNULL();
@@ -663,13 +663,13 @@ ScVbaFormat<Ifc1>::getShrinkToFit( ) throw (script::BasicErrorException, uno::R
}
catch (uno::Exception& )
{
- DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString());
+ DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString());
}
return aRet;
}
template< typename Ifc1 >
-void SAL_CALL
+void SAL_CALL
ScVbaFormat<Ifc1>::setReadingOrder( const uno::Any& ReadingOrder ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -687,22 +687,22 @@ ScVbaFormat<Ifc1>::setReadingOrder( const uno::Any& ReadingOrder ) throw (script
aVal = uno::makeAny( text::WritingMode_RL_TB );
break;
case excel::Constants::xlContext:
- DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString());
+ DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString());
break;
default:
- DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
+ DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
}
mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRITING ) ), aVal );
}
catch (uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
+ DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
}
}
template< typename Ifc1 >
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaFormat<Ifc1>::getReadingOrder( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Any NRetReadingOrder = aNULL();
@@ -712,7 +712,7 @@ ScVbaFormat<Ifc1>::getReadingOrder( ) throw (script::BasicErrorException, uno::
if (!isAmbiguous(sWritingMode))
{
text::WritingMode aWritingMode = text::WritingMode_LR_TB;
- if ( ( mxPropertySet->getPropertyValue(sWritingMode) ) >>= aWritingMode )
+ if ( ( mxPropertySet->getPropertyValue(sWritingMode) ) >>= aWritingMode )
switch (aWritingMode){
case text::WritingMode_LR_TB:
NRetReadingOrder = uno::makeAny(excel::Constants::xlLTR);
@@ -730,19 +730,19 @@ ScVbaFormat<Ifc1>::getReadingOrder( ) throw (script::BasicErrorException, uno::
DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString());
}
return NRetReadingOrder;
-
+
}
template< typename Ifc1 >
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaFormat< Ifc1 >::getNumberFormat( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Any aFormat = aNULL();
- try
+ try
{
sal_Int32 nFormat = -1;
rtl::OUString sNumFormat( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_NUMBERFO ) );
- if (!isAmbiguous(sNumFormat) &&
+ if (!isAmbiguous(sNumFormat) &&
( mxPropertySet->getPropertyValue(sNumFormat) >>= nFormat) )
{
initializeNumberFormats();
@@ -773,24 +773,24 @@ ScVbaFormat<Ifc1>::isAmbiguous(const rtl::OUString& _sPropertyName) throw ( scri
catch (uno::Exception& )
{
DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
- }
+ }
return bResult;
}
template< typename Ifc1 >
-void
+void
ScVbaFormat<Ifc1>::initializeNumberFormats() throw ( script::BasicErrorException )
{
if ( !xNumberFormats.is() )
{
- mxNumberFormatsSupplier.set( mxModel, uno::UNO_QUERY_THROW );
+ mxNumberFormatsSupplier.set( mxModel, uno::UNO_QUERY_THROW );
xNumberFormats = mxNumberFormatsSupplier->getNumberFormats();
xNumberFormatTypes.set( xNumberFormats, uno::UNO_QUERY ); // _THROW?
}
}
template< typename Ifc1 >
-uno::Reference< beans::XPropertyState >
+uno::Reference< beans::XPropertyState >
ScVbaFormat<Ifc1>::getXPropertyState() throw ( uno::RuntimeException )
{
if ( !xPropertyState.is() )
@@ -820,20 +820,20 @@ ScVbaFormat<Ifc1>::getServiceNames()
}
template< typename Ifc1 >
-ScCellRangesBase*
+ScCellRangesBase*
ScVbaFormat<Ifc1>::getCellRangesBase() throw ( ::uno::RuntimeException )
{
return ScCellRangesBase::getImplementation( mxPropertySet );
}
template< typename Ifc1 >
-SfxItemSet*
+SfxItemSet*
ScVbaFormat<Ifc1>::getCurrentDataSet( ) throw ( uno::RuntimeException )
{
SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( getCellRangesBase() );
if ( !pDataSet )
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't access Itemset for XPropertySet" ) ), uno::Reference< uno::XInterface >() );
- return pDataSet;
+ return pDataSet;
}
diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx
index bfa88d6c7cb8..7b57df42fe02 100644
--- a/sc/source/ui/vba/vbaformat.hxx
+++ b/sc/source/ui/vba/vbaformat.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +28,10 @@
#define SC_VBA_FORMAT_HXX
#include <ooo/vba/excel/XFormat.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/util/XNumberFormats.hpp>
-#include <com/sun/star/util/XNumberFormatTypes.hpp>
-#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/util/XNumberFormatTypes.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/Locale.hpp>
@@ -68,7 +68,7 @@ protected:
public:
ScVbaFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( css::script::BasicErrorException );
virtual ~ScVbaFormat() {}
- virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() = 0;
+ virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() = 0;
css::uno::Reference< css::lang::XServiceInfo > getXServiceInfo() { return mxServiceInfo; }
void SAL_CALL setAddIndent( const css::uno::Any& _BAddIndent) throw( css::uno::RuntimeException ) { _BAddIndent >>= mbAddIndent; }
css::uno::Any SAL_CALL getAddIndent() throw( css::uno::RuntimeException ) { return css::uno::makeAny( mbAddIndent ); }
@@ -97,7 +97,7 @@ public:
virtual void SAL_CALL setFormulaHidden( const css::uno::Any& FormulaHidden ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getFormulaHidden( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0;
- virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0;
+ virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0;
virtual void SAL_CALL setReadingOrder( const css::uno::Any& ReadingOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getReadingOrder( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XHelperInterface
@@ -105,4 +105,4 @@ public:
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
-#endif
+#endif
diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx
index 99d8a579956a..a93f86cd577f 100644
--- a/sc/source/ui/vba/vbaformatcondition.cxx
+++ b/sc/source/ui/vba/vbaformatcondition.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-ScVbaFormatConditions*
+ScVbaFormatConditions*
lcl_getScVbaFormatConditionsPtr( const uno::Reference< excel::XFormatConditions >& xFormatConditions ) throw ( script::BasicErrorException )
{
ScVbaFormatConditions* pFormatConditions = static_cast< ScVbaFormatConditions* >( xFormatConditions.get() );
@@ -48,7 +48,7 @@ ScVbaFormatCondition::ScVbaFormatCondition( const uno::Reference< XHelperInterf
}
-void SAL_CALL
+void SAL_CALL
ScVbaFormatCondition::Delete( ) throw (script::BasicErrorException, uno::RuntimeException)
{
ScVbaFormatConditions* pFormatConditions = lcl_getScVbaFormatConditionsPtr( moFormatConditions );
@@ -56,7 +56,7 @@ ScVbaFormatCondition::Delete( ) throw (script::BasicErrorException, uno::Runtim
notifyRange();
}
-void SAL_CALL
+void SAL_CALL
ScVbaFormatCondition::Modify( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2 ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -71,18 +71,18 @@ ScVbaFormatCondition::Modify( ::sal_Int32 _nType, const uno::Any& _aOperator, co
}
}
-uno::Reference< excel::XInterior > SAL_CALL
+uno::Reference< excel::XInterior > SAL_CALL
ScVbaFormatCondition::Interior( ) throw (script::BasicErrorException, uno::RuntimeException)
{
return mxStyle->Interior();
}
-uno::Reference< excel::XFont > SAL_CALL
+uno::Reference< excel::XFont > SAL_CALL
ScVbaFormatCondition::Font( ) throw (script::BasicErrorException, uno::RuntimeException)
{
return mxStyle->Font();
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaFormatCondition::Borders( const uno::Any& Index ) throw (script::BasicErrorException, uno::RuntimeException)
{ return mxStyle->Borders( Index );
}
@@ -102,11 +102,11 @@ ScVbaFormatCondition::retrieveAPIType(sal_Int32 _nVBAType, const uno::Reference<
break;
default:
DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() );
- }
+ }
return aAPIType;
}
-void
+void
ScVbaFormatCondition::setFormula1( const uno::Any& _aFormula1) throw ( script::BasicErrorException )
{
// getA1Formula *SHOULD* detect whether the formula is r1c1 or A1 syntax
@@ -120,7 +120,7 @@ ScVbaFormatCondition::setFormula2( const uno::Any& _aFormula2) throw ( script::B
ScVbaFormatCondition_BASE::setFormula1( uno::makeAny( lcl_getScVbaFormatConditionsPtr( moFormatConditions )->getA1Formula(_aFormula2)) );
}
-::sal_Int32 SAL_CALL
+::sal_Int32 SAL_CALL
ScVbaFormatCondition::Type( ) throw ( script::BasicErrorException, uno::RuntimeException )
{
sal_Int32 nReturnType = 0;
@@ -132,18 +132,18 @@ ScVbaFormatCondition::Type( ) throw ( script::BasicErrorException, uno::Runtime
}
-::sal_Int32
+::sal_Int32
ScVbaFormatCondition::Operator( sal_Bool bVal ) throw (script::BasicErrorException )
{
return ScVbaFormatCondition_BASE::Operator( bVal );
}
-::sal_Int32 SAL_CALL
+::sal_Int32 SAL_CALL
ScVbaFormatCondition::Operator( ) throw (script::BasicErrorException, uno::RuntimeException)
{
return ScVbaFormatCondition_BASE::Operator( sal_True );
}
-void
+void
ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException )
{
try
@@ -156,14 +156,14 @@ ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException )
}
}
-rtl::OUString&
+rtl::OUString&
ScVbaFormatCondition::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatCondition") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaFormatCondition::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx
index 075dbf658203..999156fd145f 100644
--- a/sc/source/ui/vba/vbaformatcondition.hxx
+++ b/sc/source/ui/vba/vbaformatcondition.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +29,10 @@
#include <ooo/vba/excel/XFormatCondition.hpp>
#include <ooo/vba/excel/XFormatConditions.hpp>
#include <ooo/vba/excel/XStyle.hpp>
-#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
#include <com/sun/star/sheet/XSheetConditionalEntry.hpp>
-#include <com/sun/star/sheet/XSheetCondition.hpp>
+#include <com/sun/star/sheet/XSheetCondition.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include "vbacondition.hxx"
@@ -41,8 +41,8 @@ class ScVbaFormatCondition : public ScVbaFormatCondition_BASE
{
protected:
rtl::OUString msStyleName;
- css::uno::Reference< css::sheet::XSheetConditionalEntry > mxSheetConditionalEntry;
- css::uno::Reference< css::sheet::XSheetConditionalEntries > mxSheetConditionalEntries;
+ css::uno::Reference< css::sheet::XSheetConditionalEntry > mxSheetConditionalEntry;
+ css::uno::Reference< css::sheet::XSheetConditionalEntries > mxSheetConditionalEntries;
css::uno::Reference< ov::excel::XFormatConditions> moFormatConditions;
css::uno::Reference< ov::excel::XStyle > mxStyle;
css::uno::Reference< css::beans::XPropertySet > mxParentRangePropertySet;
@@ -67,4 +67,4 @@ public:
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
-#endif
+#endif
diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx
index 8dd67843ec00..2bb7db854e71 100644
--- a/sc/source/ui/vba/vbaformatconditions.cxx
+++ b/sc/source/ui/vba/vbaformatconditions.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +52,12 @@ ScVbaFormatConditions::ScVbaFormatConditions( const uno::Reference< XHelperInter
mxStyles.set( xApp->getThisWorkbook()->Styles( uno::Any() ), uno::UNO_QUERY_THROW );
uno::Reference< sheet::XCellRangeAddressable > xCellRange( mxRangeParent->getCellRange(), uno::UNO_QUERY_THROW );
mxParentRangePropertySet.set( xCellRange, uno::UNO_QUERY_THROW );
-
+
table::CellRangeAddress rangeAddress = xCellRange->getRangeAddress();
maCellAddress = table::CellAddress( rangeAddress.Sheet, rangeAddress.StartColumn, rangeAddress.StartRow );
}
-void SAL_CALL
+void SAL_CALL
ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -70,7 +70,7 @@ ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::Runti
{
uno::Reference< sheet::XSheetConditionalEntry > xSheetConditionalEntry( mxSheetConditionalEntries->getByIndex(i), uno::UNO_QUERY_THROW );
pStyles->Delete(xSheetConditionalEntry->getStyleName());
- mxSheetConditionalEntries->removeByIndex(i);
+ mxSheetConditionalEntries->removeByIndex(i);
}
notifyRange();
}
@@ -80,24 +80,24 @@ ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::Runti
}
}
-uno::Type SAL_CALL
+uno::Type SAL_CALL
ScVbaFormatConditions::getElementType() throw (css::uno::RuntimeException)
{
return excel::XFormatCondition::static_type(0);
}
-uno::Any xSheetConditionToFormatCondition( const uno::Reference< XHelperInterface >& xRangeParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< excel::XStyles >& xStyles, const uno::Reference< excel::XFormatConditions >& xFormatConditions, const uno::Reference< beans::XPropertySet >& xRangeProps, const uno::Any& aObject )
+uno::Any xSheetConditionToFormatCondition( const uno::Reference< XHelperInterface >& xRangeParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< excel::XStyles >& xStyles, const uno::Reference< excel::XFormatConditions >& xFormatConditions, const uno::Reference< beans::XPropertySet >& xRangeProps, const uno::Any& aObject )
{
uno::Reference< sheet::XSheetConditionalEntry > xSheetConditionalEntry;
aObject >>= xSheetConditionalEntry;
uno::Reference< excel::XStyle > xStyle( xStyles->Item( uno::makeAny( xSheetConditionalEntry->getStyleName() ), uno::Any() ), uno::UNO_QUERY_THROW );
- uno::Reference< excel::XFormatCondition > xCondition = new ScVbaFormatCondition( xRangeParent, xContext, xSheetConditionalEntry, xStyle, xFormatConditions, xRangeProps );
+ uno::Reference< excel::XFormatCondition > xCondition = new ScVbaFormatCondition( xRangeParent, xContext, xSheetConditionalEntry, xStyle, xFormatConditions, xRangeProps );
return uno::makeAny( xCondition );
}
-uno::Any
+uno::Any
ScVbaFormatConditions::createCollectionObject(const uno::Any& aObject )
{
return xSheetConditionToFormatCondition( uno::Reference< XHelperInterface >( mxRangeParent, uno::UNO_QUERY_THROW ), mxContext, mxStyles, this, mxParentRangePropertySet, aObject );
@@ -128,21 +128,21 @@ public:
}
};
-uno::Reference< excel::XFormatCondition > SAL_CALL
+uno::Reference< excel::XFormatCondition > SAL_CALL
ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2 ) throw (script::BasicErrorException, uno::RuntimeException)
{
return Add( _nType, _aOperator, _aFormula1, _aFormula2, uno::Reference< excel::XStyle >() );
}
-uno::Reference< excel::XFormatCondition >
+uno::Reference< excel::XFormatCondition >
ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, const uno::Any& _aFormula1, const uno::Any& _aFormula2, const css::uno::Reference< excel::XStyle >& _xStyle ) throw (script::BasicErrorException, uno::RuntimeException)
{
// #TODO
- // #FIXME
+ // #FIXME
// This method will NOT handle r1c1 formulas [*]and only assumes that
// the formulas are _xlA1 based ( need to hook into calc work ths should
// address this )
- // [*] reason: getA1Formula method below is just a hook and just
+ // [*] reason: getA1Formula method below is just a hook and just
// returns whats it gets ( e.g. doesn't convert anything )
uno::Reference< excel::XStyle > xStyle( _xStyle );
uno::Reference< excel::XFormatCondition > xFormatCondition;
@@ -150,7 +150,7 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons
{
rtl::OUString sStyleName;
if ( !xStyle.is() )
- {
+ {
sStyleName = getStyleName();
xStyle = mxStyles->Add(sStyleName, uno::Any() );
}
@@ -172,12 +172,12 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons
aPropertyValueVector.push_back( aProperty );
if ( _aFormula1.hasValue() )
- {
+ {
beans::PropertyValue aProp( FORMULA1, 0, uno::makeAny( getA1Formula( _aFormula1 ) ), beans::PropertyState_DIRECT_VALUE );
aPropertyValueVector.push_back( aProp );
}
if ( _aFormula2.hasValue() )
- {
+ {
beans::PropertyValue aProp( FORMULA2, 0, uno::makeAny( getA1Formula( _aFormula2 ) ), beans::PropertyState_DIRECT_VALUE );
aPropertyValueVector.push_back( aProp );
}
@@ -211,14 +211,14 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons
}
-uno::Reference< container::XEnumeration > SAL_CALL
+uno::Reference< container::XEnumeration > SAL_CALL
ScVbaFormatConditions::createEnumeration() throw (uno::RuntimeException)
{
return new EnumWrapper( m_xIndexAccess, mxRangeParent, mxContext, mxStyles, this, mxParentRangePropertySet );
}
-void
+void
ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException )
{
try
@@ -231,7 +231,7 @@ ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException )
}
}
-rtl::OUString
+rtl::OUString
ScVbaFormatConditions::getA1Formula(const css::uno::Any& _aFormula) throw ( script::BasicErrorException )
{
// #TODO, #FIXME hook-in proper formula conversion detection & logic
@@ -241,7 +241,7 @@ ScVbaFormatConditions::getA1Formula(const css::uno::Any& _aFormula) throw ( scri
return sFormula;
}
-rtl::OUString
+rtl::OUString
ScVbaFormatConditions::getStyleName()
{
ScVbaStyles* pStyles = static_cast< ScVbaStyles* >( mxStyles.get() );
@@ -251,7 +251,7 @@ ScVbaFormatConditions::getStyleName()
return ContainerUtilities::getUniqueName(sCellStyleNames, sStyleNamePrefix, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_") ));
}
-void
+void
ScVbaFormatConditions::removeFormatCondition( const rtl::OUString& _sStyleName, sal_Bool _bRemoveStyle) throw ( script::BasicErrorException )
{
try
@@ -280,14 +280,14 @@ ScVbaFormatConditions::removeFormatCondition( const rtl::OUString& _sStyleName,
}
}
-rtl::OUString&
+rtl::OUString&
ScVbaFormatConditions::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFormatConditions") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaFormatConditions::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx
index 7dfa065ea8b6..dabad8dd41e5 100644
--- a/sc/source/ui/vba/vbaformatconditions.hxx
+++ b/sc/source/ui/vba/vbaformatconditions.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
typedef CollTestImplHelper< ov::excel::XFormatConditions > ScVbaFormatConditions_BASE;
class ScVbaFormatConditions: public ScVbaFormatConditions_BASE
{
- css::table::CellAddress maCellAddress;
+ css::table::CellAddress maCellAddress;
css::uno::Reference< css::sheet::XSheetConditionalEntries > mxSheetConditionalEntries;
css::uno::Reference< ov::excel::XStyles > mxStyles;
css::uno::Reference< ov::excel::XRange > mxRangeParent;
@@ -55,7 +55,7 @@ public:
virtual css::uno::Reference< ov::excel::XFormatCondition > SAL_CALL Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XEnumerationAccess
virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
- virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
virtual css::uno::Any createCollectionObject(const css::uno::Any&);
// XHelperInterface
virtual rtl::OUString& getServiceImplName();
diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx
index 03f3ecd3c50c..adb9b7f9354d 100644
--- a/sc/source/ui/vba/vbaglobals.cxx
+++ b/sc/source/ui/vba/vbaglobals.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScVbaGlobals::ScVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Referen
aInitArgs[ 0 ].Value = uno::makeAny( getApplication() );
aInitArgs[ 1 ].Name = sDocCtxName;
aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) );
-
+
init( aInitArgs );
}
@@ -74,20 +74,29 @@ ScVbaGlobals::~ScVbaGlobals()
uno::Reference<excel::XApplication >
ScVbaGlobals::getApplication() throw (uno::RuntimeException)
{
-// OSL_TRACE("In ScVbaGlobals::getApplication");
+// OSL_TRACE("In ScVbaGlobals::getApplication");
if ( !mxApplication.is() )
mxApplication.set( new ScVbaApplication( mxContext) );
- return mxApplication;
+ return mxApplication;
+}
+
+
+uno::Reference<excel::XApplication > SAL_CALL
+ScVbaGlobals::getExcel() throw (uno::RuntimeException)
+{
+ return getApplication();
}
-uno::Reference< excel::XWorkbook > SAL_CALL
+
+
+uno::Reference< excel::XWorkbook > SAL_CALL
ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException)
{
-// OSL_TRACE("In ScVbaGlobals::getActiveWorkbook");
+// OSL_TRACE("In ScVbaGlobals::getActiveWorkbook");
uno::Reference< excel::XWorkbook > xWorkbook( getApplication()->getActiveWorkbook(), uno::UNO_QUERY);
if ( xWorkbook.is() )
{
- return xWorkbook;
+ return xWorkbook;
}
// FIXME check if this is correct/desired behavior
throw uno::RuntimeException( rtl::OUString::createFromAscii(
@@ -95,19 +104,19 @@ ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException)
}
-uno::Reference< excel::XWindow > SAL_CALL
+uno::Reference< excel::XWindow > SAL_CALL
ScVbaGlobals::getActiveWindow() throw (uno::RuntimeException)
{
return getApplication()->getActiveWindow();
}
-uno::Reference< excel::XWorksheet > SAL_CALL
+uno::Reference< excel::XWorksheet > SAL_CALL
ScVbaGlobals::getActiveSheet() throw (uno::RuntimeException)
{
return getApplication()->getActiveSheet();
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaGlobals::WorkBooks( const uno::Any& aIndex ) throw (uno::RuntimeException)
{
return uno::Any( getApplication()->Workbooks(aIndex) );
@@ -124,7 +133,7 @@ ScVbaGlobals::Sheets( const uno::Any& aIndex ) throw (uno::RuntimeException)
return WorkSheets( aIndex );
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaGlobals::Range( const uno::Any& Cell1, const uno::Any& Cell2 ) throw (uno::RuntimeException)
{
return getApplication()->Range( Cell1, Cell2 );
@@ -136,97 +145,116 @@ ScVbaGlobals::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeException
return getApplication()->Names( aIndex );
}
-uno::Reference< excel::XRange > SAL_CALL
+uno::Reference< excel::XRange > SAL_CALL
ScVbaGlobals::getActiveCell() throw (uno::RuntimeException)
{
return getApplication()->getActiveCell();
}
-uno::Reference< XAssistant > SAL_CALL
+uno::Reference< XAssistant > SAL_CALL
ScVbaGlobals::getAssistant() throw (uno::RuntimeException)
{
return getApplication()->getAssistant();
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaGlobals::getSelection() throw (uno::RuntimeException)
{
return getApplication()->getSelection();
}
-uno::Reference< excel::XWorkbook > SAL_CALL
+uno::Reference< excel::XWorkbook > SAL_CALL
ScVbaGlobals::getThisWorkbook() throw (uno::RuntimeException)
{
return getApplication()->getThisWorkbook();
}
-void SAL_CALL
+void SAL_CALL
ScVbaGlobals::Calculate() throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::RuntimeException)
{
return getApplication()->Calculate();
}
-uno::Reference< excel::XRange > SAL_CALL
+uno::Reference< excel::XRange > SAL_CALL
ScVbaGlobals::Cells( const uno::Any& RowIndex, const uno::Any& ColumnIndex ) throw (uno::RuntimeException)
{
return getApplication()->getActiveSheet()->Cells( RowIndex, ColumnIndex );
}
-uno::Reference< excel::XRange > SAL_CALL
+uno::Reference< excel::XRange > SAL_CALL
ScVbaGlobals::Columns( const uno::Any& aIndex ) throw (uno::RuntimeException)
{
return getApplication()->getActiveSheet()->Columns( aIndex );
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaGlobals::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
{
uno::Reference< XApplicationBase > xBase( getApplication(), uno::UNO_QUERY_THROW );
return xBase->CommandBars( aIndex );
}
-css::uno::Reference< ov::excel::XRange > SAL_CALL
+css::uno::Reference< ov::excel::XRange > SAL_CALL
ScVbaGlobals::Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
{
return getApplication()->Union( Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17, Arg18, Arg19, Arg20, Arg21, Arg22, Arg23, Arg24, Arg25, Arg26, Arg27, Arg28, Arg29, Arg30 );
}
-css::uno::Reference< ov::excel::XRange > SAL_CALL
+css::uno::Reference< ov::excel::XRange > SAL_CALL
ScVbaGlobals::Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
{
return getApplication()->Intersect( Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17, Arg18, Arg19, Arg20, Arg21, Arg22, Arg23, Arg24, Arg25, Arg26, Arg27, Arg28, Arg29, Arg30 );
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaGlobals::Evaluate( const ::rtl::OUString& Name ) throw (uno::RuntimeException)
{
return getApplication()->Evaluate( Name );
}
-css::uno::Any SAL_CALL
+css::uno::Any SAL_CALL
ScVbaGlobals::WorksheetFunction( ) throw (css::uno::RuntimeException)
{
return getApplication()->WorksheetFunction();
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaGlobals::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException)
{
return getApplication()->Windows( aIndex );
}
-uno::Reference< excel::XRange > SAL_CALL
+uno::Reference< excel::XRange > SAL_CALL
ScVbaGlobals::Rows( const uno::Any& aIndex ) throw (uno::RuntimeException)
{
return getApplication()->getActiveSheet()->Rows( aIndex );
+
+}
+
+uno::Any SAL_CALL
+ScVbaGlobals::getDebug() throw (uno::RuntimeException)
+{
+ try // return empty object on error
+ {
+ uno::Sequence< uno::Any > aArgs( 1 );
+ aArgs[ 0 ] <<= uno::Reference< XHelperInterface >( this );
+ uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_SET_THROW );
+ uno::Reference< uno::XInterface > xVBADebug = xServiceManager->createInstanceWithArgumentsAndContext(
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.Debug" ) ), aArgs, mxContext );
+ return uno::Any( xVBADebug );
+ }
+ catch( uno::Exception& )
+ {
+ }
+ return uno::Any();
}
-uno::Sequence< ::rtl::OUString > SAL_CALL
+uno::Sequence< ::rtl::OUString > SAL_CALL
ScVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException)
{
static bool bInit = false;
static uno::Sequence< rtl::OUString > serviceNames( ScVbaGlobals_BASE::getAvailableServiceNames() );
if ( !bInit )
{
- rtl::OUString names[] = {
+ rtl::OUString names[] = {
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Range" ) ),
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Workbook" ) ),
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Window" ) ),
diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx
index ae34d710240f..025cf668e34c 100644
--- a/sc/source/ui/vba/vbaglobals.hxx
+++ b/sc/source/ui/vba/vbaglobals.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +50,7 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc
ov::excel::XApplication > SAL_CALL getApplication()
throw (css::uno::RuntimeException);
public:
-
+
ScVbaGlobals( css::uno::Sequence< css::uno::Any > const& aArgs,
css::uno::Reference< css::uno::XComponentContext >const& rxContext );
//ScVbaGlobals(
@@ -82,7 +82,8 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc
virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw ( css::uno::RuntimeException );
virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-
+ virtual css::uno::Reference< ov::excel::XApplication > SAL_CALL getExcel() throw (css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL getDebug() throw (css::uno::RuntimeException);
// XMultiServiceFactory
@@ -91,4 +92,4 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
-#endif //
+#endif //
diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx
index cc76b1e60125..1248b4c734e1 100644
--- a/sc/source/ui/vba/vbahelper.cxx
+++ b/sc/source/ui/vba/vbahelper.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -173,9 +173,9 @@ void dispatchExecute(css::uno::Reference< css::frame::XModel>& xModel, USHORT nS
{
pDispatcher->Execute( nSlot , nCall );
}
- }
+ }
}
-
+
void
implnPaste()
{
@@ -197,7 +197,7 @@ implnCopy()
pViewShell->CopyToClip(NULL,false,false,true);
}
-void
+void
implnCut()
{
ScTabViewShell* pViewShell = getCurrentBestViewShell();
@@ -212,23 +212,23 @@ void implnPasteSpecial(USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_B
InsCellCmd eMoveMode = INS_NONE;
ScTabViewShell* pTabViewShell = ScTabViewShell::GetActiveViewShell();
- if ( !pTabViewShell )
+ if ( !pTabViewShell )
// none active, try next best
pTabViewShell = getCurrentBestViewShell();
if ( pTabViewShell )
{
- ScViewData* pView = pTabViewShell->GetViewData();
+ ScViewData* pView = pTabViewShell->GetViewData();
Window* pWin = ( pView != NULL ) ? pView->GetActiveWin() : NULL;
if ( pView && pWin )
{
if ( bAsLink && bOtherDoc )
pTabViewShell->PasteFromSystem(0);//SOT_FORMATSTR_ID_LINK
- else
+ else
{
ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
- ScDocument* pDoc = NULL;
+ ScDocument* pDoc = NULL;
if ( pOwnClip )
- pDoc = pOwnClip->GetDocument();
+ pDoc = pOwnClip->GetDocument();
pTabViewShell->PasteFromClip( nFlags, pDoc,
nFunction, bSkipEmpty, bTranspose, bAsLink,
eMoveMode, IDF_NONE, TRUE );
@@ -239,7 +239,7 @@ void implnPasteSpecial(USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_B
}
- uno::Reference< frame::XModel >
+ uno::Reference< frame::XModel >
getCurrentDocument() throw (uno::RuntimeException)
{
uno::Reference< frame::XModel > xModel;
@@ -249,7 +249,7 @@ getCurrentDocument() throw (uno::RuntimeException)
{
OSL_TRACE("getModelFromBasic() StarBASIC* is NULL" );
return xModel;
- }
+ }
SbxObject* p = pBasic;
SbxObject* pParent = p->GetParent();
SbxObject* pParentParent = pParent ? pParent->GetParent() : NULL;
@@ -264,7 +264,7 @@ getCurrentDocument() throw (uno::RuntimeException)
}
- uno::Any aModel;
+ uno::Any aModel;
SbxVariable *pCompVar = basicChosen->Find( UniString(RTL_CONSTASCII_USTRINGPARAM("ThisComponent")), SbxCLASS_OBJECT );
if ( pCompVar )
@@ -282,7 +282,7 @@ getCurrentDocument() throw (uno::RuntimeException)
xModel.set( xDesktop->getCurrentComponent(), uno::UNO_QUERY );
if ( !xModel.is() )
{
- throw uno::RuntimeException(
+ throw uno::RuntimeException(
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't extract model from basic ( its obviously not set yet ) therefore don't know the currently selected document") ), uno::Reference< uno::XInterface >() );
}
return xModel;
@@ -297,8 +297,8 @@ getCurrentDocument() throw (uno::RuntimeException)
else
{
OSL_TRACE("Failed to get ThisComponent");
- throw uno::RuntimeException(
- rtl::OUString(
+ throw uno::RuntimeException(
+ rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"Can't determine the currently selected document") ),
uno::Reference< uno::XInterface >() );
@@ -306,8 +306,8 @@ getCurrentDocument() throw (uno::RuntimeException)
return xModel;
}
-ScDocShell*
-getDocShell( css::uno::Reference< css::frame::XModel>& xModel )
+ScDocShell*
+getDocShell( css::uno::Reference< css::frame::XModel>& xModel )
{
uno::Reference< uno::XInterface > xIf( xModel, uno::UNO_QUERY_THROW );
ScModelObj* pModel = dynamic_cast< ScModelObj* >( xIf.get() );
@@ -318,7 +318,7 @@ getDocShell( css::uno::Reference< css::frame::XModel>& xModel )
}
-ScTabViewShell*
+ScTabViewShell*
getBestViewShell( css::uno::Reference< css::frame::XModel>& xModel )
{
ScDocShell* pDocShell = getDocShell( xModel );
@@ -327,23 +327,23 @@ getBestViewShell( css::uno::Reference< css::frame::XModel>& xModel )
return NULL;
}
-ScTabViewShell*
+ScTabViewShell*
getCurrentBestViewShell()
-{
+{
uno::Reference< frame::XModel > xModel = getCurrentDocument();
return getBestViewShell( xModel );
}
-SfxViewFrame*
+SfxViewFrame*
getCurrentViewFrame()
{
- ScTabViewShell* pViewShell = getCurrentBestViewShell();
+ ScTabViewShell* pViewShell = getCurrentBestViewShell();
if ( pViewShell )
return pViewShell->GetViewFrame();
return NULL;
}
-sal_Int32
+sal_Int32
OORGBToXLRGB( sal_Int32 nCol )
{
sal_Int32 nRed = nCol;
@@ -357,7 +357,7 @@ OORGBToXLRGB( sal_Int32 nCol )
sal_Int32 nRGB = ( (nBlue << 16) | (nGreen << 8) | nRed );
return nRGB;
}
-sal_Int32
+sal_Int32
XLRGBToOORGB( sal_Int32 nCol )
{
sal_Int32 nBlue = nCol;
@@ -371,7 +371,7 @@ XLRGBToOORGB( sal_Int32 nCol )
sal_Int32 nRGB = ( (nRed << 16) | (nGreen << 8) | nBlue );
return nRGB;
}
-uno::Any
+uno::Any
OORGBToXLRGB( const uno::Any& aCol )
{
sal_Int32 nCol=0;
@@ -379,7 +379,7 @@ OORGBToXLRGB( const uno::Any& aCol )
nCol = OORGBToXLRGB( nCol );
return uno::makeAny( nCol );
}
-uno::Any
+uno::Any
XLRGBToOORGB( const uno::Any& aCol )
{
sal_Int32 nCol=0;
@@ -405,7 +405,7 @@ void PrintOutHelper( const uno::Any& From, const uno::Any& To, const uno::Any& C
rtl::OUString sRange( RTL_CONSTASCII_USTRINGPARAM( "-" ) );
rtl::OUString sFileName;
-
+
if (( nFrom || nTo ) )
{
if ( nFrom )
@@ -425,7 +425,7 @@ void PrintOutHelper( const uno::Any& From, const uno::Any& To, const uno::Any& C
if ( pViewFrame )
{
SfxAllItemSet aArgs( SFX_APP()->GetPool() );
-
+
SfxBoolItem sfxCollate( SID_PRINT_COLLATE, bCollate );
aArgs.Put( sfxCollate, sfxCollate.Which() );
SfxInt16Item sfxCopies( SID_PRINT_COPIES, nCopies );
@@ -434,7 +434,7 @@ void PrintOutHelper( const uno::Any& From, const uno::Any& To, const uno::Any& C
{
SfxStringItem sfxFileName( SID_FILE_NAME, sFileName);
aArgs.Put( sfxFileName, sfxFileName.Which() );
-
+
}
if ( sRange.getLength() )
{
@@ -451,7 +451,7 @@ void PrintOutHelper( const uno::Any& From, const uno::Any& To, const uno::Any& C
{
if ( bPreview )
{
- if ( !pViewFrame->GetFrame().IsInPlace() )
+ if ( !pViewFrame->GetFrame().IsInPlace() )
{
SC_MOD()->InputEnterHandler();
pViewFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SFX_CALLMODE_SYNCHRON );
@@ -462,12 +462,12 @@ void PrintOutHelper( const uno::Any& From, const uno::Any& To, const uno::Any& C
else
pDispatcher->Execute( (USHORT)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
}
-
+
}
-
+
// #FIXME #TODO
// 1 ActivePrinter ( how/can we switch a printer via API? )
- // 2 PrintToFile ( ms behaviour if this option is specified but no
+ // 2 PrintToFile ( ms behaviour if this option is specified but no
// filename supplied 'PrToFileName' then the user will be prompted )
// 3 Need to check behaviour of Selected sheets with range ( e.g. From & To
// values ) in oOO these options are mutually exclusive
@@ -536,13 +536,13 @@ rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeEx
}
-rtl::OUString
+rtl::OUString
ContainerUtilities::getUniqueName( const uno::Sequence< ::rtl::OUString >& _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator)
{
return getUniqueName(_slist, _sElementName, _sSuffixSeparator, sal_Int32(2));
}
-rtl::OUString
+rtl::OUString
ContainerUtilities::getUniqueName( const uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix)
{
sal_Int32 a = _nStartSuffix;
@@ -552,7 +552,7 @@ ContainerUtilities::getUniqueName( const uno::Sequence< rtl::OUString >& _slist,
if ( nLen == 0 )
return _sElementName;
- while (bElementexists == true)
+ while (bElementexists == true)
{
for (sal_Int32 i = 0; i < nLen; i++)
{
@@ -566,17 +566,17 @@ ContainerUtilities::getUniqueName( const uno::Sequence< rtl::OUString >& _slist,
return rtl::OUString();
}
-sal_Int32
+sal_Int32
ContainerUtilities::FieldInList( const uno::Sequence< rtl::OUString >& SearchList, const rtl::OUString& SearchString )
{
sal_Int32 FieldLen = SearchList.getLength();
sal_Int32 retvalue = -1;
- for (sal_Int32 i = 0; i < FieldLen; i++)
+ for (sal_Int32 i = 0; i < FieldLen; i++)
{
// I wonder why comparing lexicographically is done
// when its a match is whats interesting?
- //if (SearchList[i].compareTo(SearchString) == 0)
- if ( SearchList[i].equals( SearchString ) )
+ //if (SearchList[i].compareTo(SearchString) == 0)
+ if ( SearchList[i].equals( SearchString ) )
{
retvalue = i;
break;
@@ -601,7 +601,7 @@ rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike )
if ( bForLike )
sResult.append(static_cast<sal_Unicode>('^'));
- while (start < end)
+ while (start < end)
{
switch (*start)
{
@@ -678,7 +678,7 @@ double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt:
}
else
{
- fConvertFactor = xDevice->getInfo().PixelPerMeterX/100000;
+ fConvertFactor = xDevice->getInfo().PixelPerMeterX/100000;
}
return fConvertFactor;
}
@@ -708,7 +708,7 @@ UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComp
double UserFormGeometryHelper::getLeft()
{
sal_Int32 nLeft = 0;
- mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ) ) >>= nLeft;
+ mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ) ) >>= nLeft;
return Millimeter::getInPoints( nLeft );
}
void UserFormGeometryHelper::setLeft( double nLeft )
@@ -718,32 +718,32 @@ UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComp
double UserFormGeometryHelper::getTop()
{
sal_Int32 nTop = 0;
- mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ) ) >>= nTop;
+ mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ) ) >>= nTop;
return Millimeter::getInPoints( nTop );
}
void UserFormGeometryHelper::setTop( double nTop )
{
- mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nTop ) ) );
+ mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nTop ) ) );
}
double UserFormGeometryHelper::getHeight()
{
sal_Int32 nHeight = 0;
- mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHGT ) ) ) >>= nHeight;
+ mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHGT ) ) ) >>= nHeight;
return Millimeter::getInPoints( nHeight );
}
void UserFormGeometryHelper::setHeight( double nHeight )
{
- mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHGT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nHeight ) ) );
+ mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHGT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nHeight ) ) );
}
double UserFormGeometryHelper::getWidth()
{
sal_Int32 nWidth = 0;
- mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLWID ) ) ) >>= nWidth;
+ mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLWID ) ) ) >>= nWidth;
return Millimeter::getInPoints( nWidth );
}
void UserFormGeometryHelper::setWidth( double nWidth)
{
- mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLWID ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nWidth ) ) );
+ mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLWID ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nWidth ) ) );
}
SfxItemSet*
@@ -751,7 +751,7 @@ ScVbaCellRangeAccess::GetDataSet( ScCellRangeObj* pRangeObj )
{
SfxItemSet* pDataSet = pRangeObj ? pRangeObj->GetCurrentDataSet( true ) : NULL ;
return pDataSet;
-
+
}
} // vba
diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx
index e37df1e118b4..86e7ba27eb2f 100644
--- a/sc/source/ui/vba/vbahyperlink.cxx
+++ b/sc/source/ui/vba/vbahyperlink.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/text/XTextFieldsSupplier.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <ooo/vba/office/MsoHyperlinkType.hpp>
#include <ooo/vba/msforms/XShape.hpp>
#include "vbarange.hxx"
diff --git a/sc/source/ui/vba/vbahyperlink.hxx b/sc/source/ui/vba/vbahyperlink.hxx
index e1520b59c15a..055c8cebe7f7 100644
--- a/sc/source/ui/vba/vbahyperlink.hxx
+++ b/sc/source/ui/vba/vbahyperlink.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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.
*
************************************************************************/
-
+
#ifndef SC_VBA_HYPERLINK_HXX
#define SC_VBA_HYPERLINK_HXX
@@ -37,7 +37,7 @@
typedef InheritedHelperInterfaceImpl1< ov::excel::XHyperlink > HyperlinkImpl_BASE;
-class ScVbaHyperlink : public HyperlinkImpl_BASE
+class ScVbaHyperlink : public HyperlinkImpl_BASE
{
public:
ScVbaHyperlink(
diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx
index 89a8109e6aa2..529b9a273104 100755
--- a/sc/source/ui/vba/vbahyperlinks.cxx
+++ b/sc/source/ui/vba/vbahyperlinks.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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.
*
************************************************************************/
-
+
#include "vbahyperlinks.hxx"
#include <algorithm>
#include <vector>
@@ -88,7 +88,7 @@ bool EqualAnchorFunctor::operator()( const uno::Reference< excel::XHyperlink >&
sal_Int32 nType = rxHlink->getType();
if( nType != mnType )
return false;
-
+
switch( nType )
{
case office::MsoHyperlinkType::msoHyperlinkRange:
@@ -125,7 +125,7 @@ public:
/** Inserts the passed hyperlink into the collection. Will remove a
Hyperlink object with the same anchor as the passed Hyperlink object. */
void insertHyperlink( const uno::Reference< excel::XHyperlink >& rxHlink ) throw (uno::RuntimeException);
-
+
// XIndexAccess
virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException);
virtual uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException);
@@ -133,7 +133,7 @@ public:
// XElementAccess
virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException);
virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException);
-
+
private:
typedef ::std::vector< uno::Reference< excel::XHyperlink > > HyperlinkVector;
HyperlinkVector maHlinks;
@@ -251,7 +251,7 @@ uno::Reference< excel::XHyperlink > SAL_CALL ScVbaHyperlinks::Add(
the spreadsheet document. Parent of the Hyperlink is the anchor object. */
uno::Reference< excel::XHyperlink > xHlink( new ScVbaHyperlink(
xAnchor, mxContext, rAddress, rSubAddress, rScreenTip, rTextToDisplay ) );
-
+
/* If creation of the hyperlink did not throw, insert it into the
collection. */
mxContainer->insertHyperlink( xHlink );
diff --git a/sc/source/ui/vba/vbahyperlinks.hxx b/sc/source/ui/vba/vbahyperlinks.hxx
index ca7d990ad6a8..8ce015101bc4 100755
--- a/sc/source/ui/vba/vbahyperlinks.hxx
+++ b/sc/source/ui/vba/vbahyperlinks.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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.
*
************************************************************************/
-
+
#ifndef SC_VBA_HYPERLINKS_HXX
#define SC_VBA_HYPERLINKS_HXX
@@ -67,7 +67,7 @@ typedef CollTestImplHelper< ov::excel::XHyperlinks > ScVbaHyperlinks_BASE;
Worksheet object, it will always represent the current set of all
hyperlinks existing in the sheet. Insertion and deletion of hyperlinks will
be reflected by the instance.
-
+
When a Hyperlinks collection object has been constructed from a VBA Range
object, it will represent the set of hyperlinks that have existed at its
construction time, and that are located completely inside the range(s)
@@ -76,9 +76,9 @@ typedef CollTestImplHelper< ov::excel::XHyperlinks > ScVbaHyperlinks_BASE;
hyperlinks it has been constructed with, even if they no longer exist.
Furthermore, the instance will not offer hyperlinks inserted later, even if
the instance itself has been used to insert the new hyperlinks.
-
+
VBA code example:
-
+
With ThisWorkbook.Worksheets(1)
Set hlinks = .Hyperlinks ' global Hyperlinks object
@@ -131,7 +131,7 @@ public:
// XEnumerationAccess
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-
+
// XElementAccess
virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx
index face47767bdc..431dae683802 100644
--- a/sc/source/ui/vba/vbainterior.cxx
+++ b/sc/source/ui/vba/vbainterior.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,17 +95,17 @@ ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent,
m_aPattColor.SetColor( (sal_uInt32)0x0 );
m_nPattern = 0L;
if ( !m_xProps.is() )
- throw lang::IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "properties") ), uno::Reference< uno::XInterface >(), 2 );
+ throw lang::IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "properties") ), uno::Reference< uno::XInterface >(), 2 );
}
uno::Any
-ScVbaInterior::getColor() throw (uno::RuntimeException)
+ScVbaInterior::getColor() throw (uno::RuntimeException)
{
Color aBackColor( GetBackColor() );
return uno::makeAny( OORGBToXLRGB( aBackColor.GetColor() ) );
}
-
-void
+
+void
ScVbaInterior::setColor( const uno::Any& _color ) throw (uno::RuntimeException)
{
sal_Int32 nColor = 0;
@@ -150,15 +150,15 @@ ScVbaInterior::SetMixedColor()
uno::Reference< container::XIndexAccess >
ScVbaInterior::getPalette()
{
- if ( !m_pScDoc )
+ if ( !m_pScDoc )
throw uno::RuntimeException();
SfxObjectShell* pShell = m_pScDoc->GetDocumentShell();
- ScVbaPalette aPalette( pShell );
- return aPalette.getPalette();
+ ScVbaPalette aPalette( pShell );
+ return aPalette.getPalette();
}
-void SAL_CALL
-ScVbaInterior::setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException)
+void SAL_CALL
+ScVbaInterior::setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException)
{
sal_Int32 nIndex = 0;
_colorindex >>= nIndex;
@@ -204,16 +204,16 @@ ScVbaInterior::GetColorIndex( const sal_Int32 nColor )
nIndex = count + 1; // 1 based
break;
}
- }
+ }
return nIndex;
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaInterior::getColorIndex() throw ( css::uno::RuntimeException )
{
sal_Int32 nColor = 0;
// hackly for excel::XlColorIndex::xlColorIndexNone
- uno::Any aColor = m_xProps->getPropertyValue( BACKCOLOR );
+ uno::Any aColor = m_xProps->getPropertyValue( BACKCOLOR );
if( ( aColor >>= nColor ) && ( nColor == -1 ) )
{
nColor = excel::XlColorIndex::xlColorIndexNone;
@@ -221,11 +221,11 @@ ScVbaInterior::getColorIndex() throw ( css::uno::RuntimeException )
}
// getColor returns Xl ColorValue, need to convert it to OO val
- // as the palette deals with OO RGB values
- // #FIXME this is daft in getColor we convert OO RGB val to XL RGB val
+ // as the palette deals with OO RGB values
+ // #FIXME this is daft in getColor we convert OO RGB val to XL RGB val
// and then back again to OO RGB value
- XLRGBToOORGB( getColor() ) >>= nColor;
-
+ XLRGBToOORGB( getColor() ) >>= nColor;
+
return uno::makeAny( GetColorIndex( nColor ) );
}
Color
@@ -245,7 +245,7 @@ ScVbaInterior::GetPatternColor( const Color& rPattColor, const Color& rBackColor
Color
ScVbaInterior::GetMixedColor( const Color& rFore, const Color& rBack, sal_uInt8 nTrans )
{
- return Color(
+ return Color(
nTrans,
GetMixedColorComp( rFore.GetRed(), rBack.GetRed(), nTrans ),
GetMixedColorComp( rFore.GetGreen(), rBack.GetGreen(), nTrans ),
@@ -304,7 +304,7 @@ ScVbaInterior::SetUserDefinedAttributes( const rtl::OUString& sName, const uno::
}
}
// OOo do not support below API
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaInterior::getPattern() throw (uno::RuntimeException)
{
// XlPattern
@@ -313,7 +313,7 @@ ScVbaInterior::getPattern() throw (uno::RuntimeException)
return uno::makeAny( GetAttributeData( aPattern ) );
return uno::makeAny( excel::XlPattern::xlPatternNone );
}
-void SAL_CALL
+void SAL_CALL
ScVbaInterior::setPattern( const uno::Any& _pattern ) throw (uno::RuntimeException)
{
if( _pattern >>= m_nPattern )
@@ -329,7 +329,7 @@ ScVbaInterior::GetBackColor()
{
sal_Int32 nColor = 0;
Color aBackColor;
- uno::Any aColor = GetUserDefinedAttributes( BACKCOLOR );
+ uno::Any aColor = GetUserDefinedAttributes( BACKCOLOR );
if( aColor.hasValue() )
{
nColor = GetAttributeData( aColor );
@@ -348,7 +348,7 @@ ScVbaInterior::GetBackColor()
}
return aBackColor;
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaInterior::getPatternColor() throw (uno::RuntimeException)
{
// 0 is the default color. no filled.
@@ -360,7 +360,7 @@ ScVbaInterior::getPatternColor() throw (uno::RuntimeException)
}
return uno::makeAny( sal_Int32( 0 ) );
}
-void SAL_CALL
+void SAL_CALL
ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::RuntimeException)
{
sal_Int32 nPattColor = 0;
@@ -372,15 +372,15 @@ ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::Runt
else
throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() );
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaInterior::getPatternColorIndex() throw (uno::RuntimeException)
{
sal_Int32 nColor = 0;
- XLRGBToOORGB( getPatternColor() ) >>= nColor;
-
+ XLRGBToOORGB( getPatternColor() ) >>= nColor;
+
return uno::makeAny( GetIndexColor( nColor ) );
}
-void SAL_CALL
+void SAL_CALL
ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw (uno::RuntimeException)
{
sal_Int32 nColorIndex = 0;
@@ -396,14 +396,14 @@ ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw
throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() );
}
-rtl::OUString&
+rtl::OUString&
ScVbaInterior::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaInterior") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaInterior::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx
index 027d06040af9..1d2c6eb2e230 100644
--- a/sc/source/ui/vba/vbainterior.hxx
+++ b/sc/source/ui/vba/vbainterior.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +47,9 @@ class ScVbaInterior : public ScVbaInterior_BASE
css::uno::Reference< css::beans::XPropertySet > m_xProps;
ScDocument* m_pScDoc;
Color m_aPattColor;
- sal_Int32 m_nPattern;
+ sal_Int32 m_nPattern;
- css::uno::Reference< css::container::XIndexAccess > getPalette();
+ css::uno::Reference< css::container::XIndexAccess > getPalette();
css::uno::Reference< css::container::XNameContainer > GetAttributeContainer();
css::uno::Any SetAttributeData( sal_Int32 nValue );
sal_Int32 GetAttributeData( css::uno::Any aValue );
@@ -79,7 +79,7 @@ public:
virtual css::uno::Any SAL_CALL getPatternColor() throw (css::uno::RuntimeException);
virtual void SAL_CALL setPatternColor( const css::uno::Any& _patterncolor ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getPatternColorIndex() throw (css::uno::RuntimeException);
- virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) throw (css::uno::RuntimeException);
//XHelperInterface
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx
index 464b167df250..66381c15ec04 100644
--- a/sc/source/ui/vba/vbaname.cxx
+++ b/sc/source/ui/vba/vbaname.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +42,12 @@
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-ScVbaName::ScVbaName(const css::uno::Reference< ov::XHelperInterface >& xParent,
+ScVbaName::ScVbaName(const css::uno::Reference< ov::XHelperInterface >& xParent,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::sheet::XNamedRange >& xName,
const css::uno::Reference< css::sheet::XNamedRanges >& xNames,
const css::uno::Reference< css::frame::XModel >& xModel ):
- NameImpl_BASE( xParent , xContext ),
+ NameImpl_BASE( xParent , xContext ),
mxModel( xModel ),
mxNamedRange( xName ),
mxNames( xNames )
@@ -122,7 +122,7 @@ ScVbaName::getValue() throw (css::uno::RuntimeException)
{
::rtl::OUString sTmp = sTmpValue.copy( 1 );
sTmp = sTmp.replaceAt(0, (sSheetName + ::rtl::OUString::createFromAscii(".")).getLength(), sSheetName + ::rtl::OUString::createFromAscii("!"));
- sResult += sTmp;
+ sResult += sTmp;
sResult += sNewSegmentation;
}
nFrom = nTo + 1;
@@ -142,7 +142,7 @@ ScVbaName::getValue() throw (css::uno::RuntimeException)
return sResult;
}
-void
+void
ScVbaName::setValue( const ::rtl::OUString & rValue ) throw (css::uno::RuntimeException)
{
::rtl::OUString sSheetName = getWorkSheet()->getName();
@@ -181,25 +181,25 @@ ScVbaName::setValue( const ::rtl::OUString & rValue ) throw (css::uno::RuntimeEx
mxNamedRange->setContent(sResult);
}
-::rtl::OUString
+::rtl::OUString
ScVbaName::getRefersTo() throw (css::uno::RuntimeException)
{
return getValue();
}
-void
+void
ScVbaName::setRefersTo( const ::rtl::OUString & rRefersTo ) throw (css::uno::RuntimeException)
{
setValue( rRefersTo );
}
-::rtl::OUString
+::rtl::OUString
ScVbaName::getRefersToLocal() throw (css::uno::RuntimeException)
{
return getRefersTo();
}
-void
+void
ScVbaName::setRefersToLocal( const ::rtl::OUString & rRefersTo ) throw (css::uno::RuntimeException)
{
setRefersTo( rRefersTo );
@@ -217,7 +217,7 @@ ScVbaName::setRefersToR1C1( const ::rtl::OUString & rRefersTo ) throw (css::uno:
setRefersTo( rRefersTo );
}
-::rtl::OUString
+::rtl::OUString
ScVbaName::getRefersToR1C1Local() throw (css::uno::RuntimeException)
{
return getRefersTo();
@@ -245,7 +245,7 @@ ScVbaName::setRefersToRange( const css::uno::Reference< ov::excel::XRange > /*rR
void
ScVbaName::Delete() throw (css::uno::RuntimeException)
{
- mxNames->removeByName( mxNamedRange->getName() );
+ mxNames->removeByName( mxNamedRange->getName() );
}
rtl::OUString&
diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx
index 81b2555a4ce1..1378647b843a 100644
--- a/sc/source/ui/vba/vbaname.hxx
+++ b/sc/source/ui/vba/vbaname.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +33,11 @@
#include <vbahelper/vbahelperinterface.hxx>
-class ScDocument;
+class ScDocument;
typedef InheritedHelperInterfaceImpl1< ov::excel::XName > NameImpl_BASE;
-class ScVbaName : public NameImpl_BASE
+class ScVbaName : public NameImpl_BASE
{
css::uno::Reference< css::frame::XModel > mxModel;
css::uno::Reference< css::sheet::XNamedRange > mxNamedRange;
diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx
index 2304874bdb1b..6a3291492f4d 100644
--- a/sc/source/ui/vba/vbanames.cxx
+++ b/sc/source/ui/vba/vbanames.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +59,11 @@ public:
};
-ScVbaNames::ScVbaNames(const css::uno::Reference< ov::XHelperInterface >& xParent,
+ScVbaNames::ScVbaNames(const css::uno::Reference< ov::XHelperInterface >& xParent,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::sheet::XNamedRanges >& xNames,
const css::uno::Reference< css::frame::XModel >& xModel ):
- ScVbaNames_BASE( xParent , xContext , uno::Reference< container::XIndexAccess >( xNames, uno::UNO_QUERY ) ),
+ ScVbaNames_BASE( xParent , xContext , uno::Reference< container::XIndexAccess >( xNames, uno::UNO_QUERY ) ),
mxModel( xModel ),
mxNames( xNames )
{
@@ -100,7 +100,7 @@ ScVbaNames::Add( const css::uno::Any& Name ,
const css::uno::Any& RefersToR1C1,
const css::uno::Any& RefersToR1C1Local ) throw (css::uno::RuntimeException)
{
-
+
rtl::OUString sName;
uno::Reference< excel::XRange > xRange;
if ( Name.hasValue() )
@@ -153,7 +153,7 @@ ScVbaNames::Add( const css::uno::Any& Name ,
sTmp += sRangeAdd;
if ( mxNames.is() )
{
- RangeType nType = RT_NAME;
+ RangeType nType = RT_NAME;
table::CellAddress aCellAddr( aAddr.Sheet , aAddr.StartColumn , aAddr.StartRow );
if ( mxNames->hasByName( sName ) )
mxNames->removeByName(sName);
@@ -164,7 +164,7 @@ ScVbaNames::Add( const css::uno::Any& Name ,
}
// XEnumerationAccess
-css::uno::Type
+css::uno::Type
ScVbaNames::getElementType() throw( css::uno::RuntimeException )
{
return ov::excel::XName::static_type(0);
@@ -173,11 +173,6 @@ ScVbaNames::getElementType() throw( css::uno::RuntimeException )
uno::Reference< container::XEnumeration >
ScVbaNames::createEnumeration() throw (uno::RuntimeException)
{
- if ( mxNames.is() )
- {
- uno::Reference< container::XEnumerationAccess > xAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
- return xAccess->createEnumeration();
- }
uno::Reference< container::XEnumerationAccess > xEnumAccess( mxNames, uno::UNO_QUERY_THROW );
return new NamesEnumeration( this, mxContext, xEnumAccess->createEnumeration(), mxModel , mxNames );
}
@@ -189,14 +184,14 @@ ScVbaNames::createCollectionObject( const uno::Any& aSource )
return uno::makeAny( uno::Reference< excel::XName > ( new ScVbaName( getParent(), mxContext, xName, mxNames , mxModel ) ) );
}
-rtl::OUString&
+rtl::OUString&
ScVbaNames::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaNames") );
return sImplName;
-}
+}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<rtl::OUString>
ScVbaNames::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbanames.hxx b/sc/source/ui/vba/vbanames.hxx
index 1997ac6163d7..1e1d06324602 100644
--- a/sc/source/ui/vba/vbanames.hxx
+++ b/sc/source/ui/vba/vbanames.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +42,13 @@ class ScVbaNames : public ScVbaNames_BASE
{
css::uno::Reference< css::frame::XModel > mxModel;
css::uno::Reference< css::sheet::XNamedRanges > mxNames;
-
+
protected:
virtual css::uno::Reference< css::frame::XModel > getModel() { return mxModel; }
public:
ScVbaNames( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XNamedRanges >& xNames , const css::uno::Reference< css::frame::XModel >& xModel );
-
+
ScDocument* getScDocument();
ScDocShell* getScDocShell();
@@ -59,7 +59,7 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
// Methods
- virtual css::uno::Any SAL_CALL Add( const css::uno::Any& aName ,
+ virtual css::uno::Any SAL_CALL Add( const css::uno::Any& aName ,
const css::uno::Any& aRefersTo,
const css::uno::Any& aVisible,
const css::uno::Any& aMacroType,
@@ -70,7 +70,7 @@ public:
const css::uno::Any& aCategoryLocal,
const css::uno::Any& aRefersToR1C1,
const css::uno::Any& aRefersToR1C1Local ) throw (css::uno::RuntimeException);
-
+
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
// ScVbaNames_BASE
diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx
index a35ce4b3120f..9ca23d9bd8db 100644
--- a/sc/source/ui/vba/vbaoleobject.cxx
+++ b/sc/source/ui/vba/vbaoleobject.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,94 +64,94 @@ ScVbaOLEObject::ScVbaOLEObject( const uno::Reference< XHelperInterface >& xParen
m_xControl.set( xControlProvider->createControl( xControlShape, xModel ) );
}
-uno::Reference< uno::XInterface > SAL_CALL
+uno::Reference< uno::XInterface > SAL_CALL
ScVbaOLEObject::getObject() throw (uno::RuntimeException)
{
return uno::Reference< uno::XInterface >( m_xControlShape, uno::UNO_QUERY_THROW );
}
-sal_Bool SAL_CALL
+sal_Bool SAL_CALL
ScVbaOLEObject::getEnabled() throw (uno::RuntimeException)
{
return m_xControl->getEnabled();
}
-void SAL_CALL
+void SAL_CALL
ScVbaOLEObject::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException)
{
m_xControl->setEnabled( _enabled );
}
-sal_Bool SAL_CALL
+sal_Bool SAL_CALL
ScVbaOLEObject::getVisible() throw (uno::RuntimeException)
{
OSL_TRACE("OleObject %s returning visible %s", rtl::OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), m_xControl->getVisible() ? "true" : "false" );
return m_xControl->getVisible();
}
-void SAL_CALL
+void SAL_CALL
ScVbaOLEObject::setVisible( sal_Bool _visible ) throw (uno::RuntimeException)
{
OSL_TRACE("OleObject %s set visible %s", rtl::OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), _visible ? "true" : "false" );
m_xControl->setVisible( _visible );
}
-double SAL_CALL
+double SAL_CALL
ScVbaOLEObject::getLeft() throw (uno::RuntimeException)
{
return m_xControl->getLeft();
}
-void SAL_CALL
+void SAL_CALL
ScVbaOLEObject::setLeft( double _left ) throw (uno::RuntimeException)
{
m_xControl->setLeft( _left );
}
-double SAL_CALL
+double SAL_CALL
ScVbaOLEObject::getTop() throw (uno::RuntimeException)
{
return m_xControl->getTop();
}
-void SAL_CALL
+void SAL_CALL
ScVbaOLEObject::setTop( double _top ) throw (uno::RuntimeException)
{
m_xControl->setTop( _top );
}
-double SAL_CALL
+double SAL_CALL
ScVbaOLEObject::getHeight() throw (uno::RuntimeException)
{
return m_xControl->getHeight();
}
-void SAL_CALL
+void SAL_CALL
ScVbaOLEObject::setHeight( double _height ) throw (uno::RuntimeException)
{
m_xControl->setHeight( _height );
}
-double SAL_CALL
+double SAL_CALL
ScVbaOLEObject::getWidth() throw (uno::RuntimeException)
{
return m_xControl->getWidth();
}
-void SAL_CALL
+void SAL_CALL
ScVbaOLEObject::setWidth( double _width ) throw (uno::RuntimeException)
{
m_xControl->setWidth( _width );
}
-rtl::OUString&
+rtl::OUString&
ScVbaOLEObject::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaOLEObject") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaOLEObject::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxx
index 008564d71e16..c82bb328a0a3 100644
--- a/sc/source/ui/vba/vbaoleobject.hxx
+++ b/sc/source/ui/vba/vbaoleobject.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ public:
virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException);
virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException);
virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException);
-
+
};
#endif //SC_VBA_OLEOBJECT_HXX
diff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxx
index 69ba36cf8279..c097963514b3 100644
--- a/sc/source/ui/vba/vbaoleobjects.cxx
+++ b/sc/source/ui/vba/vbaoleobjects.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 IndexAccessWrapper : public XIndexAccess_BASE
typedef std::vector< uno::Reference< drawing::XControlShape > > OLEObjects;
OLEObjects vObjects;
public:
- IndexAccessWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess )
+ IndexAccessWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess )
{
sal_Int32 nLen = xIndexAccess->getCount();
for ( sal_Int32 index = 0; index < nLen; ++index )
@@ -63,7 +63,7 @@ public:
{
if ( Index < 0 || Index >= getCount() )
throw lang::IndexOutOfBoundsException();
- return uno::makeAny( vObjects[ Index ] );
+ return uno::makeAny( vObjects[ Index ] );
}
// Methods XElementAcess
@@ -165,14 +165,14 @@ ScVbaOLEObjects::getElementType() throw (uno::RuntimeException)
{
return ooo::vba::excel::XOLEObject::static_type(0);
}
-rtl::OUString&
+rtl::OUString&
ScVbaOLEObjects::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaOLEObjects") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaOLEObjects::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbaoleobjects.hxx b/sc/source/ui/vba/vbaoleobjects.hxx
index ab4ed29d163d..aca72df14209 100644
--- a/sc/source/ui/vba/vbaoleobjects.hxx
+++ b/sc/source/ui/vba/vbaoleobjects.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ protected:
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
public:
- ScVbaOLEObjects( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
+ ScVbaOLEObjects( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess );
// XEnumerationAccess
@@ -51,7 +51,7 @@ public:
// ScVbaCollectionBaseImpl
virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
-
+
};
#endif //SC_VBA_OLEOBJECTS_HXX
diff --git a/sc/source/ui/vba/vbaoutline.cxx b/sc/source/ui/vba/vbaoutline.cxx
index ee4c78c73151..65e29fd83b69 100644
--- a/sc/source/ui/vba/vbaoutline.cxx
+++ b/sc/source/ui/vba/vbaoutline.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +29,15 @@ using namespace ::com::sun::star;
using namespace ::ooo::vba;
void
-ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevels ) throw (uno::RuntimeException)
+ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevels ) throw (uno::RuntimeException)
{
sal_Int16 nLevel = 0;
- if (mxOutline.is())
+ if (mxOutline.is())
{
if (RowLevels >>= nLevel)
{
mxOutline->showLevel(nLevel, table::TableOrientation_ROWS);
- }
+ }
if (ColumnLevels >>= nLevel)
{
mxOutline->showLevel(nLevel,table::TableOrientation_COLUMNS);
@@ -45,14 +45,14 @@ ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevel
}
}
-rtl::OUString&
+rtl::OUString&
ScVbaOutline::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaOutline") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaOutline::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbaoutline.hxx b/sc/source/ui/vba/vbaoutline.hxx
index c954842cf7fd..28632e8302d7 100644
--- a/sc/source/ui/vba/vbaoutline.hxx
+++ b/sc/source/ui/vba/vbaoutline.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
typedef InheritedHelperInterfaceImpl1< ov::excel::XOutline > ScVbaOutline_BASE;
-class ScVbaOutline : public ScVbaOutline_BASE
+class ScVbaOutline : public ScVbaOutline_BASE
{
css::uno::Reference< css::sheet::XSheetOutline > mxOutline;
public:
@@ -43,7 +43,7 @@ public:
css::uno::Reference<css::sheet::XSheetOutline> outline): ScVbaOutline_BASE( xParent, xContext) , mxOutline(outline)
{}
virtual ~ScVbaOutline(){}
-
+
virtual void SAL_CALL ShowLevels( const css::uno::Any& RowLevels, const css::uno::Any& ColumnLevels ) throw (css::uno::RuntimeException) ;
// XHelperInterface
virtual rtl::OUString& getServiceImplName();
diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx
index 1103c10f54c8..44bbd595464f 100644
--- a/sc/source/ui/vba/vbapagebreak.cxx
+++ b/sc/source/ui/vba/vbapagebreak.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using namespace ::com::sun::star;
using namespace ::ooo::vba;
template< typename Ifc1 >
-ScVbaPageBreak<Ifc1>::ScVbaPageBreak( const uno::Reference< XHelperInterface >& xParent,
+ScVbaPageBreak<Ifc1>::ScVbaPageBreak( const uno::Reference< XHelperInterface >& xParent,
const uno::Reference< uno::XComponentContext >& xContext,
uno::Reference< beans::XPropertySet >& xProps,
sheet::TablePageBreakData aTablePageBreakData) throw (uno::RuntimeException):
@@ -42,7 +42,7 @@ ScVbaPageBreak<Ifc1>::ScVbaPageBreak( const uno::Reference< XHelperInterface >&
}
template< typename Ifc1 >
-sal_Int32 ScVbaPageBreak<Ifc1>::getType() throw (uno::RuntimeException)
+sal_Int32 ScVbaPageBreak<Ifc1>::getType() throw (uno::RuntimeException)
{
uno::Any aValue = mxRowColPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsStartOfNewPage" )));
sal_Bool hasPageBreak = sal_False;
@@ -50,17 +50,17 @@ sal_Int32 ScVbaPageBreak<Ifc1>::getType() throw (uno::RuntimeException)
if( !hasPageBreak )
return excel::XlPageBreak::xlPageBreakNone;
-
+
if( maTablePageBreakData.ManualBreak )
return excel::XlPageBreak::xlPageBreakManual;
-
+
return excel::XlPageBreak::xlPageBreakAutomatic;
}
template< typename Ifc1 >
-void ScVbaPageBreak<Ifc1>::setType(sal_Int32 type) throw (uno::RuntimeException)
+void ScVbaPageBreak<Ifc1>::setType(sal_Int32 type) throw (uno::RuntimeException)
{
- if( (type != excel::XlPageBreak::xlPageBreakNone) &&
+ if( (type != excel::XlPageBreak::xlPageBreakNone) &&
(type != excel::XlPageBreak::xlPageBreakManual) &&
(type != excel::XlPageBreak::xlPageBreakAutomatic) )
{
@@ -94,7 +94,7 @@ uno::Reference< excel::XRange> ScVbaPageBreak<Ifc1>::Location() throw ( script::
}
template< typename Ifc1 >
-rtl::OUString&
+rtl::OUString&
ScVbaPageBreak<Ifc1>::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPageBreak") );
@@ -102,7 +102,7 @@ ScVbaPageBreak<Ifc1>::getServiceImplName()
}
template< typename Ifc1 >
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaPageBreak<Ifc1>::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
@@ -117,14 +117,14 @@ ScVbaPageBreak<Ifc1>::getServiceNames()
template class ScVbaPageBreak< excel::XHPageBreak >;
/* class ScVbaHPageBreak */
-rtl::OUString&
+rtl::OUString&
ScVbaHPageBreak::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaHPageBreak") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaHPageBreak::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
@@ -139,26 +139,26 @@ ScVbaHPageBreak::getServiceNames()
template class ScVbaPageBreak< excel::XVPageBreak >;
/* class ScVbaVPageBreak */
-ScVbaVPageBreak::ScVbaVPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent,
+ScVbaVPageBreak::ScVbaVPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
css::uno::Reference< css::beans::XPropertySet >& xProps,
css::sheet::TablePageBreakData aTablePageBreakData ) throw ( css::uno::RuntimeException )
: ScVbaVPageBreak_BASE( xParent, xContext, xProps, aTablePageBreakData )
{
}
-
+
ScVbaVPageBreak::~ScVbaVPageBreak()
{
}
-rtl::OUString&
+rtl::OUString&
ScVbaVPageBreak::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaVPageBreak") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaVPageBreak::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx
index 4832464c1296..dd30bb533c50 100644
--- a/sc/source/ui/vba/vbapagebreak.hxx
+++ b/sc/source/ui/vba/vbapagebreak.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +46,12 @@ protected:
css::uno::Reference< css::beans::XPropertySet > mxRowColPropertySet;
css::sheet::TablePageBreakData maTablePageBreakData;
public:
- ScVbaPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent,
+ ScVbaPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
css::uno::Reference< css::beans::XPropertySet >& xProps,
css::sheet::TablePageBreakData aTablePageBreakData) throw (css::uno::RuntimeException);
virtual ~ScVbaPageBreak(){}
-
+
virtual sal_Int32 SAL_CALL getType( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL setType(sal_Int32 type) throw (css::uno::RuntimeException);
@@ -69,14 +69,14 @@ typedef ScVbaPageBreak < ov::excel::XHPageBreak > ScVbaHPageBreak_BASE;
class ScVbaHPageBreak : public ScVbaHPageBreak_BASE
{
public:
- ScVbaHPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent,
+ ScVbaHPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
css::uno::Reference< css::beans::XPropertySet >& xProps,
css::sheet::TablePageBreakData aTablePageBreakData) throw (css::uno::RuntimeException):
ScVbaHPageBreak_BASE( xParent,xContext,xProps,aTablePageBreakData ){}
-
+
virtual ~ScVbaHPageBreak(){}
-
+
// XHelperInterface
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
@@ -88,13 +88,13 @@ typedef ScVbaPageBreak < ov::excel::XVPageBreak > ScVbaVPageBreak_BASE;
class ScVbaVPageBreak : public ScVbaVPageBreak_BASE
{
public:
- ScVbaVPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent,
+ ScVbaVPageBreak( const css::uno::Reference< ov::XHelperInterface >& xParent,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
css::uno::Reference< css::beans::XPropertySet >& xProps,
css::sheet::TablePageBreakData aTablePageBreakData) throw (css::uno::RuntimeException);
-
+
virtual ~ScVbaVPageBreak();
-
+
// XHelperInterface
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx
index 25ccbb0f4cdc..ebb5a0d9cfc9 100644
--- a/sc/source/ui/vba/vbapagebreaks.cxx
+++ b/sc/source/ui/vba/vbapagebreaks.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ public:
* To become completely compatible the print area has to be considered. As far as I found out this printarea
* also considers the position and sizes of shapes and manually inserted page breaks
* Note: In MS there is a limit of 1026 horizontal page breaks per sheet.
-*/
+*/
sal_Int32 SAL_CALL RangePageBreaks::getCount( ) throw (uno::RuntimeException)
{
sal_Int32 nCount = 0;
@@ -209,10 +209,10 @@ public:
}
};
-ScVbaHPageBreaks::ScVbaHPageBreaks( const uno::Reference< XHelperInterface >& xParent,
+ScVbaHPageBreaks::ScVbaHPageBreaks( const uno::Reference< XHelperInterface >& xParent,
const uno::Reference< uno::XComponentContext >& xContext,
uno::Reference< sheet::XSheetPageBreak >& xSheetPageBreak) throw (uno::RuntimeException):
- ScVbaHPageBreaks_BASE( xParent,xContext, new RangePageBreaks( xParent, xContext, xSheetPageBreak, sal_False )),
+ ScVbaHPageBreaks_BASE( xParent,xContext, new RangePageBreaks( xParent, xContext, xSheetPageBreak, sal_False )),
mxSheetPageBreak( xSheetPageBreak )
{
}
@@ -239,20 +239,20 @@ ScVbaHPageBreaks::createCollectionObject( const css::uno::Any& aSource )
return aSource; // its already a pagebreak object
}
-uno::Type
+uno::Type
ScVbaHPageBreaks::getElementType() throw (uno::RuntimeException)
{
return excel::XHPageBreak::static_type(0);
}
-rtl::OUString&
+rtl::OUString&
ScVbaHPageBreaks::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaHPageBreaks") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaHPageBreaks::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
@@ -265,10 +265,10 @@ ScVbaHPageBreaks::getServiceNames()
}
//VPageBreak
-ScVbaVPageBreaks::ScVbaVPageBreaks( const uno::Reference< XHelperInterface >& xParent,
+ScVbaVPageBreaks::ScVbaVPageBreaks( const uno::Reference< XHelperInterface >& xParent,
const uno::Reference< uno::XComponentContext >& xContext,
uno::Reference< sheet::XSheetPageBreak >& xSheetPageBreak ) throw ( uno::RuntimeException )
-: ScVbaVPageBreaks_BASE( xParent, xContext, new RangePageBreaks( xParent, xContext, xSheetPageBreak, sal_True ) ),
+: ScVbaVPageBreaks_BASE( xParent, xContext, new RangePageBreaks( xParent, xContext, xSheetPageBreak, sal_True ) ),
mxSheetPageBreak( xSheetPageBreak )
{
}
@@ -277,7 +277,7 @@ ScVbaVPageBreaks::~ScVbaVPageBreaks()
{
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaVPageBreaks::Add( const uno::Any& Before ) throw ( script::BasicErrorException, uno::RuntimeException )
{
RangePageBreaks* pPageBreaks = dynamic_cast< RangePageBreaks* >( m_xIndexAccess.get() );
@@ -300,20 +300,20 @@ ScVbaVPageBreaks::createCollectionObject( const css::uno::Any& aSource )
return aSource; // its already a pagebreak object
}
-uno::Type
+uno::Type
ScVbaVPageBreaks::getElementType() throw ( uno::RuntimeException )
{
return excel::XVPageBreak::static_type( 0 );
}
-rtl::OUString&
+rtl::OUString&
ScVbaVPageBreaks::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM( "ScVbaVPageBreaks" ) );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaVPageBreaks::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbapagebreaks.hxx b/sc/source/ui/vba/vbapagebreaks.hxx
index de6174191e95..8060e11622c7 100644
--- a/sc/source/ui/vba/vbapagebreaks.hxx
+++ b/sc/source/ui/vba/vbapagebreaks.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ class ScVbaHPageBreaks : public ScVbaHPageBreaks_BASE
{
css::uno::Reference< css::sheet::XSheetPageBreak > mxSheetPageBreak;
public:
- ScVbaHPageBreaks( const css::uno::Reference< ov::XHelperInterface >& xParent,
+ ScVbaHPageBreaks( const css::uno::Reference< ov::XHelperInterface >& xParent,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
css::uno::Reference< css::sheet::XSheetPageBreak >& xSheetPageBreak) throw (css::uno::RuntimeException);
virtual ~ScVbaHPageBreaks(){}
- // XHPageBreaks
+ // XHPageBreaks
virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before) throw ( css::script::BasicErrorException, css::uno::RuntimeException);
// XEnumerationAccess
virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
- virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
virtual css::uno::Any createCollectionObject(const css::uno::Any&);
// XHelperInterface
@@ -75,18 +75,18 @@ class ScVbaVPageBreaks : public ScVbaVPageBreaks_BASE
css::uno::Reference< css::sheet::XSheetPageBreak > mxSheetPageBreak;
public:
- ScVbaVPageBreaks( const css::uno::Reference< ov::XHelperInterface >& xParent,
+ ScVbaVPageBreaks( const css::uno::Reference< ov::XHelperInterface >& xParent,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
css::uno::Reference< css::sheet::XSheetPageBreak >& xSheetPageBreak ) throw ( css::uno::RuntimeException );
virtual ~ScVbaVPageBreaks();
- // XVPageBreaks
+ // XVPageBreaks
virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException );
// XEnumerationAccess
virtual css::uno::Type SAL_CALL getElementType() throw ( css::uno::RuntimeException );
- virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw ( css::uno::RuntimeException );
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw ( css::uno::RuntimeException );
virtual css::uno::Any createCollectionObject( const css::uno::Any& );
// XHelperInterface
diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx
index d660ddbbfd77..eeba5be387d8 100644
--- a/sc/source/ui/vba/vbapagesetup.cxx
+++ b/sc/source/ui/vba/vbapagesetup.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using namespace ::ooo::vba;
bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException );
-ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent,
+ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent,
const uno::Reference< uno::XComponentContext >& xContext,
const uno::Reference< sheet::XSpreadsheet >& xSheet,
const uno::Reference< frame::XModel >& xModel) throw (uno::RuntimeException):
@@ -65,7 +65,7 @@ ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent
mxPageProps.set( xPageStyle->getByName(aStyleName), uno::UNO_QUERY_THROW );
mnOrientLandscape = excel::XlPageOrientation::xlLandscape;
mnOrientPortrait = excel::XlPageOrientation::xlPortrait;
-}
+}
rtl::OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeException)
{
@@ -88,7 +88,7 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeEx
ScDocument* pDoc = excel::getDocShell( mxModel )->GetDocument();
aRangeList.Format( aPrintArea, nFlags, pDoc, formula::FormulaGrammar::CONV_XL_A1, ',' );
}
-
+
return aPrintArea;
}
@@ -106,7 +106,7 @@ void SAL_CALL ScVbaPageSetup::setPrintArea( const rtl::OUString& rAreas ) throw
{
ScRangeList aCellRanges;
ScRange aRange;
- if( getScRangeListForAddress( rAreas, excel::getDocShell( mxModel ) , aRange, aCellRanges ) )
+ if( getScRangeListForAddress( rAreas, excel::getDocShell( mxModel ) , aRange, aCellRanges ) )
{
uno::Sequence< table::CellRangeAddress > aSeq( aCellRanges.Count() );
USHORT i=0;
@@ -263,7 +263,7 @@ void SAL_CALL ScVbaPageSetup::setLeftHeader( const rtl::OUString& leftHeader) th
{
uno::Reference< text::XText > xText = xHeaderContent->getLeftText();
xText->setString( leftHeader );
- mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightPageHeaderContent")), uno::makeAny(xHeaderContent) );
+ mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightPageHeaderContent")), uno::makeAny(xHeaderContent) );
}
}
catch( uno::Exception& )
@@ -299,7 +299,7 @@ void SAL_CALL ScVbaPageSetup::setCenterHeader( const rtl::OUString& centerHeader
{
uno::Reference< text::XText > xText = xHeaderContent->getCenterText();
xText->setString( centerHeader );
- mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightPageHeaderContent")), uno::makeAny(xHeaderContent) );
+ mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightPageHeaderContent")), uno::makeAny(xHeaderContent) );
}
}
catch( uno::Exception& )
@@ -335,7 +335,7 @@ void SAL_CALL ScVbaPageSetup::setRightHeader( const rtl::OUString& rightHeader)
{
uno::Reference< text::XText > xText = xHeaderContent->getRightText();
xText->setString( rightHeader );
- mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightPageHeaderContent")), uno::makeAny(xHeaderContent) );
+ mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightPageHeaderContent")), uno::makeAny(xHeaderContent) );
}
}
catch( uno::Exception& )
@@ -371,7 +371,7 @@ void SAL_CALL ScVbaPageSetup::setLeftFooter( const rtl::OUString& leftFooter) th
{
uno::Reference< text::XText > xText = xFooterContent->getLeftText();
xText->setString( leftFooter );
- mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightPageFooterContent")), uno::makeAny(xFooterContent) );
+ mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightPageFooterContent")), uno::makeAny(xFooterContent) );
}
}
catch( uno::Exception& )
@@ -407,7 +407,7 @@ void SAL_CALL ScVbaPageSetup::setCenterFooter( const rtl::OUString& centerFooter
{
uno::Reference< text::XText > xText = xFooterContent->getCenterText();
xText->setString( centerFooter );
- mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightPageFooterContent")), uno::makeAny(xFooterContent) );
+ mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightPageFooterContent")), uno::makeAny(xFooterContent) );
}
}
catch( uno::Exception& )
@@ -444,7 +444,7 @@ void SAL_CALL ScVbaPageSetup::setRightFooter( const rtl::OUString& rightFooter)
{
uno::Reference< text::XText > xText = xFooterContent->getRightText();
xText->setString( rightFooter );
- mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightPageFooterContent")), uno::makeAny(xFooterContent) );
+ mxPageProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("RightPageFooterContent")), uno::makeAny(xFooterContent) );
}
}
catch( uno::Exception& )
@@ -606,14 +606,14 @@ void SAL_CALL ScVbaPageSetup::setPrintHeadings( sal_Bool printHeadings) throw (c
}
}
-rtl::OUString&
+rtl::OUString&
ScVbaPageSetup::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPageSetup") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaPageSetup::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxx
index d2c001b225cf..09a996c865d2 100644
--- a/sc/source/ui/vba/vbapagesetup.hxx
+++ b/sc/source/ui/vba/vbapagesetup.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +37,16 @@
typedef cppu::ImplInheritanceHelper1< VbaPageSetupBase, ov::excel::XPageSetup > ScVbaPageSetup_BASE;
-class ScVbaPageSetup : public ScVbaPageSetup_BASE
+class ScVbaPageSetup : public ScVbaPageSetup_BASE
{
css::uno::Reference< css::sheet::XSpreadsheet > mxSheet;
public:
- ScVbaPageSetup( const css::uno::Reference< ov::XHelperInterface >& xParent,
+ ScVbaPageSetup( const css::uno::Reference< ov::XHelperInterface >& xParent,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::sheet::XSpreadsheet>& xSheet,
- const css::uno::Reference< css::frame::XModel >& xModel) throw (css::uno::RuntimeException);
+ const css::uno::Reference< css::frame::XModel >& xModel) throw (css::uno::RuntimeException);
virtual ~ScVbaPageSetup(){}
-
+
// Attribute
virtual rtl::OUString SAL_CALL getPrintArea() throw (css::uno::RuntimeException);
virtual void SAL_CALL setPrintArea( const rtl::OUString& rAreas ) throw (css::uno::RuntimeException);
diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx
index c6ae5c488a20..92b33dec816c 100644
--- a/sc/source/ui/vba/vbapalette.cxx
+++ b/sc/source/ui/vba/vbapalette.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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.
*
************************************************************************/
-
+
#include "vbapalette.hxx"
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -100,12 +100,12 @@ ScVbaPalette::getPalette() const
{
uno::Reference< container::XIndexAccess > xIndex;
uno::Reference< beans::XPropertySet > xProps;
- if ( m_pShell )
+ if ( m_pShell )
xProps.set( m_pShell->GetModel(), uno::UNO_QUERY_THROW );
else
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't extract palette, no doc shell" ) ), uno::Reference< uno::XInterface >() );
xIndex.set( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ColorPalette") ) ), uno::UNO_QUERY );
if ( !xIndex.is() )
return new DefaultPalette();
- return xIndex;
+ return xIndex;
}
diff --git a/sc/source/ui/vba/vbapalette.hxx b/sc/source/ui/vba/vbapalette.hxx
index b51483772674..937935a5d714 100644
--- a/sc/source/ui/vba/vbapalette.hxx
+++ b/sc/source/ui/vba/vbapalette.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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.
*
************************************************************************/
-
+
#ifndef SC_VBAPALETTE_HXX
#define SC_VBAPALETTE_HXX
diff --git a/sc/source/ui/vba/vbapane.cxx b/sc/source/ui/vba/vbapane.cxx
index 29d7a286b402..28795cf1165e 100644
--- a/sc/source/ui/vba/vbapane.cxx
+++ b/sc/source/ui/vba/vbapane.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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.
*
************************************************************************/
-
+
#include "vbapane.hxx"
#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
@@ -45,13 +45,13 @@ ScVbaPane::ScVbaPane(
{
}
-sal_Int32 SAL_CALL
+sal_Int32 SAL_CALL
ScVbaPane::getScrollColumn() throw (uno::RuntimeException)
{
return ( m_xViewPane->getFirstVisibleColumn() + 1 );
}
-void SAL_CALL
+void SAL_CALL
ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn ) throw (uno::RuntimeException)
{
if( _scrollcolumn < 1 )
@@ -62,13 +62,13 @@ ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn ) throw (uno::RuntimeExcepti
m_xViewPane->setFirstVisibleColumn( _scrollcolumn - 1 );
}
-sal_Int32 SAL_CALL
+sal_Int32 SAL_CALL
ScVbaPane::getScrollRow() throw (uno::RuntimeException)
{
return ( m_xViewPane->getFirstVisibleRow() + 1 );
}
-void SAL_CALL
+void SAL_CALL
ScVbaPane::setScrollRow( sal_Int32 _scrollrow ) throw (uno::RuntimeException)
{
if( _scrollrow < 1 )
@@ -93,7 +93,7 @@ ScVbaPane::getVisibleRange() throw (uno::RuntimeException)
}
//Method
-void SAL_CALL
+void SAL_CALL
ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException)
{
rtl::OUString messageBuffer;
@@ -136,7 +136,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any
if( messageBuffer.getLength() > 0 )
throw(uno::RuntimeException( messageBuffer, uno::Reference< uno::XInterface >() ) );
- sal_Int32 newStartRow = visibleRange.StartRow + downRows;
+ sal_Int32 newStartRow = visibleRange.StartRow + downRows;
if( newStartRow < 0 )
newStartRow = 0;
sal_Int32 newStartCol = visibleRange.StartColumn + rightCols;
@@ -146,7 +146,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any
m_xViewPane->setFirstVisibleColumn( newStartCol );
}
-void SAL_CALL
+void SAL_CALL
ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException)
{
rtl::OUString messageBuffer;
@@ -168,7 +168,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any
{
sal_Int32 up = 0;
if( Up >>= up )
- downPages -= up;
+ downPages -= up;
else
messageBuffer += rtl::OUString::createFromAscii( "Error getting parameter: Up\n" );
}
diff --git a/sc/source/ui/vba/vbapane.hxx b/sc/source/ui/vba/vbapane.hxx
index ff87a9966d80..eb8eb403214e 100644
--- a/sc/source/ui/vba/vbapane.hxx
+++ b/sc/source/ui/vba/vbapane.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/vba/vbapivotcache.cxx b/sc/source/ui/vba/vbapivotcache.cxx
index 322b42368b48..1ca3ca3c9d3c 100644
--- a/sc/source/ui/vba/vbapivotcache.cxx
+++ b/sc/source/ui/vba/vbapivotcache.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,19 +34,19 @@ ScVbaPivotCache::ScVbaPivotCache( const uno::Reference< XHelperInterface >& xPar
{
}
-void SAL_CALL
+void SAL_CALL
ScVbaPivotCache::Refresh() throw (css::uno::RuntimeException)
{
m_xTable->refresh();
}
-rtl::OUString&
+rtl::OUString&
ScVbaPivotCache::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotCache") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaPivotCache::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbapivotcache.hxx b/sc/source/ui/vba/vbapivotcache.hxx
index dea3e35d18bd..682c6409a398 100644
--- a/sc/source/ui/vba/vbapivotcache.hxx
+++ b/sc/source/ui/vba/vbapivotcache.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
typedef InheritedHelperInterfaceImpl1<ov::excel::XPivotCache > PivotCacheImpl_BASE;
class ScVbaPivotCache : public PivotCacheImpl_BASE
-{
+{
css::uno::Reference< css::sheet::XDataPilotTable > m_xTable;
public:
ScVbaPivotCache( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XDataPilotTable >& xTable );
diff --git a/sc/source/ui/vba/vbapivottable.cxx b/sc/source/ui/vba/vbapivottable.cxx
index e5d78602dcdd..d006c73a5939 100644
--- a/sc/source/ui/vba/vbapivottable.cxx
+++ b/sc/source/ui/vba/vbapivottable.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,18 +39,18 @@ uno::Reference< excel::XPivotCache >
ScVbaPivotTable::PivotCache() throw (uno::RuntimeException)
{
// #FIXME with a quick example failed to determine what the parent
- // should be, leaving as null at the moment
+ // should be, leaving as null at the moment
return new ScVbaPivotCache( uno::Reference< XHelperInterface >(), mxContext, m_xTable );
}
-rtl::OUString&
+rtl::OUString&
ScVbaPivotTable::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotTable") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaPivotTable::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbapivottable.hxx b/sc/source/ui/vba/vbapivottable.hxx
index e6e341830489..c702dd73af00 100644
--- a/sc/source/ui/vba/vbapivottable.hxx
+++ b/sc/source/ui/vba/vbapivottable.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
typedef InheritedHelperInterfaceImpl1< ov::excel::XPivotTable > PivotTableImpl_BASE;
class ScVbaPivotTable : public PivotTableImpl_BASE
-{
+{
css::uno::Reference< css::sheet::XDataPilotTable > m_xTable;
public:
ScVbaPivotTable( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XDataPilotTable >& xTable );
diff --git a/sc/source/ui/vba/vbapivottables.cxx b/sc/source/ui/vba/vbapivottables.cxx
index fcbf347a3cd4..f9014a42de3e 100644
--- a/sc/source/ui/vba/vbapivottables.cxx
+++ b/sc/source/ui/vba/vbapivottables.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +44,14 @@ class PivotTableEnumeration : public EnumerationHelperImpl
public:
PivotTableEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ) {}
- virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
- {
+ virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ {
return DataPilotToPivotTable( m_xEnumeration->nextElement(), m_xContext );
}
};
-ScVbaPivotTables::ScVbaPivotTables( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ): ScVbaPivotTables_BASE( xParent, xContext, xIndexAccess )
+ScVbaPivotTables::ScVbaPivotTables( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ): ScVbaPivotTables_BASE( xParent, xContext, xIndexAccess )
{
}
@@ -68,20 +68,20 @@ ScVbaPivotTables::createCollectionObject( const css::uno::Any& aSource )
return DataPilotToPivotTable( aSource, mxContext );
}
-uno::Type
+uno::Type
ScVbaPivotTables::getElementType() throw (uno::RuntimeException)
{
return excel::XPivotTable::static_type(0);
}
-rtl::OUString&
+rtl::OUString&
ScVbaPivotTables::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPivotTables") );
return sImplName;
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<rtl::OUString>
ScVbaPivotTables::getServiceNames()
{
static uno::Sequence< rtl::OUString > sNames;
diff --git a/sc/source/ui/vba/vbapivottables.hxx b/sc/source/ui/vba/vbapivottables.hxx
index 3354d8a82953..38af1e6cec58 100644
--- a/sc/source/ui/vba/vbapivottables.hxx
+++ b/sc/source/ui/vba/vbapivottables.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 <ooo/vba/excel/XPivotTables.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-
+
#include "excelvbahelper.hxx"
#include <vbahelper/vbahelperinterface.hxx>
#include <vbahelper/vbacollectionimpl.hxx>
@@ -56,8 +56,8 @@ public:
// XPivotTables
// ScVbaPivotTables_BASE
- virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
-
+ virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+
virtual rtl::OUString& getServiceImplName();
};
diff --git a/sc/source/ui/vba/vbapropvalue.cxx b/sc/source/ui/vba/vbapropvalue.cxx
index ff821d17f479..0290179a6a7c 100644
--- a/sc/source/ui/vba/vbapropvalue.cxx
+++ b/sc/source/ui/vba/vbapropvalue.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,18 +27,18 @@
#include "vbapropvalue.hxx"
using namespace com::sun::star;
-
+
ScVbaPropValue::ScVbaPropValue( PropListener* pListener ) : m_pListener( pListener )
{
}
-css::uno::Any SAL_CALL
+css::uno::Any SAL_CALL
ScVbaPropValue::getValue() throw (css::uno::RuntimeException)
{
return m_pListener->getValueEvent();
}
-void SAL_CALL
+void SAL_CALL
ScVbaPropValue::setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException)
{
m_pListener->setValueEvent( _value );
diff --git a/sc/source/ui/vba/vbapropvalue.hxx b/sc/source/ui/vba/vbapropvalue.hxx
index af748dae5585..1080c3268f44 100644
--- a/sc/source/ui/vba/vbapropvalue.hxx
+++ b/sc/source/ui/vba/vbapropvalue.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +33,15 @@
typedef ::cppu::WeakImplHelper1< ov::XPropValue > PropValueImpl_BASE;
-class PropListener
+class PropListener
{
public:
virtual void setValueEvent( const css::uno::Any& value ) = 0;
- virtual css::uno::Any getValueEvent() = 0;
+ virtual css::uno::Any getValueEvent() = 0;
};
-class ScVbaPropValue : public PropValueImpl_BASE
+class ScVbaPropValue : public PropValueImpl_BASE
{
PropListener* m_pListener;
public:
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index b50199f025d0..82f6f44f3518 100755
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +179,16 @@ double lcl_hmmToPoints( double nVal ) { return ( (double)((nVal /1000 ) * 567 )
static const sal_Int16 supportedIndexTable[] = { excel::XlBordersIndex::xlEdgeLeft, excel::XlBordersIndex::xlEdgeTop, excel::XlBordersIndex::xlEdgeBottom, excel::XlBordersIndex::xlEdgeRight, excel::XlBordersIndex::xlDiagonalDown, excel::XlBordersIndex::xlDiagonalUp, excel::XlBordersIndex::xlInsideVertical, excel::XlBordersIndex::xlInsideHorizontal };
-USHORT lcl_pointsToTwips( double nVal )
-{
+USHORT lcl_pointsToTwips( double nVal )
+{
nVal = nVal * static_cast<double>(20);
short nTwips = static_cast<short>(nVal);
return nTwips;
}
-double lcl_TwipsToPoints( USHORT nVal )
-{
+double lcl_TwipsToPoints( USHORT nVal )
+{
double nPoints = nVal;
- return nPoints / 20;
+ return nPoints / 20;
}
double lcl_Round2DecPlaces( double nVal )
@@ -215,7 +215,7 @@ uno::Reference< excel::XRange > lcl_makeXRangeFromSheetCellRanges( const uno::Re
ScRangeList aCellRanges;
sal_Int32 nLen = sAddresses.getLength();
if ( nLen )
- {
+ {
for ( sal_Int32 index = 0; index < nLen; ++index )
{
ScRange refRange;
@@ -274,7 +274,7 @@ public:
SingleRangeEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xRange( xRange ), mxContext( xContext ), bHasMore( true ) { }
virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException) { return bHasMore; }
- virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
if ( !bHasMore )
throw container::NoSuchElementException();
@@ -299,14 +299,14 @@ public:
// XIndexAccess
virtual ::sal_Int32 SAL_CALL getCount() throw (::uno::RuntimeException) { return 1; }
virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
- {
+ {
if ( Index != 0 )
throw lang::IndexOutOfBoundsException();
- return uno::makeAny( m_xRange );
+ return uno::makeAny( m_xRange );
}
// XElementAccess
virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException){ return table::XCellRange::static_type(0); }
-
+
virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException) { return sal_True; }
// XEnumerationAccess
virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException) { return new SingleRangeEnumeration( mxParent, mxContext, m_xRange ); }
@@ -322,8 +322,8 @@ class RangesEnumerationImpl : public EnumerationHelperImpl
public:
RangesEnumerationImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, bool bIsRows, bool bIsColumns ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) {}
- virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
- {
+ virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ {
return lcl_makeRange( m_xParent, m_xContext, m_xEnumeration->nextElement(), mbIsRows, mbIsColumns );
}
};
@@ -346,11 +346,11 @@ public:
virtual rtl::OUString& getServiceImplName() { static rtl::OUString sDummy; return sDummy; }
- virtual uno::Sequence< rtl::OUString > getServiceNames() { return uno::Sequence< rtl::OUString >(); }
+ virtual uno::Sequence< rtl::OUString > getServiceNames() { return uno::Sequence< rtl::OUString >(); }
-};
+};
-uno::Reference< container::XEnumeration > SAL_CALL
+uno::Reference< container::XEnumeration > SAL_CALL
ScVbaRangeAreas::createEnumeration() throw (uno::RuntimeException)
{
uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
@@ -424,7 +424,7 @@ ScVbaRange::getScDocument() throw (uno::RuntimeException)
return getDocumentFromRange( mxRange );
}
-ScDocShell*
+ScDocShell*
ScVbaRange::getScDocShell() throw (uno::RuntimeException)
{
if ( mxRanges.is() )
@@ -491,7 +491,7 @@ public:
if ( mxFormats.is() )
return mxFormats->getByKey( nIndexKey );
- return uno::Reference< beans::XPropertySet > ();
+ return uno::Reference< beans::XPropertySet > ();
}
bool isBooleanType()
@@ -519,7 +519,7 @@ public:
if ( pUnoCellRange )
{
- SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
+ SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
SfxItemState eState = pDataSet->GetItemState( ATTR_VALUE_FORMAT, TRUE, NULL);
// one of the cells in the range is not like the other ;-)
// so return a zero length format to indicate that
@@ -716,7 +716,7 @@ CellValueSetter::processValue( const uno::Any& aValue, const uno::Reference< tab
case uno::TypeClass_BOOLEAN:
{
sal_Bool bState = sal_False;
- if ( aValue >>= bState )
+ if ( aValue >>= bState )
{
uno::Reference< table::XCellRange > xRange( xCell, uno::UNO_QUERY_THROW );
if ( bState )
@@ -1083,7 +1083,7 @@ public:
uno::Reference< sheet::XSheetCellCursor > getSheetCellCursor() throw ( uno::RuntimeException )
{
- return uno::Reference< sheet::XSheetCellCursor >( getSpreadSheet()->createCursorByRange( getSheetCellRange() ), uno::UNO_QUERY_THROW );
+ return uno::Reference< sheet::XSheetCellCursor >( getSpreadSheet()->createCursorByRange( getSheetCellRange() ), uno::UNO_QUERY_THROW );
}
static uno::Reference< excel::XRange > createRangeFromRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference<uno::XComponentContext >& xContext,
@@ -1103,7 +1103,7 @@ public:
bool
getCellRangesForAddress( USHORT& rResFlags, const rtl::OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv )
{
-
+
ScDocument* pDoc = NULL;
if ( pDocSh )
{
@@ -1116,20 +1116,20 @@ getCellRangesForAddress( USHORT& rResFlags, const rtl::OUString& sAddress, ScDoc
{
return true;
}
- }
+ }
return false;
-}
+}
bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException )
{
// see if there is a match with a named range
uno::Reference< beans::XPropertySet > xProps( pDocSh->GetModel(), uno::UNO_QUERY_THROW );
uno::Reference< container::XNameAccess > xNameAccess( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NamedRanges") ) ), uno::UNO_QUERY_THROW );
- // Strangly enough you can have Range( "namedRange1, namedRange2, etc," )
+ // Strangly enough you can have Range( "namedRange1, namedRange2, etc," )
// loop around each ',' seperated name
std::vector< rtl::OUString > vNames;
sal_Int32 nIndex = 0;
- do
+ do
{
rtl::OUString aToken = sName.getToken( 0, ',', nIndex );
vNames.push_back( aToken );
@@ -1138,12 +1138,12 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S
if ( !vNames.size() )
vNames.push_back( sName );
- std::vector< rtl::OUString >::iterator it = vNames.begin();
- std::vector< rtl::OUString >::iterator it_end = vNames.end();
+ std::vector< rtl::OUString >::iterator it = vNames.begin();
+ std::vector< rtl::OUString >::iterator it_end = vNames.end();
for ( ; it != it_end; ++it )
{
-
- formula::FormulaGrammar::AddressConvention eConv = aConv;
+
+ formula::FormulaGrammar::AddressConvention eConv = aConv;
// spaces are illegal ( but the user of course can enter them )
rtl::OUString sAddress = (*it).trim();
if ( xNameAccess->hasByName( sAddress ) )
@@ -1153,12 +1153,12 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S
// As the address comes from OOO, the addressing
// style is may not be XL_A1
eConv = pDocSh->GetDocument()->GetAddressConvention();
- }
+ }
USHORT nFlags = 0;
if ( !getCellRangesForAddress( nFlags, sAddress, pDocSh, aCellRanges, eConv ) )
return false;
-
+
bool bTabFromReferrer = !( nFlags & SCA_TAB_3D );
for ( ScRange* pRange = aCellRanges.First() ; pRange; pRange = aCellRanges.Next() )
@@ -1181,7 +1181,7 @@ getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const
ScRangeList aCellRanges;
ScRange refRange;
ScUnoConversion::FillScRange( refRange, pAddr );
- if ( !getScRangeListForAddress ( sName, pDocSh, refRange, aCellRanges, eConv ) )
+ if ( !getScRangeListForAddress ( sName, pDocSh, refRange, aCellRanges, eConv ) )
throw uno::RuntimeException();
// Single range
if ( aCellRanges.First() == aCellRanges.Last() )
@@ -1192,7 +1192,7 @@ getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const
}
uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( pDocSh, aCellRanges ) );
- uno::Reference< XHelperInterface > xFixThisParent = excel::getUnoSheetModuleObj( xRanges );
+ uno::Reference< XHelperInterface > xFixThisParent = excel::getUnoSheetModuleObj( xRanges );
return new ScVbaRange( xFixThisParent, xContext, xRanges );
}
@@ -1206,6 +1206,14 @@ inline table::CellRangeAddress lclGetRangeAddress( const uno::Reference< RangeTy
return uno::Reference< sheet::XCellRangeAddressable >( rxCellRange, uno::UNO_QUERY_THROW )->getRangeAddress();
}
+void lclClearRange( const uno::Reference< table::XCellRange >& rxCellRange ) throw (uno::RuntimeException)
+{
+ using namespace ::com::sun::star::sheet::CellFlags;
+ sal_Int32 nFlags = VALUE | DATETIME | STRING | ANNOTATION | FORMULA | HARDATTR | STYLES | EDITATTR | FORMATTED;
+ uno::Reference< sheet::XSheetOperation > xSheetOperation( rxCellRange, uno::UNO_QUERY_THROW );
+ xSheetOperation->clearContents( nFlags );
+}
+
uno::Reference< sheet::XSheetCellRange > lclExpandToMerged( const uno::Reference< table::XCellRange >& rxCellRange, bool bRecursive ) throw (uno::RuntimeException)
{
uno::Reference< sheet::XSheetCellRange > xNewCellRange( rxCellRange, uno::UNO_QUERY_THROW );
@@ -1251,15 +1259,27 @@ void lclExpandAndMerge( const uno::Reference< table::XCellRange >& rxCellRange,
// Calc cannot merge over merged ranges, always unmerge first
xMerge->merge( sal_False );
if( bMerge )
+ {
+ // clear all contents of the covered cells (not the top-left cell)
+ table::CellRangeAddress aRangeAddr = lclGetRangeAddress( rxCellRange );
+ sal_Int32 nLastColIdx = aRangeAddr.EndColumn - aRangeAddr.StartColumn;
+ sal_Int32 nLastRowIdx = aRangeAddr.EndRow - aRangeAddr.StartRow;
+ // clear cells of top row, right of top-left cell
+ if( nLastColIdx > 0 )
+ lclClearRange( rxCellRange->getCellRangeByPosition( 1, 0, nLastColIdx, 0 ) );
+ // clear all rows below top row
+ if( nLastRowIdx > 0 )
+ lclClearRange( rxCellRange->getCellRangeByPosition( 0, 1, nLastColIdx, nLastRowIdx ) );
+ // merge the range
xMerge->merge( sal_True );
- // FIXME need to check whether all the cell contents are retained or lost by popping up a dialog
+ }
}
util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxCellRange ) throw (uno::RuntimeException)
{
/* 1) Check if range is completely inside one single merged range. To do
this, try to extend from top-left cell only (not from entire range).
- This will excude cases where this range consists of several merged
+ This will exclude cases where this range consists of several merged
ranges (or parts of them). */
table::CellRangeAddress aRangeAddr = lclGetRangeAddress( rxCellRange );
uno::Reference< table::XCellRange > xTopLeft( rxCellRange->getCellRangeByPosition( 0, 0, 0, 0 ), uno::UNO_SET_THROW );
@@ -1305,7 +1325,7 @@ table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam,
aParam >>= rString;
ScRangeList aCellRanges;
ScRange refRange;
- if ( getScRangeListForAddress ( rString, pDocSh, refRange, aCellRanges, aConv ) )
+ if ( getScRangeListForAddress ( rString, pDocSh, refRange, aCellRanges, aConv ) )
{
if ( aCellRanges.First() == aCellRanges.Last() )
{
@@ -1332,7 +1352,7 @@ table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam,
uno::Reference< XCollection >
lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno::Reference<uno::XComponentContext>& xContext, const uno::Reference< table::XCellRange >& xRange ) throw( uno::RuntimeException )
{
- uno::Reference< XHelperInterface > xParent( xParentRange, uno::UNO_QUERY_THROW );
+ uno::Reference< XHelperInterface > xParent( xParentRange, uno::UNO_QUERY_THROW );
ScDocument* pDoc = getDocumentFromRange(xRange);
if ( !pDoc )
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access document from shell" ) ), uno::Reference< uno::XInterface >() );
@@ -1378,7 +1398,7 @@ ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const
{
uno::Reference< container::XIndexAccess > xIndex( mxRanges, uno::UNO_QUERY_THROW );
- m_Areas = new ScVbaRangeAreas( xParent, mxContext, xIndex, mbIsRows, mbIsColumns );
+ m_Areas = new ScVbaRangeAreas( xParent, mxContext, xIndex, mbIsRows, mbIsColumns );
}
@@ -1415,7 +1435,7 @@ ScVbaRange::visitArray( ArrayVisitor& visitor )
-uno::Any
+uno::Any
ScVbaRange::getValue( ValueGetter& valueGetter) throw (uno::RuntimeException)
{
uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY_THROW );
@@ -1452,7 +1472,7 @@ ScVbaRange::getValue() throw (uno::RuntimeException)
}
-void
+void
ScVbaRange::setValue( const uno::Any &aValue, ValueSetter& valueSetter ) throw (uno::RuntimeException)
{
uno::TypeClass aClass = aValue.getValueTypeClass();
@@ -1462,8 +1482,8 @@ ScVbaRange::setValue( const uno::Any &aValue, ValueSetter& valueSetter ) thro
uno::Any aConverted;
try
{
- // test for single dimension, could do
- // with a better test than this
+ // test for single dimension, could do
+ // with a better test than this
if ( aValue.getValueTypeName().indexOf('[') == aValue.getValueTypeName().lastIndexOf('[') )
{
aConverted = xConverter->convertTo( aValue, getCppuType((uno::Sequence< uno::Any >*)0) );
@@ -1479,7 +1499,7 @@ ScVbaRange::setValue( const uno::Any &aValue, ValueSetter& valueSetter ) thro
}
catch ( uno::Exception& e )
{
- OSL_TRACE("Bahhh, caught exception %s",
+ OSL_TRACE("Bahhh, caught exception %s",
rtl::OUStringToOString( e.Message,
RTL_TEXTENCODING_UTF8 ).getStr() );
}
@@ -1497,10 +1517,10 @@ ScVbaRange::setValue( const uno::Any &aValue ) throw (uno::RuntimeException)
if ( m_Areas->getCount() > 1 )
{
AreasVisitor aVisitor( m_Areas );
- RangeValueProcessor valueProcessor( aValue );
+ RangeValueProcessor valueProcessor( aValue );
aVisitor.visit( valueProcessor );
return;
- }
+ }
CellValueSetter valueSetter( aValue );
setValue( aValue, valueSetter );
}
@@ -1508,7 +1528,8 @@ ScVbaRange::setValue( const uno::Any &aValue ) throw (uno::RuntimeException)
void
ScVbaRange::Clear() throw (uno::RuntimeException)
{
- sal_Int32 nFlags = sheet::CellFlags::VALUE | sheet::CellFlags::STRING | sheet::CellFlags::HARDATTR | sheet::CellFlags::FORMATTED | sheet::CellFlags::EDITATTR | sheet::CellFlags::FORMULA;
+ using namespace ::com::sun::star::sheet::CellFlags;
+ sal_Int32 nFlags = VALUE | DATETIME | STRING | FORMULA | HARDATTR | EDITATTR | FORMATTED;
ClearContents( nFlags );
}
@@ -1528,7 +1549,7 @@ ScVbaRange::ClearContents( sal_Int32 nFlags ) throw (uno::RuntimeException)
uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
ScVbaRange* pRange = getImplementation( xRange );
if ( pRange )
- pRange->ClearContents( nFlags );
+ pRange->ClearContents( nFlags );
}
return;
}
@@ -1547,7 +1568,7 @@ void
ScVbaRange::ClearContents() throw (uno::RuntimeException)
{
sal_Int32 nClearFlags = ( sheet::CellFlags::VALUE |
- sheet::CellFlags::STRING | sheet::CellFlags::DATETIME |
+ sheet::CellFlags::STRING | sheet::CellFlags::DATETIME |
sheet::CellFlags::FORMULA );
ClearContents( nClearFlags );
}
@@ -1567,15 +1588,15 @@ ScVbaRange::setFormulaValue( const uno::Any& rFormula, formula::FormulaGrammar::
if ( m_Areas->getCount() > 1 )
{
AreasVisitor aVisitor( m_Areas );
- RangeFormulaProcessor valueProcessor( rFormula );
+ RangeFormulaProcessor valueProcessor( rFormula );
aVisitor.visit( valueProcessor );
return;
- }
+ }
CellFormulaValueSetter formulaValueSetter( rFormula, getScDocument(), eGram );
setValue( rFormula, formulaValueSetter );
}
-uno::Any
+uno::Any
ScVbaRange::getFormulaValue( formula::FormulaGrammar::Grammar eGram ) throw (uno::RuntimeException)
{
// #TODO code within the test below "if ( m_Areas.... " can be removed
@@ -1589,13 +1610,13 @@ ScVbaRange::getFormulaValue( formula::FormulaGrammar::Grammar eGram ) throw (uno
}
CellFormulaValueGetter valueGetter( getScDocument(), eGram );
return getValue( valueGetter );
-
+
}
void
ScVbaRange::setFormula(const uno::Any &rFormula ) throw (uno::RuntimeException)
{
- // #FIXME converting "=$a$1" e.g. CONV_XL_A1 -> CONV_OOO // results in "=$a$1:a1", temporalily disable conversion
+ // #FIXME converting "=$a$1" e.g. CONV_XL_A1 -> CONV_OOO // results in "=$a$1:a1", temporalily disable conversion
setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );;
}
@@ -1617,7 +1638,7 @@ ScVbaRange::getFormula() throw (::com::sun::star::uno::RuntimeException)
return getFormulaValue( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );
}
-sal_Int32
+sal_Int32
ScVbaRange::getCount() throw (uno::RuntimeException)
{
// If this is a multiple selection apply setValue over all areas
@@ -1627,7 +1648,7 @@ ScVbaRange::getCount() throw (uno::RuntimeException)
RangeCountProcessor valueProcessor;
aVisitor.visit( valueProcessor );
return valueProcessor.value();
- }
+ }
sal_Int32 rowCount = 0;
sal_Int32 colCount = 0;
uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY_THROW );
@@ -1635,13 +1656,13 @@ ScVbaRange::getCount() throw (uno::RuntimeException)
colCount = xColumnRowRange->getColumns()->getCount();
if( IsRows() )
- return rowCount;
+ return rowCount;
if( IsColumns() )
return colCount;
return rowCount * colCount;
}
-sal_Int32
+sal_Int32
ScVbaRange::getRow() throw (uno::RuntimeException)
{
// #TODO code within the test below "if ( m_Areas.... " can be removed
@@ -1654,10 +1675,10 @@ ScVbaRange::getRow() throw (uno::RuntimeException)
return xRange->getRow();
}
uno::Reference< sheet::XCellAddressable > xCellAddressable(mxRange->getCellByPosition(0, 0), uno::UNO_QUERY_THROW );
- return xCellAddressable->getCellAddress().Row + 1; // Zero value indexing
-}
-
-sal_Int32
+ return xCellAddressable->getCellAddress().Row + 1; // Zero value indexing
+}
+
+sal_Int32
ScVbaRange::getColumn() throw (uno::RuntimeException)
{
// #TODO code within the test below "if ( m_Areas.... " can be removed
@@ -1688,8 +1709,8 @@ ScVbaRange::HasFormula() throw (uno::RuntimeException)
if ( index > 1 )
if ( aResult != xRange->HasFormula() )
return aNULL();
- aResult = xRange->HasFormula();
- if ( aNULL() == aResult )
+ aResult = xRange->HasFormula();
+ if ( aNULL() == aResult )
return aNULL();
}
return aResult;
@@ -1701,13 +1722,13 @@ ScVbaRange::HasFormula() throw (uno::RuntimeException)
uno::Reference<uno::XInterface> xRanges( pThisRanges->queryFormulaCells( ( sheet::FormulaResult::ERROR | sheet::FormulaResult::VALUE | sheet::FormulaResult::STRING ) ), uno::UNO_QUERY_THROW );
ScCellRangesBase* pFormulaRanges = dynamic_cast< ScCellRangesBase * > ( xRanges.get() );
// check if there are no formula cell, return false
- if ( pFormulaRanges->GetRangeList().Count() == 0 )
+ if ( pFormulaRanges->GetRangeList().Count() == 0 )
return uno::makeAny(sal_False);
-
+
// chech if there are holes (where some cells are not formulas)
- // or returned range is not equal to this range
- if ( ( pFormulaRanges->GetRangeList().Count() > 1 )
- || ( pFormulaRanges->GetRangeList().GetObject(0)->aStart != pThisRanges->GetRangeList().GetObject(0)->aStart )
+ // or returned range is not equal to this range
+ if ( ( pFormulaRanges->GetRangeList().Count() > 1 )
+ || ( pFormulaRanges->GetRangeList().GetObject(0)->aStart != pThisRanges->GetRangeList().GetObject(0)->aStart )
|| ( pFormulaRanges->GetRangeList().GetObject(0)->aEnd != pThisRanges->GetRangeList().GetObject(0)->aEnd ) )
return aNULL(); // should return aNULL;
}
@@ -1725,40 +1746,40 @@ ScVbaRange::fillSeries( sheet::FillDirection nFillDirection, sheet::FillMode nFi
uno::Reference< excel::XRange > xRange( xCollection->Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
ScVbaRange* pThisRange = getImplementation( xRange );
pThisRange->fillSeries( nFillDirection, nFillMode, nFillDateMode, fStep, fEndValue );
-
+
}
- return;
+ return;
}
-
+
uno::Reference< sheet::XCellSeries > xCellSeries(mxRange, uno::UNO_QUERY_THROW );
xCellSeries->fillSeries( nFillDirection, nFillMode, nFillDateMode, fStep, fEndValue );
}
-void
+void
ScVbaRange::FillLeft() throw (uno::RuntimeException)
{
- fillSeries(sheet::FillDirection_TO_LEFT,
+ fillSeries(sheet::FillDirection_TO_LEFT,
sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF);
}
-void
+void
ScVbaRange::FillRight() throw (uno::RuntimeException)
{
- fillSeries(sheet::FillDirection_TO_RIGHT,
+ fillSeries(sheet::FillDirection_TO_RIGHT,
sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF);
}
-void
+void
ScVbaRange::FillUp() throw (uno::RuntimeException)
{
- fillSeries(sheet::FillDirection_TO_TOP,
+ fillSeries(sheet::FillDirection_TO_TOP,
sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF);
}
-void
+void
ScVbaRange::FillDown() throw (uno::RuntimeException)
{
- fillSeries(sheet::FillDirection_TO_BOTTOM,
+ fillSeries(sheet::FillDirection_TO_BOTTOM,
sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF);
}
@@ -1788,7 +1809,7 @@ ScVbaRange::Offset( const ::uno::Any &nRowOff, const uno::Any &nColOff ) throw (
ScCellRangesBase* pUnoRangesBase = getCellRangesBase();
ScRangeList aCellRanges = pUnoRangesBase->GetRangeList();
-
+
for ( ScRange* pRange = aCellRanges.First() ; pRange; pRange = aCellRanges.Next() )
{
@@ -1826,13 +1847,13 @@ ScVbaRange::CurrentRegion() throw (uno::RuntimeException)
uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
return xRange->CurrentRegion();
}
-
+
RangeHelper helper( mxRange );
- uno::Reference< sheet::XSheetCellCursor > xSheetCellCursor =
+ uno::Reference< sheet::XSheetCellCursor > xSheetCellCursor =
helper.getSheetCellCursor();
xSheetCellCursor->collapseToCurrentRegion();
uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable(xSheetCellCursor, uno::UNO_QUERY_THROW);
- return RangeHelper::createRangeFromRange( mxParent, mxContext, helper.getCellRangeFromSheet(), xCellRangeAddressable );
+ return RangeHelper::createRangeFromRange( mxParent, mxContext, helper.getCellRangeFromSheet(), xCellRangeAddressable );
}
uno::Reference< excel::XRange >
@@ -1848,11 +1869,11 @@ ScVbaRange::CurrentArray() throw (uno::RuntimeException)
return xRange->CurrentArray();
}
RangeHelper helper( mxRange );
- uno::Reference< sheet::XSheetCellCursor > xSheetCellCursor =
+ uno::Reference< sheet::XSheetCellCursor > xSheetCellCursor =
helper.getSheetCellCursor();
xSheetCellCursor->collapseToCurrentArray();
uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable(xSheetCellCursor, uno::UNO_QUERY_THROW);
- return RangeHelper::createRangeFromRange( mxParent, mxContext, helper.getCellRangeFromSheet(), xCellRangeAddressable );
+ return RangeHelper::createRangeFromRange( mxParent, mxContext, helper.getCellRangeFromSheet(), xCellRangeAddressable );
}
uno::Any
@@ -1867,7 +1888,7 @@ ScVbaRange::getFormulaArray() throw (uno::RuntimeException)
uno::Reference< excel::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW );
return xRange->getFormulaArray();
}
-
+
uno::Reference< sheet::XCellRangeFormula> xCellRangeFormula( mxRange, uno::UNO_QUERY_THROW );
uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( mxContext );
uno::Any aMatrix;
@@ -1875,7 +1896,7 @@ ScVbaRange::getFormulaArray() throw (uno::RuntimeException)
return aMatrix;
}
-void
+void
ScVbaRange::setFormulaArray(const uno::Any& rFormula) throw (uno::RuntimeException)
{
// #TODO code within the test below "if ( m_Areas.... " can be removed
@@ -1941,8 +1962,8 @@ ScVbaRange::Address( const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolut
}
sAddress += xRange->Address( RowAbsolute, ColumnAbsolute, ReferenceStyle, aExternalCopy, RelativeTo );
}
- return sAddress;
-
+ return sAddress;
+
}
ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
if ( ReferenceStyle.hasValue() )
@@ -1956,7 +1977,7 @@ ScVbaRange::Address( const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolut
ScDocShell* pDocShell = getScDocShell();
ScDocument* pDoc = pDocShell->GetDocument();
- RangeHelper thisRange( mxRange );
+ RangeHelper thisRange( mxRange );
table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
ScRange aRange( static_cast< SCCOL >( thisAddress.StartColumn ), static_cast< SCROW >( thisAddress.StartRow ), static_cast< SCTAB >( thisAddress.Sheet ), static_cast< SCCOL >( thisAddress.EndColumn ), static_cast< SCROW >( thisAddress.EndRow ), static_cast< SCTAB >( thisAddress.Sheet ) );
String sRange;
@@ -1988,11 +2009,11 @@ ScVbaRange::Address( const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolut
if ( RelativeTo.hasValue() )
{
// #TODO should I throw an error if R1C1 is not set?
-
+
table::CellRangeAddress refAddress = getCellRangeAddressForVBARange( RelativeTo, pDocShell );
dDetails = ScAddress::Details( formula::FormulaGrammar::CONV_XL_R1C1, static_cast< SCROW >( refAddress.StartRow ), static_cast< SCCOL >( refAddress.StartColumn ) );
}
- aRange.Format( sRange, nFlags, pDoc, dDetails );
+ aRange.Format( sRange, nFlags, pDoc, dDetails );
return sRange;
}
@@ -2008,18 +2029,18 @@ ScVbaRange::Font() throw ( script::BasicErrorException, uno::RuntimeException)
if ( !pDoc )
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access document from shell" ) ), uno::Reference< uno::XInterface >() );
- ScVbaPalette aPalette( pDoc->GetDocumentShell() );
+ ScVbaPalette aPalette( pDoc->GetDocumentShell() );
ScCellRangeObj* pRangeObj = NULL;
try
{
pRangeObj = getCellRangeObj();
}
- catch( uno::Exception& )
+ catch( uno::Exception& )
{
}
return new ScVbaFont( this, mxContext, aPalette, xProps, pRangeObj );
}
-
+
uno::Reference< excel::XRange >
ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) throw(uno::RuntimeException)
{
@@ -2064,7 +2085,7 @@ ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) thr
}
catch( uno::Exception& ) {} // silence any errors
}
-
+
RangeHelper thisRange( mxRange );
table::CellRangeAddress thisRangeAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
uno::Reference< table::XCellRange > xSheetRange = thisRange.getCellRangeFromSheet();
@@ -2087,7 +2108,7 @@ ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) thr
else
--nColumn;
nRow = nRow + thisRangeAddress.StartRow;
- nColumn = nColumn + thisRangeAddress.StartColumn;
+ nColumn = nColumn + thisRangeAddress.StartColumn;
return new ScVbaRange( mxParent, mxContext, xSheetRange->getCellRangeByPosition( nColumn, nRow, nColumn, nRow ) );
}
@@ -2117,7 +2138,7 @@ ScVbaRange::Select() throw (uno::RuntimeException)
}
catch( uno::Exception& )
{
- }
+ }
}
}
@@ -2157,14 +2178,14 @@ ScVbaRange::Activate() throw (uno::RuntimeException)
RangeHelper thisRange( xCellRange );
uno::Reference< sheet::XCellRangeAddressable > xThisRangeAddress = thisRange.getCellRangeAddressable();
table::CellRangeAddress thisRangeAddress = xThisRangeAddress->getRangeAddress();
- uno::Reference< frame::XModel > xModel;
+ uno::Reference< frame::XModel > xModel;
ScDocShell* pShell = getScDocShell();
if ( pShell )
xModel = pShell->GetModel();
if ( !xModel.is() )
- throw uno::RuntimeException();
+ throw uno::RuntimeException();
// get current selection
uno::Reference< sheet::XCellRangeAddressable > xRange( xModel->getCurrentSelection(), ::uno::UNO_QUERY);
@@ -2181,9 +2202,9 @@ ScVbaRange::Activate() throw (uno::RuntimeException)
setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), xModel );
return;
}
-
+
}
- }
+ }
if ( xRange.is() && cellInRange( xRange->getRangeAddress(), thisRangeAddress.StartColumn, thisRangeAddress.StartRow ) )
setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), xModel );
@@ -2191,7 +2212,7 @@ ScVbaRange::Activate() throw (uno::RuntimeException)
{
// if this range is multi cell select the range other
// wise just position the cell at this single range position
- if ( isSingleCellRange() )
+ if ( isSingleCellRange() )
// This top-leftmost cell of this Range is not in the current
// selection so just select this range
setCursor( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), xModel, false );
@@ -2221,8 +2242,8 @@ ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException)
aRange.aStart.SetRow( aRange.aStart.Row() + --nValue );
aRange.aEnd.SetRow( aRange.aStart.Row() );
}
-
- else if ( aIndex >>= sAddress )
+
+ else if ( aIndex >>= sAddress )
{
ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
ScRange tmpRange;
@@ -2235,7 +2256,7 @@ ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException)
}
else
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Illegal param" ) ), uno::Reference< uno::XInterface >() );
-
+
if ( aRange.aStart.Row() < 0 || aRange.aEnd.Row() < 0 )
throw uno::RuntimeException( rtl::OUString::createFromAscii("Internal failure, illegal param"), uno::Reference< uno::XInterface >() );
// return a normal range ( even for multi-selection
@@ -2246,7 +2267,7 @@ ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException)
if ( m_Areas->getCount() > 1 )
return new ScVbaRange( mxParent, mxContext, mxRanges, true );
return new ScVbaRange( mxParent, mxContext, mxRange, true );
-}
+}
uno::Reference< excel::XRange >
ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException)
@@ -2268,8 +2289,8 @@ ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException)
aRange.aStart.SetCol( aRange.aStart.Col() + static_cast< SCCOL > ( --nValue ) );
aRange.aEnd.SetCol( aRange.aStart.Col() );
}
-
- else if ( aIndex >>= sAddress )
+
+ else if ( aIndex >>= sAddress )
{
ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
ScRange tmpRange;
@@ -2282,20 +2303,19 @@ ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException)
}
else
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Illegal param" ) ), uno::Reference< uno::XInterface >() );
-
+
if ( aRange.aStart.Col() < 0 || aRange.aEnd.Col() < 0 )
throw uno::RuntimeException( rtl::OUString::createFromAscii("Internal failure, illegal param"), uno::Reference< uno::XInterface >() );
}
// Columns() - no params
uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), aRange ) );
return new ScVbaRange( mxParent, mxContext, xRange, false, true );
-}
+}
void
ScVbaRange::setMergeCells( const uno::Any& aIsMerged ) throw (script::BasicErrorException, uno::RuntimeException)
{
- bool bMerge = false;
- aIsMerged >>= bMerge;
+ bool bMerge = extractBoolFromAny( aIsMerged );
if( mxRanges.is() )
{
@@ -2325,7 +2345,7 @@ ScVbaRange::setMergeCells( const uno::Any& aIsMerged ) throw (script::BasicError
// otherwise, merge single range
lclExpandAndMerge( mxRange, bMerge );
}
-
+
uno::Any
ScVbaRange::getMergeCells() throw (script::BasicErrorException, uno::RuntimeException)
{
@@ -2354,7 +2374,7 @@ ScVbaRange::getMergeCells() throw (script::BasicErrorException, uno::RuntimeExce
default: return aNULL();
}
}
-
+
void
ScVbaRange::Copy(const ::uno::Any& Destination) throw (uno::RuntimeException)
{
@@ -2407,7 +2427,7 @@ ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException)
excel::implnCut( xModel );
}
}
-
+
void
ScVbaRange::setNumberFormat( const uno::Any& aFormat ) throw ( script::BasicErrorException, uno::RuntimeException)
{
@@ -2419,14 +2439,14 @@ ScVbaRange::setNumberFormat( const uno::Any& aFormat ) throw ( script::BasicErro
for ( sal_Int32 index=1; index <= nItems; ++index )
{
uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
- xRange->setNumberFormat( aFormat );
+ xRange->setNumberFormat( aFormat );
}
return;
}
NumFormatHelper numFormat( mxRange );
numFormat.setNumberFormat( sFormat );
}
-
+
uno::Any
ScVbaRange::getNumberFormat() throw ( script::BasicErrorException, uno::RuntimeException)
{
@@ -2443,8 +2463,8 @@ ScVbaRange::getNumberFormat() throw ( script::BasicErrorException, uno::RuntimeE
if ( index > 1 )
if ( aResult != xRange->getNumberFormat() )
return aNULL();
- aResult = xRange->getNumberFormat();
- if ( aNULL() == aResult )
+ aResult = xRange->getNumberFormat();
+ if ( aNULL() == aResult )
return aNULL();
}
return aResult;
@@ -2479,7 +2499,7 @@ ScVbaRange::Resize( const uno::Any &RowSize, const uno::Any &ColumnSize ) throw
xCellRangeAddressable->getRangeAddress().EndColumn,
xCellRangeAddressable->getRangeAddress().EndRow ) );
}
-
+
void
ScVbaRange::setWrapText( const uno::Any& aIsWrapped ) throw (script::BasicErrorException, uno::RuntimeException)
{
@@ -2490,15 +2510,16 @@ ScVbaRange::setWrapText( const uno::Any& aIsWrapped ) throw (script::BasicErrorE
for ( sal_Int32 index=1; index <= nItems; ++index )
{
uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
- xRange->setWrapText( aIsWrapped );
+ xRange->setWrapText( aIsWrapped );
}
return;
}
uno::Reference< beans::XPropertySet > xProps(mxRange, ::uno::UNO_QUERY_THROW );
- xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsTextWrapped" ) ), aIsWrapped );
+ bool bIsWrapped = extractBoolFromAny( aIsWrapped );
+ xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsTextWrapped" ) ), uno::Any( bIsWrapped ) );
}
-
+
uno::Any
ScVbaRange::getWrapText() throw (script::BasicErrorException, uno::RuntimeException)
{
@@ -2512,17 +2533,17 @@ ScVbaRange::getWrapText() throw (script::BasicErrorException, uno::RuntimeExcept
if ( index > 1 )
if ( aResult != xRange->getWrapText() )
return aNULL();
- aResult = xRange->getWrapText();
+ aResult = xRange->getWrapText();
}
return aResult;
}
SfxItemSet* pDataSet = getCurrentDataSet();
-
+
SfxItemState eState = pDataSet->GetItemState( ATTR_LINEBREAK, TRUE, NULL);
if ( eState == SFX_ITEM_DONTCARE )
return aNULL();
-
+
uno::Reference< beans::XPropertySet > xProps(mxRange, ::uno::UNO_QUERY_THROW );
uno::Any aValue = xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsTextWrapped" ) ) );
return aValue;
@@ -2532,7 +2553,7 @@ uno::Reference< excel::XInterior > ScVbaRange::Interior( ) throw ( script::Basic
{
uno::Reference< beans::XPropertySet > xProps( mxRange, uno::UNO_QUERY_THROW );
return new ScVbaInterior ( this, mxContext, xProps, getScDocument() );
-}
+}
uno::Reference< excel::XRange >
ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2 ) throw (uno::RuntimeException)
{
@@ -2556,11 +2577,11 @@ ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseI
uno::Reference< table::XCellRange > xRanges = thisRange.getCellRangeFromSheet();
uno::Reference< sheet::XCellRangeAddressable > xAddressable( xRanges, uno::UNO_QUERY_THROW );
- uno::Reference< table::XCellRange > xReferrer =
- xRanges->getCellRangeByPosition( getColumn()-1, getRow()-1,
- xAddressable->getRangeAddress().EndColumn,
+ uno::Reference< table::XCellRange > xReferrer =
+ xRanges->getCellRangeByPosition( getColumn()-1, getRow()-1,
+ xAddressable->getRangeAddress().EndColumn,
xAddressable->getRangeAddress().EndRow );
- // xAddressable now for this range
+ // xAddressable now for this range
xAddressable.set( xReferrer, uno::UNO_QUERY_THROW );
if( !Cell1.hasValue() )
@@ -2577,20 +2598,20 @@ ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseI
{
rtl::OUString sName;
Cell1 >>= sName;
- RangeHelper referRange( xReferrer );
+ RangeHelper referRange( xReferrer );
table::CellRangeAddress referAddress = referRange.getCellRangeAddressable()->getRangeAddress();
return getRangeForName( mxContext, sName, getScDocShell(), referAddress );
-
+
}
else
{
table::CellRangeAddress cell1, cell2;
- cell1 = getCellRangeAddressForVBARange( Cell1, getScDocShell() );
+ cell1 = getCellRangeAddressForVBARange( Cell1, getScDocShell() );
// Cell1 & Cell2 defined
// Excel seems to combine the range as the range defined by
// the combination of Cell1 & Cell2
-
- cell2 = getCellRangeAddressForVBARange( Cell2, getScDocShell() );
+
+ cell2 = getCellRangeAddressForVBARange( Cell2, getScDocShell() );
resultAddress.StartColumn = ( cell1.StartColumn < cell2.StartColumn ) ? cell1.StartColumn : cell2.StartColumn;
resultAddress.StartRow = ( cell1.StartRow < cell2.StartRow ) ? cell1.StartRow : cell2.StartRow;
@@ -2610,8 +2631,8 @@ ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseI
// this is not a call from Application.Range( x,y )
// if a different sheet from this range is specified it's
// an error
- if ( parentRangeAddress.Sheet != cell1.Sheet
- || parentRangeAddress.Sheet != cell2.Sheet
+ if ( parentRangeAddress.Sheet != cell1.Sheet
+ || parentRangeAddress.Sheet != cell2.Sheet
)
throw uno::RuntimeException();
@@ -2619,7 +2640,7 @@ ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseI
ScUnoConversion::FillScRange( aRange, resultAddress );
}
ScRange parentAddress;
- ScUnoConversion::FillScRange( parentAddress, parentRangeAddress);
+ ScUnoConversion::FillScRange( parentAddress, parentRangeAddress);
if ( aRange.aStart.Col() >= 0 && aRange.aStart.Row() >= 0 && aRange.aEnd.Col() >= 0 && aRange.aEnd.Row() >= 0 )
{
sal_Int32 nStartX = parentAddress.aStart.Col() + aRange.aStart.Col();
@@ -2635,13 +2656,13 @@ ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseI
xCellRange = new ScCellRangeObj( getScDocShell(), aNew );
}
}
-
+
return new ScVbaRange( mxParent, mxContext, xCellRange );
}
// Allow access to underlying openoffice uno api ( useful for debugging
-// with openoffice basic )
+// with openoffice basic )
uno::Any SAL_CALL ScVbaRange::getCellRange( ) throw (uno::RuntimeException)
{
uno::Any aAny;
@@ -2659,19 +2680,19 @@ uno::Any SAL_CALL ScVbaRange::getCellRange( ) throw (uno::RuntimeException)
throw uno::RuntimeException();
}
-static USHORT
+static USHORT
getPasteFlags (sal_Int32 Paste)
{
- USHORT nFlags = IDF_NONE;
+ USHORT nFlags = IDF_NONE;
switch (Paste) {
- case excel::XlPasteType::xlPasteComments:
+ case excel::XlPasteType::xlPasteComments:
nFlags = IDF_NOTE;break;
- case excel::XlPasteType::xlPasteFormats:
+ case excel::XlPasteType::xlPasteFormats:
nFlags = IDF_ATTRIB;break;
- case excel::XlPasteType::xlPasteFormulas:
+ case excel::XlPasteType::xlPasteFormulas:
nFlags = IDF_FORMULA;break;
- case excel::XlPasteType::xlPasteFormulasAndNumberFormats :
- case excel::XlPasteType::xlPasteValues:
+ case excel::XlPasteType::xlPasteFormulasAndNumberFormats :
+ case excel::XlPasteType::xlPasteValues:
#ifdef VBA_OOBUILD_HACK
nFlags = ( IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_SPECIAL_BOOLEAN ); break;
#else
@@ -2680,52 +2701,52 @@ getPasteFlags (sal_Int32 Paste)
case excel::XlPasteType::xlPasteValuesAndNumberFormats:
nFlags = IDF_VALUE | IDF_ATTRIB; break;
case excel::XlPasteType::xlPasteColumnWidths:
- case excel::XlPasteType::xlPasteValidation:
+ case excel::XlPasteType::xlPasteValidation:
nFlags = IDF_NONE;break;
- case excel::XlPasteType::xlPasteAll:
- case excel::XlPasteType::xlPasteAllExceptBorders:
+ case excel::XlPasteType::xlPasteAll:
+ case excel::XlPasteType::xlPasteAllExceptBorders:
default:
nFlags = IDF_ALL;break;
};
return nFlags;
}
-static USHORT
+static USHORT
getPasteFormulaBits( sal_Int32 Operation)
{
USHORT nFormulaBits = PASTE_NOFUNC ;
switch (Operation)
{
- case excel::XlPasteSpecialOperation::xlPasteSpecialOperationAdd:
+ case excel::XlPasteSpecialOperation::xlPasteSpecialOperationAdd:
nFormulaBits = PASTE_ADD;break;
- case excel::XlPasteSpecialOperation::xlPasteSpecialOperationSubtract:
+ case excel::XlPasteSpecialOperation::xlPasteSpecialOperationSubtract:
nFormulaBits = PASTE_SUB;break;
- case excel::XlPasteSpecialOperation::xlPasteSpecialOperationMultiply:
+ case excel::XlPasteSpecialOperation::xlPasteSpecialOperationMultiply:
nFormulaBits = PASTE_MUL;break;
case excel::XlPasteSpecialOperation::xlPasteSpecialOperationDivide:
nFormulaBits = PASTE_DIV;break;
- case excel::XlPasteSpecialOperation::xlPasteSpecialOperationNone:
+ case excel::XlPasteSpecialOperation::xlPasteSpecialOperationNone:
default:
nFormulaBits = PASTE_NOFUNC; break;
};
-
+
return nFormulaBits;
}
-void SAL_CALL
-ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, const uno::Any& SkipBlanks, const uno::Any& Transpose ) throw (::com::sun::star::uno::RuntimeException)
+void SAL_CALL
+ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, const uno::Any& SkipBlanks, const uno::Any& Transpose ) throw (::com::sun::star::uno::RuntimeException)
{
if ( m_Areas->getCount() > 1 )
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("That command cannot be used on multiple selections" ) ), uno::Reference< uno::XInterface >() );
- ScDocShell* pShell = getScDocShell();
-
+ ScDocShell* pShell = getScDocShell();
+
uno::Reference< frame::XModel > xModel( ( pShell ? pShell->GetModel() : NULL ), uno::UNO_QUERY_THROW );
uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
// save old selection
uno::Reference< uno::XInterface > xSel( xModel->getCurrentSelection() );
// select this range
xSelection->select( uno::makeAny( mxRange ) );
- // set up defaults
+ // set up defaults
sal_Int32 nPaste = excel::XlPasteType::xlPasteAll;
sal_Int32 nOperation = excel::XlPasteSpecialOperation::xlPasteSpecialOperationNone;
sal_Bool bTranspose = sal_False;
@@ -2747,20 +2768,20 @@ ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, cons
xSelection->select( uno::makeAny( xSel ) );
}
-uno::Reference< excel::XRange >
+uno::Reference< excel::XRange >
ScVbaRange::getEntireColumnOrRow( bool bColumn ) throw (uno::RuntimeException)
{
ScCellRangesBase* pUnoRangesBase = getCellRangesBase();
// copy the range list
- ScRangeList aCellRanges = pUnoRangesBase->GetRangeList();
+ ScRangeList aCellRanges = pUnoRangesBase->GetRangeList();
for ( ScRange* pRange = aCellRanges.First() ; pRange; pRange = aCellRanges.Next() )
{
- if ( bColumn )
+ if ( bColumn )
{
pRange->aStart.SetRow( 0 );
pRange->aEnd.SetRow( MAXROW );
- }
+ }
else
{
pRange->aStart.SetCol( 0 );
@@ -2770,32 +2791,32 @@ ScVbaRange::getEntireColumnOrRow( bool bColumn ) throw (uno::RuntimeException)
if ( aCellRanges.Count() > 1 ) // Multi-Area
{
uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( pUnoRangesBase->GetDocShell(), aCellRanges ) );
-
+
return new ScVbaRange( mxParent, mxContext, xRanges, !bColumn, bColumn );
}
uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), *aCellRanges.First() ) );
return new ScVbaRange( mxParent, mxContext, xRange, !bColumn, bColumn );
}
-uno::Reference< excel::XRange > SAL_CALL
+uno::Reference< excel::XRange > SAL_CALL
ScVbaRange::getEntireRow() throw (uno::RuntimeException)
{
return getEntireColumnOrRow(false);
}
-uno::Reference< excel::XRange > SAL_CALL
+uno::Reference< excel::XRange > SAL_CALL
ScVbaRange::getEntireColumn() throw (uno::RuntimeException)
{
return getEntireColumnOrRow();
}
-uno::Reference< excel::XComment > SAL_CALL
+uno::Reference< excel::XComment > SAL_CALL
ScVbaRange::AddComment( const uno::Any& Text ) throw (uno::RuntimeException)
{
// if there is already a comment in the top-left cell then throw
if( getComment().is() )
throw uno::RuntimeException();
-
+
// workaround: Excel allows to create empty comment, Calc does not
::rtl::OUString aNoteText;
if( Text.hasValue() && !(Text >>= aNoteText) )
@@ -2822,7 +2843,7 @@ ScVbaRange::getComment() throw (uno::RuntimeException)
if ( !xComment->Text( uno::Any(), uno::Any(), uno::Any() ).getLength() )
return NULL;
return xComment;
-
+
}
uno::Reference< beans::XPropertySet >
@@ -2834,18 +2855,18 @@ getRowOrColumnProps( const uno::Reference< table::XCellRange >& xCellRange, bool
xProps.set( xColRow->getRows(), uno::UNO_QUERY_THROW );
else
xProps.set( xColRow->getColumns(), uno::UNO_QUERY_THROW );
- return xProps;
+ return xProps;
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaRange::getHidden() throw (uno::RuntimeException)
{
- // if multi-area result is the result of the
+ // if multi-area result is the result of the
// first area
if ( m_Areas->getCount() > 1 )
{
uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(sal_Int32(1)), uno::Any() ), uno::UNO_QUERY_THROW );
- return xRange->getHidden();
+ return xRange->getHidden();
}
bool bIsVisible = false;
try
@@ -2858,10 +2879,10 @@ ScVbaRange::getHidden() throw (uno::RuntimeException)
{
throw uno::RuntimeException( e.Message, uno::Reference< uno::XInterface >() );
}
- return uno::makeAny( !bIsVisible );
+ return uno::makeAny( !bIsVisible );
}
-void SAL_CALL
+void SAL_CALL
ScVbaRange::setHidden( const uno::Any& _hidden ) throw (uno::RuntimeException)
{
if ( m_Areas->getCount() > 1 )
@@ -2870,23 +2891,21 @@ ScVbaRange::setHidden( const uno::Any& _hidden ) throw (uno::RuntimeException)
for ( sal_Int32 index=1; index <= nItems; ++index )
{
uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
- xRange->setHidden( _hidden );
+ xRange->setHidden( _hidden );
}
return;
}
- sal_Bool bHidden = sal_False;
- _hidden >>= bHidden;
-
+ bool bHidden = extractBoolFromAny( _hidden );
try
{
uno::Reference< beans::XPropertySet > xProps = getRowOrColumnProps( mxRange, mbIsRows );
- xProps->setPropertyValue( ISVISIBLE, uno::makeAny( !bHidden ) );
+ xProps->setPropertyValue( ISVISIBLE, uno::Any( !bHidden ) );
}
catch( uno::Exception& e )
{
throw uno::RuntimeException( e.Message, uno::Reference< uno::XInterface >() );
- }
+ }
}
::sal_Bool SAL_CALL
@@ -2899,8 +2918,8 @@ ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replace
uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW );
xRange->Replace( What, Replacement, LookAt, SearchOrder, MatchCase, MatchByte, SearchFormat, ReplaceFormat );
}
- return sal_True; // seems to return true always ( or at least I haven't found the trick of
- }
+ return sal_True; // seems to return true always ( or at least I haven't found the trick of
+ }
// sanity check required params
if ( !What.getLength() /*|| !Replacement.getLength()*/ )
@@ -2911,7 +2930,7 @@ ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replace
const SvxSearchItem& globalSearchOptions = ScGlobal::GetSearchItem();
SvxSearchItem newOptions( globalSearchOptions );
- sal_Int16 nLook = globalSearchOptions.GetWordOnly() ? excel::XlLookAt::xlPart : excel::XlLookAt::xlWhole;
+ sal_Int16 nLook = globalSearchOptions.GetWordOnly() ? excel::XlLookAt::xlPart : excel::XlLookAt::xlWhole;
sal_Int16 nSearchOrder = globalSearchOptions.GetRowDirection() ? excel::XlSearchOrder::xlByRows : excel::XlSearchOrder::xlByColumns;
sal_Bool bMatchCase = sal_False;
@@ -2920,10 +2939,10 @@ ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replace
{
uno::Reference< util::XReplaceDescriptor > xDescriptor =
xReplace->createReplaceDescriptor();
-
- xDescriptor->setSearchString( sWhat);
- xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHREGEXP ) ), uno::makeAny( sal_True ) );
- xDescriptor->setReplaceString( Replacement);
+
+ xDescriptor->setSearchString( sWhat);
+ xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHREGEXP ) ), uno::makeAny( sal_True ) );
+ xDescriptor->setReplaceString( Replacement);
if ( LookAt.hasValue() )
{
// sets SearchWords ( true is Cell match )
@@ -2938,7 +2957,7 @@ ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replace
// set global search props ( affects the find dialog
// and of course the defaults for this method
newOptions.SetWordOnly( bSearchWords );
- xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHWORDS ) ), uno::makeAny( bSearchWords ) );
+ xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHWORDS ) ), uno::makeAny( bSearchWords ) );
}
// sets SearchByRow ( true for Rows )
if ( SearchOrder.hasValue() )
@@ -2951,18 +2970,18 @@ ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replace
bSearchByRow = sal_True;
else
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for SearchOrder" )) , uno::Reference< uno::XInterface >() );
-
- newOptions.SetRowDirection( bSearchByRow );
- xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHBYROW ) ), uno::makeAny( bSearchByRow ) );
- }
+
+ newOptions.SetRowDirection( bSearchByRow );
+ xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHBYROW ) ), uno::makeAny( bSearchByRow ) );
+ }
if ( MatchCase.hasValue() )
{
// SearchCaseSensitive
- MatchCase >>= bMatchCase;
- xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHCASE ) ), uno::makeAny( bMatchCase ) );
- }
+ MatchCase >>= bMatchCase;
+ xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHCASE ) ), uno::makeAny( bMatchCase ) );
+ }
- ScGlobal::SetSearchItem( newOptions );
+ ScGlobal::SetSearchItem( newOptions );
// ignore MatchByte for the moment, its not supported in
// OOo.org afaik
@@ -2972,14 +2991,14 @@ ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replace
return sal_True; // always
}
-uno::Reference< excel::XRange > SAL_CALL
+uno::Reference< excel::XRange > SAL_CALL
ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& LookIn, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& SearchDirection, const uno::Any& MatchCase, const uno::Any& /*MatchByte*/, const uno::Any& /*SearchFormat*/ ) throw (uno::RuntimeException)
{
// return a Range object that represents the first cell where that information is found.
rtl::OUString sWhat;
sal_Int32 nWhat = 0;
- float fWhat = 0.0;
-
+ double fWhat = 0.0;
+
// string.
if( What >>= sWhat )
{
@@ -3002,7 +3021,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L
const SvxSearchItem& globalSearchOptions = ScGlobal::GetSearchItem();
SvxSearchItem newOptions( globalSearchOptions );
- sal_Int16 nLookAt = globalSearchOptions.GetWordOnly() ? excel::XlLookAt::xlPart : excel::XlLookAt::xlWhole;
+ sal_Int16 nLookAt = globalSearchOptions.GetWordOnly() ? excel::XlLookAt::xlPart : excel::XlLookAt::xlWhole;
sal_Int16 nSearchOrder = globalSearchOptions.GetRowDirection() ? excel::XlSearchOrder::xlByRows : excel::XlSearchOrder::xlByColumns;
uno::Reference< util::XSearchable > xSearch( mxRange, uno::UNO_QUERY );
@@ -3010,6 +3029,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L
{
uno::Reference< util::XSearchDescriptor > xDescriptor = xSearch->createSearchDescriptor();
xDescriptor->setSearchString( sSearch );
+ xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHREGEXP ) ), uno::Any( true ) );
uno::Reference< excel::XRange > xAfterRange;
uno::Reference< table::XCellRange > xStartCell;
@@ -3030,7 +3050,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L
sal_Int32 nLookIn = 0;
if( LookIn >>= nLookIn )
{
- sal_Int16 nSearchType = 0;
+ sal_Int16 nSearchType = 0;
switch( nLookIn )
{
case excel::XlFindLookIn::xlComments :
@@ -3062,7 +3082,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L
else
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for LookAt" )) , uno::Reference< uno::XInterface >() );
newOptions.SetWordOnly( bSearchWords );
- xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHWORDS ) ), uno::makeAny( bSearchWords ) );
+ xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHWORDS ) ), uno::makeAny( bSearchWords ) );
}
// SearchOrder
@@ -3076,10 +3096,10 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L
bSearchByRow = sal_True;
else
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for SearchOrder" )) , uno::Reference< uno::XInterface >() );
-
- newOptions.SetRowDirection( bSearchByRow );
- xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHBYROW ) ), uno::makeAny( bSearchByRow ) );
- }
+
+ newOptions.SetRowDirection( bSearchByRow );
+ xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHBYROW ) ), uno::makeAny( bSearchByRow ) );
+ }
// SearchDirection
if ( SearchDirection.hasValue() )
@@ -3089,7 +3109,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L
{
sal_Bool bSearchBackwards = sal_False;
if ( nSearchDirection == excel::XlSearchDirection::xlNext )
- bSearchBackwards = sal_False;
+ bSearchBackwards = sal_False;
else if( nSearchDirection == excel::XlSearchDirection::xlPrevious )
bSearchBackwards = sal_True;
else
@@ -3106,8 +3126,8 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L
// SearchCaseSensitive
if( !( MatchCase >>= bMatchCase ) )
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Range::Replace, illegal value for MatchCase" )) , uno::Reference< uno::XInterface >() );
- }
- xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHCASE ) ), uno::makeAny( bMatchCase ) );
+ }
+ xDescriptor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SRCHCASE ) ), uno::makeAny( bMatchCase ) );
// MatchByte
// SearchFormat
@@ -3115,8 +3135,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L
ScGlobal::SetSearchItem( newOptions );
- uno::Reference< util::XSearchDescriptor > xSearchDescriptor( xDescriptor, uno::UNO_QUERY );
- uno::Reference< uno::XInterface > xInterface = xStartCell.is() ? xSearch->findNext( xStartCell, xSearchDescriptor) : xSearch->findFirst( xSearchDescriptor );
+ uno::Reference< uno::XInterface > xInterface = xStartCell.is() ? xSearch->findNext( xStartCell, xDescriptor) : xSearch->findFirst( xDescriptor );
uno::Reference< table::XCellRange > xCellRange( xInterface, uno::UNO_QUERY );
if ( xCellRange.is() )
{
@@ -3141,7 +3160,7 @@ uno::Reference< table::XCellRange > processKey( const uno::Any& Key, uno::Refere
xKeyRange.set( Key, uno::UNO_QUERY_THROW );
}
else if ( Key.getValueType() == ::getCppuType( static_cast< const rtl::OUString* >(0) ) )
-
+
{
rtl::OUString sRangeName = ::comphelper::getString( Key );
table::CellRangeAddress aRefAddr;
@@ -3174,11 +3193,11 @@ const rtl::OUString& sPropName ) throw( uno::RuntimeException )
// helper method for Sort
void updateTableSortField( const uno::Reference< table::XCellRange >& xParentRange,
- const uno::Reference< table::XCellRange >& xColRowKey, sal_Int16 nOrder,
+ const uno::Reference< table::XCellRange >& xColRowKey, sal_Int16 nOrder,
table::TableSortField& aTableField, sal_Bool bIsSortColumn, sal_Bool bMatchCase ) throw ( uno::RuntimeException )
{
- RangeHelper parentRange( xParentRange );
- RangeHelper colRowRange( xColRowKey );
+ RangeHelper parentRange( xParentRange );
+ RangeHelper colRowRange( xColRowKey );
table::CellRangeAddress parentRangeAddress = parentRange.getCellRangeAddressable()->getRangeAddress();
@@ -3187,27 +3206,27 @@ void updateTableSortField( const uno::Reference< table::XCellRange >& xParentRan
// make sure that upper left poing of key range is within the
// parent range
if ( ( !bIsSortColumn && colRowKeyAddress.StartColumn >= parentRangeAddress.StartColumn &&
- colRowKeyAddress.StartColumn <= parentRangeAddress.EndColumn ) || ( bIsSortColumn &&
+ colRowKeyAddress.StartColumn <= parentRangeAddress.EndColumn ) || ( bIsSortColumn &&
colRowKeyAddress.StartRow >= parentRangeAddress.StartRow &&
colRowKeyAddress.StartRow <= parentRangeAddress.EndRow ) )
{
//determine col/row index
if ( bIsSortColumn )
- aTableField.Field = colRowKeyAddress.StartRow - parentRangeAddress.StartRow;
+ aTableField.Field = colRowKeyAddress.StartRow - parentRangeAddress.StartRow;
else
- aTableField.Field = colRowKeyAddress.StartColumn - parentRangeAddress.StartColumn;
+ aTableField.Field = colRowKeyAddress.StartColumn - parentRangeAddress.StartColumn;
aTableField.IsCaseSensitive = bMatchCase;
- if ( nOrder == excel::XlSortOrder::xlAscending )
- aTableField.IsAscending = sal_True;
- else
- aTableField.IsAscending = sal_False;
+ if ( nOrder == excel::XlSortOrder::xlAscending )
+ aTableField.IsAscending = sal_True;
+ else
+ aTableField.IsAscending = sal_False;
}
else
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Illegal Key param" ) ), uno::Reference< uno::XInterface >() );
-
-}
+
+}
void SAL_CALL
ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& Key2, const uno::Any& /*Type*/, const uno::Any& Order2, const uno::Any& Key3, const uno::Any& Order3, const uno::Any& Header, const uno::Any& OrderCustom, const uno::Any& MatchCase, const uno::Any& Orientation, const uno::Any& SortMethod, const uno::Any& DataOption1, const uno::Any& DataOption2, const uno::Any& DataOption3 ) throw (uno::RuntimeException)
@@ -3240,14 +3259,14 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any&
// 1) #TODO #FIXME need to process DataOption[1..3] not used currently
// 2) #TODO #FIXME need to refactor this ( below ) into a IsSingleCell() method
uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY_THROW );
-
+
// 'Fraid I don't remember what I was trying to achieve here ???
-/*
+/*
if ( isSingleCellRange() )
{
uno::Reference< XRange > xCurrent = CurrentRegion();
xCurrent->Sort( Key1, Order1, Key2, Type, Order2, Key3, Order3, Header, OrderCustom, MatchCase, Orientation, SortMethod, DataOption1, DataOption2, DataOption3 );
- return;
+ return;
}
*/
// set up defaults
@@ -3265,8 +3284,8 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any&
if ( Orientation.hasValue() )
{
- // Documentation says xlSortRows is default but that doesn't appear to be
- // the case. Also it appears that xlSortColumns is the default which
+ // Documentation says xlSortRows is default but that doesn't appear to be
+ // the case. Also it appears that xlSortColumns is the default which
// strangely enought sorts by Row
nOrientation = ::comphelper::getINT16( Orientation );
// persist new option to be next calls default
@@ -3293,17 +3312,17 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any&
#ifdef VBA_OOBUILD_HACK
aSortParam.nCompatHeader = nHeader;
#endif
- }
+ }
if ( nHeader == excel::XlYesNoGuess::xlGuess )
{
bool bHasColHeader = pDoc->HasColHeader( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), static_cast< SCCOL >( thisRangeAddress.EndColumn ), static_cast< SCROW >( thisRangeAddress.EndRow ), static_cast< SCTAB >( thisRangeAddress.Sheet ));
bool bHasRowHeader = pDoc->HasRowHeader( static_cast< SCCOL >( thisRangeAddress.StartColumn ), static_cast< SCROW >( thisRangeAddress.StartRow ), static_cast< SCCOL >( thisRangeAddress.EndColumn ), static_cast< SCROW >( thisRangeAddress.EndRow ), static_cast< SCTAB >( thisRangeAddress.Sheet ) );
if ( bHasColHeader || bHasRowHeader )
- nHeader = excel::XlYesNoGuess::xlYes;
+ nHeader = excel::XlYesNoGuess::xlYes;
else
- nHeader = excel::XlYesNoGuess::xlNo;
-#ifdef VBA_OOBUILD_HACK
+ nHeader = excel::XlYesNoGuess::xlNo;
+#ifdef VBA_OOBUILD_HACK
aSortParam.nCompatHeader = nHeader;
#endif
}
@@ -3315,7 +3334,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any&
{
nSortMethod = ::comphelper::getINT16( SortMethod );
}
-
+
if ( OrderCustom.hasValue() )
{
OrderCustom >>= nCustom;
@@ -3332,7 +3351,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any&
if ( Order1.hasValue() )
{
nOrder1 = ::comphelper::getINT16(Order1);
- if ( nOrder1 == excel::XlSortOrder::xlAscending )
+ if ( nOrder1 == excel::XlSortOrder::xlAscending )
aSortParam.bAscending[0] = TRUE;
else
aSortParam.bAscending[0] = FALSE;
@@ -3341,7 +3360,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any&
if ( Order2.hasValue() )
{
nOrder2 = ::comphelper::getINT16(Order2);
- if ( nOrder2 == excel::XlSortOrder::xlAscending )
+ if ( nOrder2 == excel::XlSortOrder::xlAscending )
aSortParam.bAscending[1] = TRUE;
else
aSortParam.bAscending[1] = FALSE;
@@ -3349,15 +3368,15 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any&
if ( Order3.hasValue() )
{
nOrder3 = ::comphelper::getINT16(Order3);
- if ( nOrder3 == excel::XlSortOrder::xlAscending )
+ if ( nOrder3 == excel::XlSortOrder::xlAscending )
aSortParam.bAscending[2] = TRUE;
else
aSortParam.bAscending[2] = FALSE;
}
- uno::Reference< table::XCellRange > xKey1;
- uno::Reference< table::XCellRange > xKey2;
- uno::Reference< table::XCellRange > xKey3;
+ uno::Reference< table::XCellRange > xKey1;
+ uno::Reference< table::XCellRange > xKey2;
+ uno::Reference< table::XCellRange > xKey3;
ScDocShell* pDocShell = getScDocShell();
xKey1 = processKey( Key1, mxContext, pDocShell );
if ( !xKey1.is() )
@@ -3376,22 +3395,22 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any&
sal_Int32 nTableIndex = 0;
updateTableSortField( mxRange, xKey1, nOrder1, sTableFields[ nTableIndex++ ], bIsSortColumns, bMatchCase );
- if ( xKey2.is() )
+ if ( xKey2.is() )
{
sTableFields.realloc( sTableFields.getLength() + 1 );
updateTableSortField( mxRange, xKey2, nOrder2, sTableFields[ nTableIndex++ ], bIsSortColumns, bMatchCase );
}
- if ( xKey3.is() )
+ if ( xKey3.is() )
{
sTableFields.realloc( sTableFields.getLength() + 1 );
updateTableSortField( mxRange, xKey3, nOrder3, sTableFields[ nTableIndex++ ], bIsSortColumns, bMatchCase );
}
sortDescriptor[ nTableSortFieldIndex ].Value <<= sTableFields;
- sal_Int32 nIndex = findSortPropertyIndex( sortDescriptor, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsSortColumns")) );
+ sal_Int32 nIndex = findSortPropertyIndex( sortDescriptor, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsSortColumns")) );
sortDescriptor[ nIndex ].Value <<= bIsSortColumns;
- nIndex = findSortPropertyIndex( sortDescriptor, CONTS_HEADER );
+ nIndex = findSortPropertyIndex( sortDescriptor, CONTS_HEADER );
sortDescriptor[ nIndex ].Value <<= bContainsHeader;
pDoc->SetSortParam( aSortParam, nTab );
@@ -3402,7 +3421,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any&
}
-uno::Reference< excel::XRange > SAL_CALL
+uno::Reference< excel::XRange > SAL_CALL
ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException)
{
if ( m_Areas->getCount() > 1 )
@@ -3411,15 +3430,15 @@ ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException)
return xRange->End( Direction );
}
-
+
// #FIXME #TODO
- // euch! found my orig implementation sucked, so
+ // euch! found my orig implementation sucked, so
// trying this even suckier one ( really need to use/expose code in
// around ScTabView::MoveCursorArea(), thats the bit that calcutes
- // where the cursor should go )
+ // where the cursor should go )
// Main problem with this method is the ultra hacky attempt to preserve
// the ActiveCell, there should be no need to go to these extreems
-
+
// Save ActiveCell pos ( to restore later )
uno::Any aDft;
uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
@@ -3441,7 +3460,7 @@ ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException)
SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
USHORT nSID = 0;
-
+
switch( Direction )
{
case excel::XlDirection::xlDown:
@@ -3457,7 +3476,7 @@ ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException)
nSID = SID_CURSORBLKRIGHT;
break;
default:
- throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": Invalid ColumnIndex" ) ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": Invalid ColumnIndex" ) ), uno::Reference< uno::XInterface >() );
}
if ( pDispatcher )
{
@@ -3465,21 +3484,21 @@ ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException)
}
}
- // result is the ActiveCell
- rtl::OUString sMoved = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft );
+ // result is the ActiveCell
+ rtl::OUString sMoved = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft );
- // restore old ActiveCell
+ // restore old ActiveCell
uno::Any aVoid;
uno::Reference< excel::XRange > xOldActiveCell( xApplication->getActiveSheet()->Range( uno::makeAny( sActiveCell ), aVoid ), uno::UNO_QUERY_THROW );
xOldActiveCell->Select();
uno::Reference< excel::XRange > resultCell;
-
+
resultCell.set( xApplication->getActiveSheet()->Range( uno::makeAny( sMoved ), aVoid ), uno::UNO_QUERY_THROW );
// return result
-
+
return resultCell;
}
@@ -3492,7 +3511,7 @@ ScVbaRange::isSingleCellRange()
return false;
}
-uno::Reference< excel::XCharacters > SAL_CALL
+uno::Reference< excel::XCharacters > SAL_CALL
ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length ) throw (uno::RuntimeException)
{
if ( !isSingleCellRange() )
@@ -3506,7 +3525,7 @@ ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length ) throw (u
return new ScVbaCharacters( this, mxContext, aPalette, xSimple, Start, Length );
}
- void SAL_CALL
+ void SAL_CALL
ScVbaRange::Delete( const uno::Any& Shift ) throw (uno::RuntimeException)
{
if ( m_Areas->getCount() > 1 )
@@ -3515,14 +3534,14 @@ ScVbaRange::Delete( const uno::Any& Shift ) throw (uno::RuntimeException)
for ( sal_Int32 index=1; index <= nItems; ++index )
{
uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
- xRange->Delete( Shift );
+ xRange->Delete( Shift );
}
return;
}
- sheet::CellDeleteMode mode = sheet::CellDeleteMode_NONE ;
+ sheet::CellDeleteMode mode = sheet::CellDeleteMode_NONE ;
RangeHelper thisRange( mxRange );
table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
- if ( Shift.hasValue() )
+ if ( Shift.hasValue() )
{
sal_Int32 nShift = 0;
Shift >>= nShift;
@@ -3549,12 +3568,12 @@ ScVbaRange::Delete( const uno::Any& Shift ) throw (uno::RuntimeException)
mode = sheet::CellDeleteMode_LEFT;
}
uno::Reference< sheet::XCellRangeMovement > xCellRangeMove( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
- xCellRangeMove->removeRange( thisAddress, mode );
-
+ xCellRangeMove->removeRange( thisAddress, mode );
+
}
//XElementAccess
-sal_Bool SAL_CALL
+sal_Bool SAL_CALL
ScVbaRange::hasElements() throw (uno::RuntimeException)
{
uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY );
@@ -3566,7 +3585,7 @@ ScVbaRange::hasElements() throw (uno::RuntimeException)
}
// XEnumerationAccess
-uno::Reference< container::XEnumeration > SAL_CALL
+uno::Reference< container::XEnumeration > SAL_CALL
ScVbaRange::createEnumeration() throw (uno::RuntimeException)
{
if ( mbIsColumns || mbIsRows )
@@ -3574,17 +3593,17 @@ ScVbaRange::createEnumeration() throw (uno::RuntimeException)
uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, uno::UNO_QUERY );
uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(1) ), uno::Any() ), uno::UNO_QUERY_THROW );
sal_Int32 nElems = 0;
- if ( mbIsColumns )
+ if ( mbIsColumns )
nElems = xColumnRowRange->getColumns()->getCount();
else
nElems = xColumnRowRange->getRows()->getCount();
return new ColumnsRowEnumeration( mxContext, xRange, nElems );
-
+
}
return new CellsEnumeration( mxParent, mxContext, m_Areas );
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
ScVbaRange::getDefaultMethodName( ) throw (uno::RuntimeException)
{
const static rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Item") );
@@ -3592,7 +3611,7 @@ ScVbaRange::getDefaultMethodName( ) throw (uno::RuntimeException)
}
-uno::Reference< awt::XDevice >
+uno::Reference< awt::XDevice >
getDeviceFromDoc( const uno::Reference< frame::XModel >& xModel ) throw( uno::RuntimeException )
{
uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
@@ -3602,7 +3621,7 @@ getDeviceFromDoc( const uno::Reference< frame::XModel >& xModel ) throw( uno::Ru
}
// returns calc internal col. width ( in points )
-double
+double
ScVbaRange::getCalcColWidth( const table::CellRangeAddress& rAddress) throw (uno::RuntimeException)
{
ScDocument* pDoc = getScDocument();
@@ -3619,15 +3638,15 @@ ScVbaRange::getCalcRowHeight( const table::CellRangeAddress& rAddress ) throw (u
USHORT nWidth = pDoc->GetOriginalHeight( rAddress.StartRow, rAddress.Sheet );
double nPoints = lcl_TwipsToPoints( nWidth );
nPoints = lcl_Round2DecPlaces( nPoints );
- return nPoints;
+ return nPoints;
}
// return Char Width in points
double getDefaultCharWidth( const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException )
{
- const static rtl::OUString sDflt( RTL_CONSTASCII_USTRINGPARAM("Default"));
- const static rtl::OUString sCharFontName( RTL_CONSTASCII_USTRINGPARAM("CharFontName"));
- const static rtl::OUString sPageStyles( RTL_CONSTASCII_USTRINGPARAM("PageStyles"));
+ const static rtl::OUString sDflt( RTL_CONSTASCII_USTRINGPARAM("Default"));
+ const static rtl::OUString sCharFontName( RTL_CONSTASCII_USTRINGPARAM("CharFontName"));
+ const static rtl::OUString sPageStyles( RTL_CONSTASCII_USTRINGPARAM("PageStyles"));
// get the font from the default style
uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( xModel, uno::UNO_QUERY_THROW );
uno::Reference< container::XNameAccess > xNameAccess( xStyleSupplier->getStyleFamilies(), uno::UNO_QUERY_THROW );
@@ -3640,32 +3659,32 @@ double getDefaultCharWidth( const uno::Reference< frame::XModel >& xModel ) thro
awt::FontDescriptor aDesc;
aDesc.Name = sFontName;
uno::Reference< awt::XFont > xFont( xDevice->getFont( aDesc ), uno::UNO_QUERY_THROW );
- double nCharPixelWidth = xFont->getCharWidth( (sal_Int8)'0' );
+ double nCharPixelWidth = xFont->getCharWidth( (sal_Int8)'0' );
double nPixelsPerMeter = xDevice->getInfo().PixelPerMeterX;
double nCharWidth = nCharPixelWidth / nPixelsPerMeter;
nCharWidth = nCharWidth * (double)56700;// in twips
- return lcl_TwipsToPoints( (USHORT)nCharWidth );
+ return lcl_TwipsToPoints( (USHORT)nCharWidth );
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaRange::getColumnWidth() throw (uno::RuntimeException)
{
sal_Int32 nLen = m_Areas->getCount();
- if ( nLen > 1 )
+ if ( nLen > 1 )
{
uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(1) ), uno::Any() ), uno::UNO_QUERY_THROW );
return xRange->getColumnWidth();
}
- double nColWidth = 0;
+ double nColWidth = 0;
ScDocShell* pShell = getScDocShell();
if ( pShell )
{
uno::Reference< frame::XModel > xModel = pShell->GetModel();
double defaultCharWidth = getDefaultCharWidth( xModel );
RangeHelper thisRange( mxRange );
- table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
+ table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
sal_Int32 nStartCol = thisAddress.StartColumn;
sal_Int32 nEndCol = thisAddress.EndColumn;
USHORT nColTwips = 0;
@@ -3673,7 +3692,7 @@ ScVbaRange::getColumnWidth() throw (uno::RuntimeException)
{
thisAddress.StartColumn = nCol;
USHORT nCurTwips = pShell->GetDocument()->GetOriginalWidth( static_cast< SCCOL >( thisAddress.StartColumn ), static_cast< SCTAB >( thisAddress.Sheet ) );
- if ( nCol == nStartCol )
+ if ( nCol == nStartCol )
nColTwips = nCurTwips;
if ( nColTwips != nCurTwips )
return aNULL();
@@ -3686,11 +3705,11 @@ ScVbaRange::getColumnWidth() throw (uno::RuntimeException)
return uno::makeAny( nColWidth );
}
-void SAL_CALL
+void SAL_CALL
ScVbaRange::setColumnWidth( const uno::Any& _columnwidth ) throw (uno::RuntimeException)
{
sal_Int32 nLen = m_Areas->getCount();
- if ( nLen > 1 )
+ if ( nLen > 1 )
{
for ( sal_Int32 index = 1; index != nLen; ++index )
{
@@ -3710,48 +3729,48 @@ ScVbaRange::setColumnWidth( const uno::Any& _columnwidth ) throw (uno::RuntimeEx
{
nColWidth = ( nColWidth * getDefaultCharWidth( xModel ) );
- RangeHelper thisRange( mxRange );
+ RangeHelper thisRange( mxRange );
table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
USHORT nTwips = lcl_pointsToTwips( nColWidth );
-
+
ScDocFunc aFunc(*pDocShell);
SCCOLROW nColArr[2];
nColArr[0] = thisAddress.StartColumn;
nColArr[1] = thisAddress.EndColumn;
aFunc.SetWidthOrHeight( TRUE, 1, nColArr, thisAddress.Sheet, SC_SIZE_ORIGINAL,
- nTwips, TRUE, TRUE );
-
+ nTwips, TRUE, TRUE );
+
}
}
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaRange::getWidth() throw (uno::RuntimeException)
{
- if ( m_Areas->getCount() > 1 )
+ if ( m_Areas->getCount() > 1 )
{
uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(1) ), uno::Any() ), uno::UNO_QUERY_THROW );
return xRange->getWidth();
}
- uno::Reference< table::XColumnRowRange > xColRowRange( mxRange, uno::UNO_QUERY_THROW );
- uno::Reference< container::XIndexAccess > xIndexAccess( xColRowRange->getColumns(), uno::UNO_QUERY_THROW );
- sal_Int32 nElems = xIndexAccess->getCount();
+ uno::Reference< table::XColumnRowRange > xColRowRange( mxRange, uno::UNO_QUERY_THROW );
+ uno::Reference< container::XIndexAccess > xIndexAccess( xColRowRange->getColumns(), uno::UNO_QUERY_THROW );
+ sal_Int32 nElems = xIndexAccess->getCount();
double nWidth = 0;
for ( sal_Int32 index=0; index<nElems; ++index )
{
- uno::Reference< sheet::XCellRangeAddressable > xAddressable( xIndexAccess->getByIndex( index ), uno::UNO_QUERY_THROW );
+ uno::Reference< sheet::XCellRangeAddressable > xAddressable( xIndexAccess->getByIndex( index ), uno::UNO_QUERY_THROW );
double nTmpWidth = getCalcColWidth( xAddressable->getRangeAddress() );
nWidth += nTmpWidth;
}
return uno::makeAny( nWidth );
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaRange::Areas( const uno::Any& item) throw (uno::RuntimeException)
{
if ( !item.hasValue() )
return uno::makeAny( m_Areas );
- return m_Areas->Item( item, uno::Any() );
+ return m_Areas->Item( item, uno::Any() );
}
uno::Reference< excel::XRange >
@@ -3818,28 +3837,28 @@ ScVbaRange::BorderAround( const css::uno::Any& LineStyle, const css::uno::Any& W
return uno::makeAny( sal_True );
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaRange::getRowHeight() throw (uno::RuntimeException)
{
sal_Int32 nLen = m_Areas->getCount();
- if ( nLen > 1 )
+ if ( nLen > 1 )
{
uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(1) ), uno::Any() ), uno::UNO_QUERY_THROW );
return xRange->getRowHeight();
- }
+ }
- // if any row's RowHeight in the
+ // if any row's RowHeight in the
// range is different from any other then return NULL
- RangeHelper thisRange( mxRange );
+ RangeHelper thisRange( mxRange );
table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
-
+
sal_Int32 nStartRow = thisAddress.StartRow;
sal_Int32 nEndRow = thisAddress.EndRow;
USHORT nRowTwips = 0;
// #TODO probably possible to use the SfxItemSet ( and see if
// SFX_ITEM_DONTCARE is set ) to improve performance
// #CHECKME looks like this is general behaviour not just row Range specific
-// if ( mbIsRows )
+// if ( mbIsRows )
ScDocShell* pShell = getScDocShell();
if ( pShell )
{
@@ -3857,11 +3876,11 @@ ScVbaRange::getRowHeight() throw (uno::RuntimeException)
return uno::makeAny( nHeight );
}
-void SAL_CALL
+void SAL_CALL
ScVbaRange::setRowHeight( const uno::Any& _rowheight) throw (uno::RuntimeException)
{
sal_Int32 nLen = m_Areas->getCount();
- if ( nLen > 1 )
+ if ( nLen > 1 )
{
for ( sal_Int32 index = 1; index != nLen; ++index )
{
@@ -3873,20 +3892,20 @@ ScVbaRange::setRowHeight( const uno::Any& _rowheight) throw (uno::RuntimeExcepti
double nHeight = 0; // Incomming height is in points
_rowheight >>= nHeight;
nHeight = lcl_Round2DecPlaces( nHeight );
- RangeHelper thisRange( mxRange );
+ RangeHelper thisRange( mxRange );
table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
USHORT nTwips = lcl_pointsToTwips( nHeight );
-
+
ScDocShell* pDocShell = getDocShellFromRange( mxRange );
ScDocFunc aFunc(*pDocShell);
SCCOLROW nRowArr[2];
nRowArr[0] = thisAddress.StartRow;
nRowArr[1] = thisAddress.EndRow;
aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, thisAddress.Sheet, SC_SIZE_ORIGINAL,
- nTwips, TRUE, TRUE );
+ nTwips, TRUE, TRUE );
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaRange::getPageBreak() throw (uno::RuntimeException)
{
sal_Int32 nPageBreak = excel::XlPageBreak::xlPageBreakNone;
@@ -3896,38 +3915,38 @@ ScVbaRange::getPageBreak() throw (uno::RuntimeException)
RangeHelper thisRange( mxRange );
table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
BOOL bColumn = FALSE;
-
+
if (thisAddress.StartRow==0)
bColumn = TRUE;
-
+
uno::Reference< frame::XModel > xModel = pShell->GetModel();
if ( xModel.is() )
{
ScDocument* pDoc = getDocumentFromRange( mxRange );
-
+
ScBreakType nBreak = BREAK_NONE;
if ( !bColumn )
nBreak = pDoc->HasRowBreak(thisAddress.StartRow, thisAddress.Sheet);
else
nBreak = pDoc->HasColBreak(thisAddress.StartColumn, thisAddress.Sheet);
-
+
if (nBreak & BREAK_PAGE)
nPageBreak = excel::XlPageBreak::xlPageBreakAutomatic;
-
+
if (nBreak & BREAK_MANUAL)
nPageBreak = excel::XlPageBreak::xlPageBreakManual;
- }
+ }
}
return uno::makeAny( nPageBreak );
}
-void SAL_CALL
+void SAL_CALL
ScVbaRange::setPageBreak( const uno::Any& _pagebreak) throw (uno::RuntimeException)
{
- sal_Int32 nPageBreak = 0;
+ sal_Int32 nPageBreak = 0;
_pagebreak >>= nPageBreak;
-
+
ScDocShell* pShell = getDocShellFromRange( mxRange );
if ( pShell )
{
@@ -3936,11 +3955,11 @@ ScVbaRange::setPageBreak( const uno::Any& _pagebreak) throw (uno::RuntimeExcepti
if ((thisAddress.StartColumn==0) && (thisAddress.StartRow==0))
return;
BOOL bColumn = FALSE;
-
+
if (thisAddress.StartRow==0)
bColumn = TRUE;
-
- ScAddress aAddr( static_cast<SCCOL>(thisAddress.StartColumn), thisAddress.StartRow, thisAddress.Sheet );
+
+ ScAddress aAddr( static_cast<SCCOL>(thisAddress.StartColumn), thisAddress.StartRow, thisAddress.Sheet );
uno::Reference< frame::XModel > xModel = pShell->GetModel();
if ( xModel.is() )
{
@@ -3953,28 +3972,28 @@ ScVbaRange::setPageBreak( const uno::Any& _pagebreak) throw (uno::RuntimeExcepti
}
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaRange::getHeight() throw (uno::RuntimeException)
{
- if ( m_Areas->getCount() > 1 )
+ if ( m_Areas->getCount() > 1 )
{
uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( sal_Int32(1) ), uno::Any() ), uno::UNO_QUERY_THROW );
return xRange->getHeight();
}
-
- uno::Reference< table::XColumnRowRange > xColRowRange( mxRange, uno::UNO_QUERY_THROW );
- uno::Reference< container::XIndexAccess > xIndexAccess( xColRowRange->getRows(), uno::UNO_QUERY_THROW );
+
+ uno::Reference< table::XColumnRowRange > xColRowRange( mxRange, uno::UNO_QUERY_THROW );
+ uno::Reference< container::XIndexAccess > xIndexAccess( xColRowRange->getRows(), uno::UNO_QUERY_THROW );
sal_Int32 nElems = xIndexAccess->getCount();
double nHeight = 0;
for ( sal_Int32 index=0; index<nElems; ++index )
{
- uno::Reference< sheet::XCellRangeAddressable > xAddressable( xIndexAccess->getByIndex( index ), uno::UNO_QUERY_THROW );
+ uno::Reference< sheet::XCellRangeAddressable > xAddressable( xIndexAccess->getByIndex( index ), uno::UNO_QUERY_THROW );
nHeight += getCalcRowHeight(xAddressable->getRangeAddress() );
}
return uno::makeAny( nHeight );
}
-awt::Point
+awt::Point
ScVbaRange::getPosition() throw ( uno::RuntimeException )
{
awt::Point aPoint;
@@ -3986,7 +4005,7 @@ ScVbaRange::getPosition() throw ( uno::RuntimeException )
xProps->getPropertyValue(POSITION) >>= aPoint;
return aPoint;
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaRange::getLeft() throw (uno::RuntimeException)
{
// helperapi returns the first ranges left ( and top below )
@@ -3997,9 +4016,9 @@ ScVbaRange::getLeft() throw (uno::RuntimeException)
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaRange::getTop() throw (uno::RuntimeException)
-{
+{
// helperapi returns the first ranges top
if ( m_Areas->getCount() > 1 )
return getArea( 0 )->getTop();
@@ -4026,7 +4045,7 @@ ScVbaRange::getWorksheet() throw (uno::RuntimeException)
RangeHelper rHelper(xRange);
// parent should be Thisworkbook
xSheet.set( new ScVbaWorksheet( uno::Reference< XHelperInterface >(), mxContext,rHelper.getSpreadSheet(),pDocShell->GetModel()) );
- }
+ }
return xSheet;
}
@@ -4035,11 +4054,11 @@ ScVbaRange::getWorksheet() throw (uno::RuntimeException)
uno::Reference< excel::XRange >
ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException)
{
- // Althought the documentation seems clear that Range without a
+ // Althought the documentation seems clear that Range without a
// qualifier then its a shortcut for ActiveSheet.Range
- // however, similarly Application.Range is apparently also a
+ // however, similarly Application.Range is apparently also a
// shortcut for ActiveSheet.Range
- // The is however a subtle behavioural difference I've come across
+ // The is however a subtle behavioural difference I've come across
// wrt to named ranges.
// If a named range "test" exists { Sheet1!$A1 } and the active sheet
// is Sheet2 then the following will fail
@@ -4049,14 +4068,14 @@ ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xC
// msgbox Range("test").Address ' works
// msgbox Application.Range("test").Address ' works
- // Single param Range
+ // Single param Range
rtl::OUString sRangeName;
Cell1 >>= sRangeName;
if ( Cell1.hasValue() && !Cell2.hasValue() && sRangeName.getLength() )
{
const static rtl::OUString sNamedRanges( RTL_CONSTASCII_USTRINGPARAM("NamedRanges"));
uno::Reference< beans::XPropertySet > xPropSet( getCurrentExcelDoc(xContext), uno::UNO_QUERY_THROW );
-
+
uno::Reference< container::XNameAccess > xNamed( xPropSet->getPropertyValue( sNamedRanges ), uno::UNO_QUERY_THROW );
uno::Reference< sheet::XCellRangeReferrer > xReferrer;
try
@@ -4078,13 +4097,13 @@ ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xC
}
}
uno::Reference< sheet::XSpreadsheetView > xView( getCurrentExcelDoc(xContext)->getCurrentController(), uno::UNO_QUERY );
- uno::Reference< table::XCellRange > xSheetRange( xView->getActiveSheet(), uno::UNO_QUERY_THROW );
+ uno::Reference< table::XCellRange > xSheetRange( xView->getActiveSheet(), uno::UNO_QUERY_THROW );
ScVbaRange* pRange = new ScVbaRange( excel::getUnoSheetModuleObj( xSheetRange ), xContext, xSheetRange );
uno::Reference< excel::XRange > xVbSheetRange( pRange );
- return pRange->Range( Cell1, Cell2, true );
+ return pRange->Range( Cell1, Cell2, true );
}
-uno::Reference< sheet::XDatabaseRanges >
+uno::Reference< sheet::XDatabaseRanges >
lcl_GetDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException )
{
uno::Reference< frame::XModel > xModel;
@@ -4092,11 +4111,11 @@ lcl_GetDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException )
xModel.set( pShell->GetModel(), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xModelProps( xModel, uno::UNO_QUERY_THROW );
uno::Reference< sheet::XDatabaseRanges > xDBRanges( xModelProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DatabaseRanges") ) ), uno::UNO_QUERY_THROW );
- return xDBRanges;
+ return xDBRanges;
}
// returns the XDatabaseRange for the autofilter on sheet (nSheet)
// also populates sName with the name of range
-uno::Reference< sheet::XDatabaseRange >
+uno::Reference< sheet::XDatabaseRange >
lcl_GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet, rtl::OUString& sName )
{
uno::Reference< container::XIndexAccess > xIndexAccess( lcl_GetDataBaseRanges( pShell ), uno::UNO_QUERY_THROW );
@@ -4105,8 +4124,8 @@ lcl_GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet, rtl::OUString& sName
for ( sal_Int32 index=0; index < xIndexAccess->getCount(); ++index )
{
uno::Reference< sheet::XDatabaseRange > xDBRange( xIndexAccess->getByIndex( index ), uno::UNO_QUERY_THROW );
- uno::Reference< container::XNamed > xNamed( xDBRange, uno::UNO_QUERY_THROW );
- // autofilters work weirdly with openoffice, unnamed is the default
+ uno::Reference< container::XNamed > xNamed( xDBRange, uno::UNO_QUERY_THROW );
+ // autofilters work weirdly with openoffice, unnamed is the default
// named range which is used to create an autofilter, but
// its also possible that another name could be used
// this also causes problems when an autofilter is created on
@@ -4120,14 +4139,14 @@ lcl_GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet, rtl::OUString& sName
xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoFilter") ) ) >>= bHasAuto;
if ( bHasAuto )
{
- sName = xNamed->getName();
+ sName = xNamed->getName();
xDataBaseRange=xDBRange;
break;
}
}
}
return xDataBaseRange;
-}
+}
// Helper functions for AutoFilter
ScDBData* lcl_GetDBData_Impl( ScDocShell* pDocShell, sal_Int16 nSheet )
@@ -4153,7 +4172,7 @@ ScDBData* lcl_GetDBData_Impl( ScDocShell* pDocShell, sal_Int16 nSheet )
void lcl_SelectAll( ScDocShell* pDocShell, ScQueryParam& aParam )
{
if ( pDocShell )
- {
+ {
ScViewData* pViewData = pDocShell->GetViewData();
if ( pViewData )
{
@@ -4165,8 +4184,8 @@ void lcl_SelectAll( ScDocShell* pDocShell, ScQueryParam& aParam )
ScQueryParam lcl_GetQueryParam( ScDocShell* pDocShell, sal_Int16 nSheet )
{
- ScDBData* pDBData = lcl_GetDBData_Impl( pDocShell, nSheet );
- ScQueryParam aParam;
+ ScDBData* pDBData = lcl_GetDBData_Impl( pDocShell, nSheet );
+ ScQueryParam aParam;
if (pDBData)
{
pDBData->GetQueryParam( aParam );
@@ -4205,7 +4224,7 @@ void lcl_SetAllQueryForField( ScDocShell* pDocShell, SCCOLROW nField, sal_Int16
// Modifies sCriteria, and nOp depending on the value of sCriteria
void lcl_setTableFieldsFromCriteria( rtl::OUString& sCriteria1, uno::Reference< beans::XPropertySet >& xDescProps, sheet::TableFilterField2& rFilterField )
{
- // #TODO make this more efficient and cycle through
+ // #TODO make this more efficient and cycle through
// sCriteria1 character by character to pick up <,<>,=, * etc.
// right now I am more concerned with just getting it to work right
@@ -4228,28 +4247,28 @@ void lcl_setTableFieldsFromCriteria( rtl::OUString& sCriteria1, uno::Reference<
{
rFilterField.Operator = sheet::FilterOperator2::EQUAL;
sCriteria1 = sCriteria1.copy( EQUALS.getLength() );
- sCriteria1 = VBAToRegexp( sCriteria1 );
- // UseRegularExpressions
+ sCriteria1 = VBAToRegexp( sCriteria1 );
+ // UseRegularExpressions
if ( xDescProps.is() )
xDescProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseRegularExpressions" ) ), uno::Any( sal_True ) );
}
}
- else if ( ( nPos = sCriteria1.indexOf( NOTEQUALS ) ) == 0 )
+ else if ( ( nPos = sCriteria1.indexOf( NOTEQUALS ) ) == 0 )
{
if ( sCriteria1.getLength() == NOTEQUALS.getLength() )
- rFilterField.Operator = sheet::FilterOperator2::NOT_EMPTY;
+ rFilterField.Operator = sheet::FilterOperator2::NOT_EMPTY;
else
{
rFilterField.Operator = sheet::FilterOperator2::NOT_EQUAL;
sCriteria1 = sCriteria1.copy( NOTEQUALS.getLength() );
- sCriteria1 = VBAToRegexp( sCriteria1 );
- // UseRegularExpressions
+ sCriteria1 = VBAToRegexp( sCriteria1 );
+ // UseRegularExpressions
if ( xDescProps.is() )
xDescProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseRegularExpressions" ) ), uno::Any( sal_True ) );
}
- }
- else if ( ( nPos = sCriteria1.indexOf( GREATERTHAN ) ) == 0 )
+ }
+ else if ( ( nPos = sCriteria1.indexOf( GREATERTHAN ) ) == 0 )
{
bIsNumeric = true;
if ( ( nPos = sCriteria1.indexOf( GREATERTHANEQUALS ) ) == 0 )
@@ -4264,7 +4283,7 @@ void lcl_setTableFieldsFromCriteria( rtl::OUString& sCriteria1, uno::Reference<
}
}
- else if ( ( nPos = sCriteria1.indexOf( LESSTHAN ) ) == 0 )
+ else if ( ( nPos = sCriteria1.indexOf( LESSTHAN ) ) == 0 )
{
bIsNumeric = true;
if ( ( nPos = sCriteria1.indexOf( LESSTHANEQUALS ) ) == 0 )
@@ -4287,22 +4306,22 @@ void lcl_setTableFieldsFromCriteria( rtl::OUString& sCriteria1, uno::Reference<
rFilterField.IsNumeric= sal_True;
rFilterField.NumericValue = sCriteria1.toDouble();
}
- rFilterField.StringValue = sCriteria1;
+ rFilterField.StringValue = sCriteria1;
}
-void SAL_CALL
+void SAL_CALL
ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const uno::Any& Operator, const uno::Any& Criteria2, const uno::Any& VisibleDropDown ) throw (uno::RuntimeException)
{
- // Is there an existing autofilter
- RangeHelper thisRange( mxRange );
+ // Is there an existing autofilter
+ RangeHelper thisRange( mxRange );
table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
sal_Int16 nSheet = thisAddress.Sheet;
ScDocShell* pShell = getScDocShell();
- sal_Bool bHasAuto = sal_False;
+ sal_Bool bHasAuto = sal_False;
rtl::OUString sAutofiltRangeName;
uno::Reference< sheet::XDatabaseRange > xDataBaseRange = lcl_GetAutoFiltRange( pShell, nSheet, sAutofiltRangeName );
if ( xDataBaseRange.is() )
- bHasAuto = true;
+ bHasAuto = true;
uno::Reference< table::XCellRange > xFilterRange;
if ( !bHasAuto )
@@ -4310,7 +4329,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
if ( m_Areas->getCount() > 1 )
throw uno::RuntimeException( STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY, uno::Reference< uno::XInterface >() );
- table::CellRangeAddress autoFiltAddress;
+ table::CellRangeAddress autoFiltAddress;
//CurrentRegion()
if ( isSingleCellRange() )
{
@@ -4326,7 +4345,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
autoFiltAddress = currentRegion.getCellRangeAddressable()->getRangeAddress();
}
}
- }
+ }
else // multi-cell range
{
RangeHelper multiCellRange( mxRange );
@@ -4345,25 +4364,25 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
xDataBaseRange.set( xDBRanges->getByName( sGenName ), uno::UNO_QUERY_THROW );
}
if ( !xDataBaseRange.is() )
- throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Failed to find the autofilter placeholder range" ) ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Failed to find the autofilter placeholder range" ) ), uno::Reference< uno::XInterface >() );
uno::Reference< beans::XPropertySet > xDBRangeProps( xDataBaseRange, uno::UNO_QUERY_THROW );
// set autofilt
- xDBRangeProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoFilter") ), uno::Any(sal_True) );
+ xDBRangeProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoFilter") ), uno::Any(sal_True) );
// set header
uno::Reference< beans::XPropertySet > xFiltProps( xDataBaseRange->getFilterDescriptor(), uno::UNO_QUERY_THROW );
sal_Bool bHasColHeader = sal_False;
ScDocument* pDoc = pShell ? pShell->GetDocument() : NULL;
-
+
bHasColHeader = pDoc->HasColHeader( static_cast< SCCOL >( autoFiltAddress.StartColumn ), static_cast< SCROW >( autoFiltAddress.StartRow ), static_cast< SCCOL >( autoFiltAddress.EndColumn ), static_cast< SCROW >( autoFiltAddress.EndRow ), static_cast< SCTAB >( autoFiltAddress.Sheet ) ) ? sal_True : sal_False;
- xFiltProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ContainsHeader") ), uno::Any( bHasColHeader ) );
+ xFiltProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ContainsHeader") ), uno::Any( bHasColHeader ) );
}
sal_Int32 nField = 0; // *IS* 1 based
rtl::OUString sCriteria1;
sal_Int32 nOperator = excel::XlAutoFilterOperator::xlAnd;
-
+
sal_Bool bVisible = sal_True;
bool bChangeDropDown = false;
VisibleDropDown >>= bVisible;
@@ -4372,8 +4391,8 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
// required
bVisible = sal_False;
else
- bChangeDropDown = true;
- sheet::FilterConnection nConn = sheet::FilterConnection_AND;
+ bChangeDropDown = true;
+ sheet::FilterConnection nConn = sheet::FilterConnection_AND;
double nCriteria1 = 0;
bool bHasCritValue = Criteria1.hasValue();
@@ -4381,11 +4400,11 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
if ( bHasCritValue )
bCritHasNumericValue = ( Criteria1 >>= nCriteria1 );
- if ( !Field.hasValue() && ( Criteria1.hasValue() || Operator.hasValue() || Criteria2.hasValue() ) )
+ if ( !Field.hasValue() && ( Criteria1.hasValue() || Operator.hasValue() || Criteria2.hasValue() ) )
throw uno::RuntimeException();
// Use the normal uno api, sometimes e.g. when you want to use ALL as the filter
// we can't use refresh as the uno interface doesn't have a concept of ALL
- // in this case we just call the core calc functionality -
+ // in this case we just call the core calc functionality -
bool bAll = false;;
if ( ( Field >>= nField ) )
{
@@ -4396,11 +4415,11 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
uno::Sequence< sheet::TableFilterField2 > sTabFilts;
uno::Reference< beans::XPropertySet > xDescProps( xDesc, uno::UNO_QUERY_THROW );
if ( Criteria1.hasValue() )
- {
+ {
sTabFilts.realloc( 1 );
sTabFilts[0].Operator = sheet::FilterOperator2::EQUAL;// sensible default
if ( !bCritHasNumericValue )
- {
+ {
Criteria1 >>= sCriteria1;
sTabFilts[0].IsNumeric = bCritHasNumericValue;
if ( bHasCritValue && sCriteria1.getLength() )
@@ -4417,15 +4436,15 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
else // no value specified
bAll = true;
// not sure what the relationship between Criteria1 and Operator is,
- // e.g. can you have a Operator without a Criteria ? in openoffice it
+ // e.g. can you have a Operator without a Criteria ? in openoffice it
if ( Operator.hasValue() && ( Operator >>= nOperator ) )
{
// if its a bottom/top Ten(Percent/Value) and there
// is no value specified for critera1 set it to 10
if ( !bCritHasNumericValue && !sCriteria1.getLength() && ( nOperator != excel::XlAutoFilterOperator::xlOr ) && ( nOperator != excel::XlAutoFilterOperator::xlAnd ) )
{
- sTabFilts[0].IsNumeric = sal_True;
- sTabFilts[0].NumericValue = 10;
+ sTabFilts[0].IsNumeric = sal_True;
+ sTabFilts[0].NumericValue = 10;
bAll = false;
}
switch ( nOperator )
@@ -4450,21 +4469,21 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
break;
default:
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UnknownOption") ), uno::Reference< uno::XInterface >() );
+
+ }
- }
-
- }
+ }
if ( !bAll )
{
- sTabFilts[0].Connection = sheet::FilterConnection_AND;
- sTabFilts[0].Field = (nField - 1);
+ sTabFilts[0].Connection = sheet::FilterConnection_AND;
+ sTabFilts[0].Field = (nField - 1);
rtl::OUString sCriteria2;
if ( Criteria2.hasValue() ) // there is a Criteria2
{
sTabFilts.realloc(2);
sTabFilts[1].Field = sTabFilts[0].Field;
- sTabFilts[1].Connection = nConn;
+ sTabFilts[1].Connection = nConn;
if ( Criteria2 >>= sCriteria2 )
{
@@ -4490,16 +4509,16 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
xDataBaseRange->refresh();
}
else
- // was 0 based now seems to be 1
+ // was 0 based now seems to be 1
lcl_SetAllQueryForField( pShell, nField, nSheet );
}
}
- else
+ else
{
- // this is just to toggle autofilter on and off ( not to be confused with
- // a VisibleDropDown option combined with a field, in that case just the
+ // this is just to toggle autofilter on and off ( not to be confused with
+ // a VisibleDropDown option combined with a field, in that case just the
// button should be disabled ) - currently we don't support that
- bChangeDropDown = true;
+ bChangeDropDown = true;
uno::Reference< beans::XPropertySet > xDBRangeProps( xDataBaseRange, uno::UNO_QUERY_THROW );
if ( bHasAuto )
{
@@ -4523,7 +4542,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
}
}
-void SAL_CALL
+void SAL_CALL
ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& CopyOrigin ) throw (uno::RuntimeException)
{
sal_Bool bCopyOrigin = sal_True;
@@ -4534,7 +4553,7 @@ ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& CopyOrigin ) throw (u
// #TODO investigate resultant behaviour using these constants
// currently just processing Shift
- sheet::CellInsertMode mode = sheet::CellInsertMode_NONE;
+ sheet::CellInsertMode mode = sheet::CellInsertMode_NONE;
if ( Shift.hasValue() )
{
sal_Int32 nShift = 0;
@@ -4551,7 +4570,7 @@ ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& CopyOrigin ) throw (u
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ("Illegal paramater ") ), uno::Reference< uno::XInterface >() );
}
}
- else
+ else
{
if ( getRow() >= getColumn() )
mode = sheet::CellInsertMode_DOWN;
@@ -4559,15 +4578,15 @@ ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& CopyOrigin ) throw (u
mode = sheet::CellInsertMode_RIGHT;
}
RangeHelper thisRange( mxRange );
- table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
- uno::Reference< sheet::XCellRangeMovement > xCellRangeMove( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
+ table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
+ uno::Reference< sheet::XCellRangeMovement > xCellRangeMove( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
xCellRangeMove->insertCells( thisAddress, mode );
if ( bCopyOrigin )
{
// After the insert ( this range ) actually has moved
ScRange aRange( static_cast< SCCOL >( thisAddress.StartColumn ), static_cast< SCROW >( thisAddress.StartRow ), static_cast< SCTAB >( thisAddress.Sheet ), static_cast< SCCOL >( thisAddress.EndColumn ), static_cast< SCROW >( thisAddress.EndRow ), static_cast< SCTAB >( thisAddress.Sheet ) );
uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( getDocShellFromRange( mxRange ) , aRange ) );
- uno::Reference< excel::XRange > xVbaRange( new ScVbaRange( mxParent, mxContext, xRange, mbIsRows, mbIsColumns ) );
+ uno::Reference< excel::XRange > xVbaRange( new ScVbaRange( mxParent, mxContext, xRange, mbIsRows, mbIsColumns ) );
xVbaRange->PasteSpecial( uno::Any(), uno::Any(), uno::Any(), uno::Any() );
}
}
@@ -4576,7 +4595,7 @@ void SAL_CALL
ScVbaRange::Autofit() throw (uno::RuntimeException)
{
sal_Int32 nLen = m_Areas->getCount();
- if ( nLen > 1 )
+ if ( nLen > 1 )
{
for ( sal_Int32 index = 1; index != nLen; ++index )
{
@@ -4589,13 +4608,13 @@ ScVbaRange::Autofit() throw (uno::RuntimeException)
// throw an error
if ( !( mbIsColumns || mbIsRows ) )
- DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
+ DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
ScDocShell* pDocShell = getDocShellFromRange( mxRange );
if ( pDocShell )
{
- RangeHelper thisRange( mxRange );
+ RangeHelper thisRange( mxRange );
table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
-
+
ScDocFunc aFunc(*pDocShell);
SCCOLROW nColArr[2];
nColArr[0] = thisAddress.StartColumn;
@@ -4608,16 +4627,16 @@ ScVbaRange::Autofit() throw (uno::RuntimeException)
nColArr[1] = thisAddress.EndRow;
}
aFunc.SetWidthOrHeight( bDirection, 1, nColArr, thisAddress.Sheet, SC_SIZE_OPTIMAL,
- 0, TRUE, TRUE );
-
- }
+ 0, TRUE, TRUE );
+
+ }
}
/***************************************************************************************
- * interface for text:
+ * interface for text:
* com.sun.star.text.XText, com.sun.star.table.XCell, com.sun.star.container.XEnumerationAccess
- * com.sun.star.text.XTextRange,
- * the main problem is to recognize the numeric and date, which assosiate with DecimalSeparator, ThousandsSeparator,
+ * com.sun.star.text.XTextRange,
+ * the main problem is to recognize the numeric and date, which assosiate with DecimalSeparator, ThousandsSeparator,
* TrailingMinusNumbers and FieldInfo.
***************************************************************************************/
void SAL_CALL
@@ -4651,7 +4670,7 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any
}
sal_Bool bDilimited = ( xlTextParsingType == excel::XlTextParsingType::xlDelimited );
- sal_Int16 xlTextQualifier = excel::XlTextQualifier::xlTextQualifierDoubleQuote;
+ sal_Int16 xlTextQualifier = excel::XlTextQualifier::xlTextQualifierDoubleQuote;
if( TextQualifier.hasValue() )
{
if( !( TextQualifier >>= xlTextQualifier ))
@@ -4745,7 +4764,7 @@ ScVbaRange::Hyperlinks( const uno::Any& aIndex ) throw (uno::RuntimeException)
/* The range object always returns a new Hyperlinks object containing a
fixed list of existing hyperlinks in the range.
See vbahyperlinks.hxx for more details. */
-
+
// get the global hyperlink object of the sheet (sheet should always be the parent of a Range object)
uno::Reference< excel::XWorksheet > xWorksheet( getParent(), uno::UNO_QUERY_THROW );
uno::Reference< excel::XHyperlinks > xSheetHlinks( xWorksheet->Hyperlinks( uno::Any() ), uno::UNO_QUERY_THROW );
@@ -4763,7 +4782,7 @@ ScVbaRange::Hyperlinks( const uno::Any& aIndex ) throw (uno::RuntimeException)
css::uno::Reference< excel::XValidation > SAL_CALL
ScVbaRange::getValidation() throw (css::uno::RuntimeException)
{
- if ( !m_xValidation.is() )
+ if ( !m_xValidation.is() )
m_xValidation = new ScVbaValidation( this, mxContext, mxRange );
return m_xValidation;
}
@@ -4846,12 +4865,12 @@ uno::Any SAL_CALL ScVbaRange::getPrefixCharacter() throw (uno::RuntimeException)
character, if the cell is right-aligned; a circumflex character, if the
cell is centered; a backslash character, if the cell is set to filled;
or an empty string, if nothing of the above.
-
+
If a range or a list of ranges contains texts with leading apostroph
character as well as other cells, this function returns an empty
string.
*/
-
+
if( mxRange.is() )
return lclGetPrefixVariant( lclGetPrefixChar( mxRange ) );
if( mxRanges.is() )
@@ -4866,7 +4885,7 @@ uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException)
// In MSO VBA, the specified range must be a single summary column or row in an outline. otherwise throw exception
if( m_Areas->getCount() > 1 )
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can not get Range.ShowDetail attribute ")), uno::Reference< uno::XInterface >() );
-
+
sal_Bool bShowDetail = sal_False;
RangeHelper helper( mxRange );
@@ -4880,7 +4899,7 @@ uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException)
if( (thisAddress.StartRow == thisAddress.EndRow && thisAddress.EndRow == aOutlineAddress.EndRow ) ||
(thisAddress.StartColumn == thisAddress.EndColumn && thisAddress.EndColumn == aOutlineAddress.EndColumn ))
{
- sal_Bool bColumn =thisAddress.StartRow == thisAddress.EndRow ? sal_False:sal_True;
+ sal_Bool bColumn =thisAddress.StartRow == thisAddress.EndRow ? sal_False:sal_True;
ScDocument* pDoc = getDocumentFromRange( mxRange );
ScOutlineTable* pOutlineTable = pDoc->GetOutlineTable(static_cast<SCTAB>(thisAddress.Sheet), sal_True);
const ScOutlineArray* pOutlineArray = bColumn ? pOutlineTable->GetColArray(): pOutlineTable->GetRowArray();
@@ -4909,9 +4928,8 @@ void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::Ru
// In MSO VBA, the specified range must be a single summary column or row in an outline. otherwise throw exception
if( m_Areas->getCount() > 1 )
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can not set Range.ShowDetail attribute ")), uno::Reference< uno::XInterface >() );
-
- sal_Bool bShowDetail = sal_False;
- aShowDetail >>= bShowDetail;
+
+ bool bShowDetail = extractBoolFromAny( aShowDetail );
RangeHelper helper( mxRange );
uno::Reference< sheet::XSheetCellCursor > xSheetCellCursor = helper.getSheetCellCursor();
@@ -4923,9 +4941,9 @@ void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::Ru
table::CellRangeAddress thisAddress = helper.getCellRangeAddressable()->getRangeAddress();
if( (thisAddress.StartRow == thisAddress.EndRow && thisAddress.EndRow == aOutlineAddress.EndRow ) ||
(thisAddress.StartColumn == thisAddress.EndColumn && thisAddress.EndColumn == aOutlineAddress.EndColumn ))
- {
- // #FIXME, seems there is a different behavior between MSO and OOo.
- // In OOo, the showDetail will show all the level entrys, while only show the first level entry in MSO
+ {
+ // #FIXME, seems there is a different behavior between MSO and OOo.
+ // In OOo, the showDetail will show all the level entrys, while only show the first level entry in MSO
uno::Reference< sheet::XSheetOutline > xSheetOutline( helper.getSpreadSheet(), uno::UNO_QUERY_THROW );
if( bShowDetail )
xSheetOutline->showDetail( aOutlineAddress );
@@ -4938,7 +4956,7 @@ void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::Ru
}
}
-uno::Reference< excel::XRange > SAL_CALL
+uno::Reference< excel::XRange > SAL_CALL
ScVbaRange::MergeArea() throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Reference< sheet::XSheetCellRange > xMergeShellCellRange(mxRange->getCellRangeByPosition(0,0,0,0), uno::UNO_QUERY_THROW);
@@ -4957,7 +4975,7 @@ ScVbaRange::MergeArea() throw (script::BasicErrorException, uno::RuntimeExceptio
}
else
{
- ScRange refRange( static_cast< SCCOL >( aCellAddress.StartColumn ), static_cast< SCROW >( aCellAddress.StartRow ), static_cast< SCTAB >( aCellAddress.Sheet ),
+ ScRange refRange( static_cast< SCCOL >( aCellAddress.StartColumn ), static_cast< SCROW >( aCellAddress.StartRow ), static_cast< SCTAB >( aCellAddress.Sheet ),
static_cast< SCCOL >( aCellAddress.EndColumn ), static_cast< SCROW >( aCellAddress.EndRow ), static_cast< SCTAB >( aCellAddress.Sheet ) );
uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( getScDocShell() , refRange ) );
return new ScVbaRange( mxParent, mxContext,xRange );
@@ -4967,13 +4985,13 @@ ScVbaRange::MergeArea() throw (script::BasicErrorException, uno::RuntimeExceptio
return new ScVbaRange( mxParent, mxContext, mxRange );
}
-void SAL_CALL
+void SAL_CALL
ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName ) throw (uno::RuntimeException)
{
ScDocShell* pShell = NULL;
sal_Int32 nItems = m_Areas->getCount();
- uno::Sequence< table::CellRangeAddress > printAreas( nItems );
+ uno::Sequence< table::CellRangeAddress > printAreas( nItems );
uno::Reference< sheet::XPrintAreas > xPrintAreas;
for ( sal_Int32 index=1; index <= nItems; ++index )
{
@@ -5002,25 +5020,25 @@ ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any&
}
void SAL_CALL
-ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const uno::Any& Type ) throw (uno::RuntimeException)
+ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const uno::Any& Type ) throw (uno::RuntimeException)
{
uno::Reference< excel::XRange > xDest( Destination, uno::UNO_QUERY_THROW );
ScVbaRange* pRange = getImplementation( xDest );
RangeHelper destRangeHelper( pRange->mxRange );
- table::CellRangeAddress destAddress = destRangeHelper.getCellRangeAddressable()->getRangeAddress();
-
+ table::CellRangeAddress destAddress = destRangeHelper.getCellRangeAddressable()->getRangeAddress();
+
RangeHelper thisRange( mxRange );
- table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
+ table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
ScRange sourceRange;
ScRange destRange;
- ScUnoConversion::FillScRange( destRange, destAddress );
+ ScUnoConversion::FillScRange( destRange, destAddress );
ScUnoConversion::FillScRange( sourceRange, thisAddress );
-
-
+
+
// source is valid
-// if ( !sourceRange.In( destRange ) )
-// throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "source not in destination" ) ), uno::Reference< uno::XInterface >() );
+// if ( !sourceRange.In( destRange ) )
+// throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "source not in destination" ) ), uno::Reference< uno::XInterface >() );
FillDir eDir = FILL_TO_BOTTOM;
double fStep = 1.0;
@@ -5030,7 +5048,7 @@ ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const
// default to include the number of Rows in the source range;
SCCOLROW nSourceCount = ( sourceRange.aEnd.Row() - sourceRange.aStart.Row() ) + 1;
- SCCOLROW nCount = 0;
+ SCCOLROW nCount = 0;
if ( sourceRange != destRange )
{
@@ -5041,7 +5059,7 @@ ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const
{
nSourceCount = ( sourceRange.aEnd.Col() - sourceRange.aStart.Col() + 1 );
aSourceRange.aEnd.SetCol( static_cast<SCCOL>( aSourceRange.aStart.Col() + nSourceCount - 1 ) );
- eDir = FILL_TO_RIGHT;
+ eDir = FILL_TO_RIGHT;
nCount = aRange.aEnd.Col() - aSourceRange.aEnd.Col();
}
else if ( sourceRange.aEnd.Col() == destRange.aEnd.Col() )
@@ -5052,13 +5070,13 @@ ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const
}
}
- else if ( aSourceRange.aEnd == destRange.aEnd )
+ else if ( aSourceRange.aEnd == destRange.aEnd )
{
if ( sourceRange.aStart.Col() == destRange.aStart.Col() )
{
aSourceRange.aStart.SetRow( static_cast<SCROW>( aSourceRange.aEnd.Row() - nSourceCount + 1 ) );
nCount = aSourceRange.aStart.Row() - aRange.aStart.Row();
- eDir = FILL_TO_TOP;
+ eDir = FILL_TO_TOP;
fStep = -fStep;
}
else if ( sourceRange.aStart.Row() == destRange.aStart.Row() )
@@ -5066,15 +5084,15 @@ ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const
nSourceCount = ( sourceRange.aEnd.Col() - sourceRange.aStart.Col() ) + 1;
aSourceRange.aStart.SetCol( static_cast<SCCOL>( aSourceRange.aEnd.Col() - nSourceCount + 1 ) );
nCount = aSourceRange.aStart.Col() - aRange.aStart.Col();
- eDir = FILL_TO_LEFT;
+ eDir = FILL_TO_LEFT;
fStep = -fStep;
}
}
- }
+ }
ScDocShell* pDocSh= getDocShellFromRange( mxRange );
FillCmd eCmd = FILL_AUTO;
- FillDateCmd eDateCmd = FILL_DAY;
+ FillDateCmd eDateCmd = FILL_DAY;
#ifdef VBA_OOBUILD_HACK
double fEndValue = MAXDOUBLE;
@@ -5082,12 +5100,12 @@ ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const
if ( Type.hasValue() )
{
- sal_Int16 nFillType = excel::XlAutoFillType::xlFillDefault;
+ sal_Int16 nFillType = excel::XlAutoFillType::xlFillDefault;
Type >>= nFillType;
switch ( nFillType )
{
case excel::XlAutoFillType::xlFillCopy:
- eCmd = FILL_SIMPLE;
+ eCmd = FILL_SIMPLE;
fStep = 0.0;
break;
case excel::XlAutoFillType::xlFillDays:
@@ -5117,9 +5135,9 @@ ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const
break;
case excel::XlAutoFillType::xlFillDefault:
default:
- eCmd = FILL_AUTO;
+ eCmd = FILL_AUTO;
break;
- }
+ }
}
ScDocFunc aFunc(*pDocSh);
#ifdef VBA_OOBUILD_HACK
@@ -5144,7 +5162,7 @@ ScVbaRange::GoalSeek( const uno::Any& Goal, const uno::Reference< excel::XRange
table::CellAddress changingCell( changingCellAddr.Sheet, changingCellAddr.StartColumn, changingCellAddr.StartRow );
sheet::GoalResult res = xGoalSeek->seekGoal( thisCell, changingCell, sGoal );
ChangingCell->setValue( uno::makeAny( res.Result ) );
-
+
// openoffice behaves differently, result is 0 if the divergence is too great
// but... if it detects 0 is the value it requires then it will use that
// e.g. divergence & result both = 0.0 does NOT mean there is an error
@@ -5162,7 +5180,7 @@ ScVbaRange::Calculate( ) throw (script::BasicErrorException, uno::RuntimeExcept
getWorksheet()->Calculate();
}
-uno::Reference< excel::XRange > SAL_CALL
+uno::Reference< excel::XRange > SAL_CALL
ScVbaRange::Item( const uno::Any& row, const uno::Any& column ) throw (script::BasicErrorException, uno::RuntimeException)
{
if ( mbIsRows || mbIsColumns )
@@ -5176,7 +5194,7 @@ ScVbaRange::Item( const uno::Any& row, const uno::Any& column ) throw (script::B
xRange = Rows( row );
return xRange;
}
- return Cells( row, column );
+ return Cells( row, column );
}
void
@@ -5185,11 +5203,11 @@ ScVbaRange::AutoOutline( ) throw (script::BasicErrorException, uno::RuntimeExce
// #TODO #FIXME needs to check for summary row/col ( whatever they are )
// not valid for multi Area Addresses
if ( m_Areas->getCount() > 1 )
- DebugHelper::exception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY);
- // So needs to either span an entire Row or a just be a single cell
+ DebugHelper::exception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY);
+ // So needs to either span an entire Row or a just be a single cell
// ( that contains a summary RowColumn )
- // also the Single cell cause doesn't seem to be handled specially in
- // this code ( ported from the helperapi RangeImpl.java,
+ // also the Single cell cause doesn't seem to be handled specially in
+ // this code ( ported from the helperapi RangeImpl.java,
// RangeRowsImpl.java, RangesImpl.java, RangeSingleCellImpl.java
RangeHelper thisRange( mxRange );
table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
@@ -5197,7 +5215,7 @@ ScVbaRange::AutoOutline( ) throw (script::BasicErrorException, uno::RuntimeExce
if ( isSingleCellRange() || mbIsRows )
{
uno::Reference< sheet::XSheetOutline > xSheetOutline( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
- xSheetOutline->autoOutline( thisAddress );
+ xSheetOutline->autoOutline( thisAddress );
}
else
DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
@@ -5212,17 +5230,17 @@ ScVbaRange:: ClearOutline( ) throw (script::BasicErrorException, uno::RuntimeEx
for ( sal_Int32 index=1; index <= nItems; ++index )
{
uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
- xRange->ClearOutline();
+ xRange->ClearOutline();
}
return;
}
RangeHelper thisRange( mxRange );
table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
uno::Reference< sheet::XSheetOutline > xSheetOutline( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
- xSheetOutline->clearOutline();
+ xSheetOutline->clearOutline();
}
-void
+void
ScVbaRange::groupUnGroup( bool bUnGroup ) throw ( script::BasicErrorException, uno::RuntimeException )
{
if ( m_Areas->getCount() > 1 )
@@ -5239,23 +5257,23 @@ ScVbaRange::groupUnGroup( bool bUnGroup ) throw ( script::BasicErrorException, u
xSheetOutline->group( thisAddress, nOrient );
}
-void SAL_CALL
+void SAL_CALL
ScVbaRange::Group( ) throw (script::BasicErrorException, uno::RuntimeException)
{
- groupUnGroup();
+ groupUnGroup();
}
-void SAL_CALL
+void SAL_CALL
ScVbaRange::Ungroup( ) throw (script::BasicErrorException, uno::RuntimeException)
{
- groupUnGroup(true);
+ groupUnGroup(true);
}
void lcl_mergeCellsOfRange( const uno::Reference< table::XCellRange >& xCellRange, sal_Bool _bMerge = sal_True ) throw ( uno::RuntimeException )
{
uno::Reference< util::XMergeable > xMergeable( xCellRange, uno::UNO_QUERY_THROW );
- xMergeable->merge(_bMerge);
+ xMergeable->merge(_bMerge);
}
-void SAL_CALL
+void SAL_CALL
ScVbaRange::Merge( const uno::Any& Across ) throw (script::BasicErrorException, uno::RuntimeException)
{
if ( m_Areas->getCount() > 1 )
@@ -5264,11 +5282,11 @@ ScVbaRange::Merge( const uno::Any& Across ) throw (script::BasicErrorException,
for ( sal_Int32 index=1; index <= nItems; ++index )
{
uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
- xRange->Merge(Across);
+ xRange->Merge(Across);
}
return;
}
- uno::Reference< table::XCellRange > oCellRange;
+ uno::Reference< table::XCellRange > oCellRange;
sal_Bool bAcross = sal_False;
Across >>= bAcross;
if ( !bAcross )
@@ -5284,7 +5302,7 @@ ScVbaRange::Merge( const uno::Any& Across ) throw (script::BasicErrorException,
}
}
-void SAL_CALL
+void SAL_CALL
ScVbaRange::UnMerge( ) throw (script::BasicErrorException, uno::RuntimeException)
{
if ( m_Areas->getCount() > 1 )
@@ -5293,14 +5311,14 @@ ScVbaRange::UnMerge( ) throw (script::BasicErrorException, uno::RuntimeExceptio
for ( sal_Int32 index=1; index <= nItems; ++index )
{
uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
- xRange->UnMerge();
+ xRange->UnMerge();
}
return;
}
lcl_mergeCellsOfRange( mxRange, sal_False);
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaRange::getStyle() throw (uno::RuntimeException)
{
if ( m_Areas->getCount() > 1 )
@@ -5312,11 +5330,11 @@ ScVbaRange::getStyle() throw (uno::RuntimeException)
rtl::OUString sStyleName;
xProps->getPropertyValue(CELLSTYLE) >>= sStyleName;
ScDocShell* pShell = getScDocShell();
- uno::Reference< frame::XModel > xModel( pShell->GetModel() );
+ uno::Reference< frame::XModel > xModel( pShell->GetModel() );
uno::Reference< excel::XStyle > xStyle = new ScVbaStyle( this, mxContext, sStyleName, xModel );
return uno::makeAny( xStyle );
}
-void SAL_CALL
+void SAL_CALL
ScVbaRange::setStyle( const uno::Any& _style ) throw (uno::RuntimeException)
{
if ( m_Areas->getCount() > 1 )
@@ -5333,11 +5351,11 @@ ScVbaRange::setStyle( const uno::Any& _style ) throw (uno::RuntimeException)
uno::Reference< excel::XRange >
ScVbaRange::PreviousNext( bool bIsPrevious )
-{
+{
ScMarkData markedRange;
- ScRange refRange;
+ ScRange refRange;
RangeHelper thisRange( mxRange );
-
+
ScUnoConversion::FillScRange( refRange, thisRange.getCellRangeAddressable()->getRangeAddress());
markedRange. SetMarkArea( refRange );
short nMove = bIsPrevious ? -1 : 1;
@@ -5346,8 +5364,8 @@ ScVbaRange::PreviousNext( bool bIsPrevious )
SCROW nNewY = refRange.aStart.Row();
SCTAB nTab = refRange.aStart.Tab();
- ScDocument* pDoc = getScDocument();
- pDoc->GetNextPos( nNewX,nNewY, nTab, nMove,0, TRUE,TRUE, markedRange );
+ ScDocument* pDoc = getScDocument();
+ pDoc->GetNextPos( nNewX,nNewY, nTab, nMove,0, TRUE,TRUE, markedRange );
refRange.aStart.SetCol( nNewX );
refRange.aStart.SetRow( nNewY );
refRange.aStart.SetTab( nTab );
@@ -5356,11 +5374,11 @@ ScVbaRange::PreviousNext( bool bIsPrevious )
refRange.aEnd.SetTab( nTab );
uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( getScDocShell() , refRange ) );
-
+
return new ScVbaRange( mxParent, mxContext, xRange );
}
-uno::Reference< excel::XRange > SAL_CALL
+uno::Reference< excel::XRange > SAL_CALL
ScVbaRange::Next() throw (script::BasicErrorException, uno::RuntimeException)
{
if ( m_Areas->getCount() > 1 )
@@ -5371,7 +5389,7 @@ ScVbaRange::Next() throw (script::BasicErrorException, uno::RuntimeException)
return PreviousNext( false );
}
-uno::Reference< excel::XRange > SAL_CALL
+uno::Reference< excel::XRange > SAL_CALL
ScVbaRange::Previous() throw (script::BasicErrorException, uno::RuntimeException)
{
if ( m_Areas->getCount() > 1 )
@@ -5385,7 +5403,7 @@ ScVbaRange::Previous() throw (script::BasicErrorException, uno::RuntimeException
uno::Reference< excel::XRange > SAL_CALL
ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) throw ( script::BasicErrorException )
{
- bool bIsSingleCell = isSingleCellRange();
+ bool bIsSingleCell = isSingleCellRange();
bool bIsMultiArea = ( m_Areas->getCount() > 1 );
ScVbaRange* pRangeToUse = this;
sal_Int32 nType = 0;
@@ -5396,7 +5414,7 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) throw
case excel::XlCellType::xlCellTypeSameFormatConditions:
case excel::XlCellType::xlCellTypeAllValidation:
case excel::XlCellType::xlCellTypeSameValidation:
- DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString());
+ DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString());
break;
case excel::XlCellType::xlCellTypeBlanks:
case excel::XlCellType::xlCellTypeComments:
@@ -5424,9 +5442,9 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) throw
uno::Reference< excel::XRange > xTmpRange( m_Areas->Item( uno::makeAny( nArea ), uno::Any() ), uno::UNO_QUERY_THROW );
RangeHelper rHelper( xTmpRange->getCellRange() );
rangeResults.push_back( rHelper.getCellRangeAddressable()->getRangeAddress() );
- }
+ }
}
- }
+ }
ScRangeList aCellRanges;
std::vector< table::CellRangeAddress >::iterator it = rangeResults.begin();
std::vector< table::CellRangeAddress >::iterator it_end = rangeResults.end();
@@ -5443,24 +5461,24 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) throw
return new ScVbaRange( mxParent, mxContext, xRange );
}
uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( getScDocShell(), aCellRanges ) );
-
+
return new ScVbaRange( mxParent, mxContext, xRanges );
}
else if ( bIsSingleCell )
{
uno::Reference< excel::XRange > xUsedRange = getWorksheet()->getUsedRange();
- pRangeToUse = static_cast< ScVbaRange* >( xUsedRange.get() );
+ pRangeToUse = static_cast< ScVbaRange* >( xUsedRange.get() );
}
-
+
break;
- }
+ }
default:
DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
break;
}
if ( !pRangeToUse )
DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() );
- return pRangeToUse->SpecialCellsImpl( nType, _oValue );
+ return pRangeToUse->SpecialCellsImpl( nType, _oValue );
}
sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType) throw ( script::BasicErrorException )
@@ -5473,7 +5491,7 @@ sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType) throw ( script::Basic
{
case excel::XlSpecialCellsValue::xlErrors:
nRes= sheet::FormulaResult::ERROR;
- break;
+ break;
case excel::XlSpecialCellsValue::xlLogical:
//TODO bc93774: ask NN if this is really an appropriate substitute
nRes = sheet::FormulaResult::VALUE;
@@ -5490,7 +5508,7 @@ sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType) throw ( script::Basic
return nRes;
}
-uno::Reference< excel::XRange >
+uno::Reference< excel::XRange >
ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw ( script::BasicErrorException )
{
uno::Reference< excel::XRange > xRange;
@@ -5505,9 +5523,9 @@ ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw (
case excel::XlCellType::xlCellTypeSameFormatConditions:
case excel::XlCellType::xlCellTypeAllValidation:
case excel::XlCellType::xlCellTypeSameValidation:
- // Shouldn't get here ( should be filtered out by
+ // Shouldn't get here ( should be filtered out by
// ScVbaRange::SpecialCells()
- DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString());
+ DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString());
break;
case excel::XlCellType::xlCellTypeBlanks:
xLocSheetCellRanges = xQuery->queryEmptyCells();
@@ -5516,7 +5534,7 @@ ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw (
xLocSheetCellRanges = xQuery->queryContentCells(sheet::CellFlags::ANNOTATION);
break;
case excel::XlCellType::xlCellTypeConstants:
- xLocSheetCellRanges = xQuery->queryContentCells(23);
+ xLocSheetCellRanges = xQuery->queryContentCells(23);
break;
case excel::XlCellType::xlCellTypeFormulas:
{
@@ -5527,7 +5545,7 @@ ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw (
case excel::XlCellType::xlCellTypeLastCell:
xRange = Cells( uno::makeAny( getCount() ), uno::Any() );
case excel::XlCellType::xlCellTypeVisible:
- xLocSheetCellRanges = xQuery->queryVisibleCells();
+ xLocSheetCellRanges = xQuery->queryVisibleCells();
break;
default:
DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
@@ -5540,19 +5558,19 @@ ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw (
}
catch (uno::Exception& )
{
- DebugHelper::exception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_NOCELLSWEREFOUND);
+ DebugHelper::exception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_NOCELLSWEREFOUND);
}
return xRange;
}
-void SAL_CALL
+void SAL_CALL
ScVbaRange::RemoveSubtotal( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Reference< sheet::XSubTotalCalculatable > xSub( mxRange, uno::UNO_QUERY_THROW );
- xSub->removeSubTotals();
+ xSub->removeSubTotals();
}
-void SAL_CALL
+void SAL_CALL
ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno::Sequence< ::sal_Int32 >& _nTotalList, const uno::Any& aReplace, const uno::Any& PageBreaks, const uno::Any& /*SummaryBelowData*/ ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -5623,14 +5641,14 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno::
}
}
-rtl::OUString&
+rtl::OUString&
ScVbaRange::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaRange") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaRange::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index e7488e434f30..14f0bde9e803 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ class ArrayVisitor
{
public:
virtual void visitNode( sal_Int32 x, sal_Int32 y, const css::uno::Reference< css::table::XCell >& xCell ) = 0;
- virtual ~ArrayVisitor(){}
+ virtual ~ArrayVisitor(){}
};
class ValueSetter : public ArrayVisitor
@@ -82,7 +82,7 @@ public:
class ValueGetter : public ArrayVisitor
{
-
+
public:
virtual void processValue( sal_Int32 x, sal_Int32 y, const css::uno::Any& aValue ) = 0;
virtual const css::uno::Any& getValue() const = 0;
@@ -105,7 +105,7 @@ class ScVbaRange : public ScVbaRange_BASE
css::uno::Reference< ov::excel::XRange > getEntireColumnOrRow( bool bColumn = true ) throw( css::uno::RuntimeException );
- void fillSeries( css::sheet::FillDirection nFillDirection, css::sheet::FillMode nFillMode, css::sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) throw( css::uno::RuntimeException );
+ void fillSeries( css::sheet::FillDirection nFillDirection, css::sheet::FillMode nFillMode, css::sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) throw( css::uno::RuntimeException );
void ClearContents( sal_Int32 nFlags ) throw (css::uno::RuntimeException);
virtual void setValue( const css::uno::Any& aValue, ValueSetter& setter) throw ( css::uno::RuntimeException);
@@ -142,7 +142,7 @@ public:
virtual ~ScVbaRange();
virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() { return this; }
- bool isSingleCellRange();
+ bool isSingleCellRange();
static css::uno::Reference< ov::excel::XRange > getRangeObjectForName(
const css::uno::Reference< css::uno::XComponentContext >& xContext,
@@ -182,14 +182,14 @@ public:
virtual css::uno::Any SAL_CALL getHeight() throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getTop() throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getLeft() throw (css::uno::RuntimeException);
-
+
virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getWorksheet() throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getPageBreak() throw (css::uno::RuntimeException);
virtual void SAL_CALL setPageBreak( const css::uno::Any& _pagebreak ) throw (css::uno::RuntimeException);
virtual css::uno::Reference< ov::excel::XValidation > SAL_CALL getValidation() throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getPrefixCharacter() throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getShowDetail() throw (css::uno::RuntimeException);
- virtual void SAL_CALL setShowDetail(const css::uno::Any& aShowDetail) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setShowDetail(const css::uno::Any& aShowDetail) throw (css::uno::RuntimeException);
// Methods
sal_Bool IsRows() { return mbIsRows; }
sal_Bool IsColumns() { return mbIsColumns; }
@@ -203,16 +203,16 @@ public:
virtual void SAL_CALL FillRight() throw (css::uno::RuntimeException);
virtual void SAL_CALL FillUp() throw (css::uno::RuntimeException);
virtual void SAL_CALL FillDown() throw (css::uno::RuntimeException);
- virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Offset( const css::uno::Any &nRowOffset, const css::uno::Any &nColOffset )
+ virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Offset( const css::uno::Any &nRowOffset, const css::uno::Any &nColOffset )
throw (css::uno::RuntimeException);
virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentRegion() throw (css::uno::RuntimeException);
virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentArray() throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL Characters( const css::uno::Any& nIndex, const css::uno::Any& nCount )
+ virtual ::rtl::OUString SAL_CALL Characters( const css::uno::Any& nIndex, const css::uno::Any& nCount )
throw (css::uno::RuntimeException);
virtual ::rtl::OUString SAL_CALL Address( const css::uno::Any& RowAbsolute, const css::uno::Any& ColumnAbsolute, const css::uno::Any& ReferenceStyle, const css::uno::Any& External, const css::uno::Any& RelativeTo ) throw (css::uno::RuntimeException);
- virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol )
+ virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol )
throw (css::uno::RuntimeException);
virtual void SAL_CALL Select() throw (css::uno::RuntimeException);
virtual void SAL_CALL Activate() throw (css::uno::RuntimeException);
@@ -220,7 +220,7 @@ public:
virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any &nIndex ) throw (css::uno::RuntimeException);
virtual void SAL_CALL Copy( const css::uno::Any& Destination ) throw (css::uno::RuntimeException);
virtual void SAL_CALL Cut( const css::uno::Any& Destination ) throw (css::uno::RuntimeException);
- virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Resize( const css::uno::Any& RowSize, const css::uno::Any& ColumnSize )
+ virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Resize( const css::uno::Any& RowSize, const css::uno::Any& ColumnSize )
throw (css::uno::RuntimeException);
virtual css::uno::Reference< ov::excel::XFont > SAL_CALL Font() throw ( css::script::BasicErrorException, css::uno::RuntimeException);
virtual css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) ;
@@ -237,10 +237,10 @@ public:
virtual void SAL_CALL Delete( const css::uno::Any& Shift ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Areas( const css::uno::Any& ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& ) throw ( css::script::BasicErrorException, css::uno::RuntimeException);
- virtual css::uno::Any SAL_CALL BorderAround( const css::uno::Any& LineStyle,
+ virtual css::uno::Any SAL_CALL BorderAround( const css::uno::Any& LineStyle,
const css::uno::Any& Weight, const css::uno::Any& ColorIndex, const css::uno::Any& Color ) throw (css::uno::RuntimeException);
virtual void SAL_CALL TextToColumns( const css::uno::Any& Destination, const css::uno::Any& DataType, const css::uno::Any& TextQualifier,
- const css::uno::Any& ConsecutinveDelimiter, const css::uno::Any& Tab, const css::uno::Any& Semicolon, const css::uno::Any& Comma,
+ const css::uno::Any& ConsecutinveDelimiter, const css::uno::Any& Tab, const css::uno::Any& Semicolon, const css::uno::Any& Comma,
const css::uno::Any& Space, const css::uno::Any& Other, const css::uno::Any& OtherChar, const css::uno::Any& FieldInfo,
const css::uno::Any& DecimalSeparator, const css::uno::Any& ThousandsSeparator, const css::uno::Any& TrailingMinusNumbers ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
@@ -250,7 +250,7 @@ public:
virtual void SAL_CALL Autofit() throw (css::uno::RuntimeException);
virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::uno::RuntimeException);
virtual void SAL_CALL AutoFill( const css::uno::Reference< ov::excel::XRange >& Destination, const css::uno::Any& Type ) throw (css::uno::RuntimeException) ;
- void SAL_CALL Calculate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+ void SAL_CALL Calculate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual void SAL_CALL AutoOutline( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Item( const ::css::uno::Any& row, const css::uno::Any& column ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual void SAL_CALL ClearOutline( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
@@ -282,14 +282,14 @@ public:
// #TODO completely rewrite ScVbaRange, its become a hackfest
// it needs to be closer to ScCellRangeBase in that the underlying
-// object model should probably be a ScRangelst.
+// object model should probably be a ScRangelst.
// * would be nice to be able to construct a range from an addres only
// * or a list of address ( multi-area )
// * object should be a lightweight as possible
// * we shouldn't need hacks like this below
static css::uno::Reference< ov::excel::XRange > ApplicationRange( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL GoalSeek( const css::uno::Any& Goal, const css::uno::Reference< ov::excel::XRange >& ChangingCell ) throw (css::uno::RuntimeException);
- virtual css::uno::Reference< ov::excel::XRange > SAL_CALL SpecialCells( const css::uno::Any& _oType, const css::uno::Any& _oValue) throw ( css::script::BasicErrorException );
+ virtual css::uno::Reference< ov::excel::XRange > SAL_CALL SpecialCells( const css::uno::Any& _oType, const css::uno::Any& _oValue) throw ( css::script::BasicErrorException );
// XHelperInterface
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
diff --git a/sc/source/ui/vba/vbaseriescollection.cxx b/sc/source/ui/vba/vbaseriescollection.cxx
index 8caa746beff0..c1e08e1c72a0 100644
--- a/sc/source/ui/vba/vbaseriescollection.cxx
+++ b/sc/source/ui/vba/vbaseriescollection.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
using namespace ::com::sun::star;
using namespace ::ooo::vba;
-ScVbaSeriesCollection::ScVbaSeriesCollection( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext ) : SeriesCollection_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() )
+ScVbaSeriesCollection::ScVbaSeriesCollection( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext ) : SeriesCollection_BASE( xParent, xContext, uno::Reference< container::XIndexAccess>() )
{
}
@@ -47,26 +47,26 @@ ScVbaSeriesCollection::createEnumeration() throw (uno::RuntimeException)
// XElementAccess
-uno::Type
+uno::Type
ScVbaSeriesCollection::getElementType() throw (uno::RuntimeException)
{
return excel::XSeries::static_type(0);
}
-uno::Any
+uno::Any
ScVbaSeriesCollection::createCollectionObject( const css::uno::Any& rSource )
{
return rSource;
}
-rtl::OUString&
+rtl::OUString&
ScVbaSeriesCollection::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaSeriesCollection") );
return sImplName;
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<rtl::OUString>
ScVbaSeriesCollection::getServiceNames()
{
static uno::Sequence< rtl::OUString > sNames;
diff --git a/sc/source/ui/vba/vbaseriescollection.hxx b/sc/source/ui/vba/vbaseriescollection.hxx
index f61720102919..419691bb4af8 100644
--- a/sc/source/ui/vba/vbaseriescollection.hxx
+++ b/sc/source/ui/vba/vbaseriescollection.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
typedef CollTestImplHelper< ov::excel::XSeriesCollection > SeriesCollection_BASE;
class ScVbaSeriesCollection : public SeriesCollection_BASE
-{
+{
css::uno::Reference< css::uno::XComponentContext > m_xContext;
public:
@@ -46,7 +46,7 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
// SeriesCollection_BASE
- virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+ virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx
index 4bd0f1d60547..215a62cec364 100755
--- a/sc/source/ui/vba/vbasheetobject.cxx
+++ b/sc/source/ui/vba/vbasheetobject.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -485,7 +485,7 @@ sal_Int32 SAL_CALL ScVbaButton::getOrientation() throw (uno::RuntimeException)
// not supported
return excel::XlOrientation::xlHorizontal;
}
-
+
void SAL_CALL ScVbaButton::setOrientation( sal_Int32 /*nOrientation*/ ) throw (uno::RuntimeException)
{
// not supported
diff --git a/sc/source/ui/vba/vbasheetobject.hxx b/sc/source/ui/vba/vbasheetobject.hxx
index b2546ca09c93..a7af03630d1f 100755
--- a/sc/source/ui/vba/vbasheetobject.hxx
+++ b/sc/source/ui/vba/vbasheetobject.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -169,7 +169,7 @@ public:
protected:
sal_Int32 getModelIndexInForm() const throw (css::uno::RuntimeException);
-
+
protected:
css::uno::Reference< css::container::XIndexContainer > mxFormIC;
css::uno::Reference< css::beans::XPropertySet > mxControlProps;
@@ -206,7 +206,7 @@ public:
// XButton methods
css::uno::Reference< ov::excel::XCharacters > SAL_CALL Characters(
const css::uno::Any& rStart, const css::uno::Any& rLength ) throw (css::uno::RuntimeException);
-
+
// XHelperInterface
VBAHELPER_DECL_XHELPERINTERFACE
diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx
index ced94db5ba76..ba0d62b4c734 100755
--- a/sc/source/ui/vba/vbasheetobjects.cxx
+++ b/sc/source/ui/vba/vbasheetobjects.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -375,7 +375,7 @@ public:
protected:
uno::Reference< container::XIndexContainer > createForm() throw (uno::RuntimeException);
-
+
virtual bool implPickShape( const uno::Reference< drawing::XShape >& rxShape ) const;
virtual OUString implGetShapeServiceName() const;
virtual bool implCheckProperties( const uno::Reference< beans::XPropertySet >& rxModelProps ) const;
diff --git a/sc/source/ui/vba/vbasheetobjects.hxx b/sc/source/ui/vba/vbasheetobjects.hxx
index fd69d4927a20..ba6eb8c5fb25 100755
--- a/sc/source/ui/vba/vbasheetobjects.hxx
+++ b/sc/source/ui/vba/vbasheetobjects.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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:
/** Updates the collection by fetching all shapes from the draw page. */
void collectShapes() throw (css::uno::RuntimeException);
-
+
// XEnumerationAccess
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx
index b99b2e783101..c3bcb5a74f32 100644
--- a/sc/source/ui/vba/vbastyle.cxx
+++ b/sc/source/ui/vba/vbastyle.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ static rtl::OUString DISPLAYNAME( RTL_CONSTASCII_USTRINGPARAM("DisplayName") );
-uno::Reference< container::XNameAccess >
+uno::Reference< container::XNameAccess >
ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException )
{
uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( xModel, uno::UNO_QUERY_THROW);
@@ -43,26 +43,26 @@ ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xMode
return xStylesAccess;
}
-uno::Reference< beans::XPropertySet >
+uno::Reference< beans::XPropertySet >
lcl_getStyleProps( const rtl::OUString& sStyleName, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException, uno::RuntimeException )
{
-
- uno::Reference< beans::XPropertySet > xStyleProps( ScVbaStyle::getStylesNameContainer( xModel )->getByName( sStyleName ), uno::UNO_QUERY_THROW );
+
+ uno::Reference< beans::XPropertySet > xStyleProps( ScVbaStyle::getStylesNameContainer( xModel )->getByName( sStyleName ), uno::UNO_QUERY_THROW );
return xStyleProps;
}
void ScVbaStyle::initialise() throw ( uno::RuntimeException )
{
- if (!mxModel.is() )
- DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XModel Interface could not be retrieved")) );
+ if (!mxModel.is() )
+ DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XModel Interface could not be retrieved")) );
uno::Reference< lang::XServiceInfo > xServiceInfo( mxPropertySet, uno::UNO_QUERY_THROW );
if ( !xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CellStyle" ) ) ) )
{
DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() );
}
mxStyle.set( mxPropertySet, uno::UNO_QUERY_THROW );
-
+
uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxModel, uno::UNO_QUERY_THROW );
mxStyleFamilyNameContainer.set( ScVbaStyle::getStylesNameContainer( mxModel ), uno::UNO_QUERY_THROW );
@@ -93,25 +93,25 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, const
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaStyle::BuiltIn() throw (script::BasicErrorException, uno::RuntimeException)
{
return !mxStyle->isUserDefined();
}
-void SAL_CALL
+void SAL_CALL
ScVbaStyle::setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException)
{
mxStyle->setName(Name);
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
ScVbaStyle::getName() throw (script::BasicErrorException, uno::RuntimeException)
{
return mxStyle->getName();
}
-void SAL_CALL
+void SAL_CALL
ScVbaStyle::setNameLocal( const ::rtl::OUString& NameLocal ) throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -124,7 +124,7 @@ ScVbaStyle::setNameLocal( const ::rtl::OUString& NameLocal ) throw (script::Basi
}
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
ScVbaStyle::getNameLocal() throw (script::BasicErrorException, uno::RuntimeException)
{
rtl::OUString sName;
@@ -139,7 +139,7 @@ ScVbaStyle::getNameLocal() throw (script::BasicErrorException, uno::RuntimeExcep
return sName;
}
-void SAL_CALL
+void SAL_CALL
ScVbaStyle::Delete() throw (script::BasicErrorException, uno::RuntimeException)
{
try
@@ -152,13 +152,13 @@ ScVbaStyle::Delete() throw (script::BasicErrorException, uno::RuntimeException)
}
}
-void SAL_CALL
+void SAL_CALL
ScVbaStyle::setMergeCells( const uno::Any& /*MergeCells*/ ) throw (script::BasicErrorException, uno::RuntimeException)
{
DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString());
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaStyle::getMergeCells( ) throw (script::BasicErrorException, uno::RuntimeException)
{
DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString());
diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx
index d5bb232dabc2..d0b888a55a90 100644
--- a/sc/source/ui/vba/vbastyle.hxx
+++ b/sc/source/ui/vba/vbastyle.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,12 +82,12 @@ public:
virtual void SAL_CALL setLocked( const css::uno::Any& Locked ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
virtual css::uno::Any SAL_CALL getLocked( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
virtual void SAL_CALL setFormulaHidden( const css::uno::Any& FormulaHidden ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
-/ virtual css::uno::Any SAL_CALL getFormulaHidden( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
+/ virtual css::uno::Any SAL_CALL getFormulaHidden( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0;
- virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0;
+ virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0;
virtual void SAL_CALL setReadingOrder( const css::uno::Any& ReadingOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
virtual css::uno::Any SAL_CALL getReadingOrder( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
-*/
+*/
// XHelperInterface
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx
index c323e2b3f6f6..2536195aa41a 100644
--- a/sc/source/ui/vba/vbastyles.cxx
+++ b/sc/source/ui/vba/vbastyles.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ css::uno::Any
lcl_createAPIStyleToVBAObject( const css::uno::Any& aObject, const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel )
{
uno::Reference< beans::XPropertySet > xStyleProps( aObject, uno::UNO_QUERY_THROW );
- uno::Reference< excel::XStyle > xStyle( new ScVbaStyle( xParent, xContext, xStyleProps, xModel ) );
+ uno::Reference< excel::XStyle > xStyle( new ScVbaStyle( xParent, xContext, xStyleProps, xModel ) );
return uno::makeAny( xStyle );
}
@@ -44,30 +44,30 @@ lcl_createAPIStyleToVBAObject( const css::uno::Any& aObject, const uno::Referenc
ScVbaStyles::ScVbaStyles( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException ) : ScVbaStyles_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( ScVbaStyle::getStylesNameContainer( xModel ), uno::UNO_QUERY_THROW ) ), mxModel( xModel ), mxParent( xParent )
{
try
- {
+ {
mxMSF.set( mxModel, uno::UNO_QUERY_THROW );
mxNameContainerCellStyles.set( m_xNameAccess, uno::UNO_QUERY_THROW );
}
- catch (uno::Exception& )
+ catch (uno::Exception& )
{
DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
}
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaStyles::getStyleNames() throw ( uno::RuntimeException )
{
return mxNameContainerCellStyles->getElementNames();
}
-uno::Any
+uno::Any
ScVbaStyles::createCollectionObject(const uno::Any& aObject)
{
return lcl_createAPIStyleToVBAObject( aObject, mxParent, mxContext, mxModel );
}
-uno::Type SAL_CALL
+uno::Type SAL_CALL
ScVbaStyles::getElementType() throw (uno::RuntimeException)
{
return excel::XStyle::static_type(0);
@@ -95,13 +95,13 @@ public:
}
};
-uno::Reference< container::XEnumeration > SAL_CALL
+uno::Reference< container::XEnumeration > SAL_CALL
ScVbaStyles::createEnumeration() throw (uno::RuntimeException)
{
return new EnumWrapper( m_xIndexAccess, mxParent, mxContext, mxModel );
}
-uno::Reference< excel::XStyle > SAL_CALL
+uno::Reference< excel::XStyle > SAL_CALL
ScVbaStyles::Add( const ::rtl::OUString& _sName, const uno::Any& _aBasedOn ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Reference< excel::XStyle > aRet;
@@ -148,7 +148,7 @@ ScVbaStyles::Add( const ::rtl::OUString& _sName, const uno::Any& _aBasedOn ) thr
return aRet;
}
-void
+void
ScVbaStyles::Delete(const rtl::OUString _sStyleName) throw ( script::BasicErrorException )
{
try
diff --git a/sc/source/ui/vba/vbastyles.hxx b/sc/source/ui/vba/vbastyles.hxx
index 300596d6b3fe..088b2acda0ce 100644
--- a/sc/source/ui/vba/vbastyles.hxx
+++ b/sc/source/ui/vba/vbastyles.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ typedef CollTestImplHelper< ov::excel::XStyles > ScVbaStyles_BASE;
class ScVbaStyles: public ScVbaStyles_BASE
{
css::uno::Reference< css::frame::XModel > mxModel;
- // hard ref to parent ( perhaps we should try this in the
+ // hard ref to parent ( perhaps we should try this in the
// XHelperInterface itself
css::uno::Reference< ov::XHelperInterface > mxParent;
css::uno::Reference< css::lang::XMultiServiceFactory > mxMSF;
@@ -47,11 +47,11 @@ public:
virtual css::uno::Reference< ov::excel::XStyle > SAL_CALL Add( const ::rtl::OUString& Name, const css::uno::Any& BasedOn ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
// XEnumerationAccess
virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
- virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
+ virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
virtual css::uno::Any createCollectionObject(const css::uno::Any&);
// XHelperInterface
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
-#endif
+#endif
diff --git a/sc/source/ui/vba/vbatextboxshape.cxx b/sc/source/ui/vba/vbatextboxshape.cxx
index 0ef9e0f7393b..fef39600f1ba 100644
--- a/sc/source/ui/vba/vbatextboxshape.cxx
+++ b/sc/source/ui/vba/vbatextboxshape.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScVbaTextBoxShape::ScVbaTextBoxShape( const uno::Reference< uno::XComponentConte
m_xModel.set( xModel );
}
-rtl::OUString SAL_CALL
+rtl::OUString SAL_CALL
ScVbaTextBoxShape::getText() throw (css::uno::RuntimeException)
{
return m_xTextRange->getString();
}
-void SAL_CALL
+void SAL_CALL
ScVbaTextBoxShape::setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException)
{
m_xTextRange->setString( _text );
}
-uno::Reference< excel::XCharacters > SAL_CALL
+uno::Reference< excel::XCharacters > SAL_CALL
ScVbaTextBoxShape::characters( const uno::Any& Start, const uno::Any& Length ) throw (uno::RuntimeException)
{
ScDocShell* pDocShell = excel::getDocShell( m_xModel );
diff --git a/sc/source/ui/vba/vbatextboxshape.hxx b/sc/source/ui/vba/vbatextboxshape.hxx
index c08a576b7155..f2e2905e0828 100644
--- a/sc/source/ui/vba/vbatextboxshape.hxx
+++ b/sc/source/ui/vba/vbatextboxshape.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +41,7 @@ class ScVbaTextBoxShape : public TextBoxShapeImpl_BASE
css::uno::Reference< css::frame::XModel > m_xModel;
public:
ScVbaTextBoxShape( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel );
-
+
// Attributes
virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
virtual void SAL_CALL setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException);
diff --git a/sc/source/ui/vba/vbatextframe.cxx b/sc/source/ui/vba/vbatextframe.cxx
index b06777526c1f..cee807612cbb 100644
--- a/sc/source/ui/vba/vbatextframe.cxx
+++ b/sc/source/ui/vba/vbatextframe.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScVbaTextFrame::ScVbaTextFrame( uno::Sequence< uno::Any> const & args, uno::Refe
}
// Methods
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaTextFrame::Characters() throw (uno::RuntimeException)
{
uno::Reference< text::XSimpleText > xSimpleText( m_xShape, uno::UNO_QUERY_THROW );
@@ -67,7 +67,7 @@ ScVbaTextFrame::getServiceNames()
return aServiceNames;
}
-namespace textframe
+namespace textframe
{
namespace sdecl = comphelper::service_decl;
sdecl::vba_service_class_<ScVbaTextFrame, sdecl::with_args<true> > serviceImpl;
diff --git a/sc/source/ui/vba/vbatextframe.hxx b/sc/source/ui/vba/vbatextframe.hxx
index b48cd8752ef9..d465553fc718 100644
--- a/sc/source/ui/vba/vbatextframe.hxx
+++ b/sc/source/ui/vba/vbatextframe.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx
index fb97f3f20f0c..7eaf740b85fe 100644
--- a/sc/source/ui/vba/vbatitle.hxx
+++ b/sc/source/ui/vba/vbatitle.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 TitleImpl : public InheritedHelperInterfaceImpl< Ifc1 >
{
typedef InheritedHelperInterfaceImpl< Ifc1 > BaseClass;
-protected:
+protected:
css::uno::Reference< css::drawing::XShape > xTitleShape;
css::uno::Reference< css::beans::XPropertySet > xShapePropertySet;
std::auto_ptr<ov::ShapeHelper> oShapeHelper;
@@ -100,7 +100,7 @@ public:
// #FIXME #TODO the helperapi Characters implementation doesn't
// seem to do very much, need to know how the existing Characters
// impl ( that we use for Range ) can be reused
- return css::uno::Reference< ov::excel::XCharacters > ();
+ return css::uno::Reference< ov::excel::XCharacters > ();
}
void SAL_CALL setTop( double Top ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
@@ -140,9 +140,9 @@ public:
catch (css::uno::Exception& )
{
throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
- }
+ }
return static_cast< sal_Int32 >(nSOOrientation / 100) ;
- }
+ }
// XHelperInterface
rtl::OUString& getServiceImplName()
{
diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx
index e2a768549e11..f76794e3ef7c 100644
--- a/sc/source/ui/vba/vbavalidation.cxx
+++ b/sc/source/ui/vba/vbavalidation.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ lcl_getValidationProps( const uno::Reference< table::XCellRange >& xRange )
return xValProps;
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaValidation::getIgnoreBlank() throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) );
@@ -75,74 +75,74 @@ ScVbaValidation::getIgnoreBlank() throw (uno::RuntimeException)
return bBlank;
}
-void SAL_CALL
+void SAL_CALL
ScVbaValidation::setIgnoreBlank( ::sal_Bool _ignoreblank ) throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) );
- xProps->setPropertyValue( IGNOREBLANK, uno::makeAny( _ignoreblank ) );
- lcl_setValidationProps( m_xRange, xProps );
+ xProps->setPropertyValue( IGNOREBLANK, uno::makeAny( _ignoreblank ) );
+ lcl_setValidationProps( m_xRange, xProps );
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaValidation::getInCellDropdown() throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange );
sal_Int32 nShowList = 0;
- xProps->getPropertyValue( SHOWLIST ) >>= nShowList;
+ xProps->getPropertyValue( SHOWLIST ) >>= nShowList;
return ( nShowList ? sal_True : sal_False );
}
-void SAL_CALL
+void SAL_CALL
ScVbaValidation::setInCellDropdown( ::sal_Bool _incelldropdown ) throw (uno::RuntimeException)
{
sal_Int32 nDropDown = sal_False;
if ( _incelldropdown )
nDropDown = 1;
uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps(m_xRange) );
- xProps->setPropertyValue( SHOWLIST, uno::makeAny( nDropDown ) );
+ xProps->setPropertyValue( SHOWLIST, uno::makeAny( nDropDown ) );
lcl_setValidationProps( m_xRange, xProps );
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaValidation::getShowInput() throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange );
sal_Bool bShowInput = sal_False;
- xProps->getPropertyValue( SHOWINPUT ) >>= bShowInput;
+ xProps->getPropertyValue( SHOWINPUT ) >>= bShowInput;
return bShowInput;
}
-void SAL_CALL
+void SAL_CALL
ScVbaValidation:: setShowInput( ::sal_Bool _showinput ) throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps(m_xRange) );
- xProps->setPropertyValue( IGNOREBLANK, uno::makeAny( _showinput ) );
+ xProps->setPropertyValue( IGNOREBLANK, uno::makeAny( _showinput ) );
lcl_setValidationProps( m_xRange, xProps );
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaValidation::getShowError() throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange );
sal_Bool bShowError = sal_False;
- xProps->getPropertyValue( SHOWERROR ) >>= bShowError;
+ xProps->getPropertyValue( SHOWERROR ) >>= bShowError;
return bShowError;
}
-void SAL_CALL
+void SAL_CALL
ScVbaValidation::setShowError( ::sal_Bool _showerror ) throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) );
- xProps->setPropertyValue( SHOWERROR, uno::makeAny( _showerror ) );
+ xProps->setPropertyValue( SHOWERROR, uno::makeAny( _showerror ) );
lcl_setValidationProps( m_xRange, xProps );
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
ScVbaValidation::getErrorTitle() throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange );
rtl::OUString sErrorTitle;
- xProps->getPropertyValue( ERRORTITLE ) >>= sErrorTitle;
+ xProps->getPropertyValue( ERRORTITLE ) >>= sErrorTitle;
return sErrorTitle;
}
@@ -150,63 +150,63 @@ void
ScVbaValidation::setErrorTitle( const rtl::OUString& _errormessage ) throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) );
- xProps->setPropertyValue( ERRORTITLE, uno::makeAny( _errormessage ) );
+ xProps->setPropertyValue( ERRORTITLE, uno::makeAny( _errormessage ) );
lcl_setValidationProps( m_xRange, xProps );
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
ScVbaValidation::getInputMessage() throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange );
rtl::OUString sMsg;
- xProps->getPropertyValue( INPUTMESS ) >>= sMsg;
+ xProps->getPropertyValue( INPUTMESS ) >>= sMsg;
return sMsg;
}
-void SAL_CALL
+void SAL_CALL
ScVbaValidation::setInputMessage( const ::rtl::OUString& _inputmessage ) throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) );
- xProps->setPropertyValue( INPUTMESS, uno::makeAny( _inputmessage ) );
+ xProps->setPropertyValue( INPUTMESS, uno::makeAny( _inputmessage ) );
lcl_setValidationProps( m_xRange, xProps );
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
ScVbaValidation::getInputTitle() throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange );
rtl::OUString sString;
- xProps->getPropertyValue( INPUTTITLE ) >>= sString;
+ xProps->getPropertyValue( INPUTTITLE ) >>= sString;
return sString;
}
-void SAL_CALL
+void SAL_CALL
ScVbaValidation::setInputTitle( const ::rtl::OUString& _inputtitle ) throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) );
- xProps->setPropertyValue( INPUTTITLE, uno::makeAny( _inputtitle ) );
+ xProps->setPropertyValue( INPUTTITLE, uno::makeAny( _inputtitle ) );
lcl_setValidationProps( m_xRange, xProps );
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
ScVbaValidation::getErrorMessage() throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange );
rtl::OUString sString;
- xProps->getPropertyValue( ERRORMESS ) >>= sString;
+ xProps->getPropertyValue( ERRORMESS ) >>= sString;
return sString;
}
-void SAL_CALL
+void SAL_CALL
ScVbaValidation::setErrorMessage( const ::rtl::OUString& _errormessage ) throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) );
- xProps->setPropertyValue( ERRORMESS, uno::makeAny( _errormessage ) );
+ xProps->setPropertyValue( ERRORMESS, uno::makeAny( _errormessage ) );
lcl_setValidationProps( m_xRange, xProps );
}
-void SAL_CALL
+void SAL_CALL
ScVbaValidation::Delete( ) throw (uno::RuntimeException)
{
rtl::OUString sBlank;
@@ -218,19 +218,19 @@ ScVbaValidation::Delete( ) throw (uno::RuntimeException)
xProps->setPropertyValue( ERRORTITLE, uno::makeAny( sBlank ) );
xProps->setPropertyValue( INPUTMESS, uno::makeAny( sBlank) );
xProps->setPropertyValue( ALERTSTYLE, uno::makeAny( sheet::ValidationAlertStyle_STOP) );
- xProps->setPropertyValue( STYPE, uno::makeAny( sheet::ValidationType_ANY ) );
+ xProps->setPropertyValue( STYPE, uno::makeAny( sheet::ValidationType_ANY ) );
xCond->setFormula1( sBlank );
xCond->setFormula2( sBlank );
xCond->setOperator( sheet::ConditionOperator_NONE );
lcl_setValidationProps( m_xRange, xProps );
}
-void SAL_CALL
+void SAL_CALL
ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const uno::Any& /*Operator*/, const uno::Any& Formula1, const uno::Any& Formula2 ) throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) );
uno::Reference< sheet::XSheetCondition > xCond( xProps, uno::UNO_QUERY_THROW );
-
+
sheet::ValidationType nValType = sheet::ValidationType_ANY;
xProps->getPropertyValue( STYPE ) >>= nValType;
if ( nValType != sheet::ValidationType_ANY )
@@ -239,7 +239,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un
if ( !Type.hasValue() || !( Type >>= nType ) )
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "missing required param" ) ), uno::Reference< uno::XInterface >() );
- Delete(); // set up defaults
+ Delete(); // set up defaults
rtl::OUString sFormula1;
Formula1 >>= sFormula1;
rtl::OUString sFormula2;
@@ -248,25 +248,25 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un
{
case excel::XlDVType::xlValidateList:
{
- // for validate list
+ // for validate list
// at least formula1 is required
if ( !Formula1.hasValue() )
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "missing param" ) ), uno::Reference< uno::XInterface >() );
nValType = sheet::ValidationType_LIST;
- xProps->setPropertyValue( STYPE, uno::makeAny(nValType ));
+ xProps->setPropertyValue( STYPE, uno::makeAny(nValType ));
// #TODO validate required params
// #TODO need to correct the ';' delimited formula on get/set
break;
}
case excel::XlDVType::xlValidateWholeNumber:
nValType = sheet::ValidationType_WHOLE;
- xProps->setPropertyValue( STYPE, uno::makeAny(nValType ));
- break;
+ xProps->setPropertyValue( STYPE, uno::makeAny(nValType ));
+ break;
default:
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unsupported operation..." ) ), uno::Reference< uno::XInterface >() );
}
- sheet::ValidationAlertStyle eStyle = sheet::ValidationAlertStyle_STOP;
+ sheet::ValidationAlertStyle eStyle = sheet::ValidationAlertStyle_STOP;
sal_Int32 nVbaAlertStyle = excel::XlDVAlertStyle::xlValidAlertStop;
if ( AlertStyle.hasValue() && ( AlertStyle >>= nVbaAlertStyle ) )
{
@@ -275,18 +275,18 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un
case excel::XlDVAlertStyle::xlValidAlertStop:
// yes I know it's already defaulted but safer to assume
// someone propbably could change the code above
- eStyle = sheet::ValidationAlertStyle_STOP;
- break;
+ eStyle = sheet::ValidationAlertStyle_STOP;
+ break;
case excel::XlDVAlertStyle::xlValidAlertWarning:
- eStyle = sheet::ValidationAlertStyle_WARNING;
- break;
+ eStyle = sheet::ValidationAlertStyle_WARNING;
+ break;
case excel::XlDVAlertStyle::xlValidAlertInformation:
- eStyle = sheet::ValidationAlertStyle_INFO;
- break;
+ eStyle = sheet::ValidationAlertStyle_INFO;
+ break;
default:
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "bad param..." ) ), uno::Reference< uno::XInterface >() );
- }
+ }
}
xProps->setPropertyValue( ALERTSTYLE, uno::makeAny( eStyle ) );
@@ -295,32 +295,32 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un
xCond->setFormula1( sFormula1 );
if ( sFormula2.getLength() )
xCond->setFormula2( sFormula2 );
-
- lcl_setValidationProps( m_xRange, xProps );
+
+ lcl_setValidationProps( m_xRange, xProps );
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
ScVbaValidation::getFormula1() throw (uno::RuntimeException)
{
uno::Reference< sheet::XSheetCondition > xCond( lcl_getValidationProps( m_xRange ), uno::UNO_QUERY_THROW );
return xCond->getFormula1();
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
ScVbaValidation::getFormula2() throw (uno::RuntimeException)
{
uno::Reference< sheet::XSheetCondition > xCond( lcl_getValidationProps( m_xRange ), uno::UNO_QUERY_THROW );
return xCond->getFormula2();
}
-rtl::OUString&
+rtl::OUString&
ScVbaValidation::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaValidation") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaValidation::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbavalidation.hxx b/sc/source/ui/vba/vbavalidation.hxx
index 563ee1d003b6..18c6a9f7467f 100644
--- a/sc/source/ui/vba/vbavalidation.hxx
+++ b/sc/source/ui/vba/vbavalidation.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +35,9 @@
typedef InheritedHelperInterfaceImpl1<ov::excel::XValidation > ValidationImpl_BASE;
class ScVbaValidation : public ValidationImpl_BASE
-{
+{
css::uno::Reference< css::table::XCellRange > m_xRange;
-
+
public:
ScVbaValidation( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange ) : ValidationImpl_BASE( xParent, xContext ), m_xRange( xRange) {}
// Attributes
@@ -68,4 +68,4 @@ public:
};
-#endif
+#endif
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index 10dad39341b7..079ec5282187 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ typedef ::cppu::WeakImplHelper1< container::XEnumeration
> Enumeration_BASE;
-typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess
+typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess
, com::sun::star::container::XIndexAccess
, com::sun::star::container::XNameAccess
> SelectedSheets_BASE;
@@ -84,12 +84,12 @@ public:
m_it = m_sheets.begin();
}
// XEnumeration
- virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException)
- {
+ virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException)
+ {
return m_it != m_sheets.end();
}
- virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
- {
+ virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ {
if ( !hasMoreElements() )
{
throw container::NoSuchElementException();
@@ -106,7 +106,7 @@ class SelectedSheetsEnumAccess : public SelectedSheets_BASE
uno::Reference< uno::XComponentContext > m_xContext;
NameIndexHash namesToIndices;
Sheets sheets;
- uno::Reference< frame::XModel > m_xModel;
+ uno::Reference< frame::XModel > m_xModel;
public:
SelectedSheetsEnumAccess( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ):m_xContext( xContext ), m_xModel( xModel )
{
@@ -119,7 +119,7 @@ public:
ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
if ( !pViewShell )
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain view shell" ) ), uno::Reference< uno::XInterface >() );
-
+
SCTAB nTabCount = pDocShell->GetDocument()->GetTableCount();
uno::Sequence<sal_Int32> aSheets( nTabCount );
SCTAB nIndex = 0;
@@ -139,60 +139,60 @@ public:
}
}
-
+
//XEnumerationAccess
virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException)
{
- return new SelectedSheetsEnum( m_xContext, sheets, m_xModel );
+ return new SelectedSheetsEnum( m_xContext, sheets, m_xModel );
}
// XIndexAccess
- virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException)
- {
+ virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException)
+ {
return sheets.size();
}
- virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
- {
+ virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
+ {
if ( Index < 0
- || static_cast< Sheets::size_type >( Index ) >= sheets.size() )
+ || static_cast< Sheets::size_type >( Index ) >= sheets.size() )
throw lang::IndexOutOfBoundsException();
-
+
return uno::makeAny( sheets[ Index ] );
}
//XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
- {
- return excel::XWorksheet::static_type(0);
+ {
+ return excel::XWorksheet::static_type(0);
}
- virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
- {
+ virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
+ {
return (sheets.size() > 0);
}
//XNameAccess
- virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
- {
+ virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ {
NameIndexHash::const_iterator it = namesToIndices.find( aName );
if ( it == namesToIndices.end() )
throw container::NoSuchElementException();
return uno::makeAny( sheets[ it->second ] );
-
+
}
- virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException)
- {
+ virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException)
+ {
uno::Sequence< ::rtl::OUString > names( namesToIndices.size() );
::rtl::OUString* pString = names.getArray();
NameIndexHash::const_iterator it = namesToIndices.begin();
NameIndexHash::const_iterator it_end = namesToIndices.end();
for ( ; it != it_end; ++it, ++pString )
- *pString = it->first;
- return names;
+ *pString = it->first;
+ return names;
}
- virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
- {
+ virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
+ {
NameIndexHash::const_iterator it = namesToIndices.find( aName );
return (it != namesToIndices.end());
}
@@ -238,19 +238,19 @@ ScVbaWindow::Scroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& T
m_xPane->SmallScroll( Down, Up, ToRight, ToLeft );
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException)
{
Scroll( Down, Up, ToRight, ToLeft );
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException)
{
Scroll( Down, Up, ToRight, ToLeft, true );
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaWindow::SelectedSheets( const uno::Any& aIndex ) throw (uno::RuntimeException)
{
uno::Reference< container::XEnumerationAccess > xEnumAccess( new SelectedSheetsEnumAccess( mxContext, m_xModel ) );
@@ -259,12 +259,12 @@ ScVbaWindow::SelectedSheets( const uno::Any& aIndex ) throw (uno::RuntimeExcepti
if ( aIndex.hasValue() )
{
uno::Reference< XCollection > xColl( xSheets, uno::UNO_QUERY_THROW );
- return xColl->Item( aIndex, uno::Any() );
+ return xColl->Item( aIndex, uno::Any() );
}
- return uno::makeAny( xSheets );
+ return uno::makeAny( xSheets );
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*Position*/ ) throw (uno::RuntimeException)
{
// #TODO #FIXME need some implementation to scroll through the tabs
@@ -272,7 +272,7 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P
/*
sal_Int32 nSheets = 0;
sal_Int32 nPosition = 0;
- throw uno::RuntimeException( rtl::OUString::createFromAscii("No Implemented" ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString::createFromAscii("No Implemented" ), uno::Reference< uno::XInterface >() );
sal_Bool bSheets = ( Sheets >>= nSheets );
sal_Bool bPosition = ( Position >>= nPosition );
if ( bSheets || bPosition ) // at least one param specified
@@ -289,12 +289,12 @@ getPropsFromModel( const uno::Reference< frame::XModel >& xModel )
uno::Reference< frame::XController > xController = xModel->getCurrentController();
if ( !xController.is() )
throw uno::RuntimeException( rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM ("No controller for model") ), uno::Reference< uno::XInterface >() );
+ RTL_CONSTASCII_USTRINGPARAM ("No controller for model") ), uno::Reference< uno::XInterface >() );
return uno::Reference< beans::XPropertySet >( xController->getFrame(), uno::UNO_QUERY );
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaWindow::getCaption() throw (uno::RuntimeException)
{
static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - OpenOffice.org Calc" ) );
@@ -302,8 +302,8 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException)
uno::Reference< beans::XPropertySet > xProps = getPropsFromModel( m_xModel );
rtl::OUString sTitle;
- xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SC_UNONAME_TITLE ) ) ) >>= sTitle;
- sal_Int32 nCrudIndex = sTitle.indexOf( sCrud );
+ xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SC_UNONAME_TITLE ) ) ) >>= sTitle;
+ sal_Int32 nCrudIndex = sTitle.indexOf( sCrud );
// adjust title ( by removing crud )
// sCrud string present
if ( nCrudIndex != -1 )
@@ -318,8 +318,8 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException)
// is like XL
// if the adjusted title == workbook name, use name
// if the adjusted title != workbook name but ...
- // name == title + extension ( .csv, ,odt, .xls )
- // etc. then also use the name
+ // name == title + extension ( .csv, ,odt, .xls )
+ // etc. then also use the name
if ( !sTitle.equals( sName ) )
{
@@ -331,40 +331,40 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException)
sTitle = sName;
}
}
- }
+ }
return uno::makeAny( sTitle );
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::setCaption( const uno::Any& _caption ) throw (uno::RuntimeException)
{
-
+
uno::Reference< beans::XPropertySet > xProps = getPropsFromModel( m_xModel );
xProps->setPropertyValue( rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM ( SC_UNONAME_TITLE ) ) , _caption );
+ RTL_CONSTASCII_USTRINGPARAM ( SC_UNONAME_TITLE ) ) , _caption );
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaWindow::getScrollRow() throw (uno::RuntimeException)
-{
+{
sal_Int32 nValue = 0;
- ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
+ ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
if ( pViewShell )
{
ScSplitPos eWhich = pViewShell->GetViewData()->GetActivePart();
nValue = pViewShell->GetViewData()->GetPosY(WhichV(eWhich));
}
-
+
return uno::makeAny( nValue + 1);
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::setScrollRow( const uno::Any& _scrollrow ) throw (uno::RuntimeException)
{
- ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
+ ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
if ( pViewShell )
{
- sal_Int32 scrollRow = 0;
+ sal_Int32 scrollRow = 0;
_scrollrow >>= scrollRow;
ScSplitPos eWhich = pViewShell->GetViewData()->GetActivePart();
sal_Int32 nOldValue = pViewShell->GetViewData()->GetPosY(WhichV(eWhich)) + 1;
@@ -372,27 +372,27 @@ ScVbaWindow::setScrollRow( const uno::Any& _scrollrow ) throw (uno::RuntimeExcep
}
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaWindow::getScrollColumn() throw (uno::RuntimeException)
-{
+{
sal_Int32 nValue = 0;
- ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
+ ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
if ( pViewShell )
{
ScSplitPos eWhich = pViewShell->GetViewData()->GetActivePart();
nValue = pViewShell->GetViewData()->GetPosX(WhichH(eWhich));
}
-
+
return uno::makeAny( nValue + 1);
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::setScrollColumn( const uno::Any& _scrollcolumn ) throw (uno::RuntimeException)
{
- ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
+ ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
if ( pViewShell )
{
- sal_Int32 scrollColumn = 0;
+ sal_Int32 scrollColumn = 0;
_scrollcolumn >>= scrollColumn;
ScSplitPos eWhich = pViewShell->GetViewData()->GetActivePart();
sal_Int32 nOldValue = pViewShell->GetViewData()->GetPosX(WhichH(eWhich)) + 1;
@@ -400,11 +400,11 @@ ScVbaWindow::setScrollColumn( const uno::Any& _scrollcolumn ) throw (uno::Runtim
}
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaWindow::getWindowState() throw (uno::RuntimeException)
-{
+{
sal_Int32 nwindowState = xlNormal;
- ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
+ ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
SfxViewFrame* pViewFrame = pViewShell -> GetViewFrame();
WorkWindow* pWork = (WorkWindow*) pViewFrame->GetFrame().GetSystemWindow();
if ( pWork )
@@ -417,12 +417,12 @@ ScVbaWindow::getWindowState() throw (uno::RuntimeException)
return uno::makeAny( nwindowState );
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeException)
{
sal_Int32 nwindowState = xlMaximized;
_windowstate >>= nwindowState;
- ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
+ ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
SfxViewFrame* pViewFrame = pViewShell -> GetViewFrame();
WorkWindow* pWork = (WorkWindow*) pViewFrame->GetFrame().GetSystemWindow();
if ( pWork )
@@ -454,19 +454,19 @@ ScVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& FileName, const
}
uno::Reference< excel::XPane > SAL_CALL
-ScVbaWindow::ActivePane() throw (script::BasicErrorException, uno::RuntimeException)
-{
+ScVbaWindow::ActivePane() throw (script::BasicErrorException, uno::RuntimeException)
+{
return new ScVbaPane( this, mxContext, m_xModel, m_xViewPane );
}
-uno::Reference< excel::XRange > SAL_CALL
+uno::Reference< excel::XRange > SAL_CALL
ScVbaWindow::ActiveCell( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
return xApplication->getActiveCell();
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaWindow::Selection( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
@@ -488,11 +488,11 @@ ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException)
rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWGRID ) );
sal_Bool bGrid = sal_True;
xProps->getPropertyValue( sName ) >>= bGrid;
- return bGrid;
+ return bGrid;
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::setDisplayGridlines( ::sal_Bool _displaygridlines ) throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
@@ -500,17 +500,17 @@ ScVbaWindow::setDisplayGridlines( ::sal_Bool _displaygridlines ) throw (uno::Run
xProps->setPropertyValue( sName, uno::makeAny( _displaygridlines ));
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLROWHDR ) );
sal_Bool bHeading = sal_True;
xProps->getPropertyValue( sName ) >>= bHeading;
- return bHeading;
+ return bHeading;
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::setDisplayHeadings( ::sal_Bool _bDisplayHeadings ) throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
@@ -518,17 +518,17 @@ ScVbaWindow::setDisplayHeadings( ::sal_Bool _bDisplayHeadings ) throw (uno::Runt
xProps->setPropertyValue( sName, uno::makeAny( _bDisplayHeadings ));
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_HORSCROLL ) );
sal_Bool bHorizontalScrollBar = sal_True;
xProps->getPropertyValue( sName ) >>= bHorizontalScrollBar;
- return bHorizontalScrollBar;
+ return bHorizontalScrollBar;
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::setDisplayHorizontalScrollBar( ::sal_Bool _bDisplayHorizontalScrollBar ) throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
@@ -536,17 +536,17 @@ ScVbaWindow::setDisplayHorizontalScrollBar( ::sal_Bool _bDisplayHorizontalScroll
xProps->setPropertyValue( sName, uno::makeAny( _bDisplayHorizontalScrollBar ));
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OUTLSYMB ) );
sal_Bool bOutline = sal_True;
xProps->getPropertyValue( sName ) >>= bOutline;
- return bOutline;
+ return bOutline;
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::setDisplayOutline( ::sal_Bool _bDisplayOutline ) throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
@@ -554,17 +554,17 @@ ScVbaWindow::setDisplayOutline( ::sal_Bool _bDisplayOutline ) throw (uno::Runtim
xProps->setPropertyValue( sName, uno::makeAny( _bDisplayOutline ));
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VERTSCROLL ) );
sal_Bool bVerticalScrollBar = sal_True;
xProps->getPropertyValue( sName ) >>= bVerticalScrollBar;
- return bVerticalScrollBar;
+ return bVerticalScrollBar;
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::setDisplayVerticalScrollBar( ::sal_Bool _bDisplayVerticalScrollBar ) throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
@@ -572,17 +572,17 @@ ScVbaWindow::setDisplayVerticalScrollBar( ::sal_Bool _bDisplayVerticalScrollBar
xProps->setPropertyValue( sName, uno::makeAny( _bDisplayVerticalScrollBar ));
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHEETTABS ) );
sal_Bool bWorkbookTabs = sal_True;
xProps->getPropertyValue( sName ) >>= bWorkbookTabs;
- return bWorkbookTabs;
+ return bWorkbookTabs;
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::setDisplayWorkbookTabs( ::sal_Bool _bDisplayWorkbookTabs ) throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
@@ -590,13 +590,13 @@ ScVbaWindow::setDisplayWorkbookTabs( ::sal_Bool _bDisplayWorkbookTabs ) throw (u
xProps->setPropertyValue( sName, uno::makeAny( _bDisplayWorkbookTabs ));
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaWindow::getFreezePanes() throw (uno::RuntimeException)
{
- return m_xViewFreezable->hasFrozenPanes();
+ return m_xViewFreezable->hasFrozenPanes();
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::setFreezePanes( ::sal_Bool /*_bFreezePanes*/ ) throw (uno::RuntimeException)
{
if( m_xViewSplitable->getIsWindowSplit() )
@@ -608,21 +608,21 @@ ScVbaWindow::setFreezePanes( ::sal_Bool /*_bFreezePanes*/ ) throw (uno::RuntimeE
}
else
{
- // otherwise we freeze in the center of the visible sheet
+ // otherwise we freeze in the center of the visible sheet
table::CellRangeAddress aCellRangeAddress = m_xViewPane->getVisibleRange();
sal_Int32 nColumn = aCellRangeAddress.StartColumn + (( aCellRangeAddress.EndColumn - aCellRangeAddress.StartColumn )/2 );
sal_Int32 nRow = aCellRangeAddress.StartRow + (( aCellRangeAddress.EndRow - aCellRangeAddress.StartRow )/2 );
- m_xViewFreezable->freezeAtPosition( nColumn, nRow );
+ m_xViewFreezable->freezeAtPosition( nColumn, nRow );
}
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaWindow::getSplit() throw (uno::RuntimeException)
{
- return m_xViewSplitable->getIsWindowSplit();
+ return m_xViewSplitable->getIsWindowSplit();
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::setSplit( ::sal_Bool _bSplit ) throw (uno::RuntimeException)
{
if( !_bSplit )
@@ -639,13 +639,13 @@ ScVbaWindow::setSplit( ::sal_Bool _bSplit ) throw (uno::RuntimeException)
}
}
-sal_Int32 SAL_CALL
+sal_Int32 SAL_CALL
ScVbaWindow::getSplitColumn() throw (uno::RuntimeException)
{
- return m_xViewSplitable->getSplitColumn();
+ return m_xViewSplitable->getSplitColumn();
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::setSplitColumn( sal_Int32 _splitcolumn ) throw (uno::RuntimeException)
{
if( getSplitColumn() != _splitcolumn )
@@ -657,7 +657,7 @@ ScVbaWindow::setSplitColumn( sal_Int32 _splitcolumn ) throw (uno::RuntimeExcepti
}
}
-double SAL_CALL
+double SAL_CALL
ScVbaWindow::getSplitHorizontal() throw (uno::RuntimeException)
{
double fSplitHorizontal = m_xViewSplitable->getSplitHorizontal();
@@ -665,21 +665,21 @@ ScVbaWindow::getSplitHorizontal() throw (uno::RuntimeException)
return fHoriPoints;
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::setSplitHorizontal( double _splithorizontal ) throw (uno::RuntimeException)
{
double fHoriPixels = PointsToPixels( m_xDevice, _splithorizontal, sal_True );
- m_xViewSplitable->splitAtPosition( static_cast<sal_Int32>( fHoriPixels ), 0 );
+ m_xViewSplitable->splitAtPosition( static_cast<sal_Int32>( fHoriPixels ), 0 );
}
-sal_Int32 SAL_CALL
+sal_Int32 SAL_CALL
ScVbaWindow::getSplitRow() throw (uno::RuntimeException)
{
sal_Int32 nValue = m_xViewSplitable->getSplitRow();
- return nValue ? nValue - 1 : nValue;
+ return nValue ? nValue - 1 : nValue;
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::setSplitRow( sal_Int32 _splitrow ) throw (uno::RuntimeException)
{
if( getSplitRow() != _splitrow )
@@ -691,15 +691,15 @@ ScVbaWindow::setSplitRow( sal_Int32 _splitrow ) throw (uno::RuntimeException)
}
}
-double SAL_CALL
+double SAL_CALL
ScVbaWindow::getSplitVertical() throw (uno::RuntimeException)
{
double fSplitVertical = m_xViewSplitable->getSplitVertical();
- double fVertiPoints = PixelsToPoints( m_xDevice, fSplitVertical, sal_False );
+ double fVertiPoints = PixelsToPoints( m_xDevice, fSplitVertical, sal_False );
return fVertiPoints;
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::setSplitVertical(double _splitvertical ) throw (uno::RuntimeException)
{
double fVertiPixels = PointsToPixels( m_xDevice, _splitvertical, sal_False );
@@ -717,9 +717,9 @@ void ScVbaWindow::SplitAtDefinedPosition(sal_Bool _bUnFreezePane)
m_xViewSplitable->splitAtPosition(nHoriSplit, nVertSplit);
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaWindow::getZoom() throw (uno::RuntimeException)
-{
+{
uno::Reference< beans::XPropertySet > xProps( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_ZOOMTYPE ) );
sal_Int16 nZoomType = view::DocumentZoomType::PAGE_WIDTH;
@@ -738,7 +738,7 @@ ScVbaWindow::getZoom() throw (uno::RuntimeException)
return uno::Any();
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::setZoom( const uno::Any& _zoom ) throw (uno::RuntimeException)
{
sal_Int16 nZoom = 100;
@@ -753,7 +753,7 @@ ScVbaWindow::setZoom( const uno::Any& _zoom ) throw (uno::RuntimeException)
excel::implSetZoom( m_xModel, nZoom, vTabs );
}
-uno::Reference< excel::XWorksheet > SAL_CALL
+uno::Reference< excel::XWorksheet > SAL_CALL
ScVbaWindow::ActiveSheet( ) throw (script::BasicErrorException, uno::RuntimeException)
{
uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
@@ -763,9 +763,9 @@ ScVbaWindow::ActiveSheet( ) throw (script::BasicErrorException, uno::RuntimeExc
uno::Any SAL_CALL
ScVbaWindow::getView() throw (uno::RuntimeException)
{
- // not supported now
- sal_Int32 nWindowView = excel::XlWindowView::xlNormalView;
- return uno::makeAny( nWindowView );
+ // not supported now
+ sal_Int32 nWindowView = excel::XlWindowView::xlNormalView;
+ return uno::makeAny( nWindowView );
}
void SAL_CALL
@@ -807,7 +807,7 @@ ScVbaWindow::PointsToScreenPixelsX(sal_Int32 _points) throw (css::script::BasicE
return static_cast<sal_Int32>(fConvertFactor * nHundredthsofOneMillimeters );
}
-sal_Int32 SAL_CALL
+sal_Int32 SAL_CALL
ScVbaWindow::PointsToScreenPixelsY(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException)
{
sal_Int32 nHundredthsofOneMillimeters = Millimeter::getInHundredthsOfOneMillimeter( _points );
@@ -815,28 +815,28 @@ ScVbaWindow::PointsToScreenPixelsY(sal_Int32 _points) throw (css::script::BasicE
return static_cast<sal_Int32>(fConvertFactor * nHundredthsofOneMillimeters );
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
{
- // need test, print current active sheet
+ // need test, print current active sheet
PrintOutHelper( excel::getBestViewShell( m_xModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, sal_True );
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindow::PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
{
- // need test, print preview current active sheet
- PrintPreviewHelper( EnableChanges, excel::getBestViewShell( m_xModel ) );
+ // need test, print preview current active sheet
+ PrintPreviewHelper( EnableChanges, excel::getBestViewShell( m_xModel ) );
}
-rtl::OUString&
+rtl::OUString&
ScVbaWindow::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWindow") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaWindow::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbawindow.hxx b/sc/source/ui/vba/vbawindow.hxx
index d58d2a07cb4b..a0cf30dda27e 100644
--- a/sc/source/ui/vba/vbawindow.hxx
+++ b/sc/source/ui/vba/vbawindow.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
typedef cppu::ImplInheritanceHelper1< VbaWindowBase, ov::excel::XWindow > WindowImpl_BASE;
class ScVbaWindow : public WindowImpl_BASE
-{
-private:
+{
+private:
css::uno::Reference< css::sheet::XViewPane > m_xViewPane;
css::uno::Reference< css::sheet::XViewFreezable > m_xViewFreezable;
css::uno::Reference< css::sheet::XViewSplitable > m_xViewSplitable;
@@ -54,16 +54,16 @@ private:
void init();
protected:
void SplitAtDefinedPosition(sal_Bool _bUnFreezePane);
-public:
- void Scroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft, bool bLargeScroll = false ) throw (css::uno::RuntimeException);
+public:
+ void Scroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft, bool bLargeScroll = false ) throw (css::uno::RuntimeException);
public:
ScVbaWindow( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel );
ScVbaWindow( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext );
// XWindow
- virtual css::uno::Reference< ov::excel::XRange > SAL_CALL ActiveCell( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+ virtual css::uno::Reference< ov::excel::XRange > SAL_CALL ActiveCell( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual css::uno::Reference< ov::excel::XPane > SAL_CALL ActivePane() throw (css::script::BasicErrorException, css::uno::RuntimeException);
- virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL ActiveSheet( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+ virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL ActiveSheet( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual void SAL_CALL setCaption( const css::uno::Any& _caption ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getCaption() throw (css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL getDisplayGridlines() throw (css::uno::RuntimeException);
@@ -105,7 +105,7 @@ public:
// Methods
virtual void SAL_CALL SmallScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) throw (css::uno::RuntimeException);
virtual void SAL_CALL LargeScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) throw (css::uno::RuntimeException);
- virtual css::uno::Any SAL_CALL SelectedSheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL SelectedSheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
virtual void SAL_CALL ScrollWorkbookTabs( const css::uno::Any& Sheets, const css::uno::Any& Position ) throw (css::uno::RuntimeException);
virtual void SAL_CALL Activate( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& FileName, const css::uno::Any& RouteWorkBook ) throw (css::uno::RuntimeException);
diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx
index 3ddc5f5b3b45..91760ad4f946 100644
--- a/sc/source/ui/vba/vbawindows.cxx
+++ b/sc/source/ui/vba/vbawindows.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -195,11 +195,11 @@ public:
NameIndexHash::const_iterator it_end = namesToIndices.end();
for ( ; it != it_end; ++it, ++pString )
*pString = it->first;
- return names;
+ return names;
}
- virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
- {
+ virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
+ {
NameIndexHash::const_iterator it = namesToIndices.find( aName );
return (it != namesToIndices.end());
}
@@ -207,7 +207,7 @@ public:
};
-ScVbaWindows::ScVbaWindows( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ): ScVbaWindows_BASE( xParent, xContext, xIndexAccess )
+ScVbaWindows::ScVbaWindows( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ): ScVbaWindows_BASE( xParent, xContext, xIndexAccess )
{
}
@@ -226,28 +226,28 @@ ScVbaWindows::createCollectionObject( const css::uno::Any& aSource )
return ComponentToWindow( aSource, mxContext, Application() );
}
-uno::Type
+uno::Type
ScVbaWindows::getElementType() throw (uno::RuntimeException)
{
return excel::XWindows::static_type(0);
}
-void SAL_CALL
+void SAL_CALL
ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWorkbook*/, const uno::Any& /*SyncHorizontal*/, const uno::Any& /*SyncVertical*/ ) throw (uno::RuntimeException)
{
//#TODO #FIXME see what can be done for an implementation here
}
-rtl::OUString&
+rtl::OUString&
ScVbaWindows::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWindows") );
return sImplName;
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<rtl::OUString>
ScVbaWindows::getServiceNames()
{
static uno::Sequence< rtl::OUString > sNames;
diff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxx
index 3441b6ccbac4..0ee01e69801e 100644
--- a/sc/source/ui/vba/vbawindows.hxx
+++ b/sc/source/ui/vba/vbawindows.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include <ooo/vba/excel/XWindows.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-
+
#include "excelvbahelper.hxx"
#include <vbahelper/vbacollectionimpl.hxx>
@@ -52,8 +52,8 @@ public:
// XWindows
virtual void SAL_CALL Arrange( ::sal_Int32 ArrangeStyle, const css::uno::Any& ActiveWorkbook, const css::uno::Any& SyncHorizontal, const css::uno::Any& SyncVertical ) throw (::com::sun::star::uno::RuntimeException);
- // ScVbaCollectionBaseImpl
- virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+ // ScVbaCollectionBaseImpl
+ virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
// XHelperInterface
virtual rtl::OUString& getServiceImplName();
diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx
index 365c8b35a00c..60fe76580b17 100644
--- a/sc/source/ui/vba/vbaworkbook.cxx
+++ b/sc/source/ui/vba/vbaworkbook.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,6 +50,7 @@
#include "vbanames.hxx" // Amelia Wang
#include "nameuno.hxx"
#include "docoptio.hxx"
+#include "unonames.hxx"
// Much of the impl. for the equivalend UNO module is
// sc/source/ui/unoobj/docuno.cxx, viewuno.cxx
@@ -61,11 +62,11 @@ class ActiveSheet : public ScVbaWorksheet
{
protected:
virtual uno::Reference< frame::XModel > getModel()
- {
- return getCurrentExcelDoc( mxContext );
+ {
+ return getCurrentExcelDoc( mxContext );
}
virtual uno::Reference< sheet::XSpreadsheet > getSheet()
- {
+ {
uno::Reference< frame::XModel > xModel = getModel();
uno::Reference< sheet::XSpreadsheet > xSheet;
if ( xModel.is() )
@@ -73,13 +74,13 @@ protected:
uno::Reference< sheet::XSpreadsheetView > xSpreadsheet(
xModel->getCurrentController(), uno::UNO_QUERY );
if ( xSpreadsheet.is() )
- xSheet = xSpreadsheet->getActiveSheet();
+ xSheet = xSpreadsheet->getActiveSheet();
}
return xSheet;
}
public:
ActiveSheet( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext ) : ScVbaWorksheet( xParent, xContext ) {}
-
+
};
uno::Sequence< sal_Int32 > ScVbaWorkbook::ColorData;
@@ -94,13 +95,13 @@ void ScVbaWorkbook::initColorData( const uno::Sequence< sal_Int32 >& sColors )
}
-void SAL_CALL
+void SAL_CALL
ScVbaWorkbook::ResetColors( ) throw (::script::BasicErrorException, ::uno::RuntimeException)
{
uno::Reference< container::XIndexAccess > xIndexAccess( ScVbaPalette::getDefaultPalette(), uno::UNO_QUERY_THROW );
sal_Int32 nLen = xIndexAccess->getCount();
ColorData.realloc( nLen );
-
+
uno::Sequence< sal_Int32 > dDefaultColors( nLen );
sal_Int32* pDest = dDefaultColors.getArray();
for ( sal_Int32 index=0; index < nLen; ++pDest, ++index )
@@ -108,7 +109,7 @@ ScVbaWorkbook::ResetColors( ) throw (::script::BasicErrorException, ::uno::Runt
initColorData( dDefaultColors );
}
-::uno::Any SAL_CALL
+::uno::Any SAL_CALL
ScVbaWorkbook::Colors( const ::uno::Any& Index ) throw (::script::BasicErrorException, ::uno::RuntimeException)
{
uno::Any aRet;
@@ -116,14 +117,14 @@ ScVbaWorkbook::Colors( const ::uno::Any& Index ) throw (::script::BasicErrorExce
{
sal_Int32 nIndex = 0;
Index >>= nIndex;
- aRet = uno::makeAny( XLRGBToOORGB( ColorData[ --nIndex ] ) );
+ aRet = uno::makeAny( XLRGBToOORGB( ColorData[ --nIndex ] ) );
}
else
aRet = uno::makeAny( ColorData );
return aRet;
}
-::sal_Int32 SAL_CALL
+::sal_Int32 SAL_CALL
ScVbaWorkbook::FileFormat( ) throw (::script::BasicErrorException, ::uno::RuntimeException)
{
sal_Int32 aFileFormat = 0;
@@ -184,13 +185,13 @@ ScVbaWorkbook::FileFormat( ) throw (::script::BasicErrorException, ::uno::Runti
return aFileFormat;
}
-void
+void
ScVbaWorkbook::init()
{
if ( !ColorData.getLength() )
ResetColors();
}
-ScVbaWorkbook::ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext) :ScVbaWorkbook_BASE( xParent, xContext )
+ScVbaWorkbook::ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext) :ScVbaWorkbook_BASE( xParent, xContext )
{
//#FIXME this persists the color data per office instance and
// not per workbook instance, need to hook the data into XModel
@@ -201,14 +202,13 @@ ScVbaWorkbook::ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface
init();
}
-ScVbaWorkbook::ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::frame::XModel > xModel ) : ScVbaWorkbook_BASE( xParent, xContext, xModel )
-{
+ScVbaWorkbook::ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::frame::XModel > xModel ) : ScVbaWorkbook_BASE( xParent, xContext, xModel )
+{
init();
}
ScVbaWorkbook::ScVbaWorkbook( uno::Sequence< uno::Any> const & args,
uno::Reference< uno::XComponentContext> const & xContext ) : ScVbaWorkbook_BASE( args, xContext )
-
{
init();
}
@@ -216,31 +216,34 @@ ScVbaWorkbook::ScVbaWorkbook( uno::Sequence< uno::Any> const & args,
uno::Reference< excel::XWorksheet >
ScVbaWorkbook::getActiveSheet() throw (uno::RuntimeException)
{
- uno::Reference< frame::XModel > xModel( getCurrentExcelDoc( mxContext ) );
- uno::Reference< sheet::XSpreadsheet > xSheet;
+ uno::Reference< frame::XModel > xModel( getCurrentExcelDoc( mxContext ), uno::UNO_SET_THROW );
uno::Reference< sheet::XSpreadsheetView > xView( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
- if ( xView.is() )
- xSheet = xView->getActiveSheet();
- return new ScVbaWorksheet( this, mxContext, xSheet, xModel );
+ uno::Reference< beans::XPropertySet > xSheetProps( xView->getActiveSheet(), uno::UNO_QUERY_THROW );
+ // #162503# return the original document module wrapper object, instead of a new instance
+ ::rtl::OUString aCodeName;
+ xSheetProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_CODENAME ) ) ) >>= aCodeName;
+ ScDocShell* pShell = excel::getDocShell( xModel );
+ if( !pShell )
+ throw uno::RuntimeException();
+ return uno::Reference< excel::XWorksheet >( getUnoDocModule( aCodeName, pShell ), uno::UNO_QUERY_THROW );
}
+
uno::Any SAL_CALL
ScVbaWorkbook::Sheets( const uno::Any& aIndex ) throw (uno::RuntimeException)
{
return Worksheets( aIndex );
}
-
-
uno::Any SAL_CALL
ScVbaWorkbook::Worksheets( const uno::Any& aIndex ) throw (uno::RuntimeException)
{
- uno::Reference< frame::XModel > xModel( getModel() );
+ uno::Reference< frame::XModel > xModel( getModel() );
uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xModel, uno::UNO_QUERY_THROW );
uno::Reference<container::XIndexAccess > xSheets( xSpreadDoc->getSheets(), uno::UNO_QUERY_THROW );
uno::Reference< XCollection > xWorkSheets( new ScVbaWorksheets( this, mxContext, xSheets, xModel ) );
if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID )
{
- return uno::Any( xWorkSheets );
+ return uno::Any( xWorkSheets );
}
// pass on to collection
return uno::Any( xWorkSheets->Item( aIndex, uno::Any() ) );
@@ -296,12 +299,12 @@ ScVbaWorkbook::SaveCopyAs( const rtl::OUString& sFileName ) throw ( uno::Runtime
xStor->storeToURL( aURL, storeProps );
}
-css::uno::Any SAL_CALL
+css::uno::Any SAL_CALL
ScVbaWorkbook::Styles( const::uno::Any& Item ) throw (uno::RuntimeException)
{
// quick look and Styles object doesn't seem to have a valid parent
- // or a least the object browser just shows an object that has no
- // variables ( therefore... leave as NULL for now )
+ // or a least the object browser just shows an object that has no
+ // variables ( therefore... leave as NULL for now )
uno::Reference< XCollection > dStyles = new ScVbaStyles( uno::Reference< XHelperInterface >(), mxContext, getModel() );
if ( Item.hasValue() )
return dStyles->Item( Item, uno::Any() );
@@ -323,14 +326,14 @@ ScVbaWorkbook::Names( const css::uno::Any& aIndex ) throw (uno::RuntimeException
return uno::Any( xNames->Item( aIndex, uno::Any() ) );
}
-rtl::OUString&
+rtl::OUString&
ScVbaWorkbook::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWorkbook") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaWorkbook::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx
index 4aff58078403..36ce6ed468c6 100644
--- a/sc/source/ui/vba/vbaworkbook.hxx
+++ b/sc/source/ui/vba/vbaworkbook.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ class ScVbaWorkbook : public ScVbaWorkbook_BASE
void init();
protected:
- ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext);
+ ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext);
public:
- ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
+ ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
css::uno::Reference< css::frame::XModel > xModel );
- ScVbaWorkbook( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext );
+ ScVbaWorkbook( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext );
virtual ~ScVbaWorkbook() {}
// Attributes
diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx
index 5298f60e0943..5316c58c0c6f 100644
--- a/sc/source/ui/vba/vbaworkbooks.cxx
+++ b/sc/source/ui/vba/vbaworkbooks.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,18 +76,18 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >&
uno::Reference<script::XLibraryContainer> xLibContainer = pShell->GetBasicContainer();
uno::Reference<script::vba::XVBACompatibility> xVBACompat( xLibContainer, uno::UNO_QUERY_THROW );
xVBACompat->setVBACompatibilityMode( sal_True );
- String aPrjName( RTL_CONSTASCII_USTRINGPARAM( "VBAProject" ) );
+ String aPrjName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
pShell->GetBasicManager()->SetName( aPrjName );
if( xLibContainer.is() )
{
if( !xLibContainer->hasByName( aPrjName ) )
- xLibContainer->createLibrary( aPrjName );
+ xLibContainer->createLibrary( aPrjName );
uno::Any aLibAny = xLibContainer->getByName( aPrjName );
uno::Reference< container::XNameContainer > xLib;
aLibAny >>= xLib;
if( xLib.is() )
- {
+ {
uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY_THROW );
uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY_THROW);
// bootstrap vbaglobals
@@ -119,7 +119,7 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >&
for ( std::vector<rtl::OUString>::iterator it = sDocModuleNames.begin(); it != it_end; ++it )
{
script::ModuleInfo sModuleInfo;
-
+
sModuleInfo.ModuleObject.set( xVBACodeNamedObjectAccess->getByName( *it ), uno::UNO_QUERY );
sModuleInfo.ModuleType = script::ModuleType::DOCUMENT;
xVBAModuleInfo->insertModuleInfo( *it, sModuleInfo );
@@ -129,7 +129,7 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >&
xLib->insertByName( *it, uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Option VBASupport 1\n" ) ) ) );
}
}
- }
+ }
}
}
@@ -140,7 +140,7 @@ getWorkbook( uno::Reference< uno::XComponentContext >& xContext, const uno::Refe
uno::Reference< frame::XModel > xModel( xDoc, uno::UNO_QUERY );
if( !xModel.is() )
return uno::Any();
-
+
ScDocShell* pShell = excel::getDocShell( xModel );
if ( pShell )
{
@@ -163,8 +163,8 @@ class WorkBookEnumImpl : public EnumerationHelperImpl
public:
WorkBookEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_aApplication( aApplication ) {}
- virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
- {
+ virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ {
uno::Reference< sheet::XSpreadsheetDocument > xDoc( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
return getWorkbook( m_xContext, xDoc, m_xParent );
}
@@ -184,7 +184,7 @@ uno::Reference< container::XEnumeration >
ScVbaWorkbooks::createEnumeration() throw (uno::RuntimeException)
{
// #FIXME its possible the WorkBookEnumImpl here doens't reflect
- // the state of this object ( although it should ) would be
+ // the state of this object ( although it should ) would be
// safer to create an enumeration based on this objects state
// rather than one effectively based of the desktop component
uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
@@ -204,7 +204,7 @@ ScVbaWorkbooks::Add() throw (uno::RuntimeException)
{
uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( VbaDocumentsBase::Add() , uno::UNO_QUERY_THROW );
- // need to set up the document modules ( and vba mode ) here
+ // need to set up the document modules ( and vba mode ) here
setUpDocumentModules( xSpreadDoc );
if( xSpreadDoc.is() )
return getWorkbook( mxContext, xSpreadDoc, mxParent );
@@ -217,13 +217,13 @@ ScVbaWorkbooks::Close() throw (uno::RuntimeException)
VbaDocumentsBase::Close();
}
-bool
+bool
ScVbaWorkbooks::isTextFile( const rtl::OUString& sType )
{
// will return true if the file is
// a) a variant of a text file
// b) a csv file
- // c) unknown
+ // c) unknown
// returning true basically means treat this like a csv file
const static rtl::OUString txtType( RTL_CONSTASCII_USTRINGPARAM("writer_Text" ) );
const static rtl::OUString csvType( RTL_CONSTASCII_USTRINGPARAM("calc_Text_txt_csv_StarCalc" ) );
@@ -231,18 +231,18 @@ ScVbaWorkbooks::isTextFile( const rtl::OUString& sType )
return sType.equals( txtType ) || sType.equals( csvType ) || ( sType.getLength() == 0 ) || sType.equals( encodedTxtType );
}
-bool
+bool
ScVbaWorkbooks::isSpreadSheetFile( const rtl::OUString& sType )
{
// include calc_QPro etc. ? ( not for the moment anyway )
- if ( sType.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("calc_MS"))) == 0
- || sType.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("calc8"))) == 0
+ if ( sType.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("calc_MS"))) == 0
+ || sType.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("calc8"))) == 0
|| sType.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("calc_StarOffice"))) == 0 )
return true;
return false;
}
-rtl::OUString
+rtl::OUString
ScVbaWorkbooks::getFileFilterType( const rtl::OUString& rFileName )
{
uno::Reference< document::XTypeDetection > xTypeDetect( mxContext->getServiceManager()->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.document.TypeDetection"), mxContext), uno::UNO_QUERY_THROW );
@@ -269,10 +269,10 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi
uno::Sequence< beans::PropertyValue > sProps(0);
sal_Int32 nIndex = 0;
-
+
rtl::OUString sType = getFileFilterType( aURL );
- // A text file means it needs to be processed as a csv file
- if ( isTextFile( sType ) )
+ // A text file means it needs to be processed as a csv file
+ if ( isTextFile( sType ) )
{
// Values for format
// 1 Tabs
@@ -284,24 +284,24 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi
// no format means use the current delimiter
sProps.realloc( 3 );
sProps[ nIndex ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FilterOptions" ) );
- sal_Int16 delims[] = { 0 /*default not used*/, 9/*tab*/, 44/*comma*/, 32/*space*/, 59/*semicolon*/ };
+ sal_Int16 delims[] = { 0 /*default not used*/, 9/*tab*/, 44/*comma*/, 32/*space*/, 59/*semicolon*/ };
static rtl::OUString sRestOfFormat( RTL_CONSTASCII_USTRINGPARAM(",34,0,1" ) );
-
+
rtl::OUString sFormat;
sal_Int16 nFormat = 0; // default indicator
if ( Format.hasValue() )
{
- Format >>= nFormat; // val of nFormat overwritten if extracted
- // validate param
+ Format >>= nFormat; // val of nFormat overwritten if extracted
+ // validate param
if ( nFormat < 1 || nFormat > 6 )
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Illegal value for Format" ) ), uno::Reference< uno::XInterface >() );
}
sal_Int16 nDelim = getCurrentDelim();
- if ( nFormat > 0 && nFormat < CUSTOM_CHAR )
+ if ( nFormat > 0 && nFormat < CUSTOM_CHAR )
{
nDelim = delims[ nFormat ];
}
@@ -332,7 +332,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi
}
else if ( !isSpreadSheetFile( sType ) )
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Bad Format")), uno::Reference< uno::XInterface >() );
-
+
uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( VbaDocumentsBase::Open( rFileName, ReadOnly, sProps ), uno::UNO_QUERY_THROW );
uno::Any aRet = getWorkbook( mxContext, xSpreadDoc, mxParent );
uno::Reference< excel::XWorkbook > xWBook( aRet, uno::UNO_QUERY );
@@ -347,14 +347,14 @@ ScVbaWorkbooks::Open( const rtl::OUString& Filename, const uno::Any& ReadOnly, c
return VbaDocumentsBase::Open( Filename, ReadOnly, rProps );
}
-rtl::OUString&
+rtl::OUString&
ScVbaWorkbooks::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWorkbooks") );
return sImplName;
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<rtl::OUString>
ScVbaWorkbooks::getServiceNames()
{
static uno::Sequence< rtl::OUString > sNames;
diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx
index 5d6210244d80..1ec89217c3f6 100644
--- a/sc/source/ui/vba/vbaworkbooks.hxx
+++ b/sc/source/ui/vba/vbaworkbooks.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +42,9 @@ typedef cppu::ImplInheritanceHelper1< VbaDocumentsBase, ov::excel::XWorkbooks >
class ScVbaWorkbooks : public ScVbaWorkbooks_BASE
{
private:
- rtl::OUString getFileFilterType( const rtl::OUString& rString );
- bool isTextFile( const rtl::OUString& rString );
- bool isSpreadSheetFile( const rtl::OUString& rString );
+ rtl::OUString getFileFilterType( const rtl::OUString& rString );
+ bool isTextFile( const rtl::OUString& rString );
+ bool isSpreadSheetFile( const rtl::OUString& rString );
static sal_Int16& getCurrentDelim(){ static sal_Int16 nDelim = 44; return nDelim; }
public:
ScVbaWorkbooks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext );
@@ -55,7 +55,7 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
// ScVbaWorkbooks_BASE
- virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+ virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx
index 4eab79813474..71e4faebb910 100644
--- a/sc/source/ui/vba/vbaworksheet.cxx
+++ b/sc/source/ui/vba/vbaworksheet.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,6 +40,7 @@
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/sheet/XCalculatable.hpp>
#include <com/sun/star/sheet/XCellRangeAddressable.hpp>
+#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
#include <com/sun/star/sheet/XSheetCellRange.hpp>
#include <com/sun/star/sheet/XSheetCellCursor.hpp>
#include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp>
@@ -183,7 +184,7 @@ ScVbaWorksheet::ScVbaWorksheet( const uno::Reference< XHelperInterface >& xParen
}
ScVbaWorksheet::ScVbaWorksheet(const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext,
- const uno::Reference< sheet::XSpreadsheet >& xSheet,
+ const uno::Reference< sheet::XSpreadsheet >& xSheet,
const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) : WorksheetImpl_BASE( xParent, xContext ), mxSheet( xSheet ), mxModel(xModel)
{
}
@@ -198,7 +199,7 @@ ScVbaWorksheet::ScVbaWorksheet( uno::Sequence< uno::Any> const & args,
args[2] >>= sSheetName;
uno::Reference< sheet::XSpreadsheetDocument > xSpreadDoc( mxModel, uno::UNO_QUERY_THROW );
- uno::Reference< container::XNameAccess > xNameAccess( xSpreadDoc->getSheets(), uno::UNO_QUERY_THROW );
+ uno::Reference< container::XNameAccess > xNameAccess( xSpreadDoc->getSheets(), uno::UNO_QUERY_THROW );
mxSheet.set( xNameAccess->getByName( sSheetName ), uno::UNO_QUERY_THROW );
}
@@ -267,14 +268,14 @@ ScVbaWorksheet::getEnableSelection() throw (uno::RuntimeException)
return excel::XlEnableSelection::xlNoRestrictions;
if( bUnlockedCells )
return excel::XlEnableSelection::xlUnlockedCells;
- return excel::XlEnableSelection::xlNoSelection;
+ return excel::XlEnableSelection::xlNoSelection;
}
else
throw uno::RuntimeException(::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "Sheet Name does not exist. ") ),
uno::Reference< XInterface >() );
return excel::XlEnableSelection::xlNoSelection;
-}
+}
void
@@ -310,7 +311,7 @@ ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeEx
{
pProtect->setOption( ScTableProtection::SELECT_LOCKED_CELLS, bLockedCells );
pProtect->setOption( ScTableProtection::SELECT_UNLOCKED_CELLS, bUnlockedCells );
- }
+ }
}
else
throw uno::RuntimeException(::rtl::OUString(
@@ -319,6 +320,40 @@ ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeEx
}
+uno::Reference< beans::XPropertySet > ScVbaWorksheet::getFirstDBRangeProperties() throw (uno::RuntimeException)
+{
+ uno::Reference< beans::XPropertySet > xModelProps( mxModel, uno::UNO_QUERY_THROW );
+ uno::Reference< container::XIndexAccess > xDBRangesIA( xModelProps->getPropertyValue(
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DatabaseRanges" ) ) ), uno::UNO_QUERY_THROW );
+
+ for( sal_Int32 nIndex = 0, nCount = xDBRangesIA->getCount(); nIndex < nCount; ++nIndex )
+ {
+ uno::Reference< sheet::XCellRangeReferrer > xDBRange( xDBRangesIA->getByIndex( nIndex ), uno::UNO_QUERY_THROW );
+ // check if the database area is on this sheet
+ uno::Reference< sheet::XCellRangeAddressable > xRangeAddr( xDBRange->getReferredCells(), uno::UNO_QUERY_THROW );
+ if( getSheetID() == xRangeAddr->getRangeAddress().Sheet )
+ return uno::Reference< beans::XPropertySet >( xDBRange, uno::UNO_QUERY_THROW );
+ }
+ return uno::Reference< beans::XPropertySet >();
+}
+
+sal_Bool SAL_CALL ScVbaWorksheet::getAutoFilterMode() throw (uno::RuntimeException)
+{
+ uno::Reference< beans::XPropertySet > xDBRangeProps = getFirstDBRangeProperties();
+ sal_Bool bAutoFilterMode = sal_False;
+ return
+ xDBRangeProps.is() &&
+ (xDBRangeProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoFilter" ) ) ) >>= bAutoFilterMode) &&
+ bAutoFilterMode;
+}
+
+void SAL_CALL ScVbaWorksheet::setAutoFilterMode( sal_Bool bAutoFilterMode ) throw (uno::RuntimeException)
+{
+ uno::Reference< beans::XPropertySet > xDBRangeProps = getFirstDBRangeProperties();
+ if( xDBRangeProps.is() )
+ xDBRangeProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AutoFilter" ) ), uno::Any( bAutoFilterMode ) );
+}
+
uno::Reference< excel::XRange >
ScVbaWorksheet::getUsedRange() throw (uno::RuntimeException)
{
@@ -348,9 +383,9 @@ uno::Any
ScVbaWorksheet::HPageBreaks( const uno::Any& aIndex ) throw (uno::RuntimeException)
{
uno::Reference< sheet::XSheetPageBreak > xSheetPageBreak(getSheet(),uno::UNO_QUERY_THROW);
- uno::Reference< excel::XHPageBreaks > xHPageBreaks( new ScVbaHPageBreaks( this, mxContext, xSheetPageBreak));
+ uno::Reference< excel::XHPageBreaks > xHPageBreaks( new ScVbaHPageBreaks( this, mxContext, xSheetPageBreak));
if ( aIndex.hasValue() )
- return xHPageBreaks->Item( aIndex, uno::Any());
+ return xHPageBreaks->Item( aIndex, uno::Any());
return uno::makeAny( xHPageBreaks );
}
@@ -358,41 +393,47 @@ uno::Any
ScVbaWorksheet::VPageBreaks( const uno::Any& aIndex ) throw ( uno::RuntimeException )
{
uno::Reference< sheet::XSheetPageBreak > xSheetPageBreak( getSheet(), uno::UNO_QUERY_THROW );
- uno::Reference< excel::XVPageBreaks > xVPageBreaks( new ScVbaVPageBreaks( this, mxContext, xSheetPageBreak ) );
+ uno::Reference< excel::XVPageBreaks > xVPageBreaks( new ScVbaVPageBreaks( this, mxContext, xSheetPageBreak ) );
if( aIndex.hasValue() )
- return xVPageBreaks->Item( aIndex, uno::Any());
+ return xVPageBreaks->Item( aIndex, uno::Any());
return uno::makeAny( xVPageBreaks );
}
-sal_Int32
+sal_Int32
ScVbaWorksheet::getStandardWidth() throw (uno::RuntimeException)
{
return STANDARDWIDTH ;
}
-sal_Int32
+sal_Int32
ScVbaWorksheet::getStandardHeight() throw (uno::RuntimeException)
{
return STANDARDHEIGHT;
}
-sal_Bool
-ScVbaWorksheet::getProtectionMode() throw (uno::RuntimeException)
+sal_Bool
+ScVbaWorksheet::getProtectionMode() throw (uno::RuntimeException)
{
- return false;
+ return sal_False;
}
sal_Bool
-ScVbaWorksheet::getProtectContents()throw (uno::RuntimeException)
+ScVbaWorksheet::getProtectContents()throw (uno::RuntimeException)
{
uno::Reference<util::XProtectable > xProtectable(getSheet(), uno::UNO_QUERY_THROW);
return xProtectable->isProtected();
}
+sal_Bool
+ScVbaWorksheet::getProtectDrawingObjects() throw (uno::RuntimeException)
+{
+ return sal_False;
+}
+
sal_Bool
-ScVbaWorksheet::getProtectDrawingObjects() throw (uno::RuntimeException)
+ScVbaWorksheet::getProtectScenarios() throw (uno::RuntimeException)
{
- return false;
+ return sal_False;
}
void
@@ -400,7 +441,7 @@ ScVbaWorksheet::Activate() throw (uno::RuntimeException)
{
uno::Reference< sheet::XSpreadsheetView > xSpreadsheet(
getModel()->getCurrentController(), uno::UNO_QUERY_THROW );
- xSpreadsheet->setActiveSheet(getSheet());
+ xSpreadsheet->setActiveSheet(getSheet());
}
void
@@ -409,8 +450,8 @@ ScVbaWorksheet::Select() throw (uno::RuntimeException)
Activate();
}
-void
-ScVbaWorksheet::Move( const uno::Any& Before, const uno::Any& After ) throw (uno::RuntimeException)
+void
+ScVbaWorksheet::Move( const uno::Any& Before, const uno::Any& After ) throw (uno::RuntimeException)
{
uno::Reference<excel::XWorksheet> xSheet;
rtl::OUString aCurrSheetName = getName();
@@ -426,7 +467,7 @@ ScVbaWorksheet::Move( const uno::Any& Before, const uno::Any& After ) throw (uno
xRange->Select();
excel::implnCopy(mxModel);
uno::Reference<frame::XModel> xModel = openNewDoc(aCurrSheetName);
- if (xModel.is())
+ if (xModel.is())
{
excel::implnPaste(xModel);
Delete();
@@ -439,15 +480,15 @@ ScVbaWorksheet::Move( const uno::Any& Before, const uno::Any& After ) throw (uno
if ( ScVbaWorksheets::nameExists (xSpreadDoc, xSheet->getName(), nDest) )
{
sal_Bool bAfter = After.hasValue();
- if (bAfter)
+ if (bAfter)
nDest++;
uno::Reference<sheet::XSpreadsheets> xSheets = xSpreadDoc->getSheets();
xSheets->moveByName(aCurrSheetName,nDest);
}
}
-void
-ScVbaWorksheet::Copy( const uno::Any& Before, const uno::Any& After ) throw (uno::RuntimeException)
+void
+ScVbaWorksheet::Copy( const uno::Any& Before, const uno::Any& After ) throw (uno::RuntimeException)
{
uno::Reference<excel::XWorksheet> xSheet;
rtl::OUString aCurrSheetName =getName();
@@ -483,7 +524,7 @@ ScVbaWorksheet::Copy( const uno::Any& Before, const uno::Any& After ) throw (uno
}
-void
+void
ScVbaWorksheet::Paste( const uno::Any& Destination, const uno::Any& /*Link*/ ) throw (uno::RuntimeException)
{
// #TODO# #FIXME# Link is not used
@@ -493,7 +534,7 @@ ScVbaWorksheet::Paste( const uno::Any& Destination, const uno::Any& /*Link*/ ) t
excel::implnPaste( mxModel );
}
-void
+void
ScVbaWorksheet::Delete() throw (uno::RuntimeException)
{
uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW );
@@ -521,7 +562,7 @@ ScVbaWorksheet::getSheetAtOffset(SCTAB offset) throw (uno::RuntimeException)
SCTAB nIdx = 0;
if ( !ScVbaWorksheets::nameExists (xSpreadDoc, getName(), nIdx ) )
- return uno::Reference< excel::XWorksheet >();
+ return uno::Reference< excel::XWorksheet >();
nIdx = nIdx + offset;
uno::Reference< sheet::XSpreadsheet > xSheet(xIndex->getByIndex(nIdx), uno::UNO_QUERY_THROW);
// parent will be the parent of 'this' worksheet
@@ -552,7 +593,7 @@ ScVbaWorksheet::Protect( const uno::Any& Password, const uno::Any& /*DrawingObje
xProtectable->protect( aPasswd );
}
-void
+void
ScVbaWorksheet::Unprotect( const uno::Any& Password ) throw (uno::RuntimeException)
{
uno::Reference<util::XProtectable > xProtectable(getSheet(), uno::UNO_QUERY_THROW);
@@ -561,7 +602,7 @@ ScVbaWorksheet::Unprotect( const uno::Any& Password ) throw (uno::RuntimeExcepti
xProtectable->unprotect( aPasswd );
}
-void
+void
ScVbaWorksheet::Calculate() throw (uno::RuntimeException)
{
uno::Reference <sheet::XCalculatable> xReCalculate(getModel(), uno::UNO_QUERY_THROW);
@@ -571,7 +612,7 @@ ScVbaWorksheet::Calculate() throw (uno::RuntimeException)
uno::Reference< excel::XRange >
ScVbaWorksheet::Range( const ::uno::Any& Cell1, const ::uno::Any& Cell2 ) throw (uno::RuntimeException)
{
- uno::Reference< excel::XRange > xSheetRange( new ScVbaRange( this, mxContext
+ uno::Reference< excel::XRange > xSheetRange( new ScVbaRange( this, mxContext
, uno::Reference< table::XCellRange >( getSheet(), uno::UNO_QUERY_THROW ) ) );
return xSheetRange->Range( Cell1, Cell2 );
}
@@ -585,7 +626,7 @@ ScVbaWorksheet::CheckSpelling( const uno::Any& /*CustomDictionary*/,const uno::A
dispatchRequests(xModel,url);
}
-uno::Reference< excel::XRange >
+uno::Reference< excel::XRange >
ScVbaWorksheet::getSheetRange() throw (uno::RuntimeException)
{
uno::Reference< table::XCellRange > xRange( getSheet(),uno::UNO_QUERY_THROW );
@@ -594,7 +635,7 @@ ScVbaWorksheet::getSheetRange() throw (uno::RuntimeException)
// These are hacks - we prolly (somehow) need to inherit
// the vbarange functionality here ...
-uno::Reference< excel::XRange >
+uno::Reference< excel::XRange >
ScVbaWorksheet::Cells( const ::uno::Any &nRow, const ::uno::Any &nCol )
throw (uno::RuntimeException)
{
@@ -620,7 +661,7 @@ ScVbaWorksheet::ChartObjects( const uno::Any& Index ) throw (uno::RuntimeExcepti
{
uno::Reference< table::XTableChartsSupplier > xChartSupplier( getSheet(), uno::UNO_QUERY_THROW );
uno::Reference< table::XTableCharts > xTableCharts = xChartSupplier->getCharts();
-
+
uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxSheet, uno::UNO_QUERY_THROW );
mxCharts = new ScVbaChartObjects( this, mxContext, xTableCharts, xDrawPageSupplier );
}
@@ -631,10 +672,10 @@ ScVbaWorksheet::ChartObjects( const uno::Any& Index ) throw (uno::RuntimeExcepti
}
else
return uno::makeAny( mxCharts );
-
+
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaWorksheet::PivotTables( const uno::Any& Index ) throw (uno::RuntimeException)
{
uno::Reference< css::sheet::XSpreadsheet > xSheet = getSheet();
@@ -703,7 +744,7 @@ ScVbaWorksheet::Shapes( const uno::Any& aIndex ) throw (uno::RuntimeException)
uno::Reference< msforms::XShapes> xVbaShapes( new ScVbaShapes( this, mxContext, xIndexAccess, getModel() ) );
if ( aIndex.hasValue() )
- return xVbaShapes->Item( aIndex, uno::Any() );
+ return xVbaShapes->Item( aIndex, uno::Any() );
return uno::makeAny( xVbaShapes );
}
@@ -770,7 +811,7 @@ ScVbaWorksheet::Spinners( const uno::Any& /*rIndex*/ ) throw (uno::RuntimeExcept
void SAL_CALL
ScVbaWorksheet::ShowDataForm( ) throw (uno::RuntimeException)
{
-#ifdef VBA_OOBUILD_HACK
+#ifdef VBA_OOBUILD_HACK
uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
ScTabViewShell* pTabViewShell = excel::getBestViewShell( xModel );
@@ -786,55 +827,55 @@ ScVbaWorksheet::ShowDataForm( ) throw (uno::RuntimeException)
#endif
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaWorksheet::Evaluate( const ::rtl::OUString& Name ) throw (uno::RuntimeException)
{
// #TODO Evaluate allows other things to be evaluated, e.g. functions
// I think ( like SIN(3) etc. ) need to investigate that
// named Ranges also? e.g. [MyRange] if so need a list of named ranges
uno::Any aVoid;
- return uno::Any( Range( uno::Any( Name ), aVoid ) );
+ return uno::Any( Range( uno::Any( Name ), aVoid ) );
}
-uno::Reference< beans::XIntrospectionAccess > SAL_CALL
+uno::Reference< beans::XIntrospectionAccess > SAL_CALL
ScVbaWorksheet::getIntrospection( ) throw (uno::RuntimeException)
{
return uno::Reference< beans::XIntrospectionAccess >();
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaWorksheet::invoke( const ::rtl::OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
{
OSL_TRACE("** ScVbaWorksheet::invoke( %s ), will barf",
rtl::OUStringToOString( aFunctionName, RTL_TEXTENCODING_UTF8 ).getStr() );
-
+
throw uno::RuntimeException(); // unsupported operation
}
-void SAL_CALL
+void SAL_CALL
ScVbaWorksheet::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
{
setDefaultPropByIntrospection( uno::makeAny( getValue( aPropertyName ) ), aValue );
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaWorksheet::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException)
{
uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW );
-
+
uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW );
uno::Reference< msforms::XControl > xControl( xControlProvider->createControl( xControlShape, getModel() ) );
return uno::makeAny( xControl );
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaWorksheet::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::RuntimeException)
{
return sal_False;
}
-uno::Reference< container::XNameAccess >
+uno::Reference< container::XNameAccess >
ScVbaWorksheet::getFormControls()
{
uno::Reference< container::XNameAccess > xFormControls;
@@ -844,11 +885,11 @@ ScVbaWorksheet::getFormControls()
uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( xSpreadsheet, uno::UNO_QUERY_THROW );
uno::Reference< form::XFormsSupplier > xFormSupplier( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
uno::Reference< container::XIndexAccess > xIndexAccess( xFormSupplier->getForms(), uno::UNO_QUERY_THROW );
- // get the www-standard container ( maybe we should access the
+ // get the www-standard container ( maybe we should access the
// 'www-standard' by name rather than index, this seems an
// implementation detail
xFormControls.set( xIndexAccess->getByIndex(0), uno::UNO_QUERY_THROW );
-
+
}
catch( uno::Exception& )
{
@@ -856,7 +897,7 @@ ScVbaWorksheet::getFormControls()
return xFormControls;
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaWorksheet::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
{
uno::Reference< container::XNameAccess > xFormControls( getFormControls() );
@@ -869,12 +910,12 @@ uno::Any
ScVbaWorksheet::getControlShape( const ::rtl::OUString& sName )
{
// ideally we would get an XControl object but it appears an XControl
- // implementation only exists for a Control implementation optained from the
+ // implementation only exists for a Control implementation optained from the
// view ( e.g. in basic you would get this from
// thiscomponent.currentcontroller.getControl( controlModel ) )
// and the thing to realise is that it is only possible to get an XControl
- // for a currently displayed control :-( often we would want to modify
- // a control not on the active sheet. But.. you can always access the
+ // for a currently displayed control :-( often we would want to modify
+ // a control not on the active sheet. But.. you can always access the
// XControlShape from the DrawPage whether that is the active drawpage or not
uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( getSheet(), uno::UNO_QUERY_THROW );
@@ -899,26 +940,26 @@ ScVbaWorksheet::getControlShape( const ::rtl::OUString& sName )
}
-rtl::OUString&
+rtl::OUString&
ScVbaWorksheet::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWorksheet") );
return sImplName;
}
-void SAL_CALL
+void SAL_CALL
ScVbaWorksheet::setEnableCalculation( ::sal_Bool bEnableCalculation ) throw ( script::BasicErrorException, uno::RuntimeException)
{
uno::Reference <sheet::XCalculatable> xCalculatable(getModel(), uno::UNO_QUERY_THROW);
- xCalculatable->enableAutomaticCalculation( bEnableCalculation);
+ xCalculatable->enableAutomaticCalculation( bEnableCalculation);
}
-::sal_Bool SAL_CALL
+::sal_Bool SAL_CALL
ScVbaWorksheet::getEnableCalculation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
{
uno::Reference <sheet::XCalculatable> xCalculatable(getModel(), uno::UNO_QUERY_THROW);
return xCalculatable->isAutomaticCalculationEnabled();
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaWorksheet::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
@@ -944,7 +985,7 @@ ScVbaWorksheet::getSheetID() throw (uno::RuntimeException)
return xAddressable->getRangeAddress().Sheet;
}
-void SAL_CALL
+void SAL_CALL
ScVbaWorksheet::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName, const uno::Any& IgnorePrintAreas ) throw (uno::RuntimeException)
{
sal_Int32 nTo = 0;
@@ -963,7 +1004,7 @@ ScVbaWorksheet::PrintOut( const uno::Any& From, const uno::Any& To, const uno::A
if ( !( nFrom || nTo ) )
bSelection = sal_True;
- uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
+ uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
PrintOutHelper( excel::getBestViewShell( xModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, bSelection );
}
diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx
index 196a195258d7..eaa9fdf0f00c 100644
--- a/sc/source/ui/vba/vbaworksheet.hxx
+++ b/sc/source/ui/vba/vbaworksheet.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 @@ class ScVbaWorksheet : public WorksheetImpl_BASE
css::uno::Reference< css::container::XNameAccess > getFormControls();
css::uno::Any getControlShape( const rtl::OUString& sName );
+
+ css::uno::Reference< css::beans::XPropertySet > getFirstDBRangeProperties() throw (css::uno::RuntimeException);
+
protected:
ScVbaWorksheet( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext );
public:
ScVbaWorksheet( const css::uno::Reference< ov::XHelperInterface >& xParent,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
- const css::uno::Reference< css::sheet::XSpreadsheet >& xSheet,
+ const css::uno::Reference< css::sheet::XSpreadsheet >& xSheet,
const css::uno::Reference< css::frame::XModel >& xModel )throw (css::uno::RuntimeException) ;
ScVbaWorksheet( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException );
@@ -95,6 +98,7 @@ public:
virtual ::sal_Bool SAL_CALL getProtectionMode() throw (css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL getProtectContents() throw (css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL getProtectDrawingObjects() throw (css::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL getProtectScenarios() throw (css::uno::RuntimeException);
virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getUsedRange() throw (css::uno::RuntimeException) ;
virtual css::uno::Any SAL_CALL ChartObjects( const css::uno::Any& Index ) throw (css::uno::RuntimeException);
virtual css::uno::Reference< ov::excel::XOutline > SAL_CALL Outline( ) throw (css::uno::RuntimeException);
@@ -106,6 +110,8 @@ public:
virtual sal_Int16 SAL_CALL getIndex() throw (css::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getEnableSelection() throw (css::uno::RuntimeException);
virtual void SAL_CALL setEnableSelection( sal_Int32 nSelection ) throw (css::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL getAutoFilterMode() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setAutoFilterMode( sal_Bool bAutoFilterMode ) throw (css::uno::RuntimeException);
// Methods
virtual void SAL_CALL Activate() throw (css::uno::RuntimeException);
@@ -125,7 +131,7 @@ public:
virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
- virtual css::uno::Any SAL_CALL Evaluate( const ::rtl::OUString& Name ) throw (css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL Evaluate( const ::rtl::OUString& Name ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL PivotTables( const css::uno::Any& Index ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Comments( const css::uno::Any& Index ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
@@ -145,7 +151,7 @@ public:
virtual css::uno::Any SAL_CALL Spinners( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException);
virtual void SAL_CALL setEnableCalculation( ::sal_Bool EnableCalculation ) throw ( css::script::BasicErrorException, css::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL getEnableCalculation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL getEnableCalculation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual void SAL_CALL ShowDataForm( ) throw (css::uno::RuntimeException);
// XInvocation
virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException);
@@ -161,7 +167,7 @@ public:
virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, const css::uno::Any& IgnorePrintAreas ) throw (css::uno::RuntimeException);
// XHelperInterface
virtual rtl::OUString& getServiceImplName();
- virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+ virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif /* SC_VBA_WORKSHEET_HXX */
diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx
index 5344e6b3a9be..8e764d10edf6 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "vbaglobals.hxx"
#include "vbaworksheet.hxx"
#include "vbaworkbook.hxx"
-#include <unonames.hxx>
+#include "unonames.hxx"
using namespace ::ooo::vba;
using namespace ::com::sun::star;
@@ -60,7 +60,7 @@ using namespace ::com::sun::star;
typedef ::cppu::WeakImplHelper1< container::XEnumeration > SheetEnumeration_BASE;
typedef ::cppu::WeakImplHelper3< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > SheetCollectionHelper_BASE;
-// a map ( or hashmap ) wont do as we need also to preserve the order
+// a map ( or hashmap ) wont do as we need also to preserve the order
// (as added ) of the items
typedef std::vector< uno::Reference< sheet::XSpreadsheet > > SheetMap;
@@ -68,7 +68,7 @@ typedef std::vector< uno::Reference< sheet::XSpreadsheet > > SheetMap;
// #FIXME #TODO the implementation of the Sheets collections sucks,
// e.g. there is no support for tracking sheets added/removed from the collection
-uno::Reference< uno::XInterface >
+uno::Reference< uno::XInterface >
lcl_getModulAsUnoObject( const uno::Reference< sheet::XSpreadsheet >& xSheet, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException )
{
uno::Reference< uno::XInterface > xRet;
@@ -79,7 +79,7 @@ lcl_getModulAsUnoObject( const uno::Reference< sheet::XSpreadsheet >& xSheet, co
xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_CODENAME ) ) ) >>= sName;
ScDocShell* pShell = excel::getDocShell( xModel );
-
+
if ( pShell )
xRet = getUnoDocModule( sName, pShell );
return xRet;
@@ -113,7 +113,7 @@ public:
// XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return sheet::XSpreadsheet::static_type(0); }
virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return ( mSheetMap.size() > 0 ); }
- // XNameAcess
+ // XNameAcess
virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
if ( !hasByName(aName) )
@@ -129,7 +129,7 @@ public:
for ( ; it != it_end; ++it, ++pString )
{
- uno::Reference< container::XNamed > xName( *it, uno::UNO_QUERY_THROW );
+ uno::Reference< container::XNamed > xName( *it, uno::UNO_QUERY_THROW );
*pString = xName->getName();
}
return sNames;
@@ -140,7 +140,7 @@ public:
SheetMap::iterator it_end = mSheetMap.end();
for ( ; cachePos != it_end; ++cachePos )
{
- uno::Reference< container::XNamed > xName( *cachePos, uno::UNO_QUERY_THROW );
+ uno::Reference< container::XNamed > xName( *cachePos, uno::UNO_QUERY_THROW );
if ( aName.equals( xName->getName() ) )
break;
}
@@ -148,12 +148,12 @@ public:
}
// XElementAccess
- virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) { return mSheetMap.size(); }
+ virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) { return mSheetMap.size(); }
virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
{
if ( Index < 0 || Index >= getCount() )
throw lang::IndexOutOfBoundsException();
-
+
return uno::makeAny( mSheetMap[ Index ] );
}
@@ -170,35 +170,35 @@ class SheetsEnumeration : public EnumerationHelperImpl
public:
SheetsEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ) {}
- virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
- {
+ virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
+ {
uno::Reference< sheet::XSpreadsheet > xSheet( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
uno::Reference< uno::XInterface > xIf = lcl_getModulAsUnoObject( xSheet, m_xModel );
uno::Any aRet;
if ( !xIf.is() )
{
- // if the Sheet is in a document created by the api unfortunately ( at the
+ // if the Sheet is in a document created by the api unfortunately ( at the
// moment, it actually wont have the special Document modules
uno::Reference< excel::XWorksheet > xNewSheet( new ScVbaWorksheet( m_xParent, m_xContext, xSheet, m_xModel ) );
- aRet <<= xNewSheet;
+ aRet <<= xNewSheet;
}
else
- aRet <<= xIf;
+ aRet <<= xIf;
return aRet;
}
};
-ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xSheets, const uno::Reference< frame::XModel >& xModel ): ScVbaWorksheets_BASE( xParent, xContext, xSheets ), mxModel( xModel ), m_xSheets( uno::Reference< sheet::XSpreadsheets >( xSheets, uno::UNO_QUERY ) )
+ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xSheets, const uno::Reference< frame::XModel >& xModel ): ScVbaWorksheets_BASE( xParent, xContext, xSheets ), mxModel( xModel ), m_xSheets( uno::Reference< sheet::XSpreadsheets >( xSheets, uno::UNO_QUERY ) )
{
}
-ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XEnumerationAccess >& xEnumAccess, const uno::Reference< frame::XModel >& xModel ): ScVbaWorksheets_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xEnumAccess, uno::UNO_QUERY ) ), mxModel(xModel)
+ScVbaWorksheets::ScVbaWorksheets( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XEnumerationAccess >& xEnumAccess, const uno::Reference< frame::XModel >& xModel ): ScVbaWorksheets_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xEnumAccess, uno::UNO_QUERY ) ), mxModel(xModel)
{
}
// XEnumerationAccess
-uno::Type
+uno::Type
ScVbaWorksheets::getElementType() throw (uno::RuntimeException)
{
return excel::XWorksheet::static_type(0);
@@ -210,7 +210,7 @@ ScVbaWorksheets::createEnumeration() throw (uno::RuntimeException)
if ( !m_xSheets.is() )
{
uno::Reference< container::XEnumerationAccess > xAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
- return xAccess->createEnumeration();
+ return xAccess->createEnumeration();
}
uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xSheets, uno::UNO_QUERY_THROW );
return new SheetsEnumeration( this, mxContext, xEnumAccess->createEnumeration(), mxModel );
@@ -224,7 +224,7 @@ ScVbaWorksheets::createCollectionObject( const uno::Any& aSource )
uno::Any aRet;
if ( !xIf.is() )
{
- // if the Sheet is in a document created by the api unfortunately ( at the
+ // if the Sheet is in a document created by the api unfortunately ( at the
// moment, it actually wont have the special Document modules
uno::Reference< excel::XWorksheet > xNewSheet( new ScVbaWorksheet( getParent(), mxContext, xSheet, mxModel ) );
aRet <<= xNewSheet;
@@ -241,7 +241,7 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After,
{
if ( isSelectedSheets() )
return uno::Any(); // or should we throw?
-
+
rtl::OUString aStringSheet;
sal_Bool bBefore(sal_True);
SCTAB nSheetIndex = 0;
@@ -290,7 +290,7 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After,
nSheetIndex++;
SCTAB nSheetName = nCount + 1L;
- String aStringBase( RTL_CONSTASCII_USTRINGPARAM("Sheet") );
+ String aStringBase( RTL_CONSTASCII_USTRINGPARAM("Sheet") );
uno::Any result;
for (SCTAB i=0; i < nNewSheets; i++, nSheetName++)
{
@@ -307,7 +307,7 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After,
}
uno::Reference< excel::XWorksheet > xNewSheet( result, uno::UNO_QUERY );
if ( xNewSheet.is() )
- xNewSheet->Activate();
+ xNewSheet->Activate();
return result;
}
@@ -332,7 +332,7 @@ ScVbaWorksheets::isSelectedSheets()
return !m_xSheets.is();
}
-void SAL_CALL
+void SAL_CALL
ScVbaWorksheets::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName ) throw (uno::RuntimeException)
{
sal_Int32 nTo = 0;
@@ -353,7 +353,7 @@ ScVbaWorksheets::PrintOut( const uno::Any& From, const uno::Any& To, const uno::
PrintOutHelper( excel::getBestViewShell( mxModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, bSelection );
}
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaWorksheets::getVisible() throw (uno::RuntimeException)
{
sal_Bool bVisible = sal_True;
@@ -370,7 +370,7 @@ ScVbaWorksheets::getVisible() throw (uno::RuntimeException)
return uno::makeAny( bVisible );
}
-void SAL_CALL
+void SAL_CALL
ScVbaWorksheets::setVisible( const uno::Any& _visible ) throw (uno::RuntimeException)
{
sal_Bool bState = sal_False;
@@ -384,24 +384,24 @@ ScVbaWorksheets::setVisible( const uno::Any& _visible ) throw (uno::RuntimeExcep
}
}
else
- throw uno::RuntimeException( rtl::OUString(
+ throw uno::RuntimeException( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "Visible property doesn't support non boolean #FIXME" ) ), uno::Reference< uno::XInterface >() );
}
-void SAL_CALL
+void SAL_CALL
ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException)
{
ScTabViewShell* pViewShell = excel::getBestViewShell( mxModel );
if ( !pViewShell )
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain view shell" ) ), uno::Reference< uno::XInterface >() );
-
+
ScMarkData& rMarkData = pViewShell->GetViewData()->GetMarkData();
sal_Bool bReplace = sal_True;
Replace >>= bReplace;
- // Replace is defaulted to True, meanining this current collection
+ // Replace is defaulted to True, meanining this current collection
// becomes the Selection, if it were false then the current selection would
// be extended
- bool bSelectSingle = bReplace;
+ bool bSelectSingle = bReplace;
sal_Int32 nElems = getCount();
for ( sal_Int32 nItem = 1; nItem <= nElems; ++nItem )
{
@@ -416,15 +416,15 @@ ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException)
}
else
rMarkData.SelectTable( static_cast< SCTAB >( pSheet->getSheetID() ), TRUE );
-
+
}
}
-
+
}
//ScVbaCollectionBaseImpl
-uno::Any SAL_CALL
+uno::Any SAL_CALL
ScVbaWorksheets::Item( const uno::Any& Index, const uno::Any& Index2 ) throw (uno::RuntimeException)
{
if ( Index.getValueTypeClass() == uno::TypeClass_SEQUENCE )
@@ -446,28 +446,28 @@ ScVbaWorksheets::Item( const uno::Any& Index, const uno::Any& Index2 ) throw (u
uno::Reference< container::XNamed > xName( xSheet, uno::UNO_QUERY_THROW );
mSheets.push_back( xSheet );
}
- }
+ }
uno::Reference< container::XIndexAccess > xIndexAccess = new SheetCollectionHelper( mSheets );
uno::Reference< XCollection > xSelectedSheets( new ScVbaWorksheets( this->getParent(), mxContext, xIndexAccess, mxModel ) );
return uno::makeAny( xSelectedSheets );
}
- return ScVbaWorksheets_BASE::Item( Index, Index2 );
+ return ScVbaWorksheets_BASE::Item( Index, Index2 );
}
-uno::Any
+uno::Any
ScVbaWorksheets::getItemByStringIndex( const rtl::OUString& sIndex ) throw (uno::RuntimeException)
{
return ScVbaWorksheets_BASE::getItemByStringIndex( sIndex );
}
-rtl::OUString&
+rtl::OUString&
ScVbaWorksheets::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWorksheets") );
return sImplName;
}
-css::uno::Sequence<rtl::OUString>
+css::uno::Sequence<rtl::OUString>
ScVbaWorksheets::getServiceNames()
{
static uno::Sequence< rtl::OUString > sNames;
diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx
index 2ced68bc9e27..1c4d3c34590a 100644
--- a/sc/source/ui/vba/vbaworksheets.hxx
+++ b/sc/source/ui/vba/vbaworksheets.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-
+
#include <vbahelper/vbacollectionimpl.hxx>
#include "address.hxx"
@@ -69,7 +69,7 @@ public:
virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before, const css::uno::Any& After, const css::uno::Any& Count, const css::uno::Any& Type ) throw (css::uno::RuntimeException);
virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException);
virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::uno::RuntimeException);
- virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
+ virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
virtual void SAL_CALL Select( const css::uno::Any& Replace ) throw (css::uno::RuntimeException);
// ScVbaWorksheets_BASE
virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw
diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx
index 60daa7303f2e..008b969508ea 100644
--- a/sc/source/ui/vba/vbawsfunction.cxx
+++ b/sc/source/ui/vba/vbawsfunction.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -174,7 +174,7 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence<
// MATCH function should alwayse return a double value, but currently if the first argument is XCellRange, MATCH function returns an array instead of a double value. Don't know why?
// To fix this issue in safe, current solution is to convert this array to a double value just for MATCH function.
String aUpper( FunctionName );
- ScCompiler aCompiler( NULL, ScAddress() );
+ ScCompiler aCompiler( NULL, ScAddress() );
OpCode eOp = aCompiler.GetEnglishOpCode( aUpper.ToUpperAscii() );
if( eOp == ocMatch )
{
@@ -208,12 +208,12 @@ sal_Bool SAL_CALL
ScVbaWSFunction::hasMethod(const rtl::OUString& Name) throw(uno::RuntimeException)
{
sal_Bool bIsFound = sal_False;
- try
+ try
{
// the function name contained in the com.sun.star.sheet.FunctionDescription service is alwayse localized.
// but the function name used in WorksheetFunction is a programmatic name (seems English).
// So m_xNameAccess->hasByName( Name ) may fail to find name when a function name has a localized name.
- ScCompiler aCompiler( NULL, ScAddress() );
+ ScCompiler aCompiler( NULL, ScAddress() );
if( aCompiler.IsEnglishSymbol( Name ) )
bIsFound = sal_True;
}
@@ -230,23 +230,23 @@ ScVbaWSFunction::hasProperty(const rtl::OUString& /*Name*/) throw(uno::RuntimeE
return sal_False;
}
-::rtl::OUString SAL_CALL
+::rtl::OUString SAL_CALL
ScVbaWSFunction::getExactName( const ::rtl::OUString& aApproximateName ) throw (css::uno::RuntimeException)
{
rtl::OUString sName = aApproximateName.toAsciiUpperCase();
if ( !hasMethod( sName ) )
return rtl::OUString();
- return sName;
+ return sName;
}
-rtl::OUString&
+rtl::OUString&
ScVbaWSFunction::getServiceImplName()
{
static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaWSFunction") );
return sImplName;
}
-uno::Sequence< rtl::OUString >
+uno::Sequence< rtl::OUString >
ScVbaWSFunction::getServiceNames()
{
static uno::Sequence< rtl::OUString > aServiceNames;
diff --git a/sc/source/ui/vba/vbawsfunction.hxx b/sc/source/ui/vba/vbawsfunction.hxx
index ffd33849afe5..52664c1654fd 100644
--- a/sc/source/ui/vba/vbawsfunction.hxx
+++ b/sc/source/ui/vba/vbawsfunction.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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:
virtual css::uno::Any SAL_CALL getValue(const rtl::OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException);
virtual sal_Bool SAL_CALL hasMethod(const rtl::OUString& Name) throw(css::uno::RuntimeException);
virtual sal_Bool SAL_CALL hasProperty(const rtl::OUString& Name) throw(css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getExactName( const ::rtl::OUString& aApproximateName ) throw (css::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getExactName( const ::rtl::OUString& aApproximateName ) throw (css::uno::RuntimeException);
// XHelperInterface
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index 2c80c154759d..ab2159b50b47 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ void ScAuditingShell::Execute( SfxRequest& rReq )
rBindings.Invalidate( SID_FILL_ADD_SUCC );
rBindings.Invalidate( SID_FILL_DEL_SUCC );
break;
- case SID_CANCEL: // Escape
+ case SID_CANCEL: // Escape
case SID_FILL_NONE:
pViewData->GetViewShell()->SetAuditShell( FALSE );
break;
@@ -149,7 +149,7 @@ void ScAuditingShell::Execute( SfxRequest& rReq )
void ScAuditingShell::GetState( SfxItemSet& rSet )
{
- rSet.Put( SfxBoolItem( nFunction, TRUE ) ); // aktive Funktion markieren
+ rSet.Put( SfxBoolItem( nFunction, TRUE ) ); // aktive Funktion markieren
}
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index c880a29f8067..92082a8b4950 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
//------------------------------------------------------------------
#define ScCellShell
-#define CellMovement
+#define CellMovement
#include "scslots.hxx"
#define SearchSettings
@@ -116,7 +116,7 @@ ScCellShell::~ScCellShell()
void ScCellShell::GetBlockState( SfxItemSet& rSet )
{
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
ScRange aMarkRange;
ScMarkType eMarkType = GetViewData()->GetSimpleArea( aMarkRange );
BOOL bSimpleArea = (eMarkType == SC_MARK_SIMPLE);
@@ -137,59 +137,59 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
while ( nWhich )
{
BOOL bDisable = FALSE;
- BOOL bNeedEdit = TRUE; // muss Selektion editierbar sein?
+ BOOL bNeedEdit = TRUE; // muss Selektion editierbar sein?
switch ( nWhich )
{
- case FID_FILL_TO_BOTTOM: // Fuellen oben/unten
- case FID_FILL_TO_TOP: // mind. 2 Zeilen markiert?
+ case FID_FILL_TO_BOTTOM: // Fuellen oben/unten
+ case FID_FILL_TO_TOP: // mind. 2 Zeilen markiert?
bDisable = (!bSimpleArea) || (nRow1 == nRow2);
if ( !bDisable && bEditable )
- { // Matrix nicht zerreissen
+ { // Matrix nicht zerreissen
if ( nWhich == FID_FILL_TO_BOTTOM )
bDisable = pDoc->HasSelectedBlockMatrixFragment(
- nCol1, nRow1, nCol2, nRow1, rMark ); // erste Zeile
+ nCol1, nRow1, nCol2, nRow1, rMark ); // erste Zeile
else
bDisable = pDoc->HasSelectedBlockMatrixFragment(
- nCol1, nRow2, nCol2, nRow2, rMark ); // letzte Zeile
+ nCol1, nRow2, nCol2, nRow2, rMark ); // letzte Zeile
}
break;
- case FID_FILL_TO_RIGHT: // Fuellen links/rechts
- case FID_FILL_TO_LEFT: // mind. 2 Spalten markiert?
+ case FID_FILL_TO_RIGHT: // Fuellen links/rechts
+ case FID_FILL_TO_LEFT: // mind. 2 Spalten markiert?
bDisable = (!bSimpleArea) || (nCol1 == nCol2);
if ( !bDisable && bEditable )
- { // Matrix nicht zerreissen
+ { // Matrix nicht zerreissen
if ( nWhich == FID_FILL_TO_RIGHT )
bDisable = pDoc->HasSelectedBlockMatrixFragment(
- nCol1, nRow1, nCol1, nRow2, rMark ); // erste Spalte
+ nCol1, nRow1, nCol1, nRow2, rMark ); // erste Spalte
else
bDisable = pDoc->HasSelectedBlockMatrixFragment(
- nCol2, nRow1, nCol2, nRow2, rMark ); // letzte Spalte
+ nCol2, nRow1, nCol2, nRow2, rMark ); // letzte Spalte
}
break;
- case FID_FILL_SERIES: // Block fuellen
- case SID_OPENDLG_TABOP: // Mehrfachoperationen, mind. 2 Zellen markiert?
+ case FID_FILL_SERIES: // Block fuellen
+ case SID_OPENDLG_TABOP: // Mehrfachoperationen, mind. 2 Zellen markiert?
if (pDoc->GetChangeTrack()!=NULL &&nWhich ==SID_OPENDLG_TABOP)
bDisable = TRUE;
else
bDisable = (!bSimpleArea) || (nCol1 == nCol2 && nRow1 == nRow2);
if ( !bDisable && bEditable && nWhich == FID_FILL_SERIES )
- { // Matrix nicht zerreissen
+ { // Matrix nicht zerreissen
bDisable = pDoc->HasSelectedBlockMatrixFragment(
- nCol1, nRow1, nCol2, nRow1, rMark ) // erste Zeile
- || pDoc->HasSelectedBlockMatrixFragment(
- nCol1, nRow2, nCol2, nRow2, rMark ) // letzte Zeile
- || pDoc->HasSelectedBlockMatrixFragment(
- nCol1, nRow1, nCol1, nRow2, rMark ) // erste Spalte
- || pDoc->HasSelectedBlockMatrixFragment(
- nCol2, nRow1, nCol2, nRow2, rMark ); // letzte Spalte
+ nCol1, nRow1, nCol2, nRow1, rMark ) // erste Zeile
+ || pDoc->HasSelectedBlockMatrixFragment(
+ nCol1, nRow2, nCol2, nRow2, rMark ) // letzte Zeile
+ || pDoc->HasSelectedBlockMatrixFragment(
+ nCol1, nRow1, nCol1, nRow2, rMark ) // erste Spalte
+ || pDoc->HasSelectedBlockMatrixFragment(
+ nCol2, nRow1, nCol2, nRow2, rMark ); // letzte Spalte
}
break;
- case SID_CUT: // Ausschneiden,
- case FID_INS_CELL: // Zellen einfuegen, nur einf. Selektion
+ case SID_CUT: // Ausschneiden,
+ case FID_INS_CELL: // Zellen einfuegen, nur einf. Selektion
bDisable = (!bSimpleArea);
break;
@@ -203,16 +203,16 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
bDisable = (!bSimpleArea) || GetViewData()->SimpleRowMarked();
break;
- case SID_COPY: // Kopieren
+ case SID_COPY: // Kopieren
// nur wegen Matrix nicht editierbar? Matrix nicht zerreissen
//! schlaegt nicht zu, wenn geschuetzt UND Matrix, aber damit
//! muss man leben.. wird in Copy-Routine abgefangen, sonst
//! muesste hier nochmal Aufwand getrieben werden
if ( !(!bEditable && bOnlyNotBecauseOfMatrix) )
- bNeedEdit = FALSE; // erlaubt, wenn geschuetzt/ReadOnly
+ bNeedEdit = FALSE; // erlaubt, wenn geschuetzt/ReadOnly
break;
- case SID_AUTOFORMAT: // Autoformat, mind. 3x3 selektiert
+ case SID_AUTOFORMAT: // Autoformat, mind. 3x3 selektiert
bDisable = (!bSimpleArea)
|| ((nCol2 - nCol1) < 2) || ((nRow2 - nRow1) < 2);
break;
@@ -269,9 +269,9 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
}
}
-// Funktionen, die je nach Cursorposition disabled sind
-// Default:
-// SID_INSERT_POSTIT, SID_CHARMAP, SID_OPENDLG_FUNCTION
+// Funktionen, die je nach Cursorposition disabled sind
+// Default:
+// SID_INSERT_POSTIT, SID_CHARMAP, SID_OPENDLG_FUNCTION
void ScCellShell::GetCellState( SfxItemSet& rSet )
{
@@ -285,7 +285,7 @@ void ScCellShell::GetCellState( SfxItemSet& rSet )
while ( nWhich )
{
BOOL bDisable = FALSE;
- BOOL bNeedEdit = TRUE; // muss Cursorposition editierbar sein?
+ BOOL bNeedEdit = TRUE; // muss Cursorposition editierbar sein?
switch ( nWhich )
{
case SID_THESAURUS:
@@ -294,7 +294,7 @@ void ScCellShell::GetCellState( SfxItemSet& rSet )
bDisable = ( eType != CELLTYPE_STRING && eType != CELLTYPE_EDIT);
if (!bDisable)
{
- // test for available languages
+ // test for available languages
USHORT nLang = ScViewUtil::GetEffLanguage( pDoc, aCursor );
bDisable = !ScModule::HasThesaurusLanguage( nLang );
}
@@ -342,9 +342,9 @@ sal_Bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDataHe
{
if ( rDataHelper.HasFormat( nFormatId ) )
{
- // #90675# translated format name strings are no longer inserted here,
- // handled by "paste special" dialog / toolbox controller instead.
- // Only the object type name has to be set here:
+ // #90675# translated format name strings are no longer inserted here,
+ // handled by "paste special" dialog / toolbox controller instead.
+ // Only the object type name has to be set here:
String aStrVal;
if ( nFormatId == SOT_FORMATSTR_ID_EMBED_SOURCE )
{
@@ -400,7 +400,7 @@ void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats )
lcl_TestFormat( rFormats, aDataHelper, SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE );
}
-// Einfuegen, Inhalte einfuegen
+// Einfuegen, Inhalte einfuegen
BOOL lcl_IsCellPastePossible( const TransferableDataHelper& rData )
{
@@ -468,7 +468,7 @@ void __EXPORT ScCellShell::GetClipState( SfxItemSet& rSet )
BOOL bDisable = !bPastePossible;
- // Zellschutz / Multiselektion
+ // Zellschutz / Multiselektion
if (!bDisable)
{
@@ -498,17 +498,17 @@ void __EXPORT ScCellShell::GetClipState( SfxItemSet& rSet )
}
}
-// only SID_HYPERLINK_GETLINK:
+// only SID_HYPERLINK_GETLINK:
void ScCellShell::GetHLinkState( SfxItemSet& rSet )
{
- // always return an item (or inserting will be disabled)
- // if the cell at the cursor contains only a link, return that link
+ // always return an item (or inserting will be disabled)
+ // if the cell at the cursor contains only a link, return that link
SvxHyperlinkItem aHLinkItem;
if ( !GetViewData()->GetView()->HasBookmarkAtCursor( &aHLinkItem ) )
{
- //! put selected text into item?
+ //! put selected text into item?
}
rSet.Put(aHLinkItem);
@@ -518,16 +518,16 @@ void ScCellShell::GetState(SfxItemSet &rSet)
{
// removed: SID_BORDER_OBJECT (old Basic)
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
// BOOL bOle = pTabViewShell->GetViewFrame()->GetFrame().IsInPlace();
-// BOOL bTabProt = GetViewData()->GetDocument()->IsTabProtected(GetViewData()->GetTabNo());
+// BOOL bTabProt = GetViewData()->GetDocument()->IsTabProtected(GetViewData()->GetTabNo());
ScDocShell* pDocSh = GetViewData()->GetDocShell();
ScViewData* pData = GetViewData();
- ScDocument* pDoc = pData->GetDocument();
- ScMarkData& rMark = pData->GetMarkData();
- SCCOL nPosX = pData->GetCurX();
- SCROW nPosY = pData->GetCurY();
- SCTAB nTab = pData->GetTabNo();
+ ScDocument* pDoc = pData->GetDocument();
+ ScMarkData& rMark = pData->GetMarkData();
+ SCCOL nPosX = pData->GetCurX();
+ SCROW nPosY = pData->GetCurY();
+ SCTAB nTab = pData->GetTabNo();
SCTAB nTabCount = pDoc->GetTableCount();
SCTAB nTabSelCount = rMark.GetSelectCount();
@@ -560,7 +560,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
case SID_RANGE_NOTETEXT:
{
- // #43343# always take cursor position, do not use top-left cell of selection
+ // #43343# always take cursor position, do not use top-left cell of selection
ScAddress aPos( nPosX, nPosY, nTab );
String aNoteText;
if ( const ScPostIt* pNote = pDoc->GetNote( aPos ) )
@@ -611,16 +611,16 @@ void ScCellShell::GetState(SfxItemSet &rSet)
case SID_STATUS_SELMODE:
{
- /* 0: STD Click hebt Sel auf
- * 1: ER Click erweitert Selektion
- * 2: ERG Click definiert weitere Selektion
+ /* 0: STD Click hebt Sel auf
+ * 1: ER Click erweitert Selektion
+ * 2: ERG Click definiert weitere Selektion
*/
USHORT nMode = pTabViewShell->GetLockedModifiers();
switch ( nMode )
{
- case KEY_SHIFT: nMode = 1; break;
- case KEY_MOD1: nMode = 2; break; // Control-Taste
+ case KEY_SHIFT: nMode = 1; break;
+ case KEY_MOD1: nMode = 2; break; // Control-Taste
case 0:
default:
nMode = 0;
@@ -632,7 +632,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
case SID_STATUS_DOCPOS:
{
- String aStr( ScGlobal::GetRscString( STR_TABLE ) );
+ String aStr( ScGlobal::GetRscString( STR_TABLE ) );
aStr += ' ';
aStr += String::CreateFromInt32( nTab + 1 );
@@ -642,14 +642,14 @@ void ScCellShell::GetState(SfxItemSet &rSet)
}
break;
- // Summe etc. mit Datum/Zeit/Fehler/Pos&Groesse zusammengefasst
+ // Summe etc. mit Datum/Zeit/Fehler/Pos&Groesse zusammengefasst
// #i34458# The SfxStringItem belongs only into SID_TABLE_CELL. It no longer has to be
// duplicated in SID_ATTR_POSITION or SID_ATTR_SIZE for SvxPosSizeStatusBarControl.
case SID_TABLE_CELL:
{
- // Testen, ob Fehler unter Cursor
- // (nicht pDoc->GetErrCode, um keine zirkulaeren Referenzen auszuloesen)
+ // Testen, ob Fehler unter Cursor
+ // (nicht pDoc->GetErrCode, um keine zirkulaeren Referenzen auszuloesen)
// In interpreter may happen via rescheduled Basic
if ( pDoc->IsInInterpreter() )
@@ -743,9 +743,9 @@ void ScCellShell::GetState(SfxItemSet &rSet)
{
// ScDocument* pDoc = GetViewData()->GetDocument();
// SCTAB nTab = GetViewData()->GetTabNo();
- List aList;
+ List aList;
- Color aDummyCol;
+ Color aDummyCol;
if ( !pDoc->IsScenario(nTab) )
{
@@ -769,8 +769,8 @@ void ScCellShell::GetState(SfxItemSet &rSet)
}
else
{
- String aComment;
- USHORT nDummyFlags;
+ String aComment;
+ USHORT nDummyFlags;
pDoc->GetScenarioData( nTab, aComment, aDummyCol, nDummyFlags );
DBG_ASSERT( aList.Count() == 0, "List not empty!" );
aList.Insert( new String( aComment ) );
@@ -795,12 +795,12 @@ void ScCellShell::GetState(SfxItemSet &rSet)
rSet.DisableItem( nWhich );
break;
-/* Zellschutz bei selektierten Zellen wird bei anderen Funktionen auch nicht abgefragt...
+/* Zellschutz bei selektierten Zellen wird bei anderen Funktionen auch nicht abgefragt...
case SID_DELETE:
{
if ( pDoc->IsTabProtected(nTab) )
{
- const SfxItemSet& rAttrSet = GetSelectionPattern()->GetItemSet();
+ const SfxItemSet& rAttrSet = GetSelectionPattern()->GetItemSet();
const ScProtectionAttr& rProtAttr = (const ScProtectionAttr&)rAttrSet.Get( ATTR_PROTECTION, TRUE );
if ( rProtAttr.GetProtection() )
rSet.DisableItem( nWhich );
@@ -889,8 +889,8 @@ void ScCellShell::GetState(SfxItemSet &rSet)
DBG_ERROR( "Old update method. Use ScTabViewShell::UpdateInputHandler()." );
break;
- case SID_SCENARIOS: // Szenarios:
- if (!(rMark.IsMarked() || rMark.IsMultiMarked())) // nur, wenn etwas selektiert
+ case SID_SCENARIOS: // Szenarios:
+ if (!(rMark.IsMarked() || rMark.IsMultiMarked())) // nur, wenn etwas selektiert
rSet.DisableItem( nWhich );
break;
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 95d86032ef56..47951fc09aff 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -126,13 +126,13 @@ using namespace ::com::sun::star::uno;
//------------------------------------------------------------------
void ScCellShell::ExecuteEdit( SfxRequest& rReq )
{
- ScModule* pScMod = SC_MOD();
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
- SfxBindings& rBindings = pTabViewShell->GetViewFrame()->GetBindings();
- const SfxItemSet* pReqArgs = rReq.GetArgs();
- USHORT nSlot = rReq.GetSlot();
+ ScModule* pScMod = SC_MOD();
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ SfxBindings& rBindings = pTabViewShell->GetViewFrame()->GetBindings();
+ const SfxItemSet* pReqArgs = rReq.GetArgs();
+ USHORT nSlot = rReq.GetSlot();
- pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox
+ pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox
// Eingabe beenden
if ( GetViewData()->HasEditView( GetViewData()->GetActivePart() ) )
@@ -157,7 +157,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
switch ( nSlot )
{
//
- // Einfuegen / Loeschen von Zellen / Zeilen / Spalten
+ // Einfuegen / Loeschen von Zellen / Zeilen / Spalten
//
case FID_INS_ROW:
@@ -223,8 +223,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScDocument* pDoc = GetViewData()->GetDocument();
BOOL bTheFlag=(pDoc->GetChangeTrack()!=NULL);
-//CHINA001 ScInsertCellDlg* pDlg = new ScInsertCellDlg( pTabViewShell->GetDialogParent(),
-//CHINA001 bTheFlag);
+//CHINA001 ScInsertCellDlg* pDlg = new ScInsertCellDlg( pTabViewShell->GetDialogParent(),
+//CHINA001 bTheFlag);
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -299,7 +299,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
(pDoc->GetChangeTrack() != NULL);
//CHINA001 ScDeleteCellDlg* pDlg = new ScDeleteCellDlg(
- //CHINA001 pTabViewShell->GetDialogParent(),bTheFlag);
+ //CHINA001 pTabViewShell->GetDialogParent(),bTheFlag);
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -339,7 +339,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
break;
//
- // Inhalte von Zellen loeschen
+ // Inhalte von Zellen loeschen
//
case SID_DELETE_CONTENTS:
@@ -349,18 +349,18 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
case SID_DELETE:
{
- USHORT nFlags = IDF_NONE;
+ USHORT nFlags = IDF_NONE;
if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() )
{
- const SfxPoolItem* pItem;
- String aFlags = 'A';
+ const SfxPoolItem* pItem;
+ String aFlags = 'A';
if( IS_AVAILABLE( SID_DELETE, &pItem ) )
aFlags = ((const SfxStringItem*)pItem)->GetValue();
aFlags.ToUpperAscii();
- BOOL bCont = TRUE;
+ BOOL bCont = TRUE;
for( xub_StrLen i=0 ; bCont && i<aFlags.Len() ; i++ )
{
@@ -370,7 +370,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
nFlags |= IDF_ALL;
bCont = FALSE; // nicht mehr weitermachen!
break;
- case 'S': nFlags |= IDF_STRING; break;
+ case 'S': nFlags |= IDF_STRING; break;
case 'V': nFlags |= IDF_VALUE; break;
case 'D': nFlags |= IDF_DATETIME; break;
case 'F': nFlags |= IDF_FORMULA; break;
@@ -385,7 +385,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScEditableTester aTester( pTabViewShell );
if (aTester.IsEditable())
{
- //CHINA001 ScDeleteContentsDlg* pDlg = new ScDeleteContentsDlg( pTabViewShell->GetDialogParent() );
+ //CHINA001 ScDeleteContentsDlg* pDlg = new ScDeleteContentsDlg( pTabViewShell->GetDialogParent() );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -411,7 +411,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if( ! rReq.IsAPI() )
{
- String aFlags;
+ String aFlags;
if( nFlags == IDF_ALL )
{
@@ -436,7 +436,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
break;
//
- // Ausfuellen...
+ // Ausfuellen...
//
case FID_FILL_TO_BOTTOM:
@@ -464,18 +464,18 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
USHORT nFlags = IDF_NONE;
USHORT nFunction = PASTE_NOFUNC;
BOOL bSkipEmpty = FALSE;
- BOOL bAsLink = FALSE;
+ BOOL bAsLink = FALSE;
if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() )
{
- const SfxPoolItem* pItem;
- String aFlags = 'A';
+ const SfxPoolItem* pItem;
+ String aFlags = 'A';
if( IS_AVAILABLE( FID_FILL_TAB, &pItem ) )
aFlags = ((const SfxStringItem*)pItem)->GetValue();
aFlags.ToUpperAscii();
- BOOL bCont = TRUE;
+ BOOL bCont = TRUE;
for( xub_StrLen i=0 ; bCont && i<aFlags.Len() ; i++ )
{
@@ -485,7 +485,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
nFlags |= IDF_ALL;
bCont = FALSE; // nicht mehr weitermachen!
break;
- case 'S': nFlags |= IDF_STRING; break;
+ case 'S': nFlags |= IDF_STRING; break;
case 'V': nFlags |= IDF_VALUE; break;
case 'D': nFlags |= IDF_DATETIME; break;
case 'F': nFlags |= IDF_FORMULA; break;
@@ -496,10 +496,10 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
else
{
-//CHINA001 ScInsertContentsDlg* pDlg =
-//CHINA001 new ScInsertContentsDlg(pTabViewShell->GetDialogParent(),
-//CHINA001 0, /* nCheckDefaults */
-//CHINA001 &ScGlobal::GetRscString(STR_FILL_TAB) );
+//CHINA001 ScInsertContentsDlg* pDlg =
+//CHINA001 new ScInsertContentsDlg(pTabViewShell->GetDialogParent(),
+//CHINA001 0, /* nCheckDefaults */
+//CHINA001 &ScGlobal::GetRscString(STR_FILL_TAB) );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -511,11 +511,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if (pDlg->Execute() == RET_OK)
{
- nFlags = pDlg->GetInsContentsCmdBits();
+ nFlags = pDlg->GetInsContentsCmdBits();
nFunction = pDlg->GetFormulaCmdBits();
bSkipEmpty = pDlg->IsSkipEmptyCells();
- bAsLink = pDlg->IsLink();
- // MoveMode gibt's bei Tabelle fuellen nicht
+ bAsLink = pDlg->IsLink();
+ // MoveMode gibt's bei Tabelle fuellen nicht
}
delete pDlg;
}
@@ -526,7 +526,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if( ! rReq.IsAPI() )
{
- String aFlags;
+ String aFlags;
if( nFlags == IDF_ALL )
{
@@ -558,13 +558,13 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
SCROW nEndRow;
SCTAB nEndTab;
USHORT nPossDir = FDS_OPT_NONE;
- FillDir eFillDir = FILL_TO_BOTTOM;
- FillCmd eFillCmd = FILL_LINEAR;
- FillDateCmd eFillDateCmd = FILL_DAY;
+ FillDir eFillDir = FILL_TO_BOTTOM;
+ FillCmd eFillCmd = FILL_LINEAR;
+ FillDateCmd eFillDateCmd = FILL_DAY;
double fStartVal = MAXDOUBLE;
- double fIncVal = 1;
- double fMaxVal = MAXDOUBLE;
- BOOL bDoIt = FALSE;
+ double fIncVal = 1;
+ double fMaxVal = MAXDOUBLE;
+ BOOL bDoIt = FALSE;
GetViewData()->GetSimpleArea( nStartCol, nStartRow, nStartTab,
nEndCol, nEndRow, nEndTab );
@@ -581,16 +581,16 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
eFillDir=FILL_TO_BOTTOM;
}
- ScDocument* pDoc = GetViewData()->GetDocument();
+ ScDocument* pDoc = GetViewData()->GetDocument();
SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
if( pReqArgs )
{
const SfxPoolItem* pItem;
- String aFillDir, aFillCmd, aFillDateCmd;
- String aFillStep, aFillStart, aFillMax;
+ String aFillDir, aFillCmd, aFillDateCmd;
+ String aFillStep, aFillStart, aFillMax;
sal_uInt32 nKey;
- double fTmpVal;
+ double fTmpVal;
bDoIt=FALSE;
@@ -647,7 +647,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if( pFormatter->IsNumberFormat( aFillMax, nKey, fTmpVal ))
fMaxVal = fTmpVal;
- bDoIt = TRUE;
+ bDoIt = TRUE;
}
else // (pReqArgs == NULL) => Dialog hochziehen
@@ -678,7 +678,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
//
String aStartStr;
- // Startwert nur vorbelegen, wenn nur 1 Zeile oder Spalte:
+ // Startwert nur vorbelegen, wenn nur 1 Zeile oder Spalte:
if ( nStartCol == nEndCol || nStartRow == nEndRow )
{
double fInputEndVal = 0.0;
@@ -734,11 +734,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
}
}
-//CHINA001 ScFillSeriesDlg* pDlg = new ScFillSeriesDlg(
-//CHINA001 pTabViewShell->GetDialogParent(), *pDoc,
-//CHINA001 eFillDir, eFillCmd, eFillDateCmd,
-//CHINA001 aStartStr, fIncVal, fMaxVal,
-//CHINA001 nPossDir);
+//CHINA001 ScFillSeriesDlg* pDlg = new ScFillSeriesDlg(
+//CHINA001 pTabViewShell->GetDialogParent(), *pDoc,
+//CHINA001 eFillDir, eFillCmd, eFillDateCmd,
+//CHINA001 aStartStr, fIncVal, fMaxVal,
+//CHINA001 nPossDir);
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -757,9 +757,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if ( pDlg->Execute() == RET_OK )
{
- eFillDir = pDlg->GetFillDir();
- eFillCmd = pDlg->GetFillCmd();
- eFillDateCmd = pDlg->GetFillDateCmd();
+ eFillDir = pDlg->GetFillDir();
+ eFillCmd = pDlg->GetFillCmd();
+ eFillDateCmd = pDlg->GetFillDateCmd();
if(eFillCmd==FILL_AUTO)
{
@@ -767,51 +767,51 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if(aStr.Len()>0)
pTabViewShell->EnterData( nStartCol, nStartRow, nStartTab, aStr );
}
- fStartVal = pDlg->GetStart();
- fIncVal = pDlg->GetStep();
- fMaxVal = pDlg->GetMax();
- bDoIt = TRUE;
+ fStartVal = pDlg->GetStart();
+ fIncVal = pDlg->GetStep();
+ fMaxVal = pDlg->GetMax();
+ bDoIt = TRUE;
}
delete pDlg;
}
if( bDoIt )
{
- //nScFillModeMouseModifier = 0; // kein Ctrl/Copy
+ //nScFillModeMouseModifier = 0; // kein Ctrl/Copy
pTabViewShell->FillSeries( eFillDir, eFillCmd, eFillDateCmd, fStartVal, fIncVal, fMaxVal );
if( ! rReq.IsAPI() )
{
- String aPara;
- Color* pColor=0;
+ String aPara;
+ Color* pColor=0;
switch( eFillDir )
{
- case FILL_TO_BOTTOM: aPara = 'B'; break;
- case FILL_TO_RIGHT: aPara = 'R'; break;
- case FILL_TO_TOP: aPara = 'T'; break;
- case FILL_TO_LEFT: aPara = 'L'; break;
+ case FILL_TO_BOTTOM: aPara = 'B'; break;
+ case FILL_TO_RIGHT: aPara = 'R'; break;
+ case FILL_TO_TOP: aPara = 'T'; break;
+ case FILL_TO_LEFT: aPara = 'L'; break;
default: aPara.Erase(); break;
}
rReq.AppendItem( SfxStringItem( FID_FILL_SERIES, aPara ) );
switch( eFillCmd )
{
- case FILL_SIMPLE: aPara = 'S'; break;
- case FILL_LINEAR: aPara = 'L'; break;
- case FILL_GROWTH: aPara = 'G'; break;
- case FILL_DATE: aPara = 'D'; break;
- case FILL_AUTO: aPara = 'A'; break;
+ case FILL_SIMPLE: aPara = 'S'; break;
+ case FILL_LINEAR: aPara = 'L'; break;
+ case FILL_GROWTH: aPara = 'G'; break;
+ case FILL_DATE: aPara = 'D'; break;
+ case FILL_AUTO: aPara = 'A'; break;
default: aPara.Erase(); break;
}
rReq.AppendItem( SfxStringItem( FN_PARAM_1, aPara ) );
switch( eFillDateCmd )
{
- case FILL_DAY: aPara = 'D'; break;
- case FILL_WEEKDAY: aPara = 'W'; break;
- case FILL_MONTH: aPara = 'M'; break;
- case FILL_YEAR: aPara = 'Y'; break;
+ case FILL_DAY: aPara = 'D'; break;
+ case FILL_WEEKDAY: aPara = 'W'; break;
+ case FILL_MONTH: aPara = 'M'; break;
+ case FILL_YEAR: aPara = 'Y'; break;
default: aPara.Erase(); break;
}
rReq.AppendItem( SfxStringItem( FN_PARAM_2, aPara ) );
@@ -866,9 +866,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
GetViewData()->GetSimpleArea( nStartCol,nStartRow,nStartTab,
nEndCol,nEndRow,nEndTab );
}
- else // Aufruf per Maus
+ else // Aufruf per Maus
{
- // #55284# nicht innerhalb einer zusammengefassten Zelle
+ // #55284# nicht innerhalb einer zusammengefassten Zelle
if ( nStartCol == nEndCol && nStartRow == nEndRow )
{
@@ -926,7 +926,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if( ! rReq.IsAPI() )
{
- String aAdrStr;
+ String aAdrStr;
ScAddress aAdr( nFillCol, nFillRow, 0 );
aAdr.Format( aAdrStr, SCR_ABS, pDoc, pDoc->GetAddressConvention() );
@@ -945,8 +945,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
break;
//
- // Gliederung (Outlines)
- // SID_AUTO_OUTLINE, SID_OUTLINE_DELETEALL in Execute (in docsh.idl)
+ // Gliederung (Outlines)
+ // SID_AUTO_OUTLINE, SID_OUTLINE_DELETEALL in Execute (in docsh.idl)
//
case SID_OUTLINE_HIDE:
@@ -1054,7 +1054,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
}
}
- else // Dialog, wenn nicht ganze Zeilen/Spalten markiert
+ else // Dialog, wenn nicht ganze Zeilen/Spalten markiert
{
if ( GetViewData()->SimpleColMarked() && !GetViewData()->SimpleRowMarked() )
bColumns = TRUE;
@@ -1062,8 +1062,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
bColumns = FALSE;
else
{
-//CHINA001 ScGroupDlg* pDlg = new ScGroupDlg(pTabViewShell->GetDialogParent(),
-//CHINA001 RID_SCDLG_GRP_MAKE, FALSE );
+//CHINA001 ScGroupDlg* pDlg = new ScGroupDlg(pTabViewShell->GetDialogParent(),
+//CHINA001 RID_SCDLG_GRP_MAKE, FALSE );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -1118,14 +1118,14 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
}
}
- else // Dialog nur, wenn Aufheben fuer Zeilen und Spalten moeglich
+ else // Dialog nur, wenn Aufheben fuer Zeilen und Spalten moeglich
{
BOOL bColPoss, bRowPoss;
pTabViewShell->TestRemoveOutline( bColPoss, bRowPoss );
if ( bColPoss && bRowPoss )
{
- //CHINA001 ScGroupDlg* pDlg = new ScGroupDlg( pTabViewShell->GetDialogParent(),
- //CHINA001 RID_SCDLG_GRP_KILL, TRUE );
+ //CHINA001 ScGroupDlg* pDlg = new ScGroupDlg( pTabViewShell->GetDialogParent(),
+ //CHINA001 RID_SCDLG_GRP_KILL, TRUE );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -1159,10 +1159,10 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
break;
//
- // Clipboard
+ // Clipboard
//
- case SID_COPY: // fuer Grafiken in DrawShell
+ case SID_COPY: // fuer Grafiken in DrawShell
{
WaitObject aWait( GetViewData()->GetDialogParent() );
pTabViewShell->CopyToClip( NULL, FALSE, FALSE, TRUE );
@@ -1170,7 +1170,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
break;
- case SID_CUT: // fuer Grafiken in DrawShell
+ case SID_CUT: // fuer Grafiken in DrawShell
{
WaitObject aWait( GetViewData()->GetDialogParent() );
pTabViewShell->CutToClip( NULL, TRUE );
@@ -1213,7 +1213,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
pTabViewShell->PasteFromSystem(nFormat);
}
//?else
- //? pTabViewShell->PasteFromSystem();
+ //? pTabViewShell->PasteFromSystem();
rReq.Done();
}
@@ -1226,7 +1226,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
USHORT nFunction = PASTE_NOFUNC;
BOOL bSkipEmpty = FALSE;
BOOL bTranspose = FALSE;
- BOOL bAsLink = FALSE;
+ BOOL bAsLink = FALSE;
InsCellCmd eMoveMode = INS_NONE;
Window* pWin = GetViewData()->GetActiveWin();
@@ -1239,14 +1239,14 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
uno::Reference<datatransfer::XTransferable> aOwnClipRef( pOwnClip );
if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() )
{
- const SfxPoolItem* pItem;
- String aFlags = 'A';
+ const SfxPoolItem* pItem;
+ String aFlags = 'A';
if( IS_AVAILABLE( FID_INS_CELL_CONTENTS, &pItem ) )
aFlags = ((const SfxStringItem*)pItem)->GetValue();
aFlags.ToUpperAscii();
- BOOL bCont = TRUE;
+ BOOL bCont = TRUE;
for( xub_StrLen i=0 ; bCont && i<aFlags.Len() ; i++ )
{
@@ -1256,7 +1256,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
nFlags |= IDF_ALL;
bCont = FALSE; // nicht mehr weitermachen!
break;
- case 'S': nFlags |= IDF_STRING; break;
+ case 'S': nFlags |= IDF_STRING; break;
case 'V': nFlags |= IDF_VALUE; break;
case 'D': nFlags |= IDF_DATETIME; break;
case 'F': nFlags |= IDF_FORMULA; break;
@@ -1327,11 +1327,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
if (pDlg->Execute() == RET_OK)
{
- nFlags = pDlg->GetInsContentsCmdBits();
+ nFlags = pDlg->GetInsContentsCmdBits();
nFunction = pDlg->GetFormulaCmdBits();
bSkipEmpty = pDlg->IsSkipEmptyCells();
bTranspose = pDlg->IsTranspose();
- bAsLink = pDlg->IsLink();
+ bAsLink = pDlg->IsLink();
eMoveMode = pDlg->GetMoveMode();
}
delete pDlg;
@@ -1345,16 +1345,16 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
{
WaitObject aWait( GetViewData()->GetDialogParent() );
if ( bAsLink && bOtherDoc )
- pTabViewShell->PasteFromSystem(SOT_FORMATSTR_ID_LINK); // DDE einfuegen
+ pTabViewShell->PasteFromSystem(SOT_FORMATSTR_ID_LINK); // DDE einfuegen
else
pTabViewShell->PasteFromClip( nFlags, pOwnClip->GetDocument(),
nFunction, bSkipEmpty, bTranspose, bAsLink,
- eMoveMode, IDF_NONE, TRUE ); // allow warning dialog
+ eMoveMode, IDF_NONE, TRUE ); // allow warning dialog
}
if( !pReqArgs )
{
- String aFlags;
+ String aFlags;
if( nFlags == IDF_ALL )
{
@@ -1381,7 +1381,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
}
}
- pTabViewShell->CellContentChanged(); // => PasteFromXXX ???
+ pTabViewShell->CellContentChanged(); // => PasteFromXXX ???
break;
case SID_PASTE_SPECIAL:
@@ -1390,7 +1390,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
{
Window* pWin = GetViewData()->GetActiveWin();
- // Clipboard-ID als Parameter angegeben? Basic "PasteSpecial(Format)"
+ // Clipboard-ID als Parameter angegeben? Basic "PasteSpecial(Format)"
const SfxPoolItem* pItem=NULL;
if ( pReqArgs &&
pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET &&
@@ -1479,11 +1479,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
}
}
- pTabViewShell->CellContentChanged(); // => PasteFromSystem() ???
+ pTabViewShell->CellContentChanged(); // => PasteFromSystem() ???
break;
//
- // sonstiges
+ // sonstiges
//
case FID_INS_ROWBRK:
@@ -1652,7 +1652,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
{
USHORT nFlags = pTabViewShell->GetCreateNameFlags();
- //CHINA001 ScNameCreateDlg* pDlg = new ScNameCreateDlg( pTabViewShell->GetDialogParent(), nFlags );
+ //CHINA001 ScNameCreateDlg* pDlg = new ScNameCreateDlg( pTabViewShell->GetDialogParent(), nFlags );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -1692,22 +1692,22 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
{
const SfxBoolItem* pOkItem = (const SfxBoolItem*)&pReqArgs->Get( SID_DLG_RETOK );
-// pScMod->SetFunctionDlg( NULL );
+// pScMod->SetFunctionDlg( NULL );
- if ( pOkItem->GetValue() ) // OK
+ if ( pOkItem->GetValue() ) // OK
{
- String aFormula;
- const SfxStringItem* pSItem = (const SfxStringItem*)&pReqArgs->Get( SCITEM_STRING );
- const SfxBoolItem* pMatrixItem = (const SfxBoolItem*) &pReqArgs->Get( SID_DLG_MATRIX );
+ String aFormula;
+ const SfxStringItem* pSItem = (const SfxStringItem*)&pReqArgs->Get( SCITEM_STRING );
+ const SfxBoolItem* pMatrixItem = (const SfxBoolItem*) &pReqArgs->Get( SID_DLG_MATRIX );
aFormula += pSItem->GetValue();
pScMod->ActivateInputWindow( &aFormula, pMatrixItem->GetValue() );
}
- else // CANCEL
+ else // CANCEL
{
pScMod->ActivateInputWindow( NULL );
}
- rReq.Ignore(); // only SID_ENTER_STRING is recorded
+ rReq.Ignore(); // only SID_ENTER_STRING is recorded
}
break;
@@ -1715,7 +1715,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if ( pReqArgs )
{
const SfxPoolItem* pItem;
- String aName, aSymbol, aAttrib;
+ String aName, aSymbol, aAttrib;
if( IS_AVAILABLE( FID_DEFINE_NAME, &pItem ) )
aName = ((const SfxStringItem*)pItem)->GetValue();
@@ -1731,12 +1731,12 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if (pTabViewShell->InsertName( aName, aSymbol, aAttrib ))
rReq.Done();
else
- SbxBase::SetError( SbxERR_BAD_PARAMETER ); // Basic-Fehler
+ SbxBase::SetError( SbxERR_BAD_PARAMETER ); // Basic-Fehler
}
}
else
{
- USHORT nId = ScNameDlgWrapper::GetChildWindowId();
+ USHORT nId = ScNameDlgWrapper::GetChildWindowId();
SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
@@ -1747,7 +1747,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
case SID_DEFINE_COLROWNAMERANGES:
{
- USHORT nId = ScColRowNameRangesDlgWrapper::GetChildWindowId();
+ USHORT nId = ScColRowNameRangesDlgWrapper::GetChildWindowId();
SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
@@ -1807,8 +1807,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
case FID_INSERT_NAME:
{
- ScDocument* pDoc = GetViewData()->GetDocument();
- //CHINA001 ScNamePasteDlg* pDlg = new ScNamePasteDlg( pTabViewShell->GetDialogParent(), pDoc->GetRangeName() );
+ ScDocument* pDoc = GetViewData()->GetDocument();
+ //CHINA001 ScNamePasteDlg* pDlg = new ScNamePasteDlg( pTabViewShell->GetDialogParent(), pDoc->GetRangeName() );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -1824,11 +1824,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScInputHandler* pHdl = pScMod->GetInputHdl( pTabViewShell );
if (pHdl)
{
- // das "=" per Key-Event, schaltet in den Eingabe-Modus
+ // das "=" per Key-Event, schaltet in den Eingabe-Modus
pScMod->InputKeyEvent( KeyEvent('=',KeyCode()) );
String aName = pDlg->GetSelectedName();
- pHdl->InsertFunction( aName, FALSE ); // ohne "()"
+ pHdl->InsertFunction( aName, FALSE ); // ohne "()"
}
}
break;
@@ -1842,7 +1842,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
{
const SfxStringItem& rTextItem = (const SfxStringItem&)pReqArgs->Get( SID_RANGE_NOTETEXT );
- // #43343# immer Cursorposition
+ // #43343# immer Cursorposition
ScAddress aPos( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() );
pTabViewShell->SetNoteText( aPos, rTextItem.GetValue() );
rReq.Done();
@@ -1931,11 +1931,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
else
{
- //CHINA001 SvxCharacterMap* pDlg = new SvxCharacterMap( pTabViewShell->GetDialogParent(), FALSE );
+ //CHINA001 SvxCharacterMap* pDlg = new SvxCharacterMap( pTabViewShell->GetDialogParent(), FALSE );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
// font color doesn't matter here
- Font aCurFont;
+ Font aCurFont;
pTabViewShell->GetSelectionPattern()->GetFont( aCurFont, SC_AUTOCOL_BLACK, NULL, NULL, NULL,
pTabViewShell->GetSelectionScriptType() );
@@ -1978,7 +1978,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if( pItem )
{
pTabViewShell->UseScenario( pItem->GetValue() );
- //! wofuer soll der Return-Wert gut sein?!?!
+ //! wofuer soll der Return-Wert gut sein?!?!
rReq.SetReturnValue( SfxStringItem( SID_SELECT_SCENARIO, pItem->GetValue() ) );
rReq.Done();
}
@@ -1997,8 +1997,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if( IS_AVAILABLE( SID_HYPERLINK_SETLINK, &pItem ) )
{
const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem;
- const String& rName = pHyper->GetName();
- const String& rURL = pHyper->GetURL();
+ const String& rName = pHyper->GetName();
+ const String& rURL = pHyper->GetURL();
const String& rTarget = pHyper->GetTargetFrame();
USHORT nType = (USHORT) pHyper->GetInsertMode();
@@ -2199,8 +2199,8 @@ void ScCellShell::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTa
pTabViewShell->PasteFromClip( nFlags, pClipDoc,
PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE,
- bShowDialog ); // allow warning dialog
+ bShowDialog ); // allow warning dialog
}
}
- pTabViewShell->CellContentChanged(); // => PasteFromSystem() ???
+ pTabViewShell->CellContentChanged(); // => PasteFromSystem() ???
}
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 086160263739..62af646c6330 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +75,8 @@
#include "dpobject.hxx"
//CHINA001 #include "dapitype.hxx"
//CHINA001 #include "dapidata.hxx"
-#include "dpsdbtab.hxx" // ScImportSourceDesc
-#include "dpshttab.hxx" // ScSheetSourceDesc
+#include "dpsdbtab.hxx" // ScImportSourceDesc
+#include "dpshttab.hxx" // ScSheetSourceDesc
#include "validate.hrc" //CHINA001 add for ScValidationDlg
#include "scui_def.hxx" //CHINA001
@@ -85,9 +85,9 @@
#include "asciiopt.hxx"
using namespace com::sun::star;
-//#include "strindlg.hxx" //! Test !!!!!
+//#include "strindlg.hxx" //! Test !!!!!
-//static ScArea aPivotSource; //! wohin? (ueber den Dialog retten)
+//static ScArea aPivotSource; //! wohin? (ueber den Dialog retten)
#define IS_AVAILABLE(WhichId,ppItem) \
@@ -138,7 +138,7 @@ bool lcl_GetTextToColumnsRange( const ScViewData* pData, ScRange& rRange )
BOOL lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam )
{
ScTabViewShell* pTabViewShell = pData->GetViewShell();
- ScDBData* pDBData = pTabViewShell->GetDBData();
+ ScDBData* pDBData = pTabViewShell->GetDBData();
ScDocument* pDoc = pData->GetDocument();
SCTAB nTab = pData->GetTabNo();
ScDirection eFillDir = DIR_TOP;
@@ -214,18 +214,18 @@ namespace
{
delete reinterpret_cast<VclAbstractDialog*>( pAbstractDialog );
return 0;
- }
+ }
}
//--> Added by PengYunQuan for Validity Cell Range Picker
void ScCellShell::ExecuteDB( SfxRequest& rReq )
{
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
USHORT nSlotId = rReq.GetSlot();
- const SfxItemSet* pReqArgs = rReq.GetArgs();
- ScModule* pScMod = SC_MOD();
+ const SfxItemSet* pReqArgs = rReq.GetArgs();
+ ScModule* pScMod = SC_MOD();
- pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox
+ pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox
if ( GetViewData()->HasEditView( GetViewData()->GetActivePart() ) )
{
@@ -237,7 +237,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
{
case SID_VIEW_DATA_SOURCE_BROWSER:
{
- // check if database beamer is open
+ // check if database beamer is open
SfxViewFrame* pViewFrame = pTabViewShell->GetViewFrame();
BOOL bWasOpen = FALSE;
@@ -252,26 +252,26 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
if ( bWasOpen )
{
- // close database beamer: just forward to SfxViewFrame
+ // close database beamer: just forward to SfxViewFrame
pViewFrame->ExecuteSlot( rReq );
}
else
{
- // show database beamer: SfxViewFrame call must be synchronous
+ // show database beamer: SfxViewFrame call must be synchronous
- pViewFrame->ExecuteSlot( rReq, (BOOL) FALSE ); // FALSE = synchronous
+ pViewFrame->ExecuteSlot( rReq, (BOOL) FALSE ); // FALSE = synchronous
- // select current database in database beamer
+ // select current database in database beamer
ScImportParam aImportParam;
- ScDBData* pDBData = pTabViewShell->GetDBData(TRUE,SC_DB_OLD); // don't create if none found
+ ScDBData* pDBData = pTabViewShell->GetDBData(TRUE,SC_DB_OLD); // don't create if none found
if (pDBData)
pDBData->GetImportParam( aImportParam );
ScDBDocFunc::ShowInBeamer( aImportParam, pTabViewShell->GetViewFrame() );
}
- rReq.Done(); // needed because it's a toggle slot
+ rReq.Done(); // needed because it's a toggle slot
}
break;
@@ -286,7 +286,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
if (aImportParam.bImport && !pDBData->HasImportSelection())
{
pTabViewShell->ImportData( aImportParam );
- pDBData->SetImportParam( aImportParam ); //! Undo ??
+ pDBData->SetImportParam( aImportParam ); //! Undo ??
bOk = TRUE;
}
}
@@ -304,7 +304,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
ScDBData* pDBData = pTabViewShell->GetDBData(TRUE,SC_DB_OLD);
if (pDBData)
{
- // Import wiederholen wie SID_REIMPORT_DATA
+ // Import wiederholen wie SID_REIMPORT_DATA
BOOL bContinue = TRUE;
ScImportParam aImportParam;
@@ -312,23 +312,23 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
if (aImportParam.bImport && !pDBData->HasImportSelection())
{
bContinue = pTabViewShell->ImportData( aImportParam );
- pDBData->SetImportParam( aImportParam ); //! Undo ??
+ pDBData->SetImportParam( aImportParam ); //! Undo ??
- // markieren (Groesse kann sich geaendert haben)
+ // markieren (Groesse kann sich geaendert haben)
ScRange aNewRange;
pDBData->GetArea(aNewRange);
pTabViewShell->MarkRange(aNewRange);
}
- if ( bContinue ) // #41905# Fehler beim Import -> Abbruch
+ if ( bContinue ) // #41905# Fehler beim Import -> Abbruch
{
- // interne Operationen, wenn welche gespeichert
+ // interne Operationen, wenn welche gespeichert
if ( pDBData->HasQueryParam() || pDBData->HasSortParam() ||
pDBData->HasSubTotalParam() )
pTabViewShell->RepeatDB();
- // Pivottabellen die den Bereich als Quelldaten haben
+ // Pivottabellen die den Bereich als Quelldaten haben
ScRange aRange;
pDBData->GetArea(aRange);
@@ -356,10 +356,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
}
else
{
- //CHINA001 ScSubTotalDlg* pDlg = NULL;
+ //CHINA001 ScSubTotalDlg* pDlg = NULL;
SfxAbstractTabDialog * pDlg = NULL;
ScSubTotalParam aSubTotalParam;
- SfxItemSet aArgSet( GetPool(), SCITEM_SUBTDATA, SCITEM_SUBTDATA );
+ SfxItemSet aArgSet( GetPool(), SCITEM_SUBTDATA, SCITEM_SUBTDATA );
ScDBData* pDBData = pTabViewShell->GetDBData();
pDBData->GetSubTotalParam( aSubTotalParam );
@@ -415,7 +415,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
//#i60401 ux-ctest: Calc does not support all users' strategies regarding sorting data
//the patch comes from maoyg
ScSortParam aSortParam;
- ScDBData* pDBData = pTabViewShell->GetDBData();
+ ScDBData* pDBData = pTabViewShell->GetDBData();
ScViewData* pData = GetViewData();
pDBData->GetSortParam( aSortParam );
@@ -435,21 +435,21 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
else if( nCol > aSortParam.nCol2 )
nCol = aSortParam.nCol2;
- aSortParam.bHasHeader = bHasHeader;
- aSortParam.bByRow = TRUE;
- aSortParam.bCaseSens = FALSE;
- aSortParam.bIncludePattern = TRUE;
- aSortParam.bInplace = TRUE;
- aSortParam.bDoSort[0] = TRUE;
- aSortParam.nField[0] = nCol;
- aSortParam.bAscending[0] = (nSlotId == SID_SORT_ASCENDING);
+ aSortParam.bHasHeader = bHasHeader;
+ aSortParam.bByRow = TRUE;
+ aSortParam.bCaseSens = FALSE;
+ aSortParam.bIncludePattern = TRUE;
+ aSortParam.bInplace = TRUE;
+ aSortParam.bDoSort[0] = TRUE;
+ aSortParam.nField[0] = nCol;
+ aSortParam.bAscending[0] = (nSlotId == SID_SORT_ASCENDING);
for ( USHORT i=1; i<MAXSORT; i++ )
aSortParam.bDoSort[i] = FALSE;
aArgSet.Put( ScSortItem( SCITEM_SORTDATA, GetViewData(), &aSortParam ) );
- pTabViewShell->UISort( aSortParam ); // Teilergebnisse bei Bedarf neu
+ pTabViewShell->UISort( aSortParam ); // Teilergebnisse bei Bedarf neu
rReq.Done();
}
@@ -463,10 +463,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
//#i60401 ux-ctest: Calc does not support all users' strategies regarding sorting data
//the patch comes from maoyg
- if ( pArgs ) // Basic
+ if ( pArgs ) // Basic
{
ScSortParam aSortParam;
- ScDBData* pDBData = pTabViewShell->GetDBData();
+ ScDBData* pDBData = pTabViewShell->GetDBData();
ScViewData* pData = GetViewData();
pDBData->GetSortParam( aSortParam );
@@ -480,7 +480,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
if( bHasHeader )
aSortParam.bHasHeader = bHasHeader;
- aSortParam.bInplace = TRUE; // von Basic immer
+ aSortParam.bInplace = TRUE; // von Basic immer
const SfxPoolItem* pItem;
if ( pArgs->GetItemState( SID_SORT_BYROW, TRUE, &pItem ) == SFX_ITEM_SET )
@@ -496,7 +496,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
USHORT nUserIndex = ((const SfxUInt16Item*)pItem)->GetValue();
aSortParam.bUserDef = ( nUserIndex != 0 );
if ( nUserIndex )
- aSortParam.nUserIndex = nUserIndex - 1; // Basic: 1-basiert
+ aSortParam.nUserIndex = nUserIndex - 1; // Basic: 1-basiert
}
SCCOLROW nField0 = 0;
@@ -529,7 +529,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
else
{
ScSortParam aSortParam;
- ScDBData* pDBData = pTabViewShell->GetDBData();
+ ScDBData* pDBData = pTabViewShell->GetDBData();
ScViewData* pData = GetViewData();
pDBData->GetSortParam( aSortParam );
@@ -538,7 +538,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
{
SfxAbstractTabDialog* pDlg = NULL;
ScDocument* pDoc = GetViewData()->GetDocument();
- SfxItemSet aArgSet( GetPool(), SCITEM_SORTDATA, SCITEM_SORTDATA );
+ SfxItemSet aArgSet( GetPool(), SCITEM_SORTDATA, SCITEM_SORTDATA );
pDBData->GetSortParam( aSortParam );
BOOL bHasHeader = pDoc->HasColHeader( aSortParam.nCol1, aSortParam.nRow1, aSortParam.nCol2, aSortParam.nRow2, pData->GetTabNo() );
@@ -621,7 +621,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
}
else
{
- USHORT nId = ScFilterDlgWrapper::GetChildWindowId();
+ USHORT nId = ScFilterDlgWrapper::GetChildWindowId();
SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
@@ -642,7 +642,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
}
else
{
- USHORT nId = ScSpecialFilterDlgWrapper::GetChildWindowId();
+ USHORT nId = ScSpecialFilterDlgWrapper::GetChildWindowId();
SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
@@ -684,7 +684,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
case SID_UNFILTER:
{
ScQueryParam aParam;
- ScDBData* pDBData = pTabViewShell->GetDBData();
+ ScDBData* pDBData = pTabViewShell->GetDBData();
pDBData->GetQueryParam( aParam );
SCSIZE nEC = aParam.GetEntryCount();
@@ -751,27 +751,27 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
ScDPObject* pDPObj = pDoc->GetDPAtCursor(
pData->GetCurX(), pData->GetCurY(),
pData->GetTabNo() );
- if ( pDPObj ) // on an existing table?
+ if ( pDPObj ) // on an existing table?
{
pNewDPObject = new ScDPObject( *pDPObj );
}
- else // create new table
+ else // create new table
{
- // select database range or data
+ // select database range or data
pTabViewShell->GetDBData( TRUE, SC_DB_OLD );
ScMarkData& rMark = GetViewData()->GetMarkData();
if ( !rMark.IsMarked() && !rMark.IsMultiMarked() )
pTabViewShell->MarkDataArea( FALSE );
- // output to cursor position for non-sheet data
+ // output to cursor position for non-sheet data
ScAddress aDestPos( pData->GetCurX(), pData->GetCurY(),
pData->GetTabNo() );
- // first select type of source data
+ // first select type of source data
BOOL bEnableExt = ScDPObject::HasRegisteredSources();
//CHINA001 ScDataPilotSourceTypeDlg* pTypeDlg = new ScDataPilotSourceTypeDlg(
- //CHINA001 pTabViewShell->GetDialogParent(), bEnableExt );
+ //CHINA001 pTabViewShell->GetDialogParent(), bEnableExt );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -784,7 +784,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
{
uno::Sequence<rtl::OUString> aSources = ScDPObject::GetRegisteredSources();
//CHINA001 ScDataPilotServiceDlg* pServDlg = new ScDataPilotServiceDlg(
- //CHINA001 pTabViewShell->GetDialogParent(), aSources );
+ //CHINA001 pTabViewShell->GetDialogParent(), aSources );
AbstractScDataPilotServiceDlg* pServDlg = pFact->CreateScDataPilotServiceDlg( pTabViewShell->GetDialogParent(), aSources, RID_SCDLG_DAPISERVICE );
DBG_ASSERT(pServDlg, "Dialog create fail!");//CHINA001
if ( pServDlg->Execute() == RET_OK )
@@ -803,7 +803,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
else if ( pTypeDlg->IsDatabase() )
{
//CHINA001 ScDataPilotDatabaseDlg* pDataDlg = new ScDataPilotDatabaseDlg(
- //CHINA001 pTabViewShell->GetDialogParent() );
+ //CHINA001 pTabViewShell->GetDialogParent() );
//ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -818,9 +818,9 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
}
delete pDataDlg;
}
- else // selection
+ else // selection
{
- //! use database ranges (select before type dialog?)
+ //! use database ranges (select before type dialog?)
ScRange aRange;
ScMarkType eType = GetViewData()->GetSimpleArea(aRange);
if ( (eType & SC_MARK_SIMPLE) == SC_MARK_SIMPLE )
@@ -841,7 +841,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
BOOL bOK = TRUE;
if ( pDoc->HasSubTotalCells( aRange ) )
{
- // confirm selection if it contains SubTotal cells
+ // confirm selection if it contains SubTotal cells
QueryBox aBox( pTabViewShell->GetDialogParent(),
WinBits(WB_YES_NO | WB_DEF_YES),
@@ -856,7 +856,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
pNewDPObject = new ScDPObject( pDoc );
pNewDPObject->SetSheetDesc( aShtDesc );
- // output below source data
+ // output below source data
if ( aRange.aEnd.Row()+2 <= MAXROW - 4 )
aDestPos = ScAddress( aRange.aStart.Col(),
aRange.aEnd.Row()+2,
@@ -871,8 +871,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
pNewDPObject->SetOutRange( aDestPos );
#if 0
- ScDBData* pDBData = pTabViewShell->GetDBData();
- String aErrMsg;
+ ScDBData* pDBData = pTabViewShell->GetDBData();
+ String aErrMsg;
pDBData->GetArea( nTab, nCol1, nRow1, nCol2, nRow2 );
@@ -886,11 +886,11 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
else if (!pDBData->HasHeader())
{
if ( MessBox( pTabViewShell->GetDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
- ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ), // "StarCalc"
- ScGlobal::GetRscString( STR_MSSG_MAKEAUTOFILTER_0 ) // Koepfe aus erster Zeile?
+ ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ), // "StarCalc"
+ ScGlobal::GetRscString( STR_MSSG_MAKEAUTOFILTER_0 ) // Koepfe aus erster Zeile?
).Execute() == RET_YES )
{
- pDBData->SetHeader( TRUE ); //! Undo ??
+ pDBData->SetHeader( TRUE ); //! Undo ??
}
else
bAreaOk = FALSE;
@@ -898,10 +898,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
#endif
}
- pTabViewShell->SetDialogDPObject( pNewDPObject ); // is copied
+ pTabViewShell->SetDialogDPObject( pNewDPObject ); // is copied
if ( pNewDPObject )
{
- // start layout dialog
+ // start layout dialog
USHORT nId = ScPivotLayoutWrapper::GetChildWindowId();
SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
@@ -915,7 +915,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
case SID_DEFINE_DBNAME:
{
- USHORT nId = ScDbNameDlgWrapper::GetChildWindowId();
+ USHORT nId = ScDbNameDlgWrapper::GetChildWindowId();
SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
@@ -943,16 +943,16 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
}
else
{
- ScDocument* pDoc = GetViewData()->GetDocument();
+ ScDocument* pDoc = GetViewData()->GetDocument();
ScDBCollection* pDBCol = pDoc->GetDBCollection();
if ( pDBCol )
{
- const String aStrNoName( ScGlobal::GetRscString(STR_DB_NONAME) );
- List aList;
- USHORT nDBCount = pDBCol->GetCount();
- ScDBData* pDbData = NULL;
- String* pDBName = NULL;
+ const String aStrNoName( ScGlobal::GetRscString(STR_DB_NONAME) );
+ List aList;
+ USHORT nDBCount = pDBCol->GetCount();
+ ScDBData* pDbData = NULL;
+ String* pDBName = NULL;
for ( USHORT i=0; i < nDBCount; i++ )
{
@@ -969,11 +969,11 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
}
}
-//CHINA001 ScSelEntryDlg* pDlg =
-//CHINA001 new ScSelEntryDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_SELECTDB,
-//CHINA001 String(ScResId(SCSTR_SELECTDB)),
-//CHINA001 String(ScResId(SCSTR_AREAS)),
-//CHINA001 aList );
+//CHINA001 ScSelEntryDlg* pDlg =
+//CHINA001 new ScSelEntryDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_SELECTDB,
+//CHINA001 String(ScResId(SCSTR_SELECTDB)),
+//CHINA001 String(ScResId(SCSTR_AREAS)),
+//CHINA001 aList );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -1041,7 +1041,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
nCurX, nCurY, nTab, ATTR_VALIDDATA ))->GetValue();
if ( nIndex )
{
- const ScValidationData* pOldData = pDoc->GetValidationEntry( nIndex );
+ const ScValidationData* pOldData = pDoc->GetValidationEntry( nIndex );
if ( pOldData )
{
eMode = pOldData->GetDataMode();
@@ -1064,24 +1064,24 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
aArgSet.Put( SfxAllEnumItem( FID_VALID_MODE, sal::static_int_cast<USHORT>(eMode) ) );
aArgSet.Put( SfxAllEnumItem( FID_VALID_CONDMODE, sal::static_int_cast<USHORT>(eOper) ) );
- aArgSet.Put( SfxStringItem( FID_VALID_VALUE1, aExpr1 ) );
- aArgSet.Put( SfxStringItem( FID_VALID_VALUE2, aExpr2 ) );
- aArgSet.Put( SfxBoolItem( FID_VALID_BLANK, bBlank ) );
+ aArgSet.Put( SfxStringItem( FID_VALID_VALUE1, aExpr1 ) );
+ aArgSet.Put( SfxStringItem( FID_VALID_VALUE2, aExpr2 ) );
+ aArgSet.Put( SfxBoolItem( FID_VALID_BLANK, bBlank ) );
aArgSet.Put( SfxInt16Item( FID_VALID_LISTTYPE, nListType ) );
- aArgSet.Put( SfxBoolItem( FID_VALID_SHOWHELP, bShowHelp ) );
- aArgSet.Put( SfxStringItem( FID_VALID_HELPTITLE, aHelpTitle ) );
- aArgSet.Put( SfxStringItem( FID_VALID_HELPTEXT, aHelpText ) );
- aArgSet.Put( SfxBoolItem( FID_VALID_SHOWERR, bShowError ) );
+ aArgSet.Put( SfxBoolItem( FID_VALID_SHOWHELP, bShowHelp ) );
+ aArgSet.Put( SfxStringItem( FID_VALID_HELPTITLE, aHelpTitle ) );
+ aArgSet.Put( SfxStringItem( FID_VALID_HELPTEXT, aHelpText ) );
+ aArgSet.Put( SfxBoolItem( FID_VALID_SHOWERR, bShowError ) );
aArgSet.Put( SfxAllEnumItem( FID_VALID_ERRSTYLE, sal::static_int_cast<USHORT>(eErrStyle) ) );
- aArgSet.Put( SfxStringItem( FID_VALID_ERRTITLE, aErrTitle ) );
- aArgSet.Put( SfxStringItem( FID_VALID_ERRTEXT, aErrText ) );
+ aArgSet.Put( SfxStringItem( FID_VALID_ERRTITLE, aErrTitle ) );
+ aArgSet.Put( SfxStringItem( FID_VALID_ERRTEXT, aErrText ) );
}
}
//CHINA001 ScValidationDlg* pDlg = new ScValidationDlg( NULL, &aArgSet );
//CHINA001 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
//CHINA001 DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
-
+
//<!--Modified by PengYunQuan for Validity Cell Range Picker
//SfxAbstractTabDialog* pDlg = pFact->CreateScValidationDlg( NULL, &aArgSet, TAB_DLG_VALIDATION );
SfxAbstractTabDialog* pDlg = pFact->CreateScValidationDlg( NULL, &aArgSet, TAB_DLG_VALIDATION, pTabViewShell );
@@ -1161,13 +1161,13 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
aData.SetIgnoreBlank( bBlank );
aData.SetListType( nListType );
- aData.SetInput(aHelpTitle, aHelpText); // sets bShowInput to TRUE
+ aData.SetInput(aHelpTitle, aHelpText); // sets bShowInput to TRUE
if (!bShowHelp)
- aData.ResetInput(); // reset only bShowInput
+ aData.ResetInput(); // reset only bShowInput
- aData.SetError(aErrTitle, aErrText, eErrStyle); // sets bShowError to TRUE
+ aData.SetError(aErrTitle, aErrText, eErrStyle); // sets bShowError to TRUE
if (!bShowError)
- aData.ResetError(); // reset only bShowError
+ aData.ResetError(); // reset only bShowError
pTabViewShell->SetValidation( aData );
rReq.Done( *pOutSet );
@@ -1237,13 +1237,13 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet )
{
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
ScViewData* pData = GetViewData();
- ScDocShell* pDocSh = pData->GetDocShell();
- ScDocument* pDoc = pDocSh->GetDocument();
- SCCOL nPosX = pData->GetCurX();
- SCROW nPosY = pData->GetCurY();
- SCTAB nTab = pData->GetTabNo();
+ ScDocShell* pDocSh = pData->GetDocShell();
+ ScDocument* pDoc = pDocSh->GetDocument();
+ SCCOL nPosX = pData->GetCurX();
+ SCROW nPosY = pData->GetCurY();
+ SCTAB nTab = pData->GetTabNo();
BOOL bAutoFilter = FALSE;
BOOL bAutoFilterTested = FALSE;
@@ -1256,8 +1256,8 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet )
{
case SID_REFRESH_DBAREA:
{
- // importierte Daten ohne Selektion
- // oder Filter,Sortierung,Teilergebis (auch ohne Import)
+ // importierte Daten ohne Selektion
+ // oder Filter,Sortierung,Teilergebis (auch ohne Import)
BOOL bOk = FALSE;
ScDBData* pDBData = pTabViewShell->GetDBData(FALSE,SC_DB_OLD);
if (pDBData && pDoc->GetChangeTrack() == NULL)
@@ -1296,7 +1296,7 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet )
case SCITEM_SUBTDATA:
case SID_OPENDLG_PIVOTTABLE:
{
- //! move ReadOnly check to idl flags
+ //! move ReadOnly check to idl flags
if ( pDocSh->IsReadOnly() || pDoc->GetChangeTrack()!=NULL ||
GetViewData()->IsMultiMarked() )
@@ -1308,7 +1308,7 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet )
case SID_REIMPORT_DATA:
{
- // nur importierte Daten ohne Selektion
+ // nur importierte Daten ohne Selektion
ScDBData* pDBData = pTabViewShell->GetDBData(FALSE,SC_DB_OLD);
if (!pDBData || !pDBData->HasImportParam() || pDBData->HasImportSelection() ||
pDoc->GetChangeTrack()!=NULL)
@@ -1323,13 +1323,13 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet )
if (!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SDATABASE))
rSet.Put(SfxVisibilityItem(nWhich, sal_False));
else
- // get state (BoolItem) from SfxViewFrame
+ // get state (BoolItem) from SfxViewFrame
pTabViewShell->GetViewFrame()->GetSlotState( nWhich, NULL, &rSet );
}
break;
case SID_SBA_BRW_INSERT:
{
- // SBA will ein BOOL-Item, damit ueberhaupt enabled
+ // SBA will ein BOOL-Item, damit ueberhaupt enabled
BOOL bEnable = TRUE;
rSet.Put(SfxBoolItem(nWhich, bEnable));
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index ed391f154892..e08ec21f4216 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "autoform.hxx"
#include "autofmt.hxx"
#include "cellsh.hxx"
-#include "attrdlg.hrc" // TP_ALIGNMENT
+#include "attrdlg.hrc" // TP_ALIGNMENT
#include "inputhdl.hxx"
#include "editable.hxx"
@@ -62,34 +62,34 @@
#define IS_EDITMODE() GetViewData()->HasEditView( GetViewData()->GetActivePart() )
-inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
-inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
-inline long TwipsToEvenHMM(long nTwips) { return ( (nTwips * 127 + 72) / 144 ) * 2; }
+inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; }
+inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
+inline long TwipsToEvenHMM(long nTwips) { return ( (nTwips * 127 + 72) / 144 ) * 2; }
//------------------------------------------------------------------
void ScCellShell::Execute( SfxRequest& rReq )
{
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
- SfxBindings& rBindings = pTabViewShell->GetViewFrame()->GetBindings();
- ScModule* pScMod = SC_MOD();
- const SfxItemSet* pReqArgs = rReq.GetArgs();
- USHORT nSlot = rReq.GetSlot();
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ SfxBindings& rBindings = pTabViewShell->GetViewFrame()->GetBindings();
+ ScModule* pScMod = SC_MOD();
+ const SfxItemSet* pReqArgs = rReq.GetArgs();
+ USHORT nSlot = rReq.GetSlot();
- if (nSlot != SID_CURRENTCELL) // der kommt beim MouseButtonUp
- pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox
+ if (nSlot != SID_CURRENTCELL) // der kommt beim MouseButtonUp
+ pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox
if ( IS_EDITMODE() )
{
switch ( nSlot )
{
- // beim Oeffnen eines Referenz-Dialogs darf die SubShell nicht umgeschaltet werden
- // (beim Schliessen des Dialogs wird StopEditShell gerufen)
+ // beim Oeffnen eines Referenz-Dialogs darf die SubShell nicht umgeschaltet werden
+ // (beim Schliessen des Dialogs wird StopEditShell gerufen)
case SID_OPENDLG_FUNCTION:
- // #53318# inplace macht die EditShell Aerger...
- //! kann nicht immer umgeschaltet werden ????
+ // #53318# inplace macht die EditShell Aerger...
+ //! kann nicht immer umgeschaltet werden ????
if (!pTabViewShell->GetViewFrame()->GetFrame().IsInPlace())
- pTabViewShell->SetDontSwitch(TRUE); // EditShell nicht abschalten
+ pTabViewShell->SetDontSwitch(TRUE); // EditShell nicht abschalten
// kein break
case FID_CELL_FORMAT:
@@ -122,16 +122,16 @@ void ScCellShell::Execute( SfxRequest& rReq )
case SID_STATUS_SELMODE:
if ( pReqArgs )
{
- /* 0: STD Click hebt Sel auf
- * 1: ER Click erweitert Selektion
- * 2: ERG Click definiert weitere Selektion
+ /* 0: STD Click hebt Sel auf
+ * 1: ER Click erweitert Selektion
+ * 2: ERG Click definiert weitere Selektion
*/
UINT16 nMode = ((const SfxUInt16Item&)pReqArgs->Get( nSlot )).GetValue();
switch ( nMode )
{
- case 1: nMode = KEY_SHIFT; break;
- case 2: nMode = KEY_MOD1; break; // Control-Taste
+ case 1: nMode = KEY_SHIFT; break;
+ case 2: nMode = KEY_MOD1; break; // Control-Taste
case 0:
default:
nMode = 0;
@@ -141,15 +141,15 @@ void ScCellShell::Execute( SfxRequest& rReq )
}
else
{
- // no arguments (also executed by double click on the status bar controller):
- // advance to next selection mode
+ // no arguments (also executed by double click on the status bar controller):
+ // advance to next selection mode
USHORT nModifiers = pTabViewShell->GetLockedModifiers();
switch ( nModifiers )
{
- case KEY_SHIFT: nModifiers = KEY_MOD1; break; // EXT -> ADD
- case KEY_MOD1: nModifiers = 0; break; // ADD -> STD
- default: nModifiers = KEY_SHIFT; break; // STD -> EXT
+ case KEY_SHIFT: nModifiers = KEY_MOD1; break; // EXT -> ADD
+ case KEY_MOD1: nModifiers = 0; break; // ADD -> STD
+ default: nModifiers = KEY_SHIFT; break; // STD -> EXT
}
pTabViewShell->LockModifiers( nModifiers );
}
@@ -158,14 +158,14 @@ void ScCellShell::Execute( SfxRequest& rReq )
rReq.Done();
break;
- // SID_STATUS_SELMODE_NORM wird nicht benutzt ???
+ // SID_STATUS_SELMODE_NORM wird nicht benutzt ???
case SID_STATUS_SELMODE_NORM:
pTabViewShell->LockModifiers( 0 );
rBindings.Invalidate( SID_STATUS_SELMODE );
break;
- // SID_STATUS_SELMODE_ERG / SID_STATUS_SELMODE_ERW als Toggles:
+ // SID_STATUS_SELMODE_ERG / SID_STATUS_SELMODE_ERW als Toggles:
case SID_STATUS_SELMODE_ERG:
if ( pTabViewShell->GetLockedModifiers() & KEY_MOD1 )
@@ -198,18 +198,18 @@ void ScCellShell::Execute( SfxRequest& rReq )
ScInputHandler* pHdl = SC_MOD()->GetInputHdl( pTabViewShell );
if ( !pHdl || !pHdl->IsInEnterHandler() )
{
- // #101061# UpdateInputHandler is needed after the cell content
- // has changed, but if called from EnterHandler, UpdateInputHandler
- // will be called later when moving the cursor.
+ // #101061# UpdateInputHandler is needed after the cell content
+ // has changed, but if called from EnterHandler, UpdateInputHandler
+ // will be called later when moving the cursor.
pTabViewShell->UpdateInputHandler();
}
rReq.Done();
- // hier kein GrabFocus, weil sonst auf dem Mac die Tabelle vor die
- // Seitenansicht springt, wenn die Eingabe nicht abgeschlossen war
- // (GrabFocus passiert in KillEditView)
+ // hier kein GrabFocus, weil sonst auf dem Mac die Tabelle vor die
+ // Seitenansicht springt, wenn die Eingabe nicht abgeschlossen war
+ // (GrabFocus passiert in KillEditView)
}
}
break;
@@ -265,7 +265,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
aCursorPos.Tab() == GetViewData()->GetTabNo()
)
{
- SfxStringItem aItem( SID_ENTER_STRING, aString );
+ SfxStringItem aItem( SID_ENTER_STRING, aString );
// SfxBindings& rBindings = pTabViewShell->GetViewFrame()->GetBindings();
const SfxPoolItem* aArgs[2];
@@ -295,9 +295,9 @@ void ScCellShell::Execute( SfxRequest& rReq )
}
- // hier kein GrabFocus, weil sonst auf dem Mac die Tabelle vor die
- // Seitenansicht springt, wenn die Eingabe nicht abgeschlossen war
- // (GrabFocus passiert in KillEditView)
+ // hier kein GrabFocus, weil sonst auf dem Mac die Tabelle vor die
+ // Seitenansicht springt, wenn die Eingabe nicht abgeschlossen war
+ // (GrabFocus passiert in KillEditView)
}
break;
@@ -314,7 +314,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
case SID_OPENDLG_CONSOLIDATE:
{
- USHORT nId = ScConsolidateDlgWrapper::GetChildWindowId();
+ USHORT nId = ScConsolidateDlgWrapper::GetChildWindowId();
SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
@@ -329,18 +329,18 @@ void ScCellShell::Execute( SfxRequest& rReq )
//----------------------------------
// Zellattribute ohne Dialog setzen:
//----------------------------------
- SfxItemSet* pEmptySet =
+ SfxItemSet* pEmptySet =
new SfxItemSet( *pReqArgs->GetPool(),
ATTR_PATTERN_START,
ATTR_PATTERN_END );
- SfxItemSet* pNewSet =
+ SfxItemSet* pNewSet =
new SfxItemSet( *pReqArgs->GetPool(),
ATTR_PATTERN_START,
ATTR_PATTERN_END );
- const SfxPoolItem* pAttr = NULL;
- USHORT nWhich = 0;
+ const SfxPoolItem* pAttr = NULL;
+ USHORT nWhich = 0;
for ( nWhich=ATTR_PATTERN_START; nWhich<=ATTR_PATTERN_END; nWhich++ )
if ( pReqArgs->GetItemState( nWhich, TRUE, &pAttr ) == SFX_ITEM_SET )
@@ -366,7 +366,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
case SID_OPENDLG_SOLVE:
{
- USHORT nId = ScSolverDlgWrapper::GetChildWindowId();
+ USHORT nId = ScSolverDlgWrapper::GetChildWindowId();
SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
@@ -386,7 +386,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
case SID_OPENDLG_TABOP:
{
- USHORT nId = ScTabOpDlgWrapper::GetChildWindowId();
+ USHORT nId = ScTabOpDlgWrapper::GetChildWindowId();
SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
@@ -439,8 +439,8 @@ void ScCellShell::Execute( SfxRequest& rReq )
aBaseName += ScGlobal::GetRscString(STR_SCENARIO);
aBaseName += '_';
- // 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 = pDoc->ValidTabName( aBaseName );
DBG_ASSERT(bPrefix, "ungueltiger Tabellenname");
@@ -471,8 +471,8 @@ void ScCellShell::Execute( SfxRequest& rReq )
if ( pReqArgs->GetItemState( SID_NEW_TABLENAME, TRUE, &pItem ) == SFX_ITEM_SET )
aArgComment = ((const SfxStringItem*)pItem)->GetValue();
- aColor = Color( COL_LIGHTGRAY ); // Default
- nFlags = 0; // nicht-TwoWay
+ aColor = Color( COL_LIGHTGRAY ); // Default
+ nFlags = 0; // nicht-TwoWay
pTabViewShell->MakeScenario( aArgName, aArgComment, aColor, nFlags );
if( ! rReq.IsAPI() )
@@ -482,7 +482,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
{
BOOL bSheetProtected = pDoc->IsTabProtected(nTab);
//CHINA001 ScNewScenarioDlg* pNewDlg =
- //CHINA001 new ScNewScenarioDlg( pTabViewShell->GetDialogParent(), aName, FALSE, bSheetProtected );
+ //CHINA001 new ScNewScenarioDlg( pTabViewShell->GetDialogParent(), aName, FALSE, bSheetProtected );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -533,17 +533,17 @@ void ScCellShell::Execute( SfxRequest& rReq )
else
{
ScViewData* pData = GetViewData();
- FieldUnit eMetric = SC_MOD()->GetAppOptions().GetAppMetric();
- USHORT nCurHeight = pData->GetDocument()->
+ FieldUnit eMetric = SC_MOD()->GetAppOptions().GetAppMetric();
+ USHORT nCurHeight = pData->GetDocument()->
GetRowHeight( pData->GetCurY(),
pData->GetTabNo() );
-//CHINA001 ScMetricInputDlg* pDlg =
-//CHINA001 new ScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_ROW_MAN,
-//CHINA001 nCurHeight,
-//CHINA001 ScGlobal::nStdRowHeight,
-//CHINA001 eMetric,
-//CHINA001 2,
-//CHINA001 MAX_COL_HEIGHT );
+//CHINA001 ScMetricInputDlg* pDlg =
+//CHINA001 new ScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_ROW_MAN,
+//CHINA001 nCurHeight,
+//CHINA001 ScGlobal::nStdRowHeight,
+//CHINA001 eMetric,
+//CHINA001 2,
+//CHINA001 MAX_COL_HEIGHT );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -589,13 +589,13 @@ void ScCellShell::Execute( SfxRequest& rReq )
{
FieldUnit eMetric = SC_MOD()->GetAppOptions().GetAppMetric();
-//CHINA001 ScMetricInputDlg* pDlg =
-//CHINA001 new ScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_ROW_OPT,
-//CHINA001 ScGlobal::nLastRowHeightExtra,
-//CHINA001 0,
-//CHINA001 eMetric,
-//CHINA001 1,
-//CHINA001 MAX_EXTRA_HEIGHT );
+//CHINA001 ScMetricInputDlg* pDlg =
+//CHINA001 new ScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_ROW_OPT,
+//CHINA001 ScGlobal::nLastRowHeightExtra,
+//CHINA001 0,
+//CHINA001 eMetric,
+//CHINA001 1,
+//CHINA001 MAX_EXTRA_HEIGHT );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -638,18 +638,18 @@ void ScCellShell::Execute( SfxRequest& rReq )
}
else
{
- FieldUnit eMetric = SC_MOD()->GetAppOptions().GetAppMetric();
+ FieldUnit eMetric = SC_MOD()->GetAppOptions().GetAppMetric();
ScViewData* pData = GetViewData();
- USHORT nCurHeight = pData->GetDocument()->
+ USHORT nCurHeight = pData->GetDocument()->
GetColWidth( pData->GetCurX(),
pData->GetTabNo() );
-//CHINA001 ScMetricInputDlg* pDlg =
-//CHINA001 new ScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_COL_MAN,
-//CHINA001 nCurHeight,
-//CHINA001 STD_COL_WIDTH,
-//CHINA001 eMetric,
-//CHINA001 2,
-//CHINA001 MAX_COL_WIDTH );
+//CHINA001 ScMetricInputDlg* pDlg =
+//CHINA001 new ScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_COL_MAN,
+//CHINA001 nCurHeight,
+//CHINA001 STD_COL_WIDTH,
+//CHINA001 eMetric,
+//CHINA001 2,
+//CHINA001 MAX_COL_WIDTH );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -695,13 +695,13 @@ void ScCellShell::Execute( SfxRequest& rReq )
{
FieldUnit eMetric = SC_MOD()->GetAppOptions().GetAppMetric();
-//CHINA001 ScMetricInputDlg* pDlg =
-//CHINA001 new ScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_COL_OPT,
-//CHINA001 ScGlobal::nLastColWidthExtra,
-//CHINA001 STD_EXTRA_WIDTH,
-//CHINA001 eMetric,
-//CHINA001 1,
-//CHINA001 MAX_EXTRA_WIDTH );
+//CHINA001 ScMetricInputDlg* pDlg =
+//CHINA001 new ScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_COL_OPT,
+//CHINA001 ScGlobal::nLastColWidthExtra,
+//CHINA001 STD_EXTRA_WIDTH,
+//CHINA001 eMetric,
+//CHINA001 1,
+//CHINA001 MAX_EXTRA_WIDTH );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -856,11 +856,11 @@ void ScCellShell::Execute( SfxRequest& rReq )
{
ScGlobal::ClearAutoFormat();
ScAutoFormatData* pNewEntry = pTabViewShell->CreateAutoFormatData();
-//CHINA001 ScAutoFormatDlg* pDlg = new ScAutoFormatDlg(
-//CHINA001 pDlgParent,
-//CHINA001 ScGlobal::GetAutoFormat(),
-//CHINA001 pNewEntry,
-//CHINA001 GetViewData()->GetDocument() );
+//CHINA001 ScAutoFormatDlg* pDlg = new ScAutoFormatDlg(
+//CHINA001 pDlgParent,
+//CHINA001 ScGlobal::GetAutoFormat(),
+//CHINA001 pNewEntry,
+//CHINA001 GetViewData()->GetDocument() );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -899,7 +899,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
else if (pTabViewShell->HasPaintBrush())
pTabViewShell->ResetBrushDocument(); // abort format paint brush
else if (pTabViewShell->HasHintWindow())
- pTabViewShell->RemoveHintWindow(); // Eingabemeldung abschalten
+ pTabViewShell->RemoveHintWindow(); // Eingabemeldung abschalten
else if( ScViewUtil::IsFullScreen( *pTabViewShell ) )
ScViewUtil::SetFullScreen( *pTabViewShell, false );
else
@@ -915,7 +915,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
//}
}
-// SetSumAssignMode(); //ScInputWindow
+// SetSumAssignMode(); //ScInputWindow
}
break;
@@ -933,7 +933,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
case SID_OPENDLG_CONDFRMT:
{
- USHORT nId = ScCondFormatDlgWrapper::GetChildWindowId();
+ USHORT nId = ScCondFormatDlgWrapper::GetChildWindowId();
SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
@@ -941,7 +941,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
}
break;
- // ----------------------------------------------------------------
+ // ----------------------------------------------------------------
case FID_INPUTLINE_STATUS:
DBG_ERROR("Execute von InputLine-Status");
@@ -949,7 +949,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
case SID_STATUS_DOCPOS:
// Launch navigator.
- GetViewData()->GetDispatcher().Execute(
+ GetViewData()->GetDispatcher().Execute(
SID_NAVIGATOR, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD );
break;
diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx
index e8419a24c80f..2c451fb82e71 100644
--- a/sc/source/ui/view/cellsh4.cxx
+++ b/sc/source/ui/view/cellsh4.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +59,16 @@
void ScCellShell::ExecuteCursor( SfxRequest& rReq )
{
ScViewData* pData = GetViewData();
- ScTabViewShell* pTabViewShell = pData->GetViewShell();
- const SfxItemSet* pReqArgs = rReq.GetArgs();
- USHORT nSlotId = rReq.GetSlot();
- SCsCOLROW nRepeat = 1;
- BOOL bSel = FALSE;
- BOOL bKeep = FALSE;
+ ScTabViewShell* pTabViewShell = pData->GetViewShell();
+ const SfxItemSet* pReqArgs = rReq.GetArgs();
+ USHORT nSlotId = rReq.GetSlot();
+ SCsCOLROW nRepeat = 1;
+ BOOL bSel = FALSE;
+ BOOL bKeep = FALSE;
if ( pReqArgs != NULL )
{
- const SfxPoolItem* pItem;
+ const SfxPoolItem* pItem;
if( IS_AVAILABLE( FN_PARAM_1, &pItem ) )
nRepeat = static_cast<SCsCOLROW>(((const SfxInt16Item*)pItem)->GetValue());
if( IS_AVAILABLE( FN_PARAM_2, &pItem ) )
@@ -76,11 +76,11 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
}
else
{
- // evaluate locked selection mode
+ // evaluate locked selection mode
USHORT nLocked = pTabViewShell->GetLockedModifiers();
if ( nLocked & KEY_SHIFT )
- bSel = TRUE; // EXT
+ bSel = TRUE; // EXT
else if ( nLocked & KEY_MOD1 )
{
// ADD mode: keep the selection, start a new block when marking with shift again
@@ -92,7 +92,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
SCsCOLROW nRTLSign = 1;
if ( pData->GetDocument()->IsLayoutRTL( pData->GetTabNo() ) )
{
- //! evaluate cursor movement option?
+ //! evaluate cursor movement option?
nRTLSign = -1;
}
@@ -104,7 +104,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
switch ( nSlotId )
{
case SID_CURSORDOWN:
- pTabViewShell->MoveCursorRel( 0, nRepeat, SC_FOLLOW_LINE, bSel, bKeep );
+ pTabViewShell->MoveCursorRel( 0, nRepeat, SC_FOLLOW_LINE, bSel, bKeep );
break;
case SID_CURSORBLKDOWN:
@@ -112,7 +112,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
break;
case SID_CURSORUP:
- pTabViewShell->MoveCursorRel( 0, -nRepeat, SC_FOLLOW_LINE, bSel, bKeep );
+ pTabViewShell->MoveCursorRel( 0, -nRepeat, SC_FOLLOW_LINE, bSel, bKeep );
break;
case SID_CURSORBLKUP:
@@ -128,7 +128,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
break;
case SID_CURSORRIGHT:
- pTabViewShell->MoveCursorRel( static_cast<SCsCOL>(nRepeat * nRTLSign), 0, SC_FOLLOW_LINE, bSel, bKeep );
+ pTabViewShell->MoveCursorRel( static_cast<SCsCOL>(nRepeat * nRTLSign), 0, SC_FOLLOW_LINE, bSel, bKeep );
break;
case SID_CURSORBLKRIGHT:
@@ -136,11 +136,11 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq )
break;
case SID_CURSORPAGEDOWN:
- pTabViewShell->MoveCursorPage( 0, nRepeat, SC_FOLLOW_FIX, bSel, bKeep );
+ pTabViewShell->MoveCursorPage( 0, nRepeat, SC_FOLLOW_FIX, bSel, bKeep );
break;
case SID_CURSORPAGEUP:
- pTabViewShell->MoveCursorPage( 0, -nRepeat, SC_FOLLOW_FIX, bSel, bKeep );
+ pTabViewShell->MoveCursorPage( 0, -nRepeat, SC_FOLLOW_FIX, bSel, bKeep );
break;
case SID_CURSORPAGERIGHT_: //XXX !!!
@@ -169,31 +169,31 @@ void ScCellShell::GetStateCursor( SfxItemSet& /* rSet */ )
void ScCellShell::ExecuteCursorSel( SfxRequest& rReq )
{
- const SfxItemSet* pReqArgs = rReq.GetArgs();
- USHORT nSlotId = rReq.GetSlot();
- short nRepeat = 1;
+ const SfxItemSet* pReqArgs = rReq.GetArgs();
+ USHORT nSlotId = rReq.GetSlot();
+ short nRepeat = 1;
if ( pReqArgs != NULL )
{
- const SfxPoolItem* pItem;
+ const SfxPoolItem* pItem;
if( IS_AVAILABLE( FN_PARAM_1, &pItem ) )
nRepeat = ((const SfxInt16Item*)pItem)->GetValue();
}
switch ( nSlotId )
{
- case SID_CURSORDOWN_SEL: rReq.SetSlot( SID_CURSORDOWN ); break;
- case SID_CURSORBLKDOWN_SEL: rReq.SetSlot( SID_CURSORBLKDOWN ); break;
- case SID_CURSORUP_SEL: rReq.SetSlot( SID_CURSORUP ); break;
- case SID_CURSORBLKUP_SEL: rReq.SetSlot( SID_CURSORBLKUP ); break;
- case SID_CURSORLEFT_SEL: rReq.SetSlot( SID_CURSORLEFT ); break;
- case SID_CURSORBLKLEFT_SEL: rReq.SetSlot( SID_CURSORBLKLEFT ); break;
- case SID_CURSORRIGHT_SEL: rReq.SetSlot( SID_CURSORRIGHT ); break;
- case SID_CURSORBLKRIGHT_SEL: rReq.SetSlot( SID_CURSORBLKRIGHT ); break;
- case SID_CURSORPAGEDOWN_SEL: rReq.SetSlot( SID_CURSORPAGEDOWN ); break;
- case SID_CURSORPAGEUP_SEL: rReq.SetSlot( SID_CURSORPAGEUP ); break;
- case SID_CURSORPAGERIGHT_SEL: rReq.SetSlot( SID_CURSORPAGERIGHT_ ); break;
- case SID_CURSORPAGELEFT_SEL: rReq.SetSlot( SID_CURSORPAGELEFT_ ); break;
+ case SID_CURSORDOWN_SEL: rReq.SetSlot( SID_CURSORDOWN ); break;
+ case SID_CURSORBLKDOWN_SEL: rReq.SetSlot( SID_CURSORBLKDOWN ); break;
+ case SID_CURSORUP_SEL: rReq.SetSlot( SID_CURSORUP ); break;
+ case SID_CURSORBLKUP_SEL: rReq.SetSlot( SID_CURSORBLKUP ); break;
+ case SID_CURSORLEFT_SEL: rReq.SetSlot( SID_CURSORLEFT ); break;
+ case SID_CURSORBLKLEFT_SEL: rReq.SetSlot( SID_CURSORBLKLEFT ); break;
+ case SID_CURSORRIGHT_SEL: rReq.SetSlot( SID_CURSORRIGHT ); break;
+ case SID_CURSORBLKRIGHT_SEL: rReq.SetSlot( SID_CURSORBLKRIGHT ); break;
+ case SID_CURSORPAGEDOWN_SEL: rReq.SetSlot( SID_CURSORPAGEDOWN ); break;
+ case SID_CURSORPAGEUP_SEL: rReq.SetSlot( SID_CURSORPAGEUP ); break;
+ case SID_CURSORPAGERIGHT_SEL: rReq.SetSlot( SID_CURSORPAGERIGHT_ ); break;
+ case SID_CURSORPAGELEFT_SEL: rReq.SetSlot( SID_CURSORPAGELEFT_ ); break;
default:
DBG_ERROR("Unbekannte Message bei ViewShell (CursorSel)");
return;
@@ -205,7 +205,7 @@ void ScCellShell::ExecuteCursorSel( SfxRequest& rReq )
void ScCellShell::ExecuteMove( SfxRequest& rReq )
{
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
USHORT nSlotId = rReq.GetSlot();
if(nSlotId != SID_CURSORTOPOFSCREEN && nSlotId != SID_CURSORENDOFSCREEN)
@@ -222,8 +222,8 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq )
pTabViewShell->SelectNextTab( -1, (nSlotId == SID_PREV_TABLE_SEL) );
break;
- // Cursorbewegungen in Bloecken gehen nicht von Basic aus,
- // weil das ScSbxRange-Objekt bei Eingaben die Markierung veraendert
+ // Cursorbewegungen in Bloecken gehen nicht von Basic aus,
+ // weil das ScSbxRange-Objekt bei Eingaben die Markierung veraendert
case SID_NEXT_UNPROTECT:
pTabViewShell->FindNextUnprot( FALSE, !rReq.IsAPI() );
@@ -305,13 +305,13 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq )
void ScCellShell::ExecutePageSel( SfxRequest& rReq )
{
- USHORT nSlotId = rReq.GetSlot();
+ USHORT nSlotId = rReq.GetSlot();
switch ( nSlotId )
{
- case SID_CURSORHOME_SEL: rReq.SetSlot( SID_CURSORHOME ); break;
- case SID_CURSOREND_SEL: rReq.SetSlot( SID_CURSOREND ); break;
- case SID_CURSORTOPOFFILE_SEL: rReq.SetSlot( SID_CURSORTOPOFFILE ); break;
- case SID_CURSORENDOFFILE_SEL: rReq.SetSlot( SID_CURSORENDOFFILE ); break;
+ case SID_CURSORHOME_SEL: rReq.SetSlot( SID_CURSORHOME ); break;
+ case SID_CURSOREND_SEL: rReq.SetSlot( SID_CURSOREND ); break;
+ case SID_CURSORTOPOFFILE_SEL: rReq.SetSlot( SID_CURSORTOPOFFILE ); break;
+ case SID_CURSORENDOFFILE_SEL: rReq.SetSlot( SID_CURSORENDOFFILE ); break;
default:
DBG_ERROR("Unbekannte Message bei ViewShell (ExecutePageSel)");
return;
@@ -322,25 +322,25 @@ void ScCellShell::ExecutePageSel( SfxRequest& rReq )
void ScCellShell::ExecutePage( SfxRequest& rReq )
{
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
- const SfxItemSet* pReqArgs = rReq.GetArgs();
- USHORT nSlotId = rReq.GetSlot();
- BOOL bSel = FALSE;
- BOOL bKeep = FALSE;
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ const SfxItemSet* pReqArgs = rReq.GetArgs();
+ USHORT nSlotId = rReq.GetSlot();
+ BOOL bSel = FALSE;
+ BOOL bKeep = FALSE;
if ( pReqArgs != NULL )
{
- const SfxPoolItem* pItem;
+ const SfxPoolItem* pItem;
if( IS_AVAILABLE( FN_PARAM_2, &pItem ) )
bSel = ((const SfxBoolItem*)pItem)->GetValue();
}
else
{
- // evaluate locked selection mode
+ // evaluate locked selection mode
USHORT nLocked = pTabViewShell->GetLockedModifiers();
if ( nLocked & KEY_SHIFT )
- bSel = TRUE; // EXT
+ bSel = TRUE; // EXT
else if ( nLocked & KEY_MOD1 )
{
// ADD mode: keep the selection, start a new block when marking with shift again
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index d802c08f642f..80c794d152f4 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -116,7 +116,7 @@ void ScColBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize )
{
USHORT nSizeTwips;
ScSizeMode eMode = SC_SIZE_DIRECT;
- if (nNewSize>0 && nNewSize<10) nNewSize=10; // (Pixel)
+ if (nNewSize>0 && nNewSize<10) nNewSize=10; // (Pixel)
if ( nNewSize == HDR_SIZE_OPTIMUM )
{
@@ -127,7 +127,7 @@ void ScColBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize )
nSizeTwips = (USHORT) ( nNewSize / pViewData->GetPPTX() );
ScMarkData& rMark = pViewData->GetMarkData();
-// SCTAB nTab = pViewData->GetTabNo();
+// SCTAB nTab = pViewData->GetTabNo();
SCCOLROW* pRanges = new SCCOLROW[MAXCOL+1];
SCCOL nRangeCnt = 0;
@@ -186,19 +186,19 @@ void ScColBar::SelectWindow()
{
ScTabViewShell* pViewSh = pViewData->GetViewShell();
- pViewSh->SetActive(); // Appear und SetViewFrame
+ pViewSh->SetActive(); // Appear und SetViewFrame
pViewSh->DrawDeselectAll();
ScSplitPos eActive = pViewData->GetActivePart();
if (eWhich==SC_SPLIT_LEFT)
{
- if (eActive==SC_SPLIT_TOPRIGHT) eActive=SC_SPLIT_TOPLEFT;
- if (eActive==SC_SPLIT_BOTTOMRIGHT) eActive=SC_SPLIT_BOTTOMLEFT;
+ if (eActive==SC_SPLIT_TOPRIGHT) eActive=SC_SPLIT_TOPLEFT;
+ if (eActive==SC_SPLIT_BOTTOMRIGHT) eActive=SC_SPLIT_BOTTOMLEFT;
}
else
{
- if (eActive==SC_SPLIT_TOPLEFT) eActive=SC_SPLIT_TOPRIGHT;
- if (eActive==SC_SPLIT_BOTTOMLEFT) eActive=SC_SPLIT_BOTTOMRIGHT;
+ if (eActive==SC_SPLIT_TOPLEFT) eActive=SC_SPLIT_TOPRIGHT;
+ if (eActive==SC_SPLIT_BOTTOMLEFT) eActive=SC_SPLIT_BOTTOMRIGHT;
}
pViewSh->ActivatePart( eActive );
@@ -235,7 +235,7 @@ String ScColBar::GetDragHelp( long nVal )
return lcl_MetricString( nTwips, ScGlobal::GetRscString(STR_TIP_WIDTH) );
}
-BOOL ScColBar::IsLayoutRTL() // overloaded only for columns
+BOOL ScColBar::IsLayoutRTL() // overloaded only for columns
{
return pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() );
}
@@ -283,7 +283,7 @@ void ScRowBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize )
{
USHORT nSizeTwips;
ScSizeMode eMode = SC_SIZE_DIRECT;
- if (nNewSize>0 && nNewSize<10) nNewSize=10; // (Pixel)
+ if (nNewSize>0 && nNewSize<10) nNewSize=10; // (Pixel)
if ( nNewSize == HDR_SIZE_OPTIMUM )
{
@@ -294,7 +294,7 @@ void ScRowBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize )
nSizeTwips = (USHORT) ( nNewSize / pViewData->GetPPTY() );
ScMarkData& rMark = pViewData->GetMarkData();
-// SCTAB nTab = pViewData->GetTabNo();
+// SCTAB nTab = pViewData->GetTabNo();
SCCOLROW* pRanges = new SCCOLROW[MAXROW+1];
SCROW nRangeCnt = 0;
@@ -353,19 +353,19 @@ void ScRowBar::SelectWindow()
{
ScTabViewShell* pViewSh = pViewData->GetViewShell();
- pViewSh->SetActive(); // Appear und SetViewFrame
+ pViewSh->SetActive(); // Appear und SetViewFrame
pViewSh->DrawDeselectAll();
ScSplitPos eActive = pViewData->GetActivePart();
if (eWhich==SC_SPLIT_TOP)
{
- if (eActive==SC_SPLIT_BOTTOMLEFT) eActive=SC_SPLIT_TOPLEFT;
- if (eActive==SC_SPLIT_BOTTOMRIGHT) eActive=SC_SPLIT_TOPRIGHT;
+ if (eActive==SC_SPLIT_BOTTOMLEFT) eActive=SC_SPLIT_TOPLEFT;
+ if (eActive==SC_SPLIT_BOTTOMRIGHT) eActive=SC_SPLIT_TOPRIGHT;
}
else
{
- if (eActive==SC_SPLIT_TOPLEFT) eActive=SC_SPLIT_BOTTOMLEFT;
- if (eActive==SC_SPLIT_TOPRIGHT) eActive=SC_SPLIT_BOTTOMRIGHT;
+ if (eActive==SC_SPLIT_TOPLEFT) eActive=SC_SPLIT_BOTTOMLEFT;
+ if (eActive==SC_SPLIT_TOPRIGHT) eActive=SC_SPLIT_BOTTOMRIGHT;
}
pViewSh->ActivatePart( eActive );
@@ -402,7 +402,7 @@ String ScRowBar::GetDragHelp( long nVal )
return lcl_MetricString( nTwips, ScGlobal::GetRscString(STR_TIP_HEIGHT) );
}
-// GetHiddenCount ist nur fuer Zeilen ueberladen
+// GetHiddenCount ist nur fuer Zeilen ueberladen
SCROW ScRowBar::GetHiddenCount( SCROW nEntryNo )
{
@@ -411,7 +411,7 @@ SCROW ScRowBar::GetHiddenCount( SCROW nEntryNo )
return pDoc->GetHiddenRowCount( nEntryNo, nTab );
}
-BOOL ScRowBar::IsMirrored() // overloaded only for rows
+BOOL ScRowBar::IsMirrored() // overloaded only for rows
{
return pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() );
}
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index 1e5a6b9da4ae..308df116b39d 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScDBFunc::~ScDBFunc()
}
//
-// Hilfsfunktionen
+// Hilfsfunktionen
//
void ScDBFunc::GotoDBArea( const String& rDBName )
@@ -93,7 +93,7 @@ void ScDBFunc::GotoDBArea( const String& rDBName )
SetTabNo( nTab );
MoveCursorAbs( nStartCol, nStartRow, ScFollowMode( SC_FOLLOW_JUMP ),
- FALSE, FALSE ); // bShift,bControl
+ FALSE, FALSE ); // bShift,bControl
DoneBlockMode();
InitBlockMode( nStartCol, nStartRow, nTab );
MarkCursor( nEndCol, nEndRow, nTab );
@@ -102,7 +102,7 @@ void ScDBFunc::GotoDBArea( const String& rDBName )
}
}
-// aktuellen Datenbereich fuer Sortieren / Filtern suchen
+// aktuellen Datenbereich fuer Sortieren / Filtern suchen
ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection eSel )
{
@@ -115,20 +115,20 @@ ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection e
bool bShrinkColumnsOnly = false;
if (eSel == SC_DBSEL_ROW_DOWN)
{
- // Don't alter row range, additional rows may have been selected on
+ // Don't alter row range, additional rows may have been selected on
// purpose to append data, or to have a fake header row.
bShrinkColumnsOnly = true;
- // Select further rows only if only one row or a portion thereof is
+ // Select further rows only if only one row or a portion thereof is
// selected.
if (aRange.aStart.Row() != aRange.aEnd.Row())
{
- // If an area is selected shrink that to the actual used
+ // If an area is selected shrink that to the actual used
// columns, don't draw filter buttons for empty columns.
eSel = SC_DBSEL_SHRINK_TO_USED_DATA;
}
else if (aRange.aStart.Col() == aRange.aEnd.Col())
{
- // One cell only, if it is not marked obtain entire used data
+ // One cell only, if it is not marked obtain entire used data
// area.
const ScMarkData& rMarkData = GetViewData()->GetMarkData();
if (!(rMarkData.IsMarked() || rMarkData.IsMultiMarked()))
@@ -188,7 +188,7 @@ ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection e
return pData;
}
-// Datenbankbereiche aendern (Dialog)
+// Datenbankbereiche aendern (Dialog)
void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rDelAreaList )
{
@@ -214,18 +214,18 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List&
rStart.Col(), rStart.Row(),
rEnd.Col(), rEnd.Row() );
- // Targets am SBA abmelden nicht mehr noetig
+ // Targets am SBA abmelden nicht mehr noetig
}
}
if (bRecord)
pUndoColl = new ScDBCollection( *pOldColl );
- // neue Targets am SBA anmelden nicht mehr noetig
+ // neue Targets am SBA anmelden nicht mehr noetig
- pDoc->CompileDBFormula( TRUE ); // CreateFormulaString
+ pDoc->CompileDBFormula( TRUE ); // CreateFormulaString
pDoc->SetDBCollection( new ScDBCollection( rNewColl ) );
- pDoc->CompileDBFormula( FALSE ); // CompileFormulaString
+ pDoc->CompileDBFormula( FALSE ); // CompileFormulaString
pOldColl = NULL;
pDocShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID );
aModificator.SetDocumentModified();
@@ -240,7 +240,7 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List&
}
//
-// wirkliche Funktionen
+// wirkliche Funktionen
//
// Sortieren
@@ -262,13 +262,13 @@ void ScDBFunc::UISort( const ScSortParam& rSortParam, BOOL bRecord )
pDBData->GetSubTotalParam( aSubTotalParam );
if (aSubTotalParam.bGroupActive[0] && !aSubTotalParam.bRemoveOnly)
{
- // Subtotals wiederholen, mit neuer Sortierung
+ // Subtotals wiederholen, mit neuer Sortierung
DoSubTotals( aSubTotalParam, bRecord, &rSortParam );
}
else
{
- Sort( rSortParam, bRecord ); // nur sortieren
+ Sort( rSortParam, bRecord ); // nur sortieren
}
}
@@ -280,7 +280,7 @@ void ScDBFunc::Sort( const ScSortParam& rSortParam, BOOL bRecord, BOOL bPaint )
BOOL bSuccess = aDBDocFunc.Sort( nTab, rSortParam, bRecord, bPaint, FALSE );
if ( bSuccess && !rSortParam.bInplace )
{
- // Ziel markieren
+ // Ziel markieren
ScRange aDestRange( rSortParam.nDestCol, rSortParam.nDestRow, rSortParam.nDestTab,
rSortParam.nDestCol + rSortParam.nCol2 - rSortParam.nCol1,
rSortParam.nDestRow + rSortParam.nRow2 - rSortParam.nRow1,
@@ -289,7 +289,7 @@ void ScDBFunc::Sort( const ScSortParam& rSortParam, BOOL bRecord, BOOL bPaint )
}
}
-// Filtern
+// Filtern
void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource, BOOL bRecord )
{
@@ -303,7 +303,7 @@ void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource
BOOL bCopy = !rQueryParam.bInplace;
if (bCopy)
{
- // Zielbereich markieren (DB-Bereich wurde ggf. angelegt)
+ // Zielbereich markieren (DB-Bereich wurde ggf. angelegt)
ScDocument* pDoc = pDocSh->GetDocument();
ScDBData* pDestData = pDoc->GetDBAtCursor(
rQueryParam.nDestCol, rQueryParam.nDestRow,
@@ -326,18 +326,18 @@ void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource
}
}
-// Autofilter-Knoepfe ein-/ausblenden
+// Autofilter-Knoepfe ein-/ausblenden
void ScDBFunc::ToggleAutoFilter()
{
ScDocShell* pDocSh = GetViewData()->GetDocShell();
ScDocShellModificator aModificator( *pDocSh );
- ScQueryParam aParam;
- ScDocument* pDoc = GetViewData()->GetDocument();
- ScDBData* pDBData = GetDBData( FALSE, SC_DB_MAKE, SC_DBSEL_ROW_DOWN );
+ ScQueryParam aParam;
+ ScDocument* pDoc = GetViewData()->GetDocument();
+ ScDBData* pDBData = GetDBData( FALSE, SC_DB_MAKE, SC_DBSEL_ROW_DOWN );
- pDBData->SetByRow( TRUE ); //! Undo, vorher abfragen ??
+ pDBData->SetByRow( TRUE ); //! Undo, vorher abfragen ??
pDBData->GetQueryParam( aParam );
@@ -345,11 +345,11 @@ void ScDBFunc::ToggleAutoFilter()
SCROW nRow = aParam.nRow1;
SCTAB nTab = GetViewData()->GetTabNo();
INT16 nFlag;
- BOOL bHasAuto = TRUE;
- BOOL bHeader = pDBData->HasHeader();
- BOOL bPaint = FALSE;
+ BOOL bHasAuto = TRUE;
+ BOOL bHeader = pDBData->HasHeader();
+ BOOL bPaint = FALSE;
- //! stattdessen aus DB-Bereich abfragen?
+ //! stattdessen aus DB-Bereich abfragen?
for (nCol=aParam.nCol1; nCol<=aParam.nCol2 && bHasAuto; nCol++)
{
@@ -360,9 +360,9 @@ void ScDBFunc::ToggleAutoFilter()
bHasAuto = FALSE;
}
- if (bHasAuto) // aufheben
+ if (bHasAuto) // aufheben
{
- // Filterknoepfe ausblenden
+ // Filterknoepfe ausblenden
for (nCol=aParam.nCol1; nCol<=aParam.nCol2; nCol++)
{
@@ -383,7 +383,7 @@ void ScDBFunc::ToggleAutoFilter()
pDBData->SetAutoFilter(FALSE);
- // Filter aufheben (incl. Paint / Undo)
+ // Filter aufheben (incl. Paint / Undo)
SCSIZE nEC = aParam.GetEntryCount();
for (SCSIZE i=0; i<nEC; i++)
@@ -395,7 +395,7 @@ void ScDBFunc::ToggleAutoFilter()
bPaint = TRUE;
}
- else // Filterknoepfe einblenden
+ else // Filterknoepfe einblenden
{
if ( !pDoc->IsBlockEmpty( nTab,
aParam.nCol1, aParam.nRow1,
@@ -404,11 +404,11 @@ void ScDBFunc::ToggleAutoFilter()
if (!bHeader)
{
if ( MessBox( GetViewData()->GetDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
- ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ), // "StarCalc"
- ScGlobal::GetRscString( STR_MSSG_MAKEAUTOFILTER_0 ) // Koepfe aus erster Zeile?
+ ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ), // "StarCalc"
+ ScGlobal::GetRscString( STR_MSSG_MAKEAUTOFILTER_0 ) // Koepfe aus erster Zeile?
).Execute() == RET_YES )
{
- pDBData->SetHeader( TRUE ); //! Undo ??
+ pDBData->SetHeader( TRUE ); //! Undo ??
bHeader = TRUE;
}
}
@@ -448,7 +448,7 @@ void ScDBFunc::ToggleAutoFilter()
}
}
-// nur ausblenden, keine Daten veraendern
+// nur ausblenden, keine Daten veraendern
void ScDBFunc::HideAutoFilter()
{
@@ -487,7 +487,7 @@ void ScDBFunc::HideAutoFilter()
rBindings.Invalidate( SID_AUTOFILTER_HIDE );
}
-// Re-Import
+// Re-Import
BOOL ScDBFunc::ImportData( const ScImportParam& rParam, BOOL bRecord )
{
diff --git a/sc/source/ui/view/dbfunc2.cxx b/sc/source/ui/view/dbfunc2.cxx
index 54ddde9b7710..faa37bd72604 100644
--- a/sc/source/ui/view/dbfunc2.cxx
+++ b/sc/source/ui/view/dbfunc2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index dbdeae1ae0b1..7e9518f9735d 100755
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +107,10 @@ using ::std::hash_set;
//==================================================================
//
-// Outliner
+// Outliner
//
-// Outline-Gruppierung erzeugen
+// Outline-Gruppierung erzeugen
void ScDBFunc::MakeOutline( BOOL bColumns, BOOL bRecord )
{
@@ -125,7 +125,7 @@ void ScDBFunc::MakeOutline( BOOL bColumns, BOOL bRecord )
ErrorMessage(STR_NOMULTISELECT);
}
-// Outline-Gruppierung loeschen
+// Outline-Gruppierung loeschen
void ScDBFunc::RemoveOutline( BOOL bColumns, BOOL bRecord )
{
@@ -140,7 +140,7 @@ void ScDBFunc::RemoveOutline( BOOL bColumns, BOOL bRecord )
ErrorMessage(STR_NOMULTISELECT);
}
-// Menue-Status: Outlines loeschen
+// Menue-Status: Outlines loeschen
void ScDBFunc::TestRemoveOutline( BOOL& rCol, BOOL& rRow )
{
@@ -164,9 +164,9 @@ void ScDBFunc::TestRemoveOutline( BOOL& rCol, BOOL& rRow )
BOOL bColMarked = ( nStartRow == 0 && nEndRow == MAXROW );
BOOL bRowMarked = ( nStartCol == 0 && nEndCol == MAXCOL );
- // Spalten
+ // Spalten
- if ( !bRowMarked || bColMarked ) // nicht wenn ganze Zeilen markiert
+ if ( !bRowMarked || bColMarked ) // nicht wenn ganze Zeilen markiert
{
pArray = pTable->GetColArray();
ScSubOutlineIterator aColIter( pArray );
@@ -179,9 +179,9 @@ void ScDBFunc::TestRemoveOutline( BOOL& rCol, BOOL& rRow )
}
}
- // Zeilen
+ // Zeilen
- if ( !bColMarked || bRowMarked ) // nicht wenn ganze Spalten markiert
+ if ( !bColMarked || bRowMarked ) // nicht wenn ganze Spalten markiert
{
pArray = pTable->GetRowArray();
ScSubOutlineIterator aRowIter( pArray );
@@ -214,12 +214,12 @@ void ScDBFunc::RemoveAllOutlines( BOOL bRecord )
UpdateScrollBars();
}
-// Auto-Outlines
+// Auto-Outlines
void ScDBFunc::AutoOutline( BOOL bRecord )
{
SCTAB nTab = GetViewData()->GetTabNo();
- ScRange aRange( 0,0,nTab, MAXCOL,MAXROW,nTab ); // ganze Tabelle, wenn nichts markiert
+ ScRange aRange( 0,0,nTab, MAXCOL,MAXROW,nTab ); // ganze Tabelle, wenn nichts markiert
ScMarkData& rMark = GetViewData()->GetMarkData();
if ( rMark.IsMarked() || rMark.IsMultiMarked() )
{
@@ -232,7 +232,7 @@ void ScDBFunc::AutoOutline( BOOL bRecord )
aFunc.AutoOutline( aRange, bRecord, FALSE );
}
-// Outline-Ebene auswaehlen
+// Outline-Ebene auswaehlen
void ScDBFunc::SelectLevel( BOOL bColumns, USHORT nLevel, BOOL bRecord, BOOL bPaint )
{
@@ -248,7 +248,7 @@ void ScDBFunc::SelectLevel( BOOL bColumns, USHORT nLevel, BOOL bRecord, BOOL bPa
UpdateScrollBars();
}
-// einzelne Outline-Gruppe einblenden
+// einzelne Outline-Gruppe einblenden
void ScDBFunc::ShowOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bRecord, BOOL bPaint )
{
@@ -264,7 +264,7 @@ void ScDBFunc::ShowOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bR
UpdateScrollBars();
}
-// einzelne Outline-Gruppe ausblenden
+// einzelne Outline-Gruppe ausblenden
void ScDBFunc::HideOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bRecord, BOOL bPaint )
{
@@ -280,7 +280,7 @@ void ScDBFunc::HideOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bR
UpdateScrollBars();
}
-// Menue-Status: markierten Bereich ein-/ausblenden
+// Menue-Status: markierten Bereich ein-/ausblenden
BOOL ScDBFunc::OutlinePossible(BOOL bHide)
{
@@ -305,7 +305,7 @@ BOOL ScDBFunc::OutlinePossible(BOOL bHide)
SCCOLROW nStart;
SCCOLROW nEnd;
- // Spalten
+ // Spalten
pArray = pTable->GetColArray();
ScSubOutlineIterator aColIter( pArray );
@@ -327,7 +327,7 @@ BOOL ScDBFunc::OutlinePossible(BOOL bHide)
}
}
- // Zeilen
+ // Zeilen
pArray = pTable->GetRowArray();
ScSubOutlineIterator aRowIter( pArray );
@@ -354,7 +354,7 @@ BOOL ScDBFunc::OutlinePossible(BOOL bHide)
return bEnable;
}
-// markierten Bereich einblenden
+// markierten Bereich einblenden
void ScDBFunc::ShowMarkedOutlines( BOOL bRecord )
{
@@ -373,7 +373,7 @@ void ScDBFunc::ShowMarkedOutlines( BOOL bRecord )
ErrorMessage(STR_NOMULTISELECT);
}
-// markierten Bereich ausblenden
+// markierten Bereich ausblenden
void ScDBFunc::HideMarkedOutlines( BOOL bRecord )
{
@@ -392,16 +392,16 @@ void ScDBFunc::HideMarkedOutlines( BOOL bRecord )
ErrorMessage(STR_NOMULTISELECT);
}
-// --------------------------------------------------------------------------
+// --------------------------------------------------------------------------
//
-// Teilergebnisse
+// Teilergebnisse
//
void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
const ScSortParam* pForceNewSort )
{
- BOOL bDo = !rParam.bRemoveOnly; // FALSE = nur loeschen
+ BOOL bDo = !rParam.bRemoveOnly; // FALSE = nur loeschen
ScDocShell* pDocSh = GetViewData()->GetDocShell();
ScDocument* pDoc = pDocSh->GetDocument();
@@ -428,7 +428,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
if (pDoc->HasAttrib( rParam.nCol1, rParam.nRow1+1, nTab,
rParam.nCol2, rParam.nRow2, nTab, HASATTR_MERGED | HASATTR_OVERLAPPED ))
{
- ErrorMessage(STR_MSSG_INSERTCELLS_0); // nicht in zusammengefasste einfuegen
+ ErrorMessage(STR_MSSG_INSERTCELLS_0); // nicht in zusammengefasste einfuegen
return;
}
@@ -450,14 +450,14 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
{
ScDocShellModificator aModificator( *pDocSh );
- ScSubTotalParam aNewParam( rParam ); // Bereichsende wird veraendert
- ScDocument* pUndoDoc = NULL;
- ScOutlineTable* pUndoTab = NULL;
- ScRangeName* pUndoRange = NULL;
+ ScSubTotalParam aNewParam( rParam ); // Bereichsende wird veraendert
+ ScDocument* pUndoDoc = NULL;
+ ScOutlineTable* pUndoTab = NULL;
+ ScRangeName* pUndoRange = NULL;
ScDBCollection* pUndoDB = NULL;
- SCTAB nTabCount = 0; // fuer Referenz-Undo
+ SCTAB nTabCount = 0; // fuer Referenz-Undo
- if (bRecord) // alte Daten sichern
+ if (bRecord) // alte Daten sichern
{
BOOL bOldFilter = bDo && rParam.bDoSort;
@@ -468,7 +468,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
{
pUndoTab = new ScOutlineTable( *pTable );
- SCCOLROW nOutStartCol; // Zeilen/Spaltenstatus
+ SCCOLROW nOutStartCol; // Zeilen/Spaltenstatus
SCCOLROW nOutStartRow;
SCCOLROW nOutEndCol;
SCCOLROW nOutEndRow;
@@ -482,15 +482,15 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
else
pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, bOldFilter );
- // Datenbereich sichern - incl. Filter-Ergebnis
+ // Datenbereich sichern - incl. Filter-Ergebnis
pDoc->CopyToDocument( 0,rParam.nRow1+1,nTab, MAXCOL,rParam.nRow2,nTab,
IDF_ALL, FALSE, pUndoDoc );
- // alle Formeln wegen Referenzen
+ // alle Formeln wegen Referenzen
pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1,
IDF_FORMULA, FALSE, pUndoDoc );
- // DB- und andere Bereiche
+ // DB- und andere Bereiche
ScRangeName* pDocRange = pDoc->GetRangeName();
if (pDocRange->GetCount())
pUndoRange = new ScRangeName( *pDocRange );
@@ -499,10 +499,10 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
pUndoDB = new ScDBCollection( *pDocDB );
}
-// pDoc->SetOutlineTable( nTab, NULL );
- ScOutlineTable* pOut = pDoc->GetOutlineTable( nTab );
+// pDoc->SetOutlineTable( nTab, NULL );
+ ScOutlineTable* pOut = pDoc->GetOutlineTable( nTab );
if (pOut)
- pOut->GetRowArray()->RemoveAll(); // nur Zeilen-Outlines loeschen
+ pOut->GetRowArray()->RemoveAll(); // nur Zeilen-Outlines loeschen
if (rParam.bReplace)
pDoc->RemoveSubTotals( nTab, aNewParam );
@@ -514,8 +514,8 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
{
pDBData->SetArea( nTab, aNewParam.nCol1,aNewParam.nRow1, aNewParam.nCol2,aNewParam.nRow2 );
- // Teilergebnis-Felder vor die Sortierung setzen
- // (doppelte werden weggelassen, kann darum auch wieder aufgerufen werden)
+ // Teilergebnis-Felder vor die Sortierung setzen
+ // (doppelte werden weggelassen, kann darum auch wieder aufgerufen werden)
ScSortParam aOldSort;
pDBData->GetSortParam( aOldSort );
@@ -531,7 +531,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
if (bRecord)
{
-// ScDBData* pUndoDBData = pDBData ? new ScDBData( *pDBData ) : NULL;
+// ScDBData* pUndoDBData = pDBData ? new ScDBData( *pDBData ) : NULL;
pDocSh->GetUndoManager()->AddUndoAction(
new ScUndoSubTotals( pDocSh, nTab,
rParam, aNewParam.nRow2,
@@ -566,7 +566,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
}
//
-// Consolidate
+// Consolidate
//
void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, BOOL bRecord )
@@ -577,7 +577,7 @@ void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, BOOL bRecord )
}
//
-// Pivot
+// Pivot
//
String lcl_MakePivotTabName( const String& rPrefix, SCTAB nNumber )
@@ -590,8 +590,8 @@ String lcl_MakePivotTabName( const String& rPrefix, SCTAB nNumber )
bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest, BOOL bNewTable,
const ScDPObject& rSource, BOOL bApi )
{
- // #70096# error message if no fields are set
- // this must be removed when drag&drop of fields from a toolbox is available
+ // #70096# error message if no fields are set
+ // this must be removed when drag&drop of fields from a toolbox is available
if ( rData.IsEmpty() && !bApi )
{
@@ -599,8 +599,8 @@ bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest,
return false;
}
- ScDocShell* pDocSh = GetViewData()->GetDocShell();
- ScDocument* pDoc = GetViewData()->GetDocument();
+ ScDocShell* pDocSh = GetViewData()->GetDocShell();
+ ScDocument* pDoc = GetViewData()->GetDocument();
BOOL bUndo(pDoc->IsUndoEnabled());
ScRange aDestRange = rDest;
@@ -657,12 +657,12 @@ bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest,
else
aObj.SetSaveData( rData );
- BOOL bAllowMove = ( pDPObj != NULL ); // allow re-positioning when editing existing table
+ BOOL bAllowMove = ( pDPObj != NULL ); // allow re-positioning when editing existing table
ScDBDocFunc aFunc( *pDocSh );
bool bSuccess = aFunc.DataPilotUpdate( pDPObj, &aObj, TRUE, FALSE, bAllowMove );
- CursorPosChanged(); // shells may be switched
+ CursorPosChanged(); // shells may be switched
if ( bNewTable )
{
@@ -675,16 +675,16 @@ bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest,
void ScDBFunc::DeletePivotTable()
{
- ScDocShell* pDocSh = GetViewData()->GetDocShell();
- ScDocument* pDoc = pDocSh->GetDocument();
- ScDPObject* pDPObj = pDoc->GetDPAtCursor( GetViewData()->GetCurX(),
+ ScDocShell* pDocSh = GetViewData()->GetDocShell();
+ ScDocument* pDoc = pDocSh->GetDocument();
+ ScDPObject* pDPObj = pDoc->GetDPAtCursor( GetViewData()->GetCurX(),
GetViewData()->GetCurY(),
GetViewData()->GetTabNo() );
if ( pDPObj )
{
ScDBDocFunc aFunc( *pDocSh );
aFunc.DataPilotUpdate( pDPObj, NULL, TRUE, FALSE );
- CursorPosChanged(); // shells may be switched
+ CursorPosChanged(); // shells may be switched
}
else
ErrorMessage(STR_PIVOT_NOTFOUND);
@@ -717,9 +717,9 @@ ULONG RefreshDPObject( ScDPObject *pDPObj, ScDocument *pDoc, ScDocShell *pDocSh,
ScDBDocFunc aFunc( * pDocSh );
if ( !aFunc.DataPilotUpdate( (*pDPCollection)[i], (*pDPCollection)[i], bRecord, bApi ) )
break;
- }
+ }
}
-
+
return nErrId;
}
@@ -729,11 +729,11 @@ ULONG RefreshDPObject( ScDPObject *pDPObj, ScDocument *pDoc, ScDocShell *pDocSh,
ULONG ScDBFunc::RecalcPivotTable()
{
ScDocShell* pDocSh = GetViewData()->GetDocShell();
- ScDocument* pDoc = GetViewData()->GetDocument();
+ ScDocument* pDoc = GetViewData()->GetDocument();
- // old pivot not used any more
+ // old pivot not used any more
- ScDPObject* pDPObj = pDoc->GetDPAtCursor( GetViewData()->GetCurX(),
+ ScDPObject* pDPObj = pDoc->GetDPAtCursor( GetViewData()->GetCurX(),
GetViewData()->GetCurY(),
GetViewData()->GetTabNo() );
if ( pDPObj )
@@ -1518,7 +1518,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
if (rString.Len())
{
if (rString.EqualsIgnoreCaseAscii(aDimName))
- {
+ {
pDim->RemoveLayoutName();
bChange = true;
}
@@ -1764,7 +1764,7 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16
// We need to run this to get all members later.
if ( pUserListId )
pDPObj->BuildAllDimensionMembers();
-
+
USHORT nOrientation;
long nDimIndex = pDPObj->GetHeaderDim(rPos, nOrientation);
if (nDimIndex < 0)
@@ -1813,13 +1813,13 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16
ScUserList* pUserList = ScGlobal::GetUserList();
if (!pUserList)
return false;
-
+
{
sal_uInt16 n = pUserList->GetCount();
if (!n || *pUserListId >= n)
return false;
}
-
+
ScUserListData* pData = static_cast<ScUserListData*>((*pUserList)[*pUserListId]);
if (pData)
{
@@ -1840,7 +1840,7 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16
vector<OUString> aRankedNames(nMemberCount);
sal_uInt16 nCurStrId = 0;
- for (list<OUString>::const_iterator itr = aMembers.begin(), itrEnd = aMembers.end();
+ for (list<OUString>::const_iterator itr = aMembers.begin(), itrEnd = aMembers.end();
itr != itrEnd; ++itr)
{
OUString aName = *itr;
@@ -2200,7 +2200,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet
}
//
-// DB-Operationen (Sortieren, Filtern, Teilergebnisse) wiederholen
+// DB-Operationen (Sortieren, Filtern, Teilergebnisse) wiederholen
//
void ScDBFunc::RepeatDB( BOOL bRecord )
@@ -2248,7 +2248,7 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
SCROW nEndRow;
pDBData->GetArea( nDummy, nStartCol, nStartRow, nEndCol, nEndRow );
- //! Undo nur benoetigte Daten ?
+ //! Undo nur benoetigte Daten ?
ScDocument* pUndoDoc = NULL;
ScOutlineTable* pUndoTab = NULL;
@@ -2264,7 +2264,7 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
{
pUndoTab = new ScOutlineTable( *pTable );
- SCCOLROW nOutStartCol; // Zeilen/Spaltenstatus
+ SCCOLROW nOutStartCol; // Zeilen/Spaltenstatus
SCCOLROW nOutStartRow;
SCCOLROW nOutEndCol;
SCCOLROW nOutEndRow;
@@ -2278,13 +2278,13 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
else
pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, TRUE );
- // Datenbereich sichern - incl. Filter-Ergebnis
+ // Datenbereich sichern - incl. Filter-Ergebnis
pDoc->CopyToDocument( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab, IDF_ALL, FALSE, pUndoDoc );
- // alle Formeln wegen Referenzen
+ // alle Formeln wegen Referenzen
pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1, IDF_FORMULA, FALSE, pUndoDoc );
- // DB- und andere Bereiche
+ // DB- und andere Bereiche
ScRangeName* pDocRange = pDoc->GetRangeName();
if (pDocRange->GetCount())
pUndoRange = new ScRangeName( *pDocRange );
@@ -2295,20 +2295,20 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
if (bSort && bSubTotal)
{
- // Sortieren ohne SubTotals
+ // Sortieren ohne SubTotals
- aSubTotalParam.bRemoveOnly = TRUE; // wird unten wieder zurueckgesetzt
+ aSubTotalParam.bRemoveOnly = TRUE; // wird unten wieder zurueckgesetzt
DoSubTotals( aSubTotalParam, FALSE );
}
if (bSort)
{
- pDBData->GetSortParam( aSortParam ); // Bereich kann sich geaendert haben
+ pDBData->GetSortParam( aSortParam ); // Bereich kann sich geaendert haben
Sort( aSortParam, FALSE, FALSE);
}
if (bQuery)
{
- pDBData->GetQueryParam( aQueryParam ); // Bereich kann sich geaendert haben
+ pDBData->GetQueryParam( aQueryParam ); // Bereich kann sich geaendert haben
ScRange aAdvSource;
if (pDBData->GetAdvancedQuerySource(aAdvSource))
{
@@ -2317,17 +2317,17 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
aAdvSource.aEnd.Col(), aAdvSource.aEnd.Row(),
aAdvSource.aStart.Tab(), aQueryParam );
Query( aQueryParam, &aAdvSource, FALSE );
- }
+ }
else
Query( aQueryParam, NULL, FALSE );
- // bei nicht-inplace kann die Tabelle umgestellt worden sein
+ // bei nicht-inplace kann die Tabelle umgestellt worden sein
if ( !aQueryParam.bInplace && aQueryParam.nDestTab != nTab )
SetTabNo( nTab );
}
if (bSubTotal)
{
- pDBData->GetSubTotalParam( aSubTotalParam ); // Bereich kann sich geaendert haben
+ pDBData->GetSubTotalParam( aSubTotalParam ); // Bereich kann sich geaendert haben
aSubTotalParam.bRemoveOnly = FALSE;
DoSubTotals( aSubTotalParam, FALSE );
}
@@ -2366,7 +2366,7 @@ void ScDBFunc::RepeatDB( BOOL bRecord )
GetViewData()->GetDocShell()->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab,
PAINT_GRID | PAINT_LEFT | PAINT_TOP | PAINT_SIZE );
}
- else // "Keine Operationen auszufuehren"
+ else // "Keine Operationen auszufuehren"
ErrorMessage(STR_MSSG_REPEATDB_0);
}
diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx
index 870622293e37..2bd6db27aa06 100644
--- a/sc/source/ui/view/dbfunc4.cxx
+++ b/sc/source/ui/view/dbfunc4.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/view/drawattr.cxx b/sc/source/ui/view/drawattr.cxx
index fa7872617c03..bc64e241fd03 100644
--- a/sc/source/ui/view/drawattr.cxx
+++ b/sc/source/ui/view/drawattr.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/view/drawutil.cxx b/sc/source/ui/view/drawutil.cxx
index ba250767c169..e599e4e700fd 100644
--- a/sc/source/ui/view/drawutil.cxx
+++ b/sc/source/ui/view/drawutil.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab,
{
SCROW nLastRow = nRow;
if (pDoc->RowHidden(nRow, nTab, NULL, &nLastRow))
- {
+ {
nRow = nLastRow;
continue;
}
@@ -84,8 +84,8 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab,
MapMode aHMMMode( MAP_100TH_MM, Point(), rZoomX, rZoomY );
Point aPixelLog = pDev->PixelToLogic( Point( nPixelX,nPixelY ), aHMMMode );
- // Fraction(double) ctor can be used here (and avoid overflows of PixelLog * Zoom)
- // because ReduceInaccurate is called later anyway.
+ // Fraction(double) ctor can be used here (and avoid overflows of PixelLog * Zoom)
+ // because ReduceInaccurate is called later anyway.
if ( aPixelLog.X() && nTwipsX )
rScaleX = Fraction( ((double)aPixelLog.X()) *
@@ -105,8 +105,8 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab,
else
rScaleY = Fraction( 1, 1 );
- // 25 bits of accuracy are needed to always hit the right part of
- // cells in the last rows (was 17 before 1M rows).
+ // 25 bits of accuracy are needed to always hit the right part of
+ // cells in the last rows (was 17 before 1M rows).
rScaleX.ReduceInaccurate( 25 );
rScaleY.ReduceInaccurate( 25 );
}
diff --git a/sc/source/ui/view/drawvie2.cxx b/sc/source/ui/view/drawvie2.cxx
index c760ce86a3d7..9c22d7ddc271 100644
--- a/sc/source/ui/view/drawvie2.cxx
+++ b/sc/source/ui/view/drawvie2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,17 +43,17 @@
void ScDrawView::UpdateBrowser()
{
- // VC's und den Browser dazu gibts nicht mehr...
+ // VC's und den Browser dazu gibts nicht mehr...
}
void ScDrawView::VCAddWin( Window* /* pWin */ )
{
- // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden
+ // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden
}
void ScDrawView::VCRemoveWin( Window* /* pWin */ )
{
- // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden
+ // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden
}
diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index ffa1efe28654..cacfd77ad923 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 "docsh.hxx"
void ScIMapDlgSet( const Graphic& rGraphic, const ImageMap* pImageMap,
- const TargetList* pTargetList, void* pEditingObj ); // imapwrap
+ const TargetList* pTargetList, void* pEditingObj ); // imapwrap
USHORT ScIMapChildWindowId();
// STATIC DATA -----------------------------------------------------------
@@ -120,7 +120,7 @@ ScAnchorType ScDrawView::GetAnchor() const
void __EXPORT ScDrawView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
- if (rHint.ISA(ScTabDeletedHint)) // Tabelle geloescht
+ if (rHint.ISA(ScTabDeletedHint)) // Tabelle geloescht
{
SCTAB nDelTab = ((ScTabDeletedHint&)rHint).GetTab();
if (ValidTab(nDelTab))
@@ -130,7 +130,7 @@ void __EXPORT ScDrawView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
HideSdrPage();
}
}
- else if (rHint.ISA(ScTabSizeChangedHint)) // Groesse geaendert
+ else if (rHint.ISA(ScTabSizeChangedHint)) // Groesse geaendert
{
if ( nTab == ((ScTabSizeChangedHint&)rHint).GetTab() )
UpdateWorkArea();
@@ -145,8 +145,8 @@ void ScDrawView::UpdateIMap( SdrObject* pObj )
pViewData->GetViewShell()->GetViewFrame()->HasChildWindow( ScIMapChildWindowId() ) &&
pObj && ( pObj->ISA(SdrGrafObj) || pObj->ISA(SdrOle2Obj) ) )
{
- Graphic aGraphic;
- TargetList aTargetList;
+ Graphic aGraphic;
+ TargetList aTargetList;
ScIMapInfo* pIMapInfo = ScDrawLayer::GetIMapInfo( pObj );
const ImageMap* pImageMap = NULL;
if ( pIMapInfo )
@@ -165,7 +165,7 @@ void ScDrawView::UpdateIMap( SdrObject* pObj )
aGraphic = *pGraphic;
}
- ScIMapDlgSet( aGraphic, pImageMap, &aTargetList, pObj ); // aus imapwrap
+ ScIMapDlgSet( aGraphic, pImageMap, &aTargetList, pObj ); // aus imapwrap
// TargetListe kann von uns wieder geloescht werden
String* pEntry = aTargetList.First();
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 3a28096d2853..0d0f0a0df0fa 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "document.hxx"
#include "docsh.hxx"
#include "drwtrans.hxx"
-#include "transobj.hxx" // SetDrawClipDoc
+#include "transobj.hxx" // SetDrawClipDoc
#include "drawutil.hxx"
#include "scmod.hxx"
#include "globstr.hrc"
@@ -63,7 +63,7 @@ Point aDragStartDiff;
// -----------------------------------------------------------------------
-//! welche Funktionen aus drawview/drawvie4 muessen wirklich ohne Optimierung sein?
+//! welche Funktionen aus drawview/drawvie4 muessen wirklich ohne Optimierung sein?
#ifdef _MSC_VER
#pragma optimize ( "", off )
@@ -123,7 +123,7 @@ void lcl_RefreshChartData( SdrModel* pModel, ScDocument* pSourceDoc )
SchMemChart* pOldData = SchDLL::GetChartData(aIPObj);
if ( pOldData )
{
- // create data from source document
+ // create data from source document
ScChartArray aArray( pSourceDoc, *pOldData );
if ( aArray.IsValid() )
{
@@ -162,17 +162,17 @@ BOOL ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos )
ScDocShellRef aDragShellRef;
if (bAnyOle)
{
- aDragShellRef = new ScDocShell; // DocShell needs a Ref immediately
+ aDragShellRef = new ScDocShell; // DocShell needs a Ref immediately
aDragShellRef->DoInitNew(NULL);
}
ScDrawLayer::SetGlobalDrawPersist(aDragShellRef);
SdrModel* pModel = GetAllMarkedModel();
ScDrawLayer::SetGlobalDrawPersist(NULL);
- // Charts now always copy their data in addition to the source reference, so
- // there's no need to call SchDLL::Update for the charts in the clipboard doc.
- // Update with the data (including NumberFormatter) from the live document would
- // also store the NumberFormatter in the clipboard chart (#88749#)
+ // Charts now always copy their data in addition to the source reference, so
+ // there's no need to call SchDLL::Update for the charts in the clipboard doc.
+ // Update with the data (including NumberFormatter) from the live document would
+ // also store the NumberFormatter in the clipboard chart (#88749#)
// lcl_RefreshChartData( pModel, pViewData->GetDocument() );
ScDocShell* pDocSh = pViewData->GetDocShell();
@@ -186,9 +186,9 @@ BOOL ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos )
uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj );
pTransferObj->SetDrawPersist( &aDragShellRef ); // keep persist for ole objects alive
- pTransferObj->SetDragSource( this ); // copies selection
+ pTransferObj->SetDragSource( this ); // copies selection
- SC_MOD()->SetDragObject( NULL, pTransferObj ); // for internal D&D
+ SC_MOD()->SetDragObject( NULL, pTransferObj ); // for internal D&D
pTransferObj->StartDrag( pWindow, DND_ACTION_COPYMOVE | DND_ACTION_LINK );
}
@@ -206,10 +206,10 @@ void ScDrawView::DoCopy()
SdrModel* pModel = GetAllMarkedModel();
ScDrawLayer::SetGlobalDrawPersist(NULL);
- // Charts now always copy their data in addition to the source reference, so
- // there's no need to call SchDLL::Update for the charts in the clipboard doc.
- // Update with the data (including NumberFormatter) from the live document would
- // also store the NumberFormatter in the clipboard chart (#88749#)
+ // Charts now always copy their data in addition to the source reference, so
+ // there's no need to call SchDLL::Update for the charts in the clipboard doc.
+ // Update with the data (including NumberFormatter) from the live document would
+ // also store the NumberFormatter in the clipboard chart (#88749#)
// lcl_RefreshChartData( pModel, pViewData->GetDocument() );
ScDocShell* pDocSh = pViewData->GetDocShell();
@@ -227,8 +227,8 @@ void ScDrawView::DoCopy()
pTransferObj->SetDrawPersist( &(*ScGlobal::pDrawClipDocShellRef) ); // keep persist for ole objects alive
}
- pTransferObj->CopyToClipboard( pViewData->GetActiveWin() ); // system clipboard
- SC_MOD()->SetClipObject( NULL, pTransferObj ); // internal clipboard
+ pTransferObj->CopyToClipboard( pViewData->GetActiveWin() ); // system clipboard
+ SC_MOD()->SetClipObject( NULL, pTransferObj ); // internal clipboard
}
uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable()
@@ -242,10 +242,10 @@ uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable()
SdrModel* pModel = GetAllMarkedModel();
ScDrawLayer::SetGlobalDrawPersist(NULL);
- // Charts now always copy their data in addition to the source reference, so
- // there's no need to call SchDLL::Update for the charts in the clipboard doc.
- // Update with the data (including NumberFormatter) from the live document would
- // also store the NumberFormatter in the clipboard chart (#88749#)
+ // Charts now always copy their data in addition to the source reference, so
+ // there's no need to call SchDLL::Update for the charts in the clipboard doc.
+ // Update with the data (including NumberFormatter) from the live document would
+ // also store the NumberFormatter in the clipboard chart (#88749#)
// lcl_RefreshChartData( pModel, pViewData->GetDocument() );
ScDocShell* pDocSh = pViewData->GetDocShell();
@@ -266,7 +266,7 @@ uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable()
return xTransferable;
}
-// Korrektur fuer 100% berechnen, unabhaengig von momentanen Einstellungen
+// Korrektur fuer 100% berechnen, unabhaengig von momentanen Einstellungen
void ScDrawView::CalcNormScale( Fraction& rFractX, Fraction& rFractY ) const
{
@@ -343,7 +343,7 @@ void ScDrawView::SetMarkedOriginalSize()
MapMode aDestMap( MAP_100TH_MM );
if (aSourceMap.GetMapUnit() == MAP_PIXEL)
{
- // Pixel-Korrektur beruecksichtigen, damit Bitmap auf dem Bildschirm stimmt
+ // Pixel-Korrektur beruecksichtigen, damit Bitmap auf dem Bildschirm stimmt
Fraction aNormScaleX, aNormScaleY;
CalcNormScale( aNormScaleX, aNormScaleY );
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 1d2b797b3a9b..921f25694fd9 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +70,8 @@ using namespace com::sun::star;
// -----------------------------------------------------------------------
-#define SC_HANDLESIZE_BIG 9
-#define SC_HANDLESIZE_SMALL 7
+#define SC_HANDLESIZE_BIG 9
+#define SC_HANDLESIZE_SMALL 7
// -----------------------------------------------------------------------
@@ -87,7 +87,7 @@ void ScDrawView::Construct()
EnableExtendedCommandEventDispatcher(FALSE);
SetFrameDragSingles(TRUE);
-// SetSolidMarkHdl(TRUE); // einstellbar -> UpdateUserViewOptions
+// SetSolidMarkHdl(TRUE); // einstellbar -> UpdateUserViewOptions
SetMinMoveDistancePixel( 2 );
SetHitTolerancePixel( 2 );
@@ -113,7 +113,7 @@ void ScDrawView::Construct()
if (pLayer)
{
SetLayerLocked( pLayer->GetName(), bProt );
- SetActiveLayer( pLayer->GetName() ); // FRONT als aktiven Layer setzen
+ SetActiveLayer( pLayer->GetName() ); // FRONT als aktiven Layer setzen
}
pLayer = rAdmin.GetLayerPerID(SC_LAYER_CONTROLS);
if (pLayer)
@@ -171,7 +171,7 @@ void ScDrawView::AddCustomHdl()
if (bNegativePage)
{
aPos = aBoundRect.TopRight();
- aPos.X() = -aPos.X(); // so the loop below is the same
+ aPos.X() = -aPos.X(); // so the loop below is the same
}
else
aPos = aBoundRect.TopLeft();
@@ -213,8 +213,8 @@ void ScDrawView::InvalidateDrawTextAttrs()
if (!pViewData) return;
SfxBindings& rBindings = pViewData->GetBindings();
- // cjk/ctl font items have no configured slots,
- // need no invalidate
+ // cjk/ctl font items have no configured slots,
+ // need no invalidate
rBindings.Invalidate( SID_ATTR_CHAR_FONT );
rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT );
@@ -249,24 +249,24 @@ void ScDrawView::InvalidateDrawTextAttrs()
//void ScDrawView::DrawMarks( OutputDevice* pOut ) const
//{
-// DBG_ASSERT(pOut, "ScDrawView::DrawMarks: No OutputDevice (!)");
-// SdrPaintWindow* pPaintWindow = FindPaintWindow(*pOut);
+// DBG_ASSERT(pOut, "ScDrawView::DrawMarks: No OutputDevice (!)");
+// SdrPaintWindow* pPaintWindow = FindPaintWindow(*pOut);
//
-// if(pPaintWindow)
-// {
-// if(pPaintWindow->isXorVisible())
-// {
-// ToggleShownXor(pOut, 0L);
-// }
-// }
+// if(pPaintWindow)
+// {
+// if(pPaintWindow->isXorVisible())
+// {
+// ToggleShownXor(pOut, 0L);
+// }
+// }
//}
void ScDrawView::SetMarkedToLayer( BYTE nLayerNo )
{
if (AreObjectsMarked())
{
- // #i11702# use SdrUndoObjectLayerChange for undo
- // STR_UNDO_SELATTR is "Attributes" - should use a different text later
+ // #i11702# use SdrUndoObjectLayerChange for undo
+ // STR_UNDO_SELATTR is "Attributes" - should use a different text later
BegUndo( ScGlobal::GetRscString( STR_UNDO_SELATTR ) );
const SdrMarkList& rMark = GetMarkedObjectList();
@@ -283,11 +283,11 @@ void ScDrawView::SetMarkedToLayer( BYTE nLayerNo )
EndUndo();
- // repaint is done in SetLayer
+ // repaint is done in SetLayer
pViewData->GetDocShell()->SetDrawModified();
- // #84073# check mark list now instead of later in a timer
+ // #84073# check mark list now instead of later in a timer
CheckMarked();
MarkListHasChanged();
}
@@ -322,7 +322,7 @@ void ScDrawView::UpdateWorkArea()
Rectangle aNewArea( aPos, aPageSize );
if ( aPageSize.Width() < 0 )
{
- // RTL: from max.negative (left) to zero (right)
+ // RTL: from max.negative (left) to zero (right)
aNewArea.Right() = 0;
aNewArea.Left() = aPageSize.Width() + 1;
}
@@ -338,7 +338,7 @@ void ScDrawView::DoCut()
{
DoCopy();
BegUndo( ScGlobal::GetRscString( STR_UNDO_CUT ) );
- DeleteMarked(); // auf dieser View - von der 505f Umstellung nicht betroffen
+ DeleteMarked(); // auf dieser View - von der 505f Umstellung nicht betroffen
EndUndo();
}
@@ -402,11 +402,11 @@ void ScDrawView::MarkListHasChanged()
{
pViewSh->Unmark(); // remove cell selection
- // #65379# end cell edit mode if drawing objects are selected
+ // #65379# end cell edit mode if drawing objects are selected
SC_MOD()->InputEnterHandler();
}
- // IP deaktivieren
+ // IP deaktivieren
ScModule* pScMod = SC_MOD();
bool bUnoRefDialog = pScMod->IsRefDialogOpen() && pScMod->GetCurRefDlgId() == WID_SIMPLE_REF;
@@ -414,14 +414,14 @@ void ScDrawView::MarkListHasChanged()
ScClient* pClient = (ScClient*) pViewSh->GetIPClient();
if ( pClient && pClient->IsObjectInPlaceActive() && !bUnoRefDialog )
{
- // #41730# beim ViewShell::Activate aus dem Reset2Open nicht die Handles anzeigen
+ // #41730# beim ViewShell::Activate aus dem Reset2Open nicht die Handles anzeigen
//HMHbDisableHdl = TRUE;
pClient->DeactivateObject();
//HMHbDisableHdl = FALSE;
- // Image-Ole wieder durch Grafik ersetzen passiert jetzt in ScClient::UIActivate
+ // Image-Ole wieder durch Grafik ersetzen passiert jetzt in ScClient::UIActivate
}
- // Ole-Objekt selektiert?
+ // Ole-Objekt selektiert?
SdrOle2Obj* pOle2Obj = NULL;
SdrGrafObj* pGrafObj = NULL;
@@ -432,7 +432,7 @@ void ScDrawView::MarkListHasChanged()
if ( nMarkCount == 0 && !pViewData->GetViewShell()->IsDrawSelMode() && !bInConstruct )
{
- // relock layers that may have been unlocked before
+ // relock layers that may have been unlocked before
LockBackgroundLayer();
LockInternalLayer();
}
@@ -463,9 +463,9 @@ void ScDrawView::MarkListHasChanged()
bSubShellSet = TRUE;
}
else if (pObj->GetObjIdentifier() != OBJ_TEXT // Verhindern, das beim Anlegen
- || !pViewSh->IsDrawTextShell()) // eines TextObjekts auf die
- { // DrawShell umgeschaltet wird.
- pViewSh->SetDrawShell(TRUE); //@#70206#
+ || !pViewSh->IsDrawTextShell()) // eines TextObjekts auf die
+ { // DrawShell umgeschaltet wird.
+ pViewSh->SetDrawShell(TRUE); //@#70206#
}
}
@@ -482,8 +482,8 @@ void ScDrawView::MarkListHasChanged()
ULONG nListCount = pLst->GetObjCount();
if ( nListCount == 0 )
{
- // #104156# An empty group (may occur during Undo) is no control or graphics object.
- // Creating the form shell during undo would lead to problems with the undo manager.
+ // #104156# An empty group (may occur during Undo) is no control or graphics object.
+ // Creating the form shell during undo would lead to problems with the undo manager.
bOnlyControls = FALSE;
bOnlyGraf = FALSE;
}
@@ -512,7 +512,7 @@ void ScDrawView::MarkListHasChanged()
if(bOnlyControls)
{
- pViewSh->SetDrawFormShell(TRUE); // jetzt UNO-Controls
+ pViewSh->SetDrawFormShell(TRUE); // jetzt UNO-Controls
}
else if(bOnlyGraf)
{
@@ -526,7 +526,7 @@ void ScDrawView::MarkListHasChanged()
- // Verben anpassen
+ // Verben anpassen
SfxViewFrame* pViewFrame = pViewSh->GetViewFrame();
BOOL bOle = pViewSh->GetViewFrame()->GetFrame().IsInPlace();
@@ -544,14 +544,14 @@ void ScDrawView::MarkListHasChanged()
else
pViewSh->SetVerbs( 0 );
- // Image-Map Editor
+ // Image-Map Editor
if ( pOle2Obj )
UpdateIMap( pOle2Obj );
else if ( pGrafObj )
UpdateIMap( pGrafObj );
- InvalidateAttribs(); // nach dem IMap-Editor Update
+ InvalidateAttribs(); // nach dem IMap-Editor Update
InvalidateDrawTextAttrs();
for(sal_uInt32 a(0L); a < PaintWindowCount(); a++)
@@ -565,8 +565,8 @@ void ScDrawView::MarkListHasChanged()
}
}
- // uno object for view returns drawing objects as selection,
- // so it must notify its SelectionChangeListeners
+ // uno object for view returns drawing objects as selection,
+ // so it must notify its SelectionChangeListeners
if (pViewFrame)
{
@@ -580,7 +580,7 @@ void ScDrawView::MarkListHasChanged()
}
}
- // update selection transfer object
+ // update selection transfer object
pViewSh->CheckSelectionTransfer();
@@ -591,10 +591,10 @@ void __EXPORT ScDrawView::ModelHasChanged()
SdrObject* pEditObj = GetTextEditObject();
if ( pEditObj && !pEditObj->IsInserted() && pViewData )
{
- // #111700# SdrObjEditView::ModelHasChanged will end text edit in this case,
- // so make sure the EditEngine's undo manager is no longer used.
+ // #111700# SdrObjEditView::ModelHasChanged will end text edit in this case,
+ // so make sure the EditEngine's undo manager is no longer used.
pViewData->GetViewShell()->SetDrawTextUndo(NULL);
- SetCreateMode(); // don't leave FuText in a funny state
+ SetCreateMode(); // don't leave FuText in a funny state
}
FmFormView::ModelHasChanged();
@@ -604,8 +604,8 @@ void __EXPORT ScDrawView::UpdateUserViewOptions()
{
if (pViewData)
{
- const ScViewOptions& rOpt = pViewData->GetOptions();
- const ScGridOptions& rGrid = rOpt.GetGridOptions();
+ const ScViewOptions& rOpt = pViewData->GetOptions();
+ const ScGridOptions& rGrid = rOpt.GetGridOptions();
BOOL bBigHdl = rOpt.GetOption( VOPT_BIGHANDLES );
@@ -617,8 +617,8 @@ void __EXPORT ScDrawView::UpdateUserViewOptions()
SetSnapEnabled( rGrid.GetUseGridSnap() );
SetGridSnap( rGrid.GetUseGridSnap() );
- // Snap from grid options is no longer used
-// SetSnapGrid( Size( rGrid.GetFldSnapX(), rGrid.GetFldSnapY() ) );
+ // Snap from grid options is no longer used
+// SetSnapGrid( Size( rGrid.GetFldSnapX(), rGrid.GetFldSnapY() ) );
Fraction aFractX( rGrid.GetFldDrawX(), rGrid.GetFldDivisionX() + 1 );
Fraction aFractY( rGrid.GetFldDrawY(), rGrid.GetFldDivisionY() + 1 );
@@ -641,7 +641,7 @@ BOOL ScDrawView::SelectObject( const String& rName )
SCTAB nObjectTab = 0;
SdrObject* pFound = NULL;
- SfxObjectShell* pShell = pDoc->GetDocumentShell();
+ SfxObjectShell* pShell = pDoc->GetDocumentShell();
if (pShell)
{
SdrModel* pDrawLayer = GetModel();
@@ -670,7 +670,7 @@ BOOL ScDrawView::SelectObject( const String& rName )
if ( pFound )
{
ScTabView* pView = pViewData->GetView();
- if ( nObjectTab != nTab ) // Tabelle umschalten
+ if ( nObjectTab != nTab ) // Tabelle umschalten
pView->SetTabNo( nObjectTab );
DBG_ASSERT( nTab == nObjectTab, "Tabellen umschalten hat nicht geklappt" );
@@ -699,7 +699,7 @@ BOOL ScDrawView::SelectObject( const String& rName )
//UNUSED2008-05 {
//UNUSED2008-05 // used for modifying a chart's data area - PersistName must always be used
//UNUSED2008-05 // (as in ScDocument::FindChartData and UpdateChartArea)
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 const SdrMarkList& rMarkList = GetMarkedObjectList();
//UNUSED2008-05 if (rMarkList.GetMarkCount() == 1)
//UNUSED2008-05 {
@@ -708,14 +708,14 @@ BOOL ScDrawView::SelectObject( const String& rName )
//UNUSED2008-05 if ( pDoc->IsChart(pObj) )
//UNUSED2008-05 return static_cast<SdrOle2Obj*>(pObj)->GetPersistName();
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 return EMPTY_STRING; // nichts gefunden
//UNUSED2008-05 }
FASTBOOL ScDrawView::InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions)
{
- // Markierung nicht aendern, wenn Ole-Objekt aktiv
- // (bei Drop aus Ole-Objekt wuerde sonst mitten im ExecuteDrag deaktiviert!)
+ // Markierung nicht aendern, wenn Ole-Objekt aktiv
+ // (bei Drop aus Ole-Objekt wuerde sonst mitten im ExecuteDrag deaktiviert!)
if (pViewData)
{
@@ -751,8 +751,8 @@ void ScDrawView::LockCalcLayer( SdrLayerID nLayer, bool bLock )
void __EXPORT ScDrawView::MakeVisible( const Rectangle& rRect, Window& rWin )
{
- //! rWin richtig auswerten
- //! ggf Zoom aendern
+ //! rWin richtig auswerten
+ //! ggf Zoom aendern
if ( pViewData && pViewData->GetActiveWin() == &rWin )
pViewData->GetView()->MakeVisible( rRect );
@@ -803,7 +803,7 @@ SdrEndTextEditKind ScDrawView::ScEndTextEdit()
SdrEndTextEditKind eKind = SdrEndTextEdit();
if ( bIsTextEdit && pViewData )
- pViewData->GetViewShell()->SetDrawTextUndo(NULL); // "normaler" Undo-Manager
+ pViewData->GetViewShell()->SetDrawTextUndo(NULL); // "normaler" Undo-Manager
return eKind;
}
@@ -826,7 +826,7 @@ void ScDrawView::MarkDropObj( SdrObject* pObj )
//UNUSED2009-05 {
//UNUSED2009-05 if(nSlot != SID_TEXTDIRECTION_LEFT_TO_RIGHT && nSlot != SID_TEXTDIRECTION_TOP_TO_BOTTOM)
//UNUSED2009-05 return;
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 SdrObject* pObject = GetTextEditObject();
//UNUSED2009-05 if ( ScDrawLayer::IsNoteCaption( pObject ) )
//UNUSED2009-05 {
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 848a0a3c7636..3ca671d93535 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +108,11 @@ SFX_IMPL_INTERFACE(ScEditShell, SfxShell, ScResId(SCSTR_EDITSHELL))
ScEditShell::ScEditShell(EditView* pView, ScViewData* pData) :
- pEditView (pView),
- pViewData (pData),
- pClipEvtLstnr (NULL),
- bPastePossible (FALSE),
- bIsInsertMode (TRUE)
+ pEditView (pView),
+ pViewData (pData),
+ pClipEvtLstnr (NULL),
+ bPastePossible (FALSE),
+ bIsInsertMode (TRUE)
{
SetPool( pEditView->GetEditEngine()->GetEmptyItemSet().GetPool() );
SetUndoManager( &pEditView->GetEditEngine()->GetUndoManager() );
@@ -157,7 +157,7 @@ void lcl_RemoveAttribs( EditView& rEditView )
pEngine->GetUndoManager().EnterListAction( aName, aName );
rEditView.RemoveAttribs(TRUE);
- pEngine->RepeatDefaults(); // #97226# paragraph attributes from cell formats must be preserved
+ pEngine->RepeatDefaults(); // #97226# paragraph attributes from cell formats must be preserved
pEngine->GetUndoManager().LeaveListAction();
@@ -175,14 +175,14 @@ void lclInsertCharacter( EditView* pTableView, EditView* pTopView, sal_Unicode c
void ScEditShell::Execute( SfxRequest& rReq )
{
- const SfxItemSet* pReqArgs = rReq.GetArgs();
- USHORT nSlot = rReq.GetSlot();
- SfxBindings& rBindings = pViewData->GetBindings();
+ const SfxItemSet* pReqArgs = rReq.GetArgs();
+ USHORT nSlot = rReq.GetSlot();
+ SfxBindings& rBindings = pViewData->GetBindings();
ScInputHandler* pHdl = GetMyInputHdl();
DBG_ASSERT(pHdl,"kein ScInputHandler");
- EditView* pTopView = pHdl->GetTopView(); // hat Eingabezeile den Focus?
+ EditView* pTopView = pHdl->GetTopView(); // hat Eingabezeile den Focus?
EditView* pTableView = pHdl->GetTableView();
DBG_ASSERT(pTableView,"no EditView :-(");
@@ -231,7 +231,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
ReplaceTextWithSynonym( *pEditView, aReplaceText );
}
break;
-
+
case SID_COPY:
pTableView->Copy();
break;
@@ -254,7 +254,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
pTopView->DeleteSelected();
break;
- case SID_CELL_FORMAT_RESET: // "Standard"
+ case SID_CELL_FORMAT_RESET: // "Standard"
lcl_RemoveAttribs( *pTableView );
if ( pTopView )
lcl_RemoveAttribs( *pTopView );
@@ -385,7 +385,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
if ( aString.Len() )
{
- // if string contains WEAK characters, set all fonts
+ // if string contains WEAK characters, set all fonts
BYTE nSetScript;
ScDocument* pDoc = pViewData->GetDocument();
if ( pDoc->HasStringWeakCharacters( aString ) )
@@ -398,7 +398,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
aSetItem.PutItemForScriptType( nSetScript, aNewItem );
aSet.Put( aSetItem.GetItemSet(), FALSE );
- // SetAttribs an der View selektiert ein Wort, wenn nichts selektiert ist
+ // SetAttribs an der View selektiert ein Wort, wenn nichts selektiert ist
pTableView->GetEditEngine()->QuickSetAttribs( aSet, pTableView->GetSelection() );
pTableView->InsertText(aString);
if (pTopView)
@@ -420,9 +420,9 @@ void ScEditShell::Execute( SfxRequest& rReq )
case FID_INSERT_NAME:
{
- ScDocument* pDoc = pViewData->GetDocument();
+ ScDocument* pDoc = pViewData->GetDocument();
//CHINA001 ScNamePasteDlg* pDlg = new ScNamePasteDlg( pViewData->GetDialogParent(),
- //CHINA001 pDoc->GetRangeName(), FALSE );
+ //CHINA001 pDoc->GetRangeName(), FALSE );
// "Liste" disablen
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -493,7 +493,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
if (pEngine->GetParagraphCount() == 1)
{
String aText = pEngine->GetText();
- ESelection aSel = pEditView->GetSelection(); // aktuelle View
+ ESelection aSel = pEditView->GetSelection(); // aktuelle View
ScRefFinder aFinder( aText, pViewData->GetDocument() );
aFinder.ToggleRel( aSel.nStartPos, aSel.nEndPos );
@@ -510,7 +510,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
}
bOk = TRUE;
- // Referenz wird selektiert -> beim Tippen nicht ueberschreiben
+ // Referenz wird selektiert -> beim Tippen nicht ueberschreiben
bSetSelIsRef = TRUE;
}
}
@@ -526,9 +526,9 @@ void ScEditShell::Execute( SfxRequest& rReq )
if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, TRUE, &pItem ) == SFX_ITEM_SET )
{
const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem;
- const String& rName = pHyper->GetName();
- const String& rURL = pHyper->GetURL();
- const String& rTarget = pHyper->GetTargetFrame();
+ const String& rName = pHyper->GetName();
+ const String& rURL = pHyper->GetURL();
+ const String& rTarget = pHyper->GetTargetFrame();
SvxLinkInsertMode eMode = pHyper->GetInsertMode();
BOOL bDone = FALSE;
@@ -537,7 +537,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
const SvxURLField* pURLField = GetURLField();
if ( pURLField )
{
- // altes Feld selektieren
+ // altes Feld selektieren
ESelection aSel = pTableView->GetSelection();
aSel.Adjust();
@@ -545,15 +545,15 @@ void ScEditShell::Execute( SfxRequest& rReq )
aSel.nEndPos = aSel.nStartPos + 1;
pTableView->SetSelection( aSel );
- // neues Feld einfuegen
+ // neues Feld einfuegen
SvxURLField aURLField( rURL, rName, SVXURLFORMAT_REPR );
aURLField.SetTargetFrame( rTarget );
SvxFieldItem aURLItem( aURLField, EE_FEATURE_FIELD );
pTableView->InsertField( aURLItem );
- pTableView->SetSelection( aSel ); // select inserted field
+ pTableView->SetSelection( aSel ); // select inserted field
- // #57254# jetzt doch auch Felder in der Top-View
+ // #57254# jetzt doch auch Felder in der Top-View
if ( pTopView )
{
@@ -562,7 +562,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
aSel.nEndPos = aSel.nStartPos + 1;
pTopView->SetSelection( aSel );
pTopView->InsertField( aURLItem );
- pTopView->SetSelection( aSel ); // select inserted field
+ pTopView->SetSelection( aSel ); // select inserted field
}
bDone = TRUE;
@@ -574,8 +574,8 @@ void ScEditShell::Execute( SfxRequest& rReq )
pViewData->GetViewShell()->
InsertURL( rName, rURL, rTarget, (USHORT) eMode );
- // InsertURL an der ViewShell schaltet bei "Button"
- // die EditShell ab, darum sofort return
+ // InsertURL an der ViewShell schaltet bei "Button"
+ // die EditShell ab, darum sofort return
return;
}
@@ -642,7 +642,7 @@ void __EXPORT ScEditShell::GetState( SfxItemSet& rSet )
return;
}
- ScInputHandler* pHdl = GetMyInputHdl();
+ ScInputHandler* pHdl = GetMyInputHdl();
EditView* pActiveView = pHdl ? pHdl->GetActiveView() : pEditView;
SfxWhichIter aIter( rSet );
@@ -651,7 +651,7 @@ void __EXPORT ScEditShell::GetState( SfxItemSet& rSet )
{
switch (nWhich)
{
- case SID_ATTR_INSERT: // Statuszeile
+ case SID_ATTR_INSERT: // Statuszeile
{
if ( pActiveView )
rSet.Put( SfxBoolItem( nWhich, pActiveView->IsInsertMode() ) );
@@ -713,7 +713,7 @@ void __EXPORT ScEditShell::GetState( SfxItemSet& rSet )
rSet.DisableItem( SID_THES );
}
break;
-
+
}
nWhich = aIter.NextWhich();
@@ -722,11 +722,11 @@ void __EXPORT ScEditShell::GetState( SfxItemSet& rSet )
const SvxURLField* ScEditShell::GetURLField()
{
- ScInputHandler* pHdl = GetMyInputHdl();
+ ScInputHandler* pHdl = GetMyInputHdl();
EditView* pActiveView = pHdl ? pHdl->GetActiveView() : pEditView;
if ( pActiveView )
{
- const SvxFieldItem* pFieldItem = pActiveView->GetFieldAtSelection();
+ const SvxFieldItem* pFieldItem = pActiveView->GetFieldAtSelection();
if (pFieldItem)
{
const SvxFieldData* pField = pFieldItem->GetField();
@@ -811,10 +811,10 @@ void lcl_InvalidateUnder( SfxBindings& rBindings )
void ScEditShell::ExecuteAttr(SfxRequest& rReq)
{
- SfxItemSet aSet( pEditView->GetEmptyItemSet() );
- SfxBindings& rBindings = pViewData->GetBindings();
- const SfxItemSet* pArgs = rReq.GetArgs();
- USHORT nSlot = rReq.GetSlot();
+ SfxItemSet aSet( pEditView->GetEmptyItemSet() );
+ SfxBindings& rBindings = pViewData->GetBindings();
+ const SfxItemSet* pArgs = rReq.GetArgs();
+ USHORT nSlot = rReq.GetSlot();
switch ( nSlot )
{
@@ -851,7 +851,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq)
}
break;
- // Toggles
+ // Toggles
case SID_ATTR_CHAR_WEIGHT:
{
@@ -904,7 +904,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq)
lcl_InvalidateUnder( rBindings );
break;
- case SID_ATTR_CHAR_UNDERLINE: // Toggles
+ case SID_ATTR_CHAR_UNDERLINE: // Toggles
case SID_ULINE_VAL_SINGLE:
case SID_ULINE_VAL_DOUBLE:
case SID_ULINE_VAL_DOTTED:
@@ -992,7 +992,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq)
}
//
- // anwenden
+ // anwenden
//
EditEngine* pEngine = pEditView->GetEditEngine();
@@ -1021,7 +1021,7 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet)
SfxItemSet aAttribs = pEditView->GetAttribs();
rSet.Put( aAttribs );
- // choose font info according to selection script type
+ // choose font info according to selection script type
USHORT nScript = pEditView->GetSelectedScriptType();
if (nScript == 0) nScript = ScGlobal::GetDefaultScriptType();
@@ -1045,7 +1045,7 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet)
if ( rSet.GetItemState( EE_CHAR_ITALIC ) != SFX_ITEM_UNKNOWN )
ScViewUtil::PutItemScript( rSet, aAttribs, EE_CHAR_ITALIC, nScript );
- // Unterstreichung
+ // Unterstreichung
SfxItemState eState = aAttribs.GetItemState( EE_CHAR_UNDERLINE, TRUE );
if ( eState == SFX_ITEM_DONTCARE )
@@ -1062,19 +1062,19 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet)
USHORT nId = SID_ULINE_VAL_NONE;
switch (eUnderline)
{
- case UNDERLINE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break;
- case UNDERLINE_DOUBLE: nId = SID_ULINE_VAL_DOUBLE; break;
- case UNDERLINE_DOTTED: nId = SID_ULINE_VAL_DOTTED; break;
+ case UNDERLINE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break;
+ case UNDERLINE_DOUBLE: nId = SID_ULINE_VAL_DOUBLE; break;
+ case UNDERLINE_DOTTED: nId = SID_ULINE_VAL_DOTTED; break;
default:
break;
}
rSet.Put( SfxBoolItem( nId, TRUE ) );
}
- //! Testen, ob Klammer-Hervorhebung aktiv ist !!!!
+ //! Testen, ob Klammer-Hervorhebung aktiv ist !!!!
ScInputHandler* pHdl = GetMyInputHdl();
if ( pHdl && pHdl->IsFormulaMode() )
- rSet.ClearItem( EE_CHAR_WEIGHT ); // hervorgehobene Klammern hier nicht
+ rSet.ClearItem( EE_CHAR_WEIGHT ); // hervorgehobene Klammern hier nicht
}
String ScEditShell::GetSelectionText( BOOL bWholeWord )
@@ -1104,11 +1104,11 @@ String ScEditShell::GetSelectionText( BOOL bWholeWord )
void ScEditShell::ExecuteUndo(SfxRequest& rReq)
{
- // #81733# Undo must be handled here because it's called for both EditViews
+ // #81733# Undo must be handled here because it's called for both EditViews
ScInputHandler* pHdl = GetMyInputHdl();
DBG_ASSERT(pHdl,"no ScInputHandler");
- EditView* pTopView = pHdl->GetTopView();
+ EditView* pTopView = pHdl->GetTopView();
EditView* pTableView = pHdl->GetTableView();
DBG_ASSERT(pTableView,"no EditView");
@@ -1153,7 +1153,7 @@ void ScEditShell::ExecuteUndo(SfxRequest& rReq)
void ScEditShell::GetUndoState(SfxItemSet &rSet)
{
- // Undo state is taken from normal ViewFrame state function
+ // Undo state is taken from normal ViewFrame state function
SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame();
if ( pViewFrm && GetUndoManager() )
@@ -1167,7 +1167,7 @@ void ScEditShell::GetUndoState(SfxItemSet &rSet)
}
}
- // disable if no action in input line EditView
+ // disable if no action in input line EditView
ScInputHandler* pHdl = GetMyInputHdl();
DBG_ASSERT(pHdl,"no ScInputHandler");
@@ -1190,7 +1190,7 @@ void ScEditShell::ExecuteTrans( SfxRequest& rReq )
ScInputHandler* pHdl = GetMyInputHdl();
DBG_ASSERT( pHdl, "no ScInputHandler" );
- EditView* pTopView = pHdl->GetTopView();
+ EditView* pTopView = pHdl->GetTopView();
EditView* pTableView = pHdl->GetTableView();
DBG_ASSERT( pTableView, "no EditView" );
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 12a1bb87211b..ccf501a36530 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#define ScFormatShell
-#define TableFont
+#define TableFont
#define FormatForSelection
#include "scslots.hxx"
@@ -158,7 +158,7 @@ ScFormatShell::ScFormatShell(ScViewData* pData) :
SfxShell(pData->GetViewShell()),
pViewData(pData)
{
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
SetPool( &pTabViewShell->GetPool() );
SfxUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager();
@@ -179,19 +179,19 @@ ScFormatShell::~ScFormatShell()
void __EXPORT ScFormatShell::GetStyleState( SfxItemSet& rSet )
{
- ScDocument* pDoc = GetViewData()->GetDocument();
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
- SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool();
+ ScDocument* pDoc = GetViewData()->GetDocument();
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool();
BOOL bProtected = FALSE;
SCTAB nTabCount = pDoc->GetTableCount();
for (SCTAB i=0; i<nTabCount; i++)
- if (pDoc->IsTabProtected(i)) // ueberhaupt eine Tabelle geschuetzt?
+ if (pDoc->IsTabProtected(i)) // ueberhaupt eine Tabelle geschuetzt?
bProtected = TRUE;
- SfxWhichIter aIter(rSet);
- USHORT nWhich = aIter.FirstWhich();
- USHORT nSlotId = 0;
+ SfxWhichIter aIter(rSet);
+ USHORT nWhich = aIter.FirstWhich();
+ USHORT nSlotId = 0;
while ( nWhich )
{
@@ -206,7 +206,7 @@ void __EXPORT ScFormatShell::GetStyleState( SfxItemSet& rSet )
rSet.DisableItem( nSlotId );
break;
- case SID_STYLE_FAMILY2: // Zellvorlagen
+ case SID_STYLE_FAMILY2: // Zellvorlagen
{
SfxStyleSheet* pStyleSheet = (SfxStyleSheet*)
pTabViewShell->GetStyleSheetFromMarked();
@@ -218,11 +218,11 @@ void __EXPORT ScFormatShell::GetStyleState( SfxItemSet& rSet )
}
break;
- case SID_STYLE_FAMILY4: // Seitenvorlagen
+ case SID_STYLE_FAMILY4: // Seitenvorlagen
{
- SCTAB nCurTab = GetViewData()->GetTabNo();
- String aPageStyle = pDoc->GetPageStyle( nCurTab );
- SfxStyleSheet* pStyleSheet = (SfxStyleSheet*)pStylePool->
+ SCTAB nCurTab = GetViewData()->GetTabNo();
+ String aPageStyle = pDoc->GetPageStyle( nCurTab );
+ SfxStyleSheet* pStyleSheet = (SfxStyleSheet*)pStylePool->
Find( aPageStyle, SFX_STYLE_FAMILY_PAGE );
if ( pStyleSheet )
@@ -281,17 +281,17 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
}
//--------------------------------------------------------------------
- SfxBindings& rBindings = pViewData->GetBindings();
- const SfxItemSet* pArgs = rReq.GetArgs();
- const USHORT nSlotId = rReq.GetSlot();
- const SCTAB nCurTab = GetViewData()->GetTabNo();
- ScDocShell* pDocSh = GetViewData()->GetDocShell();
- ScTabViewShell* pTabViewShell= GetViewData()->GetViewShell();
- ScDocument* pDoc = pDocSh->GetDocument();
- ScMarkData& rMark = GetViewData()->GetMarkData();
- ScModule* pScMod = SC_MOD();
- String aRefName;
- BOOL bUndo = pDoc->IsUndoEnabled();
+ SfxBindings& rBindings = pViewData->GetBindings();
+ const SfxItemSet* pArgs = rReq.GetArgs();
+ const USHORT nSlotId = rReq.GetSlot();
+ const SCTAB nCurTab = GetViewData()->GetTabNo();
+ ScDocShell* pDocSh = GetViewData()->GetDocShell();
+ ScTabViewShell* pTabViewShell= GetViewData()->GetViewShell();
+ ScDocument* pDoc = pDocSh->GetDocument();
+ ScMarkData& rMark = GetViewData()->GetMarkData();
+ ScModule* pScMod = SC_MOD();
+ String aRefName;
+ BOOL bUndo = pDoc->IsUndoEnabled();
if ( (nSlotId == SID_STYLE_NEW)
|| (nSlotId == SID_STYLE_EDIT)
@@ -302,13 +302,13 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
|| (nSlotId == SID_STYLE_NEW_BY_EXAMPLE)
|| (nSlotId == SID_STYLE_UPDATE_BY_EXAMPLE) )
{
- SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool();
+ SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool();
SfxStyleSheetBase* pStyleSheet = NULL;
BOOL bStyleToMarked = FALSE;
BOOL bListAction = FALSE;
- BOOL bAddUndo = FALSE; // add ScUndoModifyStyle (style modified)
- ScStyleSaveData aOldData; // for undo/redo
+ BOOL bAddUndo = FALSE; // add ScUndoModifyStyle (style modified)
+ ScStyleSaveData aOldData; // for undo/redo
ScStyleSaveData aNewData;
SfxStyleFamily eFamily = SFX_STYLE_FAMILY_PARA;
@@ -491,18 +491,18 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
// muss noch darauf geachtet werden, Items aus Vorlagen nicht
// zu uebernehmen (GetSelectionPattern sammelt auch Items aus
// Vorlagen zusammen) (#44748#)
- // pAttrItem = GetSelectionPattern();
+ // pAttrItem = GetSelectionPattern();
// ScViewData* pViewData = GetViewData();
- SCCOL nCol = pViewData->GetCurX();
- SCROW nRow = pViewData->GetCurY();
+ SCCOL nCol = pViewData->GetCurX();
+ SCROW nRow = pViewData->GetCurY();
pAttrItem = pDoc->GetPattern( nCol, nRow, nCurTab );
SfxItemSet aAttrSet = pAttrItem->GetItemSet();
aAttrSet.ClearItem( ATTR_MERGE );
aAttrSet.ClearItem( ATTR_MERGE_FLAG );
- // bedingte Formatierung und Gueltigkeit nicht uebernehmen,
- // weil sie in der Vorlage nicht editiert werden koennen
+ // bedingte Formatierung und Gueltigkeit nicht uebernehmen,
+ // weil sie in der Vorlage nicht editiert werden koennen
aAttrSet.ClearItem( ATTR_VALIDDATA );
aAttrSet.ClearItem( ATTR_CONDITIONAL );
@@ -515,8 +515,8 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
bListAction = TRUE;
}
- BOOL bConvertBack = FALSE;
- SfxStyleSheet* pSheetInUse = (SfxStyleSheet*)
+ BOOL bConvertBack = FALSE;
+ SfxStyleSheet* pSheetInUse = (SfxStyleSheet*)
pTabViewShell->GetStyleSheetFromMarked();
// wenn neuer Style vorhanden und in der Selektion
@@ -558,8 +558,8 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
pStyleSheet->GetItemSet().Put( aAttrSet );
pTabViewShell->UpdateStyleSheetInUse( (SfxStyleSheet*)pStyleSheet );
- // call SetStyleSheetToMarked after adding the ScUndoModifyStyle
- // (pStyleSheet pointer is used!)
+ // call SetStyleSheetToMarked after adding the ScUndoModifyStyle
+ // (pStyleSheet pointer is used!)
bStyleToMarked = TRUE;
}
else // ( nSlotId == SID_STYLE_UPDATE_BY_EXAMPLE )
@@ -580,8 +580,8 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
pStyleSheet->GetItemSet().Put( aAttrSet );
pTabViewShell->UpdateStyleSheetInUse( (SfxStyleSheet*)pStyleSheet );
- // call SetStyleSheetToMarked after adding the ScUndoModifyStyle
- // (pStyleSheet pointer is used!)
+ // call SetStyleSheetToMarked after adding the ScUndoModifyStyle
+ // (pStyleSheet pointer is used!)
bStyleToMarked = TRUE;
}
}
@@ -662,10 +662,10 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
if ( rStrCurStyle != aStyleName )
{
- SfxStyleSheetBase* pCurStyle = pStylePool->Find( rStrCurStyle, eFamily );
- SfxItemSet aAttrSet = pCurStyle->GetItemSet();
- SCTAB nInTab;
- BOOL bUsed = pDoc->IsPageStyleInUse( aStyleName, &nInTab );
+ SfxStyleSheetBase* pCurStyle = pStylePool->Find( rStrCurStyle, eFamily );
+ SfxItemSet aAttrSet = pCurStyle->GetItemSet();
+ SCTAB nInTab;
+ BOOL bUsed = pDoc->IsPageStyleInUse( aStyleName, &nInTab );
// wenn bereits vorhanden, erstmal entfernen...
if ( pStyleSheet )
@@ -708,14 +708,14 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
{
SvxNumberInfoItem* pNumberInfoItem = NULL;
- SfxStyleFamily eFam = pStyleSheet->GetFamily();
+ SfxStyleFamily eFam = pStyleSheet->GetFamily();
// ScDocument* pDoc = GetViewData()->GetDocument();
// ScDocShell* pDocSh = GetViewData()->GetDocShell();
- //CHINA001 ScStyleDlg* pDlg = NULL;
+ //CHINA001 ScStyleDlg* pDlg = NULL;
SfxAbstractTabDialog* pDlg = NULL; //CHINA001
- USHORT nRsc = 0;
+ USHORT nRsc = 0;
- // #37034#/#37245# alte Items aus der Vorlage merken
+ // #37034#/#37245# alte Items aus der Vorlage merken
SfxItemSet aOldSet = pStyleSheet->GetItemSet();
String aOldName = pStyleSheet->GetName();
@@ -757,14 +757,14 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
pDocSh->PutItem( *pNumberInfoItem );
nRsc = RID_SCDLG_STYLES_PAR;
- // auf jeden Fall ein SvxBoxInfoItem mit Table = FALSE im Set:
- // (wenn gar kein Item da ist, loescht der Dialog auch das
- // BORDER_OUTER SvxBoxItem aus dem Vorlagen-Set)
+ // auf jeden Fall ein SvxBoxInfoItem mit Table = FALSE im Set:
+ // (wenn gar kein Item da ist, loescht der Dialog auch das
+ // BORDER_OUTER SvxBoxItem aus dem Vorlagen-Set)
if ( rSet.GetItemState( ATTR_BORDER_INNER, FALSE ) != SFX_ITEM_SET )
{
SvxBoxInfoItem aBoxInfoItem( ATTR_BORDER_INNER );
- aBoxInfoItem.SetTable(FALSE); // keine inneren Linien
+ aBoxInfoItem.SetTable(FALSE); // keine inneren Linien
aBoxInfoItem.SetDist(TRUE);
aBoxInfoItem.SetMinDist(FALSE);
rSet.Put( aBoxInfoItem );
@@ -773,18 +773,18 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
break;
}
- // If GetDefDialogParent is a dialog, it must be used
- // (style catalog)
+ // If GetDefDialogParent is a dialog, it must be used
+ // (style catalog)
Window* pParent = Application::GetDefDialogParent();
if ( !pParent || !pParent->IsDialog() )
{
- // #107256# GetDefDialogParent currently doesn't return the window
- // that was set with SetDefDialogParent (but dynamically finds the
- // topmost parent of the focus window), so IsDialog above is FALSE
- // even if called from the style catalog.
- // -> Use NULL if a modal dialog is open, to enable the Dialog's
- // default parent handling.
+ // #107256# GetDefDialogParent currently doesn't return the window
+ // that was set with SetDefDialogParent (but dynamically finds the
+ // topmost parent of the focus window), so IsDialog above is FALSE
+ // even if called from the style catalog.
+ // -> Use NULL if a modal dialog is open, to enable the Dialog's
+ // default parent handling.
if ( Application::IsInModalMode() )
pParent = NULL;
else
@@ -810,12 +810,12 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
{
nRetMask = pStyleSheet->GetMask();
- // #37034#/#37245# Attribut-Vergleiche (frueher in ModifyStyleSheet)
- // jetzt hier mit den alten Werten (Style ist schon veraendert)
+ // #37034#/#37245# Attribut-Vergleiche (frueher in ModifyStyleSheet)
+ // jetzt hier mit den alten Werten (Style ist schon veraendert)
if ( SFX_STYLE_FAMILY_PARA == eFam )
{
-// pDoc->CellStyleChanged( *pStyleSheet, aOldSet );
+// pDoc->CellStyleChanged( *pStyleSheet, aOldSet );
SfxItemSet& rNewSet = pStyleSheet->GetItemSet();
BOOL bNumFormatChanged;
@@ -846,7 +846,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
}
else
{
- //! auch fuer Seitenvorlagen die Abfragen hier
+ //! auch fuer Seitenvorlagen die Abfragen hier
String aNewName = pStyleSheet->GetName();
if ( aNewName != aOldName &&
@@ -882,8 +882,8 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
pStylePool->Remove( pStyleSheet );
else
{
- // falls zwischendurch etwas mit dem temporaer geaenderten
- // ItemSet gepainted wurde:
+ // falls zwischendurch etwas mit dem temporaer geaenderten
+ // ItemSet gepainted wurde:
pDocSh->PostPaintGridAll();
}
}
@@ -891,7 +891,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
}
}
-// if ( nRetMask != 0xffff )// Irgendein Wert MUSS geliefert werden JN
+// if ( nRetMask != 0xffff )// Irgendein Wert MUSS geliefert werden JN
rReq.SetReturnValue( SfxUInt16Item( nSlotId, nRetMask ) );
// #96983# only stylist sends focus to sheet
@@ -904,8 +904,8 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
if ( bStyleToMarked )
{
- // call SetStyleSheetToMarked after adding the ScUndoModifyStyle,
- // so redo will find the modified style
+ // call SetStyleSheetToMarked after adding the ScUndoModifyStyle,
+ // so redo will find the modified style
pTabViewShell->SetStyleSheetToMarked( (SfxStyleSheet*)pStyleSheet );
pTabViewShell->InvalidateAttribs();
}
@@ -921,12 +921,12 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq )
{
- ScModule* pScMod = SC_MOD();
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
- const SfxItemSet* pReqArgs = rReq.GetArgs();
- USHORT nSlot = rReq.GetSlot();
+ ScModule* pScMod = SC_MOD();
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ const SfxItemSet* pReqArgs = rReq.GetArgs();
+ USHORT nSlot = rReq.GetSlot();
- pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox
+ pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox
// Eingabe beenden
if ( GetViewData()->HasEditView( GetViewData()->GetActivePart() ) )
@@ -960,7 +960,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq )
switch ( nSlot )
{
case SID_NUMBER_TWODEC:
- pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER, 4 ); // Standard+4 = #.##0,00
+ pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER, 4 ); // Standard+4 = #.##0,00
rReq.Done();
break;
case SID_NUMBER_SCIENTIFIC:
@@ -1037,7 +1037,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq )
//------------------------------------------------------------------
#define APPLY_HOR_JUSTIFY(j) \
- { \
+ { \
if ( !pHorJustify || (eHorJustify != (j) ) ) \
pTabViewShell->ApplyAttr( SvxHorJustifyItem( (j) ) ); \
else \
@@ -1045,7 +1045,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq )
}
#define APPLY_VER_JUSTIFY(j) \
- { \
+ { \
if ( !pVerJustify || (eVerJustify != (j) ) ) \
pTabViewShell->ApplyAttr( SvxVerJustifyItem( (j) ) ); \
else \
@@ -1054,12 +1054,12 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq )
void ScFormatShell::ExecuteAlignment( SfxRequest& rReq )
{
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
- SfxBindings& rBindings = pViewData->GetBindings();
- const SfxItemSet* pSet = rReq.GetArgs();
- USHORT nSlot = rReq.GetSlot();
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ SfxBindings& rBindings = pViewData->GetBindings();
+ const SfxItemSet* pSet = rReq.GetArgs();
+ USHORT nSlot = rReq.GetSlot();
- pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox
+ pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox
switch( nSlot )
{
@@ -1144,14 +1144,14 @@ void ScFormatShell::ExecuteAlignment( SfxRequest& rReq )
void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
{
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
- SfxBindings& rBindings = pViewData->GetBindings();
- const ScPatternAttr* pAttrs = pTabViewShell->GetSelectionPattern();
- const SfxItemSet* pSet = rReq.GetArgs();
- USHORT nSlot = rReq.GetSlot();
- SfxAllItemSet* pNewSet = 0;
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ SfxBindings& rBindings = pViewData->GetBindings();
+ const ScPatternAttr* pAttrs = pTabViewShell->GetSelectionPattern();
+ const SfxItemSet* pSet = rReq.GetArgs();
+ USHORT nSlot = rReq.GetSlot();
+ SfxAllItemSet* pNewSet = 0;
- pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox
+ pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox
if ( (nSlot == SID_ATTR_CHAR_WEIGHT)
||(nSlot == SID_ATTR_CHAR_POSTURE)
@@ -1176,7 +1176,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
aSetItem.PutItemForScriptType( nScript, pSet->Get( ATTR_FONT_WEIGHT ) );
else
{
- // toggle manually
+ // toggle manually
FontWeight eWeight = WEIGHT_BOLD;
SvxScriptSetItem aOldSetItem( nSlot, rPool );
@@ -1203,7 +1203,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
aSetItem.PutItemForScriptType( nScript, pSet->Get( ATTR_FONT_POSTURE ) );
else
{
- // toggle manually
+ // toggle manually
FontItalic eItalic = ITALIC_NORMAL;
SvxScriptSetItem aOldSetItem( nSlot, rPool );
@@ -1251,7 +1251,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
case SID_ULINE_VAL_NONE:
pTabViewShell->ApplyAttr( SvxUnderlineItem( UNDERLINE_NONE, ATTR_FONT_UNDERLINE ) );
break;
- case SID_ULINE_VAL_SINGLE: // Toggles
+ case SID_ULINE_VAL_SINGLE: // Toggles
case SID_ULINE_VAL_DOUBLE:
case SID_ULINE_VAL_DOTTED:
{
@@ -1287,7 +1287,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
* Button ist gedrueckt
*/
- const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet();
+ const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet();
const SfxPoolItem* pItem = NULL;
const SvxHorJustifyItem* pHorJustify = NULL;
const SvxVerJustifyItem* pVerJustify = NULL;
@@ -1314,7 +1314,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_HOR_JUSTIFY_LEFT : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
-// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_LEFT );
+// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_LEFT );
//break;
case SID_ALIGNRIGHT:
@@ -1324,7 +1324,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
-// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_RIGHT );
+// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_RIGHT );
//break;
case SID_ALIGNCENTERHOR:
@@ -1334,7 +1334,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_HOR_JUSTIFY_CENTER : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
-// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_CENTER );
+// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_CENTER );
//break;
case SID_ALIGNBLOCK:
@@ -1344,7 +1344,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_HOR_JUSTIFY_BLOCK : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
-// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_BLOCK );
+// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_BLOCK );
//break;
case SID_ALIGNTOP:
@@ -1354,7 +1354,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_VER_JUSTIFY_TOP : SVX_VER_JUSTIFY_STANDARD, SID_V_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
-// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_TOP );
+// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_TOP );
//break;
case SID_ALIGNBOTTOM:
@@ -1364,7 +1364,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_VER_JUSTIFY_BOTTOM : SVX_VER_JUSTIFY_STANDARD, SID_V_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
-// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_BOTTOM );
+// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_BOTTOM );
//break;
case SID_ALIGNCENTERVER:
@@ -1374,7 +1374,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_VER_JUSTIFY_CENTER : SVX_VER_JUSTIFY_STANDARD, SID_V_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
-// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_CENTER );
+// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_CENTER );
//break;
default:
@@ -1384,7 +1384,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
}
rBindings.Update();
-// rReq.Done();
+// rReq.Done();
if( pNewSet )
{
@@ -1405,11 +1405,11 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
{
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
- SfxBindings& rBindings = pViewData->GetBindings();
- const SfxItemSet* pNewAttrs = rReq.GetArgs();
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ SfxBindings& rBindings = pViewData->GetBindings();
+ const SfxItemSet* pNewAttrs = rReq.GetArgs();
- pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox
+ pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox
if ( !pNewAttrs )
{
@@ -1419,10 +1419,10 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
{
case SID_ATTR_CHAR_FONT:
case SID_ATTR_CHAR_FONTHEIGHT:
- pTabViewShell->ExecuteCellFormatDlg( rReq, TP_FONT ); // wenn ToolBar vertikal
+ pTabViewShell->ExecuteCellFormatDlg( rReq, TP_FONT ); // wenn ToolBar vertikal
break;
- case SID_ATTR_ALIGN_LINEBREAK: // ohne Parameter als Toggle
+ case SID_ATTR_ALIGN_LINEBREAK: // ohne Parameter als Toggle
{
const ScPatternAttr* pAttrs = pTabViewShell->GetSelectionPattern();
BOOL bOld = ((const SfxBoolItem&)pAttrs->GetItem(ATTR_LINEBREAK)).GetValue();
@@ -1439,7 +1439,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
case SID_BACKGROUND_COLOR:
{
- // SID_BACKGROUND_COLOR without arguments -> set transparent background
+ // SID_BACKGROUND_COLOR without arguments -> set transparent background
SvxBrushItem aBrushItem( (const SvxBrushItem&)
pTabViewShell->GetSelectionPattern()->
@@ -1575,11 +1575,11 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
if ( pNewAttrs->GetItemState( ATTR_BORDER, TRUE, &pItem )
== SFX_ITEM_SET )
{
- // #100959# The SvxFrameToolBoxControl toolbox controller uses a default
- // SvxBorderLine (all widths 0) to mark the lines that should be set.
- // Macro recording uses a SvxBoxItem with the real values (OutWidth > 0)
- // or NULL pointers for no lines.
- // -> Substitute existing lines with pDefLine only if widths are 0.
+ // #100959# The SvxFrameToolBoxControl toolbox controller uses a default
+ // SvxBorderLine (all widths 0) to mark the lines that should be set.
+ // Macro recording uses a SvxBoxItem with the real values (OutWidth > 0)
+ // or NULL pointers for no lines.
+ // -> Substitute existing lines with pDefLine only if widths are 0.
SvxBoxItem aBoxItem ( *(const SvxBoxItem*)pItem );
if ( aBoxItem.GetTop() && aBoxItem.GetTop()->GetOutWidth() == 0 )
aBoxItem.SetLine( pDefLine, BOX_LINE_TOP );
@@ -1669,8 +1669,8 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
void ScFormatShell::GetAttrState( SfxItemSet& rSet )
{
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
- const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet();
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet();
const SvxBorderLine* pLine = pTabViewShell->GetDefaultFrameLine();
const SvxBrushItem& rBrushItem = (const SvxBrushItem&)rAttrSet.Get( ATTR_BACKGROUND );
SfxWhichIter aIter( rSet );
@@ -1678,8 +1678,8 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet )
rSet.Put( rAttrSet, FALSE );
- // choose font info according to selection script type
- BYTE nScript = 0; // GetSelectionScriptType never returns 0
+ // choose font info according to selection script type
+ BYTE nScript = 0; // GetSelectionScriptType never returns 0
if ( rSet.GetItemState( ATTR_FONT ) != SFX_ITEM_UNKNOWN )
{
if (!nScript) nScript = pTabViewShell->GetSelectionScriptType();
@@ -1710,7 +1710,7 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet )
rSet.Put( rBrushItem, GetPool().GetWhich(nWhich) );
}
break;
-/* case SID_ATTR_ALIGN_LINEBREAK:
+/* case SID_ATTR_ALIGN_LINEBREAK:
{
const SfxBoolItem& rBreakItem = (const SfxBoolItem&)rAttrSet.Get( ATTR_LINEBREAK );
rSet.Put( rBreakItem, GetPool().GetWhich(nWhich) );
@@ -1726,12 +1726,12 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet )
void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
{
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
- const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet();
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet();
rSet.Put( rAttrSet, FALSE ); // ItemStates mitkopieren
- // choose font info according to selection script type
- BYTE nScript = 0; // GetSelectionScriptType never returns 0
+ // choose font info according to selection script type
+ BYTE nScript = 0; // GetSelectionScriptType never returns 0
if ( rSet.GetItemState( ATTR_FONT_WEIGHT ) != SFX_ITEM_UNKNOWN )
{
if (!nScript) nScript = pTabViewShell->GetSelectionScriptType();
@@ -1744,7 +1744,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
}
SfxItemState eState;
-// const SfxPoolItem* pItem;
+// const SfxPoolItem* pItem;
//--------------------------------------------------------------------
// eigene Kontrolle ueber RadioButton-Funktionalitaet:
@@ -1767,9 +1767,9 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
USHORT nId = SID_ULINE_VAL_NONE;
switch (eUnderline)
{
- case UNDERLINE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break;
- case UNDERLINE_DOUBLE: nId = SID_ULINE_VAL_DOUBLE; break;
- case UNDERLINE_DOTTED: nId = SID_ULINE_VAL_DOTTED; break;
+ case UNDERLINE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break;
+ case UNDERLINE_DOUBLE: nId = SID_ULINE_VAL_DOUBLE; break;
+ case UNDERLINE_DOTTED: nId = SID_ULINE_VAL_DOTTED; break;
default:
break;
}
@@ -1784,11 +1784,11 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
const SvxVerJustifyItem* pVerJustify = NULL;
SvxCellHorJustify eHorJustify = SVX_HOR_JUSTIFY_STANDARD;
SvxCellVerJustify eVerJustify = SVX_VER_JUSTIFY_STANDARD;
- USHORT nWhich = 0;
- BOOL bJustifyStd = FALSE;
- SfxBoolItem aBoolItem ( 0, TRUE );
+ USHORT nWhich = 0;
+ BOOL bJustifyStd = FALSE;
+ SfxBoolItem aBoolItem ( 0, TRUE );
- eState = rAttrSet.GetItemState( ATTR_HOR_JUSTIFY, TRUE,
+ eState = rAttrSet.GetItemState( ATTR_HOR_JUSTIFY, TRUE,
(const SfxPoolItem**)&pHorJustify );
switch ( eState )
{
@@ -1845,10 +1845,10 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
else if ( bJustifyStd )
{
aBoolItem.SetValue( FALSE );
- aBoolItem.SetWhich( SID_ALIGNLEFT ); rSet.Put( aBoolItem );
- aBoolItem.SetWhich( SID_ALIGNRIGHT ); rSet.Put( aBoolItem );
+ aBoolItem.SetWhich( SID_ALIGNLEFT ); rSet.Put( aBoolItem );
+ aBoolItem.SetWhich( SID_ALIGNRIGHT ); rSet.Put( aBoolItem );
aBoolItem.SetWhich( SID_ALIGNCENTERHOR ); rSet.Put( aBoolItem );
- aBoolItem.SetWhich( SID_ALIGNBLOCK ); rSet.Put( aBoolItem );
+ aBoolItem.SetWhich( SID_ALIGNBLOCK ); rSet.Put( aBoolItem );
bJustifyStd = FALSE;
}
@@ -1909,8 +1909,8 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
else if ( bJustifyStd )
{
aBoolItem.SetValue( FALSE );
- aBoolItem.SetWhich( SID_ALIGNTOP ); rSet.Put( aBoolItem );
- aBoolItem.SetWhich( SID_ALIGNBOTTOM ); rSet.Put( aBoolItem );
+ aBoolItem.SetWhich( SID_ALIGNTOP ); rSet.Put( aBoolItem );
+ aBoolItem.SetWhich( SID_ALIGNBOTTOM ); rSet.Put( aBoolItem );
aBoolItem.SetWhich( SID_ALIGNCENTERVER ); rSet.Put( aBoolItem );
}
}
@@ -1920,9 +1920,9 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
void ScFormatShell::GetBorderState( SfxItemSet& rSet )
{
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
- SvxBoxItem aBoxItem( ATTR_BORDER );
- SvxBoxInfoItem aInfoItem( ATTR_BORDER_INNER );
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ SvxBoxItem aBoxItem( ATTR_BORDER );
+ SvxBoxInfoItem aInfoItem( ATTR_BORDER_INNER );
pTabViewShell->GetSelectionFrame( aBoxItem, aInfoItem );
@@ -1936,10 +1936,10 @@ void ScFormatShell::GetBorderState( SfxItemSet& rSet )
void ScFormatShell::GetAlignState( SfxItemSet& rSet )
{
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet();
- SfxWhichIter aIter(rSet);
- USHORT nWhich = aIter.FirstWhich();
+ SfxWhichIter aIter(rSet);
+ USHORT nWhich = aIter.FirstWhich();
SvxCellHorJustify eHAlign = SVX_HOR_JUSTIFY_STANDARD;
bool bHasHAlign = rAttrSet.GetItemState( ATTR_HOR_JUSTIFY ) != SFX_ITEM_DONTCARE;
@@ -1985,10 +1985,10 @@ void ScFormatShell::GetAlignState( SfxItemSet& rSet )
void ScFormatShell::GetNumFormatState( SfxItemSet& rSet )
{
- ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
// ScViewData* pViewData = GetViewData();
- ScDocument* pDoc = pViewData->GetDocument();
+ ScDocument* pDoc = pViewData->GetDocument();
SfxWhichIter aIter(rSet);
USHORT nWhich = aIter.FirstWhich();
@@ -1998,7 +1998,7 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet )
{
case SID_NUMBER_FORMAT:
{
- String aFormatCode; // bleibt leer, wenn dont-care
+ String aFormatCode; // bleibt leer, wenn dont-care
const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet();
if ( rAttrSet.GetItemState( ATTR_VALUE_FORMAT ) != SFX_ITEM_DONTCARE )
@@ -2087,7 +2087,7 @@ void ScFormatShell::GetTextDirectionState( SfxItemSet& rSet )
eBidiDir = EE_HTEXTDIR_L2R;
}
- SvtLanguageOptions aLangOpt;
+ SvtLanguageOptions aLangOpt;
BOOL bDisableCTLFont = !aLangOpt.IsCTLFontEnabled();
BOOL bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled();
diff --git a/sc/source/ui/view/galwrap.cxx b/sc/source/ui/view/galwrap.cxx
index 1d92cb5f303a..65146deca056 100644
--- a/sc/source/ui/view/galwrap.cxx
+++ b/sc/source/ui/view/galwrap.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ String GalleryGetFullPath()
{
GalleryExplorer* pGal = SVX_GALLERY();
DBG_ASSERT( pGal, "Wo ist die Gallery?" );
-// return pGal->GetPath().GetFull();
+// return pGal->GetPath().GetFull();
return pGal->GetURL().GetMainURL(INetURLObject::NO_DECODE);
// URL as stored in GraphicLink must be encoded
}
diff --git a/sc/source/ui/view/gridmerg.cxx b/sc/source/ui/view/gridmerg.cxx
index 5a1f501e38ca..bb5afda14ebe 100644
--- a/sc/source/ui/view/gridmerg.cxx
+++ b/sc/source/ui/view/gridmerg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +43,8 @@ ScGridMerger::ScGridMerger( OutputDevice* pOutDev, long nOnePixelX, long nOnePix
nCount( 0 ),
bVertical( FALSE )
{
- // optimize (DrawGrid) only for pixel MapMode,
- // to avoid rounding errors
+ // optimize (DrawGrid) only for pixel MapMode,
+ // to avoid rounding errors
bOptimize = ( pDev->GetMapMode().GetMapUnit() == MAP_PIXEL );
}
@@ -58,8 +58,8 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos )
{
if ( nCount )
{
- // not first line - test fix position
- // more than one previous line - test distance
+ // not first line - test fix position
+ // more than one previous line - test distance
if ( nStart != nFixStart || nEnd != nFixEnd )
{
@@ -67,8 +67,8 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos )
( nStart == nFixEnd ||
nStart == nFixEnd + ( bVertical ? nOneY : nOneX ) ) )
{
- // additional optimization: extend connected lines
- // keep nCount at 1
+ // additional optimization: extend connected lines
+ // keep nCount at 1
nFixEnd = nEnd;
}
else
@@ -79,7 +79,7 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos )
nVarDiff = nPos - nVarStart;
++nCount;
}
- else if ( nPos != nVarStart + nCount * nVarDiff ) //! keep VarEnd?
+ else if ( nPos != nVarStart + nCount * nVarDiff ) //! keep VarEnd?
Flush();
else
++nCount;
@@ -87,7 +87,7 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos )
if ( !nCount )
{
- // first line (or flushed above) - just store
+ // first line (or flushed above) - just store
nFixStart = nStart;
nFixEnd = nEnd;
@@ -140,9 +140,9 @@ void ScGridMerger::Flush()
long nVarEnd = nVarStart + ( nCount - 1 ) * nVarDiff;
if ( nVarDiff < 0 )
{
- // nVarDiff is negative in RTL layout mode
- // Change the positions so DrawGrid is called with a positive distance
- // (nVarStart / nVarDiff can be modified, aren't used after Flush)
+ // nVarDiff is negative in RTL layout mode
+ // Change the positions so DrawGrid is called with a positive distance
+ // (nVarStart / nVarDiff can be modified, aren't used after Flush)
nVarDiff = -nVarDiff;
long nTemp = nVarStart;
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 0f07b8772254..64df802e8e9a 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +54,8 @@
#include <sot/formats.hxx>
#include <sot/clsids.hxx>
-#include <svx/svdview.hxx> // fuer Command-Handler (COMMAND_INSERTTEXT)
-#include <editeng/outliner.hxx> // fuer Command-Handler (COMMAND_INSERTTEXT)
+#include <svx/svdview.hxx> // fuer Command-Handler (COMMAND_INSERTTEXT)
+#include <editeng/outliner.hxx> // fuer Command-Handler (COMMAND_INSERTTEXT)
#include <svx/svditer.hxx>
#include <svx/svdocapt.hxx>
#include <svx/svdpagv.hxx>
@@ -90,10 +90,10 @@
#include "editutil.hxx"
#include "scresid.hxx"
#include "inputhdl.hxx"
-#include "uiitems.hxx" // Filter-Dialog - auslagern !!!
+#include "uiitems.hxx" // Filter-Dialog - auslagern !!!
#include "filtdlg.hxx"
-#include "impex.hxx" // Sylk-ID fuer CB
-#include "cell.hxx" // fuer Edit-Felder
+#include "impex.hxx" // Sylk-ID fuer CB
+#include "cell.hxx" // fuer Edit-Felder
#include "patattr.hxx"
#include "notemark.hxx"
#include "rfindlst.hxx"
@@ -137,11 +137,11 @@ const BYTE SC_NESTEDBUTTON_NONE = 0;
const BYTE SC_NESTEDBUTTON_DOWN = 1;
const BYTE SC_NESTEDBUTTON_UP = 2;
-#define SC_AUTOFILTER_ALL 0
-#define SC_AUTOFILTER_TOP10 1
-#define SC_AUTOFILTER_CUSTOM 2
+#define SC_AUTOFILTER_ALL 0
+#define SC_AUTOFILTER_TOP10 1
+#define SC_AUTOFILTER_CUSTOM 2
-// Modi fuer die FilterListBox
+// Modi fuer die FilterListBox
enum ScFilterBoxMode
{
SC_FILTERBOX_FILTER,
@@ -150,11 +150,11 @@ enum ScFilterBoxMode
SC_FILTERBOX_PAGEFIELD
};
-extern SfxViewShell* pScActiveViewShell; // global.cxx
-extern USHORT nScClickMouseModifier; // global.cxx
-extern USHORT nScFillModeMouseModifier; // global.cxx
+extern SfxViewShell* pScActiveViewShell; // global.cxx
+extern USHORT nScClickMouseModifier; // global.cxx
+extern USHORT nScFillModeMouseModifier; // global.cxx
-#define SC_FILTERLISTBOX_LINES 12
+#define SC_FILTERLISTBOX_LINES 12
// ============================================================================
@@ -173,36 +173,36 @@ bool ScGridWindow::VisibleRange::isInside(SCCOL nCol, SCROW nRow) const
class ScFilterListBox : public ListBox
{
private:
- ScGridWindow* pGridWin;
- SCCOL nCol;
- SCROW nRow;
- BOOL bButtonDown;
- BOOL bInit;
- BOOL bCancelled;
+ ScGridWindow* pGridWin;
+ SCCOL nCol;
+ SCROW nRow;
+ BOOL bButtonDown;
+ BOOL bInit;
+ BOOL bCancelled;
BOOL bInSelect;
bool mbListHasDates;
- ULONG nSel;
- ScFilterBoxMode eMode;
+ ULONG nSel;
+ ScFilterBoxMode eMode;
protected:
- virtual void LoseFocus();
- void SelectHdl();
+ virtual void LoseFocus();
+ void SelectHdl();
public:
ScFilterListBox( Window* pParent, ScGridWindow* pGrid,
SCCOL nNewCol, SCROW nNewRow, ScFilterBoxMode eNewMode );
~ScFilterListBox();
- virtual long PreNotify( NotifyEvent& rNEvt );
- virtual void Select();
+ virtual long PreNotify( NotifyEvent& rNEvt );
+ virtual void Select();
- SCCOL GetCol() const { return nCol; }
- SCROW GetRow() const { return nRow; }
- ScFilterBoxMode GetMode() const { return eMode; }
- BOOL IsDataSelect() const { return (eMode == SC_FILTERBOX_DATASELECT); }
- void EndInit();
+ SCCOL GetCol() const { return nCol; }
+ SCROW GetRow() const { return nRow; }
+ ScFilterBoxMode GetMode() const { return eMode; }
+ BOOL IsDataSelect() const { return (eMode == SC_FILTERBOX_DATASELECT); }
+ void EndInit();
BOOL IsInInit() const { return bInit; }
- void SetCancelled() { bCancelled = TRUE; }
+ void SetCancelled() { bCancelled = TRUE; }
BOOL IsInSelect() const { return bInSelect; }
void SetListHasDates(bool b) { mbListHasDates = b; }
bool HasDates() const { return mbListHasDates; }
@@ -210,7 +210,7 @@ public:
//-------------------------------------------------------------------
-// ListBox in einem FloatingWindow (pParent)
+// ListBox in einem FloatingWindow (pParent)
ScFilterListBox::ScFilterListBox( Window* pParent, ScGridWindow* pGrid,
SCCOL nNewCol, SCROW nNewRow, ScFilterBoxMode eNewMode ) :
ListBox( pParent, WB_AUTOHSCROLL ),
@@ -260,17 +260,17 @@ long ScFilterListBox::PreNotify( NotifyEvent& rNEvt )
{
KeyEvent aKeyEvt = *rNEvt.GetKeyEvent();
KeyCode aCode = aKeyEvt.GetKeyCode();
- if ( !aCode.GetModifier() ) // ohne alle Modifiers
+ if ( !aCode.GetModifier() ) // ohne alle Modifiers
{
USHORT nKey = aCode.GetCode();
if ( nKey == KEY_RETURN )
{
- SelectHdl(); // auswaehlen
+ SelectHdl(); // auswaehlen
nDone = 1;
}
else if ( nKey == KEY_ESCAPE )
{
- pGridWin->ClickExtern(); // loescht die List-Box !!!
+ pGridWin->ClickExtern(); // loescht die List-Box !!!
nDone = 1;
}
}
@@ -335,9 +335,9 @@ Window* ScFilterFloatingWindow::GetPreferredKeyInputWindow()
BOOL lcl_IsEditableMatrix( ScDocument* pDoc, const ScRange& rRange )
{
- // wenn es ein editierbarer Bereich ist, und rechts unten eine Matrix-Zelle
- // mit Origin links oben liegt, enthaelt der Bereich genau die Matrix.
- //! Direkt die MatrixEdges Funktionen von der Column herausreichen ???
+ // wenn es ein editierbarer Bereich ist, und rechts unten eine Matrix-Zelle
+ // mit Origin links oben liegt, enthaelt der Bereich genau die Matrix.
+ //! Direkt die MatrixEdges Funktionen von der Column herausreichen ???
if ( !pDoc->IsBlockEditable( rRange.aStart.Tab(), rRange.aStart.Col(),rRange.aStart.Row(),
rRange.aEnd.Col(),rRange.aEnd.Row() ) )
@@ -378,9 +378,9 @@ sal_Bool lcl_GetHyperlinkCell(ScDocument* pDoc, SCCOL& rPosX, SCROW& rPosY, SCTA
if ( !rpCell || rpCell->GetCellType() == CELLTYPE_NOTE )
{
if ( rPosX <= 0 )
- return FALSE; // alles leer bis links
+ return FALSE; // alles leer bis links
else
- --rPosX; // weitersuchen
+ --rPosX; // weitersuchen
}
else if ( rpCell->GetCellType() == CELLTYPE_EDIT)
bFound = TRUE;
@@ -388,7 +388,7 @@ sal_Bool lcl_GetHyperlinkCell(ScDocument* pDoc, SCCOL& rPosX, SCROW& rPosY, SCTA
static_cast<ScFormulaCell*>(rpCell)->IsHyperLinkCell())
bFound = TRUE;
else
- return FALSE; // andere Zelle
+ return FALSE; // andere Zelle
}
while ( !bFound );
@@ -396,9 +396,9 @@ sal_Bool lcl_GetHyperlinkCell(ScDocument* pDoc, SCCOL& rPosX, SCROW& rPosY, SCTA
}
// ---------------------------------------------------------------------------
-// WB_DIALOGCONTROL noetig fuer UNO-Controls
+// WB_DIALOGCONTROL noetig fuer UNO-Controls
ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhichPos )
-: Window( pParent, WB_CLIPCHILDREN | WB_DIALOGCONTROL ),
+: Window( pParent, WB_CLIPCHILDREN | WB_DIALOGCONTROL ),
DropTargetHelper( this ),
DragSourceHelper( this ),
mpOOCursors( NULL ),
@@ -414,7 +414,7 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic
pFilterBox( NULL ),
pFilterFloat( NULL ),
mpDPFieldPopup(NULL),
- mpFilterButton(NULL),
+ mpFilterButton(NULL),
nCursorHideCount( 0 ),
bMarking( FALSE ),
nButtonDown( 0 ),
@@ -463,7 +463,7 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic
SetBackground();
SetMapMode(pViewData->GetLogicMode(eWhich));
-// EnableDrop();
+// EnableDrop();
EnableChildTransparentMode();
SetDialogControlFlags( WINDOW_DLGCTRL_RETURN | WINDOW_DLGCTRL_WANTFOCUS );
@@ -486,7 +486,7 @@ __EXPORT ScGridWindow::~ScGridWindow()
void __EXPORT ScGridWindow::Resize( const Size& )
{
- // gar nix
+ // gar nix
}
void ScGridWindow::ClickExtern()
@@ -500,7 +500,7 @@ void ScGridWindow::ClickExtern()
{
break;
}
-
+
DELETEZ(pFilterBox);
DELETEZ(pFilterFloat);
}
@@ -516,7 +516,7 @@ void ScGridWindow::ClickExtern()
IMPL_LINK( ScGridWindow, PopupModeEndHdl, FloatingWindow*, EMPTYARG )
{
if (pFilterBox)
- pFilterBox->SetCancelled(); // nicht mehr auswaehlen
+ pFilterBox->SetCancelled(); // nicht mehr auswaehlen
GrabFocus();
return 0;
}
@@ -530,11 +530,11 @@ IMPL_LINK( ScGridWindow, PopupSpellingHdl, SpellCallbackInfo*, pInfo )
void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelection, const String& rStr )
{
- //! gridwin2 ?
+ //! gridwin2 ?
ScDocument* pDoc = pViewData->GetDocument();
SCTAB nTab = pViewData->GetTabNo();
- ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab);
+ ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab);
if ( pDPObj && nCol > 0 )
{
// look for the dimension header left of the drop-down arrow
@@ -559,7 +559,7 @@ void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelecti
aNewObj.SetSaveData( aSaveData );
ScDBDocFunc aFunc( *pViewData->GetDocShell() );
aFunc.DataPilotUpdate( pDPObj, &aNewObj, TRUE, FALSE );
- pViewData->GetView()->CursorPosChanged(); // shells may be switched
+ pViewData->GetView()->CursorPosChanged(); // shells may be switched
}
}
}
@@ -567,7 +567,7 @@ void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelecti
void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow )
{
- //! merge position/size handling with DoAutoFilterMenue
+ //! merge position/size handling with DoAutoFilterMenue
delete pFilterBox;
delete pFilterFloat;
@@ -590,7 +590,7 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow )
aPos.X() -= 1;
aPos.Y() += nSizeY - 1;
- pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // not resizable etc.
+ pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // not resizable etc.
pFilterFloat->SetPopupModeEndHdl( LINK( this, ScGridWindow, PopupModeEndHdl ) );
pFilterBox = new ScFilterListBox( pFilterFloat, this, nCol, nRow, SC_FILTERBOX_PAGEFIELD );
if ( bLayoutRTL )
@@ -599,7 +599,7 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow )
nSizeX += 1;
{
- Font aOldFont = GetFont(); SetFont( pFilterBox->GetFont() );
+ Font aOldFont = GetFont(); SetFont( pFilterBox->GetFont() );
MapMode aOldMode = GetMapMode(); SetMapMode( MAP_PIXEL );
nHeight = GetTextHeight();
@@ -609,14 +609,14 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow )
SetFont( aOldFont );
}
- // SetSize comes later
+ // SetSize comes later
TypedScStrCollection aStrings( 128, 128 );
- // get list box entries and selection
+ // get list box entries and selection
BOOL bHasCurrentPage = FALSE;
String aCurrentPage;
- ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab);
+ ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab);
if ( pDPObj && nCol > 0 )
{
// look for the dimension header left of the drop-down arrow
@@ -643,7 +643,7 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow )
}
}
- // include all entry widths for the size of the drop-down
+ // include all entry widths for the size of the drop-down
long nMaxText = 0;
USHORT nCount = aStrings.GetCount();
for (i=0; i<nCount; i++)
@@ -654,17 +654,17 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow )
nMaxText = nTextWidth;
}
- // add scrollbar width if needed (string entries are counted here)
- // (scrollbar is shown if the box is exactly full?)
+ // add scrollbar width if needed (string entries are counted here)
+ // (scrollbar is shown if the box is exactly full?)
if ( nCount >= SC_FILTERLISTBOX_LINES )
nMaxText += GetSettings().GetStyleSettings().GetScrollBarSize();
- nMaxText += 4; // for borders
+ nMaxText += 4; // for borders
if ( nMaxText > nSizeX )
- nSizeX = nMaxText; // just modify width - starting position is unchanged
+ nSizeX = nMaxText; // just modify width - starting position is unchanged
- // adjust position and size to window
+ // adjust position and size to window
Size aParentSize = GetParent()->GetOutputSizePixel();
Size aSize( nSizeX, nHeight );
@@ -675,13 +675,13 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow )
aPos.Y() = aParentSize.Height() - aSize.Height();
pFilterBox->SetSizePixel( aSize );
- pFilterBox->Show(); // Show must be called before SetUpdateMode
+ pFilterBox->Show(); // Show must be called before SetUpdateMode
pFilterBox->SetUpdateMode(FALSE);
pFilterFloat->SetOutputSizePixel( aSize );
pFilterFloat->StartPopupMode( aCellRect, FLOATWIN_POPUPMODE_DOWN|FLOATWIN_POPUPMODE_GRABFOCUS);
- // fill the list box
+ // fill the list box
BOOL bWait = ( nCount > 100 );
if (bWait)
@@ -706,7 +706,7 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow )
pFilterBox->GrabFocus();
- // call Select after GrabFocus, so the focus rectangle ends up in the right position
+ // call Select after GrabFocus, so the focus rectangle ends up in the right position
if ( nSelPos != LISTBOX_ENTRY_NOTFOUND )
pFilterBox->SelectEntryPos( nSelPos );
@@ -737,13 +737,13 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange )
delete pFilterBox;
delete pFilterFloat;
- SCCOL nCol = rScenRange.aEnd.Col(); // Zelle unterhalb des Buttons
+ SCCOL nCol = rScenRange.aEnd.Col(); // Zelle unterhalb des Buttons
SCROW nRow = rScenRange.aStart.Row();
if (nRow == 0)
{
- nRow = rScenRange.aEnd.Row() + 1; // Bereich ganz oben -> Button unterhalb
+ nRow = rScenRange.aEnd.Row() + 1; // Bereich ganz oben -> Button unterhalb
if (nRow>MAXROW) nRow = MAXROW;
- //! Texthoehe addieren (wenn sie an der View gespeichert ist...)
+ //! Texthoehe addieren (wenn sie an der View gespeichert ist...)
}
ScDocument* pDoc = pViewData->GetDocument();
@@ -760,10 +760,10 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange )
Rectangle aCellRect( OutputToScreenPixel(aPos), Size(nSizeX,nSizeY) );
aCellRect.Top() -= nSizeY;
aCellRect.Bottom() -= nSizeY - 1;
- // Die ListBox direkt unter der schwarzen Linie auf dem Zellgitter
- // (wenn die Linie verdeckt wird, sieht es komisch aus...)
+ // Die ListBox direkt unter der schwarzen Linie auf dem Zellgitter
+ // (wenn die Linie verdeckt wird, sieht es komisch aus...)
- pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // nicht resizable etc.
+ pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // nicht resizable etc.
pFilterFloat->SetPopupModeEndHdl( LINK( this, ScGridWindow, PopupModeEndHdl ) );
pFilterBox = new ScFilterListBox( pFilterFloat, this, nCol, nRow, SC_FILTERBOX_SCENARIO );
if ( bLayoutRTL )
@@ -772,7 +772,7 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange )
nSizeX += 1;
{
- Font aOldFont = GetFont(); SetFont( pFilterBox->GetFont() );
+ Font aOldFont = GetFont(); SetFont( pFilterBox->GetFont() );
MapMode aOldMode = GetMapMode(); SetMapMode( MAP_PIXEL );
nHeight = GetTextHeight();
@@ -782,22 +782,22 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange )
SetFont( aOldFont );
}
- // SetSize spaeter
+ // SetSize spaeter
/*
pFilterBox->SetSelectionMode( SINGLE_SELECTION );
pFilterBox->SetTabs( nFilterBoxTabs, MapUnit( MAP_APPFONT ));
pFilterBox->SetTabJustify( 1, bLayoutRTL ? AdjustRight : AdjustLeft );
*/
- // ParentSize Abfrage fehlt
+ // ParentSize Abfrage fehlt
Size aSize( nSizeX, nHeight );
pFilterBox->SetSizePixel( aSize );
- pFilterBox->Show(); // Show muss vor SetUpdateMode kommen !!!
+ pFilterBox->Show(); // Show muss vor SetUpdateMode kommen !!!
pFilterBox->SetUpdateMode(FALSE);
- // SetOutputSizePixel/StartPopupMode erst unten, wenn die Groesse feststeht
+ // SetOutputSizePixel/StartPopupMode erst unten, wenn die Groesse feststeht
- // Listbox fuellen
+ // Listbox fuellen
long nMaxText = 0;
String aCurrent;
@@ -820,11 +820,11 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange )
}
if (nEntryCount > SC_FILTERLISTBOX_LINES)
nMaxText += GetSettings().GetStyleSettings().GetScrollBarSize();
- nMaxText += 4; // fuer Rand
+ nMaxText += 4; // fuer Rand
if ( nMaxText > 300 )
- nMaxText = 300; // auch nicht uebertreiben (Pixel)
+ nMaxText = 300; // auch nicht uebertreiben (Pixel)
- if (nMaxText > nSizeX) // Groesse auf benoetigte Groesse anpassen
+ if (nMaxText > nSizeX) // Groesse auf benoetigte Groesse anpassen
{
long nDiff = nMaxText - nSizeX;
aSize = Size( nMaxText, nHeight );
@@ -833,7 +833,7 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange )
if ( !bLayoutRTL )
{
- // also move popup position
+ // also move popup position
long nNewX = aCellRect.Left() - nDiff;
if ( nNewX < 0 )
nNewX = 0;
@@ -847,24 +847,24 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange )
pFilterBox->SetUpdateMode(TRUE);
pFilterBox->GrabFocus();
- // Select erst nach GrabFocus, damit das Focus-Rechteck richtig landet
-//! SvLBoxEntry* pSelect = NULL;
+ // Select erst nach GrabFocus, damit das Focus-Rechteck richtig landet
+//! SvLBoxEntry* pSelect = NULL;
USHORT nPos = LISTBOX_ENTRY_NOTFOUND;
if (aCurrent.Len())
{
nPos = pFilterBox->GetEntryPos( aCurrent );
-//! pSelect = pFilterBox->GetEntry( nPos );
+//! pSelect = pFilterBox->GetEntry( nPos );
}
if (/*!pSelect*/ LISTBOX_ENTRY_NOTFOUND == nPos && pFilterBox->GetEntryCount() > 0 )
nPos = 0;
-//! pSelect = pFilterBox->GetEntry(0); // einer sollte immer selektiert sein
+//! pSelect = pFilterBox->GetEntry(0); // einer sollte immer selektiert sein
if (/*pSelect*/ LISTBOX_ENTRY_NOTFOUND != nPos )
pFilterBox->SelectEntryPos(nPos);
pFilterBox->EndInit();
// Szenario-Auswahl kommt aus MouseButtonDown:
- // der naechste MouseMove auf die Filterbox ist wie ein ButtonDown
+ // der naechste MouseMove auf die Filterbox ist wie ein ButtonDown
nMouseStatus = SC_GM_FILTER;
CaptureMouse();
@@ -893,7 +893,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
aPos.X() -= 1;
aPos.Y() += nSizeY - 1;
- pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // nicht resizable etc.
+ pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // nicht resizable etc.
pFilterFloat->SetPopupModeEndHdl( LINK( this, ScGridWindow, PopupModeEndHdl ) );
pFilterBox = new ScFilterListBox(
pFilterFloat, this, nCol, nRow, bDataSelect ? SC_FILTERBOX_DATASELECT : SC_FILTERBOX_FILTER );
@@ -903,7 +903,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
nSizeX += 1;
{
- Font aOldFont = GetFont(); SetFont( pFilterBox->GetFont() );
+ Font aOldFont = GetFont(); SetFont( pFilterBox->GetFont() );
MapMode aOldMode = GetMapMode(); SetMapMode( MAP_PIXEL );
nHeight = GetTextHeight();
@@ -913,7 +913,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
SetFont( aOldFont );
}
- // SetSize spaeter
+ // SetSize spaeter
/*
pFilterBox->SetSelectionMode( SINGLE_SELECTION );
pFilterBox->SetTabs( nFilterBoxTabs, MapUnit( MAP_APPFONT ));
@@ -922,24 +922,24 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
BOOL bEmpty = FALSE;
TypedScStrCollection aStrings( 128, 128 );
- if ( bDataSelect ) // Auswahl-Liste
+ if ( bDataSelect ) // Auswahl-Liste
{
- // Liste fuellen
+ // Liste fuellen
aStrings.SetCaseSensitive( TRUE );
pDoc->GetDataEntries( nCol, nRow, nTab, aStrings );
if ( aStrings.GetCount() == 0 )
bEmpty = TRUE;
}
- else // AutoFilter
+ else // AutoFilter
{
- //! wird der Titel ueberhaupt ausgewertet ???
+ //! wird der Titel ueberhaupt ausgewertet ???
String aString;
pDoc->GetString( nCol, nRow, nTab, aString );
pFilterBox->SetText( aString );
long nMaxText = 0;
- // default entries
+ // default entries
static const USHORT nDefIDs[] = { SCSTR_ALLFILTER, SCSTR_TOP10FILTER, SCSTR_STDFILTER };
const USHORT nDefCount = sizeof(nDefIDs) / sizeof(USHORT);
for (i=0; i<nDefCount; i++)
@@ -952,18 +952,18 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
}
pFilterBox->SetSeparatorPos( nDefCount - 1 );
- // get list entries
+ // get list entries
bool bHasDates = false;
pDoc->GetFilterEntries( nCol, nRow, nTab, true, aStrings, bHasDates);
pFilterBox->SetListHasDates(bHasDates);
- // check widths of numerical entries (string entries are not included)
- // so all numbers are completely visible
+ // check widths of numerical entries (string entries are not included)
+ // so all numbers are completely visible
USHORT nCount = aStrings.GetCount();
for (i=0; i<nCount; i++)
{
TypedStrData* pData = aStrings[i];
- if ( !pData->IsStrData() ) // only numerical entries
+ if ( !pData->IsStrData() ) // only numerical entries
{
long nTextWidth = pFilterBox->GetTextWidth( pData->GetString() );
if ( nTextWidth > nMaxText )
@@ -971,21 +971,21 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
}
}
- // add scrollbar width if needed (string entries are counted here)
- // (scrollbar is shown if the box is exactly full?)
+ // add scrollbar width if needed (string entries are counted here)
+ // (scrollbar is shown if the box is exactly full?)
if ( nCount + nDefCount >= SC_FILTERLISTBOX_LINES )
nMaxText += GetSettings().GetStyleSettings().GetScrollBarSize();
- nMaxText += 4; // for borders
+ nMaxText += 4; // for borders
if ( nMaxText > nSizeX )
- nSizeX = nMaxText; // just modify width - starting position is unchanged
+ nSizeX = nMaxText; // just modify width - starting position is unchanged
}
if (!bEmpty)
{
- // Position und Groesse an Fenster anpassen
- //! vorher Abfrage, ob die Eintraege hineinpassen (Breite)
+ // Position und Groesse an Fenster anpassen
+ //! vorher Abfrage, ob die Eintraege hineinpassen (Breite)
Size aParentSize = GetParent()->GetOutputSizePixel();
Size aSize( nSizeX, nHeight );
@@ -996,13 +996,13 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
aPos.Y() = aParentSize.Height() - aSize.Height();
pFilterBox->SetSizePixel( aSize );
- pFilterBox->Show(); // Show muss vor SetUpdateMode kommen !!!
+ pFilterBox->Show(); // Show muss vor SetUpdateMode kommen !!!
pFilterBox->SetUpdateMode(FALSE);
pFilterFloat->SetOutputSizePixel( aSize );
pFilterFloat->StartPopupMode( aCellRect, FLOATWIN_POPUPMODE_DOWN|FLOATWIN_POPUPMODE_GRABFOCUS);
- // Listbox fuellen
+ // Listbox fuellen
USHORT nCount = aStrings.GetCount();
BOOL bWait = ( nCount > 100 );
@@ -1018,22 +1018,22 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
pFilterBox->SetUpdateMode(TRUE);
}
-//! SvLBoxEntry* pSelect = NULL;
+//! SvLBoxEntry* pSelect = NULL;
USHORT nSelPos = LISTBOX_ENTRY_NOTFOUND;
- if (!bDataSelect) // AutoFilter: aktiven Eintrag selektieren
+ if (!bDataSelect) // AutoFilter: aktiven Eintrag selektieren
{
ScDBData* pDBData = pDoc->GetDBAtCursor( nCol, nRow, nTab );
if (pDBData)
{
ScQueryParam aParam;
- pDBData->GetQueryParam( aParam ); // kann nur MAXQUERY Eintraege ergeben
+ pDBData->GetQueryParam( aParam ); // kann nur MAXQUERY Eintraege ergeben
BOOL bValid = TRUE;
- for (SCSIZE j=0; j<MAXQUERY && bValid; j++) // bisherige Filter-Einstellungen
+ for (SCSIZE j=0; j<MAXQUERY && bValid; j++) // bisherige Filter-Einstellungen
if (aParam.GetEntry(j).bDoQuery)
{
- //! Abfrage mit DrawButtons zusammenfassen!
+ //! Abfrage mit DrawButtons zusammenfassen!
ScQueryEntry& rEntry = aParam.GetEntry(j);
if (j>0)
@@ -1047,7 +1047,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
if (pStr)
{
nSelPos = pFilterBox->GetEntryPos( *pStr );
-//! pSelect = pFilterBox->GetEntry( nPos );
+//! pSelect = pFilterBox->GetEntry( nPos );
}
}
else if (rEntry.eOp == SC_TOPVAL && rEntry.pStr &&
@@ -1069,7 +1069,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
nCol, nRow, nTab, ATTR_VALIDDATA ))->GetValue();
if ( nIndex )
{
- const ScValidationData* pData = pDoc->GetValidationEntry( nIndex );
+ const ScValidationData* pData = pDoc->GetValidationEntry( nIndex );
if (pData)
{
TypedStrData* pNew = NULL;
@@ -1095,7 +1095,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
USHORT nCount = aStrings.GetCount();
for (i = 0; ((i < nCount) && ( LISTBOX_ENTRY_NOTFOUND == nSelPos)); i++)
{
- if ( aStrings.Compare(aStrings[i], pNew)==0 )
+ if ( aStrings.Compare(aStrings[i], pNew)==0 )
nSelPos = i;
}
}
@@ -1104,24 +1104,24 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
}
}
- // neu (309): irgendwas muss immer selektiert sein:
+ // neu (309): irgendwas muss immer selektiert sein:
if ( LISTBOX_ENTRY_NOTFOUND == nSelPos && pFilterBox->GetEntryCount() > 0 && !bDataSelect)
nSelPos = 0;
- // keine leere Auswahl-Liste anzeigen:
+ // keine leere Auswahl-Liste anzeigen:
if ( bEmpty )
{
- DELETEZ(pFilterBox); // war nix
+ DELETEZ(pFilterBox); // war nix
DELETEZ(pFilterFloat);
- Sound::Beep(); // bemerkbar machen
+ Sound::Beep(); // bemerkbar machen
}
else
{
-// pFilterBox->Show(); // schon vorne
+// pFilterBox->Show(); // schon vorne
pFilterBox->GrabFocus();
- // Select erst nach GrabFocus, damit das Focus-Rechteck richtig landet
+ // Select erst nach GrabFocus, damit das Focus-Rechteck richtig landet
if ( LISTBOX_ENTRY_NOTFOUND != nSelPos )
pFilterBox->SelectEntryPos( nSelPos );
else
@@ -1135,7 +1135,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect )
if (!bDataSelect)
{
// AutoFilter (aus MouseButtonDown):
- // der naechste MouseMove auf die Filterbox ist wie ein ButtonDown
+ // der naechste MouseMove auf die Filterbox ist wie ein ButtonDown
nMouseStatus = SC_GM_FILTER;
CaptureMouse();
@@ -1179,7 +1179,7 @@ void ScGridWindow::FilterSelect( ULONG nSel )
if (pFilterFloat)
pFilterFloat->EndPopupMode();
- GrabFocus(); // unter OS/2 stimmt der Focus sonst nicht
+ GrabFocus(); // unter OS/2 stimmt der Focus sonst nicht
}
void ScGridWindow::ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr )
@@ -1207,7 +1207,7 @@ void ScGridWindow::ExecFilter( ULONG nSel,
if (pDBData)
{
ScQueryParam aParam;
- pDBData->GetQueryParam( aParam ); // kann nur MAXQUERY Eintraege ergeben
+ pDBData->GetQueryParam( aParam ); // kann nur MAXQUERY Eintraege ergeben
if (SC_AUTOFILTER_CUSTOM == nSel)
{
@@ -1218,7 +1218,7 @@ void ScGridWindow::ExecFilter( ULONG nSel,
SCROW nEndRow;
pDBData->GetArea( nAreaTab, nStartCol,nStartRow,nEndCol,nEndRow );
pViewData->GetView()->MarkRange( ScRange( nStartCol,nStartRow,nAreaTab,nEndCol,nEndRow,nAreaTab));
- pViewData->GetView()->SetCursor(nCol,nRow); //! auch ueber Slot ??
+ pViewData->GetView()->SetCursor(nCol,nRow); //! auch ueber Slot ??
pViewData->GetDispatcher().Execute( SID_FILTER, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD );
}
else
@@ -1230,10 +1230,10 @@ void ScGridWindow::ExecFilter( ULONG nSel,
bDeleteOld = TRUE;
if (aParam.bRegExp)
bDeleteOld = TRUE;
- for (SCSIZE i=0; i<MAXQUERY && !bDeleteOld; i++) // bisherige Filter-Einstellungen
+ for (SCSIZE i=0; i<MAXQUERY && !bDeleteOld; i++) // bisherige Filter-Einstellungen
if (aParam.GetEntry(i).bDoQuery)
{
- //! Abfrage mit DrawButtons zusammenfassen!
+ //! Abfrage mit DrawButtons zusammenfassen!
ScQueryEntry& rEntry = aParam.GetEntry(i);
if (i>0)
@@ -1242,7 +1242,7 @@ void ScGridWindow::ExecFilter( ULONG nSel,
if (rEntry.nField == nCol)
{
- if (bFound) // diese Spalte zweimal?
+ if (bFound) // diese Spalte zweimal?
bDeleteOld = TRUE;
nQueryPos = i;
bFound = TRUE;
@@ -1261,25 +1261,25 @@ void ScGridWindow::ExecFilter( ULONG nSel,
aParam.bRegExp = FALSE;
}
- if ( nQueryPos < MAXQUERY || SC_AUTOFILTER_ALL == nSel ) // loeschen geht immer
+ if ( nQueryPos < MAXQUERY || SC_AUTOFILTER_ALL == nSel ) // loeschen geht immer
{
if (nSel)
{
ScQueryEntry& rNewEntry = aParam.GetEntry(nQueryPos);
- rNewEntry.bDoQuery = TRUE;
+ rNewEntry.bDoQuery = TRUE;
rNewEntry.bQueryByString = TRUE;
- rNewEntry.nField = nCol;
+ rNewEntry.nField = nCol;
rNewEntry.bQueryByDate = bCheckForDates;
if ( nSel == SC_AUTOFILTER_TOP10 )
{
- rNewEntry.eOp = SC_TOPVAL;
- *rNewEntry.pStr = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("10"));
+ rNewEntry.eOp = SC_TOPVAL;
+ *rNewEntry.pStr = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("10"));
}
else
{
- rNewEntry.eOp = SC_EQUAL;
- *rNewEntry.pStr = aValue;
+ rNewEntry.eOp = SC_EQUAL;
+ *rNewEntry.pStr = aValue;
}
if (nQueryPos > 0)
rNewEntry.eConnect = SC_AND;
@@ -1290,7 +1290,7 @@ void ScGridWindow::ExecFilter( ULONG nSel,
aParam.DeleteQuery(nQueryPos);
}
- // #100597# end edit mode - like in ScCellShell::ExecuteDB
+ // #100597# end edit mode - like in ScCellShell::ExecuteDB
if ( pViewData->HasEditView( pViewData->GetActivePart() ) )
{
SC_MOD()->InputEnterHandler();
@@ -1298,9 +1298,9 @@ void ScGridWindow::ExecFilter( ULONG nSel,
}
pViewData->GetView()->Query( aParam, NULL, TRUE );
- pDBData->SetQueryParam( aParam ); // speichern
+ pDBData->SetQueryParam( aParam ); // speichern
}
- else // "Zuviele Bedingungen"
+ else // "Zuviele Bedingungen"
pViewData->GetView()->ErrorMessage( STR_FILTER_TOOMANY );
}
}
@@ -1347,10 +1347,10 @@ void ScGridWindow::MoveMouseStatus( ScGridWindow& rDestWin )
BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction )
{
- // MouseEvent buttons must only be checked if bAction==TRUE
- // to allow changing the mouse pointer in MouseMove,
- // but not start AutoFill with right button (#74229#).
- // with bAction==TRUE, SetFillMode / SetDragMode is called
+ // MouseEvent buttons must only be checked if bAction==TRUE
+ // to allow changing the mouse pointer in MouseMove,
+ // but not start AutoFill with right button (#74229#).
+ // with bAction==TRUE, SetFillMode / SetDragMode is called
if ( bAction && !rMEvt.IsLeft() )
return FALSE;
@@ -1366,7 +1366,7 @@ BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction )
SCTAB nTab = pViewData->GetTabNo();
BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
- // Auto-Fill
+ // Auto-Fill
ScRange aMarkRange;
if (pViewData->GetSimpleArea( aMarkRange ) == SC_MARK_SIMPLE)
@@ -1389,8 +1389,8 @@ BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction )
pViewData->SetFillMode(
aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), nX, nY );
- // #108266# The simple selection must also be recognized when dragging,
- // where the Marking flag is set and MarkToSimple won't work anymore.
+ // #108266# The simple selection must also be recognized when dragging,
+ // where the Marking flag is set and MarkToSimple won't work anymore.
pViewData->GetMarkData().MarkToSimple();
}
bNewPointer = TRUE;
@@ -1398,7 +1398,7 @@ BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction )
}
}
- // Embedded-Rechteck
+ // Embedded-Rechteck
if (pDoc->IsEmbedded())
{
@@ -1436,7 +1436,7 @@ BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction )
if (!bNewPointer && bAction)
{
-// SetPointer( POINTER_ARROW ); // in Fu...
+// SetPointer( POINTER_ARROW ); // in Fu...
pViewData->ResetFillMode();
}
@@ -1482,22 +1482,22 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
aCurMousePos = rMEvt.GetPosPixel();
- // Filter-Popup beendet sich mit eigenem Mausklick, nicht erst beim Klick
- // in das GridWindow, darum ist die folgende Abfrage nicht mehr noetig:
+ // Filter-Popup beendet sich mit eigenem Mausklick, nicht erst beim Klick
+ // in das GridWindow, darum ist die folgende Abfrage nicht mehr noetig:
#if 0
// merken, dass FilterBox geloescht wird, damit sichergestellt
// ist, dass in diesem Handler nicht an gleicher Stelle wieder
// eine neue geoeffnet wird.
- BOOL bWasFilterBox = ( pFilterBox != NULL &&
+ BOOL bWasFilterBox = ( pFilterBox != NULL &&
((Window*)pFilterBox)->IsVisible() &&
!pFilterBox->IsDataSelect() );
- SCCOL nOldColFBox = bWasFilterBox ? pFilterBox->GetCol() : 0;
- SCROW nOldRowFBox = bWasFilterBox ? pFilterBox->GetRow() : 0;
+ SCCOL nOldColFBox = bWasFilterBox ? pFilterBox->GetCol() : 0;
+ SCROW nOldRowFBox = bWasFilterBox ? pFilterBox->GetRow() : 0;
#endif
- ClickExtern(); // loescht FilterBox, wenn vorhanden
+ ClickExtern(); // loescht FilterBox, wenn vorhanden
- HideNoteMarker(); // Notiz-Anzeige
+ HideNoteMarker(); // Notiz-Anzeige
bEEMouse = FALSE;
@@ -1508,24 +1508,24 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
return;
}
- pScActiveViewShell = pViewData->GetViewShell(); // falls auf Link geklickt wird
- nScClickMouseModifier = rMEvt.GetModifier(); // um Control-Klick immer zu erkennen
+ pScActiveViewShell = pViewData->GetViewShell(); // falls auf Link geklickt wird
+ nScClickMouseModifier = rMEvt.GetModifier(); // um Control-Klick immer zu erkennen
BOOL bDetective = pViewData->GetViewShell()->IsAuditShell();
- BOOL bRefMode = pViewData->IsRefMode(); // Referenz angefangen
- BOOL bFormulaMode = pScMod->IsFormulaMode(); // naechster Klick -> Referenz
- BOOL bEditMode = pViewData->HasEditView(eWhich); // auch bei Mode==SC_INPUT_TYPE
+ BOOL bRefMode = pViewData->IsRefMode(); // Referenz angefangen
+ BOOL bFormulaMode = pScMod->IsFormulaMode(); // naechster Klick -> Referenz
+ BOOL bEditMode = pViewData->HasEditView(eWhich); // auch bei Mode==SC_INPUT_TYPE
BOOL bDouble = (rMEvt.GetClicks() == 2);
- // DeactivateIP passiert nur noch bei MarkListHasChanged
+ // DeactivateIP passiert nur noch bei MarkListHasChanged
- // im GrabFocus Aufruf kann eine Fehlermeldung hochkommen
- // (z.B. beim Umbenennen von Tabellen per Tab-Reiter)
+ // im GrabFocus Aufruf kann eine Fehlermeldung hochkommen
+ // (z.B. beim Umbenennen von Tabellen per Tab-Reiter)
if ( !nButtonDown || !bDouble ) // single (first) click is always valid
nButtonDown = rMEvt.GetButtons(); // set nButtonDown first, so StopMarking works
-// pViewData->GetViewShell()->GetViewFrame()->GetWindow().GrabFocus();
+// pViewData->GetViewShell()->GetViewFrame()->GetWindow().GrabFocus();
if ( ( bEditMode && pViewData->GetActivePart() == eWhich ) || !bFormulaMode )
GrabFocus();
@@ -1538,13 +1538,13 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
return;
}
- if ( bDetective ) // Detektiv-Fuell-Modus
+ if ( bDetective ) // Detektiv-Fuell-Modus
{
if ( rMEvt.IsLeft() && !rMEvt.GetModifier() )
{
- Point aPos = rMEvt.GetPosPixel();
- SCsCOL nPosX;
- SCsROW nPosY;
+ Point aPos = rMEvt.GetPosPixel();
+ SCsCOL nPosX;
+ SCsROW nPosY;
pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY );
SfxInt16Item aPosXItem( SID_RANGE_COL, nPosX );
@@ -1576,14 +1576,14 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
if (bEditMode && (pViewData->GetRefTabNo() == pViewData->GetTabNo()))
{
- Point aPos = rMEvt.GetPosPixel();
- SCsCOL nPosX;
- SCsROW nPosY;
+ Point aPos = rMEvt.GetPosPixel();
+ SCsCOL nPosX;
+ SCsROW nPosY;
pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY );
- EditView* pEditView;
- SCCOL nEditCol;
- SCROW nEditRow;
+ EditView* pEditView;
+ SCCOL nEditCol;
+ SCROW nEditRow;
pViewData->GetEditView( eWhich, pEditView, nEditCol, nEditRow );
SCCOL nEndCol = pViewData->GetEditEndCol();
SCROW nEndRow = pViewData->GetEditEndRow();
@@ -1591,8 +1591,8 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
if ( nPosX >= (SCsCOL) nEditCol && nPosX <= (SCsCOL) nEndCol &&
nPosY >= (SCsROW) nEditRow && nPosY <= (SCsROW) nEndRow )
{
- // #53966# beim Klick in die Tabellen-EditView immer den Focus umsetzen
- if (bFormulaMode) // sonst ist es oben schon passiert
+ // #53966# beim Klick in die Tabellen-EditView immer den Focus umsetzen
+ if (bFormulaMode) // sonst ist es oben schon passiert
GrabFocus();
pScMod->SetInputMode( SC_INPUT_TABLE );
@@ -1604,7 +1604,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
if (pScMod->GetIsWaterCan())
{
- //! was is mit'm Mac ???
+ //! was is mit'm Mac ???
if ( rMEvt.GetModifier() + rMEvt.GetButtons() == MOUSE_RIGHT )
{
nMouseStatus = SC_GM_WATERUNDO;
@@ -1613,14 +1613,14 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
}
// Reihenfolge passend zum angezeigten Cursor:
- // RangeFinder, AutoFill, PageBreak, Drawing
+ // RangeFinder, AutoFill, PageBreak, Drawing
if ( HitRangeFinder( rMEvt.GetPosPixel(), bRFSize, &nRFIndex, &nRFAddX, &nRFAddY ) )
{
- bRFMouse = TRUE; // die anderen Variablen sind oben initialisiert
+ bRFMouse = TRUE; // die anderen Variablen sind oben initialisiert
if ( pViewData->GetActivePart() != eWhich )
- pViewData->GetView()->ActivatePart( eWhich ); //! schon oben immer ???
+ pViewData->GetView()->ActivatePart( eWhich ); //! schon oben immer ???
// CaptureMouse();
StartTracking();
@@ -1633,7 +1633,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
if ( bDouble )
pViewData->GetView()->FillCrossDblClick();
else
- pScMod->InputEnterHandler(); // Autofill etc.
+ pScMod->InputEnterHandler(); // Autofill etc.
}
if ( !bCrossPointer )
@@ -1655,13 +1655,13 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
if ( !bCrossPointer && DrawMouseButtonDown(rMEvt) )
{
//if (DrawHasMarkedObj())
- // pViewData->GetViewShell()->SetDrawShellOrSub(); // Draw-Objekt selektiert
+ // pViewData->GetViewShell()->SetDrawShellOrSub(); // Draw-Objekt selektiert
return;
}
- pViewData->GetViewShell()->SetDrawShell( FALSE ); // kein Draw-Objekt selektiert
+ pViewData->GetViewShell()->SetDrawShell( FALSE ); // kein Draw-Objekt selektiert
- // TestMouse schon oben passiert
+ // TestMouse schon oben passiert
}
Point aPos = rMEvt.GetPosPixel();
@@ -1687,7 +1687,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
}
if (pAttr->HasButton())
{
- DoPushButton( nPosX, nPosY, rMEvt ); // setzt evtl. bPivotMouse / bDPMouse
+ DoPushButton( nPosX, nPosY, rMEvt ); // setzt evtl. bPivotMouse / bDPMouse
return;
}
@@ -1719,7 +1719,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
}
//
- // Doppelklick angefangen ?
+ // Doppelklick angefangen ?
//
// StopMarking kann aus DrawMouseButtonDown gerufen werden
@@ -1736,20 +1736,20 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
}
//
- // Links in Edit-Zellen
+ // Links in Edit-Zellen
//
BOOL bAlt = rMEvt.IsMod2();
if ( !bAlt && rMEvt.IsLeft() &&
- GetEditUrl(rMEvt.GetPosPixel()) ) // Klick auf Link: Cursor nicht bewegen
+ GetEditUrl(rMEvt.GetPosPixel()) ) // Klick auf Link: Cursor nicht bewegen
{
SetPointer( Pointer( POINTER_REFHAND ) );
- nMouseStatus = SC_GM_URLDOWN; // auch nur dann beim ButtonUp ausfuehren
+ nMouseStatus = SC_GM_URLDOWN; // auch nur dann beim ButtonUp ausfuehren
return;
}
//
- // Gridwin - SelectionEngine
+ // Gridwin - SelectionEngine
//
if ( rMEvt.IsLeft() )
@@ -1759,13 +1759,13 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
pSelEng->SetWhich(eWhich);
pSelEng->SetVisibleArea( Rectangle(Point(), GetOutputSizePixel()) );
- // SelMouseButtonDown an der View setzt noch das bMoveIsShift Flag
+ // SelMouseButtonDown an der View setzt noch das bMoveIsShift Flag
if ( pViewData->GetView()->SelMouseButtonDown( rMEvt ) )
{
if (IsMouseCaptured())
{
- // Tracking statt CaptureMouse, damit sauber abgebrochen werden kann
- //! Irgendwann sollte die SelectionEngine selber StartTracking rufen!?!
+ // Tracking statt CaptureMouse, damit sauber abgebrochen werden kann
+ //! Irgendwann sollte die SelectionEngine selber StartTracking rufen!?!
ReleaseMouse();
StartTracking();
}
@@ -1788,7 +1788,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
nNestedButtonState = SC_NESTEDBUTTON_UP;
if (nButtonDown != rMEvt.GetButtons())
- nMouseStatus = SC_GM_IGNORE; // reset und return
+ nMouseStatus = SC_GM_IGNORE; // reset und return
nButtonDown = 0;
@@ -1804,7 +1804,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
pViewData->ResetFillMode();
}
StopMarking();
- DrawEndAction(); // Markieren/Verschieben auf Drawing-Layer abbrechen
+ DrawEndAction(); // Markieren/Verschieben auf Drawing-Layer abbrechen
ReleaseMouse();
return;
}
@@ -1827,7 +1827,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
}
nMouseStatus = SC_GM_NONE;
ReleaseMouse();
- return; // da muss nix mehr passieren
+ return; // da muss nix mehr passieren
}
ScModule* pScMod = SC_MOD();
@@ -1837,20 +1837,20 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
SfxBindings& rBindings = pViewData->GetBindings();
if (bEEMouse && pViewData->HasEditView( eWhich ))
{
- EditView* pEditView;
- SCCOL nEditCol;
- SCROW nEditRow;
+ EditView* pEditView;
+ SCCOL nEditCol;
+ SCROW nEditRow;
pViewData->GetEditView( eWhich, pEditView, nEditCol, nEditRow );
pEditView->MouseButtonUp( rMEvt );
if ( rMEvt.IsMiddle() &&
GetSettings().GetMouseSettings().GetMiddleButtonAction() == MOUSE_MIDDLE_PASTESELECTION )
{
- // EditView may have pasted from selection
+ // EditView may have pasted from selection
pScMod->InputChanged( pEditView );
}
else
- pScMod->InputSelection( pEditView ); // parentheses etc.
+ pScMod->InputSelection( pEditView ); // parentheses etc.
pViewData->GetView()->InvalidateAttribs();
rBindings.Invalidate( SID_HYPERLINK_GETLINK );
@@ -1860,13 +1860,13 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
if (bDPMouse)
{
- DPMouseButtonUp( rMEvt ); // resets bDPMouse
+ DPMouseButtonUp( rMEvt ); // resets bDPMouse
return;
}
if (bRFMouse)
{
- RFMouseMove( rMEvt, TRUE ); // Range wieder richtigherum
+ RFMouseMove( rMEvt, TRUE ); // Range wieder richtigherum
bRFMouse = FALSE;
SetPointer( Pointer( POINTER_ARROW ) );
ReleaseMouse();
@@ -1882,7 +1882,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
return;
}
- if (nMouseStatus == SC_GM_WATERUNDO) // Undo im Giesskannenmodus
+ if (nMouseStatus == SC_GM_WATERUNDO) // Undo im Giesskannenmodus
{
SfxUndoManager* pMgr = pViewData->GetDocShell()->GetUndoManager();
if ( pMgr->GetUndoActionCount() && pMgr->GetUndoActionId() == STR_UNDO_APPLYCELLSTYLE )
@@ -1908,15 +1908,15 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
SCCOL nEndCol;
SCROW nEndRow;
pViewData->GetFillData( nStartCol, nStartRow, nEndCol, nEndRow );
-// DBG_ASSERT( nStartCol==pViewData->GetRefStartX() && nStartRow==pViewData->GetRefStartY(),
-// "Block falsch fuer AutoFill" );
+// DBG_ASSERT( nStartCol==pViewData->GetRefStartX() && nStartRow==pViewData->GetRefStartY(),
+// "Block falsch fuer AutoFill" );
ScRange aDelRange;
BOOL bIsDel = pViewData->GetDelMark( aDelRange );
ScViewFunc* pView = pViewData->GetView();
pView->StopRefMode();
pViewData->ResetFillMode();
- pView->GetFunctionSet()->SetAnchorFlag( FALSE ); // #i5819# don't use AutoFill anchor flag for selection
+ pView->GetFunctionSet()->SetAnchorFlag( FALSE ); // #i5819# don't use AutoFill anchor flag for selection
if ( bIsDel )
{
@@ -1970,17 +1970,17 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
pViewData->GetDocShell()->UpdateOle(pViewData);
}
- BOOL bRefMode = pViewData->IsRefMode();
+ BOOL bRefMode = pViewData->IsRefMode();
if (bRefMode)
pScMod->EndReference();
//
- // Giesskannen-Modus (Gestalter)
+ // Giesskannen-Modus (Gestalter)
//
if (pScMod->GetIsWaterCan())
{
- // Abfrage auf Undo schon oben
+ // Abfrage auf Undo schon oben
ScStyleSheetPool* pStylePool = (ScStyleSheetPool*)
(pViewData->GetDocument()->
@@ -2029,19 +2029,19 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
}
//
- // double click (only left button)
+ // double click (only left button)
//
BOOL bDouble = ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() );
if ( bDouble && !bRefMode && nMouseStatus == SC_GM_DBLDOWN && !pScMod->IsRefDialogOpen() )
{
- // data pilot table
+ // data pilot table
Point aPos = rMEvt.GetPosPixel();
SCsCOL nPosX;
SCsROW nPosY;
SCTAB nTab = pViewData->GetTabNo();
pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY );
- ScDPObject* pDPObj = pDoc->GetDPAtCursor( nPosX, nPosY, nTab );
+ ScDPObject* pDPObj = pDoc->GetDPAtCursor( nPosX, nPosY, nTab );
if ( pDPObj && pDPObj->GetSaveData()->GetDrillDown() )
{
ScAddress aCellPos( nPosX, nPosY, pViewData->GetTabNo() );
@@ -2116,20 +2116,20 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
}
//
- // Links in edit cells
+ // Links in edit cells
//
BOOL bAlt = rMEvt.IsMod2();
if ( !bAlt && !bRefMode && !bDouble && nMouseStatus == SC_GM_URLDOWN )
{
- // beim ButtonUp nur ausfuehren, wenn ButtonDown auch ueber einer URL war
+ // beim ButtonUp nur ausfuehren, wenn ButtonDown auch ueber einer URL war
String aName, aUrl, aTarget;
if ( GetEditUrl( rMEvt.GetPosPixel(), &aName, &aUrl, &aTarget ) )
{
- nMouseStatus = SC_GM_NONE; // keinen Doppelklick anfangen
+ nMouseStatus = SC_GM_NONE; // keinen Doppelklick anfangen
ScGlobal::OpenURL( aUrl, aTarget );
-
+
// fire worksheet_followhyperlink event
uno::Reference< script::vba::XVBAEventProcessor > xVbaEvents = pDoc->GetVbaEventProcessor();
if( xVbaEvents.is() ) try
@@ -2158,48 +2158,48 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
}
//
- // Gridwin - SelectionEngine
+ // Gridwin - SelectionEngine
//
- // SelMouseButtonDown is called only for left button, but SelMouseButtonUp would return
- // TRUE for any call, so IsLeft must be checked here, too.
+ // SelMouseButtonDown is called only for left button, but SelMouseButtonUp would return
+ // TRUE for any call, so IsLeft must be checked here, too.
if ( rMEvt.IsLeft() && pViewData->GetView()->GetSelEngine()->SelMouseButtonUp( rMEvt ) )
{
-// rMark.MarkToSimple();
+// rMark.MarkToSimple();
pViewData->GetView()->UpdateAutoFillMark();
SfxDispatcher* pDisp = pViewData->GetViewShell()->GetDispatcher();
BOOL bFormulaMode = pScMod->IsFormulaMode();
DBG_ASSERT( pDisp || bFormulaMode, "Cursor auf nicht aktiver View bewegen ?" );
- // #i14927# execute SID_CURRENTCELL (for macro recording) only if there is no
- // multiple selection, so the argument string completely describes the selection,
- // and executing the slot won't change the existing selection (executing the slot
- // here and from a recorded macro is treated equally)
+ // #i14927# execute SID_CURRENTCELL (for macro recording) only if there is no
+ // multiple selection, so the argument string completely describes the selection,
+ // and executing the slot won't change the existing selection (executing the slot
+ // here and from a recorded macro is treated equally)
if ( pDisp && !bFormulaMode && !rMark.IsMultiMarked() )
{
- String aAddr; // CurrentCell
+ String aAddr; // CurrentCell
if( rMark.IsMarked() )
{
-// BOOL bKeep = rMark.IsMultiMarked(); //! wohin damit ???
+// BOOL bKeep = rMark.IsMultiMarked(); //! wohin damit ???
ScRange aScRange;
rMark.GetMarkArea( aScRange );
aScRange.Format( aAddr, SCR_ABS );
if ( aScRange.aStart == aScRange.aEnd )
{
- // make sure there is a range selection string even for a single cell
+ // make sure there is a range selection string even for a single cell
String aSingle = aAddr;
aAddr.Append( (sal_Char) ':' );
aAddr.Append( aSingle );
}
- //! SID_MARKAREA gibts nicht mehr ???
- //! was passiert beim Markieren mit dem Cursor ???
+ //! SID_MARKAREA gibts nicht mehr ???
+ //! was passiert beim Markieren mit dem Cursor ???
}
- else // nur Cursor bewegen
+ else // nur Cursor bewegen
{
ScAddress aScAddress( pViewData->GetCurX(), pViewData->GetCurY(), 0 );
aScAddress.Format( aAddr, SCA_ABS );
@@ -2219,7 +2219,7 @@ void ScGridWindow::FakeButtonUp()
{
if ( nButtonDown )
{
- MouseEvent aEvent( aCurMousePos ); // nButtons = 0 -> ignore
+ MouseEvent aEvent( aCurMousePos ); // nButtons = 0 -> ignore
MouseButtonUp( aEvent );
}
}
@@ -2235,8 +2235,8 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt )
if (pScMod->IsModalMode(pViewData->GetSfxDocShell()))
return;
- // Ob aus dem Edit-Modus Drag&Drop gestartet wurde, bekommt man leider
- // nicht anders mit:
+ // Ob aus dem Edit-Modus Drag&Drop gestartet wurde, bekommt man leider
+ // nicht anders mit:
if (bEEMouse && nButtonDown && !rMEvt.GetButtons())
{
@@ -2249,10 +2249,10 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt )
if (nMouseStatus == SC_GM_IGNORE)
return;
- if (nMouseStatus == SC_GM_WATERUNDO) // Undo im Giesskannenmodus -> nur auf Up warten
+ if (nMouseStatus == SC_GM_WATERUNDO) // Undo im Giesskannenmodus -> nur auf Up warten
return;
- if ( pViewData->GetViewShell()->IsAuditShell() ) // Detektiv-Fuell-Modus
+ if ( pViewData->GetViewShell()->IsAuditShell() ) // Detektiv-Fuell-Modus
{
SetPointer( Pointer( POINTER_FILL ) );
return;
@@ -2282,13 +2282,13 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt )
}
}
- BOOL bFormulaMode = pScMod->IsFormulaMode(); // naechster Klick -> Referenz
+ BOOL bFormulaMode = pScMod->IsFormulaMode(); // naechster Klick -> Referenz
if (bEEMouse && pViewData->HasEditView( eWhich ))
{
- EditView* pEditView;
- SCCOL nEditCol;
- SCROW nEditRow;
+ EditView* pEditView;
+ SCCOL nEditCol;
+ SCROW nEditRow;
pViewData->GetEditView( eWhich, pEditView, nEditCol, nEditRow );
pEditView->MouseMove( rMEvt );
return;
@@ -2312,21 +2312,21 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt )
return;
}
- // anderen Mauszeiger anzeigen?
+ // anderen Mauszeiger anzeigen?
BOOL bEditMode = pViewData->HasEditView(eWhich);
//! Testen ob RefMode-Dragging !!!
if ( bEditMode && (pViewData->GetRefTabNo() == pViewData->GetTabNo()) )
{
- Point aPos = rMEvt.GetPosPixel();
- SCsCOL nPosX;
- SCsROW nPosY;
+ Point aPos = rMEvt.GetPosPixel();
+ SCsCOL nPosX;
+ SCsROW nPosY;
pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY );
- EditView* pEditView;
- SCCOL nEditCol;
- SCROW nEditRow;
+ EditView* pEditView;
+ SCCOL nEditCol;
+ SCROW nEditRow;
pViewData->GetEditView( eWhich, pEditView, nEditCol, nEditRow );
SCCOL nEndCol = pViewData->GetEditEndCol();
SCROW nEndRow = pViewData->GetEditEndRow();
@@ -2334,7 +2334,7 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt )
if ( nPosX >= (SCsCOL) nEditCol && nPosX <= (SCsCOL) nEndCol &&
nPosY >= (SCsROW) nEditRow && nPosY <= (SCsROW) nEndRow )
{
- // Field can only be URL field
+ // Field can only be URL field
BOOL bAlt = rMEvt.IsMod2();
if ( !bAlt && !nButtonDown && pEditView && pEditView->GetFieldUnderMousePointer() )
SetPointer( Pointer( POINTER_REFHAND ) );
@@ -2354,7 +2354,7 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt )
{
BOOL bCross = FALSE;
- // Range-Finder
+ // Range-Finder
BOOL bCorner;
if ( HitRangeFinder( rMEvt.GetPosPixel(), bCorner ) )
@@ -2366,7 +2366,7 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt )
bCross = TRUE;
}
- // Page-Break-Modus
+ // Page-Break-Modus
USHORT nBreakType;
if ( !nButtonDown && pViewData->IsPagebreakMode() &&
@@ -2398,7 +2398,7 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt )
bCross = TRUE;
}
- // Fill-Cursor anzeigen ?
+ // Fill-Cursor anzeigen ?
if ( !bFormulaMode && !nButtonDown )
if (TestMouse( rMEvt, FALSE ))
@@ -2408,19 +2408,19 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt )
{
SetPointer( Pointer( POINTER_CROSS ) );
bCross = TRUE;
- nScFillModeMouseModifier = rMEvt.GetModifier(); // ausgewertet bei AutoFill und Matrix
+ nScFillModeMouseModifier = rMEvt.GetModifier(); // ausgewertet bei AutoFill und Matrix
}
if (!bCross)
{
BOOL bAlt = rMEvt.IsMod2();
- if (bEditMode) // Edit-Mode muss zuerst kommen!
+ if (bEditMode) // Edit-Mode muss zuerst kommen!
SetPointer( Pointer( POINTER_ARROW ) );
else if ( !bAlt && !nButtonDown &&
GetEditUrl(rMEvt.GetPosPixel()) )
SetPointer( Pointer( POINTER_REFHAND ) );
- else if ( DrawMouseMove(rMEvt) ) // setzt Pointer um
+ else if ( DrawMouseMove(rMEvt) ) // setzt Pointer um
return;
}
}
@@ -2507,17 +2507,17 @@ long ScGridWindow::PreNotify( NotifyEvent& rNEvt )
void ScGridWindow::Tracking( const TrackingEvent& rTEvt )
{
- // Weil die SelectionEngine kein Tracking kennt, die Events nur auf
- // die verschiedenen MouseHandler verteilen...
+ // Weil die SelectionEngine kein Tracking kennt, die Events nur auf
+ // die verschiedenen MouseHandler verteilen...
const MouseEvent& rMEvt = rTEvt.GetMouseEvent();
- if ( rTEvt.IsTrackingCanceled() ) // alles abbrechen...
+ if ( rTEvt.IsTrackingCanceled() ) // alles abbrechen...
{
if (!pViewData->GetView()->IsInActivatePart())
{
if (bDPMouse)
- bDPMouse = FALSE; // gezeichnet wird per bDragRect
+ bDPMouse = FALSE; // gezeichnet wird per bDragRect
if (bDragRect)
{
// pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
@@ -2526,14 +2526,14 @@ void ScGridWindow::Tracking( const TrackingEvent& rTEvt )
}
if (bRFMouse)
{
- RFMouseMove( rMEvt, TRUE ); // richtig abbrechen geht dabei nicht...
+ RFMouseMove( rMEvt, TRUE ); // richtig abbrechen geht dabei nicht...
bRFMouse = FALSE;
}
if (nPagebreakMouse)
{
// if (bPagebreakDrawn)
- // DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(),
- // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE );
+ // DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(),
+ // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE );
bPagebreakDrawn = FALSE;
UpdateDragRectOverlay();
nPagebreakMouse = SC_PD_NONE;
@@ -2541,18 +2541,18 @@ void ScGridWindow::Tracking( const TrackingEvent& rTEvt )
SetPointer( Pointer( POINTER_ARROW ) );
StopMarking();
- MouseButtonUp( rMEvt ); // mit Status SC_GM_IGNORE aus StopMarking
+ MouseButtonUp( rMEvt ); // mit Status SC_GM_IGNORE aus StopMarking
- BOOL bRefMode = pViewData->IsRefMode();
+ BOOL bRefMode = pViewData->IsRefMode();
if (bRefMode)
- SC_MOD()->EndReference(); // #63148# Dialog nicht verkleinert lassen
+ SC_MOD()->EndReference(); // #63148# Dialog nicht verkleinert lassen
}
}
else if ( rTEvt.IsTrackingEnded() )
{
- // MouseButtonUp immer mit passenden Buttons (z.B. wegen Testtool, #63148#)
- // Schliesslich behauptet der Tracking-Event ja, dass normal beendet und nicht
- // abgebrochen wurde.
+ // MouseButtonUp immer mit passenden Buttons (z.B. wegen Testtool, #63148#)
+ // Schliesslich behauptet der Tracking-Event ja, dass normal beendet und nicht
+ // abgebrochen wurde.
MouseEvent aUpEvt( rMEvt.GetPosPixel(), rMEvt.GetClicks(),
rMEvt.GetMode(), nButtonDown, rMEvt.GetModifier() );
@@ -2573,9 +2573,9 @@ void ScGridWindow::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel )
if (bEEMouse && pViewData->HasEditView( eWhich ))
{
- EditView* pEditView;
- SCCOL nEditCol;
- SCROW nEditRow;
+ EditView* pEditView;
+ SCCOL nEditCol;
+ SCROW nEditRow;
pViewData->GetEditView( eWhich, pEditView, nEditCol, nEditRow );
// #63263# don't remove the edit view while switching views
@@ -2589,13 +2589,13 @@ void ScGridWindow::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel )
pHdl->DataChanged();
pScMod->SetInEditCommand( FALSE );
- if (!pViewData->IsActive()) // dropped to different view?
+ if (!pViewData->IsActive()) // dropped to different view?
{
ScInputHandler* pViewHdl = pScMod->GetInputHdl( pViewData->GetViewShell() );
if ( pViewHdl && pViewData->HasEditView( eWhich ) )
{
pViewHdl->CancelHandler();
- ShowCursor(); // missing from KillEditView
+ ShowCursor(); // missing from KillEditView
}
}
}
@@ -2643,7 +2643,7 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
BOOL bEditView = pViewData->HasEditView( eWhich );
if (!bEditView)
{
- // only if no cell editview is active, look at drawview
+ // only if no cell editview is active, look at drawview
SdrView* pSdrView = pViewData->GetView()->GetSdrView();
if ( pSdrView )
{
@@ -2651,17 +2651,17 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
if ( pOlView && pOlView->GetWindow() == this )
{
pOlView->Command( rCEvt );
- return; // done
+ return; // done
}
}
}
if ( nCmd == COMMAND_CURSORPOS && !bEditView )
{
- // #88458# CURSORPOS may be called without following text input,
- // to set the input method window position
- // -> input mode must not be started,
- // manually calculate text insert position if not in input mode
+ // #88458# CURSORPOS may be called without following text input,
+ // to set the input method window position
+ // -> input mode must not be started,
+ // manually calculate text insert position if not in input mode
lcl_SetTextCursorPos( pViewData, eWhich, this );
return;
@@ -2671,7 +2671,7 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
if ( pHdl )
{
pHdl->InputCommand( rCEvt, TRUE );
- return; // done
+ return; // done
}
Window::Command( rCEvt );
@@ -2680,17 +2680,17 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
if ( nCmd == COMMAND_VOICE )
{
- // Der Handler wird nur gerufen, wenn ein Text-Cursor aktiv ist,
- // also muss es eine EditView oder ein editiertes Zeichenobjekt geben
+ // Der Handler wird nur gerufen, wenn ein Text-Cursor aktiv ist,
+ // also muss es eine EditView oder ein editiertes Zeichenobjekt geben
ScInputHandler* pHdl = pScMod->GetInputHdl( pViewData->GetViewShell() );
if ( pHdl && pViewData->HasEditView( eWhich ) )
{
- EditView* pEditView = pViewData->GetEditView( eWhich ); // ist dann nicht 0
+ EditView* pEditView = pViewData->GetEditView( eWhich ); // ist dann nicht 0
pHdl->DataChanging();
pEditView->Command( rCEvt );
pHdl->DataChanged();
- return; // erledigt
+ return; // erledigt
}
SdrView* pSdrView = pViewData->GetView()->GetSdrView();
if ( pSdrView )
@@ -2699,10 +2699,10 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
if ( pOlView && pOlView->GetWindow() == this )
{
pOlView->Command( rCEvt );
- return; // erledigt
+ return; // erledigt
}
}
- Window::Command(rCEvt); // sonst soll sich die Basisklasse drum kuemmern...
+ Window::Command(rCEvt); // sonst soll sich die Basisklasse drum kuemmern...
return;
}
@@ -2710,8 +2710,8 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
{
if ( bEEMouse )
{
- // EditEngine handles selection in MouseButtonUp - no action
- // needed in command handler
+ // EditEngine handles selection in MouseButtonUp - no action
+ // needed in command handler
}
else
{
@@ -2786,8 +2786,8 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
// Selecting this cell is not allowed, neither is context menu.
return;
- // #i18735# First select the item under the mouse pointer.
- // This can change the selection, and the view state (edit mode, etc).
+ // #i18735# First select the item under the mouse pointer.
+ // This can change the selection, and the view state (edit mode, etc).
SelectForContextMenu( aPosPixel, nCellX, nCellY );
}
@@ -2798,17 +2798,17 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
// Edit-Zelle mit Spelling-Errors ?
if ( bMouse && GetEditUrlOrError( TRUE, aPosPixel ) )
{
- // GetEditUrlOrError hat den Cursor schon bewegt
+ // GetEditUrlOrError hat den Cursor schon bewegt
pScMod->SetInputMode( SC_INPUT_TABLE );
- bEdit = pViewData->HasEditView(eWhich); // hat's geklappt ?
+ bEdit = pViewData->HasEditView(eWhich); // hat's geklappt ?
DBG_ASSERT( bEdit, "kann nicht in Edit-Modus schalten" );
}
}
if ( bEdit )
{
- EditView* pEditView = pViewData->GetEditView( eWhich ); // ist dann nicht 0
+ EditView* pEditView = pViewData->GetEditView( eWhich ); // ist dann nicht 0
if ( !bMouse )
{
@@ -2816,25 +2816,25 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
if ( pCur )
{
Point aLogicPos = pCur->GetPos();
- // use the position right of the cursor (spell popup is opened if
- // the cursor is before the word, but not if behind it)
+ // use the position right of the cursor (spell popup is opened if
+ // the cursor is before the word, but not if behind it)
aLogicPos.X() += pCur->GetWidth();
- aLogicPos.Y() += pCur->GetHeight() / 2; // center vertically
+ aLogicPos.Y() += pCur->GetHeight() / 2; // center vertically
aMenuPos = LogicToPixel( aLogicPos );
}
}
- // if edit mode was just started above, online spelling may be incomplete
+ // if edit mode was just started above, online spelling may be incomplete
pEditView->GetEditEngine()->CompleteOnlineSpelling();
- // IsCursorAtWrongSpelledWord could be used for !bMouse
- // if there was a corresponding ExecuteSpellPopup call
+ // IsCursorAtWrongSpelledWord could be used for !bMouse
+ // if there was a corresponding ExecuteSpellPopup call
if( pEditView->IsWrongSpelledWordAtPos( aMenuPos ) )
{
- // Wenn man unter OS/2 neben das Popupmenue klickt, kommt MouseButtonDown
- // vor dem Ende des Menue-Execute, darum muss SetModified vorher kommen
- // (Bug #40968#)
+ // Wenn man unter OS/2 neben das Popupmenue klickt, kommt MouseButtonDown
+ // vor dem Ende des Menue-Execute, darum muss SetModified vorher kommen
+ // (Bug #40968#)
ScInputHandler* pHdl = pScMod->GetInputHdl();
if (pHdl)
pHdl->SetModified();
@@ -2847,7 +2847,7 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
}
else if ( !bMouse )
{
- // non-edit menu by keyboard -> use lower right of cell cursor position
+ // non-edit menu by keyboard -> use lower right of cell cursor position
SCCOL nCurX = pViewData->GetCurX();
SCROW nCurY = pViewData->GetCurY();
@@ -2863,7 +2863,7 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt )
ScTabViewShell* pViewSh = pViewData->GetViewShell();
if (pViewSh)
{
- // Is a draw object selected?
+ // Is a draw object selected?
SdrView* pDrawView = pViewSh->GetSdrView();
if (pDrawView && pDrawView->AreObjectsMarked())
@@ -3059,8 +3059,8 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)
// wenn semi-Modeless-SfxChildWindow-Dialog oben, keine KeyInputs:
else if( !pViewData->IsAnyFillMode() )
{
- // query for existing note marker before calling ViewShell's keyboard handling
- // which may remove the marker
+ // query for existing note marker before calling ViewShell's keyboard handling
+ // which may remove the marker
BOOL bHadKeyMarker = ( pNoteMarker && pNoteMarker->IsByKeyboard() );
ScTabViewShell* pViewSh = pViewData->GetViewShell();
@@ -3070,13 +3070,13 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)
if (DrawKeyInput(rKEvt))
return;
- if (!pViewData->GetView()->IsDrawSelMode() && !DrawHasMarkedObj()) // keine Eingaben im Zeichenmodus
- { //! DrawShell abfragen !!!
+ if (!pViewData->GetView()->IsDrawSelMode() && !DrawHasMarkedObj()) // keine Eingaben im Zeichenmodus
+ { //! DrawShell abfragen !!!
if (pViewSh->TabKeyInput(rKEvt))
return;
}
else
- if (pViewSh->SfxViewShell::KeyInput(rKEvt)) // von SfxViewShell
+ if (pViewSh->SfxViewShell::KeyInput(rKEvt)) // von SfxViewShell
return;
KeyCode aCode = rKEvt.GetKeyCode();
@@ -3090,11 +3090,11 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)
}
if ( aCode.GetCode() == KEY_F1 && aCode.GetModifier() == KEY_MOD1 )
{
- // ctrl-F1 shows or hides the note or redlining info for the cursor position
- // (hard-coded because F1 can't be configured)
+ // ctrl-F1 shows or hides the note or redlining info for the cursor position
+ // (hard-coded because F1 can't be configured)
if ( bHadKeyMarker )
- HideNoteMarker(); // hide when previously visible
+ HideNoteMarker(); // hide when previously visible
else
ShowNoteMarker( pViewData->GetCurX(), pViewData->GetCurY(), TRUE );
return;
@@ -3106,7 +3106,7 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)
void ScGridWindow::StopMarking()
{
- DrawEndAction(); // Markieren/Verschieben auf Drawing-Layer abbrechen
+ DrawEndAction(); // Markieren/Verschieben auf Drawing-Layer abbrechen
if (nButtonDown)
{
@@ -3120,8 +3120,8 @@ void ScGridWindow::UpdateInputContext()
BOOL bReadOnly = pViewData->GetDocShell()->IsReadOnly();
ULONG nOptions = bReadOnly ? 0 : ( INPUTCONTEXT_TEXT | INPUTCONTEXT_EXTTEXTINPUT );
- // when font from InputContext is used,
- // it must be taken from the cursor position's cell attributes
+ // when font from InputContext is used,
+ // it must be taken from the cursor position's cell attributes
InputContext aContext;
aContext.SetOptions( nOptions );
@@ -3135,7 +3135,7 @@ void ScGridWindow::UpdateInputContext()
BOOL ScGridWindow::DropScroll( const Point& rMousePos )
{
-/* doch auch auf nicht aktiven Views...
+/* doch auch auf nicht aktiven Views...
if ( !pViewData->IsActive() )
return FALSE;
*/
@@ -3162,16 +3162,16 @@ BOOL ScGridWindow::DropScroll( const Point& rMousePos )
if ( nDx != 0 || nDy != 0 )
{
-// if (bDragRect)
-// pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
+// if (bDragRect)
+// pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
if ( nDx != 0 )
pViewData->GetView()->ScrollX( nDx, WhichH(eWhich) );
if ( nDy != 0 )
pViewData->GetView()->ScrollY( nDy, WhichV(eWhich) );
-// if (bDragRect)
-// pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
+// if (bDragRect)
+// pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
}
return FALSE;
@@ -3179,7 +3179,7 @@ BOOL ScGridWindow::DropScroll( const Point& rMousePos )
BOOL lcl_TestScenarioRedliningDrop( ScDocument* pDoc, const ScRange& aDragRange)
{
- // Testet, ob bei eingeschalteten RedLining,
+ // Testet, ob bei eingeschalteten RedLining,
// bei einem Drop ein Scenario betroffen ist.
BOOL bReturn = FALSE;
@@ -3229,8 +3229,8 @@ ScRange lcl_MakeDropRange( SCCOL nPosX, SCROW nPosY, SCTAB nTab, const ScRange&
//--------------------------------------------------------
-extern BOOL bPasteIsDrop; // viewfun4 -> move to header
-extern BOOL bPasteIsMove; // viewfun7 -> move to header
+extern BOOL bPasteIsDrop; // viewfun4 -> move to header
+extern BOOL bPasteIsMove; // viewfun7 -> move to header
//--------------------------------------------------------
@@ -3239,7 +3239,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
if ( rEvt.mbLeaving )
{
// if (bDragRect)
- // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
+ // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
bDragRect = FALSE;
UpdateDragRectOverlay();
return rEvt.mnAction;
@@ -3267,34 +3267,34 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
{
if ( pThisDoc->HasChartAtPoint(pViewData->GetTabNo(), PixelToLogic(aPos)) )
{
- if (bDragRect) // Rechteck loeschen
+ if (bDragRect) // Rechteck loeschen
{
// pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
bDragRect = FALSE;
UpdateDragRectOverlay();
}
- //! highlight chart? (selection border?)
+ //! highlight chart? (selection border?)
sal_Int8 nRet = rEvt.mnAction;
-//! if ( rEvt.GetAction() == DROP_LINK )
-//! bOk = rEvt.SetAction( DROP_COPY ); // can't link onto chart
+//! if ( rEvt.GetAction() == DROP_LINK )
+//! bOk = rEvt.SetAction( DROP_COPY ); // can't link onto chart
return nRet;
}
}
-//! else
-//! if ( rEvt.GetAction() == DROP_MOVE )
-//! rEvt.SetAction( DROP_COPY ); // different doc: default=COPY
+//! else
+//! if ( rEvt.GetAction() == DROP_MOVE )
+//! rEvt.SetAction( DROP_COPY ); // different doc: default=COPY
- if ( rData.pCellTransfer->GetDragSourceFlags() & SC_DROP_TABLE ) // whole sheet?
+ if ( rData.pCellTransfer->GetDragSourceFlags() & SC_DROP_TABLE ) // whole sheet?
{
BOOL bOk = pThisDoc->IsDocEditable();
- return bOk ? rEvt.mnAction : 0; // don't draw selection frame
+ return bOk ? rEvt.mnAction : 0; // don't draw selection frame
}
- SCsCOL nPosX;
- SCsROW nPosY;
+ SCsCOL nPosX;
+ SCsROW nPosY;
pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY );
ScRange aSourceRange = rData.pCellTransfer->GetRange();
@@ -3306,7 +3306,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
SCROW nSizeY = nSourceEndY - nSourceStartY + 1;
if ( rEvt.mnAction != DND_ACTION_MOVE )
- nSizeY = rData.pCellTransfer->GetNonFilteredRows(); // copy/link: no filtered rows
+ nSizeY = rData.pCellTransfer->GetNonFilteredRows(); // copy/link: no filtered rows
SCsCOL nNewDragX = nPosX - rData.pCellTransfer->GetDragHandleX();
if (nNewDragX<0) nNewDragX=0;
@@ -3317,7 +3317,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
if (nNewDragY+(nSizeY-1) > MAXROW)
nNewDragY = MAXROW-(nSizeY-1);
- // don't break scenario ranges, don't drop on filtered
+ // don't break scenario ranges, don't drop on filtered
SCTAB nTab = pViewData->GetTabNo();
ScRange aDropRange = lcl_MakeDropRange( nNewDragX, nNewDragY, nTab, aSourceRange );
if ( lcl_TestScenarioRedliningDrop( pThisDoc, aDropRange ) ||
@@ -3445,7 +3445,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
!bDragRect || eDragInsertMode != meDragInsertMode )
{
// if (bDragRect)
- // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
+ // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
nDragStartX = nNewDragX;
nDragStartY = nNewDragY;
@@ -3458,13 +3458,13 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
UpdateDragRectOverlay();
- // show target position as tip help
+ // show target position as tip help
#if 0
if (Help::IsQuickHelpEnabled())
{
ScRange aRange( nDragStartX, nDragStartY, nTab, nDragEndX, nDragEndY, nTab );
String aHelpStr;
- aRange.Format( aHelpStr, SCA_VALID ); // non-3D
+ aRange.Format( aHelpStr, SCA_VALID ); // non-3D
Point aPos = Pointer::GetPosPixel();
USHORT nAlign = QUICKHELP_BOTTOM|QUICKHELP_RIGHT;
@@ -3485,7 +3485,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt )
{
DrawMarkDropObj( NULL );
if ( rData.pCellTransfer )
- return AcceptPrivateDrop( rEvt ); // hide drop marker for internal D&D
+ return AcceptPrivateDrop( rEvt ); // hide drop marker for internal D&D
else
return rEvt.mnAction;
}
@@ -3519,8 +3519,8 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt )
}
else if (rData.aJumpTarget.Len())
{
- // internal bookmarks (from Navigator)
- // local jumps from an unnamed document are possible only within a document
+ // internal bookmarks (from Navigator)
+ // local jumps from an unnamed document are possible only within a document
if ( !rData.pJumpLocalDoc || rData.pJumpLocalDoc == pViewData->GetDocument() )
nRet = rEvt.mnAction;
@@ -3530,7 +3530,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt )
sal_Int8 nMyAction = rEvt.mnAction;
if ( !rData.pDrawTransfer ||
- !IsMyModel(rData.pDrawTransfer->GetDragSourceView()) ) // drawing within the document
+ !IsMyModel(rData.pDrawTransfer->GetDragSourceView()) ) // drawing within the document
if ( rEvt.mbDefault && nMyAction == DND_ACTION_MOVE )
nMyAction = DND_ACTION_COPY;
@@ -3543,7 +3543,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt )
|| IsDropFormatSupported(SOT_FORMAT_GDIMETAFILE)
|| IsDropFormatSupported(SOT_FORMAT_BITMAP) )
{
- // graphic dragged onto drawing object
+ // graphic dragged onto drawing object
DrawMarkDropObj( pHitObj );
nRet = nMyAction;
}
@@ -3628,7 +3628,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt )
}
}
- // scroll only for accepted formats
+ // scroll only for accepted formats
if (nRet)
DropScroll( rEvt.maPosPixel );
}
@@ -3642,7 +3642,7 @@ ULONG lcl_GetDropFormatId( const uno::Reference<datatransfer::XTransferable>& xT
if ( !aDataHelper.HasFormat( SOT_FORMATSTR_ID_SBA_DATAEXCHANGE ) )
{
- // use bookmark formats if no sba is present
+ // use bookmark formats if no sba is present
if ( aDataHelper.HasFormat( SOT_FORMATSTR_ID_SOLK ) )
return SOT_FORMATSTR_ID_SOLK;
@@ -3661,7 +3661,7 @@ ULONG lcl_GetDropFormatId( const uno::Reference<datatransfer::XTransferable>& xT
nFormatId = SOT_FORMATSTR_ID_SVXB;
else if ( aDataHelper.HasFormat( SOT_FORMATSTR_ID_EMBED_SOURCE ) )
{
- // If it's a Writer object, insert RTF instead of OLE
+ // If it's a Writer object, insert RTF instead of OLE
BOOL bDoRtf = FALSE;
SotStorageStreamRef xStm;
@@ -3753,7 +3753,7 @@ sal_Int8 ScGridWindow::ExecutePrivateDrop( const ExecuteDropEvent& rEvt )
{
// hide drop marker
// if (bDragRect)
- // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
+ // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
bDragRect = FALSE;
UpdateDragRectOverlay();
@@ -3773,7 +3773,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
ScDocument* pSourceDoc = pTransObj->GetSourceDocument();
ScDocShell* pDocSh = pViewData->GetDocShell();
ScDocument* pThisDoc = pViewData->GetDocument();
- ScViewFunc* pView = pViewData->GetView();
+ ScViewFunc* pView = pViewData->GetView();
SCTAB nThisTab = pViewData->GetTabNo();
USHORT nFlags = pTransObj->GetDragSourceFlags();
@@ -3792,8 +3792,8 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
ScRange aSource = pTransObj->GetRange();
- // only use visible tab from source range - when dragging within one table,
- // all selected tables at the time of dropping are used (handled in MoveBlockTo)
+ // only use visible tab from source range - when dragging within one table,
+ // all selected tables at the time of dropping are used (handled in MoveBlockTo)
SCTAB nSourceTab = pTransObj->GetVisibleTab();
aSource.aStart.SetTab( nSourceTab );
aSource.aEnd.SetTab( nSourceTab );
@@ -3833,17 +3833,17 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
if (!bFiltered && pSourceDoc == pThisDoc)
{
- if ( nFlags & SC_DROP_TABLE ) // whole sheet?
+ if ( nFlags & SC_DROP_TABLE ) // whole sheet?
{
if ( pThisDoc->IsDocEditable() )
{
SCTAB nSrcTab = aSource.aStart.Tab();
- pViewData->GetDocShell()->MoveTable( nSrcTab, nThisTab, !bIsMove, TRUE ); // with Undo
+ pViewData->GetDocShell()->MoveTable( nSrcTab, nThisTab, !bIsMove, TRUE ); // with Undo
pView->SetTabNo( nThisTab, TRUE );
bDone = TRUE;
}
}
- else // move/copy block
+ else // move/copy block
{
String aChartName;
if (pThisDoc->HasChartAtPoint( nThisTab, rLogicPos, &aChartName ))
@@ -3954,18 +3954,18 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
pDocSh->GetUndoManager()->LeaveListAction();
if (!bDone)
- Sound::Beep(); // instead of error message in drop handler
+ Sound::Beep(); // instead of error message in drop handler
}
else
- bDone = TRUE; // nothing to do
+ bDone = TRUE; // nothing to do
}
if (bDone)
- pTransObj->SetDragWasInternal(); // don't delete source in DragFinished
+ pTransObj->SetDragWasInternal(); // don't delete source in DragFinished
}
- else if ( !bFiltered && pSourceDoc ) // between documents
+ else if ( !bFiltered && pSourceDoc ) // between documents
{
- if ( nFlags & SC_DROP_TABLE ) // copy/link sheets between documents
+ if ( nFlags & SC_DROP_TABLE ) // copy/link sheets between documents
{
if ( pThisDoc->IsDocEditable() )
{
@@ -3973,9 +3973,9 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
SCTAB nTabs[MAXTABCOUNT];
- ScMarkData aMark = pTransObj->GetSourceMarkData();
- SCTAB nTabCount = pSourceDoc->GetTableCount();
- SCTAB nTabSelCount = 0;
+ ScMarkData aMark = pTransObj->GetSourceMarkData();
+ SCTAB nTabCount = pSourceDoc->GetTableCount();
+ SCTAB nTabSelCount = 0;
for(SCTAB i=0; i<nTabCount; i++)
{
@@ -4000,8 +4000,8 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
}
else if ( bIsLink )
{
- // as in PasteDDE
- // (external references might be used instead?)
+ // as in PasteDDE
+ // (external references might be used instead?)
SfxObjectShell* pSourceSh = pSourceDoc->GetDocumentShell();
DBG_ASSERT(pSourceSh, "drag document has no shell");
@@ -4064,8 +4064,8 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
}
else
{
- //! HasSelectedBlockMatrixFragment without selected sheet?
- //! or don't start dragging on a part of a matrix
+ //! HasSelectedBlockMatrixFragment without selected sheet?
+ //! or don't start dragging on a part of a matrix
String aUndo = ScGlobal::GetRscString( bIsMove ? STR_UNDO_MOVE : STR_UNDO_COPY );
pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
@@ -4096,8 +4096,8 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
pDocSh->GetUndoManager()->LeaveListAction();
- // no longer call ResetMark here - the inserted block has been selected
- // and may have been copied to primary selection
+ // no longer call ResetMark here - the inserted block has been selected
+ // and may have been copied to primary selection
}
}
@@ -4107,7 +4107,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
{
- DrawMarkDropObj( NULL ); // drawing layer
+ DrawMarkDropObj( NULL ); // drawing layer
ScModule* pScMod = SC_MOD();
const ScDragData& rData = pScMod->GetDragData();
@@ -4118,7 +4118,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
if ( rData.aLinkDoc.Len() )
{
- // try to insert a link
+ // try to insert a link
BOOL bOk = TRUE;
String aThisName;
@@ -4126,7 +4126,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
if (pDocSh && pDocSh->HasName())
aThisName = pDocSh->GetMedium()->GetName();
- if ( rData.aLinkDoc == aThisName ) // error - no link within a document
+ if ( rData.aLinkDoc == aThisName ) // error - no link within a document
bOk = FALSE;
else
{
@@ -4136,8 +4136,8 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
rData.aLinkTable );
else if ( rData.aLinkArea.Len() )
{
- SCsCOL nPosX;
- SCsROW nPosY;
+ SCsCOL nPosX;
+ SCsROW nPosY;
pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY );
pView->MoveCursorAbs( nPosX, nPosY, SC_FOLLOW_NONE, FALSE, FALSE );
@@ -4151,7 +4151,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
}
}
- return bOk ? rEvt.mnAction : DND_ACTION_NONE; // don't try anything else
+ return bOk ? rEvt.mnAction : DND_ACTION_NONE; // don't try anything else
}
Point aLogicPos = PixelToLogic(aPos);
@@ -4175,14 +4175,14 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
}
- SCsCOL nPosX;
- SCsROW nPosY;
+ SCsCOL nPosX;
+ SCsROW nPosY;
pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY );
if (rData.aJumpTarget.Len())
{
- // internal bookmark (from Navigator)
- // bookmark clipboard formats are in PasteScDataObject
+ // internal bookmark (from Navigator)
+ // bookmark clipboard formats are in PasteScDataObject
if ( !rData.pJumpLocalDoc || rData.pJumpLocalDoc == pViewData->GetDocument() )
{
@@ -4198,8 +4198,8 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
SdrObject* pHitObj = pThisDoc->GetObjectAtPoint( pViewData->GetTabNo(), PixelToLogic(aPos) );
if ( pHitObj && bIsLink )
{
- // dropped on drawing object
- // PasteOnDrawObject checks for valid formats
+ // dropped on drawing object
+ // PasteOnDrawObject checks for valid formats
if ( pViewData->GetView()->PasteOnDrawObject( rEvt.maDropEvent.Transferable, pHitObj, TRUE ) )
return rEvt.mnAction;
}
@@ -4229,14 +4229,14 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel )
{
Point aLogicPos = PixelToLogic( rPosPixel );
- SCsCOL nPosX;
- SCsROW nPosY;
+ SCsCOL nPosX;
+ SCsROW nPosY;
pViewData->GetPosFromPixel( rPosPixel.X(), rPosPixel.Y(), eWhich, nPosX, nPosY );
ScSelectionTransferObj* pOwnSelection = SC_MOD()->GetSelectionTransfer();
if ( pOwnSelection )
{
- // within Calc
+ // within Calc
ScTransferObj* pCellTransfer = pOwnSelection->GetCellData();
if ( pCellTransfer )
@@ -4253,8 +4253,8 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel )
// keep a reference to the data in case the selection is changed during paste
uno::Reference<datatransfer::XTransferable> xRef( pDrawTransfer );
- // #96821# bSameDocClipboard argument for PasteDraw is needed
- // because only DragData is checked directly inside PasteDraw
+ // #96821# bSameDocClipboard argument for PasteDraw is needed
+ // because only DragData is checked directly inside PasteDraw
pViewData->GetView()->PasteDraw( aLogicPos, pDrawTransfer->GetModel(), FALSE,
pDrawTransfer->GetSourceDocID() == pViewData->GetDocument()->GetDocumentID() );
}
@@ -4262,7 +4262,7 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel )
}
else
{
- // get selection from system
+ // get selection from system
TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSelection( this ) );
uno::Reference<datatransfer::XTransferable> xTransferable = aDataHelper.GetTransferable();
@@ -4292,7 +4292,7 @@ void ScGridWindow::UpdateEditViewPos()
SCCOL nEndCol = pViewData->GetEditEndCol();
SCROW nEndRow = pViewData->GetEditEndRow();
- // hide EditView?
+ // hide EditView?
BOOL bHide = ( nEndCol<pViewData->GetPosX(eHWhich) || nEndRow<pViewData->GetPosY(eVWhich) );
if ( SC_MOD()->IsFormulaMode() )
@@ -4333,7 +4333,7 @@ void ScGridWindow::ScrollPixel( long nDifX, long nDifY )
SetMapMode(MAP_PIXEL);
Scroll( nDifX, nDifY, SCROLL_CHILDREN );
- SetMapMode( GetDrawMapMode() ); // verschobenen MapMode erzeugen
+ SetMapMode( GetDrawMapMode() ); // verschobenen MapMode erzeugen
UpdateEditViewPos();
@@ -4341,7 +4341,7 @@ void ScGridWindow::ScrollPixel( long nDifX, long nDifY )
bIsInScroll = FALSE;
}
-// Formeln neu zeichnen -------------------------------------------------
+// Formeln neu zeichnen -------------------------------------------------
void ScGridWindow::UpdateFormulas()
{
@@ -4350,18 +4350,18 @@ void ScGridWindow::UpdateFormulas()
if ( nPaintCount )
{
- // nicht anfangen, verschachtelt zu painten
- // (dann wuerde zumindest der MapMode nicht mehr stimmen)
+ // nicht anfangen, verschachtelt zu painten
+ // (dann wuerde zumindest der MapMode nicht mehr stimmen)
- bNeedsRepaint = TRUE; // -> am Ende vom Paint nochmal Invalidate auf alles
- aRepaintPixel = Rectangle(); // alles
+ bNeedsRepaint = TRUE; // -> am Ende vom Paint nochmal Invalidate auf alles
+ aRepaintPixel = Rectangle(); // alles
return;
}
- SCCOL nX1 = pViewData->GetPosX( eHWhich );
- SCROW nY1 = pViewData->GetPosY( eVWhich );
- SCCOL nX2 = nX1 + pViewData->VisibleCellsX( eHWhich );
- SCROW nY2 = nY1 + pViewData->VisibleCellsY( eVWhich );
+ SCCOL nX1 = pViewData->GetPosX( eHWhich );
+ SCROW nY1 = pViewData->GetPosY( eVWhich );
+ SCCOL nX2 = nX1 + pViewData->VisibleCellsX( eHWhich );
+ SCROW nY2 = nY1 + pViewData->VisibleCellsY( eVWhich );
if (nX2 > MAXCOL) nX2 = MAXCOL;
if (nY2 > MAXROW) nY2 = MAXROW;
@@ -4498,10 +4498,10 @@ void __EXPORT ScGridWindow::GetFocus()
if ( !SC_MOD()->IsFormulaMode() )
{
pViewShell->UpdateInputHandler();
-// StopMarking(); // falls Dialog (Fehler), weil dann kein ButtonUp
+// StopMarking(); // falls Dialog (Fehler), weil dann kein ButtonUp
// MO: nur wenn nicht im RefInput-Modus
// -> GetFocus/MouseButtonDown-Reihenfolge
- // auf dem Mac
+ // auf dem Mac
}
Window::GetFocus();
@@ -4541,10 +4541,10 @@ BOOL ScGridWindow::HitRangeFinder( const Point& rMouse, BOOL& rCorner,
SCsCOL nPosX;
SCsROW nPosY;
pViewData->GetPosFromPixel( rMouse.X(), rMouse.Y(), eWhich, nPosX, nPosY );
- // zusammengefasste (einzeln/Bereich) ???
+ // zusammengefasste (einzeln/Bereich) ???
ScAddress aAddr( nPosX, nPosY, nTab );
-// Point aNext = pViewData->GetScrPos( nPosX+1, nPosY+1, eWhich );
+// Point aNext = pViewData->GetScrPos( nPosX+1, nPosY+1, eWhich );
Point aNext = pViewData->GetScrPos( nPosX, nPosY, eWhich, TRUE );
long nSizeXPix;
@@ -4561,19 +4561,19 @@ BOOL ScGridWindow::HitRangeFinder( const Point& rMouse, BOOL& rCorner,
BOOL bCellCorner = ( bCornerHor &&
rMouse.Y() >= aNext.Y() - 8 && rMouse.Y() <= aNext.Y() );
- // corner is hit only if the mouse is within the cell
+ // corner is hit only if the mouse is within the cell
USHORT nCount = (USHORT)pRangeFinder->Count();
for (USHORT i=nCount; i;)
{
- // rueckwaerts suchen, damit der zuletzt gepaintete Rahmen gefunden wird
+ // rueckwaerts suchen, damit der zuletzt gepaintete Rahmen gefunden wird
--i;
ScRangeFindData* pData = pRangeFinder->GetObject(i);
if ( pData && pData->aRef.In(aAddr) )
{
- if (pIndex) *pIndex = i;
- if (pAddX) *pAddX = nPosX - pData->aRef.aStart.Col();
- if (pAddY) *pAddY = nPosY - pData->aRef.aStart.Row();
+ if (pIndex) *pIndex = i;
+ if (pAddX) *pAddX = nPosX - pData->aRef.aStart.Col();
+ if (pAddY) *pAddY = nPosY - pData->aRef.aStart.Row();
bFound = TRUE;
rCorner = ( bCellCorner && aAddr == pData->aRef.aEnd );
break;
@@ -4584,15 +4584,15 @@ BOOL ScGridWindow::HitRangeFinder( const Point& rMouse, BOOL& rCorner,
return bFound;
}
-#define SCE_TOP 1
-#define SCE_BOTTOM 2
-#define SCE_LEFT 4
-#define SCE_RIGHT 8
-#define SCE_ALL 15
+#define SCE_TOP 1
+#define SCE_BOTTOM 2
+#define SCE_LEFT 4
+#define SCE_RIGHT 8
+#define SCE_ALL 15
void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, USHORT nEdges )
{
- // der Range ist immer richtigherum
+ // der Range ist immer richtigherum
SCCOL nCol1 = rRange.aStart.Col();
SCROW nRow1 = rRange.aStart.Row();
@@ -4633,8 +4633,8 @@ void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, USHORT nEdges
if ( nCol2 > nCol1 + 1 && nRow2 > nRow1 + 1 && !bHiddenEdge )
{
- // nur an den Raendern entlang
- // (die Ecken werden evtl. zweimal getroffen)
+ // nur an den Raendern entlang
+ // (die Ecken werden evtl. zweimal getroffen)
if ( nEdges & SCE_TOP )
pDocSh->PostPaint( nCol1, nRow1, nTab1, nCol2, nRow1, nTab2, PAINT_MARKS );
@@ -4645,22 +4645,22 @@ void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, USHORT nEdges
if ( nEdges & SCE_BOTTOM )
pDocSh->PostPaint( nCol1, nRow2, nTab1, nCol2, nRow2, nTab2, PAINT_MARKS );
}
- else // everything in one call
+ else // everything in one call
pDocSh->PostPaint( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, PAINT_MARKS );
}
void lcl_PaintRefChanged( ScDocShell* pDocSh, const ScRange& rOldUn, const ScRange& rNewUn )
{
- // Repaint fuer die Teile des Rahmens in Old, die bei New nicht mehr da sind
+ // Repaint fuer die Teile des Rahmens in Old, die bei New nicht mehr da sind
ScRange aOld = rOldUn;
ScRange aNew = rNewUn;
aOld.Justify();
aNew.Justify();
- if ( aOld.aStart == aOld.aEnd ) //! Tab ignorieren?
+ if ( aOld.aStart == aOld.aEnd ) //! Tab ignorieren?
pDocSh->GetDocument()->ExtendMerge(aOld);
- if ( aNew.aStart == aNew.aEnd ) //! Tab ignorieren?
+ if ( aNew.aStart == aNew.aEnd ) //! Tab ignorieren?
pDocSh->GetDocument()->ExtendMerge(aNew);
SCCOL nOldCol1 = aOld.aStart.Col();
@@ -4671,7 +4671,7 @@ void lcl_PaintRefChanged( ScDocShell* pDocSh, const ScRange& rOldUn, const ScRan
SCROW nNewRow1 = aNew.aStart.Row();
SCCOL nNewCol2 = aNew.aEnd.Col();
SCROW nNewRow2 = aNew.aEnd.Row();
- SCTAB nTab1 = aOld.aStart.Tab(); // Tab aendert sich nicht
+ SCTAB nTab1 = aOld.aStart.Tab(); // Tab aendert sich nicht
SCTAB nTab2 = aOld.aEnd.Tab();
if ( nNewRow2 < nOldRow1 || nNewRow1 > nOldRow2 ||
@@ -4679,45 +4679,45 @@ void lcl_PaintRefChanged( ScDocShell* pDocSh, const ScRange& rOldUn, const ScRan
( nNewCol1 != nOldCol1 && nNewRow1 != nOldRow1 &&
nNewCol2 != nOldCol2 && nNewRow2 != nOldRow2 ) )
{
- // komplett weggeschoben oder alle Seiten veraendert
- // (Abfrage <= statt < geht schief bei einzelnen Zeilen/Spalten)
+ // komplett weggeschoben oder alle Seiten veraendert
+ // (Abfrage <= statt < geht schief bei einzelnen Zeilen/Spalten)
lcl_PaintOneRange( pDocSh, aOld, SCE_ALL );
}
- else // alle vier Kanten einzeln testen
+ else // alle vier Kanten einzeln testen
{
- // oberer Teil
- if ( nNewRow1 < nOldRow1 ) // nur obere Linie loeschen
+ // oberer Teil
+ if ( nNewRow1 < nOldRow1 ) // nur obere Linie loeschen
lcl_PaintOneRange( pDocSh, ScRange(
nOldCol1, nOldRow1, nTab1, nOldCol2, nOldRow1, nTab2 ), SCE_ALL );
- else if ( nNewRow1 > nOldRow1 ) // den Teil, der oben wegkommt
+ else if ( nNewRow1 > nOldRow1 ) // den Teil, der oben wegkommt
lcl_PaintOneRange( pDocSh, ScRange(
nOldCol1, nOldRow1, nTab1, nOldCol2, nNewRow1-1, nTab2 ),
SCE_ALL &~ SCE_BOTTOM );
- // unterer Teil
- if ( nNewRow2 > nOldRow2 ) // nur untere Linie loeschen
+ // unterer Teil
+ if ( nNewRow2 > nOldRow2 ) // nur untere Linie loeschen
lcl_PaintOneRange( pDocSh, ScRange(
nOldCol1, nOldRow2, nTab1, nOldCol2, nOldRow2, nTab2 ), SCE_ALL );
- else if ( nNewRow2 < nOldRow2 ) // den Teil, der unten wegkommt
+ else if ( nNewRow2 < nOldRow2 ) // den Teil, der unten wegkommt
lcl_PaintOneRange( pDocSh, ScRange(
nOldCol1, nNewRow2+1, nTab1, nOldCol2, nOldRow2, nTab2 ),
SCE_ALL &~ SCE_TOP );
- // linker Teil
- if ( nNewCol1 < nOldCol1 ) // nur linke Linie loeschen
+ // linker Teil
+ if ( nNewCol1 < nOldCol1 ) // nur linke Linie loeschen
lcl_PaintOneRange( pDocSh, ScRange(
nOldCol1, nOldRow1, nTab1, nOldCol1, nOldRow2, nTab2 ), SCE_ALL );
- else if ( nNewCol1 > nOldCol1 ) // den Teil, der links wegkommt
+ else if ( nNewCol1 > nOldCol1 ) // den Teil, der links wegkommt
lcl_PaintOneRange( pDocSh, ScRange(
nOldCol1, nOldRow1, nTab1, nNewCol1-1, nOldRow2, nTab2 ),
SCE_ALL &~ SCE_RIGHT );
- // rechter Teil
- if ( nNewCol2 > nOldCol2 ) // nur rechte Linie loeschen
+ // rechter Teil
+ if ( nNewCol2 > nOldCol2 ) // nur rechte Linie loeschen
lcl_PaintOneRange( pDocSh, ScRange(
nOldCol2, nOldRow1, nTab1, nOldCol2, nOldRow2, nTab2 ), SCE_ALL );
- else if ( nNewCol2 < nOldCol2 ) // den Teil, der rechts wegkommt
+ else if ( nNewCol2 < nOldCol2 ) // den Teil, der rechts wegkommt
lcl_PaintOneRange( pDocSh, ScRange(
nNewCol2+1, nOldRow1, nTab1, nOldCol2, nOldRow2, nTab2 ),
SCE_ALL &~ SCE_LEFT );
@@ -4736,14 +4736,14 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, BOOL bUp )
if (!pData)
return;
- // Mauszeiger
+ // Mauszeiger
if (bRFSize)
SetPointer( Pointer( POINTER_CROSS ) );
else
SetPointer( Pointer( POINTER_HAND ) );
- // Scrolling
+ // Scrolling
BOOL bTimer = FALSE;
Point aPos = rMEvt.GetPosPixel();
@@ -4763,9 +4763,9 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, BOOL bUp )
bTimer = TRUE;
}
- // Umschalten bei Fixierung (damit Scrolling funktioniert)
+ // Umschalten bei Fixierung (damit Scrolling funktioniert)
- if ( eWhich == pViewData->GetActivePart() ) //??
+ if ( eWhich == pViewData->GetActivePart() ) //??
{
if ( pViewData->GetHSplitMode() == SC_SPLIT_FIX )
if ( nDx > 0 )
@@ -4786,10 +4786,10 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, BOOL bUp )
}
}
- // Verschieben
+ // Verschieben
- SCsCOL nPosX;
- SCsROW nPosY;
+ SCsCOL nPosX;
+ SCsROW nPosY;
pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY );
ScRange aOld = pData->aRef;
@@ -4825,7 +4825,7 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, BOOL bUp )
}
if ( bUp )
- aNew.Justify(); // beim ButtonUp wieder richtigherum
+ aNew.Justify(); // beim ButtonUp wieder richtigherum
if ( aNew != aOld )
{
@@ -4833,19 +4833,19 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, BOOL bUp )
ScDocShell* pDocSh = pViewData->GetDocShell();
- // nur das neuzeichnen, was sich veraendert hat...
+ // nur das neuzeichnen, was sich veraendert hat...
lcl_PaintRefChanged( pDocSh, aOld, aNew );
- // neuen Rahmen nur drueberzeichnen (synchron)
+ // neuen Rahmen nur drueberzeichnen (synchron)
pDocSh->Broadcast( ScIndexHint( SC_HINT_SHOWRANGEFINDER, nRFIndex ) );
- Update(); // was man bewegt, will man auch sofort sehen
+ Update(); // was man bewegt, will man auch sofort sehen
}
- // Timer fuer Scrolling
+ // Timer fuer Scrolling
if (bTimer)
- pViewData->GetView()->SetTimer( this, rMEvt ); // Event wiederholen
+ pViewData->GetView()->SetTimer( this, rMEvt ); // Event wiederholen
else
pViewData->GetView()->ResetTimer();
}
@@ -4861,7 +4861,7 @@ BOOL ScGridWindow::GetEditUrl( const Point& rPos,
BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos,
String* pName, String* pUrl, String* pTarget )
{
- //! nPosX/Y mit uebergeben?
+ //! nPosX/Y mit uebergeben?
SCsCOL nPosX;
SCsROW nPosY;
pViewData->GetPosFromPixel( rPos.X(), rPos.Y(), eWhich, nPosX, nPosY );
@@ -4875,7 +4875,7 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos,
if( !bFound )
return FALSE;
- ScHideTextCursor aHideCursor( pViewData, eWhich ); // before GetEditArea (MapMode is changed)
+ ScHideTextCursor aHideCursor( pViewData, eWhich ); // before GetEditArea (MapMode is changed)
const ScPatternAttr* pPattern = pDoc->GetPattern( nPosX, nPosY, nTab );
// bForceToTop = FALSE, use the cell's real position
@@ -4883,7 +4883,7 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos,
if (rPos.Y() < aEditRect.Top())
return FALSE;
- // vertikal kann (noch) nicht angeklickt werden:
+ // vertikal kann (noch) nicht angeklickt werden:
if (pPattern->GetCellOrientation() != SVX_ORIENTATION_STANDARD)
return FALSE;
@@ -4894,7 +4894,7 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos,
SvxCellHorJustify eHorJust = (SvxCellHorJustify)((SvxHorJustifyItem&)pPattern->
GetItem(ATTR_HOR_JUSTIFY)).GetValue();
- // EditEngine
+ // EditEngine
ScFieldEditEngine aEngine( pDoc->GetEditPool() );
ScSizeDeviceProvider aProv(pDocSh);
@@ -4906,8 +4906,8 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos,
switch (eHorJust)
{
case SVX_HOR_JUSTIFY_LEFT:
- case SVX_HOR_JUSTIFY_REPEAT: // nicht implementiert
- case SVX_HOR_JUSTIFY_STANDARD: // always Text if an EditCell type
+ case SVX_HOR_JUSTIFY_REPEAT: // nicht implementiert
+ case SVX_HOR_JUSTIFY_STANDARD: // always Text if an EditCell type
eSvxAdjust = SVX_ADJUST_LEFT;
break;
case SVX_HOR_JUSTIFY_RIGHT:
@@ -4925,7 +4925,7 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos,
if (bSpellErr)
aEngine.SetControlWord( aEngine.GetControlWord() | EE_CNTRL_ONLINESPELLING );
- MapMode aEditMode = pViewData->GetLogicMode(eWhich); // ohne Drawing-Skalierung
+ MapMode aEditMode = pViewData->GetLogicMode(eWhich); // ohne Drawing-Skalierung
Rectangle aLogicEdit = PixelToLogic( aEditRect, aEditMode );
long nThisColLogic = aLogicEdit.Right() - aLogicEdit.Left() + 1;
Size aPaperSize = Size( 1000000, 1000000 );
@@ -4989,23 +4989,23 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos,
Point aLogicClick = PixelToLogic(rPos,aEditMode);
if ( aLogicEdit.IsInside(aLogicClick) )
{
-// aEngine.SetUpdateMode(FALSE);
+// aEngine.SetUpdateMode(FALSE);
EditView aTempView( &aEngine, this );
aTempView.SetOutputArea( aLogicEdit );
BOOL bRet = FALSE;
MapMode aOld = GetMapMode();
- SetMapMode(aEditMode); // kein return mehr
+ SetMapMode(aEditMode); // kein return mehr
- if (bSpellErr) // Spelling-Fehler suchen
+ if (bSpellErr) // Spelling-Fehler suchen
{
bRet = aTempView.IsWrongSpelledWordAtPos( rPos );
if ( bRet )
- pViewData->GetView()->SetCursor( nPosX, nPosY ); // Cursor setzen
+ pViewData->GetView()->SetCursor( nPosX, nPosY ); // Cursor setzen
}
- else // URL suchen
+ else // URL suchen
{
- const SvxFieldItem* pFieldItem = aTempView.GetFieldUnderMousePointer();
+ const SvxFieldItem* pFieldItem = aTempView.GetFieldUnderMousePointer();
if (pFieldItem)
{
@@ -5029,7 +5029,7 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos,
SetMapMode(aOld);
- // text cursor is restored in ScHideTextCursor dtor
+ // text cursor is restored in ScHideTextCursor dtor
return bRet;
}
@@ -5048,11 +5048,11 @@ BOOL ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRang
Size aButSize = pViewData->GetScenButSize();
long nBWidth = aButSize.Width();
if (!nBWidth)
- return FALSE; // noch kein Button gezeichnet -> da ist auch keiner
+ return FALSE; // noch kein Button gezeichnet -> da ist auch keiner
long nBHeight = aButSize.Height();
long nHSpace = (long)( SC_SCENARIO_HSPACE * pViewData->GetPPTX() );
- //! Ranges an der Table cachen!!!!
+ //! Ranges an der Table cachen!!!!
ScMarkData aMarks;
for (SCTAB i=nTab+1; i<nTabCount && pDoc->IsScenario(i); i++)
@@ -5065,8 +5065,8 @@ BOOL ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRang
for (ULONG j=0; j<nRangeCount; j++)
{
ScRange aRange = *aRanges.GetObject(j);
- // Szenario-Rahmen immer dann auf zusammengefasste Zellen erweitern, wenn
- // dadurch keine neuen nicht-ueberdeckten Zellen mit umrandet werden
+ // Szenario-Rahmen immer dann auf zusammengefasste Zellen erweitern, wenn
+ // dadurch keine neuen nicht-ueberdeckten Zellen mit umrandet werden
pDoc->ExtendTotalMerge( aRange );
BOOL bTextBelow = ( aRange.aStart.Row() == 0 );
@@ -5086,7 +5086,7 @@ BOOL ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRang
if ( bLayoutRTL )
aButtonPos.X() -= nHSpace - 1;
else
- aButtonPos.X() -= nBWidth - nHSpace; // same for top or bottom
+ aButtonPos.X() -= nBWidth - nHSpace; // same for top or bottom
Rectangle aButRect( aButtonPos, Size(nBWidth,nBHeight) );
if ( aButRect.IsInside( rPosPixel ) )
@@ -5255,7 +5255,7 @@ void ScGridWindow::UpdateCursorOverlay()
const Color aCursorColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
std::vector< basegfx::B2DRange > aRanges;
const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation());
-
+
for(sal_uInt32 a(0); a < aPixelRects.size(); a++)
{
const Rectangle aRA(aPixelRects[a]);
@@ -5263,10 +5263,10 @@ void ScGridWindow::UpdateCursorOverlay()
aRB.transform(aTransform);
aRanges.push_back(aRB);
}
-
+
sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection(
- sdr::overlay::OVERLAY_SOLID,
- aCursorColor,
+ sdr::overlay::OVERLAY_SOLID,
+ aCursorColor,
aRanges,
false);
@@ -5305,7 +5305,7 @@ void ScGridWindow::UpdateSelectionOverlay()
{
std::vector< basegfx::B2DRange > aRanges;
const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation());
-
+
for(sal_uInt32 a(0); a < aPixelRects.size(); a++)
{
const Rectangle aRA(aPixelRects[a]);
@@ -5335,8 +5335,8 @@ void ScGridWindow::UpdateSelectionOverlay()
}
sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection(
- sdr::overlay::OVERLAY_TRANSPARENT,
- aHighlight,
+ sdr::overlay::OVERLAY_TRANSPARENT,
+ aHighlight,
aRanges,
true);
@@ -5395,7 +5395,7 @@ void ScGridWindow::UpdateAutoFillOverlay()
aFillPos.Y() += nSizeYPix;
aFillPos.Y() -= 2;
mpAutoFillRect.reset(new Rectangle(aFillPos, Size(6, 6)));
-
+
// #i70788# get the OverlayManager safely
::sdr::overlay::OverlayManager* pOverlayManager = getOverlayManager();
@@ -5405,13 +5405,13 @@ void ScGridWindow::UpdateAutoFillOverlay()
std::vector< basegfx::B2DRange > aRanges;
const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation());
basegfx::B2DRange aRB(mpAutoFillRect->Left(), mpAutoFillRect->Top(), mpAutoFillRect->Right() + 1, mpAutoFillRect->Bottom() + 1);
-
+
aRB.transform(aTransform);
aRanges.push_back(aRB);
- sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection(
- sdr::overlay::OVERLAY_SOLID,
- aHandleColor,
+ sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection(
+ sdr::overlay::OVERLAY_SOLID,
+ aHandleColor,
aRanges,
false);
@@ -5532,7 +5532,7 @@ void ScGridWindow::UpdateDragRectOverlay()
// Color aHighlight = GetSettings().GetStyleSettings().GetHighlightColor();
std::vector< basegfx::B2DRange > aRanges;
const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation());
-
+
for(sal_uInt32 a(0); a < aPixelRects.size(); a++)
{
const Rectangle aRA(aPixelRects[a]);
@@ -5541,8 +5541,8 @@ void ScGridWindow::UpdateDragRectOverlay()
aRanges.push_back(aRB);
}
- sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection(
- sdr::overlay::OVERLAY_INVERT,
+ sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection(
+ sdr::overlay::OVERLAY_INVERT,
Color(COL_BLACK),
aRanges,
false);
@@ -5583,13 +5583,13 @@ void ScGridWindow::UpdateHeaderOverlay()
std::vector< basegfx::B2DRange > aRanges;
const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation());
basegfx::B2DRange aRB(aInvertRect.Left(), aInvertRect.Top(), aInvertRect.Right() + 1, aInvertRect.Bottom() + 1);
-
+
aRB.transform(aTransform);
aRanges.push_back(aRB);
sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection(
- sdr::overlay::OVERLAY_INVERT,
- Color(COL_BLACK),
+ sdr::overlay::OVERLAY_INVERT,
+ Color(COL_BLACK),
aRanges,
false);
@@ -5653,13 +5653,13 @@ void ScGridWindow::UpdateShrinkOverlay()
std::vector< basegfx::B2DRange > aRanges;
const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation());
basegfx::B2DRange aRB(aPixRect.Left(), aPixRect.Top(), aPixRect.Right() + 1, aPixRect.Bottom() + 1);
-
+
aRB.transform(aTransform);
aRanges.push_back(aRB);
sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection(
- sdr::overlay::OVERLAY_INVERT,
- Color(COL_BLACK),
+ sdr::overlay::OVERLAY_INVERT,
+ Color(COL_BLACK),
aRanges,
false);
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index a64814d952ef..28cf67c0bfb5 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "pagedata.hxx"
#include "dpobject.hxx"
#include "dpsave.hxx"
-#include "dpoutput.hxx" // ScDPPositionData
+#include "dpoutput.hxx" // ScDPPositionData
#include "dpshttab.hxx"
#include "dbdocfun.hxx"
#include "dpcontrol.hxx"
@@ -175,7 +175,7 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt
ScDocument* pDoc = pViewData->GetDocument();
SCTAB nTab = pViewData->GetTabNo();
- ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab);
+ ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab);
if (pDPObj)
{
@@ -189,8 +189,8 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt
pDragDPObj = pDPObj;
if (DPTestFieldPopupArrow(rMEvt, aPos, pDPObj))
- {
- // field name pop up menu has been launched. Don't activate
+ {
+ // field name pop up menu has been launched. Don't activate
// field move.
bDPMouse = false;
return;
@@ -201,7 +201,7 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt
}
else if ( pDPObj->IsFilterButton(aPos) )
{
- ReleaseMouse(); // may have been captured in ButtonDown
+ ReleaseMouse(); // may have been captured in ButtonDown
ScQueryParam aQueryParam;
SCTAB nSrcTab = 0;
@@ -217,13 +217,13 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt
SCITEM_QUERYDATA, SCITEM_QUERYDATA );
aArgSet.Put( ScQueryItem( SCITEM_QUERYDATA, pViewData, &aQueryParam ) );
-//CHINA001 ScPivotFilterDlg* pDlg = new ScPivotFilterDlg(
-//CHINA001 pViewData->GetViewShell()->GetDialogParent(),
-//CHINA001 aArgSet, nSrcTab );
+//CHINA001 ScPivotFilterDlg* pDlg = new ScPivotFilterDlg(
+//CHINA001 pViewData->GetViewShell()->GetDialogParent(),
+//CHINA001 aArgSet, nSrcTab );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
- AbstractScPivotFilterDlg* pDlg = pFact->CreateScPivotFilterDlg( pViewData->GetViewShell()->GetDialogParent(),
+ AbstractScPivotFilterDlg* pDlg = pFact->CreateScPivotFilterDlg( pViewData->GetViewShell()->GetDialogParent(),
aArgSet, nSrcTab,
RID_SCDLG_PIVOTFILTER);
DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
@@ -240,7 +240,7 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt
aNewObj.SetSheetDesc( aNewDesc );
ScDBDocFunc aFunc( *pViewData->GetDocShell() );
aFunc.DataPilotUpdate( pDPObj, &aNewObj, TRUE, FALSE );
- pViewData->GetView()->CursorPosChanged(); // shells may be switched
+ pViewData->GetView()->CursorPosChanged(); // shells may be switched
}
delete pDlg;
}
@@ -255,15 +255,15 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt
// -----------------------------------------------------------------------
//
-// Data Pilot interaction
+// Data Pilot interaction
//
void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove )
{
DBG_ASSERT(pDragDPObj, "pDragDPObj missing");
- // scroll window if at edges
- //! move this to separate method
+ // scroll window if at edges
+ //! move this to separate method
BOOL bTimer = FALSE;
Point aPixel = rMEvt.GetPosPixel();
@@ -291,13 +291,13 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove )
bTimer = TRUE;
}
- // ---
+ // ---
- SCsCOL nPosX;
- SCsROW nPosY;
+ SCsCOL nPosX;
+ SCsROW nPosY;
pViewData->GetPosFromPixel( aPixel.X(), aPixel.Y(), eWhich, nPosX, nPosY );
- BOOL bMouseLeft;
- BOOL bMouseTop;
+ BOOL bMouseLeft;
+ BOOL bMouseTop;
pViewData->GetMouseQuadrant( aPixel, eWhich, nPosX, nPosY, bMouseLeft, bMouseTop );
ScAddress aPos( nPosX, nPosY, pViewData->GetTabNo() );
@@ -309,20 +309,20 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove )
aPosRect, nOrient, nDimPos );
UpdateDragRect( bHasRange && bMove, aPosRect );
- if (bMove) // set mouse pointer
+ if (bMove) // set mouse pointer
{
PointerStyle ePointer = POINTER_PIVOT_DELETE;
if ( bHasRange )
switch (nOrient)
{
- case sheet::DataPilotFieldOrientation_COLUMN: ePointer = POINTER_PIVOT_COL; break;
- case sheet::DataPilotFieldOrientation_ROW: ePointer = POINTER_PIVOT_ROW; break;
+ case sheet::DataPilotFieldOrientation_COLUMN: ePointer = POINTER_PIVOT_COL; break;
+ case sheet::DataPilotFieldOrientation_ROW: ePointer = POINTER_PIVOT_ROW; break;
case sheet::DataPilotFieldOrientation_PAGE:
- case sheet::DataPilotFieldOrientation_DATA: ePointer = POINTER_PIVOT_FIELD; break;
+ case sheet::DataPilotFieldOrientation_DATA: ePointer = POINTER_PIVOT_FIELD; break;
}
SetPointer( ePointer );
}
- else // execute change
+ else // execute change
{
if (!bHasRange)
nOrient = sheet::DataPilotFieldOrientation_HIDDEN;
@@ -332,7 +332,7 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove )
if ( bIsDataLayout && ( nOrient != sheet::DataPilotFieldOrientation_COLUMN &&
nOrient != sheet::DataPilotFieldOrientation_ROW ) )
{
- // removing data layout is not allowed
+ // removing data layout is not allowed
pViewData->GetView()->ErrorMessage(STR_PIVOT_MOVENOTALLOWED);
}
else
@@ -347,19 +347,19 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove )
pDim->SetOrientation( nOrient );
aSaveData.SetPosition( pDim, nDimPos );
- //! docfunc method with ScDPSaveData as argument?
+ //! docfunc method with ScDPSaveData as argument?
ScDPObject aNewObj( *pDragDPObj );
aNewObj.SetSaveData( aSaveData );
ScDBDocFunc aFunc( *pViewData->GetDocShell() );
// when dragging fields, allow re-positioning (bAllowMove)
aFunc.DataPilotUpdate( pDragDPObj, &aNewObj, TRUE, FALSE, TRUE );
- pViewData->GetView()->CursorPosChanged(); // shells may be switched
+ pViewData->GetView()->CursorPosChanged(); // shells may be switched
}
}
if (bTimer && bMove)
- pViewData->GetView()->SetTimer( this, rMEvt ); // repeat event
+ pViewData->GetView()->SetTimer( this, rMEvt ); // repeat event
else
pViewData->GetView()->ResetTimer();
}
@@ -401,7 +401,7 @@ struct DPFieldPopupData : public ScDPFieldPopupWindow::ExtendedData
class DPFieldPopupOKAction : public ScMenuFloatingWindow::Action
{
public:
- explicit DPFieldPopupOKAction(ScGridWindow* p) :
+ explicit DPFieldPopupOKAction(ScGridWindow* p) :
mpGridWindow(p) {}
virtual void execute()
@@ -496,7 +496,7 @@ void ScGridWindow::DPLaunchFieldPopupMenu(
// Populate the menus.
ScTabViewShell* pViewShell = pViewData->GetViewShell();
mpDPFieldPopup->addMenuItem(
- ScRscStrLoader(RID_POPUP_FILTER, STR_MENU_SORT_ASC).GetString(), true,
+ ScRscStrLoader(RID_POPUP_FILTER, STR_MENU_SORT_ASC).GetString(), true,
new PopupSortAction(rPos, PopupSortAction::ASCENDING, 0, pViewShell));
mpDPFieldPopup->addMenuItem(
ScRscStrLoader(RID_POPUP_FILTER, STR_MENU_SORT_DESC).GetString(), true,
@@ -508,9 +508,9 @@ void ScGridWindow::DPLaunchFieldPopupMenu(
{
size_t n = aUserSortNames.size();
for (size_t i = 0; i < n; ++i)
- {
+ {
pSubMenu->addMenuItem(
- aUserSortNames[i], true,
+ aUserSortNames[i], true,
new PopupSortAction(rPos, PopupSortAction::CUSTOM, static_cast<sal_uInt16>(i), pViewShell));
}
}
@@ -519,7 +519,7 @@ void ScGridWindow::DPLaunchFieldPopupMenu(
const Size& rPopupSize = mpDPFieldPopup->getWindowSize();
if (rScrSize.getWidth() > rPopupSize.getWidth())
{
- // If the cell width is larger than the popup window width, launch it
+ // If the cell width is larger than the popup window width, launch it
// right-aligned with the cell.
long nXOffset = rScrSize.getWidth() - rPopupSize.getWidth();
aCellRect.SetPos(Point(rScrPos.X() + nXOffset, rScrPos.Y()));
@@ -607,11 +607,11 @@ void ScGridWindow::UpdateDragRect( BOOL bShowRange, const Rectangle& rPosRect )
if ( bShowRange == bDragRect && nDragStartX == nStartX && nDragEndX == nEndX &&
nDragStartY == nStartY && nDragEndY == nEndY )
{
- return; // everything unchanged
+ return; // everything unchanged
}
// if ( bDragRect )
- // DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, FALSE );
+ // DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, FALSE );
if ( bShowRange )
{
nDragStartX = nStartX;
@@ -629,12 +629,12 @@ void ScGridWindow::UpdateDragRect( BOOL bShowRange, const Rectangle& rPosRect )
// -----------------------------------------------------------------------
-// Page-Break-Modus
+// Page-Break-Modus
USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource,
SCCOLROW* pBreak, SCCOLROW* pPrev )
{
- USHORT nFound = SC_PD_NONE; // 0
+ USHORT nFound = SC_PD_NONE; // 0
ScRange aSource;
SCCOLROW nBreak = 0;
SCCOLROW nPrev = 0;
@@ -655,7 +655,7 @@ USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource,
Point aTL = pViewData->GetScrPos( nPosX, nPosY, eWhich );
Point aBR = pViewData->GetScrPos( nPosX+1, nPosY+1, eWhich );
- // Horizontal mehr Toleranz als vertikal, weil mehr Platz ist
+ // Horizontal mehr Toleranz als vertikal, weil mehr Platz ist
if ( nMouseX <= aTL.X() + 4 )
{
bHori = TRUE;
@@ -664,7 +664,7 @@ USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource,
else if ( nMouseX >= aBR.X() - 6 )
{
bHori = TRUE;
- nHitX = nPosX+1; // linker Rand der naechsten Zelle
+ nHitX = nPosX+1; // linker Rand der naechsten Zelle
}
if ( nMouseY <= aTL.Y() + 2 )
{
@@ -674,7 +674,7 @@ USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource,
else if ( nMouseY >= aBR.Y() - 4 )
{
bVert = TRUE;
- nHitY = nPosY+1; // oberer Rand der naechsten Zelle
+ nHitY = nPosY+1; // oberer Rand der naechsten Zelle
}
if ( bHori || bVert )
@@ -716,7 +716,7 @@ USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource,
if (nFound)
aSource = aRange;
- // Umbrueche
+ // Umbrueche
if ( bVert && bInsideH && !nFound )
{
@@ -755,20 +755,20 @@ USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource,
}
if (pSource)
- *pSource = aSource; // Druckbereich
+ *pSource = aSource; // Druckbereich
if (pBreak)
- *pBreak = nBreak; // X/Y Position des verchobenen Seitenumbruchs
+ *pBreak = nBreak; // X/Y Position des verchobenen Seitenumbruchs
if (pPrev)
- *pPrev = nPrev; // X/Y Anfang der Seite, die am Umbruch zuende ist
+ *pPrev = nPrev; // X/Y Anfang der Seite, die am Umbruch zuende ist
return nFound;
}
void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
{
- //! Scrolling und Umschalten mit RFMouseMove zusammenfassen !
- //! (Weginvertieren vor dem Scrolling ist anders)
+ //! Scrolling und Umschalten mit RFMouseMove zusammenfassen !
+ //! (Weginvertieren vor dem Scrolling ist anders)
- // Scrolling
+ // Scrolling
BOOL bTimer = FALSE;
Point aPos = rMEvt.GetPosPixel();
@@ -783,10 +783,10 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
nDy = 1;
if ( nDx != 0 || nDy != 0 )
{
- if ( bPagebreakDrawn ) // weginvertieren
+ if ( bPagebreakDrawn ) // weginvertieren
{
// DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(),
- // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE );
+ // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE );
bPagebreakDrawn = FALSE;
UpdateDragRectOverlay();
}
@@ -796,9 +796,9 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
bTimer = TRUE;
}
- // Umschalten bei Fixierung (damit Scrolling funktioniert)
+ // Umschalten bei Fixierung (damit Scrolling funktioniert)
- if ( eWhich == pViewData->GetActivePart() ) //??
+ if ( eWhich == pViewData->GetActivePart() ) //??
{
if ( pViewData->GetHSplitMode() == SC_SPLIT_FIX )
if ( nDx > 0 )
@@ -819,9 +819,9 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
}
}
- // ab hier neu
+ // ab hier neu
- // gesucht wird eine Position zwischen den Zellen (vor nPosX / nPosY)
+ // gesucht wird eine Position zwischen den Zellen (vor nPosX / nPosY)
SCsCOL nPosX;
SCsROW nPosY;
pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY );
@@ -839,7 +839,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
if ( nPagebreakMouse == SC_PD_BREAK_H )
{
if ( nPosX > aPagebreakSource.aStart.Col() &&
- nPosX <= aPagebreakSource.aEnd.Col() + 1 ) // ans Ende ist auch erlaubt
+ nPosX <= aPagebreakSource.aEnd.Col() + 1 ) // ans Ende ist auch erlaubt
{
bToEnd = ( nPosX == aPagebreakSource.aEnd.Col() + 1 );
aDrawRange.aStart.SetCol( nPosX );
@@ -851,7 +851,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
else
{
if ( nPosY > aPagebreakSource.aStart.Row() &&
- nPosY <= aPagebreakSource.aEnd.Row() + 1 ) // ans Ende ist auch erlaubt
+ nPosY <= aPagebreakSource.aEnd.Row() + 1 ) // ans Ende ist auch erlaubt
{
bToEnd = ( nPosY == aPagebreakSource.aEnd.Row() + 1 );
aDrawRange.aStart.SetRow( nPosY );
@@ -888,13 +888,13 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
if ( !bPagebreakDrawn || bUp || aDrawRange != aPagebreakDrag )
{
- // zeichnen...
+ // zeichnen...
if ( bPagebreakDrawn )
{
// weginvertieren
// DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(),
- // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE );
+ // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE );
bPagebreakDrawn = FALSE;
}
aPagebreakDrag = aDrawRange;
@@ -902,13 +902,13 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
{
// hininvertieren
// DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(),
- // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE );
+ // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE );
bPagebreakDrawn = TRUE;
}
UpdateDragRectOverlay();
}
- // bei ButtonUp die Aenderung ausfuehren
+ // bei ButtonUp die Aenderung ausfuehren
if ( bUp )
{
@@ -938,14 +938,14 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
ScAddress aOldAddr( static_cast<SCCOL>(nPagebreakBreak), nPosY, nTab );
pViewFunc->DeletePageBreak( TRUE, TRUE, &aOldAddr, FALSE );
}
- if ( !bHide && !bToEnd ) // am Ende nicht
+ if ( !bHide && !bToEnd ) // am Ende nicht
{
ScAddress aNewAddr( static_cast<SCCOL>(nNew), nPosY, nTab );
pViewFunc->InsertPageBreak( TRUE, TRUE, &aNewAddr, FALSE );
}
if ( bGrow )
{
- // vorigen Break auf hart, und Skalierung aendern
+ // vorigen Break auf hart, und Skalierung aendern
bool bManualBreak = (pDoc->HasColBreak(static_cast<SCCOL>(nPagebreakPrev), nTab) & BREAK_MANUAL);
if ( static_cast<SCCOL>(nPagebreakPrev) > aPagebreakSource.aStart.Col() && !bManualBreak )
{
@@ -965,14 +965,14 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
ScAddress aOldAddr( nPosX, nPagebreakBreak, nTab );
pViewFunc->DeletePageBreak( FALSE, TRUE, &aOldAddr, FALSE );
}
- if ( !bHide && !bToEnd ) // am Ende nicht
+ if ( !bHide && !bToEnd ) // am Ende nicht
{
ScAddress aNewAddr( nPosX, nNew, nTab );
pViewFunc->InsertPageBreak( FALSE, TRUE, &aNewAddr, FALSE );
}
if ( bGrow )
{
- // vorigen Break auf hart, und Skalierung aendern
+ // vorigen Break auf hart, und Skalierung aendern
bool bManualBreak = (pDoc->HasRowBreak(nPagebreakPrev, nTab) & BREAK_MANUAL);
if ( nPagebreakPrev > aPagebreakSource.aStart.Row() && !bManualBreak )
{
@@ -991,7 +991,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
pDocSh->GetUndoManager()->LeaveListAction();
}
- if (!bGrow) // sonst in AdjustPrintZoom schon passiert
+ if (!bGrow) // sonst in AdjustPrintZoom schon passiert
{
pViewFunc->UpdatePageBreakData( TRUE );
pDocSh->SetDocumentModified();
@@ -1000,7 +1000,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
}
else if ( bHide || aPagebreakDrag != aPagebreakSource )
{
- // Druckbereich setzen
+ // Druckbereich setzen
String aNewRanges;
USHORT nOldCount = pDoc->GetPrintRangeCount( nTab );
@@ -1032,10 +1032,10 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
}
}
- // Timer fuer Scrolling
+ // Timer fuer Scrolling
if (bTimer && !bUp)
- pViewData->GetView()->SetTimer( this, rMEvt ); // Event wiederholen
+ pViewData->GetView()->SetTimer( this, rMEvt ); // Event wiederholen
else
pViewData->GetView()->ResetTimer();
}
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index f16c2fe1ada7..9ba9ee6a4d4b 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ BOOL ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt)
Point aLogicPos = PixelToLogic(rMEvt.GetPosPixel());
if ( pDraw->IsDetectiveHit( aLogicPos ) )
{
- // auf Detektiv-Pfeilen gar nichts (Doppelklick wird bei ButtonUp ausgewertet)
+ // auf Detektiv-Pfeilen gar nichts (Doppelklick wird bei ButtonUp ausgewertet)
bRet = TRUE;
}
else
@@ -74,7 +74,7 @@ BOOL ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt)
}
}
- // bei rechter Taste Draw-Aktion abbrechen
+ // bei rechter Taste Draw-Aktion abbrechen
ScDrawView* pDrView = pViewData->GetScDrawView();
if ( pDrView && !rMEvt.IsLeft() && !bRet )
@@ -142,7 +142,7 @@ void ScGridWindow::DrawEndAction()
if (pDraw)
pDraw->StopDragTimer();
- // ReleaseMouse beim Aufruf
+ // ReleaseMouse beim Aufruf
}
BOOL ScGridWindow::DrawCommand(const CommandEvent& rCEvt)
@@ -154,7 +154,7 @@ BOOL ScGridWindow::DrawCommand(const CommandEvent& rCEvt)
pDraw->SetWindow( this );
BYTE nUsed = pDraw->Command( rCEvt );
if( nUsed == SC_CMD_USED )
- nButtonDown = 0; // MouseButtonUp wird verschluckt...
+ nButtonDown = 0; // MouseButtonUp wird verschluckt...
if( nUsed || pDrView->IsAction() )
return TRUE;
}
@@ -182,10 +182,10 @@ BOOL ScGridWindow::DrawKeyInput(const KeyEvent& rKEvt)
bLeaveDraw = TRUE;
if ( !bOldMarked &&
rKEvt.GetKeyCode().GetCode() == KEY_DELETE )
- bUsed = FALSE; // nichts geloescht
+ bUsed = FALSE; // nichts geloescht
}
if (!bLeaveDraw)
- UpdateStatusPosSize(); // #108137# for moving/resizing etc. by keyboard
+ UpdateStatusPosSize(); // #108137# for moving/resizing etc. by keyboard
return bUsed;
}
}
@@ -228,7 +228,7 @@ void ScGridWindow::DrawRedraw( ScOutputData& rOutputData, ScUpdateMode eMode, UL
void ScGridWindow::DrawSdrGrid( const Rectangle& rDrawingRect, OutputDevice* pContentDev )
{
- // Draw-Gitterlinien
+ // Draw-Gitterlinien
ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
if ( pDrView && pDrView->IsGridVisible() )
@@ -278,7 +278,7 @@ MapMode ScGridWindow::GetDrawMapMode( BOOL bForce )
Point aStartPos = pViewData->GetPixPos(eWhich);
if ( bNegativePage )
{
- // RTL uses negative positions for drawing objects
+ // RTL uses negative positions for drawing objects
aStartPos.X() = -aStartPos.X() + GetOutputSizePixel().Width() - 1;
}
aDrawMode.SetOrigin( PixelToLogic( aStartPos, aDrawMode ) );
@@ -288,44 +288,44 @@ MapMode ScGridWindow::GetDrawMapMode( BOOL bForce )
//BOOL ScGridWindow::DrawBeforeScroll()
//{
-// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
+// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
//
-// BOOL bXor = FALSE;
-// if (pDrView)
-// {
-// bXor=pDrView->IsShownXorVisible(this);
-// if (bXor) pDrView->HideShownXor(this);
-// }
-// return bXor;
+// BOOL bXor = FALSE;
+// if (pDrView)
+// {
+// bXor=pDrView->IsShownXorVisible(this);
+// if (bXor) pDrView->HideShownXor(this);
+// }
+// return bXor;
//}
void ScGridWindow::DrawAfterScroll(/*BOOL bVal*/)
{
- Update(); // immer, damit das Verhalten mit/ohne DrawingLayer gleich ist
+ Update(); // immer, damit das Verhalten mit/ohne DrawingLayer gleich ist
ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
if (pDrView)
{
//if (bVal)
- // pDrView->ShowShownXor(this);
+ // pDrView->ShowShownXor(this);
OutlinerView* pOlView = pDrView->GetTextEditOutlinerView();
if (pOlView && pOlView->GetWindow() == this)
- pOlView->ShowCursor(FALSE); // ist beim Scrollen weggekommen
+ pOlView->ShowCursor(FALSE); // ist beim Scrollen weggekommen
}
}
//void ScGridWindow::DrawMarks()
//{
-// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
-// if (pDrView)
-// pDrView->DrawMarks(this);
+// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
+// if (pDrView)
+// pDrView->DrawMarks(this);
//}
//BOOL ScGridWindow::NeedDrawMarks()
//{
-// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
-// return pDrView && pDrView->IsMarkHdlShown() && pDrView->AreObjectsMarked();
+// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
+// return pDrView && pDrView->IsMarkHdlShown() && pDrView->AreObjectsMarked();
//}
void ScGridWindow::CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddress)
@@ -361,7 +361,7 @@ void ScGridWindow::UpdateStatusPosSize()
{
ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
if (!pDrView)
- return; // shouldn't be called in that case
+ return; // shouldn't be called in that case
SdrPageView* pPV = pDrView->GetSdrPageView();
if (!pPV)
@@ -369,13 +369,13 @@ void ScGridWindow::UpdateStatusPosSize()
SfxItemSet aSet(pViewData->GetViewShell()->GetPool(), SID_ATTR_POSITION, SID_ATTR_SIZE);
- // Fill items for position and size:
- // #108137# show action rectangle during action,
- // position and size of selected object(s) if something is selected,
- // mouse position otherwise
+ // Fill items for position and size:
+ // #108137# show action rectangle during action,
+ // position and size of selected object(s) if something is selected,
+ // mouse position otherwise
BOOL bActionItem = FALSE;
- if ( pDrView->IsAction() ) // action rectangle
+ if ( pDrView->IsAction() ) // action rectangle
{
Rectangle aRect;
pDrView->TakeActionRect( aRect );
@@ -390,7 +390,7 @@ void ScGridWindow::UpdateStatusPosSize()
}
if ( !bActionItem )
{
- if ( pDrView->AreObjectsMarked() ) // selected objects
+ if ( pDrView->AreObjectsMarked() ) // selected objects
{
Rectangle aRect = pDrView->GetAllMarkedRect();
pPV->LogicToPagePos(aRect);
@@ -398,7 +398,7 @@ void ScGridWindow::UpdateStatusPosSize()
aSet.Put( SvxSizeItem( SID_ATTR_SIZE,
Size( aRect.Right() - aRect.Left(), aRect.Bottom() - aRect.Top() ) ) );
}
- else // mouse position
+ else // mouse position
{
Point aPos = PixelToLogic(aCurMousePos);
pPV->LogicToPagePos(aPos);
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index ba73fbf00269..92ed90af3a76 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +52,11 @@
#include "output.hxx"
#include "document.hxx"
#include "attrib.hxx"
-#include "patattr.hxx" // InvertSimple
+#include "patattr.hxx" // InvertSimple
#include "dbcolect.hxx"
#include "docoptio.hxx"
#include "notemark.hxx"
-#include "dbfunc.hxx" // oder GetPageBreakData an die ViewData
+#include "dbfunc.hxx" // oder GetPageBreakData an die ViewData
#include "scmod.hxx"
#include "inputhdl.hxx"
#include "rfindlst.hxx"
@@ -64,7 +64,7 @@
#include "pagedata.hxx"
#include "docpool.hxx"
#include "globstr.hrc"
-#include "docsh.hxx" // oder GetSfxInPlaceObject
+#include "docsh.hxx" // oder GetSfxInPlaceObject
#include "cbutton.hxx"
#include "invmerge.hxx"
#include "editutil.hxx"
@@ -78,16 +78,16 @@
// #i74769#
#include <svx/sdrpaintwindow.hxx>
-//#include "tabvwsh.hxx" //! Test !!!!
+//#include "tabvwsh.hxx" //! Test !!!!
//------------------------------------------------------------------------
void lcl_LimitRect( Rectangle& rRect, const Rectangle& rVisible )
{
if ( rRect.Top() < rVisible.Top()-1 ) rRect.Top() = rVisible.Top()-1;
-// if ( rRect.Left() < rVisible.Left()-1 ) rRect.Left() = rVisible.Left()-1;
+// if ( rRect.Left() < rVisible.Left()-1 ) rRect.Left() = rVisible.Left()-1;
if ( rRect.Bottom() > rVisible.Bottom()+1 ) rRect.Bottom() = rVisible.Bottom()+1;
-// if ( rRect.Right() > rVisible.Right()+1 ) rRect.Right() = rVisible.Right()+1;
+// if ( rRect.Right() > rVisible.Right()+1 ) rRect.Right() = rVisible.Right()+1;
// #51122# auch wenn das inner-Rectangle nicht sichtbar ist, muss evtl.
// die Titelzeile gezeichnet werden, darum kein Rueckgabewert mehr.
@@ -99,8 +99,8 @@ void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel,
double nPPTX, double nPPTY, const Fraction& rZoomY,
ScDocument* pDoc, ScViewData* pButtonViewData, BOOL bLayoutRTL )
{
- // pButtonViewData wird nur benutzt, um die Button-Groesse zu setzen,
- // darf ansonsten NULL sein!
+ // pButtonViewData wird nur benutzt, um die Button-Groesse zu setzen,
+ // darf ansonsten NULL sein!
Rectangle aInner = rInnerPixel;
if ( bLayoutRTL )
@@ -115,17 +115,17 @@ void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel,
Rectangle aOuter = aInner;
long nHor = (long) ( SC_SCENARIO_HSPACE * nPPTX );
long nVer = (long) ( SC_SCENARIO_VSPACE * nPPTY );
- aOuter.Left() -= nHor;
- aOuter.Right() += nHor;
- aOuter.Top() -= nVer;
- aOuter.Bottom() += nVer;
+ aOuter.Left() -= nHor;
+ aOuter.Right() += nHor;
+ aOuter.Top() -= nVer;
+ aOuter.Bottom() += nVer;
- // use ScPatternAttr::GetFont only for font size
+ // use ScPatternAttr::GetFont only for font size
Font aAttrFont;
((const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)).
GetFont(aAttrFont,SC_AUTOCOL_BLACK,pDev,&rZoomY);
- // everything else from application font
+ // everything else from application font
Font aAppFont = pDev->GetSettings().GetStyleSettings().GetAppFont();
aAppFont.SetSize( aAttrFont.GetSize() );
@@ -141,7 +141,7 @@ void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel,
pDev->SetLineColor();
pDev->SetFillColor( rColor );
- // links, oben, rechts, unten
+ // links, oben, rechts, unten
pDev->DrawRect( Rectangle( aOuter.Left(), aOuter.Top(), aInner.Left(), aOuter.Bottom() ) );
pDev->DrawRect( Rectangle( aOuter.Left(), aOuter.Top(), aOuter.Right(), aInner.Top() ) );
pDev->DrawRect( Rectangle( aInner.Right(), aOuter.Top(), aOuter.Right(), aOuter.Bottom() ) );
@@ -203,14 +203,14 @@ void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, ScSplitP
if ( nTab+1<nTabCount && pDoc->IsScenario(nTab+1) && !pDoc->IsScenario(nTab) )
{
if ( nX1 > 0 ) --nX1;
- if ( nY1>=2 ) nY1 -= 2; // Hack: Titelzeile beruehrt zwei Zellen
+ if ( nY1>=2 ) nY1 -= 2; // Hack: Titelzeile beruehrt zwei Zellen
else if ( nY1 > 0 ) --nY1;
if ( nX2 < MAXCOL ) ++nX2;
- if ( nY2 < MAXROW-1 ) nY2 += 2; // Hack: Titelzeile beruehrt zwei Zellen
+ if ( nY2 < MAXROW-1 ) nY2 += 2; // Hack: Titelzeile beruehrt zwei Zellen
else if ( nY2 < MAXROW ) ++nY2;
ScRange aViewRange( nX1,nY1,nTab, nX2,nY2,nTab );
- //! Ranges an der Table cachen!!!!
+ //! Ranges an der Table cachen!!!!
ScMarkData aMarks;
for (SCTAB i=nTab+1; i<nTabCount && pDoc->IsScenario(i); i++)
@@ -225,19 +225,19 @@ void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, ScSplitP
for (USHORT j=0; j<nRangeCount; j++)
{
ScRange aRange = *xRanges->GetObject(j);
- // Szenario-Rahmen immer dann auf zusammengefasste Zellen erweitern, wenn
- // dadurch keine neuen nicht-ueberdeckten Zellen mit umrandet werden
+ // Szenario-Rahmen immer dann auf zusammengefasste Zellen erweitern, wenn
+ // dadurch keine neuen nicht-ueberdeckten Zellen mit umrandet werden
pDoc->ExtendTotalMerge( aRange );
- //! -> Repaint beim Zusammenfassen erweitern !!!
+ //! -> Repaint beim Zusammenfassen erweitern !!!
- if ( aRange.Intersects( aViewRange ) ) //! Platz fuer Text/Button?
+ if ( aRange.Intersects( aViewRange ) ) //! Platz fuer Text/Button?
{
Point aStartPos = pViewData->GetScrPos(
aRange.aStart.Col(), aRange.aStart.Row(), eWhich, TRUE );
Point aEndPos = pViewData->GetScrPos(
aRange.aEnd.Col()+1, aRange.aEnd.Row()+1, eWhich, TRUE );
- // on the grid:
+ // on the grid:
aStartPos.X() -= nLayoutSign;
aStartPos.Y() -= 1;
aEndPos.X() -= nLayoutSign;
@@ -259,7 +259,7 @@ void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, ScSplitP
if (!aCurrent.Len())
aCurrent = ScGlobal::GetRscString( STR_EMPTYDATA );
- //! eigener Text "(keins)" statt "(leer)" ???
+ //! eigener Text "(keins)" statt "(leer)" ???
lcl_DrawOneFrame( pDev, Rectangle( aStartPos, aEndPos ),
aCurrent, aColor, bTextBelow,
@@ -298,15 +298,15 @@ void lcl_DrawHighlight( ScOutputData& rOutputData, ScViewData* pViewData,
void ScGridWindow::DoInvertRect( const Rectangle& rPixel )
{
-// Invert( PixelToLogic(rPixel) );
+// Invert( PixelToLogic(rPixel) );
if ( rPixel == aInvertRect )
- aInvertRect = Rectangle(); // aufheben
+ aInvertRect = Rectangle(); // aufheben
else
{
DBG_ASSERT( aInvertRect.IsEmpty(), "DoInvertRect nicht paarig" );
- aInvertRect = rPixel; // neues Rechteck merken
+ aInvertRect = rPixel; // neues Rechteck merken
}
UpdateHeaderOverlay(); // uses aInvertRect
@@ -347,19 +347,19 @@ void __EXPORT ScGridWindow::Paint( const Rectangle& rRect )
ScDocument* pDoc = pViewData->GetDocument();
if ( pDoc->IsInInterpreter() )
{
- // via Reschedule, interpretierende Zellen nicht nochmal anstossen
- // hier kein Invalidate, sonst kommt z.B. eine Error-Box nie an die Reihe
- // (Bug 36381). Durch bNeedsRepaint wird spaeter alles nochmal gemalt.
+ // via Reschedule, interpretierende Zellen nicht nochmal anstossen
+ // hier kein Invalidate, sonst kommt z.B. eine Error-Box nie an die Reihe
+ // (Bug 36381). Durch bNeedsRepaint wird spaeter alles nochmal gemalt.
if ( bNeedsRepaint )
{
- //! Rechtecke zusammenfassen?
- aRepaintPixel = Rectangle(); // mehrfach -> alles painten
+ //! Rechtecke zusammenfassen?
+ aRepaintPixel = Rectangle(); // mehrfach -> alles painten
}
else
{
bNeedsRepaint = TRUE;
- aRepaintPixel = LogicToPixel(rRect); // nur betroffenen Bereich
+ aRepaintPixel = LogicToPixel(rRect); // nur betroffenen Bereich
}
return;
}
@@ -382,7 +382,7 @@ void __EXPORT ScGridWindow::Paint( const Rectangle& rRect )
Rectangle aMirroredPixel = aPixRect;
if ( pDoc->IsLayoutRTL( nTab ) )
{
- // mirror and swap
+ // mirror and swap
long nWidth = GetSizePixel().Width();
aMirroredPixel.Left() = nWidth - 1 - aPixRect.Right();
aMirroredPixel.Right() = nWidth - 1 - aPixRect.Left();
@@ -410,20 +410,20 @@ void __EXPORT ScGridWindow::Paint( const Rectangle& rRect )
ScViewData::AddPixelsWhile( nScrY, aPixRect.Bottom(), nY2, MAXROW, nPPTY, pDoc, nTab);
}
- Draw( nX1,nY1,nX2,nY2, SC_UPDATE_MARKS ); // nicht weiterzeichnen
+ Draw( nX1,nY1,nX2,nY2, SC_UPDATE_MARKS ); // nicht weiterzeichnen
bIsInPaint = FALSE;
}
//
-// Draw ----------------------------------------------------------------
+// Draw ----------------------------------------------------------------
//
void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMode eMode )
{
ScModule* pScMod = SC_MOD();
BOOL bTextWysiwyg = pScMod->GetInputOptions().GetTextWysiwyg();
- BOOL bGridFirst = TRUE; //! entscheiden!!!
+ BOOL bGridFirst = TRUE; //! entscheiden!!!
if (pViewData->IsMinimized())
return;
@@ -436,7 +436,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
SCCOL nPosX = pViewData->GetPosX( eHWhich );
SCROW nPosY = pViewData->GetPosY( eVWhich );
if (nX2 < nPosX || nY2 < nPosY)
- return; // unsichtbar
+ return; // unsichtbar
if (nX1 < nPosX) nX1 = nPosX;
if (nY1 < nPosY) nY1 = nPosY;
@@ -452,17 +452,17 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
maVisibleRange.mnRow2 = nYBottom;
if (nX1 > nXRight || nY1 > nYBottom)
- return; // unsichtbar
+ return; // unsichtbar
if (nX2 > nXRight) nX2 = nXRight;
if (nY2 > nYBottom) nY2 = nYBottom;
if ( eMode != SC_UPDATE_MARKS )
if (nX2 < nXRight)
- nX2 = nXRight; // zum Weiterzeichnen
+ nX2 = nXRight; // zum Weiterzeichnen
- // ab hier kein return mehr
+ // ab hier kein return mehr
- ++nPaintCount; // merken, dass gemalt wird (wichtig beim Invertieren)
+ ++nPaintCount; // merken, dass gemalt wird (wichtig beim Invertieren)
ScDocShell* pDocSh = pViewData->GetDocShell();
ScDocument* pDoc = pDocSh->GetDocument();
@@ -492,7 +492,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
BOOL bCurVis = nCursorHideCount==0 &&
( nCurEndX+1 >= nX1 && nCurX <= nX2+1 && nCurEndY+1 >= nY1 && nCurY <= nY2+1 );
- // AutoFill-Anfasser
+ // AutoFill-Anfasser
if ( !bCurVis && nCursorHideCount==0 && bAutoMarkVisible && aAutoMarkPos.Tab() == nTab &&
( aAutoMarkPos.Col() != nCurX || aAutoMarkPos.Row() != nCurY ) )
{
@@ -500,9 +500,9 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
SCROW nHdlY = aAutoMarkPos.Row();
pDoc->ExtendMerge( nHdlX, nHdlY, nHdlX, nHdlY, nTab );
bCurVis = ( nHdlX+1 >= nX1 && nHdlX <= nX2 && nHdlY+1 >= nY1 && nHdlY <= nY2 );
- // links und oben ist nicht betroffen
+ // links und oben ist nicht betroffen
- //! AutoFill-Anfasser alleine (ohne Cursor) zeichnen ???
+ //! AutoFill-Anfasser alleine (ohne Cursor) zeichnen ???
}
double nPPTX = pViewData->GetPPTX();
@@ -527,14 +527,14 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
nScrX, nScrY, nX1, nY1, nX2, nY2, nPPTX, nPPTY,
&aZoomX, &aZoomY );
- aOutputData.SetMirrorWidth( nMirrorWidth ); // needed for RTL
+ aOutputData.SetMirrorWidth( nMirrorWidth ); // needed for RTL
std::auto_ptr< VirtualDevice > xFmtVirtDev;
BOOL bLogicText = bTextWysiwyg; // call DrawStrings in logic MapMode?
if ( bTextWysiwyg )
{
- // use printer for text formatting
+ // use printer for text formatting
OutputDevice* pFmtDev = pDoc->GetPrinter();
pFmtDev->SetMapMode( pViewData->GetLogicMode(eWhich) );
@@ -556,18 +556,18 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
Color aGridColor( rColorCfg.GetColorValue( svtools::CALCGRID, FALSE ).nColor );
if ( aGridColor.GetColor() == COL_TRANSPARENT )
{
- // use view options' grid color only if color config has "automatic" color
+ // use view options' grid color only if color config has "automatic" color
aGridColor = rOpts.GetGridColor();
}
- aOutputData.SetSyntaxMode ( pViewData->IsSyntaxMode() );
- aOutputData.SetGridColor ( aGridColor );
- aOutputData.SetShowNullValues ( rOpts.GetOption( VOPT_NULLVALS ) );
- aOutputData.SetShowFormulas ( bFormulaMode );
+ aOutputData.SetSyntaxMode ( pViewData->IsSyntaxMode() );
+ aOutputData.SetGridColor ( aGridColor );
+ aOutputData.SetShowNullValues ( rOpts.GetOption( VOPT_NULLVALS ) );
+ aOutputData.SetShowFormulas ( bFormulaMode );
aOutputData.SetShowSpellErrors ( pDoc->GetDocOptions().IsAutoSpell() );
- aOutputData.SetMarkClipped ( bMarkClipped );
+ aOutputData.SetMarkClipped ( bMarkClipped );
- aOutputData.SetUseStyleColor( TRUE ); // always set in table view
+ aOutputData.SetUseStyleColor( TRUE ); // always set in table view
aOutputData.SetEditObject( GetEditObject() );
aOutputData.SetViewShell( pViewData->GetViewShell() );
@@ -582,14 +582,14 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
}
BOOL bPageMode = pViewData->IsPagebreakMode();
- if (bPageMode) // nach FindChanged
+ if (bPageMode) // nach FindChanged
{
// SetPagebreakMode initialisiert auch bPrinted Flags
aOutputData.SetPagebreakMode( pViewData->GetView()->GetPageBreakData() );
}
- EditView* pEditView = NULL;
- BOOL bEditMode = pViewData->HasEditView(eWhich);
+ EditView* pEditView = NULL;
+ BOOL bEditMode = pViewData->HasEditView(eWhich);
if ( bEditMode && pViewData->GetRefTabNo() == nTab )
{
SCCOL nEditCol;
@@ -603,11 +603,11 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
else
bEditMode = FALSE;
- // nur Edit-Area zu zeichnen?
- //! dann muss trotzdem noch der Rand / das Gitter gemalt werden!
+ // nur Edit-Area zu zeichnen?
+ //! dann muss trotzdem noch der Rand / das Gitter gemalt werden!
-// if ( nEditCol <= nX1 && nEditEndCol >= nX2 && nEditRow <= nY1 && nEditEndRow >= nY2 )
-// bOnlyEdit = TRUE;
+// if ( nEditCol <= nX1 && nEditEndCol >= nX2 && nEditRow <= nY1 && nEditEndRow >= nY2 )
+// bOnlyEdit = TRUE;
}
// define drawing layer map mode and paint rectangle
@@ -642,11 +642,11 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
}
// not necessary with overlay
-// if (bCurVis)
-// HideCursor();
+// if (bCurVis)
+// HideCursor();
OutputDevice* pContentDev = this; // device for document content, used by overlay manager
- SdrPaintWindow* pTargetPaintWindow = 0; // #i74769# work with SdrPaintWindow directly
+ SdrPaintWindow* pTargetPaintWindow = 0; // #i74769# work with SdrPaintWindow directly
{
// init redraw
@@ -675,7 +675,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
}
}
- // Rand (Wiese) (Pixel)
+ // Rand (Wiese) (Pixel)
if ( nX2==MAXCOL || nY2==MAXROW )
{
// save MapMode and set to pixel
@@ -744,7 +744,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
aOutputData.DrawShadow();
aOutputData.DrawFrame();
if ( !bLogicText )
- aOutputData.DrawStrings(FALSE); // in pixel MapMode
+ aOutputData.DrawStrings(FALSE); // in pixel MapMode
// edit cells and printer-metrics text must be before the buttons
// (DataPilot buttons contain labels in UI font)
@@ -770,10 +770,10 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
}
aOutputData.DrawClipMarks();
- // Szenario / ChangeTracking muss auf jeden Fall nach DrawGrid sein, auch bei !bGridFirst
+ // Szenario / ChangeTracking muss auf jeden Fall nach DrawGrid sein, auch bei !bGridFirst
- //! Test, ob ChangeTrack-Anzeige aktiv ist
- //! Szenario-Rahmen per View-Optionen abschaltbar?
+ //! Test, ob ChangeTrack-Anzeige aktiv ist
+ //! Szenario-Rahmen per View-Optionen abschaltbar?
SCTAB nTabCount = pDoc->GetTableCount();
ScHighlightRanges* pHigh = pViewData->GetView()->GetHighlightRanges();
@@ -812,7 +812,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
DrawRedraw( aOutputData, eMode, SC_LAYER_INTERN );
DrawSdrGrid( aDrawingRectLogic, pContentDev );
- if (!bIsInScroll) // Drawing Markierungen
+ if (!bIsInScroll) // Drawing Markierungen
{
if(eMode == SC_UPDATE_CHANGED && aOutputData.SetChangedClip())
{
@@ -821,12 +821,12 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
//BOOL bDraw = TRUE;
//if (eMode == SC_UPDATE_CHANGED)
- // bDraw = NeedDrawMarks() && aOutputData.SetChangedClip();
+ // bDraw = NeedDrawMarks() && aOutputData.SetChangedClip();
//if (bDraw)
//{
- // DrawMarks();
- // if (eMode == SC_UPDATE_CHANGED)
- // pContentDev->SetClipRegion();
+ // DrawMarks();
+ // if (eMode == SC_UPDATE_CHANGED)
+ // pContentDev->SetClipRegion();
//}
}
@@ -841,16 +841,16 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
{
// The AutoFill shrink area has an own overlay now
#if 0
- // Schraffur beim Loeschen per AutoFill
+ // Schraffur beim Loeschen per AutoFill
if ( pViewData->GetRefType() == SC_REFTYPE_FILL )
{
ScRange aRange;
if ( pViewData->GetDelMark( aRange ) )
{
if ( aRange.aStart.Col() < nX1 ) aRange.aStart.SetCol(nX1);
- if ( aRange.aEnd.Col() > nX2 ) aRange.aEnd.SetCol(nX2);
+ if ( aRange.aEnd.Col() > nX2 ) aRange.aEnd.SetCol(nX2);
if ( aRange.aStart.Row() < nY1 ) aRange.aStart.SetRow(nY1);
- if ( aRange.aEnd.Row() > nY2 ) aRange.aEnd.SetRow(nY2);
+ if ( aRange.aEnd.Row() > nY2 ) aRange.aEnd.SetRow(nY2);
if ( aRange.aStart.Col() <= aRange.aEnd.Col() &&
aRange.aStart.Row() <= aRange.aEnd.Row() )
{
@@ -861,11 +861,11 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
aEnd.X() -= 1;
aEnd.Y() -= 1;
- // Markierung aufheben - roter Rahmen bleibt stehen
+ // Markierung aufheben - roter Rahmen bleibt stehen
Rectangle aRect( aStart,aEnd );
Invert( aRect, INVERT_HIGHLIGHT );
- //! Delete-Bereich extra kennzeichnen?!?!?
+ //! Delete-Bereich extra kennzeichnen?!?!?
}
}
}
@@ -877,7 +877,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
aRefColor, FALSE );
}
- // Range-Finder
+ // Range-Finder
ScInputHandler* pHdl = pScMod->GetInputHdl( pViewData->GetViewShell() );
if (pHdl)
@@ -924,7 +924,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
}
}
- // InPlace Edit-View
+ // InPlace Edit-View
// moved after EndDrawLayers() to get it outside the overlay buffer and
// on top of everything
if ( bEditMode && (pViewData->GetRefTabNo() == pViewData->GetTabNo()) )
@@ -939,7 +939,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
SetFillColor( pEditView->GetBackgroundColor() );
Point aStart = pViewData->GetScrPos( nCol1, nRow1, eWhich );
Point aEnd = pViewData->GetScrPos( nCol2+1, nRow2+1, eWhich );
- aEnd.X() -= 2 * nLayoutSign; // don't overwrite grid
+ aEnd.X() -= 2 * nLayoutSign; // don't overwrite grid
aEnd.Y() -= 2;
DrawRect( Rectangle( aStart,aEnd ) );
@@ -961,13 +961,13 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
SetMapMode(aDrawMode);
if ( pNoteMarker )
- pNoteMarker->Draw(); // ueber den Cursor, im Drawing-MapMode
+ pNoteMarker->Draw(); // ueber den Cursor, im Drawing-MapMode
- //DrawStartTimer(); // fuer bunte Handles ohne System-Clipping
+ //DrawStartTimer(); // fuer bunte Handles ohne System-Clipping
//
- // Wenn waehrend des Paint etwas invertiert wurde (Selektion geaendert aus Basic-Macro),
- // ist das jetzt durcheinandergekommen und es muss neu gemalt werden
+ // Wenn waehrend des Paint etwas invertiert wurde (Selektion geaendert aus Basic-Macro),
+ // ist das jetzt durcheinandergekommen und es muss neu gemalt werden
//
DBG_ASSERT(nPaintCount, "nPaintCount falsch");
@@ -978,7 +978,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
void ScGridWindow::CheckNeedsRepaint()
{
- // called at the end of painting, and from timer after background text width calculation
+ // called at the end of painting, and from timer after background text width calculation
if (bNeedsRepaint)
{
@@ -1012,7 +1012,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
String aPageText = ScGlobal::GetRscString( STR_PAGE );
if ( nPageScript == 0 )
{
- // get script type of translated "Page" string only once
+ // get script type of translated "Page" string only once
nPageScript = pDoc->GetStringScriptType( aPageText );
if (nPageScript == 0)
nPageScript = ScGlobal::GetDefaultScriptType();
@@ -1024,14 +1024,14 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
const ScPatternAttr& rDefPattern = ((const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN));
if ( nPageScript == SCRIPTTYPE_LATIN )
{
- // use single font and call DrawText directly
+ // use single font and call DrawText directly
rDefPattern.GetFont( aFont, SC_AUTOCOL_BLACK );
aFont.SetColor( Color( COL_LIGHTGRAY ) );
- // font size is set as needed
+ // font size is set as needed
}
else
{
- // use EditEngine to draw mixed-script string
+ // use EditEngine to draw mixed-script string
pEditEng = new ScEditEngineDefaulter( EditEngine::CreatePool(), TRUE );
pEditEng->SetRefMapMode( pContentDev->GetMapMode() );
SfxItemSet* pEditDefaults = new SfxItemSet( pEditEng->GetEmptyItemSet() );
@@ -1048,8 +1048,8 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
if ( aRange.aStart.Col() <= nX2+1 && aRange.aEnd.Col()+1 >= nX1 &&
aRange.aStart.Row() <= nY2+1 && aRange.aEnd.Row()+1 >= nY1 )
{
- // 3 Pixel Rahmen um den Druckbereich
- // (mittlerer Pixel auf den Gitterlinien)
+ // 3 Pixel Rahmen um den Druckbereich
+ // (mittlerer Pixel auf den Gitterlinien)
pContentDev->SetLineColor();
if (rData.IsAutomatic())
@@ -1064,9 +1064,9 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
aStart.X() -= 2;
aStart.Y() -= 2;
- // Ueberlaeufe verhindern:
- if ( aStart.X() < -10 ) aStart.X() = -10;
- if ( aStart.Y() < -10 ) aStart.Y() = -10;
+ // Ueberlaeufe verhindern:
+ if ( aStart.X() < -10 ) aStart.X() = -10;
+ if ( aStart.Y() < -10 ) aStart.Y() = -10;
if ( aEnd.X() > aWinSize.Width() + 10 )
aEnd.X() = aWinSize.Width() + 10;
if ( aEnd.Y() > aWinSize.Height() + 10 )
@@ -1077,8 +1077,8 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
pContentDev->DrawRect( Rectangle( Point(aStart.X(),aEnd.Y()-2), aEnd ) );
pContentDev->DrawRect( Rectangle( Point(aEnd.X()-2,aStart.Y()), aEnd ) );
- // Seitenumbrueche
- //! anders darstellen (gestrichelt ????)
+ // Seitenumbrueche
+ //! anders darstellen (gestrichelt ????)
size_t nColBreaks = rData.GetPagesX();
const SCCOL* pColEnd = rData.GetPageEndX();
@@ -1118,7 +1118,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
}
}
- // Seitenzahlen
+ // Seitenzahlen
SCROW nPrStartY = aRange.aStart.Row();
for (nRowPos=0; nRowPos<nRowBreaks; nRowPos++)
@@ -1147,7 +1147,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
if ( pEditEng )
{
- // find right font size with EditEngine
+ // find right font size with EditEngine
long nHeight = 100;
pEditEng->SetDefaultItem( SvxFontHeightItem( nHeight, 100, EE_CHAR_FONTHEIGHT ) );
pEditEng->SetDefaultItem( SvxFontHeightItem( nHeight, 100, EE_CHAR_FONTHEIGHT_CJK ) );
@@ -1155,7 +1155,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
pEditEng->SetText( aPageStr );
Size aSize100( pEditEng->CalcTextWidth(), pEditEng->GetTextHeight() );
- // 40% of width or 60% of height
+ // 40% of width or 60% of height
long nSizeX = 40 * ( aPageEnd.X() - aPageStart.X() ) / aSize100.Width();
long nSizeY = 60 * ( aPageEnd.Y() - aPageStart.Y() ) / aSize100.Height();
nHeight = Min(nSizeX,nSizeY);
@@ -1163,7 +1163,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
pEditEng->SetDefaultItem( SvxFontHeightItem( nHeight, 100, EE_CHAR_FONTHEIGHT_CJK ) );
pEditEng->SetDefaultItem( SvxFontHeightItem( nHeight, 100, EE_CHAR_FONTHEIGHT_CTL ) );
- // centered output with EditEngine
+ // centered output with EditEngine
Size aTextSize( pEditEng->CalcTextWidth(), pEditEng->GetTextHeight() );
Point aPos( (aPageStart.X()+aPageEnd.X()-aTextSize.Width())/2,
(aPageStart.Y()+aPageEnd.Y()-aTextSize.Height())/2 );
@@ -1171,18 +1171,18 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
}
else
{
- // find right font size for DrawText
+ // find right font size for DrawText
aFont.SetSize( Size( 0,100 ) );
pContentDev->SetFont( aFont );
Size aSize100( pContentDev->GetTextWidth( aPageStr ), pContentDev->GetTextHeight() );
- // 40% of width or 60% of height
+ // 40% of width or 60% of height
long nSizeX = 40 * ( aPageEnd.X() - aPageStart.X() ) / aSize100.Width();
long nSizeY = 60 * ( aPageEnd.Y() - aPageStart.Y() ) / aSize100.Height();
aFont.SetSize( Size( 0,Min(nSizeX,nSizeY) ) );
pContentDev->SetFont( aFont );
- // centered output with DrawText
+ // centered output with DrawText
Size aTextSize( pContentDev->GetTextWidth( aPageStr ), pContentDev->GetTextHeight() );
Point aPos( (aPageStart.X()+aPageEnd.X()-aTextSize.Width())/2,
(aPageStart.Y()+aPageEnd.Y()-aTextSize.Height())/2 );
@@ -1212,16 +1212,16 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2
SCROW nRow;
SCSIZE nArrY;
SCSIZE nQuery;
- SCTAB nTab = pViewData->GetTabNo();
- ScDBData* pDBData = NULL;
- ScQueryParam* pQueryParam = NULL;
+ SCTAB nTab = pViewData->GetTabNo();
+ ScDBData* pDBData = NULL;
+ ScQueryParam* pQueryParam = NULL;
RowInfo* pRowInfo = rTabInfo.mpRowInfo;
USHORT nArrCount = rTabInfo.mnArrCount;
BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
- Point aOldPos = aComboButton.GetPosPixel(); // Zustand fuer MouseDown/Up
+ Point aOldPos = aComboButton.GetPosPixel(); // Zustand fuer MouseDown/Up
Size aOldSize = aComboButton.GetSizePixel(); // merken
for (nArrY=1; nArrY+1<nArrCount; nArrY++)
@@ -1266,7 +1266,7 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2
}
}
- // pQueryParam kann nur MAXQUERY Eintraege enthalten
+ // pQueryParam kann nur MAXQUERY Eintraege enthalten
BOOL bSimpleQuery = TRUE;
BOOL bColumnFound = FALSE;
@@ -1275,8 +1275,8 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2
for (nQuery=0; nQuery<MAXQUERY && bSimpleQuery; nQuery++)
if (pQueryParam->GetEntry(nQuery).bDoQuery)
{
- // hier nicht auf EQUAL beschraenken
- // (auch bei ">1" soll der Spaltenkopf blau werden)
+ // hier nicht auf EQUAL beschraenken
+ // (auch bei ">1" soll der Spaltenkopf blau werden)
if (pQueryParam->GetEntry(nQuery).nField == nCol)
bColumnFound = TRUE;
@@ -1286,8 +1286,8 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2
}
bool bArrowState = bSimpleQuery && bColumnFound;
- long nSizeX;
- long nSizeY;
+ long nSizeX;
+ long nSizeY;
pViewData->GetMergeSizePixel( nCol, nRow, nSizeX, nSizeY );
Point aScrPos = pViewData->GetScrPos( nCol, nRow, eWhich );
@@ -1403,9 +1403,9 @@ Rectangle ScGridWindow::GetListValButtonRect( const ScAddress& rButtonPos )
BOOL ScGridWindow::IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab )
{
- ScDocument* pDoc = pViewData->GetDocument();
- ScDBData* pDBData = pDoc->GetDBAtCursor( nCol, nRow, nTab );
- ScQueryParam aQueryParam;
+ ScDocument* pDoc = pViewData->GetDocument();
+ ScDBData* pDBData = pDoc->GetDBAtCursor( nCol, nRow, nTab );
+ ScQueryParam aQueryParam;
if ( pDBData )
pDBData->GetQueryParam( aQueryParam );
@@ -1414,14 +1414,14 @@ BOOL ScGridWindow::IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab )
DBG_ERROR("Auto-Filter-Button ohne DBData");
}
- BOOL bSimpleQuery = TRUE;
- BOOL bColumnFound = FALSE;
- SCSIZE nQuery;
+ BOOL bSimpleQuery = TRUE;
+ BOOL bColumnFound = FALSE;
+ SCSIZE nQuery;
if ( !aQueryParam.bInplace )
bSimpleQuery = FALSE;
- // aQueryParam kann nur MAXQUERY Eintraege enthalten
+ // aQueryParam kann nur MAXQUERY Eintraege enthalten
for ( nQuery=0; nQuery<MAXQUERY && bSimpleQuery; nQuery++ )
if ( aQueryParam.GetEntry(nQuery).bDoQuery )
@@ -1437,14 +1437,14 @@ BOOL ScGridWindow::IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab )
return ( bSimpleQuery && bColumnFound );
}
-void ScGridWindow::DrawComboButton( const Point& rCellPos,
- long nCellSizeX,
- long nCellSizeY,
+void ScGridWindow::DrawComboButton( const Point& rCellPos,
+ long nCellSizeX,
+ long nCellSizeY,
BOOL bArrowState,
- BOOL bBtnIn )
+ BOOL bBtnIn )
{
- Point aScrPos = rCellPos;
- Size aBtnSize = aComboButton.GetSizePixel();
+ Point aScrPos = rCellPos;
+ Size aBtnSize = aComboButton.GetSizePixel();
if ( nCellSizeX < aBtnSize.Width() || nCellSizeY < aBtnSize.Height() )
{
@@ -1475,9 +1475,9 @@ void ScGridWindow::DrawComboButton( const Point& rCellPos,
void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
BOOL bTestMerge, BOOL bRepeat )
{
- //! if INVERT_HIGHLIGHT swaps foreground and background (like on Mac),
- //! use INVERT_HIGHLIGHT only for cells that have no background color set
- //! (here and in ScOutputData::DrawMark)
+ //! if INVERT_HIGHLIGHT swaps foreground and background (like on Mac),
+ //! use INVERT_HIGHLIGHT only for cells that have no background color set
+ //! (here and in ScOutputData::DrawMark)
PutInOrder( nX1, nX2 );
PutInOrder( nY1, nY2 );
@@ -1497,7 +1497,7 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
SCCOL nPosX = pViewData->GetPosX( eHWhich );
SCROW nPosY = pViewData->GetPosY( eVWhich );
if (nTestX2 < nPosX || nTestY2 < nPosY)
- return; // unsichtbar
+ return; // unsichtbar
SCCOL nRealX1 = nX1;
if (nX1 < nPosX)
nX1 = nPosX;
@@ -1510,11 +1510,11 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
if (nYBottom > MAXROW) nYBottom = MAXROW;
if (nX1 > nXRight || nY1 > nYBottom)
- return; // unsichtbar
+ return; // unsichtbar
if (nX2 > nXRight) nX2 = nXRight;
if (nY2 > nYBottom) nY2 = nYBottom;
- MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); // erst nach den return's !!!
+ MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); // erst nach den return's !!!
double nPPTX = pViewData->GetPPTX();
double nPPTY = pViewData->GetPPTY();
@@ -1526,16 +1526,16 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
BOOL bWasHidden = FALSE;
for (SCROW nY=nY1; nY<=nY2; nY++)
{
- BOOL bFirstRow = ( nY == nPosY ); // first visible row?
- BOOL bDoHidden = FALSE; // versteckte nachholen ?
+ BOOL bFirstRow = ( nY == nPosY ); // first visible row?
+ BOOL bDoHidden = FALSE; // versteckte nachholen ?
USHORT nHeightTwips = pDoc->GetRowHeight( nY,nTab );
BOOL bDoRow = ( nHeightTwips != 0 );
if (bDoRow)
{
if (bTestMerge)
- if (bWasHidden) // auf versteckte zusammengefasste testen
+ if (bWasHidden) // auf versteckte zusammengefasste testen
{
-// --nY; // nY geaendert -> vorherige zeichnen
+// --nY; // nY geaendert -> vorherige zeichnen
bDoHidden = TRUE;
bDoRow = TRUE;
}
@@ -1547,13 +1547,13 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
bWasHidden = TRUE;
if (bTestMerge)
if (nY==nY2)
- bDoRow = TRUE; // letzte Zeile aus Block
+ bDoRow = TRUE; // letzte Zeile aus Block
}
if ( bDoRow )
{
SCCOL nLoopEndX = nX2;
- if (nX2 < nX1) // Rest von zusammengefasst
+ if (nX2 < nX1) // Rest von zusammengefasst
{
SCCOL nStartX = nX1;
while ( ((const ScMergeFlagAttr*)pDoc->
@@ -1623,7 +1623,7 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
}
}
}
- else // !bTestMerge
+ else // !bTestMerge
{
if ( rMark.IsCellMarked( nX, nY, TRUE ) == bRepeat &&
nEndX * nLayoutSign >= nScrX * nLayoutSign && nEndY >= nScrY )
@@ -1639,7 +1639,7 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
}
}
- aInvert.Flush(); // before restoring MapMode
+ aInvert.Flush(); // before restoring MapMode
SetMapMode(aOld);
@@ -1685,7 +1685,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
SCCOL nPosX = pViewData->GetPosX( eHWhich );
SCROW nPosY = pViewData->GetPosY( eVWhich );
if (nTestX2 < nPosX || nTestY2 < nPosY)
- return; // unsichtbar
+ return; // unsichtbar
SCCOL nRealX1 = nX1;
if (nX1 < nPosX)
nX1 = nPosX;
@@ -1698,11 +1698,11 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
if (nYBottom > MAXROW) nYBottom = MAXROW;
if (nX1 > nXRight || nY1 > nYBottom)
- return; // unsichtbar
+ return; // unsichtbar
if (nX2 > nXRight) nX2 = nXRight;
if (nY2 > nYBottom) nY2 = nYBottom;
-// MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); // erst nach den return's !!!
+// MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); // erst nach den return's !!!
double nPPTX = pViewData->GetPPTX();
double nPPTY = pViewData->GetPPTY();
@@ -1714,14 +1714,14 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
BOOL bWasHidden = FALSE;
for (SCROW nY=nY1; nY<=nY2; nY++)
{
- BOOL bFirstRow = ( nY == nPosY ); // first visible row?
- BOOL bDoHidden = FALSE; // versteckte nachholen ?
+ BOOL bFirstRow = ( nY == nPosY ); // first visible row?
+ BOOL bDoHidden = FALSE; // versteckte nachholen ?
USHORT nHeightTwips = pDoc->GetRowHeight( nY,nTab );
BOOL bDoRow = ( nHeightTwips != 0 );
if (bDoRow)
{
if (bTestMerge)
- if (bWasHidden) // auf versteckte zusammengefasste testen
+ if (bWasHidden) // auf versteckte zusammengefasste testen
{
bDoHidden = TRUE;
bDoRow = TRUE;
@@ -1734,13 +1734,13 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
bWasHidden = TRUE;
if (bTestMerge)
if (nY==nY2)
- bDoRow = TRUE; // letzte Zeile aus Block
+ bDoRow = TRUE; // letzte Zeile aus Block
}
if ( bDoRow )
{
SCCOL nLoopEndX = nX2;
- if (nX2 < nX1) // Rest von zusammengefasst
+ if (nX2 < nX1) // Rest von zusammengefasst
{
SCCOL nStartX = nX1;
while ( ((const ScMergeFlagAttr*)pDoc->
@@ -1810,7 +1810,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
}
}
}
- else // !bTestMerge
+ else // !bTestMerge
{
if ( aMultiMark.IsCellMarked( nX, nY, TRUE ) == bRepeat &&
nEndX * nLayoutSign >= nScrX * nLayoutSign && nEndY >= nScrY )
@@ -1826,7 +1826,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
}
}
-// aInvert.Flush(); // before restoring MapMode
+// aInvert.Flush(); // before restoring MapMode
}
// -------------------------------------------------------------------------
@@ -1835,32 +1835,32 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
//UNUSED2008-05 {
//UNUSED2008-05 if ( nX2 < pViewData->GetPosX(eHWhich) || nY2 < pViewData->GetPosY(eVWhich) )
//UNUSED2008-05 return;
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 Update(); // wegen XOR
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL);
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 SCTAB nTab = pViewData->GetTabNo();
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 SCCOL nPosX = pViewData->GetPosX(WhichH(eWhich));
//UNUSED2008-05 SCROW nPosY = pViewData->GetPosY(WhichV(eWhich));
//UNUSED2008-05 if (nX1 < nPosX) nX1 = nPosX;
//UNUSED2008-05 if (nX2 < nPosX) nX2 = nPosX;
//UNUSED2008-05 if (nY1 < nPosY) nY1 = nPosY;
//UNUSED2008-05 if (nY2 < nPosY) nY2 = nPosY;
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 Point aScrPos( pViewData->GetScrPos( nX1, nY1, eWhich ) );
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 long nSizeXPix=0;
//UNUSED2008-05 long nSizeYPix=0;
//UNUSED2008-05 ScDocument* pDoc = pViewData->GetDocument();
//UNUSED2008-05 double nPPTX = pViewData->GetPPTX();
//UNUSED2008-05 double nPPTY = pViewData->GetPPTY();
//UNUSED2008-05 SCCOLROW i;
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
//UNUSED2008-05 long nLayoutSign = bLayoutRTL ? -1 : 1;
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 if (ValidCol(nX2) && nX2>=nX1)
//UNUSED2008-05 for (i=nX1; i<=nX2; i++)
//UNUSED2008-05 nSizeXPix += ScViewData::ToPixel( pDoc->GetColWidth( static_cast<SCCOL>(i), nTab ), nPPTX );
@@ -1869,7 +1869,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
//UNUSED2008-05 aScrPos.X() -= nLayoutSign;
//UNUSED2008-05 nSizeXPix += 2;
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 if (ValidRow(nY2) && nY2>=nY1)
//UNUSED2008-05 for (i=nY1; i<=nY2; i++)
//UNUSED2008-05 nSizeYPix += ScViewData::ToPixel( pDoc->GetRowHeight( i, nTab ), nPPTY );
@@ -1878,10 +1878,10 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
//UNUSED2008-05 aScrPos.Y() -= 1;
//UNUSED2008-05 nSizeYPix += 2;
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 aScrPos.X() -= 2 * nLayoutSign;
//UNUSED2008-05 aScrPos.Y() -= 2;
-//UNUSED2008-05 // Rectangle aRect( aScrPos, Size( nSizeXPix + 3, nSizeYPix + 3 ) );
+//UNUSED2008-05 // Rectangle aRect( aScrPos, Size( nSizeXPix + 3, nSizeYPix + 3 ) );
//UNUSED2008-05 Rectangle aRect( aScrPos.X(), aScrPos.Y(),
//UNUSED2008-05 aScrPos.X() + ( nSizeXPix + 2 ) * nLayoutSign, aScrPos.Y() + nSizeYPix + 2 );
//UNUSED2008-05 if ( bLayoutRTL )
@@ -1889,12 +1889,12 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
//UNUSED2008-05 aRect.Left() = aRect.Right(); // end position is left
//UNUSED2008-05 aRect.Right() = aScrPos.X();
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 Invert(Rectangle( aRect.Left(), aRect.Top(), aRect.Left()+2, aRect.Bottom() ));
//UNUSED2008-05 Invert(Rectangle( aRect.Right()-2, aRect.Top(), aRect.Right(), aRect.Bottom() ));
//UNUSED2008-05 Invert(Rectangle( aRect.Left()+3, aRect.Top(), aRect.Right()-3, aRect.Top()+2 ));
//UNUSED2008-05 Invert(Rectangle( aRect.Left()+3, aRect.Bottom()-2, aRect.Right()-3, aRect.Bottom() ));
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 SetMapMode(aOld);
//UNUSED2008-05 }
@@ -1903,122 +1903,122 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
void ScGridWindow::DrawCursor()
{
// #114409#
-// SCTAB nTab = pViewData->GetTabNo();
-// SCCOL nX = pViewData->GetCurX();
-// SCROW nY = pViewData->GetCurY();
+// SCTAB nTab = pViewData->GetTabNo();
+// SCCOL nX = pViewData->GetCurX();
+// SCROW nY = pViewData->GetCurY();
//
-// // in verdeckten Zellen nicht zeichnen
+// // in verdeckten Zellen nicht zeichnen
//
-// ScDocument* pDoc = pViewData->GetDocument();
-// const ScPatternAttr* pPattern = pDoc->GetPattern(nX,nY,nTab);
-// const ScMergeFlagAttr& rMerge = (const ScMergeFlagAttr&) pPattern->GetItem(ATTR_MERGE_FLAG);
-// if (rMerge.IsOverlapped())
-// return;
+// ScDocument* pDoc = pViewData->GetDocument();
+// const ScPatternAttr* pPattern = pDoc->GetPattern(nX,nY,nTab);
+// const ScMergeFlagAttr& rMerge = (const ScMergeFlagAttr&) pPattern->GetItem(ATTR_MERGE_FLAG);
+// if (rMerge.IsOverlapped())
+// return;
//
-// // links/oben ausserhalb des Bildschirms ?
+// // links/oben ausserhalb des Bildschirms ?
//
-// BOOL bVis = ( nX>=pViewData->GetPosX(eHWhich) && nY>=pViewData->GetPosY(eVWhich) );
-// if (!bVis)
-// {
-// SCCOL nEndX = nX;
-// SCROW nEndY = nY;
-// ScDocument* pDoc = pViewData->GetDocument();
-// const ScMergeAttr& rMerge = (const ScMergeAttr&) pPattern->GetItem(ATTR_MERGE);
-// if (rMerge.GetColMerge() > 1)
-// nEndX += rMerge.GetColMerge()-1;
-// if (rMerge.GetRowMerge() > 1)
-// nEndY += rMerge.GetRowMerge()-1;
-// bVis = ( nEndX>=pViewData->GetPosX(eHWhich) && nEndY>=pViewData->GetPosY(eVWhich) );
-// }
+// BOOL bVis = ( nX>=pViewData->GetPosX(eHWhich) && nY>=pViewData->GetPosY(eVWhich) );
+// if (!bVis)
+// {
+// SCCOL nEndX = nX;
+// SCROW nEndY = nY;
+// ScDocument* pDoc = pViewData->GetDocument();
+// const ScMergeAttr& rMerge = (const ScMergeAttr&) pPattern->GetItem(ATTR_MERGE);
+// if (rMerge.GetColMerge() > 1)
+// nEndX += rMerge.GetColMerge()-1;
+// if (rMerge.GetRowMerge() > 1)
+// nEndY += rMerge.GetRowMerge()-1;
+// bVis = ( nEndX>=pViewData->GetPosX(eHWhich) && nEndY>=pViewData->GetPosY(eVWhich) );
+// }
//
-// if ( bVis )
-// {
-// // hier kein Update, da aus Paint gerufen und laut Zaehler Cursor schon da
-// // wenn Update noetig, dann bei Hide/Showcursor vor dem Hoch-/Runterzaehlen
+// if ( bVis )
+// {
+// // hier kein Update, da aus Paint gerufen und laut Zaehler Cursor schon da
+// // wenn Update noetig, dann bei Hide/Showcursor vor dem Hoch-/Runterzaehlen
//
-// MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL);
+// MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL);
//
-// Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE );
-// BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+// Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE );
+// BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
//
-// // completely right of/below the screen?
-// // (test with logical start position in aScrPos)
-// BOOL bMaybeVisible;
-// if ( bLayoutRTL )
-// bMaybeVisible = ( aScrPos.X() >= -2 && aScrPos.Y() >= -2 );
-// else
-// {
-// Size aOutSize = GetOutputSizePixel();
-// bMaybeVisible = ( aScrPos.X() <= aOutSize.Width() + 2 && aScrPos.Y() <= aOutSize.Height() + 2 );
-// }
-// if ( bMaybeVisible )
-// {
-// long nSizeXPix;
-// long nSizeYPix;
-// pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix );
+// // completely right of/below the screen?
+// // (test with logical start position in aScrPos)
+// BOOL bMaybeVisible;
+// if ( bLayoutRTL )
+// bMaybeVisible = ( aScrPos.X() >= -2 && aScrPos.Y() >= -2 );
+// else
+// {
+// Size aOutSize = GetOutputSizePixel();
+// bMaybeVisible = ( aScrPos.X() <= aOutSize.Width() + 2 && aScrPos.Y() <= aOutSize.Height() + 2 );
+// }
+// if ( bMaybeVisible )
+// {
+// long nSizeXPix;
+// long nSizeYPix;
+// pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix );
//
-// if ( bLayoutRTL )
-// aScrPos.X() -= nSizeXPix - 2; // move instead of mirroring
+// if ( bLayoutRTL )
+// aScrPos.X() -= nSizeXPix - 2; // move instead of mirroring
//
-// BOOL bFix = ( pViewData->GetHSplitMode() == SC_SPLIT_FIX ||
-// pViewData->GetVSplitMode() == SC_SPLIT_FIX );
-// if ( pViewData->GetActivePart()==eWhich || bFix )
-// {
-// // old UNX version with two Invert calls causes flicker.
-// // if optimization is needed, a new flag should be added
-// // to InvertTracking
+// BOOL bFix = ( pViewData->GetHSplitMode() == SC_SPLIT_FIX ||
+// pViewData->GetVSplitMode() == SC_SPLIT_FIX );
+// if ( pViewData->GetActivePart()==eWhich || bFix )
+// {
+// // old UNX version with two Invert calls causes flicker.
+// // if optimization is needed, a new flag should be added
+// // to InvertTracking
//
-// aScrPos.X() -= 2;
-// aScrPos.Y() -= 2;
-// Rectangle aRect( aScrPos, Size( nSizeXPix + 3, nSizeYPix + 3 ) );
+// aScrPos.X() -= 2;
+// aScrPos.Y() -= 2;
+// Rectangle aRect( aScrPos, Size( nSizeXPix + 3, nSizeYPix + 3 ) );
//
-// Invert(Rectangle( aRect.Left(), aRect.Top(), aRect.Left()+2, aRect.Bottom() ));
-// Invert(Rectangle( aRect.Right()-2, aRect.Top(), aRect.Right(), aRect.Bottom() ));
-// Invert(Rectangle( aRect.Left()+3, aRect.Top(), aRect.Right()-3, aRect.Top()+2 ));
-// Invert(Rectangle( aRect.Left()+3, aRect.Bottom()-2, aRect.Right()-3, aRect.Bottom() ));
-// }
-// else
-// {
-// Rectangle aRect( aScrPos, Size( nSizeXPix - 1, nSizeYPix - 1 ) );
-// Invert( aRect );
-// }
-// }
+// Invert(Rectangle( aRect.Left(), aRect.Top(), aRect.Left()+2, aRect.Bottom() ));
+// Invert(Rectangle( aRect.Right()-2, aRect.Top(), aRect.Right(), aRect.Bottom() ));
+// Invert(Rectangle( aRect.Left()+3, aRect.Top(), aRect.Right()-3, aRect.Top()+2 ));
+// Invert(Rectangle( aRect.Left()+3, aRect.Bottom()-2, aRect.Right()-3, aRect.Bottom() ));
+// }
+// else
+// {
+// Rectangle aRect( aScrPos, Size( nSizeXPix - 1, nSizeYPix - 1 ) );
+// Invert( aRect );
+// }
+// }
//
-// SetMapMode(aOld);
-// }
+// SetMapMode(aOld);
+// }
}
- // AutoFill-Anfasser:
+ // AutoFill-Anfasser:
void ScGridWindow::DrawAutoFillMark()
{
// #114409#
-// if ( bAutoMarkVisible && aAutoMarkPos.Tab() == pViewData->GetTabNo() )
-// {
-// SCCOL nX = aAutoMarkPos.Col();
-// SCROW nY = aAutoMarkPos.Row();
-// SCTAB nTab = pViewData->GetTabNo();
-// ScDocument* pDoc = pViewData->GetDocument();
-// BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
+// if ( bAutoMarkVisible && aAutoMarkPos.Tab() == pViewData->GetTabNo() )
+// {
+// SCCOL nX = aAutoMarkPos.Col();
+// SCROW nY = aAutoMarkPos.Row();
+// SCTAB nTab = pViewData->GetTabNo();
+// ScDocument* pDoc = pViewData->GetDocument();
+// BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
//
-// Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE );
-// long nSizeXPix;
-// long nSizeYPix;
-// pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix );
-// if ( bLayoutRTL )
-// aFillPos.X() -= nSizeXPix + 3;
-// else
-// aFillPos.X() += nSizeXPix - 2;
+// Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE );
+// long nSizeXPix;
+// long nSizeYPix;
+// pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix );
+// if ( bLayoutRTL )
+// aFillPos.X() -= nSizeXPix + 3;
+// else
+// aFillPos.X() += nSizeXPix - 2;
//
-// aFillPos.Y() += nSizeYPix;
-// aFillPos.Y() -= 2;
-// Rectangle aFillRect( aFillPos, Size(6,6) );
-// // Anfasser von Zeichenobjekten sind 7*7
+// aFillPos.Y() += nSizeYPix;
+// aFillPos.Y() -= 2;
+// Rectangle aFillRect( aFillPos, Size(6,6) );
+// // Anfasser von Zeichenobjekten sind 7*7
//
-// MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL);
-// Invert( aFillRect );
-// SetMapMode(aOld);
-// }
+// MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL);
+// Invert( aFillRect );
+// SetMapMode(aOld);
+// }
}
// -------------------------------------------------------------------------
@@ -2040,20 +2040,20 @@ void ScGridWindow::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
(rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
- if ( eWhich == pViewData->GetActivePart() ) // only once for the view
+ if ( eWhich == pViewData->GetActivePart() ) // only once for the view
{
ScTabView* pView = pViewData->GetView();
- // update scale in case the UI ScreenZoom has changed
+ // update scale in case the UI ScreenZoom has changed
ScGlobal::UpdatePPT(this);
pView->RecalcPPT();
- // RepeatResize in case scroll bar sizes have changed
+ // RepeatResize in case scroll bar sizes have changed
pView->RepeatResize();
pView->UpdateAllOverlays();
- // invalidate cell attribs in input handler, in case the
- // EditEngine BackgroundColor has to be changed
+ // invalidate cell attribs in input handler, in case the
+ // EditEngine BackgroundColor has to be changed
if ( pViewData->IsActive() )
{
ScInputHandler* pHdl = SC_MOD()->GetInputHdl();
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index 4a9dbbaf98b6..821d5da30a4c 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ ScHideTextCursor::~ScHideTextCursor()
Window* pWin = pViewData->GetView()->GetWindowByPos( eWhich );
if (pWin)
{
- // restore text cursor
+ // restore text cursor
if ( pViewData->HasEditView(eWhich) && pWin->HasFocus() )
pViewData->GetEditView(eWhich)->ShowCursor( FALSE, TRUE );
}
@@ -96,13 +96,13 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard )
BOOL bDone = FALSE;
ScDocument* pDoc = pViewData->GetDocument();
- SCTAB nTab = pViewData->GetTabNo();
- ScAddress aCellPos( nPosX, nPosY, nTab );
+ SCTAB nTab = pViewData->GetTabNo();
+ ScAddress aCellPos( nPosX, nPosY, nTab );
String aTrackText;
BOOL bLeftEdge = FALSE;
- // Change-Tracking
+ // Change-Tracking
ScChangeTrack* pTrack = pDoc->GetChangeTrack();
ScChangeViewSettings* pSettings = pDoc->GetChangeViewSettings();
@@ -131,7 +131,7 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard )
if ( aRange.In( aCellPos ) )
{
- pFound = pAction; // der letzte gewinnt
+ pFound = pAction; // der letzte gewinnt
switch ( eType )
{
case SC_CAT_CONTENT :
@@ -166,13 +166,13 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard )
if ( pFound )
{
if ( pFoundContent && pFound->GetType() != SC_CAT_CONTENT )
- pFound = pFoundContent; // Content gewinnt
+ pFound = pFoundContent; // Content gewinnt
if ( pFoundMove && pFound->GetType() != SC_CAT_MOVE &&
pFoundMove->GetActionNumber() >
pFound->GetActionNumber() )
- pFound = pFoundMove; // Move gewinnt
+ pFound = pFoundMove; // Move gewinnt
- // bei geloeschten Spalten: Pfeil auf die linke Seite der Zelle
+ // bei geloeschten Spalten: Pfeil auf die linke Seite der Zelle
if ( pFound->GetType() == SC_CAT_DELETE_COLS )
bLeftEdge = TRUE;
@@ -197,27 +197,27 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard )
}
}
- // Notiz nur, wenn sie nicht schon auf dem Drawing-Layer angezeigt wird:
+ // Notiz nur, wenn sie nicht schon auf dem Drawing-Layer angezeigt wird:
const ScPostIt* pNote = pDoc->GetNote( aCellPos );
if ( (aTrackText.Len() > 0) || (pNote && !pNote->IsCaptionShown()) )
{
BOOL bNew = TRUE;
BOOL bFast = FALSE;
- if ( pNoteMarker ) // schon eine Notiz angezeigt
+ if ( pNoteMarker ) // schon eine Notiz angezeigt
{
- if ( pNoteMarker->GetDocPos() == aCellPos ) // dieselbe
- bNew = FALSE; // dann stehenlassen
+ if ( pNoteMarker->GetDocPos() == aCellPos ) // dieselbe
+ bNew = FALSE; // dann stehenlassen
else
- bFast = TRUE; // sonst sofort
+ bFast = TRUE; // sonst sofort
- // marker which was shown for ctrl-F1 isn't removed by mouse events
+ // marker which was shown for ctrl-F1 isn't removed by mouse events
if ( pNoteMarker->IsByKeyboard() && !bKeyboard )
bNew = FALSE;
}
if ( bNew )
{
if ( bKeyboard )
- bFast = TRUE; // keyboard also shows the marker immediately
+ bFast = TRUE; // keyboard also shows the marker immediately
delete pNoteMarker;
@@ -246,7 +246,7 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard )
aMapMode, bLeftEdge, bFast, bKeyboard );
}
- bDone = TRUE; // something is shown (old or new)
+ bDone = TRUE; // something is shown (old or new)
}
return bDone;
@@ -264,18 +264,18 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
if (pDrView)
bDrawTextEdit = pDrView->IsTextEdit();
- // notes or change tracking
+ // notes or change tracking
if ( bHelpEnabled && !bDrawTextEdit )
{
- Point aPosPixel = ScreenToOutputPixel( rHEvt.GetMousePosPixel() );
+ Point aPosPixel = ScreenToOutputPixel( rHEvt.GetMousePosPixel() );
SCsCOL nPosX;
SCsROW nPosY;
pViewData->GetPosFromPixel( aPosPixel.X(), aPosPixel.Y(), eWhich, nPosX, nPosY );
if ( ShowNoteMarker( nPosX, nPosY, FALSE ) )
{
- Window::RequestHelp( rHEvt ); // alte Tip/Balloon ausschalten
+ Window::RequestHelp( rHEvt ); // alte Tip/Balloon ausschalten
bDone = TRUE;
}
}
@@ -284,21 +284,21 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
{
if ( pNoteMarker->IsByKeyboard() )
{
- // marker which was shown for ctrl-F1 isn't removed by mouse events
+ // marker which was shown for ctrl-F1 isn't removed by mouse events
}
else
DELETEZ(pNoteMarker);
}
- // Image-Map / Text-URL
+ // Image-Map / Text-URL
- if ( bHelpEnabled && !bDone && !nButtonDown ) // nur ohne gedrueckten Button
+ if ( bHelpEnabled && !bDone && !nButtonDown ) // nur ohne gedrueckten Button
{
String aHelpText;
Rectangle aPixRect;
Point aPosPixel = ScreenToOutputPixel( rHEvt.GetMousePosPixel() );
- if ( pDrView ) // URL / Image-Map
+ if ( pDrView ) // URL / Image-Map
{
SdrViewEvent aVEvt;
MouseEvent aMEvt( aPosPixel, 1, 0, MOUSE_LEFT );
@@ -315,7 +315,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
if ( pIMapObj )
{
- // #44990# Bei ImageMaps die Description anzeigen, wenn vorhanden
+ // #44990# Bei ImageMaps die Description anzeigen, wenn vorhanden
aHelpText = pIMapObj->GetAltText();
if (!aHelpText.Len())
aHelpText = pIMapObj->GetURL();
@@ -357,7 +357,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
}
}
- if ( !aHelpText.Len() ) // Text-URL
+ if ( !aHelpText.Len() ) // Text-URL
{
String aUrl;
if ( GetEditUrl( aPosPixel, NULL, &aUrl, NULL ) )
@@ -368,11 +368,11 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
ScDocument* pDoc = pViewData->GetDocument();
SCsCOL nPosX;
SCsROW nPosY;
- SCTAB nTab = pViewData->GetTabNo();
+ SCTAB nTab = pViewData->GetTabNo();
pViewData->GetPosFromPixel( aPosPixel.X(), aPosPixel.Y(), eWhich, nPosX, nPosY );
const ScPatternAttr* pPattern = pDoc->GetPattern( nPosX, nPosY, nTab );
- ScHideTextCursor aHideCursor( pViewData, eWhich ); // MapMode is changed in GetEditArea
+ ScHideTextCursor aHideCursor( pViewData, eWhich ); // MapMode is changed in GetEditArea
// bForceToTop = FALSE, use the cell's real position
aPixRect = pViewData->GetEditArea( eWhich, nPosX, nPosY, this, pPattern, FALSE );
@@ -393,7 +393,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
}
}
- // Basic-Controls
+ // Basic-Controls
if ( pDrView && bHelpEnabled && !bDone )
{
@@ -403,7 +403,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
bDone = ((ScDrawPage*)pPV->GetPage())->RequestHelp( this, pDrView, rHEvt );
}
- // Wenn QuickHelp fuer AutoFill angezeigt wird, nicht wieder wegnehmen lassen
+ // Wenn QuickHelp fuer AutoFill angezeigt wird, nicht wieder wegnehmen lassen
if ( nMouseStatus == SC_GM_TABDOWN && pViewData->GetRefType() == SC_REFTYPE_FILL &&
Help::IsQuickHelpEnabled() )
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 25f3c1c8f10a..ce69872d52bb 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,42 +41,42 @@
#include "sc.hrc"
#include "tabvwsh.hxx"
#include "hdrcont.hxx"
-#include "scmod.hxx" // Optionen
-#include "inputopt.hxx" // Optionen
+#include "scmod.hxx" // Optionen
+#include "inputopt.hxx" // Optionen
#include "gridmerg.hxx"
#include "document.hxx"
// -----------------------------------------------------------------------
-#define SC_DRAG_MIN 2
+#define SC_DRAG_MIN 2
-// passes in paint
-// (selection left/right must be first because the continuous lines
-// are partly overwritten later)
+// passes in paint
+// (selection left/right must be first because the continuous lines
+// are partly overwritten later)
-#define SC_HDRPAINT_SEL_RIGHT 0
-#define SC_HDRPAINT_SEL_LEFT 1
-#define SC_HDRPAINT_TOP 2
-#define SC_HDRPAINT_SEL_TOP 3
-#define SC_HDRPAINT_SEL_BOTTOM 4
-#define SC_HDRPAINT_BOTTOM 5
-#define SC_HDRPAINT_TEXT 6
-#define SC_HDRPAINT_COUNT 7
+#define SC_HDRPAINT_SEL_RIGHT 0
+#define SC_HDRPAINT_SEL_LEFT 1
+#define SC_HDRPAINT_TOP 2
+#define SC_HDRPAINT_SEL_TOP 3
+#define SC_HDRPAINT_SEL_BOTTOM 4
+#define SC_HDRPAINT_BOTTOM 5
+#define SC_HDRPAINT_TEXT 6
+#define SC_HDRPAINT_COUNT 7
//==================================================================
ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEngine,
SCCOLROW nNewSize, USHORT nNewFlags ) :
- Window ( pParent ),
- pSelEngine ( pSelectionEngine ),
- nFlags ( nNewFlags ),
- bVertical ( (nNewFlags & HDR_VERTICAL) != 0 ),
- nSize ( nNewSize ),
- nMarkStart ( 0 ),
- nMarkEnd ( 0 ),
- bMarkRange ( FALSE ),
- bDragging ( FALSE ),
- bIgnoreMove ( FALSE )
+ Window ( pParent ),
+ pSelEngine ( pSelectionEngine ),
+ nFlags ( nNewFlags ),
+ bVertical ( (nNewFlags & HDR_VERTICAL) != 0 ),
+ nSize ( nNewSize ),
+ nMarkStart ( 0 ),
+ nMarkEnd ( 0 ),
+ bMarkRange ( FALSE ),
+ bDragging ( FALSE ),
+ bIgnoreMove ( FALSE )
{
// --- RTL --- no default mirroring for this window, the spreadsheet itself
// is also not mirrored
@@ -86,7 +86,7 @@ ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEn
EnableRTL( FALSE );
aNormFont = GetFont();
- aNormFont.SetTransparent( TRUE ); //! WEIGHT_NORMAL hart setzen ???
+ aNormFont.SetTransparent( TRUE ); //! WEIGHT_NORMAL hart setzen ???
aBoldFont = aNormFont;
aBoldFont.SetWeight( WEIGHT_BOLD );
@@ -96,7 +96,7 @@ ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEn
Size aSize = LogicToPixel( Size(
GetTextWidth( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("8888")) ),
GetTextHeight() ) );
- aSize.Width() += 4; // Platz fuer hervorgehobene Umrandung
+ aSize.Width() += 4; // Platz fuer hervorgehobene Umrandung
aSize.Height() += 3;
SetSizePixel( aSize );
@@ -104,7 +104,7 @@ ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEn
nBigWidth = LogicToPixel( Size( GetTextWidth(
String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("8888888")) ), 0 ) ).Width() + 5;
- SetBackground(); // sonst Probleme auf OS/2 !?!?!
+ SetBackground(); // sonst Probleme auf OS/2 !?!?!
}
void ScHeaderControl::SetWidth( long nNew )
@@ -112,12 +112,12 @@ void ScHeaderControl::SetWidth( long nNew )
DBG_ASSERT( bVertical, "SetDigits nur fuer Zeilenkoepfe erlaubt" );
if ( nNew != nWidth )
{
- Size aSize( nNew, GetSizePixel().Height() ); // Hoehe nicht aendern
+ Size aSize( nNew, GetSizePixel().Height() ); // Hoehe nicht aendern
SetSizePixel( aSize );
nWidth = nNew;
- Invalidate(); // neu zentrieren
+ Invalidate(); // neu zentrieren
}
}
@@ -146,21 +146,21 @@ void ScHeaderControl::DoPaint( SCCOLROW nStart, SCCOLROW nEnd )
void ScHeaderControl::SetMark( BOOL bNewSet, SCCOLROW nNewStart, SCCOLROW nNewEnd )
{
- BOOL bEnabled = SC_MOD()->GetInputOptions().GetMarkHeader(); //! cachen?
+ BOOL bEnabled = SC_MOD()->GetInputOptions().GetMarkHeader(); //! cachen?
if (!bEnabled)
bNewSet = FALSE;
- // Variablen setzen
+ // Variablen setzen
- BOOL bOldSet = bMarkRange;
+ BOOL bOldSet = bMarkRange;
SCCOLROW nOldStart = nMarkStart;
- SCCOLROW nOldEnd = nMarkEnd;
+ SCCOLROW nOldEnd = nMarkEnd;
PutInOrder( nNewStart, nNewEnd );
bMarkRange = bNewSet;
nMarkStart = nNewStart;
nMarkEnd = nNewEnd;
- // Paint
+ // Paint
if ( bNewSet )
{
@@ -176,20 +176,20 @@ void ScHeaderControl::SetMark( BOOL bNewSet, SCCOLROW nNewStart, SCCOLROW nNewEn
DoPaint( Min( nNewStart, nOldStart ), Max( nNewStart, nOldStart ) - 1 );
else if ( nNewStart > nOldEnd || nNewEnd < nOldStart )
{
- // zwei Bereiche...
+ // zwei Bereiche...
DoPaint( nOldStart, nOldEnd );
DoPaint( nNewStart, nNewEnd );
}
- else // irgendwie ueberlappend... (kommt eh nicht oft vor)
+ else // irgendwie ueberlappend... (kommt eh nicht oft vor)
DoPaint( Min( nNewStart, nOldStart ), Max( nNewEnd, nOldEnd ) );
}
else
- DoPaint( nNewStart, nNewEnd ); // komplett neu
+ DoPaint( nNewStart, nNewEnd ); // komplett neu
}
else if ( bOldSet )
- DoPaint( nOldStart, nOldEnd ); // komplett aufheben
+ DoPaint( nOldStart, nOldEnd ); // komplett aufheben
- // sonst war nix, is nix
+ // sonst war nix, is nix
}
long ScHeaderControl::GetScrPos( SCCOLROW nEntryNo )
@@ -260,13 +260,13 @@ void ScHeaderControl::DrawShadedRect( long nStart, long nEnd, const Color& rBase
}
//
-// Paint
+// Paint
//
void ScHeaderControl::Paint( const Rectangle& rRect )
{
- // fuer VCL ist es wichtig, wenig Aufrufe zu haben, darum werden die aeusseren
- // Linien zusammengefasst
+ // fuer VCL ist es wichtig, wenig Aufrufe zu haben, darum werden die aeusseren
+ // Linien zusammengefasst
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
BOOL bHighContrast = rStyleSettings.GetHighContrastMode();
@@ -290,19 +290,19 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
long nLayoutSign = bLayoutRTL ? -1 : 1;
BOOL bMirrored = IsMirrored();
-// const FunctionSet* pFuncSet = pSelEngine->GetFunctionSet();
- String aString;
- USHORT nBarSize;
- Point aScrPos;
- Size aTextSize;
-// Size aSize = GetOutputSizePixel();
+// const FunctionSet* pFuncSet = pSelEngine->GetFunctionSet();
+ String aString;
+ USHORT nBarSize;
+ Point aScrPos;
+ Size aTextSize;
+// Size aSize = GetOutputSizePixel();
if (bVertical)
nBarSize = (USHORT) GetSizePixel().Width();
else
nBarSize = (USHORT) GetSizePixel().Height();
- SCCOLROW nPos = GetPos();
+ SCCOLROW nPos = GetPos();
long nPStart = bVertical ? rRect.Top() : rRect.Left();
long nPEnd = bVertical ? rRect.Bottom() : rRect.Right();
@@ -313,22 +313,22 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
long nInitScrPos = 0;
if ( bLayoutRTL )
{
- long nTemp = nPStart; // swap nPStart / nPEnd
+ long nTemp = nPStart; // swap nPStart / nPEnd
nPStart = nPEnd;
nPEnd = nTemp;
- nTemp = nTransStart; // swap nTransStart / nTransEnd
+ nTemp = nTransStart; // swap nTransStart / nTransEnd
nTransStart = nTransEnd;
nTransEnd = nTemp;
- if ( bVertical ) // start loops from the end
+ if ( bVertical ) // start loops from the end
nInitScrPos = GetSizePixel().Height() - 1;
else
nInitScrPos = GetSizePixel().Width() - 1;
}
- // aeussere Linien komplett durchzeichnen
- // Zuerst Ende der letzten Zelle finden
+ // aeussere Linien komplett durchzeichnen
+ // Zuerst Ende der letzten Zelle finden
-// long nLineEnd = -1;
+// long nLineEnd = -1;
long nLineEnd = nInitScrPos - nLayoutSign;
for (SCCOLROW i=nPos; i<nSize; i++)
@@ -361,7 +361,7 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
}
}
- // background is different for entry area and behind the entries
+ // background is different for entry area and behind the entries
Rectangle aFillRect;
SetLineColor();
@@ -403,7 +403,7 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
{
if ( bDark )
{
- // solid grey background for dark face color is drawn before lines
+ // solid grey background for dark face color is drawn before lines
SetLineColor();
SetFillColor( COL_LIGHTGRAY );
@@ -454,19 +454,19 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
}
//
- // loop through entries several times to avoid changing the line color too often
- // and to allow merging of lines
+ // loop through entries several times to avoid changing the line color too often
+ // and to allow merging of lines
//
ScGridMerger aGrid( this, 1, 1 );
- // start at SC_HDRPAINT_BOTTOM instead of 0 - selection doesn't get different
- // borders, light border at top isn't used anymore
+ // start at SC_HDRPAINT_BOTTOM instead of 0 - selection doesn't get different
+ // borders, light border at top isn't used anymore
// use SC_HDRPAINT_SEL_BOTTOM for different color
for (USHORT nPass = SC_HDRPAINT_SEL_BOTTOM; nPass < SC_HDRPAINT_COUNT; nPass++)
{
- // set line color etc. before entry loop
+ // set line color etc. before entry loop
switch ( nPass )
{
case SC_HDRPAINT_SEL_BOTTOM:
@@ -480,13 +480,13 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
// DrawSelectionBackground is used only for high contrast on light background
if ( nTransEnd * nLayoutSign >= nTransStart * nLayoutSign && bHighContrast && !bDark )
{
- // Transparent selection background is drawn after lines, before text.
- // #109814# Use DrawSelectionBackground to make sure there is a visible
- // difference. The case of a dark face color, where DrawSelectionBackground
- // would just paint over the lines, is handled separately (bDark).
- // Otherwise, GetHighlightColor is used with 80% transparency.
- // The window's background color (SetBackground) has to be the background
- // of the cell area, for the contrast comparison in DrawSelectionBackground.
+ // Transparent selection background is drawn after lines, before text.
+ // #109814# Use DrawSelectionBackground to make sure there is a visible
+ // difference. The case of a dark face color, where DrawSelectionBackground
+ // would just paint over the lines, is handled separately (bDark).
+ // Otherwise, GetHighlightColor is used with 80% transparency.
+ // The window's background color (SetBackground) has to be the background
+ // of the cell area, for the contrast comparison in DrawSelectionBackground.
Rectangle aTransRect;
if (bVertical)
@@ -500,8 +500,8 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
break;
}
- SCCOLROW nCount=0;
- long nScrPos=nInitScrPos;
+ SCCOLROW nCount=0;
+ long nScrPos=nInitScrPos;
do
{
if (bVertical)
@@ -509,9 +509,9 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
else
aScrPos = Point( nScrPos, 0 );
- SCCOLROW nEntryNo = nCount + nPos;
- if ( nEntryNo >= nSize ) // MAXCOL/MAXROW
- nScrPos = nPEnd + nLayoutSign; // beyond nPEnd -> stop
+ SCCOLROW nEntryNo = nCount + nPos;
+ if ( nEntryNo >= nSize ) // MAXCOL/MAXROW
+ nScrPos = nPEnd + nLayoutSign; // beyond nPEnd -> stop
else
{
USHORT nSizePix = GetEntrySize( nEntryNo );
@@ -560,7 +560,7 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
break;
case SC_HDRPAINT_TEXT:
- if ( nSizePix > 1 ) // minimal check for small columns/rows
+ if ( nSizePix > 1 ) // minimal check for small columns/rows
{
if ( bMark != bBoldSet )
{
@@ -580,7 +580,7 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
aTxtPos.X() += (nBarSize-aTextSize.Width())/2;
aTxtPos.Y() += (nSizePix*nLayoutSign-aTextSize.Height())/2;
if ( bMirrored )
- aTxtPos.X() += 1; // dark border is left instead of right
+ aTxtPos.X() += 1; // dark border is left instead of right
}
else
{
@@ -592,10 +592,10 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
break;
}
- // bei Selektion der ganzen Zeile/Spalte:
- // InvertRect( Rectangle( aScrPos, aEndPos ) );
+ // bei Selektion der ganzen Zeile/Spalte:
+ // InvertRect( Rectangle( aScrPos, aEndPos ) );
}
- nScrPos += nSizePix * nLayoutSign; // also if before the visible area
+ nScrPos += nSizePix * nLayoutSign; // also if before the visible area
}
++nCount;
}
@@ -606,20 +606,20 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
}
//
-// Maus - Handling
+// Maus - Handling
//
SCCOLROW ScHeaderControl::GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder )
{
- BOOL bFound=FALSE;
- SCCOLROW nCount = 1;
- SCCOLROW nPos = GetPos();
- SCCOLROW nHitNo = nPos;
- long nScrPos;
- long nMousePos = bVertical ? rMEvt.GetPosPixel().Y() : rMEvt.GetPosPixel().X();
- long nDif;
- Size aSize = GetOutputSizePixel();
- long nWinSize = bVertical ? aSize.Height() : aSize.Width();
+ BOOL bFound=FALSE;
+ SCCOLROW nCount = 1;
+ SCCOLROW nPos = GetPos();
+ SCCOLROW nHitNo = nPos;
+ long nScrPos;
+ long nMousePos = bVertical ? rMEvt.GetPosPixel().Y() : rMEvt.GetPosPixel().X();
+ long nDif;
+ Size aSize = GetOutputSizePixel();
+ long nWinSize = bVertical ? aSize.Height() : aSize.Width();
BOOL bLayoutRTL = IsLayoutRTL();
long nLayoutSign = bLayoutRTL ? -1 : 1;
@@ -630,12 +630,12 @@ SCCOLROW ScHeaderControl::GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder )
{
SCCOLROW nEntryNo = nCount + nPos;
-// nScrPos = GetScrPos( nEntryNo ) - 1;
+// nScrPos = GetScrPos( nEntryNo ) - 1;
if (nEntryNo > nSize)
nScrPos = nEndPos + nLayoutSign;
else
- nScrPos += GetEntrySize( nEntryNo - 1 ) * nLayoutSign; //! GetHiddenCount() ??
+ nScrPos += GetEntrySize( nEntryNo - 1 ) * nLayoutSign; //! GetHiddenCount() ??
nDif = nMousePos - nScrPos;
if (nDif >= -2 && nDif <= 2 && nCount > 0)
@@ -669,13 +669,13 @@ bool ScHeaderControl::IsSelectionAllowed(SCCOLROW nPos) const
// This sheet is protected. Check if a context menu is allowed on this cell.
bool bCellsProtected = false;
if (bVertical)
- {
+ {
// row header
SCROW nRPos = static_cast<SCROW>(nPos);
bCellsProtected = pDoc->HasAttrib(0, nRPos, nTab, MAXCOL, nRPos, nTab, HASATTR_PROTECTED);
}
else
- {
+ {
// column header
SCCOL nCPos = static_cast<SCCOL>(nPos);
bCellsProtected = pDoc->HasAttrib(nCPos, 0, nTab, nCPos, MAXROW, nTab, HASATTR_PROTECTED);
@@ -741,18 +741,18 @@ void ScHeaderControl::MouseButtonDown( const MouseEvent& rMEvt )
aVis.Top() = LONG_MIN, aVis.Bottom() = LONG_MAX;
pSelEngine->SetVisibleArea( aVis );
- SetMarking( TRUE ); // muss vor SelMouseButtonDown sein
+ SetMarking( TRUE ); // muss vor SelMouseButtonDown sein
pSelEngine->SelMouseButtonDown( rMEvt );
- // #74215# In column/row headers a simple click already is a selection.
- // -> Call SelMouseMove to ensure CreateAnchor is called (and DestroyAnchor
- // if the next click is somewhere else with Control key).
+ // #74215# In column/row headers a simple click already is a selection.
+ // -> Call SelMouseMove to ensure CreateAnchor is called (and DestroyAnchor
+ // if the next click is somewhere else with Control key).
pSelEngine->SelMouseMove( rMEvt );
if (IsMouseCaptured())
{
- // Tracking statt CaptureMouse, damit sauber abgebrochen werden kann
- //! Irgendwann sollte die SelectionEngine selber StartTracking rufen!?!
+ // Tracking statt CaptureMouse, damit sauber abgebrochen werden kann
+ //! Irgendwann sollte die SelectionEngine selber StartTracking rufen!?!
ReleaseMouse();
StartTracking();
}
@@ -773,10 +773,10 @@ void ScHeaderControl::MouseButtonUp( const MouseEvent& rMEvt )
{
DrawInvert( nDragPos );
ReleaseMouse();
- bDragging = FALSE;
+ bDragging = FALSE;
- long nScrPos = GetScrPos( nDragNo );
- long nMousePos = bVertical ? rMEvt.GetPosPixel().Y() : rMEvt.GetPosPixel().X();
+ long nScrPos = GetScrPos( nDragNo );
+ long nMousePos = bVertical ? rMEvt.GetPosPixel().Y() : rMEvt.GetPosPixel().X();
BOOL bLayoutRTL = IsLayoutRTL();
long nNewWidth = bLayoutRTL ? ( nScrPos - nMousePos + 1 )
: ( nMousePos + 2 - nScrPos );
@@ -791,7 +791,7 @@ void ScHeaderControl::MouseButtonUp( const MouseEvent& rMEvt )
if (nDragNo>0)
{
--nDragNo;
- nNewWidth += GetEntrySize( nDragNo ); //! GetHiddenCount() ???
+ nNewWidth += GetEntrySize( nDragNo ); //! GetHiddenCount() ???
}
else
nNewWidth = 0;
@@ -851,8 +851,8 @@ void ScHeaderControl::MouseMove( const MouseEvent& rMEvt )
void ScHeaderControl::Tracking( const TrackingEvent& rTEvt )
{
- // Weil die SelectionEngine kein Tracking kennt, die Events nur auf
- // die verschiedenen MouseHandler verteilen...
+ // Weil die SelectionEngine kein Tracking kennt, die Events nur auf
+ // die verschiedenen MouseHandler verteilen...
if ( rTEvt.IsTrackingCanceled() )
StopMarking();
@@ -867,9 +867,9 @@ void ScHeaderControl::Command( const CommandEvent& rCEvt )
USHORT nCmd = rCEvt.GetCommand();
if ( nCmd == COMMAND_CONTEXTMENU )
{
- StopMarking(); // Selektion / Dragging beenden
+ StopMarking(); // Selektion / Dragging beenden
- // Popup ausfuehren
+ // Popup ausfuehren
ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell,
SfxViewShell::Current() );
@@ -935,8 +935,8 @@ void ScHeaderControl::StopMarking()
SetMarking( FALSE );
bIgnoreMove = TRUE;
- // #86260# don't call pSelEngine->Reset, so selection across the parts of
- // a split/frozen view is possible
+ // #86260# don't call pSelEngine->Reset, so selection across the parts of
+ // a split/frozen view is possible
ReleaseMouse();
}
@@ -945,7 +945,7 @@ void ScHeaderControl::ShowDragHelp()
{
if (Help::IsQuickHelpEnabled())
{
- long nScrPos = GetScrPos( nDragNo );
+ long nScrPos = GetScrPos( nDragNo );
BOOL bLayoutRTL = IsLayoutRTL();
long nVal = bLayoutRTL ? ( nScrPos - nDragPos + 1 )
: ( nDragPos + 2 - nScrPos );
@@ -960,21 +960,21 @@ void ScHeaderControl::ShowDragHelp()
USHORT nAlign;
if (!bVertical)
{
- // oberhalb
+ // oberhalb
aRect.Left() = aMousePos.X();
- aRect.Top() = aPos.Y() - 4;
- nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER;
+ aRect.Top() = aPos.Y() - 4;
+ nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER;
}
else
{
- // rechts oben
+ // rechts oben
aRect.Left() = aPos.X() + aSize.Width() + 8;
- aRect.Top() = aMousePos.Y() - 2;
- nAlign = QUICKHELP_LEFT|QUICKHELP_BOTTOM;
+ aRect.Top() = aMousePos.Y() - 2;
+ nAlign = QUICKHELP_LEFT|QUICKHELP_BOTTOM;
}
- aRect.Right() = aRect.Left();
- aRect.Bottom() = aRect.Top();
+ aRect.Right() = aRect.Left();
+ aRect.Bottom() = aRect.Top();
Help::ShowQuickHelp(this, aRect, aHelpStr, nAlign);
}
@@ -982,8 +982,8 @@ void ScHeaderControl::ShowDragHelp()
void ScHeaderControl::RequestHelp( const HelpEvent& rHEvt )
{
- // Wenn eigene QuickHelp angezeigt wird, nicht durch RequestHelp
- // wieder wegnehmen lassen
+ // Wenn eigene QuickHelp angezeigt wird, nicht durch RequestHelp
+ // wieder wegnehmen lassen
BOOL bOwn = bDragging && Help::IsQuickHelpEnabled();
if (!bOwn)
@@ -991,7 +991,7 @@ void ScHeaderControl::RequestHelp( const HelpEvent& rHEvt )
}
// -----------------------------------------------------------------------
-// Dummys fuer virtuelle Methoden
+// Dummys fuer virtuelle Methoden
// -----------------------------------------------------------------------
SCCOLROW ScHeaderControl::GetHiddenCount( SCCOLROW nEntryNo )
diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx
index 568923f42838..d9efd072f077 100644
--- a/sc/source/ui/view/hintwin.cxx
+++ b/sc/source/ui/view/hintwin.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +37,9 @@
#include "hintwin.hxx"
#include "global.hxx"
-#define HINT_LINESPACE 2
-#define HINT_INDENT 3
-#define HINT_MARGIN 4
+#define HINT_LINESPACE 2
+#define HINT_INDENT 3
+#define HINT_MARGIN 4
//==================================================================
@@ -50,8 +50,8 @@ ScHintWindow::ScHintWindow( Window* pParent, const String& rTit, const String& r
{
aMessage.ConvertLineEnd( LINEEND_CR );
- // Hellgelb, wie Notizen in detfunc.cxx
- Color aYellow( 255,255,192 ); // hellgelb
+ // Hellgelb, wie Notizen in detfunc.cxx
+ Color aYellow( 255,255,192 ); // hellgelb
SetBackground( aYellow );
aTextFont = GetFont();
diff --git a/sc/source/ui/view/imapwrap.cxx b/sc/source/ui/view/imapwrap.cxx
index b2f4fb714775..b8ea6cf3b7a0 100644
--- a/sc/source/ui/view/imapwrap.cxx
+++ b/sc/source/ui/view/imapwrap.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ USHORT ScIMapChildWindowId()
SvxIMapDlg* ScGetIMapDlg()
{
- //! pass view frame here and in SVXIMAPDLG()
+ //! pass view frame here and in SVXIMAPDLG()
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
if( pViewFrm && pViewFrm->HasChildWindow( SvxIMapDlgChildWindow::GetChildWindowId() ) )
@@ -66,7 +66,7 @@ const void* ScIMapDlgGetObj( SvxIMapDlg* pDlg )
return NULL;
}
-const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg )
+const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg )
{
return pDlg->GetImageMap();
}
diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx
index a895dc5faec0..77af9751e766 100644
--- a/sc/source/ui/view/invmerge.cxx
+++ b/sc/source/ui/view/invmerge.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,7 +41,7 @@ ScInvertMerger::ScInvertMerger( Window* pWindow ) :
pWin( pWindow ),
pRects( NULL )
{
- // both rectangles empty
+ // both rectangles empty
}
ScInvertMerger::ScInvertMerger( ::std::vector< Rectangle >* pRectangles ) :
@@ -110,7 +110,7 @@ void ScInvertMerger::Flush()
void ScInvertMerger::FlushTotal()
{
if( aTotalRect.IsEmpty() )
- return; // nothing to do
+ return; // nothing to do
if ( pWin )
pWin->Invert( aTotalRect, INVERT_HIGHLIGHT );
@@ -123,11 +123,11 @@ void ScInvertMerger::FlushTotal()
void ScInvertMerger::FlushLine()
{
if( aLineRect.IsEmpty() )
- return; // nothing to do
+ return; // nothing to do
if ( aTotalRect.IsEmpty() )
{
- aTotalRect = aLineRect; // start new total rect
+ aTotalRect = aLineRect; // start new total rect
}
else
{
@@ -140,8 +140,8 @@ void ScInvertMerger::FlushLine()
}
else
{
- FlushTotal(); // draw old total rect
- aTotalRect = aLineRect; // and start new one
+ FlushTotal(); // draw old total rect
+ aTotalRect = aLineRect; // and start new one
}
}
@@ -173,7 +173,7 @@ void ScInvertMerger::AddRect( const Rectangle& rRect )
aLineRect.Right() = aJustified.Right();
bDone = TRUE;
}
- else if ( aJustified.Right() + 1 == aLineRect.Left() ) // for RTL layout
+ else if ( aJustified.Right() + 1 == aLineRect.Left() ) // for RTL layout
{
aLineRect.Left() = aJustified.Left();
bDone = TRUE;
@@ -181,8 +181,8 @@ void ScInvertMerger::AddRect( const Rectangle& rRect )
}
if (!bDone)
{
- FlushLine(); // use old line rect for total rect
- aLineRect = aJustified; // and start new one
+ FlushLine(); // use old line rect for total rect
+ aLineRect = aJustified; // and start new one
}
}
}
diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index 065ba5899817..2ea78687ba6c 100644
--- a/sc/source/ui/view/notemark.cxx
+++ b/sc/source/ui/view/notemark.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,8 +41,8 @@
#include "document.hxx"
#include "postit.hxx"
-#define SC_NOTEMARK_TIME 800
-#define SC_NOTEMARK_SHORT 70
+#define SC_NOTEMARK_TIME 800
+#define SC_NOTEMARK_SHORT 70
// -----------------------------------------------------------------------
@@ -98,8 +98,8 @@ IMPL_LINK( ScNoteMarker, TimeHdl, Timer*, EMPTYARG )
OutputDevice* pPrinter = pDoc->GetRefDevice();
if (pPrinter)
{
- // Am Outliner des Draw-Model ist auch der Drucker als RefDevice gesetzt,
- // und es soll einheitlich aussehen.
+ // Am Outliner des Draw-Model ist auch der Drucker als RefDevice gesetzt,
+ // und es soll einheitlich aussehen.
Outliner& rOutliner = pModel->GetDrawOutliner();
rOutliner.SetRefDevice(pPrinter);
}
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index b1e82fd9217f..38fb5a12a75a 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -183,8 +183,8 @@ const ScOutlineEntry* ScOutlineWindow::GetOutlineEntry( size_t nLevel, size_t nE
bool ScOutlineWindow::IsHidden( SCCOLROW nColRowIndex ) const
{
- return mbHoriz ?
- GetDoc().ColHidden(static_cast<SCCOL>(nColRowIndex), GetTab()) :
+ return mbHoriz ?
+ GetDoc().ColHidden(static_cast<SCCOL>(nColRowIndex), GetTab()) :
GetDoc().RowHidden(static_cast<SCROW>(nColRowIndex), GetTab());
}
diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx
index 248777f4e473..aec971d8d2ad 100644
--- a/sc/source/ui/view/olkact.cxx
+++ b/sc/source/ui/view/olkact.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -219,7 +219,7 @@
//#define _VCSBX_HXX
//#define _VCBRW_HXX
-//#define _SVDATTR_HXX <--- der wars
+//#define _SVDATTR_HXX <--- der wars
#define _SVDXOUT_HXX
#define _SVDEC_HXX
//#define _SVDIO_HXX
@@ -263,17 +263,17 @@
void ActivateOlk( ScViewData* /* pViewData */ )
{
// Browser fuer Virtual Controls fuellen
- // VC's und den Browser dazu gibts nicht mehr...
+ // VC's und den Browser dazu gibts nicht mehr...
- // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden
+ // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden
}
void DeActivateOlk( ScViewData* /* pViewData */ )
{
// Browser fuer Virtual Controls fuellen
- // VC's und den Browser dazu gibts nicht mehr...
+ // VC's und den Browser dazu gibts nicht mehr...
- // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden
+ // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden
}
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 7b27ddf3f8cc..f0056c634ac0 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,33 +72,33 @@ using namespace com::sun::star;
// STATIC DATA -----------------------------------------------------------
-// Farben fuer ChangeTracking "nach Autor" wie im Writer (swmodul1.cxx)
+// Farben fuer ChangeTracking "nach Autor" wie im Writer (swmodul1.cxx)
-#define SC_AUTHORCOLORCOUNT 9
+#define SC_AUTHORCOLORCOUNT 9
static ColorData nAuthorColor[ SC_AUTHORCOLORCOUNT ] = {
- COL_LIGHTRED, COL_LIGHTBLUE, COL_LIGHTMAGENTA,
- COL_GREEN, COL_RED, COL_BLUE,
- COL_BROWN, COL_MAGENTA, COL_CYAN };
+ COL_LIGHTRED, COL_LIGHTBLUE, COL_LIGHTMAGENTA,
+ COL_GREEN, COL_RED, COL_BLUE,
+ COL_BROWN, COL_MAGENTA, COL_CYAN };
-// Hilfsklasse, fuer die Farbzuordnung,
-// um nicht mehrfach hintereinander denselben User aus der Liste zu suchen
+// Hilfsklasse, fuer die Farbzuordnung,
+// um nicht mehrfach hintereinander denselben User aus der Liste zu suchen
class ScActionColorChanger
{
private:
- const ScAppOptions& rOpt;
- const ScStrCollection& rUsers;
- String aLastUserName;
- USHORT nLastUserIndex;
- ColorData nColor;
+ const ScAppOptions& rOpt;
+ const ScStrCollection& rUsers;
+ String aLastUserName;
+ USHORT nLastUserIndex;
+ ColorData nColor;
public:
ScActionColorChanger( const ScChangeTrack& rTrack );
~ScActionColorChanger() {}
- void Update( const ScChangeAction& rAction );
- ColorData GetColor() const { return nColor; }
+ void Update( const ScChangeAction& rAction );
+ ColorData GetColor() const { return nColor; }
};
//------------------------------------------------------------------
@@ -133,9 +133,9 @@ void ScActionColorChanger::Update( const ScChangeAction& rAction )
nSetColor = rOpt.GetTrackContentColor();
break;
}
- if ( nSetColor != COL_TRANSPARENT ) // Farbe eingestellt
+ if ( nSetColor != COL_TRANSPARENT ) // Farbe eingestellt
nColor = nSetColor;
- else // nach Autor
+ else // nach Autor
{
if ( rAction.GetUser() != aLastUserName )
{
@@ -163,8 +163,8 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType,
double nPixelPerTwipsX, double nPixelPerTwipsY,
const Fraction* pZoomX, const Fraction* pZoomY ) :
pDev( pNewDev ),
- pRefDevice( pNewDev ), // default is output device
- pFmtDevice( pNewDev ), // default is output device
+ pRefDevice( pNewDev ), // default is output device
+ pFmtDevice( pNewDev ), // default is output device
mrTabInfo( rTabInfo ),
pRowInfo( rTabInfo.mpRowInfo ),
nArrCount( rTabInfo.mnArrCount ),
@@ -197,7 +197,7 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType,
bShowNullValues( TRUE ),
bShowFormulas( FALSE ),
bShowSpellErrors( FALSE ),
- bMarkClipped( FALSE ), // FALSE fuer Drucker/Metafile etc.
+ bMarkClipped( FALSE ), // FALSE fuer Drucker/Metafile etc.
bSnapPixel( FALSE ),
bAnyRotated( FALSE ),
bAnyClipped( FALSE ),
@@ -330,10 +330,10 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
Color aManualColor;
if (bPagebreakMode)
- bPage = FALSE; // keine "normalen" Umbrueche ueber volle Breite/Hoehe
+ bPage = FALSE; // keine "normalen" Umbrueche ueber volle Breite/Hoehe
- //! um den einen Pixel sieht das Metafile (oder die Druck-Ausgabe) anders aus
- //! als die Bildschirmdarstellung, aber wenigstens passen Druck und Metafile zusammen
+ //! um den einen Pixel sieht das Metafile (oder die Druck-Ausgabe) anders aus
+ //! als die Bildschirmdarstellung, aber wenigstens passen Druck und Metafile zusammen
Size aOnePixel = pDev->PixelToLogic(Size(1,1));
long nOneX = aOnePixel.Width();
@@ -360,7 +360,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
ScGridMerger aGrid( pDev, nOneX, nOneY );
//
- // Vertikale Linien
+ // Vertikale Linien
//
nPosX = nScrX;
@@ -378,7 +378,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
if ( bPage )
{
- // Seitenumbrueche auch in ausgeblendeten suchen
+ // Seitenumbrueche auch in ausgeblendeten suchen
SCCOL nCol = nXplus1;
while (nCol <= MAXCOL)
{
@@ -399,13 +399,13 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
}
}
- BOOL bDraw = bGrid || nBreakOld; // einfaches Gitter nur wenn eingestellt
+ BOOL bDraw = bGrid || nBreakOld; // einfaches Gitter nur wenn eingestellt
- //! Mit dieser Abfrage wird zuviel weggelassen, wenn ein automatischer
- //! Umbruch mitten in den Wiederholungsspalten liegt.
- //! Dann lieber den aeusseren Rahmen zweimal ausgeben...
+ //! Mit dieser Abfrage wird zuviel weggelassen, wenn ein automatischer
+ //! Umbruch mitten in den Wiederholungsspalten liegt.
+ //! Dann lieber den aeusseren Rahmen zweimal ausgeben...
#if 0
- // auf dem Drucker die Aussen-Linien weglassen (werden getrennt ausgegeben)
+ // auf dem Drucker die Aussen-Linien weglassen (werden getrennt ausgegeben)
if ( eType == OUTTYPE_PRINTER && !bMetaFile )
{
if ( nX == MAXCOL )
@@ -416,7 +416,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
#endif
USHORT nWidthXplus2 = pRowInfo[0].pCellInfo[nXplus2].nWidth;
- bSingle = bSingleGrid; //! in Fillinfo holen !!!!!
+ bSingle = bSingleGrid; //! in Fillinfo holen !!!!!
if ( nX<MAXCOL && !bSingle )
{
bSingle = ( nWidthXplus2 == 0 );
@@ -486,7 +486,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
}
//
- // Horizontale Linien
+ // Horizontale Linien
//
bool bHiddenRow = true;
@@ -507,12 +507,12 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
{
if (i > nHiddenEndRow)
bHiddenRow = pDoc->RowHidden(i, nTab, nHiddenEndRow);
- /* TODO: optimize the row break thing for large hidden
- * segments where HasRowBreak() has to be called
- * nevertheless for each row, as a row break is drawn also
- * for hidden rows, above them. This needed to be done only
- * once per hidden segment, maybe giving manual breaks
- * priority. Something like GetNextRowBreak() and
+ /* TODO: optimize the row break thing for large hidden
+ * segments where HasRowBreak() has to be called
+ * nevertheless for each row, as a row break is drawn also
+ * for hidden rows, above them. This needed to be done only
+ * once per hidden segment, maybe giving manual breaks
+ * priority. Something like GetNextRowBreak() and
* GetNextManualRowBreak(). */
nBreak = pDoc->HasRowBreak(i, nTab);
if (!bHiddenRow || nBreak)
@@ -528,13 +528,13 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
}
}
- BOOL bDraw = bGrid || nBreakOld; // einfaches Gitter nur wenn eingestellt
+ BOOL bDraw = bGrid || nBreakOld; // einfaches Gitter nur wenn eingestellt
- //! Mit dieser Abfrage wird zuviel weggelassen, wenn ein automatischer
- //! Umbruch mitten in den Wiederholungszeilen liegt.
- //! Dann lieber den aeusseren Rahmen zweimal ausgeben...
+ //! Mit dieser Abfrage wird zuviel weggelassen, wenn ein automatischer
+ //! Umbruch mitten in den Wiederholungszeilen liegt.
+ //! Dann lieber den aeusseren Rahmen zweimal ausgeben...
#if 0
- // auf dem Drucker die Aussen-Linien weglassen (werden getrennt ausgegeben)
+ // auf dem Drucker die Aussen-Linien weglassen (werden getrennt ausgegeben)
if ( eType == OUTTYPE_PRINTER && !bMetaFile )
{
if ( nY == MAXROW )
@@ -545,7 +545,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
#endif
BOOL bNextYisNextRow = (pRowInfo[nArrYplus1].nRowNo == nYplus1);
- bSingle = !bNextYisNextRow; // Hidden
+ bSingle = !bNextYisNextRow; // Hidden
for (SCCOL i=nX1; i<=nX2 && !bSingle; i++)
{
if (pRowInfo[nArrYplus1].pCellInfo[i+1].bVOverlapped)
@@ -566,7 +566,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
for (SCCOL i=nX1; i<=nX2; i++)
{
nNextX = nPosX + pRowInfo[0].pCellInfo[i+1].nWidth * nLayoutSign;
- if (nNextX != nPosX) // sichtbar
+ if (nNextX != nPosX) // sichtbar
{
BOOL bVOver;
if ( bNextYisNextRow )
@@ -576,7 +576,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
bVOver = ((ScMergeFlagAttr*)pDoc->GetAttr(
i,nYplus1,nTab,ATTR_MERGE_FLAG))
->IsVerOverlapped()
- && ((ScMergeFlagAttr*)pDoc->GetAttr(
+ && ((ScMergeFlagAttr*)pDoc->GetAttr(
i,nVisY,nTab,ATTR_MERGE_FLAG))
->IsVerOverlapped();
//! nVisY aus Array ??
@@ -604,16 +604,16 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
}
}
-// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
void ScOutputData::SetPagebreakMode( ScPageBreakData* pPageData )
{
bPagebreakMode = TRUE;
if (!pPageData)
- return; // noch nicht initialisiert -> alles "nicht gedruckt"
+ return; // noch nicht initialisiert -> alles "nicht gedruckt"
- // gedruckten Bereich markieren
- // (in FillInfo ist schon alles auf FALSE initialisiert)
+ // gedruckten Bereich markieren
+ // (in FillInfo ist schon alles auf FALSE initialisiert)
USHORT nRangeCount = sal::static_int_cast<USHORT>(pPageData->GetCount());
for (USHORT nPos=0; nPos<nRangeCount; nPos++)
@@ -640,7 +640,7 @@ void ScOutputData::SetPagebreakMode( ScPageBreakData* pPageData )
void ScOutputData::FindRotated()
{
- //! nRotMax speichern
+ //! nRotMax speichern
SCCOL nRotMax = nX2;
for (SCSIZE nRotY=0; nRotY<nArrCount; nRotY++)
if (pRowInfo[nRotY].nRotMaxCol != SC_ROTMAX_NONE && pRowInfo[nRotY].nRotMaxCol > nRotMax)
@@ -667,7 +667,7 @@ void ScOutputData::FindRotated()
pCondSet = pDoc->GetCondResult( nX, nY, nTab );
}
- if ( pPattern ) // Spalte nicht ausgeblendet
+ if ( pPattern ) // Spalte nicht ausgeblendet
{
BYTE nDir = pPattern->GetRotateDir( pCondSet );
if (nDir != SC_ROTDIR_NONE)
@@ -681,7 +681,7 @@ void ScOutputData::FindRotated()
}
}
-// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
USHORT lcl_GetRotateDir( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab )
{
@@ -702,7 +702,7 @@ USHORT lcl_GetRotateDir( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab )
nRet = SC_ROTDIR_CENTER;
else if ( eRotMode == SVX_ROTATE_MODE_TOP || eRotMode == SVX_ROTATE_MODE_BOTTOM )
{
- long nRot180 = nAttrRotate % 18000; // 1/100 Grad
+ long nRot180 = nAttrRotate % 18000; // 1/100 Grad
if ( nRot180 == 9000 )
nRet = SC_ROTDIR_CENTER;
else if ( ( eRotMode == SVX_ROTATE_MODE_TOP && nRot180 < 9000 ) ||
@@ -725,10 +725,10 @@ const SvxBrushItem* lcl_FindBackground( ScDocument* pDoc, SCCOL nCol, SCROW nRow
USHORT nDir = lcl_GetRotateDir( pDoc, nCol, nRow, nTab );
- // CENTER wird wie RIGHT behandelt...
+ // CENTER wird wie RIGHT behandelt...
if ( nDir == SC_ROTDIR_RIGHT || nDir == SC_ROTDIR_CENTER )
{
- // Text geht nach rechts -> Hintergrund von links nehmen
+ // Text geht nach rechts -> Hintergrund von links nehmen
while ( nCol > 0 && lcl_GetRotateDir( pDoc, nCol, nRow, nTab ) == nDir &&
pBackground->GetColor().GetTransparency() != 255 )
{
@@ -740,7 +740,7 @@ const SvxBrushItem* lcl_FindBackground( ScDocument* pDoc, SCCOL nCol, SCROW nRow
}
else if ( nDir == SC_ROTDIR_LEFT )
{
- // Text geht nach links -> Hintergrund von rechts nehmen
+ // Text geht nach links -> Hintergrund von rechts nehmen
while ( nCol < MAXCOL && lcl_GetRotateDir( pDoc, nCol, nRow, nTab ) == nDir &&
pBackground->GetColor().GetTransparency() != 255 )
{
@@ -754,7 +754,7 @@ const SvxBrushItem* lcl_FindBackground( ScDocument* pDoc, SCCOL nCol, SCROW nRow
return pBackground;
}
-// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
BOOL lcl_EqualBack( const RowInfo& rFirst, const RowInfo& rOther,
SCCOL nX1, SCCOL nX2, BOOL bShowProt, BOOL bPagebreakMode )
@@ -797,7 +797,7 @@ BOOL lcl_EqualBack( const RowInfo& rFirst, const RowInfo& rOther,
void ScOutputData::DrawBackground()
{
- FindRotated(); //! von aussen ?
+ FindRotated(); //! von aussen ?
ScModule* pScMod = SC_MOD();
@@ -820,7 +820,7 @@ void ScOutputData::DrawBackground()
BOOL bShowProt = bSyntaxMode && pDoc->IsTabProtected(nTab);
BOOL bDoAll = bShowProt || bPagebreakMode || bSolidBackground;
- // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
+ // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
BOOL bCellContrast = bUseStyleColor &&
Application::GetSettings().GetStyleSettings().GetHighContrastMode();
@@ -834,7 +834,7 @@ void ScOutputData::DrawBackground()
{
if ( ( ( pThisRowInfo->bEmptyBack ) || bSyntaxMode ) && !bDoAll )
{
- // nichts
+ // nichts
}
else
{
@@ -845,7 +845,7 @@ void ScOutputData::DrawBackground()
nX1, nX2, bShowProt, bPagebreakMode ) )
{
++nSkip;
- nRowHeight += pRowInfo[nArrY+nSkip].nHeight; // after incrementing
+ nRowHeight += pRowInfo[nArrY+nSkip].nHeight; // after incrementing
}
long nPosX = nScrX;
@@ -861,10 +861,10 @@ void ScOutputData::DrawBackground()
if (bCellContrast)
{
- // high contrast for cell borders and backgrounds -> empty background
+ // high contrast for cell borders and backgrounds -> empty background
pBackground = ScGlobal::GetEmptyBrushItem();
}
- else if (bShowProt) // show cell protection in syntax mode
+ else if (bShowProt) // show cell protection in syntax mode
{
const ScPatternAttr* pP = pInfo->pPatternAttr;
if (pP)
@@ -896,12 +896,12 @@ void ScOutputData::DrawBackground()
if ( pBackground != pOldBackground )
{
aRect.Right() = nPosX-nSignedOneX;
- if (pOldBackground) // ==0 if hidden
+ if (pOldBackground) // ==0 if hidden
{
Color aBackCol = pOldBackground->GetColor();
if ( bSolidBackground && aBackCol.GetTransparency() )
aBackCol = aBgColor;
- if ( !aBackCol.GetTransparency() ) //! partial transparency?
+ if ( !aBackCol.GetTransparency() ) //! partial transparency?
{
pDev->SetFillColor( aBackCol );
pDev->DrawRect( aRect );
@@ -918,7 +918,7 @@ void ScOutputData::DrawBackground()
Color aBackCol = pOldBackground->GetColor();
if ( bSolidBackground && aBackCol.GetTransparency() )
aBackCol = aBgColor;
- if ( !aBackCol.GetTransparency() ) //! partial transparency?
+ if ( !aBackCol.GetTransparency() ) //! partial transparency?
{
pDev->SetFillColor( aBackCol );
pDev->DrawRect( aRect );
@@ -942,7 +942,7 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBot
pDev->SetLineColor();
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
+ // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
BOOL bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode();
Color aAutoTextColor;
if ( bCellContrast )
@@ -974,7 +974,7 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBot
BOOL bCornerX = ( nArrX==nX1 || nArrX==nX2+2 );
BOOL bSkipX = ( nArrX==nX1 && !bLeft ) || ( nArrX==nX2+2 && !bRight );
- for (USHORT nPass=0; nPass<2; nPass++) // horizontal / vertikal
+ for (USHORT nPass=0; nPass<2; nPass++) // horizontal / vertikal
{
const SvxShadowItem* pAttr = nPass ?
pThisRowInfo->pCellInfo[nArrX].pVShadowOrigin :
@@ -996,16 +996,16 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBot
long nMaxWidth = nThisWidth;
if (!nMaxWidth)
{
- //! direction must depend on shadow location
- SCCOL nWx = nArrX; // nX+1
+ //! direction must depend on shadow location
+ SCCOL nWx = nArrX; // nX+1
while (nWx<nX2 && !pRowInfo[0].pCellInfo[nWx+1].nWidth)
++nWx;
nMaxWidth = pRowInfo[0].pCellInfo[nWx+1].nWidth;
}
-// Rectangle aRect( Point(nPosX,nPosY),
-// Size( pRowInfo[0].pCellInfo[nArrX].nWidth,
-// pRowInfo[nArrY].nHeight ) );
+// Rectangle aRect( Point(nPosX,nPosY),
+// Size( pRowInfo[0].pCellInfo[nArrX].nWidth,
+// pRowInfo[nArrY].nHeight ) );
// rectangle is in logical orientation
Rectangle aRect( nPosX, nPosY,
@@ -1018,19 +1018,19 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBot
long nSizeY = (long)(nSize*nPPTY);
if (nSizeY >= nRowHeight) nSizeY = nRowHeight-1;
- nSizeX *= nLayoutSign; // used only to add to rectangle values
+ nSizeX *= nLayoutSign; // used only to add to rectangle values
SvxShadowLocation eLoc = pAttr->GetLocation();
if ( bLayoutRTL )
{
- // Shadow location is specified as "visual" (right is always right),
- // so the attribute's location value is mirrored here and in FillInfo.
+ // Shadow location is specified as "visual" (right is always right),
+ // so the attribute's location value is mirrored here and in FillInfo.
switch (eLoc)
{
- case SVX_SHADOW_BOTTOMRIGHT: eLoc = SVX_SHADOW_BOTTOMLEFT; break;
- case SVX_SHADOW_BOTTOMLEFT: eLoc = SVX_SHADOW_BOTTOMRIGHT; break;
- case SVX_SHADOW_TOPRIGHT: eLoc = SVX_SHADOW_TOPLEFT; break;
- case SVX_SHADOW_TOPLEFT: eLoc = SVX_SHADOW_TOPRIGHT; break;
+ case SVX_SHADOW_BOTTOMRIGHT: eLoc = SVX_SHADOW_BOTTOMLEFT; break;
+ case SVX_SHADOW_BOTTOMLEFT: eLoc = SVX_SHADOW_BOTTOMRIGHT; break;
+ case SVX_SHADOW_TOPRIGHT: eLoc = SVX_SHADOW_TOPLEFT; break;
+ case SVX_SHADOW_TOPLEFT: eLoc = SVX_SHADOW_TOPRIGHT; break;
default:
{
// added to avoid warnings
@@ -1084,7 +1084,7 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBot
}
//
-// Loeschen
+// Loeschen
//
void ScOutputData::DrawClear()
@@ -1117,7 +1117,7 @@ void ScOutputData::DrawClear()
while ( nArrY+nSkip+2<nArrCount && pRowInfo[nArrY+nSkip+1].bChanged )
{
++nSkip;
- nRowHeight += pRowInfo[nArrY+nSkip].nHeight; // after incrementing
+ nRowHeight += pRowInfo[nArrY+nSkip].nHeight; // after incrementing
}
aRect = Rectangle( Point( nScrX, nPosY ),
@@ -1132,7 +1132,7 @@ void ScOutputData::DrawClear()
//
-// Linien
+// Linien
//
long lclGetSnappedX( OutputDevice& rDev, long nPosX, bool bSnapPixel )
@@ -1157,13 +1157,13 @@ void ScOutputData::DrawFrame()
Color aSingleColor;
BOOL bUseSingleColor = FALSE;
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
+ // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
BOOL bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode();
- // #107519# if a Calc OLE object is embedded in Draw/Impress, the VCL DrawMode is used
- // for display mode / B&W printing. The VCL DrawMode handling doesn't work for lines
- // that are drawn with DrawRect, so if the line/background bits are set, the DrawMode
- // must be reset and the border colors handled here.
+ // #107519# if a Calc OLE object is embedded in Draw/Impress, the VCL DrawMode is used
+ // for display mode / B&W printing. The VCL DrawMode handling doesn't work for lines
+ // that are drawn with DrawRect, so if the line/background bits are set, the DrawMode
+ // must be reset and the border colors handled here.
if ( ( nOldDrawMode & DRAWMODE_WHITEFILL ) && ( nOldDrawMode & DRAWMODE_BLACKLINE ) )
{
@@ -1174,7 +1174,7 @@ void ScOutputData::DrawFrame()
else if ( ( nOldDrawMode & DRAWMODE_SETTINGSFILL ) && ( nOldDrawMode & DRAWMODE_SETTINGSLINE ) )
{
pDev->SetDrawMode( nOldDrawMode & (~DRAWMODE_SETTINGSFILL) );
- aSingleColor = rStyleSettings.GetWindowTextColor(); // same as used in VCL for DRAWMODE_SETTINGSLINE
+ aSingleColor = rStyleSettings.GetWindowTextColor(); // same as used in VCL for DRAWMODE_SETTINGSLINE
bUseSingleColor = TRUE;
}
else if ( bCellContrast )
@@ -1186,7 +1186,7 @@ void ScOutputData::DrawFrame()
const Color* pForceColor = bUseSingleColor ? &aSingleColor : 0;
if (bAnyRotated)
- DrawRotatedFrame( pForceColor ); // removes the lines that must not be painted here
+ DrawRotatedFrame( pForceColor ); // removes the lines that must not be painted here
long nInitPosX = nScrX;
if ( bLayoutRTL )
@@ -1268,9 +1268,9 @@ void ScOutputData::DrawFrame()
pDev->SetDrawMode(nOldDrawMode);
}
-// -------------------------------------------------------------------------
+// -------------------------------------------------------------------------
-// Linie unter der Zelle
+// Linie unter der Zelle
const SvxBorderLine* lcl_FindHorLine( ScDocument* pDoc,
SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nRotDir,
@@ -1284,19 +1284,19 @@ const SvxBorderLine* lcl_FindHorLine( ScDocument* pDoc,
{
if ( nRotDir == SC_ROTDIR_LEFT )
{
- // Text nach links -> Linie von rechts
+ // Text nach links -> Linie von rechts
if ( nCol < MAXCOL )
++nCol;
else
- return NULL; // war nix
+ return NULL; // war nix
}
else
{
- // Text nach rechts -> Linie von links
+ // Text nach rechts -> Linie von links
if ( nCol > 0 )
--nCol;
else
- return NULL; // war nix
+ return NULL; // war nix
}
const ScPatternAttr* pPattern = pDoc->GetPattern( nCol, nRow, nTab );
const SfxItemSet* pCondSet = pDoc->GetCondResult( nCol, nRow, nTab );
@@ -1340,8 +1340,8 @@ void lcl_VertLineEnds( OutputDevice& rDev, const Point& rTop, const Point& rBott
rDev.SetLineColor(rColor); // PEN_NULL ???
rDev.SetFillColor(rColor);
- // Position oben/unten muss unabhaengig von der Liniendicke sein,
- // damit der Winkel stimmt (oder X-Position auch anpassen)
+ // Position oben/unten muss unabhaengig von der Liniendicke sein,
+ // damit der Winkel stimmt (oder X-Position auch anpassen)
long nTopPos = rTop.Y();
long nBotPos = rBottom.Y();
@@ -1351,7 +1351,7 @@ void lcl_VertLineEnds( OutputDevice& rDev, const Point& rTop, const Point& rBott
long nBotLeft = rBottom.X() + nXOffs;
long nBotRight = nBotLeft + nWidth - 1;
- // oben abschliessen
+ // oben abschliessen
if ( rTopLine.Prim() )
{
@@ -1359,15 +1359,15 @@ void lcl_VertLineEnds( OutputDevice& rDev, const Point& rTop, const Point& rBott
if (nLineW >= 2)
{
Point aTriangle[3];
- aTriangle[0] = Point( nTopLeft, nTopPos ); // wie aPoints[0]
- aTriangle[1] = Point( nTopRight, nTopPos ); // wie aPoints[1]
+ aTriangle[0] = Point( nTopLeft, nTopPos ); // wie aPoints[0]
+ aTriangle[1] = Point( nTopRight, nTopPos ); // wie aPoints[1]
aTriangle[2] = Point( rTop.X(), nTopPos - (nLineW - 1) / 2 );
Polygon aTriPoly( 3, aTriangle );
rDev.DrawPolygon( aTriPoly );
}
}
- // unten abschliessen
+ // unten abschliessen
if ( rBottomLine.Prim() )
{
@@ -1375,8 +1375,8 @@ void lcl_VertLineEnds( OutputDevice& rDev, const Point& rTop, const Point& rBott
if (nLineW >= 2)
{
Point aTriangle[3];
- aTriangle[0] = Point( nBotLeft, nBotPos ); // wie aPoints[3]
- aTriangle[1] = Point( nBotRight, nBotPos ); // wie aPoints[2]
+ aTriangle[0] = Point( nBotLeft, nBotPos ); // wie aPoints[3]
+ aTriangle[1] = Point( nBotRight, nBotPos ); // wie aPoints[2]
aTriangle[2] = Point( rBottom.X(), nBotPos - (nLineW - 1) / 2 + nLineW - 1 );
Polygon aTriPoly( 3, aTriangle );
rDev.DrawPolygon( aTriPoly );
@@ -1411,20 +1411,20 @@ void lcl_VertLine( OutputDevice& rDev, const Point& rTop, const Point& rBottom,
void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
{
- //! nRotMax speichern
+ //! nRotMax speichern
SCCOL nRotMax = nX2;
for (SCSIZE nRotY=0; nRotY<nArrCount; nRotY++)
if (pRowInfo[nRotY].nRotMaxCol != SC_ROTMAX_NONE && pRowInfo[nRotY].nRotMaxCol > nRotMax)
nRotMax = pRowInfo[nRotY].nRotMaxCol;
const ScPatternAttr* pPattern;
- const SfxItemSet* pCondSet;
+ const SfxItemSet* pCondSet;
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
+ // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
BOOL bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode();
- // color (pForceColor) is determined externally, including DrawMode changes
+ // color (pForceColor) is determined externally, including DrawMode changes
long nInitPosX = nScrX;
if ( bLayoutRTL )
@@ -1449,8 +1449,8 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
long nPosY = nScrY;
for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++)
{
- // Rotated wird auch 1 Zeile ueber/unter Changed gezeichnet, falls Teile
- // in die Zeile hineinragen...
+ // Rotated wird auch 1 Zeile ueber/unter Changed gezeichnet, falls Teile
+ // in die Zeile hineinragen...
RowInfo& rPrevRowInfo = pRowInfo[nArrY-1];
RowInfo& rThisRowInfo = pRowInfo[nArrY];
@@ -1468,7 +1468,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
SCCOL nX;
for (nX=0; nX<=nRotMax; nX++)
{
- if (nX==nX1) nPosX = nInitPosX; // calculated individually for preceding positions
+ if (nX==nX1) nPosX = nInitPosX; // calculated individually for preceding positions
USHORT nArrX = nX + 1;
@@ -1487,7 +1487,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
pInfo->pConditionSet = pCondSet;
}
- //! LastPattern etc.
+ //! LastPattern etc.
long nAttrRotate = pPattern->GetRotateVal( pCondSet );
SvxRotateMode eRotMode = (SvxRotateMode)((const SvxRotateModeItem&)
@@ -1495,7 +1495,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
if ( nAttrRotate )
{
- if (nX<nX1) // negative Position berechnen
+ if (nX<nX1) // negative Position berechnen
{
nPosX = nInitPosX;
SCCOL nCol = nX1;
@@ -1506,8 +1506,8 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
}
}
- // Startposition minus 1, damit auch schraege Hintergruende
- // zur Umrandung passen (Umrandung ist auf dem Gitter)
+ // Startposition minus 1, damit auch schraege Hintergruende
+ // zur Umrandung passen (Umrandung ist auf dem Gitter)
long nTop = nPosY - 1;
long nBottom = nPosY + nRowHeight - 1;
@@ -1516,12 +1516,12 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
long nBotLeft = nTopLeft;
long nBotRight = nTopRight;
- // inclusion of the sign here hasn't been decided yet
- // (if not, the extension of the non-rotated background must also be changed)
- double nRealOrient = nLayoutSign * nAttrRotate * F_PI18000; // 1/100th degrees
+ // inclusion of the sign here hasn't been decided yet
+ // (if not, the extension of the non-rotated background must also be changed)
+ double nRealOrient = nLayoutSign * nAttrRotate * F_PI18000; // 1/100th degrees
double nCos = cos( nRealOrient );
double nSin = sin( nRealOrient );
- //! begrenzen !!!
+ //! begrenzen !!!
long nSkew = (long) ( nRowHeight * nCos / nSin );
switch (eRotMode)
@@ -1559,23 +1559,23 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
ATTR_BACKGROUND, pCondSet );
if (bCellContrast)
{
- // high contrast for cell borders and backgrounds -> empty background
+ // high contrast for cell borders and backgrounds -> empty background
pBackground = ScGlobal::GetEmptyBrushItem();
}
const Color& rColor = pBackground->GetColor();
if ( rColor.GetTransparency() != 255 )
{
- // #95879# draw background only for the changed row itself
- // (background doesn't extend into other cells).
- // For the borders (rotated and normal), clipping should be
- // set if the row isn't changed, but at least the borders
- // don't cover the cell contents.
+ // #95879# draw background only for the changed row itself
+ // (background doesn't extend into other cells).
+ // For the borders (rotated and normal), clipping should be
+ // set if the row isn't changed, but at least the borders
+ // don't cover the cell contents.
if ( rThisRowInfo.bChanged )
{
Polygon aPoly( 4, aPoints );
- // ohne Pen wird bei DrawPolygon rechts und unten
- // ein Pixel weggelassen...
+ // ohne Pen wird bei DrawPolygon rechts und unten
+ // ein Pixel weggelassen...
if ( rColor.GetTransparency() == 0 )
pDev->SetLineColor(rColor);
else
@@ -1587,9 +1587,9 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
svx::frame::Style aTopLine, aBottomLine, aLeftLine, aRightLine;
- if ( nX < nX1 || nX > nX2 ) // Attribute in FillInfo nicht gesetzt
+ if ( nX < nX1 || nX > nX2 ) // Attribute in FillInfo nicht gesetzt
{
- //! Seitengrenzen fuer Druck beruecksichtigen !!!!!
+ //! Seitengrenzen fuer Druck beruecksichtigen !!!!!
const SvxBorderLine* pLeftLine;
const SvxBorderLine* pTopLine;
const SvxBorderLine* pRightLine;
@@ -1623,10 +1623,10 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
nPosX += nColWidth * nLayoutSign;
}
- // erst hinterher im zweiten Schritt die Linien fuer normale Ausgabe loeschen
+ // erst hinterher im zweiten Schritt die Linien fuer normale Ausgabe loeschen
nX = nX1 > 0 ? (nX1-1) : static_cast<SCCOL>(0);
- for (; nX<=nX2+1; nX++) // sichtbarer Teil +- 1
+ for (; nX<=nX2+1; nX++) // sichtbarer Teil +- 1
{
USHORT nArrX = nX + 1;
CellInfo& rInfo = rThisRowInfo.pCellInfo[nArrX];
@@ -1640,8 +1640,8 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
size_t nCol = lclGetArrayColFromCellInfoX( nArrX, nX1, nX2, bLayoutRTL );
- // horizontal: angrenzende Linie verlaengern
- // (nur, wenn die gedrehte Zelle eine Umrandung hat)
+ // horizontal: angrenzende Linie verlaengern
+ // (nur, wenn die gedrehte Zelle eine Umrandung hat)
USHORT nDir = rInfo.nRotateDir;
if ( rArray.GetCellStyleTop( nCol, nRow ).Prim() && eRotMode != SVX_ROTATE_MODE_TOP )
{
@@ -1687,7 +1687,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor )
pDev->SetClipRegion();
}
-// Drucker
+// Drucker
PolyPolygon ScOutputData::GetChangedArea()
{
@@ -1697,9 +1697,9 @@ PolyPolygon ScOutputData::GetChangedArea()
aDrawingRect.Left() = nScrX;
aDrawingRect.Right() = nScrX+nScrW-1;
- BOOL bHad = FALSE;
- long nPosY = nScrY;
- SCSIZE nArrY;
+ BOOL bHad = FALSE;
+ long nPosY = nScrY;
+ SCSIZE nArrY;
for (nArrY=1; nArrY+1<nArrCount; nArrY++)
{
RowInfo* pThisRowInfo = &pRowInfo[nArrY];
@@ -1735,9 +1735,9 @@ BOOL ScOutputData::SetChangedClip()
aDrawingRect.Left() = nScrX;
aDrawingRect.Right() = nScrX+nScrW-1;
- BOOL bHad = FALSE;
- long nPosY = nScrY;
- SCSIZE nArrY;
+ BOOL bHad = FALSE;
+ long nPosY = nScrY;
+ SCSIZE nArrY;
for (nArrY=1; nArrY+1<nArrCount; nArrY++)
{
RowInfo* pThisRowInfo = &pRowInfo[nArrY];
@@ -1770,8 +1770,8 @@ BOOL ScOutputData::SetChangedClip()
void ScOutputData::FindChanged()
{
- SCCOL nX;
- SCSIZE nArrY;
+ SCCOL nX;
+ SCSIZE nArrY;
BOOL bWasIdleDisabled = pDoc->IsIdleDisabled();
pDoc->DisableIdle( TRUE );
@@ -1825,7 +1825,7 @@ void ScOutputData::DrawMark( Window* pWin )
{
Rectangle aRect;
ScInvertMerger aInvert( pWin );
- //! additional method AddLineRect for ScInvertMerger?
+ //! additional method AddLineRect for ScInvertMerger?
long nPosY = nScrY;
for (SCSIZE nArrY=1; nArrY+1<nArrCount; nArrY++)
@@ -1906,12 +1906,12 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
BOOL bTop = FALSE;
BOOL bBottom = FALSE;
BOOL bLeft = FALSE;
- BOOL bRight = FALSE;
+ BOOL bRight = FALSE;
long nPosY = nScrY;
BOOL bNoStartY = ( nY1 < nRefStartY );
BOOL bNoEndY = FALSE;
- for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++) // loop to end for bNoEndY check
+ for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++) // loop to end for bNoEndY check
{
SCROW nY = pRowInfo[nArrY].nRowNo;
@@ -1937,7 +1937,7 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
long nPosX = nScrX;
if ( bLayoutRTL )
- nPosX += nMirrorW - 1; // always in pixels
+ nPosX += nMirrorW - 1; // always in pixels
for (SCCOL nX=nX1; nX<=nX2; nX++)
{
@@ -1995,7 +1995,7 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
pDoc->ExtendMerge( nRefStartX, nRefStartY, nRefEndX, nRefEndY, nTab );
if ( nRefStartX <= nVisX2 + 1 && nRefEndX >= nVisX1 &&
- nRefStartY <= nVisY2 + 1 && nRefEndY >= nVisY1 ) // +1 because it touches next cells left/top
+ nRefStartY <= nVisY2 + 1 && nRefEndY >= nVisY1 ) // +1 because it touches next cells left/top
{
long nMinX = nScrX;
long nMinY = nScrY;
@@ -2012,12 +2012,12 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
BOOL bTop = FALSE;
BOOL bBottom = FALSE;
BOOL bLeft = FALSE;
- BOOL bRight = FALSE;
+ BOOL bRight = FALSE;
long nPosY = nScrY;
BOOL bNoStartY = ( nY1 < nRefStartY );
BOOL bNoEndY = FALSE;
- for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++) // loop to end for bNoEndY check
+ for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++) // loop to end for bNoEndY check
{
SCROW nY = pRowInfo[nArrY].nRowNo;
@@ -2043,7 +2043,7 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
long nPosX = nScrX;
if ( bLayoutRTL )
- nPosX += nMirrorW - 1; // always in pixels
+ nPosX += nMirrorW - 1; // always in pixels
for (SCCOL nX=nX1; nX<=nX2+1; nX++)
{
@@ -2064,9 +2064,9 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
nMaxY >= nMinY )
{
if ( nType == SC_CAT_DELETE_ROWS )
- bLeft = bRight = bBottom = FALSE; //! dicke Linie ???
+ bLeft = bRight = bBottom = FALSE; //! dicke Linie ???
else if ( nType == SC_CAT_DELETE_COLS )
- bTop = bBottom = bRight = FALSE; //! dicke Linie ???
+ bTop = bBottom = bRight = FALSE; //! dicke Linie ???
pDev->SetLineColor( rColor );
if (bTop && bBottom && bLeft && bRight)
@@ -2108,17 +2108,17 @@ void ScOutputData::DrawChangeTrack()
ScChangeTrack* pTrack = pDoc->GetChangeTrack();
ScChangeViewSettings* pSettings = pDoc->GetChangeViewSettings();
if ( !pTrack || !pTrack->GetFirst() || !pSettings || !pSettings->ShowChanges() )
- return; // nix da oder abgeschaltet
+ return; // nix da oder abgeschaltet
ScActionColorChanger aColorChanger(*pTrack);
- // Clipping passiert von aussen
- //! ohne Clipping, nur betroffene Zeilen painten ??!??!?
+ // Clipping passiert von aussen
+ //! ohne Clipping, nur betroffene Zeilen painten ??!??!?
SCCOL nEndX = nX2;
SCROW nEndY = nY2;
- if ( nEndX < MAXCOL ) ++nEndX; // auch noch von der naechsten Zelle, weil die Markierung
- if ( nEndY < MAXROW ) ++nEndY; // in die jeweils vorhergehende Zelle hineinragt
+ if ( nEndX < MAXCOL ) ++nEndX; // auch noch von der naechsten Zelle, weil die Markierung
+ if ( nEndY < MAXROW ) ++nEndY; // in die jeweils vorhergehende Zelle hineinragt
ScRange aViewRange( nX1, nY1, nTab, nEndX, nEndY, nTab );
const ScChangeAction* pAction = pTrack->GetFirst();
while (pAction)
@@ -2174,7 +2174,7 @@ void ScOutputData::DrawNoteMarks()
long nInitPosX = nScrX;
if ( bLayoutRTL )
- nInitPosX += nMirrorW - 1; // always in pixels
+ nInitPosX += nMirrorW - 1; // always in pixels
long nLayoutSign = bLayoutRTL ? -1 : 1;
long nPosY = nScrY;
@@ -2221,7 +2221,7 @@ void ScOutputData::DrawNoteMarks()
long nMarkX = nPosX + ( pRowInfo[0].pCellInfo[nX+1].nWidth - 4 ) * nLayoutSign;
if ( bIsMerged || pInfo->bMerged )
{
- // if merged, add widths of all cells
+ // if merged, add widths of all cells
SCCOL nNextX = nX + 1;
while ( nNextX <= nX2 + 1 && pThisRowInfo->pCellInfo[nNextX+1].bHOverlapped )
{
@@ -2338,15 +2338,15 @@ void ScOutputData::DrawClipMarks()
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
if ( bUseStyleColor && rStyleSettings.GetHighContrastMode() )
{
- // use DrawMode to change the arrow's outline color
+ // use DrawMode to change the arrow's outline color
pDev->SetDrawMode( nOldDrawMode | DRAWMODE_SETTINGSLINE );
- // use text color also for the fill color
+ // use text color also for the fill color
aArrowFillCol.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
}
long nInitPosX = nScrX;
if ( bLayoutRTL )
- nInitPosX += nMirrorW - 1; // always in pixels
+ nInitPosX += nMirrorW - 1; // always in pixels
long nLayoutSign = bLayoutRTL ? -1 : 1;
Rectangle aCellRect;
@@ -2365,7 +2365,7 @@ void ScOutputData::DrawClipMarks()
{
if (pInfo->bHOverlapped || pInfo->bVOverlapped)
{
- // merge origin may be outside of visible area - use document functions
+ // merge origin may be outside of visible area - use document functions
SCCOL nOverX = nX;
SCROW nOverY = nY;
@@ -2427,7 +2427,7 @@ void ScOutputData::DrawClipMarks()
Point( nStartPosX+nOutWidth-1, nPosY+nOutHeight-1 ) );
}
- aCellRect.Bottom() -= 1; // don't paint over the cell grid
+ aCellRect.Bottom() -= 1; // don't paint over the cell grid
if ( bLayoutRTL )
aCellRect.Left() += 1;
else
@@ -2438,27 +2438,27 @@ void ScOutputData::DrawClipMarks()
if ( pInfo->nClipMark & ( bLayoutRTL ? SC_CLIPMARK_RIGHT : SC_CLIPMARK_LEFT ) )
{
- // visually left
+ // visually left
Rectangle aMarkRect = aCellRect;
aMarkRect.Right() = aCellRect.Left()+nMarkPixel-1;
#if 0
- //! Test
+ //! Test
pDev->SetLineColor(); pDev->SetFillColor(COL_YELLOW);
pDev->DrawRect(aMarkRect);
- //! Test
+ //! Test
#endif
SvxFont::DrawArrow( *pDev, aMarkRect, aMarkSize, aArrowFillCol, TRUE );
}
if ( pInfo->nClipMark & ( bLayoutRTL ? SC_CLIPMARK_LEFT : SC_CLIPMARK_RIGHT ) )
{
- // visually right
+ // visually right
Rectangle aMarkRect = aCellRect;
aMarkRect.Left() = aCellRect.Right()-nMarkPixel+1;
#if 0
- //! Test
+ //! Test
pDev->SetLineColor(); pDev->SetFillColor(COL_LIGHTGREEN);
pDev->DrawRect(aMarkRect);
- //! Test
+ //! Test
#endif
SvxFont::DrawArrow( *pDev, aMarkRect, aMarkSize, aArrowFillCol, FALSE );
}
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 6d40d304fb13..b717f7d993ef 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +79,10 @@
#include <math.h>
-//! Autofilter-Breite mit column.cxx zusammenfassen
-#define DROPDOWN_BITMAP_SIZE 17
+//! Autofilter-Breite mit column.cxx zusammenfassen
+#define DROPDOWN_BITMAP_SIZE 17
-#define DRAWTEXT_MAX 32767
+#define DRAWTEXT_MAX 32767
const USHORT SC_SHRINKAGAIN_MAX = 7;
@@ -93,78 +93,78 @@ const USHORT SC_SHRINKAGAIN_MAX = 7;
class ScDrawStringsVars
{
- ScOutputData* pOutput; // Verbindung
+ ScOutputData* pOutput; // Verbindung
- const ScPatternAttr* pPattern; // Attribute
- const SfxItemSet* pCondSet; // aus bedingter Formatierung
+ const ScPatternAttr* pPattern; // Attribute
+ const SfxItemSet* pCondSet; // aus bedingter Formatierung
- Font aFont; // aus Attributen erzeugt
- FontMetric aMetric;
- long nAscentPixel; // always pixels
- SvxCellOrientation eAttrOrient;
- SvxCellHorJustify eAttrHorJust;
- SvxCellVerJustify eAttrVerJust;
+ Font aFont; // aus Attributen erzeugt
+ FontMetric aMetric;
+ long nAscentPixel; // always pixels
+ SvxCellOrientation eAttrOrient;
+ SvxCellHorJustify eAttrHorJust;
+ SvxCellVerJustify eAttrVerJust;
const SvxMarginItem* pMargin;
- USHORT nIndent;
- BOOL bRotated;
+ USHORT nIndent;
+ BOOL bRotated;
- String aString; // Inhalte
- Size aTextSize;
- long nOriginalWidth;
+ String aString; // Inhalte
+ Size aTextSize;
+ long nOriginalWidth;
long nMaxDigitWidth;
long nSignWidth;
long nDotWidth;
long nExpWidth;
- ScBaseCell* pLastCell;
- ULONG nValueFormat;
- BOOL bLineBreak;
+ ScBaseCell* pLastCell;
+ ULONG nValueFormat;
+ BOOL bLineBreak;
BOOL bRepeat;
BOOL bShrink;
- BOOL bPixelToLogic;
- BOOL bCellContrast;
+ BOOL bPixelToLogic;
+ BOOL bCellContrast;
- Color aBackConfigColor; // used for ScPatternAttr::GetFont calls
- Color aTextConfigColor;
+ Color aBackConfigColor; // used for ScPatternAttr::GetFont calls
+ Color aTextConfigColor;
public:
ScDrawStringsVars(ScOutputData* pData, BOOL bPTL);
~ScDrawStringsVars();
- // SetPattern = ex-SetVars
- // SetPatternSimple: ohne Font
+ // SetPattern = ex-SetVars
+ // SetPatternSimple: ohne Font
- void SetPattern( const ScPatternAttr* pNew, const SfxItemSet* pSet, ScBaseCell* pCell, BYTE nScript );
- void SetPatternSimple( const ScPatternAttr* pNew, const SfxItemSet* pSet );
+ void SetPattern( const ScPatternAttr* pNew, const SfxItemSet* pSet, ScBaseCell* pCell, BYTE nScript );
+ void SetPatternSimple( const ScPatternAttr* pNew, const SfxItemSet* pSet );
- BOOL SetText( ScBaseCell* pCell ); // TRUE -> pOldPattern vergessen
+ BOOL SetText( ScBaseCell* pCell ); // TRUE -> pOldPattern vergessen
void SetTextToWidthOrHash( ScBaseCell* pCell, long nWidth );
- void SetAutoText( const String& rAutoText );
+ void SetAutoText( const String& rAutoText );
- const ScPatternAttr* GetPattern() const { return pPattern; }
- SvxCellOrientation GetOrient() const { return eAttrOrient; }
- SvxCellHorJustify GetHorJust() const { return eAttrHorJust; }
- SvxCellVerJustify GetVerJust() const { return eAttrVerJust; }
- const SvxMarginItem* GetMargin() const { return pMargin; }
+ const ScPatternAttr* GetPattern() const { return pPattern; }
+ SvxCellOrientation GetOrient() const { return eAttrOrient; }
+ SvxCellHorJustify GetHorJust() const { return eAttrHorJust; }
+ SvxCellVerJustify GetVerJust() const { return eAttrVerJust; }
+ const SvxMarginItem* GetMargin() const { return pMargin; }
- USHORT GetLeftTotal() const { return pMargin->GetLeftMargin() + nIndent; }
+ USHORT GetLeftTotal() const { return pMargin->GetLeftMargin() + nIndent; }
- const String& GetString() const { return aString; }
- const Size& GetTextSize() const { return aTextSize; }
- long GetOriginalWidth() const { return nOriginalWidth; }
+ const String& GetString() const { return aString; }
+ const Size& GetTextSize() const { return aTextSize; }
+ long GetOriginalWidth() const { return nOriginalWidth; }
- ULONG GetValueFormat() const { return nValueFormat; }
- BOOL GetLineBreak() const { return bLineBreak; }
+ ULONG GetValueFormat() const { return nValueFormat; }
+ BOOL GetLineBreak() const { return bLineBreak; }
BOOL IsRepeat() const { return bRepeat; }
BOOL IsShrink() const { return bShrink; }
- long GetAscent() const { return nAscentPixel; }
- BOOL IsRotated() const { return bRotated; }
+ long GetAscent() const { return nAscentPixel; }
+ BOOL IsRotated() const { return bRotated; }
void SetShrinkScale( long nScale, BYTE nScript );
- BOOL HasCondHeight() const { return pCondSet && SFX_ITEM_SET ==
+ BOOL HasCondHeight() const { return pCondSet && SFX_ITEM_SET ==
pCondSet->GetItemState( ATTR_FONT_HEIGHT, TRUE ); }
BOOL HasEditCharacters() const;
@@ -181,29 +181,29 @@ private:
//==================================================================
ScDrawStringsVars::ScDrawStringsVars(ScOutputData* pData, BOOL bPTL) :
- pOutput ( pData ),
- pPattern ( NULL ),
- pCondSet ( NULL ),
- eAttrOrient ( SVX_ORIENTATION_STANDARD ),
+ pOutput ( pData ),
+ pPattern ( NULL ),
+ pCondSet ( NULL ),
+ eAttrOrient ( SVX_ORIENTATION_STANDARD ),
eAttrHorJust( SVX_HOR_JUSTIFY_STANDARD ),
eAttrVerJust( SVX_VER_JUSTIFY_BOTTOM ),
- pMargin ( NULL ),
- nIndent ( 0 ),
- bRotated ( FALSE ),
+ pMargin ( NULL ),
+ nIndent ( 0 ),
+ bRotated ( FALSE ),
nOriginalWidth( 0 ),
nMaxDigitWidth( 0 ),
nSignWidth( 0 ),
nDotWidth( 0 ),
nExpWidth( 0 ),
- pLastCell ( NULL ),
+ pLastCell ( NULL ),
nValueFormat( 0 ),
- bLineBreak ( FALSE ),
+ bLineBreak ( FALSE ),
bRepeat ( FALSE ),
bShrink ( FALSE ),
bPixelToLogic( bPTL )
{
ScModule* pScMod = SC_MOD();
- // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
+ // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
bCellContrast = pOutput->bUseStyleColor &&
Application::GetSettings().GetStyleSettings().GetHighContrastMode();
@@ -269,13 +269,13 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet*
pPattern = pNew;
pCondSet = pSet;
- // pPattern auswerten
+ // pPattern auswerten
OutputDevice* pDev = pOutput->pDev;
OutputDevice* pRefDevice = pOutput->pRefDevice;
OutputDevice* pFmtDevice = pOutput->pFmtDevice;
- // Font
+ // Font
ScAutoFontColorMode eColorMode;
if ( pOutput->bUseStyleColor )
@@ -296,11 +296,11 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet*
&aBackConfigColor, &aTextConfigColor );
aFont.SetAlign(ALIGN_BASELINE);
- // Orientierung
+ // Orientierung
eAttrOrient = pPattern->GetCellOrientation( pCondSet );
- // alignment
+ // alignment
eAttrHorJust = (SvxCellHorJustify)((const SvxHorJustifyItem&)pPattern->GetItem( ATTR_HOR_JUSTIFY, pCondSet )).GetValue();
@@ -308,7 +308,7 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet*
if ( eAttrVerJust == SVX_VER_JUSTIFY_STANDARD )
eAttrVerJust = SVX_VER_JUSTIFY_BOTTOM;
- // line break
+ // line break
bLineBreak = ((const SfxBoolItem&)pPattern->GetItem( ATTR_LINEBREAK, pCondSet )).GetValue();
@@ -353,7 +353,7 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet*
}
aFont.SetOrientation( nRot );
- // Syntax-Modus
+ // Syntax-Modus
if (pOutput->bSyntaxMode)
pOutput->SetSyntaxColor( &aFont, pCell );
@@ -365,8 +365,8 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet*
aMetric = pFmtDevice->GetFontMetric();
//
- // Wenn auf dem Drucker das Leading 0 ist, gibt es Probleme
- // -> Metric vom Bildschirm nehmen (wie EditEngine!)
+ // Wenn auf dem Drucker das Leading 0 ist, gibt es Probleme
+ // -> Metric vom Bildschirm nehmen (wie EditEngine!)
//
if ( pFmtDevice->GetOutDevType() == OUTDEV_PRINTER && aMetric.GetIntLeading() == 0 )
@@ -388,16 +388,16 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet*
Color aOLineColor( ((const SvxOverlineItem&)pPattern->GetItem( ATTR_FONT_OVERLINE, pCondSet )).GetColor() );
pDev->SetOverlineColor( aOLineColor );
- // Zahlenformat
+ // Zahlenformat
// ULONG nOld = nValueFormat;
nValueFormat = pPattern->GetNumberFormat( pOutput->pDoc->GetFormatTable(), pCondSet );
-/* s.u.
+/* s.u.
if (nValueFormat != nOld)
- pLastCell = NULL; // immer neu formatieren
+ pLastCell = NULL; // immer neu formatieren
*/
- // Raender
+ // Raender
pMargin = (const SvxMarginItem*)&pPattern->GetItem( ATTR_MARGIN, pCondSet );
if ( eAttrHorJust == SVX_HOR_JUSTIFY_LEFT )
@@ -409,8 +409,8 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet*
bShrink = static_cast<const SfxBoolItem&>(pPattern->GetItem( ATTR_SHRINKTOFIT, pCondSet )).GetValue();
- // zumindest die Text-Groesse muss neu geholt werden
- //! unterscheiden, und den Text nicht neu vom Numberformatter holen?
+ // zumindest die Text-Groesse muss neu geholt werden
+ //! unterscheiden, und den Text nicht neu vom Numberformatter holen?
pLastCell = NULL;
}
@@ -421,15 +421,15 @@ void ScDrawStringsVars::SetPatternSimple( const ScPatternAttr* pNew, const SfxIt
nSignWidth = 0;
nDotWidth = 0;
nExpWidth = 0;
- // wird gerufen, wenn sich die Font-Variablen nicht aendern (!StringDiffer)
+ // wird gerufen, wenn sich die Font-Variablen nicht aendern (!StringDiffer)
pPattern = pNew;
- pCondSet = pSet; //! noetig ???
+ pCondSet = pSet; //! noetig ???
- // Zahlenformat
+ // Zahlenformat
ULONG nOld = nValueFormat;
-// nValueFormat = pPattern->GetNumberFormat( pFormatter );
+// nValueFormat = pPattern->GetNumberFormat( pFormatter );
const SfxPoolItem* pFormItem;
if ( !pCondSet || pCondSet->GetItemState(ATTR_VALUE_FORMAT,TRUE,&pFormItem) != SFX_ITEM_SET )
pFormItem = &pPattern->GetItem(ATTR_VALUE_FORMAT);
@@ -441,9 +441,9 @@ void ScDrawStringsVars::SetPatternSimple( const ScPatternAttr* pNew, const SfxIt
((SvxLanguageItem*)pLangItem)->GetLanguage() );
if (nValueFormat != nOld)
- pLastCell = NULL; // immer neu formatieren
+ pLastCell = NULL; // immer neu formatieren
- // Raender
+ // Raender
pMargin = (const SvxMarginItem*)&pPattern->GetItem( ATTR_MARGIN, pCondSet );
@@ -457,7 +457,7 @@ void ScDrawStringsVars::SetPatternSimple( const ScPatternAttr* pNew, const SfxIt
bShrink = static_cast<const SfxBoolItem&>(pPattern->GetItem( ATTR_SHRINKTOFIT, pCondSet )).GetValue();
}
-inline BOOL SameValue( ScBaseCell* pCell, ScBaseCell* pOldCell ) // pCell ist != 0
+inline BOOL SameValue( ScBaseCell* pCell, ScBaseCell* pOldCell ) // pCell ist != 0
{
return pOldCell && pOldCell->GetCellType() == CELLTYPE_VALUE &&
pCell->GetCellType() == CELLTYPE_VALUE &&
@@ -472,7 +472,7 @@ BOOL ScDrawStringsVars::SetText( ScBaseCell* pCell )
{
if ( !SameValue( pCell, pLastCell ) )
{
- pLastCell = pCell; // Zelle merken
+ pLastCell = pCell; // Zelle merken
Color* pColor;
ULONG nFormat = GetValueFormat();
@@ -490,14 +490,14 @@ BOOL ScDrawStringsVars::SetText( ScBaseCell* pCell )
{
OutputDevice* pDev = pOutput->pDev;
aFont.SetColor(*pColor);
- pDev->SetFont( aFont ); // nur fuer Ausgabe
+ pDev->SetFont( aFont ); // nur fuer Ausgabe
bChanged = TRUE;
- pLastCell = NULL; // naechstes Mal wieder hierherkommen
+ pLastCell = NULL; // naechstes Mal wieder hierherkommen
}
TextChanged();
}
- // sonst String/Groesse behalten
+ // sonst String/Groesse behalten
}
else
{
@@ -541,7 +541,7 @@ void ScDrawStringsVars::SetTextToWidthOrHash( ScBaseCell* pCell, long nWidth )
return;
}
- double fVal = (eType == CELLTYPE_VALUE) ?
+ double fVal = (eType == CELLTYPE_VALUE) ?
static_cast<ScValueCell*>(pCell)->GetValue() : static_cast<ScFormulaCell*>(pCell)->GetValue();
const SvNumberformat* pNumFormat = pOutput->pDoc->GetFormatTable()->GetEntry(nFormat);
@@ -584,7 +584,7 @@ void ScDrawStringsVars::SetTextToWidthOrHash( ScBaseCell* pCell, long nWidth )
if (nDecimalCount || nSignCount || nExpCount)
{
// Re-calculate.
- nNumDigits = static_cast<sal_uInt16>(nWidth / nMaxDigit);
+ nNumDigits = static_cast<sal_uInt16>(nWidth / nMaxDigit);
if (!pNumFormat->GetOutputString(fVal, nNumDigits, aString))
// Failed to get output string. Bail out.
return;
@@ -629,7 +629,7 @@ void ScDrawStringsVars::SetAutoText( const String& rAutoText )
if ( bPixelToLogic )
aTextSize = pRefDevice->LogicToPixel( aTextSize );
- pLastCell = NULL; // derselbe Text kann in der naechsten Zelle wieder passen
+ pLastCell = NULL; // derselbe Text kann in der naechsten Zelle wieder passen
}
long ScDrawStringsVars::GetMaxDigitWidth()
@@ -640,7 +640,7 @@ long ScDrawStringsVars::GetMaxDigitWidth()
sal_Char cZero = '0';
for (sal_Char i = 0; i < 10; ++i)
{
- sal_Char cDigit = cZero + i;
+ sal_Char cDigit = cZero + i;
long n = pOutput->pFmtDevice->GetTextWidth(String(cDigit));
nMaxDigitWidth = ::std::max(nMaxDigitWidth, n);
}
@@ -716,10 +716,10 @@ double ScOutputData::GetStretch()
{
if ( pRefDevice->IsMapMode() )
{
- // #95920# If a non-trivial MapMode is set, its scale is now already
- // taken into account in the OutputDevice's font handling
- // (OutputDevice::ImplNewFont, see #95414#).
- // The old handling below is only needed for pixel output.
+ // #95920# If a non-trivial MapMode is set, its scale is now already
+ // taken into account in the OutputDevice's font handling
+ // (OutputDevice::ImplNewFont, see #95414#).
+ // The old handling below is only needed for pixel output.
return 1.0;
}
@@ -741,7 +741,7 @@ double ScOutputData::GetStretch()
//==================================================================
//
-// output strings
+// output strings
//
void lcl_DoHyperlinkResult( OutputDevice* pDev, const Rectangle& rRect, ScBaseCell* pCell )
@@ -841,7 +841,7 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
bDoMerge = bIsTop;
// weiter solange versteckt
-/* if (!bDoMerge)
+/* if (!bDoMerge)
return FALSE;
*/
@@ -851,7 +851,7 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
BOOL bVOver = pInfo->bVOverlapped;
BOOL bHidden;
- while (bHOver) // nY konstant
+ while (bHOver) // nY konstant
{
--rOverX;
bHidden = pDoc->ColHidden(rOverX, nTab);
@@ -860,14 +860,14 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
if (rOverX >= nX1 && !bHidden)
{
-// rVirtPosX -= pRowInfo[0].pCellInfo[rOverX+1].nWidth;
+// rVirtPosX -= pRowInfo[0].pCellInfo[rOverX+1].nWidth;
bHOver = pRowInfo[nArrY].pCellInfo[rOverX+1].bHOverlapped;
bVOver = pRowInfo[nArrY].pCellInfo[rOverX+1].bVOverlapped;
}
else
{
-// if (!bClipVirt)
-// rVirtPosX -= (long) (pDoc->GetColWidth( rOverX, nTab ) * nPPTX);
+// if (!bClipVirt)
+// rVirtPosX -= (long) (pDoc->GetColWidth( rOverX, nTab ) * nPPTX);
USHORT nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr(
rOverX, rOverY, nTab, ATTR_MERGE_FLAG ))->GetValue();
bHOver = ((nOverlap & SC_MF_HOR) != 0);
@@ -883,21 +883,21 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
return FALSE;
if (nArrY>0)
- --nArrY; // lokale Kopie !
+ --nArrY; // lokale Kopie !
if (rOverX >= nX1 && rOverY >= nY1 &&
!pDoc->ColHidden(rOverX, nTab) &&
!pDoc->RowHidden(rOverY, nTab) &&
pRowInfo[nArrY].nRowNo == rOverY)
{
-// rVirtPosY -= pRowInfo[nArrY].nHeight;
+// rVirtPosY -= pRowInfo[nArrY].nHeight;
bHOver = pRowInfo[nArrY].pCellInfo[rOverX+1].bHOverlapped;
bVOver = pRowInfo[nArrY].pCellInfo[rOverX+1].bVOverlapped;
}
else
{
-// if (!bClipVirt)
-// rVirtPosY -= (long) (pDoc->GetRowHeight( rOverY, nTab ) * nPPTY);
+// if (!bClipVirt)
+// rVirtPosY -= (long) (pDoc->GetRowHeight( rOverY, nTab ) * nPPTY);
USHORT nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr(
rOverX, rOverY, nTab, ATTR_MERGE_FLAG ))->GetValue();
bHOver = ((nOverlap & SC_MF_HOR) != 0);
@@ -973,7 +973,7 @@ inline BOOL StringDiffer( const ScPatternAttr*& rpOldPattern, const ScPatternAtt
else if ( &rpNewPattern->GetItem( ATTR_FONT_RELIEF ) != &rpOldPattern->GetItem( ATTR_FONT_RELIEF ) )
return TRUE;
else if ( &rpNewPattern->GetItem( ATTR_BACKGROUND ) != &rpOldPattern->GetItem( ATTR_BACKGROUND ) )
- return TRUE; // needed with automatic text color
+ return TRUE; // needed with automatic text color
else
{
rpOldPattern = rpNewPattern;
@@ -1017,8 +1017,8 @@ BOOL ScOutputData::IsEmptyCellText( RowInfo* pThisRowInfo, SCCOL nX, SCROW nY )
if ( !bEmpty && ( nX < nX1 || nX > nX2 || !pThisRowInfo ) )
{
- // for the range nX1..nX2 in RowInfo, cell protection attribute is already evaluated
- // into bEmptyCellText in ScDocument::FillInfo / lcl_HidePrint (printfun)
+ // for the range nX1..nX2 in RowInfo, cell protection attribute is already evaluated
+ // into bEmptyCellText in ScDocument::FillInfo / lcl_HidePrint (printfun)
BOOL bIsPrint = ( eType == OUTTYPE_PRINTER );
@@ -1053,9 +1053,9 @@ void ScOutputData::GetVisibleCell( SCCOL nCol, SCROW nRow, SCTAB nTabP, ScBaseCe
BOOL ScOutputData::IsAvailable( SCCOL nX, SCROW nY )
{
- // apply the same logic here as in DrawStrings/DrawEdit:
- // Stop at non-empty or merged or overlapped cell,
- // where a note is empty as well as a cell that's hidden by protection settings
+ // apply the same logic here as in DrawStrings/DrawEdit:
+ // Stop at non-empty or merged or overlapped cell,
+ // where a note is empty as well as a cell that's hidden by protection settings
const ScBaseCell* pCell = pDoc->GetCell( ScAddress( nX, nY, nTab ) );
if ( pCell && pCell->GetCellType() != CELLTYPE_NOTE && !IsEmptyCellText( NULL, nX, nY ) )
@@ -1073,15 +1073,15 @@ BOOL ScOutputData::IsAvailable( SCCOL nX, SCROW nY )
return TRUE;
}
-// nX, nArrY: loop variables from DrawStrings / DrawEdit
-// nPosX, nPosY: corresponding positions for nX, nArrY
-// nCellX, nCellY: position of the cell that contains the text
-// nNeeded: Text width, including margin
-// rPattern: cell format at nCellX, nCellY
-// nHorJustify: horizontal alignment (visual) to determine which cells to use for long strings
-// bCellIsValue: if set, don't extend into empty cells
-// bBreak: if set, don't extend, and don't set clip marks (but rLeftClip/rRightClip is set)
-// bOverwrite: if set, also extend into non-empty cells (for rotated text)
+// nX, nArrY: loop variables from DrawStrings / DrawEdit
+// nPosX, nPosY: corresponding positions for nX, nArrY
+// nCellX, nCellY: position of the cell that contains the text
+// nNeeded: Text width, including margin
+// rPattern: cell format at nCellX, nCellY
+// nHorJustify: horizontal alignment (visual) to determine which cells to use for long strings
+// bCellIsValue: if set, don't extend into empty cells
+// bBreak: if set, don't extend, and don't set clip marks (but rLeftClip/rRightClip is set)
+// bOverwrite: if set, also extend into non-empty cells (for rotated text)
// rParam output: various area parameters.
void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY,
@@ -1320,7 +1320,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
BOOL bWasIdleDisabled = pDoc->IsIdleDisabled();
pDoc->DisableIdle( TRUE );
- Size aMinSize = pRefDevice->PixelToLogic(Size(0,100)); // erst darueber wird ausgegeben
+ Size aMinSize = pRefDevice->PixelToLogic(Size(0,100)); // erst darueber wird ausgegeben
// UINT32 nMinHeight = aMinSize.Height() / 200; // 1/2 Pixel
ScDrawStringsVars aVars( this, bPixelToLogic );
@@ -1329,7 +1329,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
long nInitPosX = nScrX;
if ( bLayoutRTL )
- nInitPosX += nMirrorW - 1; // pixels
+ nInitPosX += nMirrorW - 1; // pixels
long nLayoutSign = bLayoutRTL ? -1 : 1;
SCCOL nLastContentCol = MAXCOL;
@@ -1338,7 +1338,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
nLastContentCol - pDoc->GetEmptyLinesInBlock( nX2+1, nY1, nTab, MAXCOL, nY2, nTab, DIR_RIGHT ) );
SCCOL nLoopStartX = nX1;
if ( nX1 > 0 )
- --nLoopStartX; // start before nX1 for rest of long text to the left
+ --nLoopStartX; // start before nX1 for rest of long text to the left
// variables for GetOutputArea
OutputAreaParam aAreaParam;
@@ -1351,7 +1351,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
const SfxItemSet* pOldCondSet = NULL;
BYTE nOldScript = 0;
- // alternative pattern instances in case we need to modify the pattern
+ // alternative pattern instances in case we need to modify the pattern
// before processing the cell value.
::boost::ptr_vector<ScPatternAttr> aAltPatterns;
@@ -1372,13 +1372,13 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1];
BOOL bEmpty = nX < nX1 || pInfo->bEmptyCellText;
- SCCOL nCellX = nX; // position where the cell really starts
+ SCCOL nCellX = nX; // position where the cell really starts
SCROW nCellY = nY;
BOOL bDoCell = FALSE;
BOOL bNeedEdit = FALSE;
//
- // Part of a merged cell?
+ // Part of a merged cell?
//
BOOL bOverlapped = ( pInfo->bHOverlapped || pInfo->bVOverlapped );
@@ -1386,7 +1386,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
{
bEmpty = TRUE;
- SCCOL nOverX; // start of the merged cells
+ SCCOL nOverX; // start of the merged cells
SCROW nOverY;
BOOL bVisChanged = !pRowInfo[nArrY-1].bChanged;
if (GetMergeOrigin( nX,nY, nArrY, nOverX,nOverY, bVisChanged ))
@@ -1400,7 +1400,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
}
//
- // Rest of a long text further to the left?
+ // Rest of a long text further to the left?
//
if ( bEmpty && !bMergeEmpty && nX < nX1 && !bOverlapped )
@@ -1419,12 +1419,12 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
}
//
- // Rest of a long text further to the right?
+ // Rest of a long text further to the right?
//
if ( bEmpty && !bMergeEmpty && nX == nX2 && !bOverlapped )
{
- // don't have to look further than nLastContentCol
+ // don't have to look further than nLastContentCol
SCCOL nTempX=nX;
while (nTempX < nLastContentCol && IsEmptyCellText( pThisRowInfo, nTempX, nY ))
@@ -1440,21 +1440,21 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
}
//
- // normal visible cell
+ // normal visible cell
//
if (!bEmpty)
bDoCell = TRUE;
//
- // don't output the cell that's being edited
+ // don't output the cell that's being edited
//
if ( bDoCell && bEditMode && nCellX == nEditCol && nCellY == nEditRow )
bDoCell = FALSE;
//
- // output the cell text
+ // output the cell text
//
ScBaseCell* pCell = NULL;
@@ -1463,7 +1463,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
if ( nCellY == nY && nCellX == nX && nCellX >= nX1 && nCellX <= nX2 )
pCell = pThisRowInfo->pCellInfo[nCellX+1].pCell;
else
- GetVisibleCell( nCellX, nCellY, nTab, pCell ); // get from document
+ GetVisibleCell( nCellX, nCellY, nTab, pCell ); // get from document
if ( !pCell )
bDoCell = FALSE;
else if ( pCell->GetCellType() == CELLTYPE_EDIT )
@@ -1485,13 +1485,13 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
pCondSet = pDoc->GetCondResult( nCellX, nCellY, nTab );
}
}
- else // get from document
+ else // get from document
{
pPattern = pDoc->GetPattern( nCellX, nCellY, nTab );
pCondSet = pDoc->GetCondResult( nCellX, nCellY, nTab );
}
- if (pCell->HasValueData() &&
+ if (pCell->HasValueData() &&
static_cast<const SfxBoolItem&>(
pPattern->GetItem(ATTR_LINEBREAK, pCondSet)).GetValue())
{
@@ -1518,7 +1518,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
nOldScript = nScript;
}
- // use edit engine for rotated, stacked or mixed-script text
+ // use edit engine for rotated, stacked or mixed-script text
if ( aVars.GetOrient() == SVX_ORIENTATION_STACKED ||
aVars.IsRotated() || IsAmbiguousScript(nScript) )
bNeedEdit = TRUE;
@@ -1531,7 +1531,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
if ( aVars.SetText(pCell) )
pOldPattern = NULL;
bNeedEdit = aVars.HasEditCharacters() ||
- (bFormulaCell && ((ScFormulaCell*)pCell)->IsMultilineResult());
+ (bFormulaCell && ((ScFormulaCell*)pCell)->IsMultilineResult());
}
long nTotalMargin = 0;
if (bDoCell && !bNeedEdit)
@@ -1549,14 +1549,14 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
( bCellIsValue ? SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_LEFT );
if ( eOutHorJust == SVX_HOR_JUSTIFY_BLOCK || eOutHorJust == SVX_HOR_JUSTIFY_REPEAT )
- eOutHorJust = SVX_HOR_JUSTIFY_LEFT; // repeat is not yet implemented
+ eOutHorJust = SVX_HOR_JUSTIFY_LEFT; // repeat is not yet implemented
BOOL bBreak = ( aVars.GetLineBreak() || aVars.GetHorJust() == SVX_HOR_JUSTIFY_BLOCK );
BOOL bRepeat = aVars.IsRepeat() && !bBreak;
BOOL bShrink = aVars.IsShrink() && !bBreak && !bRepeat;
- nTotalMargin =
- static_cast<long>(aVars.GetLeftTotal() * nPPTX) +
+ nTotalMargin =
+ static_cast<long>(aVars.GetLeftTotal() * nPPTX) +
static_cast<long>(aVars.GetMargin()->GetRightMargin() * nPPTX);
nNeededWidth = aVars.GetTextSize().Width() + nTotalMargin;
@@ -1630,7 +1630,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
}
}
- // use edit engine if automatic line breaks are needed
+ // use edit engine if automatic line breaks are needed
if ( bBreak )
{
if ( aVars.GetOrient() == SVX_ORIENTATION_STANDARD )
@@ -1646,13 +1646,13 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
}
if (bNeedEdit)
{
- // mark the cell in CellInfo to be drawn in DrawEdit:
- // Cells to the left are marked directly, cells to the
- // right are handled by the flag for nX2
+ // mark the cell in CellInfo to be drawn in DrawEdit:
+ // Cells to the left are marked directly, cells to the
+ // right are handled by the flag for nX2
SCCOL nMarkX = ( nCellX <= nX2 ) ? nCellX : nX2;
RowInfo* pMarkRowInfo = ( nCellY == nY ) ? pThisRowInfo : &pRowInfo[0];
pMarkRowInfo->pCellInfo[nMarkX+1].bEditEngine = TRUE;
- bDoCell = FALSE; // don't draw here
+ bDoCell = FALSE; // don't draw here
}
if ( bDoCell )
{
@@ -1666,12 +1666,12 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
if ( nNeededWidth <= aAreaParam.maClipRect.GetWidth() )
aAreaParam.mbLeftClip = aAreaParam.mbRightClip = FALSE;
- // If the "###" replacement doesn't fit into the cells, no clip marks
- // are shown, as the "###" already denotes too little space.
- // The rectangles from the first GetOutputArea call remain valid.
+ // If the "###" replacement doesn't fit into the cells, no clip marks
+ // are shown, as the "###" already denotes too little space.
+ // The rectangles from the first GetOutputArea call remain valid.
}
- long nJustPosX = aAreaParam.maAlignRect.Left(); // "justified" - effect of alignment will be added
+ long nJustPosX = aAreaParam.maAlignRect.Left(); // "justified" - effect of alignment will be added
long nJustPosY = aAreaParam.maAlignRect.Top();
long nAvailWidth = aAreaParam.maAlignRect.GetWidth();
long nOutHeight = aAreaParam.maAlignRect.GetHeight();
@@ -1684,7 +1684,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
}
if ( aAreaParam.maClipRect.Right() > nScrX + nScrW )
{
- aAreaParam.maClipRect.Right() = nScrX + nScrW; //! minus one?
+ aAreaParam.maClipRect.Right() = nScrX + nScrW; //! minus one?
aAreaParam.mbRightClip = TRUE;
}
@@ -1703,10 +1703,10 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
}
//
- // horizontalen Platz testen
+ // horizontalen Platz testen
//
- BOOL bRightAdjusted = FALSE; // to correct text width calculation later
+ BOOL bRightAdjusted = FALSE; // to correct text width calculation later
BOOL bNeedEditEngine = FALSE;
if ( !bNeedEditEngine && !bOutside )
{
@@ -1765,8 +1765,8 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
if ( nTestClipHeight > nOutHeight )
{
- // kein vertikales Clipping beim Drucken von Zellen mit
- // optimaler Hoehe, ausser bei Groesse in bedingter Formatierung
+ // kein vertikales Clipping beim Drucken von Zellen mit
+ // optimaler Hoehe, ausser bei Groesse in bedingter Formatierung
if ( eType != OUTTYPE_PRINTER ||
( pDoc->GetRowFlags( nCellY, nTab ) & CR_MANUALSIZE ) ||
( aVars.HasCondHeight() ) )
@@ -1775,9 +1775,9 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
if ( bHClip || bVClip )
{
- // nur die betroffene Dimension clippen,
- // damit bei nicht-proportionalem Resize nicht alle
- // rechtsbuendigen Zahlen abgeschnitten werden:
+ // nur die betroffene Dimension clippen,
+ // damit bei nicht-proportionalem Resize nicht alle
+ // rechtsbuendigen Zahlen abgeschnitten werden:
if (!bHClip)
{
@@ -1790,8 +1790,8 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
aAreaParam.maClipRect.Bottom() = nScrY+nScrH;
}
- // aClipRect is not used after SetClipRegion/IntersectClipRegion,
- // so it can be modified here
+ // aClipRect is not used after SetClipRegion/IntersectClipRegion,
+ // so it can be modified here
if (bPixelToLogic)
aAreaParam.maClipRect = pRefDevice->PixelToLogic( aAreaParam.maClipRect );
@@ -1830,19 +1830,19 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
Point aDrawTextPos( nJustPosX, nJustPosY );
if ( bPixelToLogic )
{
- // undo text width adjustment in pixels
+ // undo text width adjustment in pixels
if (bRightAdjusted)
aDrawTextPos.X() += aVars.GetTextSize().Width();
aDrawTextPos = pRefDevice->PixelToLogic( aDrawTextPos );
- // redo text width adjustment in logic units
+ // redo text width adjustment in logic units
if (bRightAdjusted)
aDrawTextPos.X() -= aVars.GetOriginalWidth();
}
- // in Metafiles immer DrawTextArray, damit die Positionen mit
- // aufgezeichnet werden (fuer nicht-proportionales Resize):
+ // in Metafiles immer DrawTextArray, damit die Positionen mit
+ // aufgezeichnet werden (fuer nicht-proportionales Resize):
String aString = aVars.GetString();
if (bMetaFile || pFmtDevice != pDev || aZoomX != aZoomY)
@@ -1893,14 +1893,14 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
pDoc->DisableIdle( bWasIdleDisabled );
}
-// -------------------------------------------------------------------------------
+// -------------------------------------------------------------------------------
-void lcl_ClearEdit( EditEngine& rEngine ) // Text und Attribute
+void lcl_ClearEdit( EditEngine& rEngine ) // Text und Attribute
{
rEngine.SetUpdateMode( FALSE );
rEngine.SetText(EMPTY_STRING);
- // keine Para-Attribute uebrigbehalten...
+ // keine Para-Attribute uebrigbehalten...
const SfxItemSet& rPara = rEngine.GetParaAttribs(0);
if (rPara.Count())
rEngine.SetParaAttribs( 0,
@@ -1987,7 +1987,7 @@ long lcl_GetEditSize( EditEngine& rEngine, BOOL bWidth, BOOL bSwap, long nAttrRo
// assuming standard mode, otherwise width isn't used
- double nRealOrient = nAttrRotate * F_PI18000; // 1/100th degrees
+ double nRealOrient = nAttrRotate * F_PI18000; // 1/100th degrees
double nAbsCos = fabs( cos( nRealOrient ) );
double nAbsSin = fabs( sin( nRealOrient ) );
if ( bWidth )
@@ -2085,19 +2085,19 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
{
vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, pDev->GetExtOutDevData() );
- Size aMinSize = pRefDevice->PixelToLogic(Size(0,100)); // erst darueber wird ausgegeben
+ Size aMinSize = pRefDevice->PixelToLogic(Size(0,100)); // erst darueber wird ausgegeben
// UINT32 nMinHeight = aMinSize.Height() / 200; // 1/2 Pixel
ScModule* pScMod = SC_MOD();
sal_Int32 nConfBackColor = pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor;
- // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
+ // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
BOOL bCellContrast = bUseStyleColor &&
Application::GetSettings().GetStyleSettings().GetHighContrastMode();
ScFieldEditEngine* pEngine = NULL;
BOOL bHyphenatorSet = FALSE;
const ScPatternAttr* pOldPattern = NULL;
- const SfxItemSet* pOldCondSet = NULL;
+ const SfxItemSet* pOldCondSet = NULL;
ScBaseCell* pCell = NULL;
Size aRefOne = pRefDevice->PixelToLogic(Size(1,1));
@@ -2114,32 +2114,32 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
}
long nLayoutSign = bLayoutRTL ? -1 : 1;
- //! store nLastContentCol as member!
+ //! store nLastContentCol as member!
SCCOL nLastContentCol = MAXCOL;
if ( nX2 < MAXCOL )
nLastContentCol = sal::static_int_cast<SCCOL>(
nLastContentCol - pDoc->GetEmptyLinesInBlock( nX2+1, nY1, nTab, MAXCOL, nY2, nTab, DIR_RIGHT ) );
long nRowPosY = nScrY;
- for (SCSIZE nArrY=0; nArrY+1<nArrCount; nArrY++) // 0 fuer Reste von zusammengefassten
+ for (SCSIZE nArrY=0; nArrY+1<nArrCount; nArrY++) // 0 fuer Reste von zusammengefassten
{
RowInfo* pThisRowInfo = &pRowInfo[nArrY];
// long nCellHeight = (long) pThisRowInfo->nHeight;
- if (nArrY==1) nRowPosY = nScrY; // vorher wird einzeln berechnet
+ if (nArrY==1) nRowPosY = nScrY; // vorher wird einzeln berechnet
if ( pThisRowInfo->bChanged || nArrY==0 )
{
long nPosX = 0;
- for (SCCOL nX=0; nX<=nX2; nX++) // wegen Ueberhaengen
+ for (SCCOL nX=0; nX<=nX2; nX++) // wegen Ueberhaengen
{
- if (nX==nX1) nPosX = nInitPosX; // positions before nX1 are calculated individually
+ if (nX==nX1) nPosX = nInitPosX; // positions before nX1 are calculated individually
- CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1];
+ CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1];
if (pInfo->bEditEngine)
{
SCROW nY = pThisRowInfo->nRowNo;
- SCCOL nCellX = nX; // position where the cell really starts
+ SCCOL nCellX = nX; // position where the cell really starts
SCROW nCellY = nY;
BOOL bDoCell = FALSE;
@@ -2148,7 +2148,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
{
nPosY = nScrY;
nY = pRowInfo[1].nRowNo;
- SCCOL nOverX; // start of the merged cells
+ SCCOL nOverX; // start of the merged cells
SCROW nOverY;
if (GetMergeOrigin( nX,nY, 1, nOverX,nOverY, TRUE ))
{
@@ -2159,7 +2159,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
}
else if ( nX == nX2 && !pThisRowInfo->pCellInfo[nX+1].pCell )
{
- // Rest of a long text further to the right?
+ // Rest of a long text further to the right?
SCCOL nTempX=nX;
while (nTempX < nLastContentCol && IsEmptyCellText( pThisRowInfo, nTempX, nY ))
@@ -2193,7 +2193,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
pCondSet = rCellInfo.pConditionSet;
pCell = rCellInfo.pCell;
}
- else // get from document
+ else // get from document
{
pPattern = pDoc->GetPattern( nCellX, nCellY, nTab );
pCondSet = pDoc->GetCondResult( nCellX, nCellY, nTab );
@@ -2207,16 +2207,16 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
BOOL bHidden = FALSE;
//
- // Create EditEngine
+ // Create EditEngine
//
if (!pEngine)
{
- // Ein RefDevice muss auf jeden Fall gesetzt werden,
- // sonst legt sich die EditEngine ein VirtualDevice an!
+ // Ein RefDevice muss auf jeden Fall gesetzt werden,
+ // sonst legt sich die EditEngine ein VirtualDevice an!
pEngine = new ScFieldEditEngine( pDoc->GetEnginePool() );
pEngine->SetUpdateMode( FALSE );
- pEngine->SetRefDevice( pFmtDevice ); // always set
+ pEngine->SetRefDevice( pFmtDevice ); // always set
ULONG nCtrl = pEngine->GetControlWord();
if ( bShowSpellErrors )
nCtrl |= EE_CNTRL_ONLINESPELLING;
@@ -2231,7 +2231,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
(EEHorizontalTextDirection)pDoc->GetEditTextDirection( nTab ) );
}
else
- lcl_ClearEdit( *pEngine ); // also calls SetUpdateMode(FALSE)
+ lcl_ClearEdit( *pEngine ); // also calls SetUpdateMode(FALSE)
BOOL bCellIsValue = lcl_SafeIsValue(pCell);
@@ -2259,9 +2259,9 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
}
if ( eOrient==SVX_ORIENTATION_STANDARD && nAttrRotate )
{
- //! Flag setzen, um die Zelle in DrawRotated wiederzufinden ?
- //! (oder Flag schon bei DrawBackground, dann hier keine Abfrage)
- bHidden = TRUE; // gedreht wird getrennt ausgegeben
+ //! Flag setzen, um die Zelle in DrawRotated wiederzufinden ?
+ //! (oder Flag schon bei DrawBackground, dann hier keine Abfrage)
+ bHidden = TRUE; // gedreht wird getrennt ausgegeben
}
BOOL bAsianVertical = ( eOrient == SVX_ORIENTATION_STACKED &&
@@ -2282,25 +2282,25 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
( bCellIsValue ? SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_LEFT );
if ( eOutHorJust == SVX_HOR_JUSTIFY_BLOCK || eOutHorJust == SVX_HOR_JUSTIFY_REPEAT )
- eOutHorJust = SVX_HOR_JUSTIFY_LEFT; // repeat is not yet implemented
+ eOutHorJust = SVX_HOR_JUSTIFY_LEFT; // repeat is not yet implemented
-//! if ( !bHidden && eType == OUTTYPE_PRINTER &&
-//! pDev->GetOutDevType() == OUTDEV_WINDOW &&
-//! ((const SvxFontHeightItem&)pPattern->
-//! GetItem(ATTR_FONT_HEIGHT)).GetHeight() <= nMinHeight )
-//! {
-//! Point aPos( nStartX, nStartY );
-//! pDev->DrawPixel( aPos,
-//! ((const SvxColorItem&)pPattern->
-//! GetItem( ATTR_FONT_COLOR )).GetValue() );
-//! bHidden = TRUE;
-//! }
+//! if ( !bHidden && eType == OUTTYPE_PRINTER &&
+//! pDev->GetOutDevType() == OUTDEV_WINDOW &&
+//! ((const SvxFontHeightItem&)pPattern->
+//! GetItem(ATTR_FONT_HEIGHT)).GetHeight() <= nMinHeight )
+//! {
+//! Point aPos( nStartX, nStartY );
+//! pDev->DrawPixel( aPos,
+//! ((const SvxColorItem&)pPattern->
+//! GetItem( ATTR_FONT_COLOR )).GetValue() );
+//! bHidden = TRUE;
+//! }
if (!bHidden)
{
- //! mirror margin values for RTL?
- //! move margin down to after final GetOutputArea call
+ //! mirror margin values for RTL?
+ //! move margin down to after final GetOutputArea call
const SvxMarginItem* pMargin = (const SvxMarginItem*)
&pPattern->GetItem(ATTR_MARGIN, pCondSet);
@@ -2330,17 +2330,17 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
OutputAreaParam aAreaParam;
//
- // Initial page size - large for normal text, cell size for automatic line breaks
+ // Initial page size - large for normal text, cell size for automatic line breaks
//
Size aPaperSize = Size( 1000000, 1000000 );
if ( bBreak || eOrient == SVX_ORIENTATION_STACKED || bAsianVertical )
{
- //! also stacked, AsianVertical
+ //! also stacked, AsianVertical
- // call GetOutputArea with nNeeded=0, to get only the cell width
+ // call GetOutputArea with nNeeded=0, to get only the cell width
- //! handle nArrY == 0
+ //! handle nArrY == 0
GetOutputArea( nXForPos, nArrYForPos, nPosX, nPosY, nCellX, nCellY, 0,
*pPattern, sal::static_int_cast<USHORT>(eOutHorJust),
bCellIsValue, true, false, aAreaParam );
@@ -2354,8 +2354,8 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
if (bAsianVertical && bBreak)
{
- // add some extra height (default margin value) for safety
- // as long as GetEditArea isn't used below
+ // add some extra height (default margin value) for safety
+ // as long as GetEditArea isn't used below
long nExtraHeight = (long)( 20 * nPPTY );
aPaperSize.Height() = aAreaParam.maAlignRect.GetHeight() - nTopM - nBottomM + nExtraHeight;
}
@@ -2379,7 +2379,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
pEngine->SetPaperSize(aPaperSize);
//
- // Fill the EditEngine (cell attributes and text)
+ // Fill the EditEngine (cell attributes and text)
//
SvxCellVerJustify eVerJust = (SvxCellVerJustify)((const SvxVerJustifyItem&)
@@ -2409,7 +2409,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
if ( !bHyphenatorSet && ((const SfxBoolItem&)pSet->Get(EE_PARA_HYPHENATE)).GetValue() )
{
- // set hyphenator the first time it is needed
+ // set hyphenator the first time it is needed
com::sun::star::uno::Reference<com::sun::star::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() );
pEngine->SetHyphenator( xXHyphenator );
bHyphenatorSet = TRUE;
@@ -2422,9 +2422,9 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
pEngine->SetBackgroundColor( aBackCol );
}
- // horizontal alignment now may depend on cell content
- // (for values with number formats with mixed script types)
- // -> always set adjustment
+ // horizontal alignment now may depend on cell content
+ // (for values with number formats with mixed script types)
+ // -> always set adjustment
SvxAdjust eSvxAdjust = SVX_ADJUST_LEFT;
if (eOrient==SVX_ORIENTATION_STACKED)
@@ -2438,7 +2438,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
eSvxAdjust = bCellIsValue ? SVX_ADJUST_RIGHT : SVX_ADJUST_LEFT;
break;
case SVX_HOR_JUSTIFY_LEFT:
- case SVX_HOR_JUSTIFY_REPEAT: // nicht implementiert
+ case SVX_HOR_JUSTIFY_REPEAT: // nicht implementiert
eSvxAdjust = SVX_ADJUST_LEFT;
break;
case SVX_HOR_JUSTIFY_RIGHT:
@@ -2470,7 +2470,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
}
pEngine->SetDefaultItem( SvxAdjustItem( eSvxAdjust, EE_PARA_JUST ) );
- // Read content from cell
+ // Read content from cell
BOOL bWrapFields = FALSE;
if (pCell)
@@ -2486,13 +2486,13 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
if ( bBreak && !bAsianVertical && pData->HasField() )
{
- // Fields aren't wrapped, so clipping is enabled to prevent
- // a field from being drawn beyond the cell size
+ // Fields aren't wrapped, so clipping is enabled to prevent
+ // a field from being drawn beyond the cell size
bWrapFields = TRUE;
}
}
- else
+ else
{
DBG_ERROR("pData == 0");
}
@@ -2518,7 +2518,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
if ( bSyntaxMode )
SetEditSyntaxColor( *pEngine, pCell );
else if ( bUseStyleColor && bForceAutoColor )
- lcl_SetEditColor( *pEngine, COL_AUTO ); //! or have a flag at EditEngine
+ lcl_SetEditColor( *pEngine, COL_AUTO ); //! or have a flag at EditEngine
}
else
{
@@ -2526,10 +2526,10 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
}
pEngine->SetVertical( bAsianVertical );
- pEngine->SetUpdateMode( TRUE ); // after SetText, before CalcTextWidth/GetTextHeight
+ pEngine->SetUpdateMode( TRUE ); // after SetText, before CalcTextWidth/GetTextHeight
//
- // Get final output area using the calculated width
+ // Get final output area using the calculated width
//
long nEngineWidth;
@@ -2568,7 +2568,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
ShrinkEditEngine( *pEngine, aAreaParam.maAlignRect,
nLeftM, nTopM, nRightM, nBottomM, bWidth,
sal::static_int_cast<USHORT>(eOrient), 0, bPixelToLogic,
- nEngineWidth, nEngineHeight, nNeededPixel,
+ nEngineWidth, nEngineHeight, nNeededPixel,
aAreaParam.mbLeftClip, aAreaParam.mbRightClip );
}
@@ -2622,7 +2622,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
nNeededPixel = nEngineWidth;
nNeededPixel += nLeftM + nRightM;
- // No clip marks if "###" doesn't fit (same as in DrawStrings)
+ // No clip marks if "###" doesn't fit (same as in DrawStrings)
}
if ( eOutHorJust != SVX_HOR_JUSTIFY_LEFT && eOrient == SVX_ORIENTATION_STANDARD )
@@ -2643,9 +2643,9 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
if ( bBreak || eOrient != SVX_ORIENTATION_STANDARD || bAsianVertical )
{
- // text with automatic breaks is aligned only within the
- // edit engine's paper size, the output of the whole area
- // is always left-aligned
+ // text with automatic breaks is aligned only within the
+ // edit engine's paper size, the output of the whole area
+ // is always left-aligned
nStartX += nLeftM;
}
@@ -2667,7 +2667,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
}
if ( aAreaParam.maClipRect.Right() > nScrX + nScrW )
{
- aAreaParam.maClipRect.Right() = nScrX + nScrW; //! minus one?
+ aAreaParam.maClipRect.Right() = nScrX + nScrW; //! minus one?
aAreaParam.mbRightClip = true;
}
@@ -2678,7 +2678,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
if ( bWrapFields )
{
- // Fields in a cell with automatic breaks: clip to cell width
+ // Fields in a cell with automatic breaks: clip to cell width
bClip = TRUE;
}
@@ -2693,7 +2693,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
bClip = TRUE;
}
- Size aCellSize; // output area, excluding margins, in logical units
+ Size aCellSize; // output area, excluding margins, in logical units
if (bPixelToLogic)
aCellSize = pRefDevice->PixelToLogic( Size( nOutWidth, nOutHeight ) );
else
@@ -2705,9 +2705,9 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
(ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE);
BOOL bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1;
- // Don't clip for text height when printing rows with optimal height,
- // except when font size is from conditional formatting.
- //! Allow clipping when vertically merged?
+ // Don't clip for text height when printing rows with optimal height,
+ // except when font size is from conditional formatting.
+ //! Allow clipping when vertically merged?
if ( eType != OUTTYPE_PRINTER ||
( pDoc->GetRowFlags( nCellY, nTab ) & CR_MANUALSIZE ) ||
( pCondSet && SFX_ITEM_SET ==
@@ -2716,12 +2716,12 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
else
bSimClip = TRUE;
- // Show clip marks if height is at least 5pt too small and
- // there are several lines of text.
- // Not for asian vertical text, because that would interfere
- // with the default right position of the text.
- // Only with automatic line breaks, to avoid having to find
- // the cells with the horizontal end of the text again.
+ // Show clip marks if height is at least 5pt too small and
+ // there are several lines of text.
+ // Not for asian vertical text, because that would interfere
+ // with the default right position of the text.
+ // Only with automatic line breaks, to avoid having to find
+ // the cells with the horizontal end of the text again.
if ( nEngineHeight - aCellSize.Height() > 100 &&
( bBreak || eOrient == SVX_ORIENTATION_STACKED ) &&
!bAsianVertical && bMarkClipped &&
@@ -2730,14 +2730,14 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
CellInfo* pClipMarkCell = NULL;
if ( bMerged )
{
- // anywhere in the merged area...
+ // anywhere in the merged area...
SCCOL nClipX = ( nX < nX1 ) ? nX1 : nX;
pClipMarkCell = &pRowInfo[(nArrY != 0) ? nArrY : 1].pCellInfo[nClipX+1];
}
else
pClipMarkCell = &pThisRowInfo->pCellInfo[nX+1];
- pClipMarkCell->nClipMark |= SC_CLIPMARK_RIGHT; //! also allow left?
+ pClipMarkCell->nClipMark |= SC_CLIPMARK_RIGHT; //! also allow left?
bAnyClipped = TRUE;
long nMarkPixel = (long)( SC_CLIPMARK_SIZE * nPPTX );
@@ -2770,7 +2770,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
else
aLogicClip = aAreaParam.maClipRect;
- if (bClip) // bei bSimClip nur aClipRect initialisieren
+ if (bClip) // bei bSimClip nur aClipRect initialisieren
{
if (bMetaFile)
{
@@ -2792,7 +2792,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
long nAvailWidth = aCellSize.Width();
// space for AutoFilter is already handled in GetOutputArea
- // horizontal alignment
+ // horizontal alignment
if (eOrient==SVX_ORIENTATION_STANDARD && !bAsianVertical)
{
@@ -2845,7 +2845,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
if (eVerJust==SVX_VER_JUSTIFY_BOTTOM ||
eVerJust==SVX_VER_JUSTIFY_STANDARD)
{
- //! if pRefDevice != pFmtDevice, keep heights in logic units,
+ //! if pRefDevice != pFmtDevice, keep heights in logic units,
//! only converting margin?
if (bPixelToLogic)
@@ -2866,7 +2866,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
else
aLogicStart.Y() += nTopM + (aCellSize.Height() - nEngineHeight) / 2;
}
- else // top
+ else // top
{
if (bPixelToLogic)
aLogicStart.Y() += pRefDevice->PixelToLogic(Size(0,nTopM)).Height();
@@ -2899,9 +2899,9 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
if ( pEngine->IsRightToLeft( 0 ) )
{
- // For right-to-left, EditEngine always calculates its lines
- // beginning from the right edge, but EditLine::nStartPosX is
- // of USHORT type, so the PaperSize must be limited to USHRT_MAX.
+ // For right-to-left, EditEngine always calculates its lines
+ // beginning from the right edge, but EditLine::nStartPosX is
+ // of USHORT type, so the PaperSize must be limited to USHRT_MAX.
Size aLogicPaper = pEngine->GetPaperSize();
if ( aLogicPaper.Width() > USHRT_MAX )
{
@@ -2915,8 +2915,8 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
if ( bSimClip && !nOriVal && !bAsianVertical )
{
- // kein hartes Clipping, aber nur die betroffenen
- // Zeilen ausgeben
+ // kein hartes Clipping, aber nur die betroffenen
+ // Zeilen ausgeben
Point aDocStart = aLogicClip.TopLeft();
aDocStart -= aLogicStart;
@@ -2926,8 +2926,8 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
{
if (bAsianVertical)
{
- // with SetVertical, the start position is top left of
- // the whole output area, not the text itself
+ // with SetVertical, the start position is top left of
+ // the whole output area, not the text itself
aLogicStart.X() -= pEngine->GetPaperSize().Width();
}
pEngine->Draw( pDev, aLogicStart, nOriVal );
@@ -2977,14 +2977,14 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
delete pEngine;
if (bAnyRotated)
- DrawRotated(bPixelToLogic); //! von aussen rufen ?
+ DrawRotated(bPixelToLogic); //! von aussen rufen ?
}
-// -------------------------------------------------------------------------------
+// -------------------------------------------------------------------------------
void ScOutputData::DrawRotated(BOOL bPixelToLogic)
{
- //! nRotMax speichern
+ //! nRotMax speichern
SCCOL nRotMax = nX2;
for (SCSIZE nRotY=0; nRotY<nArrCount; nRotY++)
if (pRowInfo[nRotY].nRotMaxCol != SC_ROTMAX_NONE && pRowInfo[nRotY].nRotMaxCol > nRotMax)
@@ -2993,16 +2993,16 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
ScModule* pScMod = SC_MOD();
sal_Int32 nConfBackColor = pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor;
- // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
+ // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
BOOL bCellContrast = bUseStyleColor &&
Application::GetSettings().GetStyleSettings().GetHighContrastMode();
ScFieldEditEngine* pEngine = NULL;
BOOL bHyphenatorSet = FALSE;
const ScPatternAttr* pPattern;
- const SfxItemSet* pCondSet;
+ const SfxItemSet* pCondSet;
const ScPatternAttr* pOldPattern = NULL;
- const SfxItemSet* pOldCondSet = NULL;
+ const SfxItemSet* pOldCondSet = NULL;
ScBaseCell* pCell = NULL;
long nInitPosX = nScrX;
@@ -3018,18 +3018,18 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
long nLayoutSign = bLayoutRTL ? -1 : 1;
long nRowPosY = nScrY;
- for (SCSIZE nArrY=0; nArrY+1<nArrCount; nArrY++) // 0 fuer Reste von zusammengefassten
+ for (SCSIZE nArrY=0; nArrY+1<nArrCount; nArrY++) // 0 fuer Reste von zusammengefassten
{
RowInfo* pThisRowInfo = &pRowInfo[nArrY];
long nCellHeight = (long) pThisRowInfo->nHeight;
- if (nArrY==1) nRowPosY = nScrY; // vorher wird einzeln berechnet
+ if (nArrY==1) nRowPosY = nScrY; // vorher wird einzeln berechnet
if ( ( pThisRowInfo->bChanged || nArrY==0 ) && pThisRowInfo->nRotMaxCol != SC_ROTMAX_NONE )
{
long nPosX = 0;
for (SCCOL nX=0; nX<=nRotMax; nX++)
{
- if (nX==nX1) nPosX = nInitPosX; // positions before nX1 are calculated individually
+ if (nX==nX1) nPosX = nInitPosX; // positions before nX1 are calculated individually
CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1];
if ( pInfo->nRotateDir != SC_ROTDIR_NONE )
@@ -3045,11 +3045,11 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
{
if (!pEngine)
{
- // Ein RefDevice muss auf jeden Fall gesetzt werden,
- // sonst legt sich die EditEngine ein VirtualDevice an!
+ // Ein RefDevice muss auf jeden Fall gesetzt werden,
+ // sonst legt sich die EditEngine ein VirtualDevice an!
pEngine = new ScFieldEditEngine( pDoc->GetEnginePool() );
pEngine->SetUpdateMode( FALSE );
- pEngine->SetRefDevice( pFmtDevice ); // always set
+ pEngine->SetRefDevice( pFmtDevice ); // always set
ULONG nCtrl = pEngine->GetControlWord();
if ( bShowSpellErrors )
nCtrl |= EE_CNTRL_ONLINESPELLING;
@@ -3064,12 +3064,12 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
(EEHorizontalTextDirection)pDoc->GetEditTextDirection( nTab ) );
}
else
- lcl_ClearEdit( *pEngine ); // also calls SetUpdateMode(FALSE)
+ lcl_ClearEdit( *pEngine ); // also calls SetUpdateMode(FALSE)
long nPosY = nRowPosY;
BOOL bVisChanged = FALSE;
- //! Rest von zusammengefasster Zelle weiter oben funktioniert nicht!
+ //! Rest von zusammengefasster Zelle weiter oben funktioniert nicht!
BOOL bFromDoc = FALSE;
pPattern = pInfo->pPatternAttr;
@@ -3087,7 +3087,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
GetVisibleCell( nX, nY, nTab, pCell );
if ( !pCell || IsEmptyCellText( pThisRowInfo, nX, nY ) )
- bHidden = TRUE; // nRotateDir is also set without a cell
+ bHidden = TRUE; // nRotateDir is also set without a cell
long nCellWidth = (long) pRowInfo[0].pCellInfo[nX+1].nWidth;
@@ -3123,7 +3123,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
}
long nCellStartX = nStartX;
- // Ersatzdarstellung fuer zu kleinen Text weggelassen
+ // Ersatzdarstellung fuer zu kleinen Text weggelassen
if (!bHidden)
{
@@ -3134,7 +3134,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
else
nOutHeight = (long) ( pDoc->GetRowHeight(nY,nTab) * nPPTY );
- if ( bMerged ) // Zusammengefasst
+ if ( bMerged ) // Zusammengefasst
{
SCCOL nCountX = pMerge->GetColMerge();
for (SCCOL i=1; i<nCountX; i++)
@@ -3174,7 +3174,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
if ( !bHyphenatorSet && ((const SfxBoolItem&)pSet->Get(EE_PARA_HYPHENATE)).GetValue() )
{
- // set hyphenator the first time it is needed
+ // set hyphenator the first time it is needed
com::sun::star::uno::Reference<com::sun::star::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() );
pEngine->SetHyphenator( xXHyphenator );
bHyphenatorSet = TRUE;
@@ -3187,9 +3187,9 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
pEngine->SetBackgroundColor( aBackCol );
}
- // Raender
+ // Raender
- //! Position und Papersize auf EditUtil umstellen !!!
+ //! Position und Papersize auf EditUtil umstellen !!!
const SvxMarginItem* pMargin = (const SvxMarginItem*)
&pPattern->GetItem(ATTR_MARGIN, pCondSet);
@@ -3198,7 +3198,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
nIndent = ((const SfxUInt16Item&)pPattern->
GetItem(ATTR_INDENT, pCondSet)).GetValue();
- long nTotalHeight = nOutHeight; // ohne Rand abzuziehen
+ long nTotalHeight = nOutHeight; // ohne Rand abzuziehen
if ( bPixelToLogic )
nTotalHeight = pRefDevice->PixelToLogic(Size(0,nTotalHeight)).Height();
@@ -3211,7 +3211,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
nOutWidth -= nLeftM + nRightM;
nOutHeight -= nTopM + nBottomM;
- // Rotation schon hier, um bei Umbruch auch PaperSize anzupassen
+ // Rotation schon hier, um bei Umbruch auch PaperSize anzupassen
long nAttrRotate = 0;
double nSin = 0.0;
double nCos = 1.0;
@@ -3226,12 +3226,12 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
pPattern->GetItem(ATTR_ROTATE_MODE, pCondSet)).GetValue();
if ( nAttrRotate == 18000 )
- eRotMode = SVX_ROTATE_MODE_STANDARD; // keinen Ueberlauf
+ eRotMode = SVX_ROTATE_MODE_STANDARD; // keinen Ueberlauf
if ( bLayoutRTL )
nAttrRotate = -nAttrRotate;
- double nRealOrient = nAttrRotate * F_PI18000; // 1/100 Grad
+ double nRealOrient = nAttrRotate * F_PI18000; // 1/100 Grad
nCos = cos( nRealOrient );
nSin = sin( nRealOrient );
}
@@ -3239,15 +3239,15 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
Size aPaperSize = Size( 1000000, 1000000 );
if (eOrient==SVX_ORIENTATION_STACKED)
- aPaperSize.Width() = nOutWidth; // zum Zentrieren
+ aPaperSize.Width() = nOutWidth; // zum Zentrieren
else if (bBreak)
{
if (nAttrRotate)
{
- //! richtige PaperSize fuer Umbruch haengt von der Zeilenzahl
- //! ab, solange die Zeilen nicht einzeln versetzt ausgegeben
- //! werden koennen -> darum unbegrenzt, also kein Umbruch.
- //! Mit versetzten Zeilen waere das folgende richtig:
+ //! richtige PaperSize fuer Umbruch haengt von der Zeilenzahl
+ //! ab, solange die Zeilen nicht einzeln versetzt ausgegeben
+ //! werden koennen -> darum unbegrenzt, also kein Umbruch.
+ //! Mit versetzten Zeilen waere das folgende richtig:
aPaperSize.Width() = (long)(nOutHeight / fabs(nSin));
}
else if (eOrient == SVX_ORIENTATION_STANDARD)
@@ -3258,9 +3258,9 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
if (bPixelToLogic)
pEngine->SetPaperSize(pRefDevice->PixelToLogic(aPaperSize));
else
- pEngine->SetPaperSize(aPaperSize); // Scale ist immer 1
+ pEngine->SetPaperSize(aPaperSize); // Scale ist immer 1
- // Daten aus Zelle lesen
+ // Daten aus Zelle lesen
if (pCell)
{
@@ -3297,14 +3297,14 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
if ( bSyntaxMode )
SetEditSyntaxColor( *pEngine, pCell );
else if ( bUseStyleColor && bForceAutoColor )
- lcl_SetEditColor( *pEngine, COL_AUTO ); //! or have a flag at EditEngine
+ lcl_SetEditColor( *pEngine, COL_AUTO ); //! or have a flag at EditEngine
}
else
{
DBG_ERROR("pCell == NULL");
}
- pEngine->SetUpdateMode( TRUE ); // after SetText, before CalcTextWidth/GetTextHeight
+ pEngine->SetUpdateMode( TRUE ); // after SetText, before CalcTextWidth/GetTextHeight
long nEngineWidth = (long) pEngine->CalcTextWidth();
long nEngineHeight = pEngine->GetTextHeight();
@@ -3343,7 +3343,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
if (bPixelToLogic)
pEngine->SetPaperSize(pRefDevice->PixelToLogic(aPaperSize));
else
- pEngine->SetPaperSize(aPaperSize); // Scale ist immer 1
+ pEngine->SetPaperSize(aPaperSize); // Scale ist immer 1
//pEngine->QuickFormatDoc( TRUE );
nEngineWidth = (long) pEngine->CalcTextWidth();
nEngineHeight = pEngine->GetTextHeight();
@@ -3354,7 +3354,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
long nRealWidth = nEngineWidth;
long nRealHeight = nEngineHeight;
- // wenn gedreht, Groesse anpassen
+ // wenn gedreht, Groesse anpassen
if (nAttrRotate)
{
double nAbsCos = fabs( nCos );
@@ -3365,29 +3365,29 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
nRealHeight * nAbsSin );
else
nEngineWidth = (long) ( nRealHeight / nAbsSin );
- //! begrenzen !!!
+ //! begrenzen !!!
nEngineHeight = (long) ( nRealHeight * nAbsCos +
nRealWidth * nAbsSin );
}
- if (!nAttrRotate) // hier nur gedrehter Text
- bHidden = TRUE; //! vorher abfragen !!!
+ if (!nAttrRotate) // hier nur gedrehter Text
+ bHidden = TRUE; //! vorher abfragen !!!
- //! weglassen, was nicht hereinragt
+ //! weglassen, was nicht hereinragt
if (!bHidden)
{
BOOL bClip = FALSE;
Size aClipSize = Size( nScrX+nScrW-nStartX, nScrY+nScrH-nStartY );
- // weiterschreiben
+ // weiterschreiben
Size aCellSize;
if (bPixelToLogic)
aCellSize = pRefDevice->PixelToLogic( Size( nOutWidth, nOutHeight ) );
else
- aCellSize = Size( nOutWidth, nOutHeight ); // Scale ist 1
+ aCellSize = Size( nOutWidth, nOutHeight ); // Scale ist 1
long nGridWidth = nEngineWidth;
BOOL bNegative = FALSE;
@@ -3409,7 +3409,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
SvxCellHorJustify eOutHorJust = eHorJust;
if ( eRotMode != SVX_ROTATE_MODE_STANDARD )
eOutHorJust = bNegative ? SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_LEFT;
- long nNeededWidth = nGridWidth; // in pixel for GetOutputArea
+ long nNeededWidth = nGridWidth; // in pixel for GetOutputArea
if ( bPixelToLogic )
nNeededWidth = pRefDevice->LogicToPixel(Size(nNeededWidth,0)).Width();
@@ -3454,7 +3454,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
{
//! Clipping unnoetig, wenn links am Fenster
- bClip = TRUE; // nur Rest ausgeben!
+ bClip = TRUE; // nur Rest ausgeben!
if (nStartX<nScrX)
{
long nDif = nScrX - nStartX;
@@ -3475,15 +3475,15 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
}
}
- bClip = TRUE; // always clip at the window/page border
+ bClip = TRUE; // always clip at the window/page border
//Rectangle aClipRect;
if (bClip)
{
if ( nAttrRotate /* && eRotMode != SVX_ROTATE_MODE_STANDARD */ )
{
- // gedrehten, ausgerichteten Text nur an den
- // Seitengrenzen clippen
+ // gedrehten, ausgerichteten Text nur an den
+ // Seitengrenzen clippen
nClipStartX = nScrX;
aClipSize.Width() = nScrW;
}
@@ -3493,7 +3493,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
Point(nClipStartX,nClipStartY), aClipSize ) );
else
aAreaParam.maClipRect = Rectangle(Point(nClipStartX, nClipStartY),
- aClipSize ); // Scale = 1
+ aClipSize ); // Scale = 1
if (bMetaFile)
{
@@ -3534,7 +3534,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
if (nAvailWidth<nComp) nAvailWidth=nComp;
}
- // horizontale Ausrichtung
+ // horizontale Ausrichtung
if (eOrient==SVX_ORIENTATION_STANDARD && !nAttrRotate)
{
@@ -3560,7 +3560,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
}
else
{
- // bei gedrehtem Text ist Standard zentriert
+ // bei gedrehtem Text ist Standard zentriert
if (eHorJust==SVX_HOR_JUSTIFY_RIGHT)
aLogicStart.X() += nAvailWidth - nEngineWidth;
else if (eHorJust==SVX_HOR_JUSTIFY_CENTER ||
@@ -3619,7 +3619,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
double nAddY = 0.0;
if ( nCos > 0.0 && eRotMode != SVX_ROTATE_MODE_STANDARD )
{
- //! begrenzen !!!
+ //! begrenzen !!!
double nH = nRealHeight * nCos;
nAddX += nH * ( nCos / fabs(nSin) );
}
@@ -3634,7 +3634,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
if ( eRotMode != SVX_ROTATE_MODE_STANDARD )
{
- //! begrenzen !!!
+ //! begrenzen !!!
double nSkew = nTotalHeight * nCos / fabs(nSin);
if ( eRotMode == SVX_ROTATE_MODE_CENTER )
nAddX -= nSkew * 0.5;
@@ -3650,7 +3650,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
if ( nSin > 0.0 )
nUp = aCellSize.Height() - nEngineHeight;
}
- else // BOTTOM / STANDARD
+ else // BOTTOM / STANDARD
{
if ( nSin < 0.0 )
nUp = aCellSize.Height() - nEngineHeight;
@@ -3663,13 +3663,13 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
aLogicStart.Y() += (long) nAddY;
}
- // bSimClip is not used here (because nOriVal is set)
+ // bSimClip is not used here (because nOriVal is set)
if ( pEngine->IsRightToLeft( 0 ) )
{
- // For right-to-left, EditEngine always calculates its lines
- // beginning from the right edge, but EditLine::nStartPosX is
- // of USHORT type, so the PaperSize must be limited to USHRT_MAX.
+ // For right-to-left, EditEngine always calculates its lines
+ // beginning from the right edge, but EditLine::nStartPosX is
+ // of USHORT type, so the PaperSize must be limited to USHRT_MAX.
Size aLogicPaper = pEngine->GetPaperSize();
if ( aLogicPaper.Width() > USHRT_MAX )
{
diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx
index 2c368937e156..953e648e0cf0 100644
--- a/sc/source/ui/view/output3.cxx
+++ b/sc/source/ui/view/output3.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ Point ScOutputData::PrePrintDrawingLayer(long nLogStX, long nLogStY )
aRect.Top() = (long) (aRect.Top() * HMM_PER_TWIPS);
aRect.Right() = (long) (aRect.Right() * HMM_PER_TWIPS);
aRect.Bottom() = (long) (aRect.Bottom() * HMM_PER_TWIPS);
-
+
if(pViewShell || pDrawView)
{
SdrView* pLocalDrawView = (pDrawView) ? pDrawView : pViewShell->GetSdrView();
@@ -122,7 +122,7 @@ Point ScOutputData::PrePrintDrawingLayer(long nLogStX, long nLogStY )
}
// #i72502#
-void ScOutputData::PostPrintDrawingLayer(const Point& rMMOffset) // #i74768#
+void ScOutputData::PostPrintDrawingLayer(const Point& rMMOffset) // #i74768#
{
// #i74768# just use offset as in PrintDrawingLayer() to also get the form controls
// painted with offset
@@ -156,14 +156,14 @@ void ScOutputData::PostPrintDrawingLayer(const Point& rMMOffset) // #i74768#
void ScOutputData::PrintDrawingLayer(const sal_uInt16 nLayer, const Point& rMMOffset)
{
bool bHideAllDrawingLayer(false);
-
+
if(pViewShell || pDrawView)
{
SdrView* pLocalDrawView = (pDrawView) ? pDrawView : pViewShell->GetSdrView();
if(pLocalDrawView)
{
- bHideAllDrawingLayer = pLocalDrawView->getHideOle() && pLocalDrawView->getHideChart()
+ bHideAllDrawingLayer = pLocalDrawView->getHideOle() && pLocalDrawView->getHideChart()
&& pLocalDrawView->getHideDraw() && pLocalDrawView->getHideFormControl();
}
}
@@ -240,14 +240,14 @@ void ScOutputData::DrawSelectiveObjects(const sal_uInt16 nLayer)
return;
}
-// Teile nur fuer Bildschirm
+// Teile nur fuer Bildschirm
// #109985#
void ScOutputData::DrawingSingle(const sal_uInt16 nLayer)
{
- BOOL bHad = FALSE;
- long nPosY = nScrY;
- SCSIZE nArrY;
+ BOOL bHad = FALSE;
+ long nPosY = nScrY;
+ SCSIZE nArrY;
for (nArrY=1; nArrY+1<nArrCount; nArrY++)
{
RowInfo* pThisRowInfo = &pRowInfo[nArrY];
diff --git a/sc/source/ui/view/pfuncache.cxx b/sc/source/ui/view/pfuncache.cxx
index 6a206ef3eb13..a15d607e6776 100644
--- a/sc/source/ui/view/pfuncache.cxx
+++ b/sc/source/ui/view/pfuncache.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -49,8 +49,8 @@ ScPrintFuncCache::ScPrintFuncCache( ScDocShell* pD, const ScMarkData& rMark,
nTotalPages( 0 ),
bLocInitialized( false )
{
- // page count uses the stored cell widths for the printer anyway,
- // so ScPrintFunc with the document's printer can be used to count
+ // page count uses the stored cell widths for the printer anyway,
+ // so ScPrintFunc with the document's printer can be used to count
SfxPrinter* pPrinter = pDocSh->GetPrinter();
@@ -74,7 +74,7 @@ ScPrintFuncCache::ScPrintFuncCache( ScDocShell* pD, const ScMarkData& rMark,
{
ScPrintFunc aFunc( pDocSh, pPrinter, nTab, nAttrPage, 0, pSelRange, &aSelection.GetOptions() );
nThisTab = aFunc.GetTotalPages();
- nFirstAttr[nTab] = aFunc.GetFirstPageNo(); // from page style or previous sheet
+ nFirstAttr[nTab] = aFunc.GetFirstPageNo(); // from page style or previous sheet
}
else
nFirstAttr[nTab] = nAttrPage;
@@ -151,7 +151,7 @@ bool ScPrintFuncCache::FindLocation( const ScAddress& rCell, ScPrintPageLocation
return true;
}
}
- return false; // not found
+ return false; // not found
}
BOOL ScPrintFuncCache::IsSameSelection( const ScPrintSelectionStatus& rStatus ) const
@@ -179,7 +179,7 @@ long ScPrintFuncCache::GetTabStart( SCTAB nTab ) const
long ScPrintFuncCache::GetDisplayStart( SCTAB nTab ) const
{
- //! merge with lcl_GetDisplayStart in preview?
+ //! merge with lcl_GetDisplayStart in preview?
long nDisplayStart = 0;
ScDocument* pDoc = pDocSh->GetDocument();
diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx
index 0e792b2bb279..472d3457d1a5 100644
--- a/sc/source/ui/view/pgbrksh.cxx
+++ b/sc/source/ui/view/pgbrksh.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index a65f86ffed2c..82f0c62da2dd 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 83fdab9000e6..f96aa09cd6ad 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 "drwlayer.hxx"
#include "scmod.hxx"
#include "globstr.hrc"
-#include "sc.hrc" // fuer ShellInvalidate
+#include "sc.hrc" // fuer ShellInvalidate
#include "AccessibleDocumentPagePreview.hxx"
#include <vcl/lineinfo.hxx>
#include <svx/algitem.hxx>
@@ -79,7 +79,7 @@
//==================================================================
-#define SC_PREVIEW_SHADOWSIZE 2
+#define SC_PREVIEW_SHADOWSIZE 2
long lcl_GetDisplayStart( SCTAB nTab, ScDocument* pDoc, long* pPages )
{
@@ -148,10 +148,10 @@ __EXPORT ScPreview::~ScPreview()
delete pLocationData;
}
-void ScPreview::UpdateDrawView() // nTab muss richtig sein
+void ScPreview::UpdateDrawView() // nTab muss richtig sein
{
ScDocument* pDoc = pDocShell->GetDocument();
- ScDrawLayer* pModel = pDoc->GetDrawLayer(); // ist nicht 0
+ ScDrawLayer* pModel = pDoc->GetDrawLayer(); // ist nicht 0
// #114135#
if ( pModel )
@@ -159,12 +159,12 @@ void ScPreview::UpdateDrawView() // nTab muss richtig sein
SdrPage* pPage = pModel->GetPage(nTab);
if ( pDrawView && ( !pDrawView->GetSdrPageView() || pDrawView->GetSdrPageView()->GetPage() != pPage ) )
{
- // die angezeigte Page der DrawView umzustellen (s.u.) funktioniert nicht ?!?
+ // die angezeigte Page der DrawView umzustellen (s.u.) funktioniert nicht ?!?
delete pDrawView;
pDrawView = NULL;
}
- if ( !pDrawView ) // neu anlegen?
+ if ( !pDrawView ) // neu anlegen?
{
pDrawView = new FmFormView( pModel, this );
// #55259# die DrawView uebernimmt den Design-Modus vom Model
@@ -174,7 +174,7 @@ void ScPreview::UpdateDrawView() // nTab muss richtig sein
pDrawView->ShowSdrPage(pPage);
}
#if 0
- else if ( !pDrawView->GetSdrPageView()) // angezeigte Page umstellen
+ else if ( !pDrawView->GetSdrPageView()) // angezeigte Page umstellen
{
pDrawView->HideSdrPage();
pDrawView->ShowSdrPage(pDrawView->GetModel()->GetPage(nTab));
@@ -183,7 +183,7 @@ void ScPreview::UpdateDrawView() // nTab muss richtig sein
}
else if ( pDrawView )
{
- delete pDrawView; // fuer diese Tabelle nicht gebraucht
+ delete pDrawView; // fuer diese Tabelle nicht gebraucht
pDrawView = NULL;
}
}
@@ -197,7 +197,7 @@ void ScPreview::TestLastPage()
{
nPageNo = nTotalPages - 1;
nTab = nTabCount - 1;
- while (nTab > 0 && !nPages[nTab]) // letzte nicht leere Tabelle
+ while (nTab > 0 && !nPages[nTab]) // letzte nicht leere Tabelle
--nTab;
DBG_ASSERT(nPages[nTab],"alle Tabellen leer?");
nTabPage = nPages[nTab] - 1;
@@ -208,7 +208,7 @@ void ScPreview::TestLastPage()
ScDocument* pDoc = pDocShell->GetDocument();
nDisplayStart = lcl_GetDisplayStart( nTab, pDoc, nPages );
}
- else // leeres Dokument
+ else // leeres Dokument
{
nTab = 0;
nPageNo = nTabPage = nTabStart = nDisplayStart = 0;
@@ -245,8 +245,8 @@ void ScPreview::CalcPages( SCTAB /*nToWhichTab*/ )
// instead of a separate progress for each sheet from ScPrintFunc
pDocShell->UpdatePendingRowHeights( nAnz-1, true );
- // PrintOptions is passed to PrintFunc for SkipEmpty flag,
- // but always all sheets are used (there is no selected sheet)
+ // PrintOptions is passed to PrintFunc for SkipEmpty flag,
+ // but always all sheets are used (there is no selected sheet)
ScPrintOptions aOptions = SC_MOD()->GetPrintOptions();
for (SCTAB i=nStart; i<nAnz; i++)
@@ -258,7 +258,7 @@ void ScPreview::CalcPages( SCTAB /*nToWhichTab*/ )
long nThisTab = aPrintFunc.GetTotalPages();
nPages[i] = nThisTab;
nTotalPages += nThisTab;
- nFirstAttr[i] = aPrintFunc.GetFirstPageNo(); // behalten oder aus Vorlage
+ nFirstAttr[i] = aPrintFunc.GetFirstPageNo(); // behalten oder aus Vorlage
if (nPageNo>=nThisStart && nPageNo<nTotalPages)
{
@@ -276,7 +276,7 @@ void ScPreview::CalcPages( SCTAB /*nToWhichTab*/ )
if (nAnz > nTabsTested)
nTabsTested = nAnz;
- // testen, ob hinter letzter Seite
+ // testen, ob hinter letzter Seite
if ( nTabsTested >= nTabCount )
TestLastPage();
@@ -289,10 +289,10 @@ void ScPreview::CalcPages( SCTAB /*nToWhichTab*/ )
}
-void ScPreview::RecalcPages() // nur nPageNo geaendert
+void ScPreview::RecalcPages() // nur nPageNo geaendert
{
if (!bValid)
- return; // dann wird CalcPages aufgerufen
+ return; // dann wird CalcPages aufgerufen
SCTAB nOldTab = nTab;
@@ -317,7 +317,7 @@ void ScPreview::RecalcPages() // nur nPageNo geaendert
nTabPage = nPageNo - nThisStart;
nTabStart = nThisStart;
-// aPageSize = aPrintFunc.GetPageSize();
+// aPageSize = aPrintFunc.GetPageSize();
}
}
@@ -325,7 +325,7 @@ void ScPreview::RecalcPages() // nur nPageNo geaendert
nDisplayStart = lcl_GetDisplayStart( nTab, pDoc, nPages );
}
- TestLastPage(); // testen, ob hinter letzter Seite
+ TestLastPage(); // testen, ob hinter letzter Seite
if ( nTab != nOldTab )
bStateValid = FALSE;
@@ -340,7 +340,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation )
{
CalcPages(0);
RecalcPages();
- UpdateDrawView(); // Tabelle evtl. geaendert
+ UpdateDrawView(); // Tabelle evtl. geaendert
}
Fraction aPreviewZoom( nZoom, 100 );
@@ -396,9 +396,9 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation )
DBG_ASSERT(nPrinted<=1, "was'n nu los?");
SetMapMode(aMMMode);
-// USHORT nPrintZoom = pPrintFunc->GetZoom();
+// USHORT nPrintZoom = pPrintFunc->GetZoom();
- if (nPrinted) // wenn nichts, alles grau zeichnen
+ if (nPrinted) // wenn nichts, alles grau zeichnen
{
aLocalPageSize = pPrintFunc->GetPageSize();
aLocalPageSize.Width() = (long) (aLocalPageSize.Width() * HMM_PER_TWIPS );
@@ -434,7 +434,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation )
if (bBottom)
{
if (bRight)
- DrawRect(Rectangle(0,nPageEndY, nPageEndX,aWinEnd.Y())); // Ecke nicht doppelt
+ DrawRect(Rectangle(0,nPageEndY, nPageEndX,aWinEnd.Y())); // Ecke nicht doppelt
else
DrawRect(Rectangle(0,nPageEndY, aWinEnd.X(),aWinEnd.Y()));
}
@@ -444,7 +444,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation )
{
Color aBorderColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
- // draw border
+ // draw border
if ( aOffset.X() <= 0 || aOffset.Y() <= 0 || bRight || bBottom )
{
@@ -457,7 +457,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation )
DrawRect( PixelToLogic( aPixel ) );
}
- // draw shadow
+ // draw shadow
SetLineColor();
SetFillColor( aBorderColor );
@@ -749,7 +749,7 @@ String ScPreview::GetPosString()
if (!bValid)
{
CalcPages(nTab);
- UpdateDrawView(); // Tabelle evtl. geaendert
+ UpdateDrawView(); // Tabelle evtl. geaendert
}
String aString( ScGlobal::GetRscString( STR_PAGE ) );
@@ -776,14 +776,14 @@ void ScPreview::SetZoom(USHORT nNewZoom)
{
nZoom = nNewZoom;
- // apply new MapMode and call UpdateScrollBars to update aOffset
+ // apply new MapMode and call UpdateScrollBars to update aOffset
Fraction aPreviewZoom( nZoom, 100 );
Fraction aHorPrevZoom( (long)( 100 * nZoom / pDocShell->GetOutputFactor() ), 10000 );
MapMode aMMMode( MAP_100TH_MM, Point(), aHorPrevZoom, aPreviewZoom );
SetMapMode( aMMMode );
- bInPaint = TRUE; // don't scroll during SetYOffset in UpdateScrollBars
+ bInPaint = TRUE; // don't scroll during SetYOffset in UpdateScrollBars
pViewShell->UpdateScrollBars();
bInPaint = FALSE;
@@ -799,7 +799,7 @@ void ScPreview::SetPageNo( long nPage )
{
nPageNo = nPage;
RecalcPages();
- UpdateDrawView(); // Tabelle evtl. geaendert
+ UpdateDrawView(); // Tabelle evtl. geaendert
InvalidateLocationData( SC_HINT_DATACHANGED );
Invalidate();
}
@@ -815,7 +815,7 @@ long ScPreview::GetFirstPage(SCTAB nTabP)
if (nTabP>0)
{
CalcPages( nTabP );
- UpdateDrawView(); // Tabelle evtl. geaendert
+ UpdateDrawView(); // Tabelle evtl. geaendert
for (SCTAB i=0; i<nTabP; i++)
nPage += nPages[i];
@@ -854,9 +854,9 @@ USHORT ScPreview::GetOptimalZoom(BOOL bWidthOnly)
double nWinScaleY = ScGlobal::nScreenPPTY;
Size aWinSize = GetOutputSizePixel();
- // desired margin is 0.25cm in default MapMode (like Writer),
- // but some additional margin is introduced by integer scale values
- // -> add only 0.10cm, so there is some margin in all cases.
+ // desired margin is 0.25cm in default MapMode (like Writer),
+ // but some additional margin is introduced by integer scale values
+ // -> add only 0.10cm, so there is some margin in all cases.
Size aMarginSize( LogicToPixel( Size( 100, 100 ), MAP_100TH_MM ) );
aWinSize.Width() -= 2 * aMarginSize.Width();
aWinSize.Height() -= 2 * aMarginSize.Height();
@@ -939,19 +939,19 @@ void ScPreview::SetYOffset( long nY )
void ScPreview::DoInvalidate()
{
- // Wenn das ganze aus dem GetState der Shell gerufen wird,
- // muss das Invalidate hinterher asynchron kommen...
+ // Wenn das ganze aus dem GetState der Shell gerufen wird,
+ // muss das Invalidate hinterher asynchron kommen...
if (bInGetState)
Application::PostUserEvent( STATIC_LINK( this, ScPreview, InvalidateHdl ) );
else
- StaticInvalidate(); // sofort
+ StaticInvalidate(); // sofort
}
void ScPreview::StaticInvalidate()
{
- // static method, because it's called asynchronously
- // -> must use current viewframe
+ // static method, because it's called asynchronously
+ // -> must use current viewframe
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
if (!pViewFrm)
@@ -996,8 +996,8 @@ void ScPreview::DataChanged( const DataChangedEvent& rDCEvt )
if ( rDCEvt.GetType() == DATACHANGED_SETTINGS &&
(rDCEvt.GetFlags() & SETTINGS_STYLE) )
{
- // scroll bar size may have changed
- pViewShell->InvalidateBorder(); // calls OuterResizePixel
+ // scroll bar size may have changed
+ pViewShell->InvalidateBorder(); // calls OuterResizePixel
}
Invalidate();
diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx
index fd36a1b2c1d0..a5fd77cf0f1e 100644
--- a/sc/source/ui/view/prevloc.cxx
+++ b/sc/source/ui/view/prevloc.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,11 +55,11 @@ enum ScPreviewLocationType
struct ScPreviewLocationEntry
{
- ScPreviewLocationType eType;
- Rectangle aPixelRect;
- ScRange aCellRange;
- BOOL bRepeatCol;
- BOOL bRepeatRow;
+ ScPreviewLocationType eType;
+ Rectangle aPixelRect;
+ ScRange aCellRange;
+ BOOL bRepeatCol;
+ BOOL bRepeatRow;
ScPreviewLocationEntry( ScPreviewLocationType eNewType, const Rectangle& rPixel, const ScRange& rRange,
BOOL bRepCol, BOOL bRepRow ) :
@@ -112,12 +112,12 @@ void ScPreviewTableInfo::LimitToArea( const Rectangle& rPixelArea )
{
if ( pColInfo )
{
- // cells completely left of the visible area
+ // cells completely left of the visible area
SCCOL nStart = 0;
while ( nStart < nCols && pColInfo[nStart].nPixelEnd < rPixelArea.Left() )
++nStart;
- // cells completely right of the visible area
+ // cells completely right of the visible area
SCCOL nEnd = nCols;
while ( nEnd > 0 && pColInfo[nEnd-1].nPixelStart > rPixelArea.Right() )
--nEnd;
@@ -133,18 +133,18 @@ void ScPreviewTableInfo::LimitToArea( const Rectangle& rPixelArea )
SetColInfo( nNewCount, pNewInfo );
}
else
- SetColInfo( 0, NULL ); // all invisible
+ SetColInfo( 0, NULL ); // all invisible
}
}
if ( pRowInfo )
{
- // cells completely above the visible area
+ // cells completely above the visible area
SCROW nStart = 0;
while ( nStart < nRows && pRowInfo[nStart].nPixelEnd < rPixelArea.Top() )
++nStart;
- // cells completely below the visible area
+ // cells completely below the visible area
SCROW nEnd = nRows;
while ( nEnd > 0 && pRowInfo[nEnd-1].nPixelStart > rPixelArea.Bottom() )
--nEnd;
@@ -160,7 +160,7 @@ void ScPreviewTableInfo::LimitToArea( const Rectangle& rPixelArea )
SetRowInfo( nNewCount, pNewInfo );
}
else
- SetRowInfo( 0, NULL ); // all invisible
+ SetRowInfo( 0, NULL ); // all invisible
}
}
}
@@ -230,7 +230,7 @@ void ScPreviewLocationData::AddCellRange( const Rectangle& rRect, const ScRange&
void ScPreviewLocationData::AddColHeaders( const Rectangle& rRect, SCCOL nStartCol, SCCOL nEndCol, BOOL bRepCol )
{
- SCTAB nTab = 0; //! ?
+ SCTAB nTab = 0; //! ?
ScRange aRange( nStartCol, 0, nTab, nEndCol, 0, nTab );
Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) );
aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_COLHEADER, aPixelRect, aRange, bRepCol, FALSE ) );
@@ -238,7 +238,7 @@ void ScPreviewLocationData::AddColHeaders( const Rectangle& rRect, SCCOL nStartC
void ScPreviewLocationData::AddRowHeaders( const Rectangle& rRect, SCROW nStartRow, SCROW nEndRow, BOOL bRepRow )
{
- SCTAB nTab = 0; //! ?
+ SCTAB nTab = 0; //! ?
ScRange aRange( 0, nStartRow, nTab, 0, nEndRow, nTab );
Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) );
aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_ROWHEADER, aPixelRect, aRange, FALSE, bRepRow ) );
@@ -246,7 +246,7 @@ void ScPreviewLocationData::AddRowHeaders( const Rectangle& rRect, SCROW nStartR
void ScPreviewLocationData::AddHeaderFooter( const Rectangle& rRect, BOOL bHeader, BOOL bLeft )
{
- ScRange aRange; //! ?
+ ScRange aRange; //! ?
Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) );
ScPreviewLocationType eType = bHeader ?
@@ -298,10 +298,10 @@ ScPreviewLocationEntry* lcl_GetEntryByAddress( const List& rEntries, const ScAdd
//UNUSED2008-05 {
//UNUSED2008-05 const double nScaleX = HMM_PER_TWIPS;
//UNUSED2008-05 const double nScaleY = HMM_PER_TWIPS;
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 Size aOffsetLogic = pWindow->PixelToLogic( rOffsetPixel, aCellMapMode );
//UNUSED2008-05 SCTAB nTab = rRange.aStart.Tab();
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 long nPosX = 0;
//UNUSED2008-05 SCCOL nCol = rRange.aStart.Col();
//UNUSED2008-05 SCCOL nEndCol = rRange.aEnd.Col();
@@ -314,7 +314,7 @@ ScPreviewLocationEntry* lcl_GetEntryByAddress( const List& rEntries, const ScAdd
//UNUSED2008-05 }
//UNUSED2008-05 if ( nCol > rRange.aStart.Col() )
//UNUSED2008-05 --nCol;
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 long nPosY = 0;
//UNUSED2008-05 ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter(
//UNUSED2008-05 pDoc->GetRowFlagsArray( nTab), rRange.aStart.Row(),
@@ -329,7 +329,7 @@ ScPreviewLocationEntry* lcl_GetEntryByAddress( const List& rEntries, const ScAdd
//UNUSED2008-05 SCROW nRow = aIter.GetPos();
//UNUSED2008-05 if ( nRow > rRange.aStart.Row() )
//UNUSED2008-05 --nRow;
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 return ScAddress( nCol, nRow, nTab );
//UNUSED2008-05 }
@@ -571,7 +571,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
aMainRect.Top() = pEntry->aPixelRect.Top();
aMainRect.Bottom() = pEntry->aPixelRect.Bottom();
}
- nTab = pEntry->aCellRange.aStart.Tab(); //! store separately?
+ nTab = pEntry->aCellRange.aStart.Tab(); //! store separately?
}
else if ( pEntry->eType == SC_PLOC_ROWHEADER )
{
@@ -590,7 +590,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
}
//
- // get column info
+ // get column info
//
SCCOL nColCount = 0;
@@ -660,7 +660,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
rInfo.SetColInfo( 0, NULL );
//
- // get row info
+ // get row info
//
SCROW nRowCount = 0;
@@ -729,7 +729,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev
rInfo.SetRowInfo( 0, NULL );
//
- // limit to visible area
+ // limit to visible area
//
rInfo.SetTab( nTab );
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 38d5144274c5..0acc879f3324 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -84,12 +84,12 @@
#include "sc.hrc" //CHINA001
#include "scabstdlg.hxx" //CHINA001
-// fuer Rad-Maus
-#define SC_DELTA_ZOOM 10
+// fuer Rad-Maus
+#define SC_DELTA_ZOOM 10
#define MINZOOM_SLIDER 10
#define MAXZOOM_SLIDER 400
-#define SC_USERDATA_SEP ';'
+#define SC_USERDATA_SEP ';'
using namespace com::sun::star;
@@ -140,7 +140,7 @@ void ScPreviewShell::Construct( Window* pParent )
if (pDrawBC)
StartListening(*pDrawBC);
-// pPreview->Show(); // wird vom Sfx angezeigt
+// pPreview->Show(); // wird vom Sfx angezeigt
pHorScroll->Show();
pVerScroll->Show();
pCorner->Show();
@@ -159,17 +159,17 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame,
if ( pOldSh && pOldSh->ISA( ScTabViewShell ) )
{
- // store view settings, show table from TabView
- //! store live ScViewData instead, and update on ScTablesHint?
- //! or completely forget aSourceData on ScTablesHint?
+ // store view settings, show table from TabView
+ //! store live ScViewData instead, and update on ScTablesHint?
+ //! or completely forget aSourceData on ScTablesHint?
ScTabViewShell* pTabViewShell = ((ScTabViewShell*)pOldSh);
ScViewData* pData = pTabViewShell->GetViewData();
pData->WriteUserDataSequence( aSourceData );
InitStartTable( pData->GetTabNo() );
- // #106334# also have to store the TabView's DesignMode state
- // (only if draw view exists)
+ // #106334# also have to store the TabView's DesignMode state
+ // (only if draw view exists)
SdrView* pDrawView = pTabViewShell->GetSdrView();
if ( pDrawView )
nSourceDesignMode = pDrawView->IsDesignMode();
@@ -194,8 +194,8 @@ __EXPORT ScPreviewShell::~ScPreviewShell()
delete pVerScroll;
delete pCorner;
- // #97612# normal mode of operation is switching back to default view in the same frame,
- // so there's no need to activate any other window here anymore
+ // #97612# normal mode of operation is switching back to default view in the same frame,
+ // so there's no need to activate any other window here anymore
}
void ScPreviewShell::InitStartTable(SCTAB nTab)
@@ -218,11 +218,11 @@ Size __EXPORT ScPreviewShell::GetOptimalSizePixel() const
if ( pViewSh )
{
- ScViewData* pViewData = pViewSh->GetViewData();
- SCTAB nCurTab = pViewData->GetTabNo();
- ScDocument* pDoc = pDocShell->GetDocument();
- ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
- SfxStyleSheetBase* pStyleSheet = pStylePool->Find(
+ ScViewData* pViewData = pViewSh->GetViewData();
+ SCTAB nCurTab = pViewData->GetTabNo();
+ ScDocument* pDoc = pDocShell->GetDocument();
+ ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
+ SfxStyleSheetBase* pStyleSheet = pStylePool->Find(
pDoc->GetPageStyle( nCurTab ),
SFX_STYLE_FAMILY_PAGE );
@@ -230,9 +230,9 @@ Size __EXPORT ScPreviewShell::GetOptimalSizePixel() const
if ( pStyleSheet )
{
- const SfxItemSet& rSet = pStyleSheet->GetItemSet();
- const SvxSizeItem& rItem = (const SvxSizeItem&)rSet.Get( ATTR_PAGE_SIZE );
- const Size& rPageSize = rItem.GetSize();
+ const SfxItemSet& rSet = pStyleSheet->GetItemSet();
+ const SvxSizeItem& rItem = (const SvxSizeItem&)rSet.Get( ATTR_PAGE_SIZE );
+ const Size& rPageSize = rItem.GetSize();
aOptSize.Width() = (long) (rPageSize.Width() * pViewData->GetPPTX());
aOptSize.Height() = (long) (rPageSize.Height() * pViewData->GetPPTY());
@@ -250,8 +250,8 @@ void __EXPORT ScPreviewShell::AdjustPosSizePixel( const Point &rPos, const Size
{
long nBarW = GetViewFrame()->GetWindow().GetSettings().GetStyleSettings().GetScrollBarSize();
long nBarH = nBarW;
-// long nBarW = pVerScroll->GetSizePixel().Width();
-// long nBarH = pHorScroll->GetSizePixel().Height();
+// long nBarW = pVerScroll->GetSizePixel().Width();
+// long nBarH = pHorScroll->GetSizePixel().Height();
Size aOutSize( rSize.Width()-nBarW, rSize.Height()-nBarH );
pPreview->SetPosSizePixel( rPos, aOutSize );
@@ -285,8 +285,8 @@ void ScPreviewShell::UpdateScrollBars()
ScDocument* pDoc = pDocShell->GetDocument();
SCTAB nTab = pPreview->GetTab();
- ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
- SfxStyleSheetBase* pStyleSheet = pStylePool->Find( pDoc->GetPageStyle( nTab ),
+ ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
+ SfxStyleSheetBase* pStyleSheet = pStylePool->Find( pDoc->GetPageStyle( nTab ),
SFX_STYLE_FAMILY_PAGE );
DBG_ASSERT(pStyleSheet,"StyleSheet nicht gefunden");
if (!pStyleSheet) return;
@@ -296,7 +296,7 @@ void ScPreviewShell::UpdateScrollBars()
aPageSize.Width() = (long) (aPageSize.Width() * HMM_PER_TWIPS );
aPageSize.Height() = (long) (aPageSize.Height() * HMM_PER_TWIPS );
- // for centering, page size without the shadow is used
+ // for centering, page size without the shadow is used
Size aWindowSize = pPreview->GetOutputSize();
@@ -312,25 +312,25 @@ void ScPreviewShell::UpdateScrollBars()
nMaxPos = aPageSize.Width() - aWindowSize.Width();
if ( nMaxPos<0 )
{
- // page smaller than window -> center (but put scrollbar to 0)
+ // page smaller than window -> center (but put scrollbar to 0)
aOfs.X() = 0;
pPreview->SetXOffset( nMaxPos / 2 );
}
else if (aOfs.X() < 0)
{
- // page larger than window -> never use negative offset
+ // page larger than window -> never use negative offset
aOfs.X() = 0;
pPreview->SetXOffset( 0 );
}
else if (aOfs.X() > nMaxPos)
{
- // limit offset to align with right edge of window
+ // limit offset to align with right edge of window
aOfs.X() = nMaxPos;
pPreview->SetXOffset(nMaxPos);
}
pHorScroll->SetThumbPos( aOfs.X() );
}
-
+
if( pVerScroll )
{
long nPageNo = pPreview->GetPageNo();
@@ -342,7 +342,7 @@ void ScPreviewShell::UpdateScrollBars()
pVerScroll->SetVisibleSize( aWindowSize.Height() );
if ( nMaxVertPos < 0 )
{
- // page smaller than window -> center (but put scrollbar to 0)
+ // page smaller than window -> center (but put scrollbar to 0)
aOfs.Y() = 0;
pPreview->SetYOffset( nMaxVertPos / 2 );
pVerScroll->SetThumbPos( nPageNo * aWindowSize.Height() );
@@ -350,7 +350,7 @@ void ScPreviewShell::UpdateScrollBars()
}
else if (aOfs.Y() < 0)
{
- // page larger than window -> never use negative offset
+ // page larger than window -> never use negative offset
pVerScroll->SetRange( Range( 0, aPageSize.Height() ) );
aOfs.Y() = 0;
pPreview->SetYOffset( 0 );
@@ -358,7 +358,7 @@ void ScPreviewShell::UpdateScrollBars()
}
else if (aOfs.Y() > nMaxVertPos )
{
- // limit offset to align with window bottom
+ // limit offset to align with window bottom
pVerScroll->SetRange( Range( 0, aPageSize.Height() ) );
aOfs.Y() = nMaxVertPos;
pPreview->SetYOffset( nMaxVertPos );
@@ -422,7 +422,7 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll )
}
else if( nDelta > 0 )
{
- BOOL bAllTested = pPreview->AllTested();
+ BOOL bAllTested = pPreview->AllTested();
if ( nTotalPages && ( nPageNo < nTotalPages || !bAllTested ) )
pPreview->SetPageNo( nPageNo );
@@ -435,10 +435,10 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll )
}
aRect.Left() = aPos.X() - 8;
- aRect.Top() = aMousePos.Y();
- aRect.Right() = aRect.Left();
- aRect.Top() = aRect.Top();
- nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER;
+ aRect.Top() = aMousePos.Y();
+ aRect.Right() = aRect.Left();
+ aRect.Top() = aRect.Top();
+ nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER;
Help::ShowQuickHelp( pScroll->GetParent(), aRect, aHelpStr, nAlign );
}
}
@@ -487,15 +487,15 @@ USHORT __EXPORT ScPreviewShell::SetPrinter( SfxPrinter *pNewPrinter, USHORT nDif
PrintDialog* __EXPORT ScPreviewShell::CreatePrintDialog( Window* pParent )
{
- pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen
+ pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen
(void)GetPrinter();
- const long nCurPage = pPreview->GetPageNo()+1;
- const long nDocPageMax = pPreview->GetTotalPages();
+ const long nCurPage = pPreview->GetPageNo()+1;
+ const long nDocPageMax = pPreview->GetTotalPages();
PrintDialog* pDlg = new PrintDialog( pParent, true );
// wenn zu langsam wieder einbauen
-// if ( pPreview->AllTested() )
-// nPageMax = pPreview->GetTotalPages();
+// if ( pPreview->AllTested() )
+// nPageMax = pPreview->GetTotalPages();
pDlg->EnableSheetRange( true, PRINTSHEETS_ALL );
pDlg->EnableSheetRange( true, PRINTSHEETS_SELECTED_SHEETS );
@@ -506,13 +506,13 @@ PrintDialog* __EXPORT ScPreviewShell::CreatePrintDialog( Window* pParent )
if ( nDocPageMax > 0 )
pDlg->SetRangeText( String::CreateFromInt32( nCurPage ) );
- pDlg->EnableRange ( PRINTDIALOG_ALL );
- pDlg->EnableRange ( PRINTDIALOG_RANGE );
- pDlg->SetFirstPage ( 1 );
- pDlg->SetMinPage ( 1 );
- pDlg->SetLastPage ( (USHORT)nDocPageMax );
- pDlg->SetMaxPage ( (USHORT)nDocPageMax );
- pDlg->EnableCollate ();
+ pDlg->EnableRange ( PRINTDIALOG_ALL );
+ pDlg->EnableRange ( PRINTDIALOG_RANGE );
+ pDlg->SetFirstPage ( 1 );
+ pDlg->SetMinPage ( 1 );
+ pDlg->SetLastPage ( (USHORT)nDocPageMax );
+ pDlg->SetMaxPage ( (USHORT)nDocPageMax );
+ pDlg->EnableCollate ();
// Selektion hier nicht
@@ -524,7 +524,7 @@ SfxTabPage* ScPreviewShell::CreatePrintOptionsPage( Window *pParent, const SfxIt
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
//CHINA001 return ScTpPrintOptions::Create( pParent, rOptions );
- ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT );
+ ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT );
if ( ScTpPrintOptionsCreate )
return (*ScTpPrintOptionsCreate)( pParent, rOptions);
return 0;
@@ -558,7 +558,7 @@ ErrCode ScPreviewShell::DoPrint( SfxPrinter *pPrinter,
USHORT __EXPORT ScPreviewShell::Print( SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pPrintDialog )
{
- pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen
+ pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen
// get the list of affected sheets before SfxViewShell::Print
bool bAllTabs = ( pPrintDialog ? ( pPrintDialog->GetCheckedSheetRange() == PRINTSHEETS_ALL ) : SC_MOD()->GetPrintOptions().GetAllSheets() );
@@ -596,12 +596,12 @@ void __EXPORT ScPreviewShell::Activate(BOOL bMDI)
{
SfxViewShell::Activate(bMDI);
- //! Basic etc. -> auslagern in eigene Datei (s. tabvwsh4)
+ //! Basic etc. -> auslagern in eigene Datei (s. tabvwsh4)
if (bMDI)
{
// InputHdl ist jetzt meistens Null, keine Assertion mehr!
- ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl();
+ ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl();
if ( pInputHdl )
pInputHdl->NotifyChange( NULL );
}
@@ -646,7 +646,7 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq )
case SID_NEXT_TABLE: // Accelerator
case SID_PREVIEW_NEXT:
{
- BOOL bAllTested = pPreview->AllTested();
+ BOOL bAllTested = pPreview->AllTested();
long nPage = pPreview->GetPageNo();
long nTotal = pPreview->GetTotalPages();
if (nTotal && (nPage+1 < nTotal || !bAllTested))
@@ -677,8 +677,8 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq )
case SID_ATTR_ZOOM:
case FID_SCALE:
{
- USHORT nZoom = 100;
- BOOL bCancel = FALSE;
+ USHORT nZoom = 100;
+ BOOL bCancel = FALSE;
eZoom = SVX_ZOOM_PERCENT;
@@ -693,8 +693,8 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq )
}
else
{
- SfxItemSet aSet ( GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM );
- SvxZoomItem aZoomItem( SVX_ZOOM_PERCENT, pPreview->GetZoom(), SID_ATTR_ZOOM );
+ SfxItemSet aSet ( GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM );
+ SvxZoomItem aZoomItem( SVX_ZOOM_PERCENT, pPreview->GetZoom(), SID_ATTR_ZOOM );
aSet.Put( aZoomItem );
//CHINA001 SvxZoomDialog* pDlg = pDlg = new SvxZoomDialog( NULL, aSet );
@@ -709,7 +709,7 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq )
if ( !bCancel )
{
- const SvxZoomItem& rZoomItem = (const SvxZoomItem&)
+ const SvxZoomItem& rZoomItem = (const SvxZoomItem&)
pDlg->GetOutputItemSet()->
Get( SID_ATTR_ZOOM );
@@ -781,7 +781,7 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq )
pPreview->SetZoom( nCurrentZoom );
rReq.Done();
}
- }
+ }
}
break;
case SID_PREVIEW_SCALINGFACTOR:
@@ -807,9 +807,9 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq )
break;
case SID_PRINTPREVIEW:
case SID_PREVIEW_CLOSE:
- // print preview is now always in the same frame as the tab view
- // -> always switch this frame back to normal view
- // (ScTabViewShell ctor reads stored view data)
+ // print preview is now always in the same frame as the tab view
+ // -> always switch this frame back to normal view
+ // (ScTabViewShell ctor reads stored view data)
GetViewFrame()->GetDispatcher()->Execute( SID_VIEWSHELL0, SFX_CALLMODE_ASYNCHRON );
break;
@@ -837,11 +837,11 @@ void __EXPORT ScPreviewShell::GetState( SfxItemSet& rSet )
{
pPreview->SetInGetState(TRUE);
- SCTAB nTab = pPreview->GetTab();
- long nPage = pPreview->GetPageNo();
- long nTotal = pPreview->GetTotalPages();
- USHORT nZoom = pPreview->GetZoom();
- BOOL bAllTested = pPreview->AllTested();
+ SCTAB nTab = pPreview->GetTab();
+ long nPage = pPreview->GetPageNo();
+ long nTotal = pPreview->GetTotalPages();
+ USHORT nZoom = pPreview->GetZoom();
+ BOOL bAllTested = pPreview->AllTested();
SfxWhichIter aIter(rSet);
USHORT nWhich = aIter.FirstWhich();
@@ -943,28 +943,28 @@ void ScPreviewShell::FillFieldData( ScHeaderFieldData& rData )
SCTAB nTab = pPreview->GetTab();
pDoc->GetName( nTab, rData.aTabName );
- rData.aTitle = pDocShell->GetTitle();
+ rData.aTitle = pDocShell->GetTitle();
const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject();
- rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
+ rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
if ( rData.aLongDocName.Len() )
rData.aShortDocName = rURLObj.GetName( INetURLObject::DECODE_UNAMBIGUOUS );
else
rData.aShortDocName = rData.aLongDocName = rData.aTitle;
- rData.nPageNo = pPreview->GetPageNo() + 1;
+ rData.nPageNo = pPreview->GetPageNo() + 1;
- BOOL bAllTested = pPreview->AllTested();
+ BOOL bAllTested = pPreview->AllTested();
if (bAllTested)
rData.nTotalPages = pPreview->GetTotalPages();
else
rData.nTotalPages = 99;
- // eNumType kennt der Dialog selber
+ // eNumType kennt der Dialog selber
}
void __EXPORT ScPreviewShell::WriteUserData(String& rData, BOOL /* bBrowse */)
{
- // nZoom
- // nPageNo
+ // nZoom
+ // nPageNo
rData = String::CreateFromInt32(pPreview->GetZoom());
rData += (sal_Unicode) SC_USERDATA_SEP;
@@ -1030,21 +1030,21 @@ void __EXPORT ScPreviewShell::ReadUserDataSequence(const uno::Sequence < beans::
void ScPreviewShell::DoScroll( USHORT nMode )
{
- Point aCurPos, aPrevPos;
+ Point aCurPos, aPrevPos;
- long nHRange = pHorScroll->GetRange().Max();
- long nHLine = pHorScroll->GetLineSize();
- long nHPage = pHorScroll->GetPageSize();
- long nVRange = pVerScroll->GetRange().Max();
- long nVLine = pVerScroll->GetLineSize();
- long nVPage = pVerScroll->GetPageSize();
+ long nHRange = pHorScroll->GetRange().Max();
+ long nHLine = pHorScroll->GetLineSize();
+ long nHPage = pHorScroll->GetPageSize();
+ long nVRange = pVerScroll->GetRange().Max();
+ long nVLine = pVerScroll->GetLineSize();
+ long nVPage = pVerScroll->GetPageSize();
aCurPos.X() = pHorScroll->GetThumbPos();
aCurPos.Y() = pVerScroll->GetThumbPos();
aPrevPos = aCurPos;
- long nThumbPos = pVerScroll->GetThumbPos();
- long nRangeMax = pVerScroll->GetRangeMax();
+ long nThumbPos = pVerScroll->GetThumbPos();
+ long nRangeMax = pVerScroll->GetRangeMax();
switch( nMode )
{
@@ -1173,13 +1173,13 @@ void ScPreviewShell::DoScroll( USHORT nMode )
// nHRange-nHPage kann negativ sein, deshalb Abfrage auf < 0 hinterher
- if( aCurPos.Y() > (nVRange-nVPage) )
+ if( aCurPos.Y() > (nVRange-nVPage) )
aCurPos.Y() = (nVRange-nVPage);
- if( aCurPos.Y() < 0 )
+ if( aCurPos.Y() < 0 )
aCurPos.Y() = 0;
- if( aCurPos.X() > (nHRange-nHPage) )
+ if( aCurPos.X() > (nHRange-nHPage) )
aCurPos.X() = (nHRange-nHPage);
- if( aCurPos.X() < 0 )
+ if( aCurPos.X() < 0 )
aCurPos.X() = 0;
if( nMaxVertPos>=0 )
diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx
index 07af90f797aa..96444ae695a2 100644
--- a/sc/source/ui/view/prevwsh2.cxx
+++ b/sc/source/ui/view/prevwsh2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 378ea1233cf9..2cc90d67c371 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include <editeng/boxitem.hxx>
#include <editeng/brshitem.hxx>
#include <svtools/colorcfg.hxx>
-#include <editeng/editstat.hxx> // EE_CNTRL_RTFSTYLESHEETS
+#include <editeng/editstat.hxx> // EE_CNTRL_RTFSTYLESHEETS
#include <svx/fmview.hxx>
#include <editeng/frmdiritem.hxx>
#include <editeng/lrspitem.hxx>
@@ -87,7 +87,7 @@
#include <boost/scoped_ptr.hpp>
-#define ZOOM_MIN 10
+#define ZOOM_MIN 10
#define GET_BOOL(set,which) ((const SfxBoolItem&)(set)->Get((which))).GetValue()
#define GET_USHORT(set,which) ((const SfxUInt16Item&)(set)->Get((which))).GetValue()
@@ -98,7 +98,7 @@
ScPageRowEntry::ScPageRowEntry(const ScPageRowEntry& r)
{
nStartRow = r.nStartRow;
- nEndRow = r.nEndRow;
+ nEndRow = r.nEndRow;
nPagesX = r.nPagesX;
if (r.pHidden && nPagesX)
{
@@ -114,7 +114,7 @@ const ScPageRowEntry& ScPageRowEntry::operator=(const ScPageRowEntry& r)
delete[] pHidden;
nStartRow = r.nStartRow;
- nEndRow = r.nEndRow;
+ nEndRow = r.nEndRow;
nPagesX = r.nPagesX;
if (r.pHidden && nPagesX)
{
@@ -142,7 +142,7 @@ void ScPageRowEntry::SetHidden(size_t nX)
{
if ( nX < nPagesX )
{
- if ( nX+1 == nPagesX ) // letzte Seite?
+ if ( nX+1 == nPagesX ) // letzte Seite?
--nPagesX;
else
{
@@ -158,7 +158,7 @@ void ScPageRowEntry::SetHidden(size_t nX)
BOOL ScPageRowEntry::IsHidden(size_t nX) const
{
- return nX>=nPagesX || ( pHidden && pHidden[nX] ); //! inline?
+ return nX>=nPagesX || ( pHidden && pHidden[nX] ); //! inline?
}
size_t ScPageRowEntry::CountVisible() const
@@ -187,12 +187,12 @@ void ScPrintFunc::Construct( const ScPrintOptions* pOptions )
pDocShell->UpdatePendingRowHeights( nPrintTab );
pDoc = pDocShell->GetDocument();
- SfxPrinter* pDocPrinter = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen
+ SfxPrinter* pDocPrinter = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen
if (pDocPrinter)
aOldPrinterMode = pDocPrinter->GetMapMode();
- // einheitlicher MapMode ueber alle Aufrufe (z.B. Repaint !!!),
- // weil die EditEngine sonst unterschiedliche Texthoehen liefert
+ // einheitlicher MapMode ueber alle Aufrufe (z.B. Repaint !!!),
+ // weil die EditEngine sonst unterschiedliche Texthoehen liefert
pDev->SetMapMode(MAP_PIXEL);
pPageEndX = NULL;
@@ -205,7 +205,7 @@ void ScPrintFunc::Construct( const ScPrintOptions* pOptions )
pEditEngine = NULL;
pEditDefaults = NULL;
- ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
+ ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
SfxStyleSheetBase* pStyleSheet = pStylePool->Find(
pDoc->GetPageStyle( nPrintTab ),
SFX_STYLE_FAMILY_PAGE );
@@ -226,27 +226,27 @@ void ScPrintFunc::Construct( const ScPrintOptions* pOptions )
InitParam(pOptions);
- pPageData = NULL; // wird nur zur Initialisierung gebraucht
+ pPageData = NULL; // wird nur zur Initialisierung gebraucht
}
ScPrintFunc::ScPrintFunc( ScDocShell* pShell, SfxPrinter* pNewPrinter, SCTAB nTab,
long nPage, long nDocP, const ScRange* pArea,
const ScPrintOptions* pOptions,
ScPageBreakData* pData )
- : pDocShell ( pShell ),
- pPrinter ( pNewPrinter ),
- pDrawView ( NULL ),
- nPrintTab ( nTab ),
- nPageStart ( nPage ),
- nDocPages ( nDocP ),
- pUserArea ( pArea ),
- bState ( FALSE ),
- bSourceRangeValid ( FALSE ),
- bPrintCurrentTable ( FALSE ),
- bMultiArea ( FALSE ),
- nTabPages ( 0 ),
- nTotalPages ( 0 ),
- pPageData ( pData )
+ : pDocShell ( pShell ),
+ pPrinter ( pNewPrinter ),
+ pDrawView ( NULL ),
+ nPrintTab ( nTab ),
+ nPageStart ( nPage ),
+ nDocPages ( nDocP ),
+ pUserArea ( pArea ),
+ bState ( FALSE ),
+ bSourceRangeValid ( FALSE ),
+ bPrintCurrentTable ( FALSE ),
+ bMultiArea ( FALSE ),
+ nTabPages ( 0 ),
+ nTotalPages ( 0 ),
+ pPageData ( pData )
{
pDev = pPrinter;
aSrcOffset = pPrinter->PixelToLogic( pPrinter->GetPageOffsetPixel(), MAP_100TH_MM );
@@ -256,20 +256,20 @@ ScPrintFunc::ScPrintFunc( ScDocShell* pShell, SfxPrinter* pNewPrinter, SCTAB nTa
ScPrintFunc::ScPrintFunc( OutputDevice* pOutDev, ScDocShell* pShell, SCTAB nTab,
long nPage, long nDocP, const ScRange* pArea,
const ScPrintOptions* pOptions )
- : pDocShell ( pShell ),
- pPrinter ( NULL ),
- pDrawView ( NULL ),
- nPrintTab ( nTab ),
- nPageStart ( nPage ),
- nDocPages ( nDocP ),
- pUserArea ( pArea ),
- bState ( FALSE ),
- bSourceRangeValid ( FALSE ),
- bPrintCurrentTable ( FALSE ),
- bMultiArea ( FALSE ),
- nTabPages ( 0 ),
- nTotalPages ( 0 ),
- pPageData ( NULL )
+ : pDocShell ( pShell ),
+ pPrinter ( NULL ),
+ pDrawView ( NULL ),
+ nPrintTab ( nTab ),
+ nPageStart ( nPage ),
+ nDocPages ( nDocP ),
+ pUserArea ( pArea ),
+ bState ( FALSE ),
+ bSourceRangeValid ( FALSE ),
+ bPrintCurrentTable ( FALSE ),
+ bMultiArea ( FALSE ),
+ nTabPages ( 0 ),
+ nTotalPages ( 0 ),
+ pPageData ( NULL )
{
pDev = pOutDev;
Construct( pOptions );
@@ -277,30 +277,30 @@ ScPrintFunc::ScPrintFunc( OutputDevice* pOutDev, ScDocShell* pShell, SCTAB nTab,
ScPrintFunc::ScPrintFunc( OutputDevice* pOutDev, ScDocShell* pShell,
const ScPrintState& rState, const ScPrintOptions* pOptions )
- : pDocShell ( pShell ),
- pPrinter ( NULL ),
- pDrawView ( NULL ),
- pUserArea ( NULL ),
- bSourceRangeValid ( FALSE ),
- bPrintCurrentTable ( FALSE ),
- bMultiArea ( FALSE ),
- pPageData ( NULL )
+ : pDocShell ( pShell ),
+ pPrinter ( NULL ),
+ pDrawView ( NULL ),
+ pUserArea ( NULL ),
+ bSourceRangeValid ( FALSE ),
+ bPrintCurrentTable ( FALSE ),
+ bMultiArea ( FALSE ),
+ pPageData ( NULL )
{
pDev = pOutDev;
- nPrintTab = rState.nPrintTab;
- nStartCol = rState.nStartCol;
- nStartRow = rState.nStartRow;
- nEndCol = rState.nEndCol;
- nEndRow = rState.nEndRow;
- nZoom = rState.nZoom;
- nPagesX = rState.nPagesX;
- nPagesY = rState.nPagesY;
- nTabPages = rState.nTabPages;
- nTotalPages = rState.nTotalPages;
- nPageStart = rState.nPageStart;
- nDocPages = rState.nDocPages;
- bState = TRUE;
+ nPrintTab = rState.nPrintTab;
+ nStartCol = rState.nStartCol;
+ nStartRow = rState.nStartRow;
+ nEndCol = rState.nEndCol;
+ nEndRow = rState.nEndRow;
+ nZoom = rState.nZoom;
+ nPagesX = rState.nPagesX;
+ nPagesY = rState.nPagesY;
+ nTabPages = rState.nTabPages;
+ nTotalPages = rState.nTotalPages;
+ nPageStart = rState.nPageStart;
+ nDocPages = rState.nDocPages;
+ bState = TRUE;
Construct( pOptions );
}
@@ -355,18 +355,18 @@ ScPrintFunc::ScPrintFunc( ScDocShell* pShell, Window* pWindow,
void ScPrintFunc::GetPrintState( ScPrintState& rState )
{
- rState.nPrintTab = nPrintTab;
- rState.nStartCol = nStartCol;
- rState.nStartRow = nStartRow;
- rState.nEndCol = nEndCol;
- rState.nEndRow = nEndRow;
- rState.nZoom = nZoom;
- rState.nPagesX = nPagesX;
- rState.nPagesY = nPagesY;
- rState.nTabPages = nTabPages;
- rState.nTotalPages = nTotalPages;
- rState.nPageStart = nPageStart;
- rState.nDocPages = nDocPages;
+ rState.nPrintTab = nPrintTab;
+ rState.nStartCol = nStartCol;
+ rState.nStartRow = nStartRow;
+ rState.nEndCol = nEndCol;
+ rState.nEndRow = nEndRow;
+ rState.nZoom = nZoom;
+ rState.nPagesX = nPagesX;
+ rState.nPagesY = nPagesY;
+ rState.nTabPages = nTabPages;
+ rState.nTotalPages = nTotalPages;
+ rState.nPageStart = nPageStart;
+ rState.nDocPages = nDocPages;
}
BOOL ScPrintFunc::GetLastSourceRange( ScRange& rRange ) const
@@ -380,14 +380,14 @@ void ScPrintFunc::FillPageData()
if (pPageData)
{
USHORT nCount = sal::static_int_cast<USHORT>( pPageData->GetCount() );
- ScPrintRangeData& rData = pPageData->GetData(nCount); // hochzaehlen
+ ScPrintRangeData& rData = pPageData->GetData(nCount); // hochzaehlen
rData.SetPrintRange( ScRange( nStartCol, nStartRow, nPrintTab,
nEndCol, nEndRow, nPrintTab ) );
rData.SetPagesX( nPagesX, pPageEndX );
rData.SetPagesY( nTotalY, pPageEndY );
- // Einstellungen
+ // Einstellungen
rData.SetTopDown( aTableParam.bTopDown );
rData.SetAutomatic( !aAreaParam.bPrintArea );
}
@@ -409,10 +409,10 @@ ScPrintFunc::~ScPrintFunc()
delete pEditDefaults;
delete pEditEngine;
- // Druckereinstellungen werden jetzt von aussen wiederhergestellt
+ // Druckereinstellungen werden jetzt von aussen wiederhergestellt
- // #64294# Fuer DrawingLayer/Charts muss der MapMode am Drucker (RefDevice) immer stimmen
- SfxPrinter* pDocPrinter = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen
+ // #64294# Fuer DrawingLayer/Charts muss der MapMode am Drucker (RefDevice) immer stimmen
+ SfxPrinter* pDocPrinter = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen
if (pDocPrinter)
pDocPrinter->SetMapMode(aOldPrinterMode);
}
@@ -434,7 +434,7 @@ void lcl_HidePrint( ScTableInfo& rTabInfo, SCCOL nX1, SCCOL nX2 )
if (((const ScProtectionAttr&)rCellInfo.pPatternAttr->
GetItem(ATTR_PROTECTION, rCellInfo.pConditionSet)).GetHidePrint())
{
- pThisRowInfo->pCellInfo[nX+1].pCell = NULL;
+ pThisRowInfo->pCellInfo[nX+1].pCell = NULL;
pThisRowInfo->pCellInfo[nX+1].bEmptyCellText = TRUE;
}
}
@@ -442,17 +442,17 @@ void lcl_HidePrint( ScTableInfo& rTabInfo, SCCOL nX1, SCCOL nX2 )
}
//
-// Ausgabe auf Device (static)
+// Ausgabe auf Device (static)
//
-// wird benutzt fuer:
-// - Clipboard/Bitmap
-// - Ole-Object (DocShell::Draw)
-// - Vorschau bei Vorlagen
+// wird benutzt fuer:
+// - Clipboard/Bitmap
+// - Ole-Object (DocShell::Draw)
+// - Vorschau bei Vorlagen
void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPrintFactor */,
const Rectangle& rBound, ScViewData* pViewData, BOOL bMetaFile )
{
- //! nPrintFactor auswerten !!!
+ //! nPrintFactor auswerten !!!
SCTAB nTab = 0;
if (pViewData)
@@ -525,15 +525,15 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
nTwipsSizeX += pDoc->GetColWidth( i, nTab );
long nTwipsSizeY = (long) pDoc->GetRowHeight( nY1, nY2, nTab );
- // wenn keine Linien, dann trotzdem Platz fuer den Aussenrahmen (20 Twips = 1pt)
- // (HasLines initalisiert aLines auf 0,0,0,0)
+ // wenn keine Linien, dann trotzdem Platz fuer den Aussenrahmen (20 Twips = 1pt)
+ // (HasLines initalisiert aLines auf 0,0,0,0)
nTwipsSizeX += aLines.Left() + Max( aLines.Right(), 20L );
nTwipsSizeY += aLines.Top() + Max( aLines.Bottom(), 20L );
double nScaleX = (double) nDevSizeX / nTwipsSizeX;
double nScaleY = (double) nDevSizeY / nTwipsSizeY;
- //! Flag bei FillInfo uebergeben !!!!!
+ //! Flag bei FillInfo uebergeben !!!!!
ScRange aERange;
BOOL bEmbed = pDoc->IsEmbedded();
if (bEmbed)
@@ -542,7 +542,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
pDoc->ResetEmbedded();
}
- // Daten zusammenstellen
+ // Daten zusammenstellen
ScTableInfo aTabInfo;
pDoc->FillInfo( aTabInfo, nX1, nY1, nX2, nY2, nTab,
@@ -552,14 +552,14 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
if (bEmbed)
pDoc->SetEmbedded(aERange);
-/* if (!bMetaFile)
+/* if (!bMetaFile)
pDev->SetMapMode(MAP_PIXEL);
*/
long nScrX = aRect.Left();
long nScrY = aRect.Top();
- // Wenn keine Linien, trotzdem Platz fuer Gitterlinien lassen
- // (werden sonst abgeschnitten)
+ // Wenn keine Linien, trotzdem Platz fuer Gitterlinien lassen
+ // (werden sonst abgeschnitten)
long nAddX = (long)( aLines.Left() * nScaleX );
nScrX += ( nAddX ? nAddX : 1 );
long nAddY = (long)( aLines.Top() * nScaleY );
@@ -583,7 +583,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
aOutputData.SetDrawView( pDrawView );
}
- //! SetUseStyleColor ??
+ //! SetUseStyleColor ??
if ( bMetaFile && pDev->GetOutDevType() == OUTDEV_VIRDEV )
aOutputData.SetSnapPixel();
@@ -592,7 +592,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
long nLogStX = aLogStart.X();
long nLogStY = aLogStart.Y();
- //! nZoom fuer GetFont in OutputData ???
+ //! nZoom fuer GetFont in OutputData ???
if (!bMetaFile && pViewData)
pDev->SetMapMode(pViewData->GetLogicMode(pViewData->GetActivePart()));
@@ -632,13 +632,13 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
if (!bMetaFile && pViewData)
pDev->SetMapMode(aMode);
- aOutputData.DrawGrid( TRUE, FALSE ); // keine Seitenumbrueche
+ aOutputData.DrawGrid( TRUE, FALSE ); // keine Seitenumbrueche
pDev->SetLineColor( COL_BLACK );
Size aOne = pDev->PixelToLogic( Size(1,1) );
if (bMetaFile)
- aOne = Size(1,1); // compatible with DrawGrid
+ aOne = Size(1,1); // compatible with DrawGrid
long nRight = nScrX + aOutputData.GetScrW() - aOne.Width();
long nBottom = nScrY + aOutputData.GetScrH() - aOne.Height();
@@ -663,38 +663,38 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
}
//
-// Drucken
+// Drucken
//
void lcl_FillHFParam( ScPrintHFParam& rParam, const SfxItemSet* pHFSet )
{
- // nDistance muss vorher unterschiedlich initalisiert sein
+ // nDistance muss vorher unterschiedlich initalisiert sein
if ( pHFSet == NULL )
{
- rParam.bEnable = FALSE;
- rParam.pBorder = NULL;
- rParam.pBack = NULL;
- rParam.pShadow = NULL;
+ rParam.bEnable = FALSE;
+ rParam.pBorder = NULL;
+ rParam.pBack = NULL;
+ rParam.pShadow = NULL;
}
else
{
- rParam.bEnable = ((const SfxBoolItem&) pHFSet->Get(ATTR_PAGE_ON)).GetValue();
- rParam.bDynamic = ((const SfxBoolItem&) pHFSet->Get(ATTR_PAGE_DYNAMIC)).GetValue();
- rParam.bShared = ((const SfxBoolItem&) pHFSet->Get(ATTR_PAGE_SHARED)).GetValue();
- rParam.nHeight = ((const SvxSizeItem&) pHFSet->Get(ATTR_PAGE_SIZE)).GetSize().Height();
+ rParam.bEnable = ((const SfxBoolItem&) pHFSet->Get(ATTR_PAGE_ON)).GetValue();
+ rParam.bDynamic = ((const SfxBoolItem&) pHFSet->Get(ATTR_PAGE_DYNAMIC)).GetValue();
+ rParam.bShared = ((const SfxBoolItem&) pHFSet->Get(ATTR_PAGE_SHARED)).GetValue();
+ rParam.nHeight = ((const SvxSizeItem&) pHFSet->Get(ATTR_PAGE_SIZE)).GetSize().Height();
const SvxLRSpaceItem* pHFLR = &(const SvxLRSpaceItem&) pHFSet->Get(ATTR_LRSPACE);
long nTmp;
nTmp = pHFLR->GetLeft();
rParam.nLeft = nTmp < 0 ? 0 : USHORT(nTmp);
nTmp = pHFLR->GetRight();
rParam.nRight = nTmp < 0 ? 0 : USHORT(nTmp);
- rParam.pBorder = (const SvxBoxItem*) &pHFSet->Get(ATTR_BORDER);
- rParam.pBack = (const SvxBrushItem*) &pHFSet->Get(ATTR_BACKGROUND);
- rParam.pShadow = (const SvxShadowItem*)&pHFSet->Get(ATTR_SHADOW);;
+ rParam.pBorder = (const SvxBoxItem*) &pHFSet->Get(ATTR_BORDER);
+ rParam.pBack = (const SvxBrushItem*) &pHFSet->Get(ATTR_BACKGROUND);
+ rParam.pShadow = (const SvxShadowItem*)&pHFSet->Get(ATTR_SHADOW);;
-// jetzt doch wieder schon im Dialog:
-// rParam.nHeight += rParam.nDistance; // nicht mehr im Dialog ???
+// jetzt doch wieder schon im Dialog:
+// rParam.nHeight += rParam.nDistance; // nicht mehr im Dialog ???
if (rParam.pBorder)
rParam.nHeight += lcl_LineTotal( rParam.pBorder->GetTop() ) +
@@ -707,14 +707,14 @@ void lcl_FillHFParam( ScPrintHFParam& rParam, const SfxItemSet* pHFSet )
rParam.nHeight = 0;
}
-// bNew = TRUE: benutzten Bereich aus dem Dokument suchen
-// bNew = FALSE: nur ganze Zeilen/Spalten begrenzen
+// bNew = TRUE: benutzten Bereich aus dem Dokument suchen
+// bNew = FALSE: nur ganze Zeilen/Spalten begrenzen
BOOL ScPrintFunc::AdjustPrintArea( BOOL bNew )
{
- SCCOL nOldEndCol = nEndCol; // nur wichtig bei !bNew
+ SCCOL nOldEndCol = nEndCol; // nur wichtig bei !bNew
SCROW nOldEndRow = nEndRow;
- BOOL bChangeCol = TRUE; // bei bNew werden beide angepasst
+ BOOL bChangeCol = TRUE; // bei bNew werden beide angepasst
BOOL bChangeRow = TRUE;
BOOL bNotes = aTableParam.bNotes;
@@ -723,7 +723,7 @@ BOOL ScPrintFunc::AdjustPrintArea( BOOL bNew )
nStartCol = 0;
nStartRow = 0;
if (!pDoc->GetPrintArea( nPrintTab, nEndCol, nEndRow, bNotes ))
- return FALSE; // nix
+ return FALSE; // nix
}
else
{
@@ -760,23 +760,23 @@ BOOL ScPrintFunc::AdjustPrintArea( BOOL bNew )
bFound = pDoc->GetPrintAreaVer( nPrintTab, nStartCol, nEndCol, nEndRow, bNotes );
if (!bFound)
- return FALSE; // leer
+ return FALSE; // leer
if (bForcedChangeRow)
bChangeRow = TRUE;
}
pDoc->ExtendMerge( nStartCol,nStartRow, nEndCol,nEndRow, nPrintTab,
- FALSE, TRUE ); // kein Refresh, incl. Attrs
+ FALSE, TRUE ); // kein Refresh, incl. Attrs
if ( bChangeCol )
{
- OutputDevice* pRefDev = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen
- pRefDev->SetMapMode( MAP_PIXEL ); // wichtig fuer GetNeededSize
+ OutputDevice* pRefDev = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen
+ pRefDev->SetMapMode( MAP_PIXEL ); // wichtig fuer GetNeededSize
pDoc->ExtendPrintArea( pRefDev,
nPrintTab, nStartCol, nStartRow, nEndCol, nEndRow );
- // nEndCol wird veraendert
+ // nEndCol wird veraendert
}
if ( nEndCol < MAXCOL && pDoc->HasAttrib(
@@ -797,14 +797,14 @@ long ScPrintFunc::TextHeight( const EditTextObject* pObject )
if (!pObject)
return 0;
-// pEditEngine->SetPageNo( nTotalPages );
+// pEditEngine->SetPageNo( nTotalPages );
pEditEngine->SetTextNewDefaults( *pObject, *pEditDefaults, FALSE );
return (long) pEditEngine->GetTextHeight();
}
-// nZoom muss gesetzt sein !!!
-// und der entsprechende Twip-MapMode eingestellt
+// nZoom muss gesetzt sein !!!
+// und der entsprechende Twip-MapMode eingestellt
void ScPrintFunc::UpdateHFHeight( ScPrintHFParam& rParam )
{
@@ -812,7 +812,7 @@ void ScPrintFunc::UpdateHFHeight( ScPrintHFParam& rParam )
if (rParam.bEnable && rParam.bDynamic)
{
- // nHeight aus Inhalten berechnen
+ // nHeight aus Inhalten berechnen
MakeEditEngine();
long nPaperWidth = ( aPageSize.Width() - nLeftMargin - nRightMargin -
@@ -854,7 +854,7 @@ void ScPrintFunc::UpdateHFHeight( ScPrintHFParam& rParam )
rParam.pShadow->CalcShadowSpace(SHADOW_BOTTOM);
if (rParam.nHeight < rParam.nManHeight)
- rParam.nHeight = rParam.nManHeight; // eingestelltes Minimum
+ rParam.nHeight = rParam.nManHeight; // eingestelltes Minimum
}
}
@@ -875,9 +875,9 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
nBottomMargin = pULItem->GetLower();
const SvxPageItem* pPageItem = (const SvxPageItem*) &pParamSet->Get( ATTR_PAGE );
- nPageUsage = pPageItem->GetPageUsage();
- bLandscape = pPageItem->IsLandscape();
- aFieldData.eNumType = pPageItem->GetNumType();
+ nPageUsage = pPageItem->GetPageUsage();
+ bLandscape = pPageItem->IsLandscape();
+ aFieldData.eNumType = pPageItem->GetNumType();
bCenterHor = ((const SfxBoolItem&) pParamSet->Get(ATTR_PAGE_HORCENTER)).GetValue();
bCenterVer = ((const SfxBoolItem&) pParamSet->Get(ATTR_PAGE_VERCENTER)).GetValue();
@@ -889,14 +889,14 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
aPageSize = SvxPaperInfo::GetPaperSize( PAPER_A4 );
}
- pBorderItem = (const SvxBoxItem*) &pParamSet->Get(ATTR_BORDER);
- pBackgroundItem = (const SvxBrushItem*) &pParamSet->Get(ATTR_BACKGROUND);
- pShadowItem = (const SvxShadowItem*) &pParamSet->Get(ATTR_SHADOW);
+ pBorderItem = (const SvxBoxItem*) &pParamSet->Get(ATTR_BORDER);
+ pBackgroundItem = (const SvxBrushItem*) &pParamSet->Get(ATTR_BACKGROUND);
+ pShadowItem = (const SvxShadowItem*) &pParamSet->Get(ATTR_SHADOW);
// TabPage "Kopfzeile"
- aHdr.pLeft = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_HEADERLEFT); // Inhalt
- aHdr.pRight = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_HEADERRIGHT);
+ aHdr.pLeft = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_HEADERLEFT); // Inhalt
+ aHdr.pRight = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_HEADERRIGHT);
const SvxSetItem* pHeaderSetItem;
const SfxItemSet* pHeaderSet = NULL;
@@ -905,14 +905,14 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
{
pHeaderSet = &pHeaderSetItem->GetItemSet();
// Kopfzeile hat unteren Abstand
- aHdr.nDistance = ((const SvxULSpaceItem&) pHeaderSet->Get(ATTR_ULSPACE)).GetLower();
+ aHdr.nDistance = ((const SvxULSpaceItem&) pHeaderSet->Get(ATTR_ULSPACE)).GetLower();
}
lcl_FillHFParam( aHdr, pHeaderSet );
// TabPage "Fusszeile"
- aFtr.pLeft = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_FOOTERLEFT); // Inhalt
- aFtr.pRight = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_FOOTERRIGHT);
+ aFtr.pLeft = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_FOOTERLEFT); // Inhalt
+ aFtr.pRight = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_FOOTERRIGHT);
const SvxSetItem* pFooterSetItem;
const SfxItemSet* pFooterSet = NULL;
@@ -921,7 +921,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
{
pFooterSet = &pFooterSetItem->GetItemSet();
// Fusszeile hat oberen Abstand
- aFtr.nDistance = ((const SvxULSpaceItem&) pFooterSet->Get(ATTR_ULSPACE)).GetUpper();
+ aFtr.nDistance = ((const SvxULSpaceItem&) pFooterSet->Get(ATTR_ULSPACE)).GetUpper();
}
lcl_FillHFParam( aFtr, pFooterSet );
@@ -956,47 +956,47 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
DBG_ASSERT( pScaleItem && pScaleToItem && pScaleToPagesItem, "Missing ScaleItem! :-/" );
aTableParam.bCellContent = TRUE;
- aTableParam.bNotes = GET_BOOL(pParamSet,ATTR_PAGE_NOTES);
- aTableParam.bGrid = GET_BOOL(pParamSet,ATTR_PAGE_GRID);
- aTableParam.bHeaders = GET_BOOL(pParamSet,ATTR_PAGE_HEADERS);
- aTableParam.bFormulas = GET_BOOL(pParamSet,ATTR_PAGE_FORMULAS);
- aTableParam.bNullVals = GET_BOOL(pParamSet,ATTR_PAGE_NULLVALS);
- aTableParam.bCharts = GET_SHOW(pParamSet,ATTR_PAGE_CHARTS);
- aTableParam.bObjects = GET_SHOW(pParamSet,ATTR_PAGE_OBJECTS);
- aTableParam.bDrawings = GET_SHOW(pParamSet,ATTR_PAGE_DRAWINGS);
- aTableParam.bTopDown = GET_BOOL(pParamSet,ATTR_PAGE_TOPDOWN);
- aTableParam.bLeftRight = !aTableParam.bLeftRight;
- aTableParam.nFirstPageNo = GET_USHORT(pParamSet,ATTR_PAGE_FIRSTPAGENO);
+ aTableParam.bNotes = GET_BOOL(pParamSet,ATTR_PAGE_NOTES);
+ aTableParam.bGrid = GET_BOOL(pParamSet,ATTR_PAGE_GRID);
+ aTableParam.bHeaders = GET_BOOL(pParamSet,ATTR_PAGE_HEADERS);
+ aTableParam.bFormulas = GET_BOOL(pParamSet,ATTR_PAGE_FORMULAS);
+ aTableParam.bNullVals = GET_BOOL(pParamSet,ATTR_PAGE_NULLVALS);
+ aTableParam.bCharts = GET_SHOW(pParamSet,ATTR_PAGE_CHARTS);
+ aTableParam.bObjects = GET_SHOW(pParamSet,ATTR_PAGE_OBJECTS);
+ aTableParam.bDrawings = GET_SHOW(pParamSet,ATTR_PAGE_DRAWINGS);
+ aTableParam.bTopDown = GET_BOOL(pParamSet,ATTR_PAGE_TOPDOWN);
+ aTableParam.bLeftRight = !aTableParam.bLeftRight;
+ aTableParam.nFirstPageNo = GET_USHORT(pParamSet,ATTR_PAGE_FIRSTPAGENO);
if (!aTableParam.nFirstPageNo)
- aTableParam.nFirstPageNo = (USHORT) nPageStart; // von vorheriger Tabelle
+ aTableParam.nFirstPageNo = (USHORT) nPageStart; // von vorheriger Tabelle
if ( pScaleItem && pScaleToItem && pScaleToPagesItem )
{
- UINT16 nScaleAll = pScaleItem->GetValue();
- UINT16 nScaleToPages = pScaleToPagesItem->GetValue();
+ UINT16 nScaleAll = pScaleItem->GetValue();
+ UINT16 nScaleToPages = pScaleToPagesItem->GetValue();
- aTableParam.bScaleNone = (nScaleAll == 100);
- aTableParam.bScaleAll = (nScaleAll > 0 );
+ aTableParam.bScaleNone = (nScaleAll == 100);
+ aTableParam.bScaleAll = (nScaleAll > 0 );
aTableParam.bScaleTo = pScaleToItem->IsValid();
- aTableParam.bScalePageNum = (nScaleToPages > 0 );
- aTableParam.nScaleAll = nScaleAll;
+ aTableParam.bScalePageNum = (nScaleToPages > 0 );
+ aTableParam.nScaleAll = nScaleAll;
aTableParam.nScaleWidth = pScaleToItem->GetWidth();
aTableParam.nScaleHeight = pScaleToItem->GetHeight();
- aTableParam.nScalePageNum = nScaleToPages;
+ aTableParam.nScalePageNum = nScaleToPages;
}
else
{
- aTableParam.bScaleNone = TRUE;
- aTableParam.bScaleAll = FALSE;
+ aTableParam.bScaleNone = TRUE;
+ aTableParam.bScaleAll = FALSE;
aTableParam.bScaleTo = FALSE;
- aTableParam.bScalePageNum = FALSE;
- aTableParam.nScaleAll = 0;
+ aTableParam.bScalePageNum = FALSE;
+ aTableParam.nScaleAll = 0;
aTableParam.nScaleWidth = 0;
aTableParam.nScaleHeight = 0;
- aTableParam.nScalePageNum = 0;
+ aTableParam.nScalePageNum = 0;
}
- // skip empty pages only if options with that flag are passed
+ // skip empty pages only if options with that flag are passed
aTableParam.bSkipEmpty = pOptions && pOptions->GetSkipEmpty();
if ( pPageData )
aTableParam.bSkipEmpty = FALSE;
@@ -1007,28 +1007,28 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
// TabPage "Bereiche":
//------------------------------------------------------
- //! alle PrintAreas der Tabelle durchgehen !!!
- const ScRange* pPrintArea = pDoc->GetPrintRange( nPrintTab, 0 );
- const ScRange* pRepeatCol = pDoc->GetRepeatColRange( nPrintTab );
- const ScRange* pRepeatRow = pDoc->GetRepeatRowRange( nPrintTab );
+ //! alle PrintAreas der Tabelle durchgehen !!!
+ const ScRange* pPrintArea = pDoc->GetPrintRange( nPrintTab, 0 );
+ const ScRange* pRepeatCol = pDoc->GetRepeatColRange( nPrintTab );
+ const ScRange* pRepeatRow = pDoc->GetRepeatRowRange( nPrintTab );
- // ATTR_PAGE_PRINTTABLES wird ignoriert
+ // ATTR_PAGE_PRINTTABLES wird ignoriert
- if ( pUserArea ) // UserArea (Selektion) hat Vorrang
+ if ( pUserArea ) // UserArea (Selektion) hat Vorrang
{
bPrintCurrentTable =
- aAreaParam.bPrintArea = TRUE; // Selektion
+ aAreaParam.bPrintArea = TRUE; // Selektion
aAreaParam.aPrintArea = *pUserArea;
- // Die Tabellen-Abfrage ist schon in DocShell::Print, hier immer
+ // Die Tabellen-Abfrage ist schon in DocShell::Print, hier immer
aAreaParam.aPrintArea.aStart.SetTab(nPrintTab);
aAreaParam.aPrintArea.aEnd.SetTab(nPrintTab);
-// lcl_LimitRange( aAreaParam.aPrintArea, nPrintTab ); // ganze Zeilen/Spalten...
+// lcl_LimitRange( aAreaParam.aPrintArea, nPrintTab ); // ganze Zeilen/Spalten...
}
else if ( pDoc->HasPrintRange() )
{
- if ( pPrintArea ) // mindestens eine gesetzt ?
+ if ( pPrintArea ) // mindestens eine gesetzt ?
{
bPrintCurrentTable =
aAreaParam.bPrintArea = TRUE;
@@ -1045,7 +1045,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
}
else
{
- // #74834# don't print hidden tables if there's no print range defined there
+ // #74834# don't print hidden tables if there's no print range defined there
if ( pDoc->IsVisible( nPrintTab ) )
{
aAreaParam.bPrintArea = FALSE;
@@ -1053,7 +1053,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
}
else
{
- aAreaParam.bPrintArea = TRUE; // otherwise the table is always counted
+ aAreaParam.bPrintArea = TRUE; // otherwise the table is always counted
bPrintCurrentTable = FALSE;
}
}
@@ -1062,8 +1062,8 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
{
aAreaParam.bRepeatCol = TRUE;
aAreaParam.aRepeatCol = *pRepeatCol;
- nRepeatStartCol = pRepeatCol->aStart.Col();
- nRepeatEndCol = pRepeatCol->aEnd .Col();
+ nRepeatStartCol = pRepeatCol->aStart.Col();
+ nRepeatEndCol = pRepeatCol->aEnd .Col();
}
else
{
@@ -1075,8 +1075,8 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
{
aAreaParam.bRepeatRow = TRUE;
aAreaParam.aRepeatRow = *pRepeatRow;
- nRepeatStartRow = pRepeatRow->aStart.Row();
- nRepeatEndRow = pRepeatRow->aEnd .Row();
+ nRepeatStartRow = pRepeatRow->aStart.Row();
+ nRepeatEndRow = pRepeatRow->aEnd .Row();
}
else
{
@@ -1085,19 +1085,19 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
}
//
- // Seiten aufteilen
+ // Seiten aufteilen
//
if (!bState)
{
- nTabPages = CountPages(); // berechnet auch Zoom
+ nTabPages = CountPages(); // berechnet auch Zoom
nTotalPages = nTabPages;
nTotalPages += CountNotePages();
}
else
{
- CalcPages(); // nur Umbrueche suchen
- CountNotePages(); // Notizen zaehlen, auch wenn Seitenzahl schon bekannt
+ CalcPages(); // nur Umbrueche suchen
+ CountNotePages(); // Notizen zaehlen, auch wenn Seitenzahl schon bekannt
}
if (nDocPages)
@@ -1107,15 +1107,15 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
SetDateTime( Date(), Time() );
- aFieldData.aTitle = pDocShell->GetTitle();
+ aFieldData.aTitle = pDocShell->GetTitle();
const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject();
- aFieldData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
+ aFieldData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
if ( aFieldData.aLongDocName.Len() )
aFieldData.aShortDocName = rURLObj.GetName( INetURLObject::DECODE_UNAMBIGUOUS );
else
aFieldData.aShortDocName = aFieldData.aLongDocName = aFieldData.aTitle;
- // Druckereinstellungen (Orientation, Paper) jetzt erst bei DoPrint
+ // Druckereinstellungen (Orientation, Paper) jetzt erst bei DoPrint
}
Size ScPrintFunc::GetDataSize() const
@@ -1182,7 +1182,7 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi
Size aDrawSize = aGrfSize;
FASTBOOL bDraw = TRUE;
-// FASTBOOL bRetouche = TRUE;
+// FASTBOOL bRetouche = TRUE;
switch ( ePos )
{
case GPOS_LT: aPos = rOrg.TopLeft();
@@ -1217,13 +1217,13 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi
case GPOS_AREA:
aPos = rOrg.TopLeft();
aDrawSize = rOrg.GetSize();
-// bRetouche = FALSE;
+// bRetouche = FALSE;
break;
case GPOS_TILED:
{
- // #104004# use GraphicObject::DrawTiled instead of an own loop
- // (pixel rounding is handled correctly, and a very small bitmap
- // is duplicated into a bigger one for better performance)
+ // #104004# use GraphicObject::DrawTiled instead of an own loop
+ // (pixel rounding is handled correctly, and a very small bitmap
+ // is duplicated into a bigger one for better performance)
GraphicObject aObject( *pGraphic );
@@ -1252,10 +1252,10 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi
// per bitmap pixel. This is approximately 50
// and 7 for current PDF writer, respectively.
//
- const double k1( 50 );
- const double k2( 7 );
- const Size aSize( rOrg.GetSize() );
- const double Abitmap( k1/k2 * aSize.Width()*aSize.Height() );
+ const double k1( 50 );
+ const double k2( 7 );
+ const Size aSize( rOrg.GetSize() );
+ const double Abitmap( k1/k2 * aSize.Width()*aSize.Height() );
aObject.DrawTiled( pOut, rOrg, aGrfSize, Size(0,0),
NULL, GRFMGR_DRAW_STANDARD,
@@ -1267,7 +1267,7 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi
}
bDraw = FALSE;
-// bRetouche = FALSE;
+// bRetouche = FALSE;
}
break;
@@ -1284,13 +1284,13 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi
}
}
-// Rahmen wird nach innen gezeichnet
+// Rahmen wird nach innen gezeichnet
void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH,
const SvxBoxItem* pBorderData, const SvxBrushItem* pBackground,
const SvxShadowItem* pShadow )
{
- //! direkte Ausgabe aus SvxBoxItem !!!
+ //! direkte Ausgabe aus SvxBoxItem !!!
if (pBorderData)
if ( !pBorderData->GetTop() && !pBorderData->GetBottom() && !pBorderData->GetLeft() &&
@@ -1298,25 +1298,25 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH,
pBorderData = NULL;
if (!pBorderData && !pBackground && !pShadow)
- return; // nichts zu tun
+ return; // nichts zu tun
long nLeft = 0;
long nRight = 0;
long nTop = 0;
long nBottom = 0;
- // aFrameRect - aussen um die Umrandung, ohne Schatten
+ // aFrameRect - aussen um die Umrandung, ohne Schatten
if ( pShadow && pShadow->GetLocation() != SVX_SHADOW_NONE )
{
- nLeft += (long) ( pShadow->CalcShadowSpace(SHADOW_LEFT) * nScaleX );
- nRight += (long) ( pShadow->CalcShadowSpace(SHADOW_RIGHT) * nScaleX );
- nTop += (long) ( pShadow->CalcShadowSpace(SHADOW_TOP) * nScaleY );
- nBottom += (long) ( pShadow->CalcShadowSpace(SHADOW_BOTTOM) * nScaleY );
+ nLeft += (long) ( pShadow->CalcShadowSpace(SHADOW_LEFT) * nScaleX );
+ nRight += (long) ( pShadow->CalcShadowSpace(SHADOW_RIGHT) * nScaleX );
+ nTop += (long) ( pShadow->CalcShadowSpace(SHADOW_TOP) * nScaleY );
+ nBottom += (long) ( pShadow->CalcShadowSpace(SHADOW_BOTTOM) * nScaleY );
}
Rectangle aFrameRect( Point(nScrX+nLeft, nScrY+nTop),
Size(nScrW-nLeft-nRight, nScrH-nTop-nBottom) );
- // Mitte der Umrandung, um Linien ueber OutputData zu zeichnen:
+ // Mitte der Umrandung, um Linien ueber OutputData zu zeichnen:
if (pBorderData)
{
nLeft += (long) ( lcl_LineTotal(pBorderData->GetLeft()) * nScaleX / 2 );
@@ -1327,22 +1327,22 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH,
long nEffHeight = nScrH - nTop - nBottom;
long nEffWidth = nScrW - nLeft - nRight;
if (nEffHeight<=0 || nEffWidth<=0)
- return; // leer
+ return; // leer
- // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
+ // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
BOOL bCellContrast = bUseStyleColor &&
Application::GetSettings().GetStyleSettings().GetHighContrastMode();
if ( pBackground && !bCellContrast )
{
-// Rectangle aBackRect( Point(nScrX+nLeft, nScrY+nTop), Size(nEffWidth,nEffHeight) );
+// Rectangle aBackRect( Point(nScrX+nLeft, nScrY+nTop), Size(nEffWidth,nEffHeight) );
if (pBackground->GetGraphicPos() != GPOS_NONE)
{
OutputDevice* pRefDev;
if ( bIsRender )
- pRefDev = pDev; // don't use printer for PDF
+ pRefDev = pDev; // don't use printer for PDF
else
- pRefDev = pDoc->GetPrinter(); // use printer also for preview
+ pRefDev = pDoc->GetPrinter(); // use printer also for preview
lcl_DrawGraphic( *pBackground, pDev, pRefDev, aFrameRect, aFrameRect );
}
@@ -1424,7 +1424,7 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH,
nScrX+nLeft, nScrY+nTop, 0,0, 0,0, nScaleX, nScaleY );
aOutputData.SetUseStyleColor( bUseStyleColor );
-// pDev->SetMapMode(aTwipMode);
+// pDev->SetMapMode(aTwipMode);
if (pBorderData)
aOutputData.DrawFrame();
@@ -1568,7 +1568,7 @@ void ScPrintFunc::LocateArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
long nScrX, long nScrY, BOOL bRepCol, BOOL bRepRow,
ScPreviewLocationData& rLocationData )
{
- // get MapMode for drawing objects (same MapMode as in ScOutputData::PrintDrawingLayer)
+ // get MapMode for drawing objects (same MapMode as in ScOutputData::PrintDrawingLayer)
Point aLogPos = OutputDevice::LogicToLogic(Point(nScrX,nScrY), aOffsetMode, aLogicMode);
long nLogStX = aLogPos.X();
@@ -1586,7 +1586,7 @@ void ScPrintFunc::LocateArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
aMMOffset += Point( nLogStX, nLogStY );
MapMode aDrawMapMode( MAP_100TH_MM, aMMOffset, aLogicMode.GetScaleX(), aLogicMode.GetScaleY() );
- // get pixel rectangle
+ // get pixel rectangle
Size aOnePixel = pDev->PixelToLogic(Size(1,1));
long nOneX = aOnePixel.Width();
@@ -1616,7 +1616,7 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
if ( nX2 < nX1 || nY2 < nY1 )
return;
- //! Flag bei FillInfo uebergeben !!!!!
+ //! Flag bei FillInfo uebergeben !!!!!
ScRange aERange;
BOOL bEmbed = pDoc->IsEmbedded();
if (bEmbed)
@@ -1629,7 +1629,7 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
long nLogStX = aPos.X();
long nLogStY = aPos.Y();
- // Daten zusammenstellen
+ // Daten zusammenstellen
ScTableInfo aTabInfo;
pDoc->FillInfo( aTabInfo, nX1, nY1, nX2, nY2, nPrintTab,
@@ -1653,7 +1653,7 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
if(!bHideAllDrawingLayer)
{
pDev->SetMapMode(aLogicMode);
- // hier kein Clipping setzen (Mapmode wird verschoben)
+ // hier kein Clipping setzen (Mapmode wird verschoben)
// #i72502#
aOutputData.PrintDrawingLayer(SC_LAYER_BACK, aMMOffset);
@@ -1672,40 +1672,40 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
if ( !pPrinter )
{
- OutputDevice* pRefDev = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen
- Fraction aPrintFrac( nZoom, 100 ); // ohne nManualZoom
- // MapMode, wie er beim Drucken herauskommen wuerde:
+ OutputDevice* pRefDev = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen
+ Fraction aPrintFrac( nZoom, 100 ); // ohne nManualZoom
+ // MapMode, wie er beim Drucken herauskommen wuerde:
pRefDev->SetMapMode( MapMode( MAP_100TH_MM, Point(), aPrintFrac, aPrintFrac ) );
- // when rendering (PDF), don't use printer as ref device, but printer's MapMode
- // has to be set anyway, as charts still use it (#106409#)
+ // when rendering (PDF), don't use printer as ref device, but printer's MapMode
+ // has to be set anyway, as charts still use it (#106409#)
if ( !bIsRender )
aOutputData.SetRefDevice( pRefDev );
}
-// aOutputData.SetMetaFileMode(TRUE);
+// aOutputData.SetMetaFileMode(TRUE);
if( aTableParam.bCellContent )
aOutputData.DrawBackground();
pDev->SetClipRegion( Rectangle( aPos, Size( aOutputData.GetScrW(), aOutputData.GetScrH() ) ) );
pDev->SetClipRegion();
-// aOutputData.SetMetaFileMode(FALSE);
+// aOutputData.SetMetaFileMode(FALSE);
if( aTableParam.bCellContent )
{
aOutputData.DrawExtraShadow( bShLeft, bShTop, bShRight, bShBottom );
aOutputData.DrawFrame();
aOutputData.DrawStrings();
- // pDev->SetMapMode(aLogicMode);
+ // pDev->SetMapMode(aLogicMode);
aOutputData.DrawEdit(FALSE);
}
-// pDev->SetMapMode(aOffsetMode);
+// pDev->SetMapMode(aOffsetMode);
if (aTableParam.bGrid)
- aOutputData.DrawGrid( TRUE, FALSE ); // keine Seitenumbrueche
+ aOutputData.DrawGrid( TRUE, FALSE ); // keine Seitenumbrueche
-/*!!!!!!!!!!! Notizen in Tabelle markieren ??????????????????????????
+/*!!!!!!!!!!! Notizen in Tabelle markieren ??????????????????????????
if (aTableParam.bNotes)
{
@@ -1717,7 +1717,7 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
aOutputData.AddPDFNotes(); // has no effect if not rendering PDF with notes enabled
-// pDev->SetMapMode(aDrawMode);
+// pDev->SetMapMode(aDrawMode);
// test if all paint parts are hidden, then a paint is not necessary at all
if(!bHideAllDrawingLayer)
@@ -1731,13 +1731,13 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
aOutputData.PostPrintDrawingLayer(aMMOffset); // #i74768#
}
-BOOL ScPrintFunc::IsMirror( long nPageNo ) // Raender spiegeln ?
+BOOL ScPrintFunc::IsMirror( long nPageNo ) // Raender spiegeln ?
{
SvxPageUsage eUsage = (SvxPageUsage) ( nPageUsage & 0x000f );
return ( eUsage == SVX_PAGE_MIRROR && (nPageNo & 1) );
}
-BOOL ScPrintFunc::IsLeft( long nPageNo ) // linke Fussnoten ?
+BOOL ScPrintFunc::IsLeft( long nPageNo ) // linke Fussnoten ?
{
SvxPageUsage eUsage = (SvxPageUsage) ( nPageUsage & 0x000f );
BOOL bLeft;
@@ -1759,8 +1759,8 @@ void ScPrintFunc::MakeEditEngine()
{
if (!pEditEngine)
{
- // can't use document's edit engine pool here,
- // because pool must have twips as default metric
+ // can't use document's edit engine pool here,
+ // because pool must have twips as default metric
pEditEngine = new ScHeaderEditEngine( EditEngine::CreatePool(), TRUE );
pEditEngine->EnableUndo(FALSE);
@@ -1770,42 +1770,42 @@ void ScPrintFunc::MakeEditEngine()
pEditEngine->SetControlWord( pEditEngine->GetControlWord() & ~EE_CNTRL_RTFSTYLESHEETS );
pEditEngine->EnableAutoColor( bUseStyleColor );
- // Default-Set fuer Ausrichtung
+ // Default-Set fuer Ausrichtung
pEditDefaults = new SfxItemSet( pEditEngine->GetEmptyItemSet() );
const ScPatternAttr& rPattern = (const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN);
rPattern.FillEditItemSet( pEditDefaults );
- // FillEditItemSet adjusts font height to 1/100th mm,
- // but for header/footer twips is needed, as in the PatternAttr:
+ // FillEditItemSet adjusts font height to 1/100th mm,
+ // but for header/footer twips is needed, as in the PatternAttr:
pEditDefaults->Put( rPattern.GetItem(ATTR_FONT_HEIGHT), EE_CHAR_FONTHEIGHT );
pEditDefaults->Put( rPattern.GetItem(ATTR_CJK_FONT_HEIGHT), EE_CHAR_FONTHEIGHT_CJK );
pEditDefaults->Put( rPattern.GetItem(ATTR_CTL_FONT_HEIGHT), EE_CHAR_FONTHEIGHT_CTL );
- // #69193# dont use font color, because background color is not used
- //! there's no way to set the background for note pages
+ // #69193# dont use font color, because background color is not used
+ //! there's no way to set the background for note pages
pEditDefaults->ClearItem( EE_CHAR_COLOR );
if (ScGlobal::IsSystemRTL())
pEditDefaults->Put( SvxFrameDirectionItem( FRMDIR_HORI_RIGHT_TOP, EE_PARA_WRITINGDIR ) );
}
- pEditEngine->SetData( aFieldData ); // Seitennummer etc. setzen
+ pEditEngine->SetData( aFieldData ); // Seitennummer etc. setzen
}
-// nStartY = logic
+// nStartY = logic
void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY,
BOOL bDoPrint, ScPreviewLocationData* pLocationData )
{
const ScPrintHFParam& rParam = bHeader ? aHdr : aFtr;
- pDev->SetMapMode( aTwipMode ); // Kopf-/Fusszeilen in Twips
+ pDev->SetMapMode( aTwipMode ); // Kopf-/Fusszeilen in Twips
BOOL bLeft = IsLeft(nPageNo) && !rParam.bShared;
const ScPageHFItem* pHFItem = bLeft ? rParam.pLeft : rParam.pRight;
long nLineStartX = aPageRect.Left() + rParam.nLeft;
- long nLineEndX = aPageRect.Right() - rParam.nRight;
+ long nLineEndX = aPageRect.Right() - rParam.nRight;
long nLineWidth = nLineEndX - nLineStartX + 1;
- // Edit-Engine
+ // Edit-Engine
Point aStart( nLineStartX, nStartY );
Size aPaperSize( nLineWidth, rParam.nHeight-rParam.nDistance );
@@ -1821,8 +1821,8 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY,
if ( rParam.pShadow && rParam.pShadow->GetLocation() != SVX_SHADOW_NONE )
{
- long nLeft = rParam.pShadow->CalcShadowSpace(SHADOW_LEFT);
- long nTop = rParam.pShadow->CalcShadowSpace(SHADOW_TOP);
+ long nLeft = rParam.pShadow->CalcShadowSpace(SHADOW_LEFT);
+ long nTop = rParam.pShadow->CalcShadowSpace(SHADOW_TOP);
aStart.X() += nLeft;
aStart.Y() += nTop;
aPaperSize.Width() -= nLeft + rParam.pShadow->CalcShadowSpace(SHADOW_RIGHT);
@@ -1835,14 +1835,14 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY,
pEditEngine->SetPaperSize(aPaperSize);
const EditTextObject* pObject;
- // Rahmen / Hintergrund
+ // Rahmen / Hintergrund
Point aBorderStart( nLineStartX, nStartY );
Size aBorderSize( nLineWidth, rParam.nHeight-rParam.nDistance );
if ( rParam.bDynamic )
{
- // hier nochmal anpassen, wegen geraden/ungeraden Kopf/Fusszeilen
- // und evtl. anderen Umbruechen durch Variablen (Seitennummer etc.)
+ // hier nochmal anpassen, wegen geraden/ungeraden Kopf/Fusszeilen
+ // und evtl. anderen Umbruechen durch Variablen (Seitennummer etc.)
long nMaxHeight = 0;
nMaxHeight = Max( nMaxHeight, TextHeight( pHFItem->GetLeftArea() ) );
@@ -1858,7 +1858,7 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY,
rParam.pShadow->CalcShadowSpace(SHADOW_BOTTOM);
if (nMaxHeight < rParam.nManHeight-rParam.nDistance)
- nMaxHeight = rParam.nManHeight-rParam.nDistance; // eingestelltes Minimum
+ nMaxHeight = rParam.nManHeight-rParam.nDistance; // eingestelltes Minimum
aBorderSize.Height() = nMaxHeight;
}
@@ -1867,17 +1867,17 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY,
{
double nOldScaleX = nScaleX;
double nOldScaleY = nScaleY;
- nScaleX = nScaleY = 1.0; // direkt in Twips ausgeben
+ nScaleX = nScaleY = 1.0; // direkt in Twips ausgeben
DrawBorder( aBorderStart.X(), aBorderStart.Y(), aBorderSize.Width(), aBorderSize.Height(),
rParam.pBorder, rParam.pBack, rParam.pShadow );
nScaleX = nOldScaleX;
nScaleY = nOldScaleY;
- // Clipping fuer Text
+ // Clipping fuer Text
pDev->SetClipRegion( Rectangle( aStart, aPaperSize ) );
- // links
+ // links
pObject = pHFItem->GetLeftArea();
if (pObject)
@@ -1891,7 +1891,7 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY,
pEditEngine->Draw( pDev, aDraw, 0 );
}
- // Mitte
+ // Mitte
pObject = pHFItem->GetCenterArea();
if (pObject)
@@ -1905,7 +1905,7 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY,
pEditEngine->Draw( pDev, aDraw, 0 );
}
- // rechts
+ // rechts
pObject = pHFItem->GetRightArea();
if (pObject)
@@ -1941,15 +1941,15 @@ long ScPrintFunc::DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData
Font aMarkFont;
ScAutoFontColorMode eColorMode = bUseStyleColor ? SC_AUTOCOL_DISPLAY : SC_AUTOCOL_PRINT;
((const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)).GetFont( aMarkFont, eColorMode );
-//? aMarkFont.SetWeight( WEIGHT_BOLD );
+//? aMarkFont.SetWeight( WEIGHT_BOLD );
pDev->SetFont( aMarkFont );
long nMarkLen = pDev->GetTextWidth(
String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("GW99999:")));
// ohne Space, weil's eh selten so weit kommt
Size aDataSize = aPageRect.GetSize();
- if ( nMarkLen > aDataSize.Width() / 2 ) // alles viel zu klein?
- nMarkLen = aDataSize.Width() / 2; // Seite bruederlich aufteilen
+ if ( nMarkLen > aDataSize.Width() / 2 ) // alles viel zu klein?
+ nMarkLen = aDataSize.Width() / 2; // Seite bruederlich aufteilen
aDataSize.Width() -= nMarkLen;
pEditEngine->SetPaperSize( aDataSize );
@@ -1980,7 +1980,7 @@ long ScPrintFunc::DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData
pPos->Format( aMarkStr, SCA_VALID, pDoc, pDoc->GetAddressConvention() );
aMarkStr += ':';
- // Zellposition auch per EditEngine, damit die Position stimmt
+ // Zellposition auch per EditEngine, damit die Position stimmt
pEditEngine->SetText(aMarkStr);
pEditEngine->Draw( pDev, Point( aPageRect.Left(), nPosY ), 0 );
}
@@ -1994,7 +1994,7 @@ long ScPrintFunc::DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData
}
nPosY += nTextHeight;
- nPosY += 200; // Abstand
+ nPosY += 200; // Abstand
++nCount;
bOk = TRUE;
}
@@ -2013,7 +2013,7 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPr
if ( bDoPrint && bClearWin )
{
- //! mit PrintPage zusammenfassen !!!
+ //! mit PrintPage zusammenfassen !!!
Color aBackgroundColor( COL_WHITE );
if ( bUseStyleColor )
@@ -2028,7 +2028,7 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPr
}
- // aPageRect auf linke / rechte Seiten anpassen
+ // aPageRect auf linke / rechte Seiten anpassen
Rectangle aTempRect = Rectangle( Point(), aPageSize );
if (IsMirror(nPageNo))
@@ -2050,7 +2050,7 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPr
if ( bDoPrint || pLocationData )
{
- // Kopf- und Fusszeilen
+ // Kopf- und Fusszeilen
if (aHdr.bEnable)
{
@@ -2081,11 +2081,11 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
BOOL bLayoutRTL = pDoc->IsLayoutRTL( nPrintTab );
long nLayoutSign = bLayoutRTL ? -1 : 1;
- // nPageNo is the page number within all sheets of one "start page" setting
+ // nPageNo is the page number within all sheets of one "start page" setting
if ( bClearWin && bDoPrint )
{
- // muss genau zum Zeichnen des Rahmens in preview.cxx passen !!!
+ // muss genau zum Zeichnen des Rahmens in preview.cxx passen !!!
Color aBackgroundColor( COL_WHITE );
if ( bUseStyleColor )
@@ -2100,7 +2100,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
}
- // aPageRect auf linke / rechte Seiten anpassen
+ // aPageRect auf linke / rechte Seiten anpassen
Rectangle aTempRect = Rectangle( Point(), aPageSize );
if (IsMirror(nPageNo))
@@ -2138,7 +2138,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
// pPrinter->StartPage();
}
- // Kopf- und Fusszeilen (ohne Zentrierung)
+ // Kopf- und Fusszeilen (ohne Zentrierung)
if (aHdr.bEnable)
{
@@ -2151,9 +2151,9 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
PrintHF( nPageNo, FALSE, nFooterY, bDoPrint, pLocationData );
}
- // Position ( Raender / zentrieren )
+ // Position ( Raender / zentrieren )
- long nLeftSpace = aPageRect.Left(); // Document-Twips
+ long nLeftSpace = aPageRect.Left(); // Document-Twips
long nTopSpace = aPageRect.Top();
if ( bCenterHor || bLayoutRTL )
{
@@ -2168,18 +2168,18 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
nDataWidth += (long) PRINT_HEADER_WIDTH;
if (pBorderItem)
nDataWidth += pBorderItem->GetDistance(BOX_LINE_LEFT) +
- pBorderItem->GetDistance(BOX_LINE_RIGHT); //! Line width?
+ pBorderItem->GetDistance(BOX_LINE_RIGHT); //! Line width?
if (pShadowItem && pShadowItem->GetLocation() != SVX_SHADOW_NONE)
nDataWidth += pShadowItem->CalcShadowSpace(SHADOW_LEFT) +
pShadowItem->CalcShadowSpace(SHADOW_RIGHT);
if ( bCenterHor )
{
- nLeftSpace += ( aPageRect.GetWidth() - nDataWidth ) / 2; // LTR or RTL
+ nLeftSpace += ( aPageRect.GetWidth() - nDataWidth ) / 2; // LTR or RTL
if (pBorderItem)
nLeftSpace -= lcl_LineTotal(pBorderItem->GetLeft());
}
else if ( bLayoutRTL )
- nLeftSpace += aPageRect.GetWidth() - nDataWidth; // align to the right edge of the page
+ nLeftSpace += aPageRect.GetWidth() - nDataWidth; // align to the right edge of the page
}
if ( bCenterVer )
{
@@ -2191,7 +2191,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
nDataHeight += (long) PRINT_HEADER_HEIGHT;
if (pBorderItem)
nDataHeight += pBorderItem->GetDistance(BOX_LINE_TOP) +
- pBorderItem->GetDistance(BOX_LINE_BOTTOM); //! Line width?
+ pBorderItem->GetDistance(BOX_LINE_BOTTOM); //! Line width?
if (pShadowItem && pShadowItem->GetLocation() != SVX_SHADOW_NONE)
nDataHeight += pShadowItem->CalcShadowSpace(SHADOW_TOP) +
pShadowItem->CalcShadowSpace(SHADOW_BOTTOM);
@@ -2200,14 +2200,14 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
nTopSpace -= lcl_LineTotal(pBorderItem->GetTop());
}
- // calculate sizes of the elements for partitioning
- // (header, repeat, data)
+ // calculate sizes of the elements for partitioning
+ // (header, repeat, data)
long nHeaderWidth = 0;
long nHeaderHeight = 0;
long nRepeatWidth = 0;
long nRepeatHeight = 0;
- long nContentWidth = 0; // scaled - not the same as nDataWidth above
+ long nContentWidth = 0; // scaled - not the same as nDataWidth above
long nContentHeight = 0;
if (aTableParam.bHeaders)
{
@@ -2225,12 +2225,12 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
nContentHeight += pDoc->GetScaledRowHeight( nY1, nY2, nPrintTab,
nScaleY);
- // partition the page
+ // partition the page
long nStartX = ((long) ( nLeftSpace * nScaleX ));
long nStartY = ((long) ( nTopSpace * nScaleY ));
-// nStartX -= aOffset.X(); // schon im MapMode
-// nStartY -= aOffset.Y();
+// nStartX -= aOffset.X(); // schon im MapMode
+// nStartY -= aOffset.Y();
long nInnerStartX = nStartX;
long nInnerStartY = nStartY;
@@ -2249,10 +2249,10 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
if ( bLayoutRTL )
{
- // arrange elements starting from the right edge
+ // arrange elements starting from the right edge
nInnerStartX += nHeaderWidth + nRepeatWidth + nContentWidth;
- // make rounding easier so the elements are really next to each other in preview
+ // make rounding easier so the elements are really next to each other in preview
Size aOffsetOnePixel = pDev->PixelToLogic( Size(1,1), aOffsetMode );
long nOffsetOneX = aOffsetOnePixel.Width();
nInnerStartX += nOffsetOneX / 2;
@@ -2261,7 +2261,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
long nFrameStartX = nInnerStartX;
long nFrameStartY = nInnerStartY;
- long nRepStartX = nInnerStartX + nHeaderWidth * nLayoutSign; // widths/heights are 0 if not used
+ long nRepStartX = nInnerStartX + nHeaderWidth * nLayoutSign; // widths/heights are 0 if not used
long nRepStartY = nInnerStartY + nHeaderHeight;
long nDataX = nRepStartX + nRepeatWidth * nLayoutSign;
long nDataY = nRepStartY + nRepeatHeight;
@@ -2272,19 +2272,19 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
if ( bLayoutRTL )
{
- // each element's start position is its left edge
- //! subtract one pixel less?
- nInnerStartX -= nHeaderWidth; // used for header
+ // each element's start position is its left edge
+ //! subtract one pixel less?
+ nInnerStartX -= nHeaderWidth; // used for header
nRepStartX -= nRepeatWidth;
nDataX -= nContentWidth;
- // continue right of the main elements again
+ // continue right of the main elements again
nEndX += nHeaderWidth + nRepeatWidth + nContentWidth;
}
- // Seiten-Rahmen / Hintergrund
+ // Seiten-Rahmen / Hintergrund
- //! nEndX/Y anpassen
+ //! nEndX/Y anpassen
long nBorderEndX = nEndX;
long nBorderEndY = nEndY;
@@ -2312,7 +2312,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
pDev->SetMapMode( aOffsetMode );
- // Wiederholungszeilen/Spalten ausgeben
+ // Wiederholungszeilen/Spalten ausgeben
if (bDoRepCol && bDoRepRow)
{
@@ -2340,15 +2340,15 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
LocateArea( nX1,nRepeatStartRow, nX2,nRepeatEndRow, nDataX,nRepStartY, FALSE,TRUE, *pLocationData );
}
- // Daten ausgeben
+ // Daten ausgeben
if ( bDoPrint )
PrintArea( nX1,nY1, nX2,nY2, nDataX,nDataY, !bDoRepCol,!bDoRepRow,TRUE,TRUE );
if ( pLocationData )
LocateArea( nX1,nY1, nX2,nY2, nDataX,nDataY, FALSE,FALSE, *pLocationData );
- // Spalten-/Zeilenkoepfe ausgeben
- // nach den Daten (ueber evtl. weitergezeichneten Schatten)
+ // Spalten-/Zeilenkoepfe ausgeben
+ // nach den Daten (ueber evtl. weitergezeichneten Schatten)
Color aGridColor( COL_BLACK );
if ( bUseStyleColor )
@@ -2393,7 +2393,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
LocateRowHdr( nY1,nY2, nInnerStartX,nDataY, FALSE, *pLocationData );
}
- // einfacher Rahmen
+ // einfacher Rahmen
if ( bDoPrint && ( aTableParam.bGrid || aTableParam.bHeaders ) )
{
@@ -2414,7 +2414,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO
pDev->SetLineColor( aGridColor );
pDev->SetFillColor();
pDev->DrawRect( Rectangle( nLeftX, nTopY, nRightX, nBottomY ) );
- // nEndX/Y ohne Rahmen-Anpassung
+ // nEndX/Y ohne Rahmen-Anpassung
}
if ( pPrinter && bDoPrint )
@@ -2451,7 +2451,7 @@ void ScPrintFunc::SetUseStyleColor( BOOL bFlag )
void ScPrintFunc::SetRenderFlag( BOOL bFlag )
{
- bIsRender = bFlag; // set when using XRenderable (PDF)
+ bIsRender = bFlag; // set when using XRenderable (PDF)
}
void ScPrintFunc::SetExclusivelyDrawOleAndDrawObjects()
@@ -2466,8 +2466,8 @@ void ScPrintFunc::SetExclusivelyDrawOleAndDrawObjects()
}
//
-// UpdatePages wird nur von aussen gerufen, um die Umbrueche fuer die Anzeige
-// richtig zu setzen - immer ohne UserArea
+// UpdatePages wird nur von aussen gerufen, um die Umbrueche fuer die Anzeige
+// richtig zu setzen - immer ohne UserArea
//
BOOL ScPrintFunc::UpdatePages()
@@ -2475,11 +2475,11 @@ BOOL ScPrintFunc::UpdatePages()
if (!pParamSet)
return FALSE;
- // Zoom
+ // Zoom
nZoom = 100;
if (aTableParam.bScalePageNum || aTableParam.bScaleTo)
- nZoom = ZOOM_MIN; // stimmt fuer Umbrueche
+ nZoom = ZOOM_MIN; // stimmt fuer Umbrueche
else if (aTableParam.bScaleAll)
{
nZoom = aTableParam.nScaleAll;
@@ -2492,10 +2492,10 @@ BOOL ScPrintFunc::UpdatePages()
for (SCTAB nTab=0; nTab<nTabCount; nTab++)
if ( nTab==nPrintTab || pDoc->GetPageStyle(nTab)==aName )
{
- // Wiederholungszeilen / Spalten
+ // Wiederholungszeilen / Spalten
pDoc->SetRepeatArea( nTab, nRepeatStartCol,nRepeatEndCol, nRepeatStartRow,nRepeatEndRow );
- // Umbrueche setzen
+ // Umbrueche setzen
ResetBreaks(nTab);
pDocShell->PostPaint(0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID);
}
@@ -2503,32 +2503,32 @@ BOOL ScPrintFunc::UpdatePages()
return TRUE;
}
-long ScPrintFunc::CountPages() // setzt auch nPagesX, nPagesY
+long ScPrintFunc::CountPages() // setzt auch nPagesX, nPagesY
{
BOOL bAreaOk = FALSE;
if (pDoc->HasTable( nPrintTab ))
{
- if (aAreaParam.bPrintArea) // Druckbereich angegeben?
+ if (aAreaParam.bPrintArea) // Druckbereich angegeben?
{
if ( bPrintCurrentTable )
{
ScRange& rRange = aAreaParam.aPrintArea;
- // hier kein Vergleich der Tabellen mehr, die Area gilt immer fuer diese Tabelle
- // wenn hier verglichen werden soll, muss die Tabelle der Druckbereiche beim
- // Einfuegen von Tabellen etc. angepasst werden !
+ // hier kein Vergleich der Tabellen mehr, die Area gilt immer fuer diese Tabelle
+ // wenn hier verglichen werden soll, muss die Tabelle der Druckbereiche beim
+ // Einfuegen von Tabellen etc. angepasst werden !
nStartCol = rRange.aStart.Col();
nStartRow = rRange.aStart.Row();
nEndCol = rRange.aEnd .Col();
nEndRow = rRange.aEnd .Row();
- bAreaOk = AdjustPrintArea(FALSE); // begrenzen
+ bAreaOk = AdjustPrintArea(FALSE); // begrenzen
}
else
bAreaOk = FALSE;
}
- else // aus Dokument suchen
+ else // aus Dokument suchen
bAreaOk = AdjustPrintArea(TRUE);
}
@@ -2553,7 +2553,7 @@ long ScPrintFunc::CountPages() // setzt auch nPagesX, n
}
else
{
- CalcZoom(RANGENO_NORANGE); // Zoom berechnen
+ CalcZoom(RANGENO_NORANGE); // Zoom berechnen
if ( aTableParam.bSkipEmpty )
for (nY=0; nY<nPagesY; nY++)
nPages += pPageRows[nY].CountVisible();
@@ -2566,7 +2566,7 @@ long ScPrintFunc::CountPages() // setzt auch nPagesX, n
}
else
{
-// nZoom = 100; // nZoom auf letztem Wert stehenlassen !!!
+// nZoom = 100; // nZoom auf letztem Wert stehenlassen !!!
nPagesX = nPagesY = nTotalY = 0;
return 0;
}
@@ -2583,9 +2583,9 @@ long ScPrintFunc::CountNotePages()
BOOL bError = FALSE;
if (!aAreaParam.bPrintArea)
- bError = !AdjustPrintArea(TRUE); // komplett aus Dok suchen
+ bError = !AdjustPrintArea(TRUE); // komplett aus Dok suchen
- USHORT nRepeats = 1; // wie oft durchgehen ?
+ USHORT nRepeats = 1; // wie oft durchgehen ?
if (bMultiArea)
nRepeats = pDoc->GetPrintRangeCount(nPrintTab);
if (bError)
@@ -2594,7 +2594,7 @@ long ScPrintFunc::CountNotePages()
for (USHORT nStep=0; nStep<nRepeats; nStep++)
{
BOOL bDoThis = TRUE;
- if (bMultiArea) // alle Areas durchgehen
+ if (bMultiArea) // alle Areas durchgehen
{
const ScRange* pThisRange = pDoc->GetPrintRange( nPrintTab, nStep );
if ( pThisRange )
@@ -2641,19 +2641,19 @@ long ScPrintFunc::CountNotePages()
return nPages;
}
-void ScPrintFunc::InitModes() // aus nZoom etc. die MapModes setzen
+void ScPrintFunc::InitModes() // aus nZoom etc. die MapModes setzen
{
aOffset = Point( aSrcOffset.X()*100/nZoom, aSrcOffset.Y()*100/nZoom );
long nEffZoom = nZoom * (long) nManualZoom;
-// nScaleX = nScaleY = 1.0; // Ausgabe in Twips
- nScaleX = nScaleY = HMM_PER_TWIPS; // Ausgabe in 1/100 mm
+// nScaleX = nScaleY = 1.0; // Ausgabe in Twips
+ nScaleX = nScaleY = HMM_PER_TWIPS; // Ausgabe in 1/100 mm
Fraction aZoomFract( nEffZoom,10000 );
Fraction aHorFract = aZoomFract;
- if ( !pPrinter && !bIsRender ) // adjust scale for preview
+ if ( !pPrinter && !bIsRender ) // adjust scale for preview
{
double nFact = pDocShell->GetOutputFactor();
aHorFract = Fraction( (long)( nEffZoom / nFact ), 10000 );
@@ -2675,7 +2675,7 @@ void ScPrintFunc::ApplyPrintSettings()
if ( pPrinter )
{
//
- // Printer zum Drucken umstellen
+ // Printer zum Drucken umstellen
//
Size aEnumSize = aPageSize;
@@ -2709,9 +2709,9 @@ void ScPrintFunc::ApplyPrintSettings()
}
//--------------------------------------------------------------------
-// rPageRanges = Range fuer alle Tabellen
-// nStartPage = in rPageRanges beginnen bei nStartPage
-// nDisplayStart = lfd. Nummer fuer Anzeige der Seitennummer
+// rPageRanges = Range fuer alle Tabellen
+// nStartPage = in rPageRanges beginnen bei nStartPage
+// nDisplayStart = lfd. Nummer fuer Anzeige der Seitennummer
long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges,
long nStartPage, long nDisplayStart, BOOL bDoPrint,
@@ -2744,14 +2744,14 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges,
long nPrinted = 0;
long nEndPage = rPageRanges.GetTotalRange().Max();
- USHORT nRepeats = 1; // wie oft durchgehen ?
+ USHORT nRepeats = 1; // wie oft durchgehen ?
if (bMultiArea)
nRepeats = pDoc->GetPrintRangeCount(nPrintTab);
for (USHORT nStep=0; nStep<nRepeats; nStep++)
{
- if (bMultiArea) // Bereich neu belegen ?
+ if (bMultiArea) // Bereich neu belegen ?
{
- CalcZoom(nStep); // setzt auch nStartCol etc. neu
+ CalcZoom(nStep); // setzt auch nStartCol etc. neu
InitModes();
}
@@ -2762,7 +2762,7 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges,
size_t nCountX;
size_t nCountY;
- if (aTableParam.bTopDown) // von oben nach unten
+ if (aTableParam.bTopDown) // von oben nach unten
{
nX1 = nStartCol;
for (nCountX=0; nCountX<nPagesX; nCountX++)
@@ -2792,7 +2792,7 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges,
nX1 = nX2 + 1;
}
}
- else // von links nach rechts
+ else // von links nach rechts
{
for (nCountY=0; nCountY<nPagesY; nCountY++)
{
@@ -2846,7 +2846,7 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges,
if (bPageSelected)
{
++nPrinted;
- bSourceRangeValid = FALSE; // last page was no cell range
+ bSourceRangeValid = FALSE; // last page was no cell range
}
++nPageNo;
}
@@ -2857,12 +2857,12 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges,
while (nNoteAdd);
if ( bMultiArea )
- ResetBreaks(nPrintTab); // Breaks fuer Anzeige richtig
+ ResetBreaks(nPrintTab); // Breaks fuer Anzeige richtig
return nPrinted;
}
-void ScPrintFunc::CalcZoom( USHORT nRangeNo ) // Zoom berechnen
+void ScPrintFunc::CalcZoom( USHORT nRangeNo ) // Zoom berechnen
{
USHORT nRCount = pDoc->GetPrintRangeCount( nPrintTab );
const ScRange* pThisRange = NULL;
@@ -2876,7 +2876,7 @@ void ScPrintFunc::CalcZoom( USHORT nRangeNo ) // Zoom bere
nEndRow = pThisRange->aEnd .Row();
}
- if (!AdjustPrintArea(FALSE)) // leer
+ if (!AdjustPrintArea(FALSE)) // leer
{
nZoom = 100;
nPagesX = nPagesY = nTotalY = 0;
@@ -2904,7 +2904,7 @@ void ScPrintFunc::CalcZoom( USHORT nRangeNo ) // Zoom bere
if (nZoom == 100)
// If it fits at 100 %, it's good enough for me.
break;
-
+
nLastFitZoom = nZoom;
nZoom = (nLastNonFitZoom + nZoom) / 2;
@@ -2946,7 +2946,7 @@ void ScPrintFunc::CalcZoom( USHORT nRangeNo ) // Zoom bere
if (nZoom == 100)
// If it fits at 100 %, it's good enough for me.
break;
-
+
nLastFitZoom = nZoom;
nZoom = (nLastNonFitZoom + nZoom) / 2;
@@ -2987,17 +2987,17 @@ Size ScPrintFunc::GetDocPageSize()
{
// Hoehe Kopf-/Fusszeile anpassen
- InitModes(); // aTwipMode aus nZoom initialisieren
- pDev->SetMapMode( aTwipMode ); // Kopf-/Fusszeilen in Twips
+ InitModes(); // aTwipMode aus nZoom initialisieren
+ pDev->SetMapMode( aTwipMode ); // Kopf-/Fusszeilen in Twips
UpdateHFHeight( aHdr );
UpdateHFHeight( aFtr );
// Seitengroesse in Document-Twips
- // Berechnung Left / Right auch in PrintPage
+ // Berechnung Left / Right auch in PrintPage
aPageRect = Rectangle( Point(), aPageSize );
- aPageRect.Left() = ( aPageRect.Left() + nLeftMargin ) * 100 / nZoom;
- aPageRect.Right() = ( aPageRect.Right() - nRightMargin ) * 100 / nZoom;
+ aPageRect.Left() = ( aPageRect.Left() + nLeftMargin ) * 100 / nZoom;
+ aPageRect.Right() = ( aPageRect.Right() - nRightMargin ) * 100 / nZoom;
aPageRect.Top() = ( aPageRect.Top() + nTopMargin ) * 100 / nZoom + aHdr.nHeight;
aPageRect.Bottom() = ( aPageRect.Bottom() - nBottomMargin ) * 100 / nZoom - aFtr.nHeight;
@@ -3028,7 +3028,7 @@ Size ScPrintFunc::GetDocPageSize()
return aDocPageSize;
}
-void ScPrintFunc::ResetBreaks( SCTAB nTab ) // Breaks fuer Anzeige richtig setzen
+void ScPrintFunc::ResetBreaks( SCTAB nTab ) // Breaks fuer Anzeige richtig setzen
{
pDoc->SetPageSize( nTab, GetDocPageSize() );
pDoc->UpdatePageBreaks( nTab, NULL );
@@ -3152,7 +3152,7 @@ void ScPrintFunc::CalcPages() // berechnet aPageRect und Seiten au
SCROW nLastRow = -1;
if (!pDoc->RowHidden(nRow, nPrintTab, NULL, &nLastRow))
- {
+ {
bVisRow = true;
nLastVisibleRow = nLastRow;
}
@@ -3180,14 +3180,14 @@ void ScPrintFunc::CalcPages() // berechnet aPageRect und Seiten au
}
//------------------------------------------------------------------------
-// class ScJobSetup
+// class ScJobSetup
//------------------------------------------------------------------------
ScJobSetup::ScJobSetup( SfxPrinter* pPrinter )
{
eOrientation = pPrinter->GetOrientation();
- nPaperBin = pPrinter->GetPaperBin();
- ePaper = pPrinter->GetPaper();
+ nPaperBin = pPrinter->GetPaperBin();
+ ePaper = pPrinter->GetPaper();
if ( PAPER_USER == ePaper )
{
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index 0d5d64964f5c..351198227b6f 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,18 +75,18 @@ SFX_IMPL_CHILDWINDOW(ScArgumentDlgWrapper, SID_OPENDLG_ARGUMENT )
//SFX_IMPL_MODELESSDIALOG(ScValidityRefChildWin, SID_VALIDITY_REFERENCE )
SFX_IMPL_CHILDWINDOW(ScValidityRefChildWin, SID_VALIDITY_REFERENCE)
SfxChildWinInfo __EXPORT ScValidityRefChildWin::GetInfo() const
-{
+{
SfxChildWinInfo anInfo = SfxChildWindow::GetInfo();
-
+
if( Window *pWnd = GetWindow() )
- {
+ {
anInfo.aSize = pWnd->GetSizePixel();
-
+
if( pWnd->IsDialog() )
if ( static_cast<Dialog*>(pWnd)->IsRollUp() )
anInfo.nFlags |= SFX_CHILDWIN_ZOOMIN;
}
-
+
return anInfo;
}
@@ -94,28 +94,28 @@ namespace { ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings ); }
//<!--Added by PengYunQuan for Validity Cell Range Picker
#define IMPL_CHILD_CTOR(Class,sid) \
- Class::Class( Window* pParentP, \
- USHORT nId, \
- SfxBindings* p, \
- SfxChildWinInfo* pInfo ) \
- : SfxChildWindow(pParentP, nId) \
- { \
+ Class::Class( Window* pParentP, \
+ USHORT nId, \
+ SfxBindings* p, \
+ SfxChildWinInfo* pInfo ) \
+ : SfxChildWindow(pParentP, nId) \
+ { \
/*//<!--Added by PengYunQuan for Validity Cell Range Picker*/\
/************************************************************************************/\
- /* When a new document is creating, the SfxViewFrame may be ready, */\
- /* But the ScTabViewShell may have not been activated yet. In this */\
- /* situation, SfxViewShell::Current() does not get the correct shell, */\
- /* and we should lcl_GetTabViewShell( p ) instead of SfxViewShell::Current() */\
+ /* When a new document is creating, the SfxViewFrame may be ready, */\
+ /* But the ScTabViewShell may have not been activated yet. In this */\
+ /* situation, SfxViewShell::Current() does not get the correct shell, */\
+ /* and we should lcl_GetTabViewShell( p ) instead of SfxViewShell::Current() */\
/************************************************************************************/\
ScTabViewShell* pViewShell = lcl_GetTabViewShell( p ); \
/*//-->Added by PengYunQuan for Validity Cell Range Picker*/\
if (!pViewShell) \
pViewShell = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); \
- DBG_ASSERT( pViewShell, "missing view shell :-(" ); \
- pWindow = pViewShell ? \
- pViewShell->CreateRefDialog( p, this, pInfo, pParentP, sid ) : NULL; \
- if (pViewShell && !pWindow) \
- pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE ); \
+ DBG_ASSERT( pViewShell, "missing view shell :-(" ); \
+ pWindow = pViewShell ? \
+ pViewShell->CreateRefDialog( p, this, pInfo, pParentP, sid ) : NULL; \
+ if (pViewShell && !pWindow) \
+ pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE ); \
}
@@ -204,21 +204,21 @@ IMPL_CHILD_CTOR( ScFormulaDlgWrapper, SID_OPENDLG_FUNCTION )
// ScSimpleRefDlgWrapper
//-------------------------------------------------------------------------
-static BOOL bScSimpleRefFlag;
-static long nScSimpleRefHeight;
-static long nScSimpleRefWidth;
-static long nScSimpleRefX;
-static long nScSimpleRefY;
-static BOOL bAutoReOpen=TRUE;
+static BOOL bScSimpleRefFlag;
+static long nScSimpleRefHeight;
+static long nScSimpleRefWidth;
+static long nScSimpleRefX;
+static long nScSimpleRefY;
+static BOOL bAutoReOpen=TRUE;
ScSimpleRefDlgWrapper::ScSimpleRefDlgWrapper( Window* pParentP,
- USHORT nId,
- SfxBindings* p,
- SfxChildWinInfo* pInfo )
+ USHORT nId,
+ SfxBindings* p,
+ SfxChildWinInfo* pInfo )
: SfxChildWindow(pParentP, nId)
{
-// ScTabViewShell* pViewShell =
-// PTR_CAST( ScTabViewShell, SfxViewShell::Current() );
+// ScTabViewShell* pViewShell =
+// PTR_CAST( ScTabViewShell, SfxViewShell::Current() );
ScTabViewShell* pViewShell = NULL;
SfxDispatcher* pDisp = p->GetDispatcher();
@@ -324,7 +324,7 @@ void ScSimpleRefDlgWrapper::StartRefInput()
// ScAcceptChgDlgWrapper //Kommentar: sollte in die ViewShell
//-------------------------------------------------------------------------
-ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper( Window* pParentP,
+ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper( Window* pParentP,
USHORT nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo ) :
@@ -395,29 +395,29 @@ namespace
if( SfxViewFrame *pFrm = pDisp->GetFrame() )
if( SfxViewShell* pViewSh = pFrm->GetViewShell() )
return dynamic_cast<ScTabViewShell*>( pViewSh );
-
+
return NULL;
}
}
-ScValidityRefChildWin::ScValidityRefChildWin( Window* pParentP, \
- USHORT nId, \
- SfxBindings* p, \
- SfxChildWinInfo* /*pInfo*/ ) \
+ScValidityRefChildWin::ScValidityRefChildWin( Window* pParentP, \
+ USHORT nId, \
+ SfxBindings* p, \
+ SfxChildWinInfo* /*pInfo*/ ) \
: SfxChildWindow(pParentP, nId),
m_bVisibleLock( false ),
m_bFreeWindowLock( false ),
m_pSavedWndParent( NULL )
{
SetWantsFocus( FALSE );\
- ScTabViewShell* pViewShell = \
+ ScTabViewShell* pViewShell = \
NULL != ( pWindow = ScValidationDlg::Find1AliveObject( pParentP ) ) ? static_cast<ScValidationDlg*>(pWindow)->GetTabViewShell() :
lcl_GetTabViewShell( p );
if (!pViewShell)
pViewShell = PTR_CAST( ScTabViewShell, SfxViewShell::Current() );
- DBG_ASSERT( pViewShell, "missing view shell :-(" ); \
- if (pViewShell && !pWindow) \
- pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE ); \
+ DBG_ASSERT( pViewShell, "missing view shell :-(" ); \
+ if (pViewShell && !pWindow) \
+ pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE ); \
else if( pWindow /*&& pWindow->ISA(ScValidationDlg)*/ )
{}//pWindow = new Window( pParentP, WB_HIDE );
diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx
index d5816ecdd289..541f0e593804 100644
--- a/sc/source/ui/view/scextopt.cxx
+++ b/sc/source/ui/view/scextopt.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index b2c9ffdc1395..a72d3782ad52 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,19 +46,19 @@
#include "docsh.hxx"
#include "tabprotection.hxx"
-extern USHORT nScFillModeMouseModifier; // global.cxx
+extern USHORT nScFillModeMouseModifier; // global.cxx
using namespace com::sun::star;
// STATIC DATA -----------------------------------------------------------
-static Point aSwitchPos; //! Member
+static Point aSwitchPos; //! Member
static BOOL bDidSwitch = FALSE;
// -----------------------------------------------------------------------
//
-// View (Gridwin / Tastatur)
+// View (Gridwin / Tastatur)
//
ScViewFunctionSet::ScViewFunctionSet( ScViewData* pNewViewData ) :
@@ -83,7 +83,7 @@ void ScViewFunctionSet::SetSelectionEngine( ScViewSelectionEngine* pSelEngine )
pEngine = pSelEngine;
}
-// Drag & Drop
+// Drag & Drop
void __EXPORT ScViewFunctionSet::BeginDrag()
{
@@ -106,10 +106,10 @@ void __EXPORT ScViewFunctionSet::BeginDrag()
BOOL bRefMode = pScMod->IsFormulaMode();
if (!bRefMode)
{
- pViewData->GetView()->FakeButtonUp( GetWhich() ); // ButtonUp wird verschluckt
+ pViewData->GetView()->FakeButtonUp( GetWhich() ); // ButtonUp wird verschluckt
ScMarkData& rMark = pViewData->GetMarkData();
-// rMark.SetMarking(FALSE); // es fehlt ein ButtonUp
+// rMark.SetMarking(FALSE); // es fehlt ein ButtonUp
rMark.MarkToSimple();
if ( rMark.IsMarked() && !rMark.IsMultiMarked() )
{
@@ -144,22 +144,22 @@ void __EXPORT ScViewFunctionSet::BeginDrag()
Window* pWindow = pViewData->GetActiveWin();
if ( pWindow->IsTracking() )
- pWindow->EndTracking( ENDTRACK_CANCEL ); // abort selecting
+ pWindow->EndTracking( ENDTRACK_CANCEL ); // abort selecting
- SC_MOD()->SetDragObject( pTransferObj, NULL ); // for internal D&D
+ SC_MOD()->SetDragObject( pTransferObj, NULL ); // for internal D&D
pTransferObj->StartDrag( pWindow, nDragActions );
- return; // dragging started
+ return; // dragging started
}
else
delete pClipDoc;
}
}
- Sound::Beep(); // can't drag
+ Sound::Beep(); // can't drag
}
-// Selektion
+// Selektion
void __EXPORT ScViewFunctionSet::CreateAnchor()
{
@@ -237,15 +237,15 @@ BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOO
if ( bDidSwitch )
{
if ( rPointPixel == aSwitchPos )
- return FALSE; // nicht auf falschem Fenster scrollen
+ return FALSE; // nicht auf falschem Fenster scrollen
else
bDidSwitch = FALSE;
}
- aSwitchPos = rPointPixel; // nur wichtig, wenn bDidSwitch
+ aSwitchPos = rPointPixel; // nur wichtig, wenn bDidSwitch
- // treat position 0 as -1, so scrolling is always possible
- // (with full screen and hidden headers, the top left border may be at 0)
- // (moved from ScViewData::GetPosFromPixel)
+ // treat position 0 as -1, so scrolling is always possible
+ // (with full screen and hidden headers, the top left border may be at 0)
+ // (moved from ScViewData::GetPosFromPixel)
Point aEffPos = rPointPixel;
if ( aEffPos.X() == 0 )
@@ -253,7 +253,7 @@ BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOO
if ( aEffPos.Y() == 0 )
aEffPos.Y() = -1;
- // Scrolling
+ // Scrolling
Size aWinSize = pEngine->GetWindow()->GetOutputSizePixel();
BOOL bRightScroll = ( aEffPos.X() >= aWinSize.Width() );
@@ -261,13 +261,13 @@ BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOO
BOOL bNegScroll = ( aEffPos.X() < 0 || aEffPos.Y() < 0 );
BOOL bScroll = bRightScroll || bBottomScroll || bNegScroll;
- SCsCOL nPosX;
- SCsROW nPosY;
+ SCsCOL nPosX;
+ SCsROW nPosY;
pViewData->GetPosFromPixel( aEffPos.X(), aEffPos.Y(), GetWhich(),
- nPosX, nPosY, TRUE, TRUE ); // mit Repair
+ nPosX, nPosY, TRUE, TRUE ); // mit Repair
- // fuer AutoFill in der Mitte der Zelle umschalten
- // dabei aber nicht das Scrolling nach rechts/unten verhindern
+ // fuer AutoFill in der Mitte der Zelle umschalten
+ // dabei aber nicht das Scrolling nach rechts/unten verhindern
if ( pViewData->IsFillMode() || pViewData->GetFillMode() == SC_FILL_MATRIX )
{
BOOL bLeft, bTop;
@@ -285,10 +285,10 @@ BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOO
nPosY = -1;
}
}
- // negativ ist erlaubt
+ // negativ ist erlaubt
}
- // ueber Fixier-Grenze bewegt?
+ // ueber Fixier-Grenze bewegt?
ScSplitPos eWhich = GetWhich();
if ( eWhich == pViewData->GetActivePart() )
@@ -378,7 +378,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
else if (pViewData->IsFillMode() ||
(pViewData->GetFillMode() == SC_FILL_MATRIX && (nScFillModeMouseModifier & KEY_MOD1) ))
{
- // Wenn eine Matrix angefasst wurde, kann mit Ctrl auf AutoFill zurueckgeschaltet werden
+ // Wenn eine Matrix angefasst wurde, kann mit Ctrl auf AutoFill zurueckgeschaltet werden
SCCOL nStartX, nEndX;
SCROW nStartY, nEndY; // Block
@@ -396,9 +396,9 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
if ( nPosX+1 >= (SCsCOL) nStartX && nPosX <= (SCsCOL) nEndX &&
nPosY+1 >= (SCsROW) nStartY && nPosY <= (SCsROW) nEndY &&
- ( nPosX != nEndX || nPosY != nEndY ) ) // verkleinern ?
+ ( nPosX != nEndX || nPosY != nEndY ) ) // verkleinern ?
{
- // Richtung (links oder oben)
+ // Richtung (links oder oben)
long nSizeX = 0;
for (SCCOL i=nPosX+1; i<=nEndX; i++)
@@ -418,7 +418,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
if ( nDelStartY < nStartY )
nDelStartY = nStartY;
- // Bereich setzen
+ // Bereich setzen
pViewData->SetDelMark( ScRange( nDelStartX,nDelStartY,nTab,
nEndX,nEndY,nTab ) );
@@ -444,10 +444,10 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
pViewData->GetView()->
PaintArea( nStartX,nDelStartY, nEndX,nEndY, SC_UPDATE_MARKS );
- nPosX = nEndX; // roten Rahmen um ganzen Bereich lassen
+ nPosX = nEndX; // roten Rahmen um ganzen Bereich lassen
nPosY = nEndY;
- // Referenz wieder richtigherum, falls unten umgedreht
+ // Referenz wieder richtigherum, falls unten umgedreht
if ( nStartX != pViewData->GetRefStartX() || nStartY != pViewData->GetRefStartY() )
{
pViewData->GetView()->DoneRefMode();
@@ -474,8 +474,8 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
long nSizeX = 0;
if ( bNegX )
{
- // #94321# in SetCursorAtPoint hidden columns are skipped.
- // They must be skipped here too, or the result will always be the first hidden column.
+ // #94321# in SetCursorAtPoint hidden columns are skipped.
+ // They must be skipped here too, or the result will always be the first hidden column.
do ++nPosX; while ( nPosX<nStartX && pDoc->ColHidden(nPosX, nTab) );
for (SCCOL i=nPosX; i<nStartX; i++)
nSizeX += pDoc->GetColWidth( i, nTab );
@@ -487,8 +487,8 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
long nSizeY = 0;
if ( bNegY )
{
- // #94321# in SetCursorAtPoint hidden rows are skipped.
- // They must be skipped here too, or the result will always be the first hidden row.
+ // #94321# in SetCursorAtPoint hidden rows are skipped.
+ // They must be skipped here too, or the result will always be the first hidden row.
if (++nPosY < nStartY)
{
nPosY = pDoc->FirstVisibleRow(nPosY, nStartY-1, nTab);
@@ -500,7 +500,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
else
nSizeY += pDoc->GetRowHeight( nEndY+1, nPosY, nTab );
- if ( nSizeX > nSizeY ) // Fill immer nur in einer Richtung
+ if ( nSizeX > nSizeY ) // Fill immer nur in einer Richtung
{
nPosY = nEndY;
bNegY = FALSE;
@@ -562,12 +562,12 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
}
// else neue Modi
}
- else // normales Markieren
+ else // normales Markieren
{
BOOL bHideCur = bAnchor && ( (SCCOL)nPosX != pViewData->GetCurX() ||
(SCROW)nPosY != pViewData->GetCurY() );
if (bHideCur)
- pView->HideAllCursors(); // sonst zweimal: Block und SetCursor
+ pView->HideAllCursors(); // sonst zweimal: Block und SetCursor
if (bAnchor)
{
@@ -597,18 +597,18 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
aAnchorPos.Set( nPosX, nPosY, nTab );
bStarted = TRUE;
}
- // #i3875# *Hack* When a new cell is Ctrl-clicked with no pre-selected cells,
- // it highlights that new cell as well as the old cell where the cursor is
- // positioned prior to the click. A selection mode via Shift-F8 should also
+ // #i3875# *Hack* When a new cell is Ctrl-clicked with no pre-selected cells,
+ // it highlights that new cell as well as the old cell where the cursor is
+ // positioned prior to the click. A selection mode via Shift-F8 should also
// follow the same behavior.
else if ( pViewData->IsSelCtrlMouseClick() )
{
SCCOL nOldX = pViewData->GetCurX();
SCROW nOldY = pViewData->GetCurY();
-
+
pView->InitBlockMode( nOldX, nOldY, nTab, TRUE );
pView->MarkCursor( (SCCOL) nOldX, (SCROW) nOldY, nTab );
-
+
if ( nOldX != nPosX || nOldY != nPosY )
{
pView->DoneBlockMode( TRUE );
@@ -616,7 +616,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
pView->MarkCursor( (SCCOL) nPosX, (SCROW) nPosY, nTab );
aAnchorPos.Set( nPosX, nPosY, nTab );
}
-
+
bStarted = TRUE;
}
}
@@ -645,8 +645,8 @@ BOOL __EXPORT ScViewFunctionSet::IsSelectionAtPoint( const Point& rPointPixel )
ScMarkData& rMark = pViewData->GetMarkData();
if (bAnchor || !rMark.IsMultiMarked())
{
- SCsCOL nPosX;
- SCsROW nPosY;
+ SCsCOL nPosX;
+ SCsROW nPosY;
pViewData->GetPosFromPixel( rPointPixel.X(), rPointPixel.Y(), GetWhich(), nPosX, nPosY );
return pViewData->GetMarkData().IsCellMarked( (SCCOL) nPosX, (SCROW) nPosY );
}
@@ -656,7 +656,7 @@ BOOL __EXPORT ScViewFunctionSet::IsSelectionAtPoint( const Point& rPointPixel )
void __EXPORT ScViewFunctionSet::DeselectAtPoint( const Point& /* rPointPixel */ )
{
- // gibt's nicht
+ // gibt's nicht
}
void __EXPORT ScViewFunctionSet::DeselectAll()
@@ -685,7 +685,7 @@ ScViewSelectionEngine::ScViewSelectionEngine( Window* pWindow, ScTabView* pView,
SelectionEngine( pWindow, pView->GetFunctionSet() ),
eWhich( eSplitPos )
{
- // Parameter einstellen
+ // Parameter einstellen
SetSelectionMode( MULTIPLE_SELECTION );
EnableDrag( TRUE );
}
@@ -694,7 +694,7 @@ ScViewSelectionEngine::ScViewSelectionEngine( Window* pWindow, ScTabView* pView,
//------------------------------------------------------------------------
//
-// Spalten- / Zeilenheader
+// Spalten- / Zeilenheader
//
ScHeaderFunctionSet::ScHeaderFunctionSet( ScViewData* pNewViewData ) :
@@ -752,14 +752,14 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B
{
if ( bDidSwitch )
{
- // die naechste gueltige Position muss vom anderen Fenster kommen
+ // die naechste gueltige Position muss vom anderen Fenster kommen
if ( rPointPixel == aSwitchPos )
- return FALSE; // nicht auf falschem Fenster scrollen
+ return FALSE; // nicht auf falschem Fenster scrollen
else
bDidSwitch = FALSE;
}
- // Scrolling
+ // Scrolling
Size aWinSize = pViewData->GetActiveWin()->GetOutputSizePixel();
BOOL bScroll;
@@ -768,7 +768,7 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B
else
bScroll = ( rPointPixel.Y() < 0 || rPointPixel.Y() >= aWinSize.Height() );
- // ueber Fixier-Grenze bewegt?
+ // ueber Fixier-Grenze bewegt?
BOOL bSwitched = FALSE;
if ( bColumn )
@@ -784,7 +784,7 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B
}
}
}
- else // Zeilenkoepfe
+ else // Zeilenkoepfe
{
if ( pViewData->GetVSplitMode() == SC_SPLIT_FIX )
{
@@ -801,13 +801,13 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B
{
aSwitchPos = rPointPixel;
bDidSwitch = TRUE;
- return FALSE; // nicht mit falschen Positionen rechnen
+ return FALSE; // nicht mit falschen Positionen rechnen
}
//
- SCsCOL nPosX;
- SCsROW nPosY;
+ SCsCOL nPosX;
+ SCsROW nPosY;
pViewData->GetPosFromPixel( rPointPixel.X(), rPointPixel.Y(), pViewData->GetActivePart(),
nPosX, nPosY, FALSE );
if (bColumn)
@@ -834,7 +834,7 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B
if ( !bAnchor || !pView->IsBlockMode() )
{
pView->DoneBlockMode( TRUE );
- pViewData->GetMarkData().MarkToMulti(); //! wer verstellt das ???
+ pViewData->GetMarkData().MarkToMulti(); //! wer verstellt das ???
pView->InitBlockMode( nPosX, nPosY, pViewData->GetTabNo(), TRUE, bColumn, !bColumn );
bAnchor = TRUE;
@@ -842,7 +842,7 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B
pView->MarkCursor( nPosX, nPosY, pViewData->GetTabNo(), bColumn, !bColumn );
- // SelectionChanged innerhalb von HideCursor wegen UpdateAutoFillMark
+ // SelectionChanged innerhalb von HideCursor wegen UpdateAutoFillMark
pView->SelectionChanged();
if (bHide)
@@ -853,8 +853,8 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B
BOOL __EXPORT ScHeaderFunctionSet::IsSelectionAtPoint( const Point& rPointPixel )
{
- SCsCOL nPosX;
- SCsROW nPosY;
+ SCsCOL nPosX;
+ SCsROW nPosY;
pViewData->GetPosFromPixel( rPointPixel.X(), rPointPixel.Y(), pViewData->GetActivePart(),
nPosX, nPosY, FALSE );
@@ -880,7 +880,7 @@ void __EXPORT ScHeaderFunctionSet::DeselectAll()
ScHeaderSelectionEngine::ScHeaderSelectionEngine( Window* pWindow, ScHeaderFunctionSet* pFuncSet ) :
SelectionEngine( pWindow, pFuncSet )
{
- // Parameter einstellen
+ // Parameter einstellen
SetSelectionMode( MULTIPLE_SELECTION );
EnableDrag( FALSE );
}
diff --git a/sc/source/ui/view/selectionstate.cxx b/sc/source/ui/view/selectionstate.cxx
index 0edd50a0b825..43ef60b3e45f 100644
--- a/sc/source/ui/view/selectionstate.cxx
+++ b/sc/source/ui/view/selectionstate.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx
index ee13ee9fbf90..67a306383b1a 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx
index ac6288028dfc..d336e5bbba94 100644
--- a/sc/source/ui/view/spelleng.cxx
+++ b/sc/source/ui/view/spelleng.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index 6014ded96e1e..073ab3064bb3 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -152,8 +152,8 @@ void ScTabControl::MouseButtonDown( const MouseEvent& rMEvt )
ScModule* pScMod = SC_MOD();
if ( !pScMod->IsModalMode() && !pScMod->IsFormulaMode() && !IsInEditMode() )
{
- // View aktivieren
- pViewData->GetViewShell()->SetActive(); // Appear und SetViewFrame
+ // View aktivieren
+ pViewData->GetViewShell()->SetActive(); // Appear und SetViewFrame
pViewData->GetView()->ActiveGrabFocus();
}
@@ -211,9 +211,9 @@ void ScTabControl::Select()
SCTAB nCount = pDoc->GetTableCount();
SCTAB i;
- if ( pScMod->IsTableLocked() ) // darf jetzt nicht umgeschaltet werden ?
+ if ( pScMod->IsTableLocked() ) // darf jetzt nicht umgeschaltet werden ?
{
- // den alten Zustand des TabControls wiederherstellen:
+ // den alten Zustand des TabControls wiederherstellen:
for (i=0; i<nCount; i++)
SelectPage( static_cast<sal_uInt16>(i)+1, rMark.GetTableSelect(i) );
@@ -224,14 +224,14 @@ void ScTabControl::Select()
}
USHORT nCurId = GetCurPageId();
- if (!nCurId) return; // kann vorkommen, wenn bei Excel-Import alles versteckt ist
+ if (!nCurId) return; // kann vorkommen, wenn bei Excel-Import alles versteckt ist
USHORT nPage = nCurId - 1;
// OLE-inplace deaktivieren
if ( nPage != static_cast<sal_uInt16>(pViewData->GetTabNo()) )
pViewData->GetView()->DrawMarkListHasChanged();
- // InputEnterHandler nur wenn nicht Referenzeingabe
+ // InputEnterHandler nur wenn nicht Referenzeingabe
BOOL bRefMode = pScMod->IsFormulaMode();
if (!bRefMode)
@@ -240,7 +240,7 @@ void ScTabControl::Select()
for (i=0; i<nCount; i++)
rMark.SelectTable( i, IsPageSelected(static_cast<sal_uInt16>(i)+1) );
-/* Markierungen werden per Default nicht pro Tabelle gehalten
+/* Markierungen werden per Default nicht pro Tabelle gehalten
USHORT nSelCnt = GetSelectPageCount();
if (nSelCnt>1)
pDoc->ExtendMarksFromTable( nPage );
@@ -251,7 +251,7 @@ void ScTabControl::Select()
pViewData->GetView()->SetTabNo( static_cast<SCTAB>(nPage) );
else
{
- // Tabelle fuer Basic ist 1-basiert
+ // Tabelle fuer Basic ist 1-basiert
SfxUInt16Item aItem( SID_CURRENTTAB, nPage + 1 );
rDisp.Execute( SID_CURRENTTAB, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
&aItem, (void*) NULL );
@@ -270,9 +270,9 @@ void ScTabControl::Select()
rBind.Invalidate( FID_TABLE_HIDE );
rBind.Invalidate( FID_TAB_SET_TAB_BG_COLOR );
- // SetReference nur wenn der Konsolidieren-Dialog offen ist
- // (fuer Referenzen ueber mehrere Tabellen)
- // bei anderen gibt das nur unnoetiges Gezappel
+ // SetReference nur wenn der Konsolidieren-Dialog offen ist
+ // (fuer Referenzen ueber mehrere Tabellen)
+ // bei anderen gibt das nur unnoetiges Gezappel
if ( bRefMode && pViewData->GetRefType() == SC_REFTYPE_REF )
if ( pViewData->GetViewShell()->GetViewFrame()->HasChildWindow(SID_OPENDLG_CONSOLIDATE) )
@@ -281,7 +281,7 @@ void ScTabControl::Select()
pViewData->GetRefStartX(), pViewData->GetRefStartY(), pViewData->GetRefStartZ(),
pViewData->GetRefEndX(), pViewData->GetRefEndY(), pViewData->GetRefEndZ() );
pScMod->SetReference( aRange, pDoc, &rMark );
- pScMod->EndReference(); // wegen Auto-Hide
+ pScMod->EndReference(); // wegen Auto-Hide
}
}
@@ -297,7 +297,7 @@ void ScTabControl::UpdateStatus()
SCTAB nMaxCnt = Max( nCount, static_cast<SCTAB>(GetMaxId()) );
Color aTabBgColor;
- BOOL bModified = FALSE; // Tabellen-Namen
+ BOOL bModified = FALSE; // Tabellen-Namen
for (i=0; i<nMaxCnt && !bModified; i++)
{
if (pDoc->IsVisible(i))
@@ -340,7 +340,7 @@ void ScTabControl::UpdateStatus()
if (bActive)
{
- bModified = FALSE; // Selektion
+ bModified = FALSE; // Selektion
for (i=0; i<nMaxCnt && !bModified; i++)
if ( rMark.GetTableSelect(i) != IsPageSelected(static_cast<sal_uInt16>(i)+1) )
bModified = TRUE;
@@ -358,14 +358,14 @@ void ScTabControl::UpdateStatus()
void ScTabControl::ActivateView(BOOL bActivate)
{
-// ScDocument* pDoc = pViewData->GetDocument();
+// ScDocument* pDoc = pViewData->GetDocument();
ScMarkData& rMark = pViewData->GetMarkData();
-// ResetMark direkt in TabView
-// pDoc->ResetMark();
+// ResetMark direkt in TabView
+// pDoc->ResetMark();
USHORT nCurId = GetCurPageId();
- if (!nCurId) return; // kann vorkommen, wenn bei Excel-Import alles versteckt ist
+ if (!nCurId) return; // kann vorkommen, wenn bei Excel-Import alles versteckt ist
USHORT nPage = nCurId - 1;
// USHORT nCount = GetMaxId();
@@ -395,9 +395,9 @@ void ScTabControl::SetSheetLayoutRTL( BOOL bSheetRTL )
void ScTabControl::Command( const CommandEvent& rCEvt )
{
- ScModule* pScMod = SC_MOD();
+ ScModule* pScMod = SC_MOD();
ScTabViewShell* pViewSh = pViewData->GetViewShell();
- BOOL bDisable = pScMod->IsFormulaMode() || pScMod->IsModalMode();
+ BOOL bDisable = pScMod->IsFormulaMode() || pScMod->IsModalMode();
// ViewFrame erstmal aktivieren (Bug 19493):
pViewSh->SetActive();
@@ -431,8 +431,8 @@ void ScTabControl::Command( const CommandEvent& rCEvt )
// #i52073# OLE inplace editing has to be stopped before showing the sheet tab context menu
pViewSh->DeactivateOle();
- // Popup-Menu:
- // get Dispatcher from ViewData (ViewFrame) instead of Shell (Frame), so it can't be null
+ // Popup-Menu:
+ // get Dispatcher from ViewData (ViewFrame) instead of Shell (Frame), so it can't be null
pViewData->GetDispatcher().ExecutePopup( ScResId(RID_POPUP_TAB) );
}
}
@@ -446,7 +446,7 @@ void ScTabControl::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel )
if (!bDisable)
{
Region aRegion( Rectangle(0,0,0,0) );
- CommandEvent aCEvt( rPosPixel, COMMAND_STARTDRAG, TRUE ); // needed for StartDrag
+ CommandEvent aCEvt( rPosPixel, COMMAND_STARTDRAG, TRUE ); // needed for StartDrag
if (TabBar::StartDrag( aCEvt, aRegion ))
DoDrag( aRegion );
}
@@ -459,7 +459,7 @@ void ScTabControl::DoDrag( const Region& /* rRegion */ )
SCTAB nTab = pViewData->GetTabNo();
ScMarkData aTabMark = pViewData->GetMarkData();
- aTabMark.ResetMark(); // doesn't change marked table information
+ aTabMark.ResetMark(); // doesn't change marked table information
aTabMark.SetMarkArea( ScRange(0,0,nTab,MAXCOL,MAXROW,nTab) );
ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP );
@@ -479,7 +479,7 @@ void ScTabControl::DoDrag( const Region& /* rRegion */ )
pTransferObj->SetDragSource( pDocSh, aTabMark );
Window* pWindow = pViewData->GetActiveWin();
- SC_MOD()->SetDragObject( pTransferObj, NULL ); // for internal D&D
+ SC_MOD()->SetDragObject( pTransferObj, NULL ); // for internal D&D
pTransferObj->StartDrag( pWindow, DND_ACTION_COPYMOVE | DND_ACTION_LINK );
}
@@ -560,10 +560,10 @@ sal_Int8 ScTabControl::AcceptDrop( const AcceptDropEvent& rEvt )
return rEvt.mnAction;
}
}
- else // switch sheets for all formats
+ else // switch sheets for all formats
{
- SwitchPage( rEvt.maPosPixel ); // switch sheet after timeout
- return 0; // nothing can be dropped here
+ SwitchPage( rEvt.maPosPixel ); // switch sheet after timeout
+ return 0; // nothing can be dropped here
}
return 0;
@@ -593,16 +593,16 @@ long ScTabControl::AllowRenaming()
nRet = TABBAR_RENAMING_YES;
else if ( bErrorShown )
{
- // if the error message from this TabControl is currently visible,
- // don't end edit mode now, to avoid problems when returning to
- // the other call (showing the error) - this should not happen
+ // if the error message from this TabControl is currently visible,
+ // don't end edit mode now, to avoid problems when returning to
+ // the other call (showing the error) - this should not happen
DBG_ERROR("ScTabControl::AllowRenaming: nested calls");
nRet = TABBAR_RENAMING_NO;
}
else if ( Application::IsInModalMode() )
{
- // #73472# don't show error message above any modal dialog
- // instead cancel renaming without error message
+ // #73472# don't show error message above any modal dialog
+ // instead cancel renaming without error message
nRet = TABBAR_RENAMING_CANCEL;
}
else
diff --git a/sc/source/ui/view/tabpopsh.cxx b/sc/source/ui/view/tabpopsh.cxx
index f5033d5d0df5..d594701d8451 100644
--- a/sc/source/ui/view/tabpopsh.cxx
+++ b/sc/source/ui/view/tabpopsh.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx
index 0f72e0e73d02..657a85c0a606 100644
--- a/sc/source/ui/view/tabsplit.cxx
+++ b/sc/source/ui/view/tabsplit.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 0bc4617a9af4..898c66d204f2 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +69,10 @@
///////////////////////////////////////////////////////////////////////////
#if 0
-#define _SDR_NOTRANSFORM // Transformationen, selten verwendet
-#define _SDR_NOTOUCH // Hit-Tests, selten verwendet
+#define _SDR_NOTRANSFORM // Transformationen, selten verwendet
+#define _SDR_NOTOUCH // Hit-Tests, selten verwendet
-#define _SDR_NOUNDO // Undo-Objekte
+#define _SDR_NOUNDO // Undo-Objekte
#define _SDR_NOPAGEOBJ // SdrPageObj
#define _SDR_NOVIRTOBJ // SdrVirtObj
#define _SDR_NOGROUPOBJ // SdrGroupObj
@@ -88,11 +88,11 @@
// Dieses define entfernt die VCControls aus SI.HXX
-#define _SI_HXX // VCControls
+#define _SI_HXX // VCControls
////////////////////// Umsetzen der Standard-Defines //////////////////////
-//#define _SVDDRAG_HXX // SdrDragStat
+//#define _SVDDRAG_HXX // SdrDragStat
#define _SVDPAGE_HXX // SdrPage
#ifdef _SDR_NOSURROGATEOBJ
@@ -164,7 +164,7 @@
#endif
//#ifdef _SDR_NOVIEWS
-// #define _SVDDRAG_HXX
+// #define _SVDDRAG_HXX
//#endif
////////////////////// Ende der SVDRAW-Modifikationen /////////////////////
@@ -202,14 +202,14 @@
#include <string>
#include <algorithm>
-#define SPLIT_MARGIN 30
-#define SC_ICONSIZE 36
+#define SPLIT_MARGIN 30
+#define SC_ICONSIZE 36
-#define SC_SCROLLBAR_MIN 30
-#define SC_TABBAR_MIN 6
+#define SC_SCROLLBAR_MIN 30
+#define SC_TABBAR_MIN 6
-// fuer Rad-Maus
-#define SC_DELTA_ZOOM 10
+// fuer Rad-Maus
+#define SC_DELTA_ZOOM 10
using namespace ::com::sun::star;
@@ -218,7 +218,7 @@ using namespace ::com::sun::star;
//==================================================================
-// Corner-Button
+// Corner-Button
ScCornerButton::ScCornerButton( Window* pParent, ScViewData* pData, BOOL bAdditional ) :
Window( pParent, WinBits( 0 ) ),
@@ -273,7 +273,7 @@ void __EXPORT ScCornerButton::Paint( const Rectangle& rRect )
DrawRect( Rectangle( 0, nCenterY, nCenterX-1, nPosY ) );
}
- // both buttons have the same look now - only dark right/bottom lines
+ // both buttons have the same look now - only dark right/bottom lines
SetLineColor( rStyleSettings.GetDarkShadowColor() );
DrawLine( Point(0,nPosY), Point(nPosX,nPosY) );
DrawLine( Point(nDarkX,0), Point(nDarkX,nPosY) );
@@ -312,7 +312,7 @@ void __EXPORT ScCornerButton::MouseButtonDown( const MouseEvent& rMEvt )
if (!bDisable)
{
ScTabViewShell* pViewSh = pViewData->GetViewShell();
- pViewSh->SetActive(); // Appear und SetViewFrame
+ pViewSh->SetActive(); // Appear und SetViewFrame
pViewSh->ActiveGrabFocus();
BOOL bControl = rMEvt.IsMod1();
@@ -348,43 +348,43 @@ BOOL lcl_HasRowOutline( const ScViewData& rViewData )
//==================================================================
-// Init und Konstruktoren
-// ScTabView::Init() in tabview5.cxx wegen out of keys
-
-
-#define TABVIEW_INIT \
- pSelEngine( NULL ), \
- aFunctionSet( &aViewData ), \
- pHdrSelEng( NULL ), \
- aHdrFunc( &aViewData ), \
- pDrawView( NULL ), \
- bDrawSelMode( FALSE ), \
- aVScrollTop( pFrameWin, WinBits( WB_VSCROLL | WB_DRAG ) ), \
- aVScrollBottom( pFrameWin, WinBits( WB_VSCROLL | WB_DRAG ) ), \
- aHScrollLeft( pFrameWin, WinBits( WB_HSCROLL | WB_DRAG ) ), \
- aHScrollRight( pFrameWin, WinBits( WB_HSCROLL | WB_DRAG ) ), \
- aCornerButton( pFrameWin, &aViewData, FALSE ), \
- aTopButton( pFrameWin, &aViewData, TRUE ), \
- aScrollBarBox( pFrameWin, WB_SIZEABLE ), \
- pInputHintWindow( NULL ), \
- pPageBreakData( NULL ), \
- pHighlightRanges( NULL ), \
+// Init und Konstruktoren
+// ScTabView::Init() in tabview5.cxx wegen out of keys
+
+
+#define TABVIEW_INIT \
+ pSelEngine( NULL ), \
+ aFunctionSet( &aViewData ), \
+ pHdrSelEng( NULL ), \
+ aHdrFunc( &aViewData ), \
+ pDrawView( NULL ), \
+ bDrawSelMode( FALSE ), \
+ aVScrollTop( pFrameWin, WinBits( WB_VSCROLL | WB_DRAG ) ), \
+ aVScrollBottom( pFrameWin, WinBits( WB_VSCROLL | WB_DRAG ) ), \
+ aHScrollLeft( pFrameWin, WinBits( WB_HSCROLL | WB_DRAG ) ), \
+ aHScrollRight( pFrameWin, WinBits( WB_HSCROLL | WB_DRAG ) ), \
+ aCornerButton( pFrameWin, &aViewData, FALSE ), \
+ aTopButton( pFrameWin, &aViewData, TRUE ), \
+ aScrollBarBox( pFrameWin, WB_SIZEABLE ), \
+ pInputHintWindow( NULL ), \
+ pPageBreakData( NULL ), \
+ pHighlightRanges( NULL ), \
pBrushDocument( NULL ), \
pDrawBrushSet( NULL ), \
bLockPaintBrush( FALSE ), \
- pTimerWindow( NULL ), \
- nTipVisible( 0 ), \
- bDragging( FALSE ), \
- bIsBlockMode( FALSE ), \
- bBlockNeg( FALSE ), \
- bBlockCols( FALSE ), \
- bBlockRows( FALSE ), \
+ pTimerWindow( NULL ), \
+ nTipVisible( 0 ), \
+ bDragging( FALSE ), \
+ bIsBlockMode( FALSE ), \
+ bBlockNeg( FALSE ), \
+ bBlockCols( FALSE ), \
+ bBlockRows( FALSE ), \
mfPendingTabBarWidth( -1.0 ), \
- bMinimized( FALSE ), \
- bInUpdateHeader( FALSE ), \
- bInActivatePart( FALSE ), \
- bInZoomUpdate( FALSE ), \
- bMoveIsShift( FALSE ), \
+ bMinimized( FALSE ), \
+ bInUpdateHeader( FALSE ), \
+ bInActivatePart( FALSE ), \
+ bInZoomUpdate( FALSE ), \
+ bMoveIsShift( FALSE ), \
bNewStartIfMarking( FALSE )
@@ -404,14 +404,14 @@ ScTabView::ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pView
//UNUSED2009-05 TABVIEW_INIT
//UNUSED2009-05 {
//UNUSED2009-05 RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScTabView::ScTabView" );
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 aViewData.SetViewShell( pViewShell );
//UNUSED2009-05 Init();
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 UpdateShow();
//UNUSED2009-05 if ( aViewData.GetActivePart() != SC_SPLIT_BOTTOMLEFT )
//UNUSED2009-05 pGridWin[SC_SPLIT_BOTTOMLEFT]->Show();
-//UNUSED2009-05
+//UNUSED2009-05
//UNUSED2009-05 InvalidateSplit();
//UNUSED2009-05 }
@@ -419,14 +419,14 @@ void ScTabView::InitScrollBar( ScrollBar& rScrollBar, long nMaxVal )
{
rScrollBar.SetRange( Range( 0, nMaxVal ) );
rScrollBar.SetLineSize( 1 );
- rScrollBar.SetPageSize( 1 ); // wird getrennt abgefragt
- rScrollBar.SetVisibleSize( 10 ); // wird bei Resize neu gesetzt
+ rScrollBar.SetPageSize( 1 ); // wird getrennt abgefragt
+ rScrollBar.SetVisibleSize( 10 ); // wird bei Resize neu gesetzt
rScrollBar.SetScrollHdl( LINK(this, ScTabView, ScrollHdl) );
rScrollBar.SetEndScrollHdl( LINK(this, ScTabView, EndScrollHdl) );
}
-// Scroll-Timer
+// Scroll-Timer
void ScTabView::SetTimer( ScGridWindow* pWin, const MouseEvent& rMEvt )
{
@@ -443,7 +443,7 @@ void ScTabView::ResetTimer()
IMPL_LINK( ScTabView, TimerHdl, Timer*, EMPTYARG )
{
-// aScrollTimer.Stop();
+// aScrollTimer.Stop();
if (pTimerWindow)
pTimerWindow->MouseMove( aTimerMEvt );
@@ -461,8 +461,8 @@ void lcl_SetPosSize( Window& rWindow, const Point& rPos, const Size& rSize,
aNewPos.X() = nTotalWidth - rPos.X() - rSize.Width();
if ( aNewPos == rWindow.GetPosPixel() && rSize.Width() != rWindow.GetSizePixel().Width() )
{
- // Document windows are manually painted right-to-left, so they need to
- // be repainted if the size changes.
+ // Document windows are manually painted right-to-left, so they need to
+ // be repainted if the size changes.
rWindow.Invalidate();
}
}
@@ -482,19 +482,19 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
if ( bLayoutRTL )
nTotalWidth += 2*rOffset.X();
- BOOL bVScroll = aViewData.IsVScrollMode();
- BOOL bHScroll = aViewData.IsHScrollMode();
+ BOOL bVScroll = aViewData.IsVScrollMode();
+ BOOL bHScroll = aViewData.IsHScrollMode();
BOOL bTabControl = aViewData.IsTabMode();
- BOOL bHeaders = aViewData.IsHeaderMode();
- BOOL bOutlMode = aViewData.IsOutlineMode();
- BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData);
- BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData);
+ BOOL bHeaders = aViewData.IsHeaderMode();
+ BOOL bOutlMode = aViewData.IsOutlineMode();
+ BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData);
+ BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData);
- // Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden:
+ // Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden:
SfxScrollingMode eMode = aViewData.GetViewShell()->GetScrollingMode();
if ( eMode == SCROLLING_NO )
bHScroll = bVScroll = FALSE;
- else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto ???
+ else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto ???
bHScroll = bVScroll = TRUE;
if ( aViewData.GetDocShell()->IsPreview() )
@@ -524,7 +524,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
if ( aViewData.GetVSplitMode() == SC_SPLIT_FIX )
nSplitSizeY = 1;
- const long nOverlap = 0; // ScrollBar::GetWindowOverlapPixel();
+ const long nOverlap = 0; // ScrollBar::GetWindowOverlapPixel();
aBorderPos = rOffset;
aFrameSize = rSize;
@@ -536,7 +536,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
if ( WhichH( aViewData.GetActivePart() ) == SC_SPLIT_RIGHT )
ActivatePart( SC_SPLIT_BOTTOMLEFT );
InvalidateSplit();
-// UpdateShow();
+// UpdateShow();
}
if ( aViewData.GetVSplitMode() != SC_SPLIT_NONE )
if ( aViewData.GetVSplitPos() > nSizeY - SPLIT_MARGIN )
@@ -545,32 +545,32 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
if ( WhichV( aViewData.GetActivePart() ) == SC_SPLIT_TOP )
ActivatePart( SC_SPLIT_BOTTOMLEFT );
InvalidateSplit();
-// UpdateShow();
+// UpdateShow();
}
UpdateShow();
- if (bHScroll || bVScroll) // Scrollbars horizontal oder vertikal
+ if (bHScroll || bVScroll) // Scrollbars horizontal oder vertikal
{
long nScrollBarSize = pFrameWin->GetSettings().GetStyleSettings().GetScrollBarSize();
if (bVScroll)
{
-// nBarX = aVScrollBottom.GetSizePixel().Width();
+// nBarX = aVScrollBottom.GetSizePixel().Width();
nBarX = nScrollBarSize;
nSizeX -= nBarX - nOverlap;
}
if (bHScroll)
{
-// nBarY = aHScrollLeft.GetSizePixel().Height();
+// nBarY = aHScrollLeft.GetSizePixel().Height();
nBarY = nScrollBarSize;
nSizeY -= nBarY - nOverlap;
}
- // window at the bottom right
+ // window at the bottom right
lcl_SetPosSize( aScrollBarBox, Point( nPosX+nSizeX, nPosY+nSizeY ), Size( nBarX, nBarY ),
nTotalWidth, bLayoutRTL );
- if (bHScroll) // Scrollbars horizontal
+ if (bHScroll) // Scrollbars horizontal
{
long nSizeLt = 0; // left scroll bar
long nSizeRt = 0; // right scroll bar
@@ -580,7 +580,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
{
case SC_SPLIT_NONE:
nSizeSp = nSplitSizeX;
- nSizeLt = nSizeX - nSizeSp + nOverlap; // Ecke ueberdecken
+ nSizeLt = nSizeX - nSizeSp + nOverlap; // Ecke ueberdecken
break;
case SC_SPLIT_NORMAL:
nSizeSp = nSplitSizeX;
@@ -605,13 +605,13 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
nTabSize = pTabControl->GetSizePixel().Width()-nOverlap;
- if ( aViewData.GetHSplitMode() != SC_SPLIT_FIX ) // bei linkem Scrollbar
+ if ( aViewData.GetHSplitMode() != SC_SPLIT_FIX ) // bei linkem Scrollbar
{
if (nTabSize > nSizeLt-SC_SCROLLBAR_MIN) nTabSize = nSizeLt-SC_SCROLLBAR_MIN;
if (nTabSize < SC_TABBAR_MIN) nTabSize = SC_TABBAR_MIN;
nSizeLt -= nTabSize;
}
- else // bei rechtem Scrollbar
+ else // bei rechtem Scrollbar
{
if (nTabSize > nSizeRt-SC_SCROLLBAR_MIN) nTabSize = nSizeRt-SC_SCROLLBAR_MIN;
if (nTabSize < SC_TABBAR_MIN) nTabSize = SC_TABBAR_MIN;
@@ -631,14 +631,14 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
nPosY+nSizeY),
Size(nSizeRt+2*nOverlap, nBarY), nTotalWidth, bLayoutRTL );
- // SetDragRectPixel is done below
+ // SetDragRectPixel is done below
}
- if (bVScroll) // Scrollbars vertikal
+ if (bVScroll) // Scrollbars vertikal
{
long nSizeUp = 0; // upper scroll bar
long nSizeSp = 0; // splitter
- long nSizeDn; // unterer Scrollbar
+ long nSizeDn; // unterer Scrollbar
switch (aViewData.GetVSplitMode())
{
@@ -665,11 +665,11 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
nPosY+nSizeUp+nSizeSp-nOverlap),
Size(nBarX, nSizeDn+2*nOverlap), nTotalWidth, bLayoutRTL );
- // SetDragRectPixel is done below
+ // SetDragRectPixel is done below
}
}
- // SetDragRectPixel auch ohne Scrollbars etc., wenn schon gesplittet ist
+ // SetDragRectPixel auch ohne Scrollbars etc., wenn schon gesplittet ist
if ( bHScroll || aViewData.GetHSplitMode() != SC_SPLIT_NONE )
pHSplitter->SetDragRectPixel(
Rectangle( nPosX, nPosY, nPosX+nSizeX, nPosY+nSizeY ), pFrameWin );
@@ -718,7 +718,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
nPosY += nOutlineY;
}
- if (bHeaders) // Spalten/Zeilen-Header
+ if (bHeaders) // Spalten/Zeilen-Header
{
nBarX = pRowBar[SC_SPLIT_BOTTOM]->GetSizePixel().Width();
nBarY = pColBar[SC_SPLIT_LEFT]->GetSizePixel().Height();
@@ -731,12 +731,12 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
nBarX = nBarY = 0;
//
- // Splitter auswerten
+ // Splitter auswerten
//
long nLeftSize = nSizeX;
long nRightSize = 0;
- long nTopSize = 0;
+ long nTopSize = 0;
long nBottomSize = nSizeY;
long nSplitPosX = nPosX;
long nSplitPosY = nPosY;
@@ -746,7 +746,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
long nSplitHeight = rSize.Height();
if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX )
{
- // Fixier-Splitter nicht mit Scrollbar/TabBar ueberlappen lassen
+ // Fixier-Splitter nicht mit Scrollbar/TabBar ueberlappen lassen
if ( bHScroll )
nSplitHeight -= aHScrollLeft.GetSizePixel().Height();
else if ( bTabControl && pTabControl )
@@ -772,9 +772,9 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
nBottomSize = nSizeY - nTopSize - nSplitSizeY;
}
- // ShowHide fuer pColOutline / pRowOutline passiert in UpdateShow
+ // ShowHide fuer pColOutline / pRowOutline passiert in UpdateShow
- if (bHOutline) // Outline-Controls
+ if (bHOutline) // Outline-Controls
{
if (pColOutline[SC_SPLIT_LEFT])
{
@@ -784,7 +784,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
}
if (pColOutline[SC_SPLIT_RIGHT])
{
- pColOutline[SC_SPLIT_RIGHT]->SetHeaderSize( 0 ); // always call to update RTL flag
+ pColOutline[SC_SPLIT_RIGHT]->SetHeaderSize( 0 ); // always call to update RTL flag
lcl_SetPosSize( *pColOutline[SC_SPLIT_RIGHT],
Point(nSplitPosX,nOutPosY), Size(nRightSize,nOutlineY), nTotalWidth, bLayoutRTL );
}
@@ -818,7 +818,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
else
aTopButton.Hide();
- if (bHeaders) // Spalten/Zeilen-Header
+ if (bHeaders) // Spalten/Zeilen-Header
{
lcl_SetPosSize( *pColBar[SC_SPLIT_LEFT],
Point(nPosX,nPosY-nBarY), Size(nLeftSize,nBarY), nTotalWidth, bLayoutRTL );
@@ -840,7 +840,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
else
{
aCornerButton.Hide();
- pColBar[SC_SPLIT_LEFT]->Hide(); // immer da
+ pColBar[SC_SPLIT_LEFT]->Hide(); // immer da
pRowBar[SC_SPLIT_BOTTOM]->Hide();
}
@@ -868,21 +868,21 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
}
//
- // Scrollbars updaten
+ // Scrollbars updaten
//
if (!bInUpdateHeader)
{
- UpdateScrollBars(); // Scrollbars nicht beim Scrollen neu setzen
+ UpdateScrollBars(); // Scrollbars nicht beim Scrollen neu setzen
UpdateHeaderWidth();
- InterpretVisible(); // #69343# have everything calculated before painting
+ InterpretVisible(); // #69343# have everything calculated before painting
}
if (bHasHint)
- TestHintWindow(); // neu positionieren
+ TestHintWindow(); // neu positionieren
- UpdateVarZoom(); // update variable zoom types (after resizing GridWindows)
+ UpdateVarZoom(); // update variable zoom types (after resizing GridWindows)
if (aViewData.GetViewShell()->HasAccessibilityObjects())
aViewData.GetViewShell()->BroadcastAccessibility(SfxSimpleHint(SC_HINT_ACC_WINDOWRESIZED));
@@ -890,7 +890,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner )
void ScTabView::UpdateVarZoom()
{
- // update variable zoom types
+ // update variable zoom types
SvxZoomType eZoomType = GetZoomType();
if ( eZoomType != SVX_ZOOM_PERCENT && !bInZoomUpdate )
@@ -949,21 +949,21 @@ void ScTabView::RepeatResize( BOOL bUpdateFix )
DoResize( aBorderPos, aFrameSize );
- //! Border muss neu gesetzt werden ???
+ //! Border muss neu gesetzt werden ???
}
void ScTabView::GetBorderSize( SvBorder& rBorder, const Size& /* rSize */ )
{
BOOL bScrollBars = aViewData.IsVScrollMode();
- BOOL bHeaders = aViewData.IsHeaderMode();
- BOOL bOutlMode = aViewData.IsOutlineMode();
- BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData);
- BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData);
+ BOOL bHeaders = aViewData.IsHeaderMode();
+ BOOL bOutlMode = aViewData.IsOutlineMode();
+ BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData);
+ BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData);
BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() );
rBorder = SvBorder();
- if (bScrollBars) // Scrollbars horizontal oder vertikal
+ if (bScrollBars) // Scrollbars horizontal oder vertikal
{
rBorder.Right() += aVScrollBottom.GetSizePixel().Width();
rBorder.Bottom() += aHScrollLeft.GetSizePixel().Height();
@@ -975,7 +975,7 @@ void ScTabView::GetBorderSize( SvBorder& rBorder, const Size& /* rSize */ )
if (bHOutline && pColOutline[SC_SPLIT_LEFT])
rBorder.Top() += pColOutline[SC_SPLIT_LEFT]->GetDepthSize();
- if (bHeaders) // Spalten/Zeilen-Header
+ if (bHeaders) // Spalten/Zeilen-Header
{
rBorder.Left() += pRowBar[SC_SPLIT_BOTTOM]->GetSizePixel().Width();
rBorder.Top() += pColBar[SC_SPLIT_LEFT]->GetSizePixel().Height();
@@ -989,16 +989,16 @@ IMPL_LINK( ScTabView, TabBarResize, void*, EMPTYARG )
{
BOOL bHScrollMode = aViewData.IsHScrollMode();
- // Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden:
+ // Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden:
SfxScrollingMode eMode = aViewData.GetViewShell()->GetScrollingMode();
if ( eMode == SCROLLING_NO )
bHScrollMode = FALSE;
- else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto ???
+ else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto ???
bHScrollMode = TRUE;
if( bHScrollMode )
{
- const long nOverlap = 0; // ScrollBar::GetWindowOverlapPixel();
+ const long nOverlap = 0; // ScrollBar::GetWindowOverlapPixel();
long nSize = pTabControl->GetSplitSize();
if (aViewData.GetHSplitMode() != SC_SPLIT_FIX)
@@ -1080,7 +1080,7 @@ void ScTabView::SetActivePointer( const Pointer& rPointer )
if (pGridWin[i])
pGridWin[i]->SetPointer( rPointer );
-/* ScSplitPos ePos = aViewData.GetActivePart();
+/* ScSplitPos ePos = aViewData.GetActivePart();
if (pGridWin[ePos])
pGridWin[ePos]->SetPointer( rPointer );
*/
@@ -1123,7 +1123,7 @@ void ScTabView::ActiveGrabFocus()
ScSplitPos ScTabView::FindWindow( Window* pWindow ) const
{
- ScSplitPos eVal = SC_SPLIT_BOTTOMLEFT; // Default
+ ScSplitPos eVal = SC_SPLIT_BOTTOMLEFT; // Default
for (USHORT i=0; i<4; i++)
if ( pGridWin[i] == pWindow )
eVal = (ScSplitPos) i;
@@ -1137,10 +1137,10 @@ Point ScTabView::GetGridOffset() const
// Groessen hier wie in DoResize
- BOOL bHeaders = aViewData.IsHeaderMode();
- BOOL bOutlMode = aViewData.IsOutlineMode();
- BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData);
- BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData);
+ BOOL bHeaders = aViewData.IsHeaderMode();
+ BOOL bOutlMode = aViewData.IsOutlineMode();
+ BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData);
+ BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData);
// Outline-Controls
if (bVOutline && pRowOutline[SC_SPLIT_BOTTOM])
@@ -1148,7 +1148,7 @@ Point ScTabView::GetGridOffset() const
if (bHOutline && pColOutline[SC_SPLIT_LEFT])
aPos.Y() += pColOutline[SC_SPLIT_LEFT]->GetDepthSize();
- if (bHeaders) // Spalten/Zeilen-Header
+ if (bHeaders) // Spalten/Zeilen-Header
{
if (pRowBar[SC_SPLIT_BOTTOM])
aPos.X() += pRowBar[SC_SPLIT_BOTTOM]->GetSizePixel().Width();
@@ -1171,8 +1171,8 @@ BOOL ScTabView::ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos )
{
if ( !aViewData.GetViewShell()->GetViewFrame()->GetFrame().IsInPlace() )
{
- // for ole inplace editing, the scale is defined by the visarea and client size
- // and can't be changed directly
+ // for ole inplace editing, the scale is defined by the visarea and client size
+ // and can't be changed directly
const Fraction& rOldY = aViewData.GetZoomY();
long nOld = (long)(( rOldY.GetNumerator() * 100 ) / rOldY.GetDenominator());
@@ -1214,15 +1214,15 @@ BOOL ScTabView::ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos )
IMPL_LINK( ScTabView, EndScrollHdl, ScrollBar*, pScroll )
{
- BOOL bOnlineScroll = TRUE; //! Optionen
+ BOOL bOnlineScroll = TRUE; //! Optionen
if ( bDragging )
{
- if ( bOnlineScroll ) // nur Ranges aktualisieren
+ if ( bOnlineScroll ) // nur Ranges aktualisieren
UpdateScrollBars();
else
{
- long nScrollMin = 0; // RangeMin simulieren
+ long nScrollMin = 0; // RangeMin simulieren
if ( aViewData.GetHSplitMode()==SC_SPLIT_FIX && pScroll == &aHScrollRight )
nScrollMin = aViewData.GetFixPosX();
if ( aViewData.GetVSplitMode()==SC_SPLIT_FIX && pScroll == &aVScrollBottom )
@@ -1233,9 +1233,9 @@ IMPL_LINK( ScTabView, EndScrollHdl, ScrollBar*, pScroll )
BOOL bMirror = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ) != Application::GetSettings().GetLayoutRTL();
ScHSplitPos eWhich = (pScroll == &aHScrollLeft) ? SC_SPLIT_LEFT : SC_SPLIT_RIGHT;
long nDelta = GetScrollBarPos( *pScroll, bMirror ) + nScrollMin - aViewData.GetPosX(eWhich);
- if (nDelta) ScrollX( nDelta, eWhich );
+ if (nDelta) ScrollX( nDelta, eWhich );
}
- else // VScroll...
+ else // VScroll...
{
ScVSplitPos eWhich = (pScroll == &aVScrollTop) ? SC_SPLIT_TOP : SC_SPLIT_BOTTOM;
long nDelta = GetScrollBarPos( *pScroll, FALSE ) + nScrollMin - aViewData.GetPosY(eWhich);
@@ -1249,7 +1249,7 @@ IMPL_LINK( ScTabView, EndScrollHdl, ScrollBar*, pScroll )
IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
{
- BOOL bOnlineScroll = TRUE; //! Optionen
+ BOOL bOnlineScroll = TRUE; //! Optionen
BOOL bHoriz = ( pScroll == &aHScrollLeft || pScroll == &aHScrollRight );
long nViewPos;
@@ -1272,8 +1272,8 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
nPrevDragPos = nViewPos;
}
- // Scroll-Position anzeigen
- // (nur QuickHelp, in der Statuszeile gibt es keinen Eintrag dafuer)
+ // Scroll-Position anzeigen
+ // (nur QuickHelp, in der Statuszeile gibt es keinen Eintrag dafuer)
if (Help::IsQuickHelpEnabled())
{
@@ -1294,7 +1294,7 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
Point aPos = pScroll->OutputToNormalizedScreenPixel( Point() );
// get scrollbar scroll position for help text (row number/column name)
- long nScrollMin = 0; // RangeMin simulieren
+ long nScrollMin = 0; // RangeMin simulieren
if ( aViewData.GetHSplitMode()==SC_SPLIT_FIX && pScroll == &aHScrollRight )
nScrollMin = aViewData.GetFixPosX();
if ( aViewData.GetVSplitMode()==SC_SPLIT_FIX && pScroll == &aVScrollBottom )
@@ -1311,8 +1311,8 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
aHelpStr += ScColToAlpha((SCCOL) nScrollPos);
aRect.Left() = aMousePos.X();
- aRect.Top() = aPos.Y() - 4;
- nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER;
+ aRect.Top() = aPos.Y() - 4;
+ nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER;
}
else
{
@@ -1322,11 +1322,11 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
// show quicktext always inside sheet area
aRect.Left() = bLayoutRTL ? (aPos.X() + aSize.Width() + 8) : (aPos.X() - 8);
- aRect.Top() = aMousePos.Y();
+ aRect.Top() = aMousePos.Y();
nAlign = (bLayoutRTL ? QUICKHELP_LEFT : QUICKHELP_RIGHT) | QUICKHELP_VCENTER;
}
- aRect.Right() = aRect.Left();
- aRect.Bottom() = aRect.Top();
+ aRect.Right() = aRect.Left();
+ aRect.Bottom() = aRect.Top();
Help::ShowQuickHelp(pScroll->GetParent(), aRect, aHelpStr, nAlign);
}
@@ -1339,10 +1339,10 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
// change scroll type so visible/previous cells calculation below remains the same
switch ( eType )
{
- case SCROLL_LINEUP: eType = SCROLL_LINEDOWN; break;
- case SCROLL_LINEDOWN: eType = SCROLL_LINEUP; break;
- case SCROLL_PAGEUP: eType = SCROLL_PAGEDOWN; break;
- case SCROLL_PAGEDOWN: eType = SCROLL_PAGEUP; break;
+ case SCROLL_LINEUP: eType = SCROLL_LINEDOWN; break;
+ case SCROLL_LINEDOWN: eType = SCROLL_LINEUP; break;
+ case SCROLL_PAGEUP: eType = SCROLL_PAGEDOWN; break;
+ case SCROLL_PAGEDOWN: eType = SCROLL_PAGEUP; break;
default:
{
// added to avoid warnings
@@ -1374,10 +1374,10 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
break;
case SCROLL_DRAG:
{
- // nur in die richtige Richtung scrollen, nicht um ausgeblendete
- // Bereiche herumzittern
+ // nur in die richtige Richtung scrollen, nicht um ausgeblendete
+ // Bereiche herumzittern
- long nScrollMin = 0; // RangeMin simulieren
+ long nScrollMin = 0; // RangeMin simulieren
if ( aViewData.GetHSplitMode()==SC_SPLIT_FIX && pScroll == &aHScrollRight )
nScrollMin = aViewData.GetFixPosX();
if ( aViewData.GetVSplitMode()==SC_SPLIT_FIX && pScroll == &aVScrollBottom )
@@ -1406,7 +1406,7 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
if (nDelta)
{
- BOOL bUpdate = ( eType != SCROLL_DRAG ); // bei Drag die Ranges nicht aendern
+ BOOL bUpdate = ( eType != SCROLL_DRAG ); // bei Drag die Ranges nicht aendern
if ( bHoriz )
ScrollX( nDelta, (pScroll == &aHScrollLeft) ? SC_SPLIT_LEFT : SC_SPLIT_RIGHT, bUpdate );
else
@@ -1443,12 +1443,12 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars )
nNewX+nDir >= 0 && nNewX+nDir <= MAXCOL )
nNewX = sal::static_int_cast<SCsCOL>( nNewX + nDir );
- // Fixierung
+ // Fixierung
if (aViewData.GetHSplitMode() == SC_SPLIT_FIX)
{
if (eWhich == SC_SPLIT_LEFT)
- nNewX = static_cast<SCsCOL>(nOldX); // links immer stehenlassen
+ nNewX = static_cast<SCsCOL>(nOldX); // links immer stehenlassen
else
{
SCsCOL nFixX = static_cast<SCsCOL>(aViewData.GetFixPosX());
@@ -1465,10 +1465,10 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars )
{
SCCOL nTrackX = std::max( nOldX, static_cast<SCCOL>(nNewX) );
- // Mit VCL wirkt Update() im Moment immer auf alle Fenster, beim Update
- // nach dem Scrollen des GridWindow's wuerde darum der Col-/RowBar evtl.
- // mit schon geaenderter Pos. gepainted werden -
- // darum vorher einmal Update am Col-/RowBar
+ // Mit VCL wirkt Update() im Moment immer auf alle Fenster, beim Update
+ // nach dem Scrollen des GridWindow's wuerde darum der Col-/RowBar evtl.
+ // mit schon geaenderter Pos. gepainted werden -
+ // darum vorher einmal Update am Col-/RowBar
if (pColBar[eWhich])
pColBar[eWhich]->Update();
@@ -1489,7 +1489,7 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars )
if ( aViewData.GetVSplitMode() != SC_SPLIT_NONE )
pGridWin[SC_SPLIT_TOPRIGHT]->ScrollPixel( nDiff, 0 );
}
- if (pColBar[eWhich]) { pColBar[eWhich]->Scroll( nDiff,0 ); pColBar[eWhich]->Update(); }
+ if (pColBar[eWhich]) { pColBar[eWhich]->Scroll( nDiff,0 ); pColBar[eWhich]->Update(); }
if (pColOutline[eWhich]) pColOutline[eWhich]->ScrollPixel( nDiff );
if (bUpdBars)
UpdateScrollBars();
@@ -1500,10 +1500,10 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars )
ShowAllCursors();
- SetNewVisArea(); // MapMode muss schon gesetzt sein
+ SetNewVisArea(); // MapMode muss schon gesetzt sein
if (bHasHint)
- TestHintWindow(); // neu positionieren
+ TestHintWindow(); // neu positionieren
}
void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars )
@@ -1532,12 +1532,12 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars )
nNewY+nDir >= 0 && nNewY+nDir <= MAXROW )
nNewY += nDir;
- // Fixierung
+ // Fixierung
if (aViewData.GetVSplitMode() == SC_SPLIT_FIX)
{
if (eWhich == SC_SPLIT_TOP)
- nNewY = static_cast<SCsROW>(nOldY); // oben immer stehenlassen
+ nNewY = static_cast<SCsROW>(nOldY); // oben immer stehenlassen
else
{
SCsROW nFixY = static_cast<SCsROW>(aViewData.GetFixPosY());
@@ -1554,11 +1554,11 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars )
{
SCROW nTrackY = std::max( nOldY, static_cast<SCROW>(nNewY) );
- // Zeilenkoepfe anpassen vor dem eigentlichen Scrolling, damit nicht
- // doppelt gepainted werden muss
- // PosY darf dann auch noch nicht umgesetzt sein, neuen Wert uebergeben
+ // Zeilenkoepfe anpassen vor dem eigentlichen Scrolling, damit nicht
+ // doppelt gepainted werden muss
+ // PosY darf dann auch noch nicht umgesetzt sein, neuen Wert uebergeben
SCROW nUNew = static_cast<SCROW>(nNewY);
- UpdateHeaderWidth( &eWhich, &nUNew ); // Zeilenkoepfe anpassen
+ UpdateHeaderWidth( &eWhich, &nUNew ); // Zeilenkoepfe anpassen
if (pRowBar[eWhich])
pRowBar[eWhich]->Update();
@@ -1579,7 +1579,7 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars )
if ( aViewData.GetHSplitMode() != SC_SPLIT_NONE )
pGridWin[SC_SPLIT_BOTTOMRIGHT]->ScrollPixel( 0, nDiff );
}
- if (pRowBar[eWhich]) { pRowBar[eWhich]->Scroll( 0,nDiff ); pRowBar[eWhich]->Update(); }
+ if (pRowBar[eWhich]) { pRowBar[eWhich]->Scroll( 0,nDiff ); pRowBar[eWhich]->Update(); }
if (pRowOutline[eWhich]) pRowOutline[eWhich]->ScrollPixel( nDiff );
if (bUpdBars)
UpdateScrollBars();
@@ -1590,10 +1590,10 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars )
ShowAllCursors();
- SetNewVisArea(); // MapMode muss schon gesetzt sein
+ SetNewVisArea(); // MapMode muss schon gesetzt sein
if (bHasHint)
- TestHintWindow(); // neu positionieren
+ TestHintWindow(); // neu positionieren
}
void ScTabView::ScrollLines( long nDeltaX, long nDeltaY )
@@ -1607,9 +1607,9 @@ void ScTabView::ScrollLines( long nDeltaX, long nDeltaY )
SCROW lcl_LastVisible( ScViewData& rViewData )
{
- // wenn am Dokumentende viele Zeilen ausgeblendet sind (welcher Trottel macht sowas?),
- // soll dadurch nicht auf breite Zeilenkoepfe geschaltet werden
- //! als Member ans Dokument ???
+ // wenn am Dokumentende viele Zeilen ausgeblendet sind (welcher Trottel macht sowas?),
+ // soll dadurch nicht auf breite Zeilenkoepfe geschaltet werden
+ //! als Member ans Dokument ???
ScDocument* pDoc = rViewData.GetDocument();
SCTAB nTab = rViewData.GetTabNo();
@@ -1628,13 +1628,13 @@ void ScTabView::UpdateHeaderWidth( const ScVSplitPos* pWhich, const SCROW* pPosY
SCROW nEndPos = MAXROW;
if ( !aViewData.GetViewShell()->GetViewFrame()->GetFrame().IsInPlace() )
{
- // fuer OLE Inplace immer MAXROW
+ // fuer OLE Inplace immer MAXROW
if ( pWhich && *pWhich == SC_SPLIT_BOTTOM && pPosY )
nEndPos = *pPosY;
else
nEndPos = aViewData.GetPosY( SC_SPLIT_BOTTOM );
- nEndPos += aViewData.CellsAtY( nEndPos, 1, SC_SPLIT_BOTTOM, SC_SIZE_NONE ); // VisibleCellsY
+ nEndPos += aViewData.CellsAtY( nEndPos, 1, SC_SPLIT_BOTTOM, SC_SIZE_NONE ); // VisibleCellsY
if (nEndPos > MAXROW)
nEndPos = lcl_LastVisible( aViewData );
@@ -1660,7 +1660,7 @@ void ScTabView::UpdateHeaderWidth( const ScVSplitPos* pWhich, const SCROW* pPosY
if (nEndPos>10000)
nEndPos = 10000;
- else if (nEndPos<1) // avoid extra step at 0 (when only one row is visible)
+ else if (nEndPos<1) // avoid extra step at 0 (when only one row is visible)
nEndPos = 1;
long nWidth = nBig - ( 10000 - nEndPos ) * nDiff / 10000;
@@ -1675,7 +1675,7 @@ void ScTabView::UpdateHeaderWidth( const ScVSplitPos* pWhich, const SCROW* pPosY
RepeatResize();
// auf VCL gibt's Update ohne Ende (jedes Update gilt fuer alle Fenster)
- //aCornerButton.Update(); // der bekommt sonst nie ein Update
+ //aCornerButton.Update(); // der bekommt sonst nie ein Update
bInUpdateHeader = FALSE;
}
@@ -1692,27 +1692,27 @@ void ScTabView::UpdateShow()
{
BOOL bHScrollMode = aViewData.IsHScrollMode();
BOOL bVScrollMode = aViewData.IsVScrollMode();
- BOOL bTabMode = aViewData.IsTabMode();
- BOOL bOutlMode = aViewData.IsOutlineMode();
- BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData);
- BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData);
- BOOL bHeader = aViewData.IsHeaderMode();
+ BOOL bTabMode = aViewData.IsTabMode();
+ BOOL bOutlMode = aViewData.IsOutlineMode();
+ BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData);
+ BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData);
+ BOOL bHeader = aViewData.IsHeaderMode();
BOOL bShowH = ( aViewData.GetHSplitMode() != SC_SPLIT_NONE );
BOOL bShowV = ( aViewData.GetVSplitMode() != SC_SPLIT_NONE );
- // Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden:
+ // Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden:
SfxScrollingMode eMode = aViewData.GetViewShell()->GetScrollingMode();
if ( eMode == SCROLLING_NO )
bHScrollMode = bVScrollMode = FALSE;
- else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto ???
+ else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto ???
bHScrollMode = bVScrollMode = TRUE;
if ( aViewData.GetDocShell()->IsPreview() )
bHScrollMode = bVScrollMode = bTabMode = bHeader = bOutlMode = bHOutline = bVOutline = FALSE;
//
- // Windows anlegen
+ // Windows anlegen
//
if (bShowH && !pGridWin[SC_SPLIT_BOTTOMRIGHT])
@@ -1749,7 +1749,7 @@ void ScTabView::UpdateShow()
&aHdrFunc, pHdrSelEng );
//
- // Windows anzeigen
+ // Windows anzeigen
//
ShowHide( &aHScrollLeft, bHScrollMode );
@@ -1758,7 +1758,7 @@ void ScTabView::UpdateShow()
ShowHide( &aVScrollTop, bShowV && bVScrollMode );
ShowHide( &aScrollBarBox, bVScrollMode || bHScrollMode );
- ShowHide( pHSplitter, bHScrollMode || bShowH ); // immer angelegt
+ ShowHide( pHSplitter, bHScrollMode || bShowH ); // immer angelegt
ShowHide( pVSplitter, bVScrollMode || bShowV );
ShowHide( pTabControl, bTabMode );
@@ -1778,7 +1778,7 @@ void ScTabView::UpdateShow()
ShowHide( pRowBar[SC_SPLIT_TOP], bShowV && bHeader );
- //! neue Gridwindows eintragen
+ //! neue Gridwindows eintragen
}
// --- Splitter --------------------------------------------------------
@@ -1800,8 +1800,8 @@ IMPL_LINK( ScTabView, SplitHdl, Splitter*, pSplitter )
void ScTabView::DoHSplit(long nSplitPos)
{
- // nSplitPos is the real pixel position on the frame window,
- // mirroring for RTL has to be done here.
+ // nSplitPos is the real pixel position on the frame window,
+ // mirroring for RTL has to be done here.
BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() );
if ( bLayoutRTL )
@@ -1828,7 +1828,7 @@ void ScTabView::DoHSplit(long nSplitPos)
if ( aNewMode != aOldMode )
{
- UpdateShow(); // vor ActivatePart !!
+ UpdateShow(); // vor ActivatePart !!
if ( aNewMode == SC_SPLIT_NONE )
{
@@ -1840,7 +1840,7 @@ void ScTabView::DoHSplit(long nSplitPos)
else
{
nOldDelta = aViewData.GetPosX( SC_SPLIT_LEFT );
-// aViewData.SetPosX( SC_SPLIT_LEFT, nOldDelta );
+// aViewData.SetPosX( SC_SPLIT_LEFT, nOldDelta );
long nLeftWidth = nSplitPos - pRowBar[SC_SPLIT_BOTTOM]->GetSizePixel().Width();
if ( nLeftWidth < 0 ) nLeftWidth = 0;
nNewDelta = nOldDelta + aViewData.CellsAtX( nOldDelta, 1, SC_SPLIT_LEFT,
@@ -1856,8 +1856,8 @@ void ScTabView::DoHSplit(long nSplitPos)
SC_SPLIT_BOTTOMRIGHT : SC_SPLIT_TOPRIGHT );
}
- // #61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen
- // dafuer muss hier schon der MapMode stimmen
+ // #61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen
+ // dafuer muss hier schon der MapMode stimmen
for (USHORT i=0; i<4; i++)
if (pGridWin[i])
pGridWin[i]->SetMapMode( pGridWin[i]->GetDrawMapMode() );
@@ -1893,7 +1893,7 @@ void ScTabView::DoVSplit(long nSplitPos)
if ( aNewMode != aOldMode )
{
- UpdateShow(); // vor ActivatePart !!
+ UpdateShow(); // vor ActivatePart !!
if ( aNewMode == SC_SPLIT_NONE )
{
@@ -1928,8 +1928,8 @@ void ScTabView::DoVSplit(long nSplitPos)
SC_SPLIT_BOTTOMLEFT : SC_SPLIT_BOTTOMRIGHT );
}
- // #61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen
- // dafuer muss hier schon der MapMode stimmen
+ // #61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen
+ // dafuer muss hier schon der MapMode stimmen
for (USHORT i=0; i<4; i++)
if (pGridWin[i])
pGridWin[i]->SetMapMode( pGridWin[i]->GetDrawMapMode() );
@@ -2189,8 +2189,8 @@ BOOL lcl_MouseIsOverWin( const Point& rScreenPosPixel, Window* pWin )
{
if (pWin)
{
- // SPLIT_HANDLE_SIZE draufaddieren, damit das Einrasten genau
- // auf dem Splitter nicht aussetzt
+ // SPLIT_HANDLE_SIZE draufaddieren, damit das Einrasten genau
+ // auf dem Splitter nicht aussetzt
Point aRel = pWin->NormalizedScreenToOutputPixel( rScreenPosPixel );
Size aWinSize = pWin->GetOutputSizePixel();
@@ -2212,7 +2212,7 @@ void ScTabView::SnapSplitPos( Point& rScreenPosPixel )
if (!bOverWin)
return;
- // #74761# don't snap to cells if the scale will be modified afterwards
+ // #74761# don't snap to cells if the scale will be modified afterwards
if ( GetZoomType() != SVX_ZOOM_PERCENT )
return;
@@ -2230,7 +2230,7 @@ void ScTabView::SnapSplitPos( Point& rScreenPosPixel )
Point aMouse = pWin->NormalizedScreenToOutputPixel( rScreenPosPixel );
SCsCOL nPosX;
SCsROW nPosY;
- // #52949# bNextIfLarge=FALSE: nicht auf naechste Zelle, wenn ausserhalb des Fensters
+ // #52949# bNextIfLarge=FALSE: nicht auf naechste Zelle, wenn ausserhalb des Fensters
aViewData.GetPosFromPixel( aMouse.X(), aMouse.Y(), ePos, nPosX, nPosY, TRUE, FALSE, FALSE );
BOOL bLeft;
BOOL bTop;
@@ -2304,7 +2304,7 @@ void ScTabView::FreezeSplitters( BOOL bFreeze )
}
aSplit = aViewData.GetScrPos( static_cast<SCCOL>(nPosX), static_cast<SCROW>(nPosY), ePos, TRUE );
- if (nPosX > aViewData.GetPosX(SC_SPLIT_LEFT)) // (aSplit.X() > 0) doesn't work for RTL
+ if (nPosX > aViewData.GetPosX(SC_SPLIT_LEFT)) // (aSplit.X() > 0) doesn't work for RTL
{
long nSplitPos = aSplit.X() + aWinStart.X();
if ( bLayoutRTL )
@@ -2331,7 +2331,7 @@ void ScTabView::FreezeSplitters( BOOL bFreeze )
else
aViewData.SetVSplitMode( SC_SPLIT_NONE );
}
- else // Fixierung aufheben
+ else // Fixierung aufheben
{
if ( eOldH == SC_SPLIT_FIX )
aViewData.SetHSplitMode( SC_SPLIT_NORMAL );
@@ -2339,8 +2339,8 @@ void ScTabView::FreezeSplitters( BOOL bFreeze )
aViewData.SetVSplitMode( SC_SPLIT_NORMAL );
}
- // #61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen
- // dafuer muss hier schon der MapMode stimmen
+ // #61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen
+ // dafuer muss hier schon der MapMode stimmen
for (USHORT i=0; i<4; i++)
if (pGridWin[i])
pGridWin[i]->SetMapMode( pGridWin[i]->GetDrawMapMode() );
@@ -2353,7 +2353,7 @@ void ScTabView::FreezeSplitters( BOOL bFreeze )
PaintTop();
PaintGrid();
- // SC_FOLLOW_NONE: only update active part
+ // SC_FOLLOW_NONE: only update active part
AlignToCursor( aViewData.GetCurX(), aViewData.GetCurY(), SC_FOLLOW_NONE );
UpdateAutoFillMark();
@@ -2389,9 +2389,9 @@ void ScTabView::SplitAtCursor()
RepeatResize();
}
-void ScTabView::SplitAtPixel( const Point& rPixel, BOOL bHor, BOOL bVer ) // fuer API
+void ScTabView::SplitAtPixel( const Point& rPixel, BOOL bHor, BOOL bVer ) // fuer API
{
- // Pixel ist auf die ganze View bezogen, nicht auf das erste GridWin
+ // Pixel ist auf die ganze View bezogen, nicht auf das erste GridWin
if (bHor)
{
@@ -2422,8 +2422,8 @@ void ScTabView::InvalidateSplit()
void ScTabView::SetNewVisArea()
{
- // #63854# fuer die Controls muss bei VisAreaChanged der Draw-MapMode eingestellt sein
- // (auch wenn ansonsten der Edit-MapMode gesetzt ist)
+ // #63854# fuer die Controls muss bei VisAreaChanged der Draw-MapMode eingestellt sein
+ // (auch wenn ansonsten der Edit-MapMode gesetzt ist)
MapMode aOldMode[4];
MapMode aDrawMode[4];
USHORT i;
@@ -2441,7 +2441,7 @@ void ScTabView::SetNewVisArea()
aViewData.GetViewShell()->VisAreaChanged(
pActive->PixelToLogic(Rectangle(Point(),pActive->GetOutputSizePixel())) );
if (pDrawView)
- pDrawView->VisAreaChanged(); // kein Window uebergeben -> alle Fenster
+ pDrawView->VisAreaChanged(); // kein Window uebergeben -> alle Fenster
UpdateAllOverlays(); // #i79909# with drawing MapMode set
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 674f6f8ae0ff..27c0f7d75733 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +60,9 @@
#include "globstr.hrc"
#include "scmod.hxx"
-#define SC_BLOCKMODE_NONE 0
-#define SC_BLOCKMODE_NORMAL 1
-#define SC_BLOCKMODE_OWN 2
+#define SC_BLOCKMODE_NONE 0
+#define SC_BLOCKMODE_NORMAL 1
+#define SC_BLOCKMODE_OWN 2
@@ -102,14 +102,14 @@ void ScTabView::InitOwnBlockMode()
{
if (!bIsBlockMode)
{
- // Wenn keine (alte) Markierung mehr da ist, Anker in SelectionEngine loeschen:
+ // Wenn keine (alte) Markierung mehr da ist, Anker in SelectionEngine loeschen:
ScMarkData& rMark = aViewData.GetMarkData();
if (!rMark.IsMarked() && !rMark.IsMultiMarked())
GetSelEngine()->CursorPosChanging( FALSE, FALSE );
-// bIsBlockMode = TRUE;
- bIsBlockMode = SC_BLOCKMODE_OWN; //! Variable umbenennen!
+// bIsBlockMode = TRUE;
+ bIsBlockMode = SC_BLOCKMODE_OWN; //! Variable umbenennen!
nBlockStartX = 0;
nBlockStartY = 0;
nBlockStartZ = 0;
@@ -117,7 +117,7 @@ void ScTabView::InitOwnBlockMode()
nBlockEndY = 0;
nBlockEndZ = 0;
- SelectionChanged(); // Status wird mit gesetzer Markierung abgefragt
+ SelectionChanged(); // Status wird mit gesetzer Markierung abgefragt
}
}
@@ -132,7 +132,7 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
ScMarkData& rMark = aViewData.GetMarkData();
SCTAB nTab = aViewData.GetTabNo();
- // Teil von Markierung aufheben?
+ // Teil von Markierung aufheben?
if (bTestNeg)
{
if ( bCols )
@@ -146,8 +146,8 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
bBlockNeg = FALSE;
rMark.SetMarkNegative(bBlockNeg);
-// bIsBlockMode = TRUE;
- bIsBlockMode = SC_BLOCKMODE_NORMAL; //! Variable umbenennen!
+// bIsBlockMode = TRUE;
+ bIsBlockMode = SC_BLOCKMODE_NORMAL; //! Variable umbenennen!
bBlockCols = bCols;
bBlockRows = bRows;
nBlockStartX = nBlockStartXOrig = nCurX;
@@ -176,7 +176,7 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
#endif
UpdateSelectionOverlay();
- bNewStartIfMarking = FALSE; // use only once
+ bNewStartIfMarking = FALSE; // use only once
}
}
@@ -187,9 +187,9 @@ void ScTabView::SetNewStartIfMarking()
void ScTabView::DoneBlockMode( BOOL bContinue ) // Default FALSE
{
- // Wenn zwischen Tabellen- und Header SelectionEngine gewechselt wird,
- // wird evtl. DeselectAll gerufen, weil die andere Engine keinen Anker hat.
- // Mit bMoveIsShift wird verhindert, dass dann die Selektion aufgehoben wird.
+ // Wenn zwischen Tabellen- und Header SelectionEngine gewechselt wird,
+ // wird evtl. DeselectAll gerufen, weil die andere Engine keinen Anker hat.
+ // Mit bMoveIsShift wird verhindert, dass dann die Selektion aufgehoben wird.
if (bIsBlockMode && !bMoveIsShift)
{
@@ -204,19 +204,19 @@ void ScTabView::DoneBlockMode( BOOL bContinue ) // Default FALSE
rMark.MarkToMulti();
else
{
- // Die Tabelle kann an dieser Stelle ungueltig sein, weil DoneBlockMode
- // aus SetTabNo aufgerufen wird
- // (z.B. wenn die aktuelle Tabelle von einer anderen View aus geloescht wird)
+ // Die Tabelle kann an dieser Stelle ungueltig sein, weil DoneBlockMode
+ // aus SetTabNo aufgerufen wird
+ // (z.B. wenn die aktuelle Tabelle von einer anderen View aus geloescht wird)
SCTAB nTab = aViewData.GetTabNo();
ScDocument* pDoc = aViewData.GetDocument();
if ( pDoc->HasTable(nTab) )
- PaintBlock( TRUE ); // TRUE -> Block loeschen
+ PaintBlock( TRUE ); // TRUE -> Block loeschen
else
rMark.ResetMark();
}
-// bIsBlockMode = FALSE;
- bIsBlockMode = SC_BLOCKMODE_NONE; //! Variable umbenennen!
+// bIsBlockMode = FALSE;
+ bIsBlockMode = SC_BLOCKMODE_NONE; //! Variable umbenennen!
rMark.SetMarking(bFlag);
rMark.SetMarkNegative(FALSE);
@@ -248,13 +248,13 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
( aMarkRange.aStart.Row() != nBlockStartY && aMarkRange.aEnd.Row() != nBlockStartY ) ||
( bIsBlockMode == SC_BLOCKMODE_OWN ))
{
- // Markierung ist veraendert worden
- // (z.B. MarkToSimple, wenn per negativ alles bis auf ein Rechteck geloescht wurde)
- // oder nach InitOwnBlockMode wird mit Shift-Klick weitermarkiert...
+ // Markierung ist veraendert worden
+ // (z.B. MarkToSimple, wenn per negativ alles bis auf ein Rechteck geloescht wurde)
+ // oder nach InitOwnBlockMode wird mit Shift-Klick weitermarkiert...
BOOL bOldShift = bMoveIsShift;
- bMoveIsShift = FALSE; // wirklich umsetzen
- DoneBlockMode(FALSE); //! direkt Variablen setzen? (-> kein Geflacker)
+ bMoveIsShift = FALSE; // wirklich umsetzen
+ DoneBlockMode(FALSE); //! direkt Variablen setzen? (-> kein Geflacker)
bMoveIsShift = bOldShift;
InitBlockMode( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(),
@@ -268,13 +268,13 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
{
// Current cursor has moved
- SCTAB nTab = nCurZ;
+ SCTAB nTab = nCurZ;
#ifdef OLD_SELECTION_PAINT
- SCCOL nDrawStartCol;
- SCROW nDrawStartRow;
- SCCOL nDrawEndCol;
- SCROW nDrawEndRow;
+ SCCOL nDrawStartCol;
+ SCROW nDrawStartRow;
+ SCCOL nDrawEndCol;
+ SCROW nDrawEndRow;
#endif
// Set old selection area
@@ -385,8 +385,8 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
nDrawEndCol, nDrawEndRow, bCont );
if ( bDraw )
{
-//? PutInOrder( nDrawStartCol, nDrawEndCol );
-//? PutInOrder( nDrawStartRow, nDrawEndRow );
+//? PutInOrder( nDrawStartCol, nDrawEndCol );
+//? PutInOrder( nDrawStartRow, nDrawEndRow );
HideAllCursors();
InvertBlockMark( nDrawStartCol, nDrawStartRow, nDrawEndCol, nDrawEndRow );
@@ -404,7 +404,7 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
nOldCurY = nCurY;
aViewData.GetViewShell()->UpdateInputHandler();
-// InvalidateAttribs();
+// InvalidateAttribs();
}
if ( !bCols && !bRows )
@@ -433,7 +433,7 @@ void ScTabView::UpdateAllOverlays()
}
//!
-//! PaintBlock in zwei Methoden aufteilen: RepaintBlock und RemoveBlock o.ae.
+//! PaintBlock in zwei Methoden aufteilen: RepaintBlock und RemoveBlock o.ae.
//!
void ScTabView::PaintBlock( BOOL bReset )
@@ -497,7 +497,7 @@ void ScTabView::PaintBlock( BOOL bReset )
#ifdef OLD_SELECTION_PAINT
// (mis)use InvertBlockMark to remove all of the selection
// -> set bBlockNeg (like when removing parts of a selection)
- // and convert everything to Multi
+ // and convert everything to Multi
rMark.MarkToMulti();
BOOL bOld = bBlockNeg;
@@ -515,7 +515,7 @@ void ScTabView::PaintBlock( BOOL bReset )
bDidReset = TRUE;
}
- // repaint if controls are touched (#69680# in both cases)
+ // repaint if controls are touched (#69680# in both cases)
// #i74768# Forms are rendered by DrawingLayer's EndDrawLayers()
static bool bSuppressControlExtraStuff(true);
@@ -528,7 +528,7 @@ void ScTabView::PaintBlock( BOOL bReset )
{
if (pGridWin[i] && pGridWin[i]->IsVisible())
{
- // MapMode muss logischer (1/100mm) sein !!!
+ // MapMode muss logischer (1/100mm) sein !!!
pDoc->InvalidateControls( pGridWin[i], nTab, aMMRect );
pGridWin[i]->Update();
}
@@ -580,8 +580,8 @@ void ScTabView::SelectAllTables()
for (SCTAB i=0; i<nCount; i++)
rMark.SelectTable( i, TRUE );
- // Markierungen werden per Default nicht pro Tabelle gehalten
-// pDoc->ExtendMarksFromTable( nTab );
+ // Markierungen werden per Default nicht pro Tabelle gehalten
+// pDoc->ExtendMarksFromTable( nTab );
aViewData.GetDocShell()->PostPaintExtras();
SfxBindings& rBind = aViewData.GetBindings();
@@ -619,7 +619,7 @@ BOOL lcl_FitsInWindow( double fScaleX, double fScaleY, USHORT nZoom,
SCCOL nCol;
for (nCol=0; nCol<nFixPosX; nCol++)
{
- // for frozen panes, add both parts
+ // for frozen panes, add both parts
USHORT nColTwips = pDoc->GetColWidth( nCol, nTab );
if (nColTwips)
{
@@ -645,7 +645,7 @@ BOOL lcl_FitsInWindow( double fScaleX, double fScaleY, USHORT nZoom,
if (pDoc->RowHidden(nRow, nTab))
continue;
- // for frozen panes, add both parts
+ // for frozen panes, add both parts
USHORT nRowTwips = pDoc->GetRowHeight(nRow, nTab);
if (nRowTwips)
{
@@ -678,26 +678,26 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom )
nZoom = nOldZoom;
break;
- case SVX_ZOOM_OPTIMAL: // nZoom entspricht der optimalen Gr"o\se
+ case SVX_ZOOM_OPTIMAL: // nZoom entspricht der optimalen Gr"o\se
{
ScMarkData& rMark = aViewData.GetMarkData();
ScDocument* pDoc = aViewData.GetDocument();
if (!rMark.IsMarked() && !rMark.IsMultiMarked())
- nZoom = 100; // nothing selected
+ nZoom = 100; // nothing selected
else
{
- SCTAB nTab = aViewData.GetTabNo();
+ SCTAB nTab = aViewData.GetTabNo();
ScRange aMarkRange;
if ( aViewData.GetSimpleArea( aMarkRange ) != SC_MARK_SIMPLE )
rMark.GetMultiMarkArea( aMarkRange );
- SCCOL nStartCol = aMarkRange.aStart.Col();
- SCROW nStartRow = aMarkRange.aStart.Row();
- SCTAB nStartTab = aMarkRange.aStart.Tab();
- SCCOL nEndCol = aMarkRange.aEnd.Col();
- SCROW nEndRow = aMarkRange.aEnd.Row();
- SCTAB nEndTab = aMarkRange.aEnd.Tab();
+ SCCOL nStartCol = aMarkRange.aStart.Col();
+ SCROW nStartRow = aMarkRange.aStart.Row();
+ SCTAB nStartTab = aMarkRange.aStart.Tab();
+ SCCOL nEndCol = aMarkRange.aEnd.Col();
+ SCROW nEndRow = aMarkRange.aEnd.Row();
+ SCTAB nEndTab = aMarkRange.aEnd.Tab();
if ( nTab < nStartTab && nTab > nEndTab )
nTab = nStartTab;
@@ -708,7 +708,7 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom )
SCROW nFixPosY = 0;
if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX )
{
- // use right part
+ // use right part
eUsedPart = (WhichV(eUsedPart)==SC_SPLIT_TOP) ? SC_SPLIT_TOPRIGHT : SC_SPLIT_BOTTOMRIGHT;
nFixPosX = aViewData.GetFixPosX();
if ( nStartCol < nFixPosX )
@@ -716,7 +716,7 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom )
}
if ( aViewData.GetVSplitMode() == SC_SPLIT_FIX )
{
- // use bottom part
+ // use bottom part
eUsedPart = (WhichH(eUsedPart)==SC_SPLIT_LEFT) ? SC_SPLIT_BOTTOMLEFT : SC_SPLIT_BOTTOMRIGHT;
nFixPosY = aViewData.GetFixPosY();
if ( nStartRow < nFixPosY )
@@ -725,12 +725,12 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom )
if (pGridWin[eUsedPart])
{
- // Because scale is rounded to pixels, the only reliable way to find
- // the right scale is to check if a zoom fits
+ // Because scale is rounded to pixels, the only reliable way to find
+ // the right scale is to check if a zoom fits
Size aWinSize = pGridWin[eUsedPart]->GetOutputSizePixel();
- // for frozen panes, use sum of both parts for calculation
+ // for frozen panes, use sum of both parts for calculation
if ( nFixPosX != 0 )
aWinSize.Width() += GetGridWidth( SC_SPLIT_LEFT );
@@ -772,13 +772,13 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom )
}
break;
- case SVX_ZOOM_WHOLEPAGE: // nZoom entspricht der ganzen Seite oder
- case SVX_ZOOM_PAGEWIDTH: // nZoom entspricht der Seitenbreite
+ case SVX_ZOOM_WHOLEPAGE: // nZoom entspricht der ganzen Seite oder
+ case SVX_ZOOM_PAGEWIDTH: // nZoom entspricht der Seitenbreite
{
- SCTAB nCurTab = aViewData.GetTabNo();
- ScDocument* pDoc = aViewData.GetDocument();
- ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
- SfxStyleSheetBase* pStyleSheet =
+ SCTAB nCurTab = aViewData.GetTabNo();
+ ScDocument* pDoc = aViewData.GetDocument();
+ ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
+ SfxStyleSheetBase* pStyleSheet =
pStylePool->Find( pDoc->GetPageStyle( nCurTab ),
SFX_STYLE_FAMILY_PAGE );
@@ -792,11 +792,11 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom )
Size aPageSize = aPrintFunc.GetDataSize();
- // use the size of the largest GridWin for normal split,
- // or both combined for frozen panes, with the (document) size
- // of the frozen part added to the page size
- // (with frozen panes, the size of the individual parts
- // depends on the scale that is to be calculated)
+ // use the size of the largest GridWin for normal split,
+ // or both combined for frozen panes, with the (document) size
+ // of the frozen part added to the page size
+ // (with frozen panes, the size of the individual parts
+ // depends on the scale that is to be calculated)
if ( !pGridWin[SC_SPLIT_BOTTOMLEFT] ) return 0;
Size aWinSize = pGridWin[SC_SPLIT_BOTTOMLEFT]->GetOutputSizePixel();
@@ -856,7 +856,7 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom )
return nZoom;
}
-// wird z.B. gerufen, wenn sich das View-Fenster verschiebt:
+// wird z.B. gerufen, wenn sich das View-Fenster verschiebt:
void ScTabView::StopMarking()
{
@@ -886,7 +886,7 @@ void ScTabView::MakeDrawLayer()
{
aViewData.GetDocShell()->MakeDrawLayer();
- // pDrawView wird per Notify gesetzt
+ // pDrawView wird per Notify gesetzt
DBG_ASSERT(pDrawView,"ScTabView::MakeDrawLayer funktioniert nicht");
// #114409#
@@ -908,7 +908,7 @@ void ScTabView::ErrorMessage( USHORT nGlobStrId )
return;
}
- StopMarking(); // falls per Focus aus MouseButtonDown aufgerufen
+ StopMarking(); // falls per Focus aus MouseButtonDown aufgerufen
Window* pParent = aViewData.GetDialogParent();
ScWaitCursorOff aWaitOff( pParent );
@@ -962,14 +962,14 @@ void ScTabView::UpdatePageBreakData( BOOL bForcePaint )
pNewData = new ScPageBreakData(nCount);
ScPrintFunc aPrintFunc( pDocSh, pDocSh->GetPrinter(), nTab, 0,0,NULL, NULL, pNewData );
- // ScPrintFunc fuellt im ctor die PageBreakData
+ // ScPrintFunc fuellt im ctor die PageBreakData
if ( nCount > 1 )
{
aPrintFunc.ResetBreaks(nTab);
pNewData->AddPages();
}
- // Druckbereiche veraendert?
+ // Druckbereiche veraendert?
if ( bForcePaint || ( pPageBreakData && !pPageBreakData->IsEqual( *pNewData ) ) )
PaintGrid();
}
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 90bfe0c24e5c..78e032a6704f 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -111,14 +111,14 @@ using namespace com::sun::star;
// -----------------------------------------------------------------------
//
-// --- Public-Funktionen
+// --- Public-Funktionen
//
void ScTabView::ClickCursor( SCCOL nPosX, SCROW nPosY, BOOL bControl )
{
ScDocument* pDoc = aViewData.GetDocument();
SCTAB nTab = aViewData.GetTabNo();
- while (pDoc->IsHorOverlapped( nPosX, nPosY, nTab )) //! ViewData !!!
+ while (pDoc->IsHorOverlapped( nPosX, nPosY, nTab )) //! ViewData !!!
--nPosX;
while (pDoc->IsVerOverlapped( nPosX, nPosY, nTab ))
--nPosY;
@@ -161,9 +161,9 @@ void ScTabView::UpdateAutoFillMark()
pRowBar[i]->SetMark( bMarked, aMarkRange.aStart.Row(), aMarkRange.aEnd.Row() );
}
- // selection transfer object is checked together with AutoFill marks,
- // because it has the same requirement of a single continuous block.
- CheckSelectionTransfer(); // update selection transfer object
+ // selection transfer object is checked together with AutoFill marks,
+ // because it has the same requirement of a single continuous block.
+ CheckSelectionTransfer(); // update selection transfer object
}
void ScTabView::FakeButtonUp( ScSplitPos eWhich )
@@ -264,13 +264,13 @@ void ScTabView::InvalidateAttribs()
rBindings.Invalidate( SID_ALIGN_ANY_VCENTER );
rBindings.Invalidate( SID_ALIGN_ANY_BOTTOM );
-// rBindings.Invalidate( SID_RANGE_VALUE );
-// rBindings.Invalidate( SID_RANGE_FORMULA );
+// rBindings.Invalidate( SID_RANGE_VALUE );
+// rBindings.Invalidate( SID_RANGE_FORMULA );
}
-// SetCursor - Cursor setzen, zeichnen, InputWin updaten
-// oder Referenz verschicken
-// ohne Optimierung wegen BugId 29307
+// SetCursor - Cursor setzen, zeichnen, InputWin updaten
+// oder Referenz verschicken
+// ohne Optimierung wegen BugId 29307
#ifdef _MSC_VER
#pragma optimize ( "", off )
@@ -281,7 +281,7 @@ void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, BOOL bNew )
SCCOL nOldX = aViewData.GetCurX();
SCROW nOldY = aViewData.GetCurY();
- // DeactivateIP nur noch bei MarkListHasChanged
+ // DeactivateIP nur noch bei MarkListHasChanged
if ( nPosX != nOldX || nPosY != nOldY || bNew )
{
@@ -309,7 +309,7 @@ void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, BOOL bNew )
void ScTabView::CheckSelectionTransfer()
{
- if ( aViewData.IsActive() ) // only for active view
+ if ( aViewData.IsActive() ) // only for active view
{
ScModule* pScMod = SC_MOD();
ScSelectionTransferObj* pOld = pScMod->GetSelectionTransfer();
@@ -322,22 +322,22 @@ void ScTabView::CheckSelectionTransfer()
ScSelectionTransferObj* pNew = ScSelectionTransferObj::CreateFromView( this );
if ( pNew )
{
- // create new selection
+ // create new selection
if (pOld)
pOld->ForgetView();
uno::Reference<datatransfer::XTransferable> xRef( pNew );
pScMod->SetSelectionTransfer( pNew );
- pNew->CopyToSelection( GetActiveWin() ); // may delete pOld
+ pNew->CopyToSelection( GetActiveWin() ); // may delete pOld
}
else if ( pOld && pOld->GetView() == this )
{
- // remove own selection
+ // remove own selection
pOld->ForgetView();
pScMod->SetSelectionTransfer( NULL );
- TransferableHelper::ClearSelection( GetActiveWin() ); // may delete pOld
+ TransferableHelper::ClearSelection( GetActiveWin() ); // may delete pOld
}
// else: selection from outside: leave unchanged
}
@@ -345,19 +345,19 @@ void ScTabView::CheckSelectionTransfer()
}
// Eingabezeile / Menues updaten
-// CursorPosChanged ruft SelectionChanged
-// SelectionChanged ruft CellContentChanged
+// CursorPosChanged ruft SelectionChanged
+// SelectionChanged ruft CellContentChanged
void ScTabView::CellContentChanged()
{
SfxBindings& rBindings = aViewData.GetBindings();
- rBindings.Invalidate( SID_ATTR_SIZE ); // -> Fehlermeldungen anzeigen
+ rBindings.Invalidate( SID_ATTR_SIZE ); // -> Fehlermeldungen anzeigen
rBindings.Invalidate( SID_THESAURUS );
rBindings.Invalidate( SID_HYPERLINK_GETLINK );
- InvalidateAttribs(); // Attribut-Updates
- TestHintWindow(); // Eingabemeldung (Gueltigkeit)
+ InvalidateAttribs(); // Attribut-Updates
+ TestHintWindow(); // Eingabemeldung (Gueltigkeit)
aViewData.GetViewShell()->UpdateInputHandler();
}
@@ -376,16 +376,16 @@ void ScTabView::SelectionChanged()
}
}
- UpdateAutoFillMark(); // also calls CheckSelectionTransfer
+ UpdateAutoFillMark(); // also calls CheckSelectionTransfer
SfxBindings& rBindings = aViewData.GetBindings();
- rBindings.Invalidate( SID_CURRENTCELL ); // -> Navigator
- rBindings.Invalidate( SID_AUTO_FILTER ); // -> Menue
+ rBindings.Invalidate( SID_CURRENTCELL ); // -> Navigator
+ rBindings.Invalidate( SID_AUTO_FILTER ); // -> Menue
rBindings.Invalidate( FID_NOTE_VISIBLE );
rBindings.Invalidate( SID_DELETE_NOTE );
- // Funktionen, die evtl disabled werden muessen
+ // Funktionen, die evtl disabled werden muessen
rBindings.Invalidate( FID_INS_ROWBRK );
rBindings.Invalidate( FID_INS_COLBRK );
@@ -396,7 +396,7 @@ void ScTabView::SelectionChanged()
rBindings.Invalidate( FID_MERGE_TOGGLE );
rBindings.Invalidate( SID_AUTOFILTER_HIDE );
rBindings.Invalidate( SID_UNFILTER );
-// rBindings.Invalidate( SID_IMPORT_DATA ); // jetzt wieder immer moeglich
+// rBindings.Invalidate( SID_IMPORT_DATA ); // jetzt wieder immer moeglich
rBindings.Invalidate( SID_REIMPORT_DATA );
rBindings.Invalidate( SID_REFRESH_DBAREA );
rBindings.Invalidate( SID_OUTLINE_SHOW );
@@ -420,12 +420,12 @@ void ScTabView::SelectionChanged()
rBindings.Invalidate( FID_INS_ROW );
rBindings.Invalidate( FID_INS_COLUMN );
rBindings.Invalidate( FID_INS_CELL );
- rBindings.Invalidate( FID_INS_CELLSDOWN );
+ rBindings.Invalidate( FID_INS_CELLSDOWN );
rBindings.Invalidate( FID_INS_CELLSRIGHT );
rBindings.Invalidate( FID_CHG_COMMENT );
- // nur wegen Zellschutz:
+ // nur wegen Zellschutz:
rBindings.Invalidate( SID_CELL_FORMAT_RESET );
rBindings.Invalidate( SID_DELETE );
@@ -436,7 +436,7 @@ void ScTabView::SelectionChanged()
rBindings.Invalidate( SID_INSERT_POSTIT );
rBindings.Invalidate( SID_CHARMAP );
rBindings.Invalidate( SID_OPENDLG_FUNCTION );
-// rBindings.Invalidate( FID_CONDITIONAL_FORMAT );
+// rBindings.Invalidate( FID_CONDITIONAL_FORMAT );
rBindings.Invalidate( SID_OPENDLG_CONDFRMT );
rBindings.Invalidate( FID_VALIDATION );
rBindings.Invalidate( SID_EXTERNAL_SOURCE );
@@ -456,14 +456,14 @@ void ScTabView::CursorPosChanged()
if ( !bRefMode ) // Abfrage, damit RefMode bei Tabellenwechsel funktioniert
aViewData.GetDocShell()->Broadcast( SfxSimpleHint( FID_KILLEDITVIEW ) );
- // Broadcast, damit andere Views des Dokuments auch umschalten
+ // Broadcast, damit andere Views des Dokuments auch umschalten
ScDocument* pDoc = aViewData.GetDocument();
bool bDP = NULL != pDoc->GetDPAtCursor(
aViewData.GetCurX(), aViewData.GetCurY(), aViewData.GetTabNo() );
aViewData.GetViewShell()->SetPivotShell(bDP);
- // UpdateInputHandler jetzt in CellContentChanged
+ // UpdateInputHandler jetzt in CellContentChanged
SelectionChanged();
@@ -485,12 +485,12 @@ void ScTabView::TestHintWindow()
ATTR_VALIDDATA );
if ( pItem->GetValue() )
{
- const ScValidationData* pData = pDoc->GetValidationEntry( pItem->GetValue() );
+ const ScValidationData* pData = pDoc->GetValidationEntry( pItem->GetValue() );
DBG_ASSERT(pData,"ValidationData nicht gefunden");
String aTitle, aMessage;
if ( pData && pData->GetInput( aTitle, aMessage ) && aMessage.Len() > 0 )
{
- //! Abfrage, ob an gleicher Stelle !!!!
+ //! Abfrage, ob an gleicher Stelle !!!!
DELETEZ(pInputHintWindow);
@@ -500,12 +500,12 @@ void ScTabView::TestHintWindow()
SCROW nRow = aViewData.GetCurY();
Point aPos = aViewData.GetScrPos( nCol, nRow, eWhich );
Size aWinSize = pWin->GetOutputSizePixel();
- // Cursor sichtbar?
+ // Cursor sichtbar?
if ( nCol >= aViewData.GetPosX(WhichH(eWhich)) &&
nRow >= aViewData.GetPosY(WhichV(eWhich)) &&
aPos.X() < aWinSize.Width() && aPos.Y() < aWinSize.Height() )
{
- aPos += pWin->GetPosPixel(); // Position auf Frame
+ aPos += pWin->GetPosPixel(); // Position auf Frame
long nSizeXPix;
long nSizeYPix;
aViewData.GetMergeSizePixel( nCol, nRow, nSizeXPix, nSizeYPix );
@@ -516,7 +516,7 @@ void ScTabView::TestHintWindow()
Size aFrameWinSize = pFrameWin->GetOutputSizePixel();
// passende Position finden
- // erster Versuch: unter dem Cursor
+ // erster Versuch: unter dem Cursor
Point aHintPos( aPos.X() + nSizeXPix / 2, aPos.Y() + nSizeYPix + 3 );
if ( aHintPos.Y() + aHintSize.Height() > aFrameWinSize.Height() )
{
@@ -537,10 +537,10 @@ void ScTabView::TestHintWindow()
}
}
- // X anpassen
+ // X anpassen
if ( aHintPos.X() + aHintSize.Width() > aFrameWinSize.Width() )
aHintPos.X() = aFrameWinSize.Width() - aHintSize.Width();
- // Y anpassen
+ // Y anpassen
if ( aHintPos.Y() + aHintSize.Height() > aFrameWinSize.Height() )
aHintPos.Y() = aFrameWinSize.Height() - aHintSize.Height();
@@ -576,9 +576,9 @@ void ScTabView::RemoveHintWindow()
// find window that should not be over the cursor
Window* lcl_GetCareWin(SfxViewFrame* pViewFrm)
{
- //! auch Spelling ??? (dann beim Aufruf Membervariable setzen)
+ //! auch Spelling ??? (dann beim Aufruf Membervariable setzen)
- // Suchen & Ersetzen
+ // Suchen & Ersetzen
if ( pViewFrm->HasChildWindow(SID_SEARCH_DLG) )
{
SfxChildWindow* pChild = pViewFrm->GetChildWindow(SID_SEARCH_DLG);
@@ -590,7 +590,7 @@ Window* lcl_GetCareWin(SfxViewFrame* pViewFrm)
}
}
- // Aenderungen uebernehmen
+ // Aenderungen uebernehmen
if ( pViewFrm->HasChildWindow(FID_CHG_ACCEPT) )
{
SfxChildWindow* pChild = pViewFrm->GetChildWindow(FID_CHG_ACCEPT);
@@ -606,14 +606,14 @@ Window* lcl_GetCareWin(SfxViewFrame* pViewFrm)
}
//
- // Bildschirm an Cursorposition anpassen
+ // Bildschirm an Cursorposition anpassen
//
void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
const ScSplitPos* pWhich )
{
//
- // aktiven Teil umschalten jetzt hier
+ // aktiven Teil umschalten jetzt hier
//
ScSplitPos eActive = aViewData.GetActivePart();
@@ -635,7 +635,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
}
//
- // eigentliches Align
+ // eigentliches Align
//
if ( eMode != SC_FOLLOW_NONE )
@@ -662,17 +662,17 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
Size aScrSize = aViewData.GetScrSize();
long nSpaceX = ( aScrSize.Width() - nCellSizeX ) / 2;
long nSpaceY = ( aScrSize.Height() - nCellSizeY ) / 2;
- // nSpaceY: desired start position of cell for FOLLOW_JUMP, modified if dialog interferes
+ // nSpaceY: desired start position of cell for FOLLOW_JUMP, modified if dialog interferes
- BOOL bForceNew = FALSE; // force new calculation of JUMP position (vertical only)
+ BOOL bForceNew = FALSE; // force new calculation of JUMP position (vertical only)
// VisibleCellsY == CellsAtY( GetPosY( eWhichY ), 1, eWhichY )
//-------------------------------------------------------------------------------
- // falls z.B. Suchen-Dialog offen ist, Cursor nicht hinter den Dialog stellen
- // wenn moeglich, die Zeile mit dem Cursor oberhalb oder unterhalb des Dialogs
+ // falls z.B. Suchen-Dialog offen ist, Cursor nicht hinter den Dialog stellen
+ // wenn moeglich, die Zeile mit dem Cursor oberhalb oder unterhalb des Dialogs
- //! nicht, wenn schon komplett sichtbar
+ //! nicht, wenn schon komplett sichtbar
if ( eMode == SC_FOLLOW_JUMP )
{
@@ -687,21 +687,21 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
{
aDlgPixel = pCare->GetWindowExtentsRelative( pWin );
aWinSize = pWin->GetOutputSizePixel();
- // ueberdeckt der Dialog das GridWin?
+ // ueberdeckt der Dialog das GridWin?
if ( aDlgPixel.Right() >= 0 && aDlgPixel.Left() < aWinSize.Width() )
{
if ( nCurX < nDeltaX || nCurX >= nDeltaX+nSizeX ||
nCurY < nDeltaY || nCurY >= nDeltaY+nSizeY )
- bLimit = TRUE; // es wird sowieso gescrollt
+ bLimit = TRUE; // es wird sowieso gescrollt
else
{
- // Cursor ist auf dem Bildschirm
+ // Cursor ist auf dem Bildschirm
Point aStart = aViewData.GetScrPos( nCurX, nCurY, eAlign );
long nCSX, nCSY;
aViewData.GetMergeSizePixel( nCurX, nCurY, nCSX, nCSY );
Rectangle aCursor( aStart, Size( nCSX, nCSY ) );
if ( aCursor.IsOver( aDlgPixel ) )
- bLimit = TRUE; // Zelle vom Dialog ueberdeckt
+ bLimit = TRUE; // Zelle vom Dialog ueberdeckt
}
}
}
@@ -717,10 +717,10 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
SCsCOL nWPosX;
SCsROW nWPosY;
aViewData.GetPosFromPixel( 0,nDlgBot, eAlign, nWPosX, nWPosY );
- ++nWPosY; // unter der letzten betroffenen Zelle
+ ++nWPosY; // unter der letzten betroffenen Zelle
SCsROW nDiff = nWPosY - nDeltaY;
- if ( nCurY >= nDiff ) // Pos. kann nicht negativ werden
+ if ( nCurY >= nDiff ) // Pos. kann nicht negativ werden
{
nSpaceY = nDlgBot + ( nBotSpace - nCellSizeY ) / 2;
bBottom = TRUE;
@@ -775,7 +775,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
nSizeY = (SCsROW) aViewData.CellsAtY( nNewDeltaY, 1, eAlignY );
}
- // like old version of SC_FOLLOW_JUMP:
+ // like old version of SC_FOLLOW_JUMP:
if ( nCurX < nNewDeltaX || nCurX >= nNewDeltaX+nSizeX )
{
@@ -839,7 +839,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
}
//
- // nochmal aktiven Teil umschalten
+ // nochmal aktiven Teil umschalten
//
if (bHFix)
@@ -877,7 +877,7 @@ BOOL ScTabView::SelMouseButtonDown( const MouseEvent& rMEvt )
}
//
- // MoveCursor - mit Anpassung des Bildausschnitts
+ // MoveCursor - mit Anpassung des Bildausschnitts
//
void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
@@ -895,18 +895,18 @@ void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
if ( bShift && bNewStartIfMarking && IsBlockMode() )
{
- // used for ADD selection mode: start a new block from the cursor position
+ // used for ADD selection mode: start a new block from the cursor position
DoneBlockMode( TRUE );
InitBlockMode( aViewData.GetCurX(), aViewData.GetCurY(), aViewData.GetTabNo(), TRUE );
}
- // aktiven Teil umschalten jetzt in AlignToCursor
+ // aktiven Teil umschalten jetzt in AlignToCursor
AlignToCursor( nCurX, nCurY, eMode );
- //! auf OS/2: SC_FOLLOW_JUMP statt SC_FOLLOW_LINE, um Nachlaufen zu verhindern ???
+ //! auf OS/2: SC_FOLLOW_JUMP statt SC_FOLLOW_LINE, um Nachlaufen zu verhindern ???
if (bKeepSel)
- SetCursor( nCurX, nCurY ); // Markierung stehenlassen
+ SetCursor( nCurX, nCurY ); // Markierung stehenlassen
else
{
BOOL bSame = ( nCurX == aViewData.GetCurX() && nCurY == aViewData.GetCurY() );
@@ -915,8 +915,8 @@ void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
bMoveIsShift = FALSE;
aFunctionSet.SetCursorAtCell( nCurX, nCurY, FALSE );
- // Wenn der Cursor nicht bewegt wurde, muss das SelectionChanged fuer das
- // Aufheben der Selektion hier einzeln passieren:
+ // Wenn der Cursor nicht bewegt wurde, muss das SelectionChanged fuer das
+ // Aufheben der Selektion hier einzeln passieren:
if (bSame)
SelectionChanged();
}
@@ -987,7 +987,7 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
else
{
nMovX = -nMovX;
- if (nMovX > 0) ++nCurX; else --nCurX; // zuruecknehmen
+ if (nMovX > 0) ++nCurX; else --nCurX; // zuruecknehmen
bHFlip = TRUE;
}
}
@@ -1029,7 +1029,7 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
else
{
nMovY = -nMovY;
- if (nMovY > 0) ++nCurY; else --nCurY; // zuruecknehmen
+ if (nMovY > 0) ++nCurY; else --nCurY; // zuruecknehmen
bVFlip = TRUE;
}
}
@@ -1089,7 +1089,7 @@ void ScTabView::MoveCursorArea( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
ScDocument* pDoc = aViewData.GetDocument();
SCTAB nTab = aViewData.GetTabNo();
- // FindAreaPos kennt nur -1 oder 1 als Richtung
+ // FindAreaPos kennt nur -1 oder 1 als Richtung
SCsCOLROW i;
if ( nMovX > 0 )
@@ -1105,7 +1105,7 @@ void ScTabView::MoveCursorArea( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
for ( i=0; i<-nMovY; i++ )
pDoc->FindAreaPos( nNewX, nNewY, nTab, 0, -1 );
- if (eMode==SC_FOLLOW_JUMP) // unten/rechts nicht zuviel grau anzeigen
+ if (eMode==SC_FOLLOW_JUMP) // unten/rechts nicht zuviel grau anzeigen
{
if (nMovX != 0 && nNewX == MAXCOL)
eMode = SC_FOLLOW_LINE;
@@ -1130,12 +1130,12 @@ void ScTabView::MoveCursorEnd( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, B
SCCOL nUsedX = 0;
SCROW nUsedY = 0;
if ( nMovX > 0 || nMovY > 0 )
- pDoc->GetPrintArea( nTab, nUsedX, nUsedY ); // Ende holen
+ pDoc->GetPrintArea( nTab, nUsedX, nUsedY ); // Ende holen
if (nMovX<0)
nNewX=0;
else if (nMovX>0)
- nNewX=nUsedX; // letzter benutzter Bereich
+ nNewX=nUsedX; // letzter benutzter Bereich
if (nMovY<0)
nNewY=0;
@@ -1178,7 +1178,7 @@ void ScTabView::MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode
else if (nMovY>0)
nNewY=nPosY+nAddY;
-// aViewData.ResetOldCursor();
+// aViewData.ResetOldCursor();
aViewData.SetOldCursor( nNewX,nNewY );
while (pDoc->IsHorOverlapped( nNewX, nNewY, nTab ))
@@ -1189,7 +1189,7 @@ void ScTabView::MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode
MoveCursorAbs( nNewX, nNewY, eMode, bShift, FALSE, TRUE );
}
-void ScTabView::MoveCursorEnter( BOOL bShift ) // bShift -> hoch/runter
+void ScTabView::MoveCursorEnter( BOOL bShift ) // bShift -> hoch/runter
{
const ScInputOptions& rOpt = SC_MOD()->GetInputOptions();
if (!rOpt.GetMoveSelection())
@@ -1232,7 +1232,7 @@ void ScTabView::MoveCursorEnter( BOOL bShift ) // bShift -> hoch/runter
MoveCursorRel( ((SCsCOL)nNewX)-(SCsCOL)nCurX, ((SCsROW)nNewY)-(SCsROW)nCurY,
SC_FOLLOW_LINE, FALSE, TRUE );
- // update input line even if cursor was not moved
+ // update input line even if cursor was not moved
if ( nNewX == nCurX && nNewY == nCurY )
aViewData.UpdateInputHandler(TRUE);
}
@@ -1240,7 +1240,7 @@ void ScTabView::MoveCursorEnter( BOOL bShift ) // bShift -> hoch/runter
{
if ( nMoveY != 0 && !nMoveX )
{
- // nach Tab und Enter wieder zur Ausgangsspalte
+ // nach Tab und Enter wieder zur Ausgangsspalte
SCCOL nTabCol = aViewData.GetTabStartCol();
if (nTabCol != SC_TABSTART_NONE)
{
@@ -1351,12 +1351,12 @@ void ScTabView::FindNextUnprot( BOOL bShift, BOOL bInSelection )
SCCOL nTabCol = aViewData.GetTabStartCol();
if ( nTabCol == SC_TABSTART_NONE )
- nTabCol = nCurX; // auf diese Spalte zurueck bei Enter
+ nTabCol = nCurX; // auf diese Spalte zurueck bei Enter
MoveCursorRel( ((SCsCOL)nNewX)-(SCsCOL)nCurX, ((SCsROW)nNewY)-(SCsROW)nCurY,
SC_FOLLOW_LINE, FALSE, TRUE );
- // in MoveCursorRel wird die TabCol zurueckgesetzt...
+ // in MoveCursorRel wird die TabCol zurueckgesetzt...
aViewData.SetTabStartCol( nTabCol );
}
@@ -1441,7 +1441,7 @@ void ScTabView::MarkMatrixFormula()
ScRange aMatrix;
if ( pDoc->GetMatrixFormulaRange( aCursor, aMatrix ) )
{
- MarkRange( aMatrix, FALSE ); // cursor is already within the range
+ MarkRange( aMatrix, FALSE ); // cursor is already within the range
}
}
@@ -1470,7 +1470,7 @@ void ScTabView::MarkRange( const ScRange& rRange, BOOL bSetCursor, BOOL bContinu
SCROW nPosY = rRange.aStart.Row();
ScDocument* pDoc = aViewData.GetDocument();
- while (pDoc->IsHorOverlapped( nPosX, nPosY, nTab )) //! ViewData !!!
+ while (pDoc->IsHorOverlapped( nPosX, nPosY, nTab )) //! ViewData !!!
--nPosX;
while (pDoc->IsVerOverlapped( nPosX, nPosY, nTab ))
--nPosY;
@@ -1547,7 +1547,7 @@ void ScTabView::SelectNextTab( short nDir, BOOL bExtendSelection )
}
-// SetTabNo - angezeigte Tabelle
+// SetTabNo - angezeigte Tabelle
void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection )
{
@@ -1559,21 +1559,21 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection )
if ( nTab != aViewData.GetTabNo() || bNew )
{
- // #57724# Die FormShell moechte vor dem Umschalten benachrichtigt werden
+ // #57724# Die FormShell moechte vor dem Umschalten benachrichtigt werden
FmFormShell* pFormSh = aViewData.GetViewShell()->GetFormShell();
if (pFormSh)
{
BOOL bAllowed = sal::static_int_cast<BOOL>( pFormSh->PrepareClose( TRUE ) );
if (!bAllowed)
{
- //! Fehlermeldung? oder macht das die FormShell selber?
- //! Fehler-Flag zurueckgeben und Aktionen abbrechen
+ //! Fehlermeldung? oder macht das die FormShell selber?
+ //! Fehler-Flag zurueckgeben und Aktionen abbrechen
- return; // Die FormShell sagt, es kann nicht umgeschaltet werden
+ return; // Die FormShell sagt, es kann nicht umgeschaltet werden
}
}
- // nicht InputEnterHandler wegen Referenzeingabe !
+ // nicht InputEnterHandler wegen Referenzeingabe !
ScDocument* pDoc = aViewData.GetDocument();
pDoc->MakeTable( nTab );
@@ -1584,7 +1584,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection )
SCTAB nTabCount = pDoc->GetTableCount();
SCTAB nOldPos = nTab;
- while (!pDoc->IsVisible(nTab)) // naechste sichtbare suchen
+ while (!pDoc->IsVisible(nTab)) // naechste sichtbare suchen
{
BOOL bUp = (nTab>=nOldPos);
if (bUp)
@@ -1618,7 +1618,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection )
if ( !bRefMode ) // Abfrage, damit RefMode bei Tabellenwechsel funktioniert
{
DoneBlockMode();
- pSelEngine->Reset(); // reset all flags, including locked modifiers
+ pSelEngine->Reset(); // reset all flags, including locked modifiers
aViewData.SetRefTabNo( nTab );
}
@@ -1626,8 +1626,8 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection )
BOOL bFocus = pGridWin[eOldActive]->HasFocus();
aViewData.SetTabNo( nTab );
- // UpdateShow noch vor SetCursor, damit UpdateAutoFillMark die richtigen
- // Fenster findet (wird aus SetCursor gerufen)
+ // UpdateShow noch vor SetCursor, damit UpdateAutoFillMark die richtigen
+ // Fenster findet (wird aus SetCursor gerufen)
UpdateShow();
aViewData.ResetOldCursor();
SetCursor( aViewData.GetCurX(), aViewData.GetCurY(), TRUE );
@@ -1637,11 +1637,11 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection )
bool bAllSelected = true;
for (SCTAB nSelTab = 0; nSelTab < nTabCount; ++nSelTab)
- {
+ {
if (!pDoc->IsVisible(nSelTab) || rMark.GetTableSelect(nSelTab))
- {
+ {
if (nTab == nSelTab)
- // This tab is already in selection. Keep the current
+ // This tab is already in selection. Keep the current
// selection.
bExtendSelection = true;
}
@@ -1681,9 +1681,9 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection )
pGridWin[i]->UpdateEditViewPos();
}
- TabChanged(); // DrawView
+ TabChanged(); // DrawView
- aViewData.GetViewShell()->WindowChanged(); // falls das aktive Fenster anders ist
+ aViewData.GetViewShell()->WindowChanged(); // falls das aktive Fenster anders ist
if ( !bUnoRefDialog )
aViewData.GetViewShell()->DisconnectAllClients(); // important for floating frames
else
@@ -1721,7 +1721,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection )
if ( bFocus && aViewData.GetActivePart() != eOldActive && !bRefMode )
ActiveGrabFocus(); // grab focus to the pane that's active now
- // Fixierungen
+ // Fixierungen
BOOL bResize = FALSE;
if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX )
@@ -1735,10 +1735,10 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection )
InvalidateSplit();
if ( aViewData.IsPagebreakMode() )
- UpdatePageBreakData(); //! asynchron ??
+ UpdatePageBreakData(); //! asynchron ??
- // #53551# Form-Layer muss den sichtbaren Ausschnitt der neuen Tabelle kennen
- // dafuer muss hier schon der MapMode stimmen
+ // #53551# Form-Layer muss den sichtbaren Ausschnitt der neuen Tabelle kennen
+ // dafuer muss hier schon der MapMode stimmen
for (USHORT i=0; i<4; i++)
if (pGridWin[i])
pGridWin[i]->SetMapMode( pGridWin[i]->GetDrawMapMode() );
@@ -1750,14 +1750,14 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection )
PaintExtras();
DoResize( aBorderPos, aFrameSize );
- rBindings.Invalidate( SID_DELETE_PRINTAREA ); // Menue
+ rBindings.Invalidate( SID_DELETE_PRINTAREA ); // Menue
rBindings.Invalidate( FID_DEL_MANUALBREAKS );
rBindings.Invalidate( FID_RESET_PRINTZOOM );
- rBindings.Invalidate( SID_STATUS_DOCPOS ); // Statusbar
- rBindings.Invalidate( SID_STATUS_PAGESTYLE ); // Statusbar
- rBindings.Invalidate( SID_CURRENTTAB ); // Navigator
- rBindings.Invalidate( SID_STYLE_FAMILY2 ); // Gestalter
- rBindings.Invalidate( SID_STYLE_FAMILY4 ); // Gestalter
+ rBindings.Invalidate( SID_STATUS_DOCPOS ); // Statusbar
+ rBindings.Invalidate( SID_STATUS_PAGESTYLE ); // Statusbar
+ rBindings.Invalidate( SID_CURRENTTAB ); // Navigator
+ rBindings.Invalidate( SID_STYLE_FAMILY2 ); // Gestalter
+ rBindings.Invalidate( SID_STYLE_FAMILY4 ); // Gestalter
rBindings.Invalidate( SID_TABLES_COUNT );
if(pScMod->IsRefDialogOpen())
@@ -1775,7 +1775,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection )
}
//
-// Paint-Funktionen - nur fuer diese View
+// Paint-Funktionen - nur fuer diese View
//
void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW nRow )
@@ -1800,8 +1800,8 @@ void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW
( nCol >= nScrX && nCol <= nScrX + aViewData.VisibleCellsX(eHWhich) + 1 &&
nRow >= nScrY && nRow <= nScrY + aViewData.VisibleCellsY(eVWhich) + 1 );
- // #102421# for the active part, create edit view even if outside the visible area,
- // so input isn't lost (and the edit view may be scrolled into the visible area)
+ // #102421# for the active part, create edit view even if outside the visible area,
+ // so input isn't lost (and the edit view may be scrolled into the visible area)
// #i26433# during spelling, the spelling view must be active
if ( bPosVisible || aViewData.GetActivePart() == (ScSplitPos) i ||
@@ -1822,8 +1822,8 @@ void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW
if ( !bPosVisible )
{
- // move the edit view area to the real (possibly negative) position,
- // or hide if completely above or left of the window
+ // move the edit view area to the real (possibly negative) position,
+ // or hide if completely above or left of the window
pGridWin[i]->UpdateEditViewPos();
}
}
@@ -1893,13 +1893,13 @@ void ScTabView::KillEditView( BOOL bNoPaint )
if (pDrawView)
DrawEnableAnim( TRUE );
- // GrabFocus immer dann, wenn diese View aktiv ist und
- // die Eingabezeile den Focus hat
+ // GrabFocus immer dann, wenn diese View aktiv ist und
+ // die Eingabezeile den Focus hat
BOOL bGrabFocus = FALSE;
if (aViewData.IsActive())
{
- ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl();
+ ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl();
if ( pInputHdl )
{
ScInputWindow* pInputWin = pInputHdl->GetInputWindow();
@@ -1910,13 +1910,13 @@ void ScTabView::KillEditView( BOOL bNoPaint )
if (bGrabFocus)
{
-// So soll es gemacht werden, damit der Sfx es mitbekommt, klappt aber nicht:
-//! aViewData.GetViewShell()->GetViewFrame()->GetWindow().GrabFocus();
-// deshalb erstmal so:
+// So soll es gemacht werden, damit der Sfx es mitbekommt, klappt aber nicht:
+//! aViewData.GetViewShell()->GetViewFrame()->GetWindow().GrabFocus();
+// deshalb erstmal so:
GetActiveWin()->GrabFocus();
}
- // Cursor-Abfrage erst nach GrabFocus
+ // Cursor-Abfrage erst nach GrabFocus
for (i=0; i<4; i++)
if (pGridWin[i] && pGridWin[i]->IsVisible())
@@ -1946,16 +1946,16 @@ void ScTabView::UpdateFormulas()
pGridWin[i]->UpdateFormulas();
if ( aViewData.IsPagebreakMode() )
- UpdatePageBreakData(); //! asynchron
+ UpdatePageBreakData(); //! asynchron
UpdateHeaderWidth();
- // if in edit mode, adjust edit view area because widths/heights may have changed
+ // if in edit mode, adjust edit view area because widths/heights may have changed
if ( aViewData.HasEditView( aViewData.GetActivePart() ) )
UpdateEditView();
}
-// PaintArea -Block neu zeichnen
+// PaintArea -Block neu zeichnen
void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
ScUpdateMode eMode )
@@ -1987,10 +1987,10 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
if (nCol1 < nScrX) nCol1 = nScrX;
if (nCol2 < nScrX)
{
- if ( eMode == SC_UPDATE_ALL ) // #91240# for UPDATE_ALL, paint anyway
- nCol2 = nScrX; // (because of extending strings to the right)
+ if ( eMode == SC_UPDATE_ALL ) // #91240# for UPDATE_ALL, paint anyway
+ nCol2 = nScrX; // (because of extending strings to the right)
else
- bOut = TRUE; // completely outside the window
+ bOut = TRUE; // completely outside the window
}
if (nRow1 < nScrY) nRow1 = nScrY;
if (nRow2 < nScrY) bOut = TRUE;
@@ -2006,7 +2006,7 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
{
if ( eMode == SC_UPDATE_CHANGED )
pGridWin[i]->Draw( nCol1, nRow1, nCol2, nRow2, eMode );
- else // ALL oder MARKS
+ else // ALL oder MARKS
{
BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() );
long nLayoutSign = bLayoutRTL ? -1 : 1;
@@ -2022,26 +2022,26 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
if ( eMode == SC_UPDATE_ALL && nRow2 >= MAXROW )
aEnd.Y() = pGridWin[i]->GetOutputSizePixel().Height();
- BOOL bShowChanges = TRUE; //! ...
+ BOOL bShowChanges = TRUE; //! ...
if (bShowChanges)
{
- aStart.X() -= nLayoutSign; // include change marks
+ aStart.X() -= nLayoutSign; // include change marks
aStart.Y() -= 1;
}
BOOL bMarkClipped = aViewData.GetOptions().GetOption( VOPT_CLIPMARKS );
if (bMarkClipped)
{
- // dazu muesste ScColumn::IsEmptyBlock optimiert werden
- // (auf Search() umstellen)
+ // dazu muesste ScColumn::IsEmptyBlock optimiert werden
+ // (auf Search() umstellen)
//!if ( nCol1 > 0 && !aViewData.GetDocument()->IsBlockEmpty(
- //! aViewData.GetTabNo(),
- //! 0, nRow1, nCol1-1, nRow2 ) )
+ //! aViewData.GetTabNo(),
+ //! 0, nRow1, nCol1-1, nRow2 ) )
{
long nMarkPixel = (long)( SC_CLIPMARK_SIZE * aViewData.GetPPTX() );
aStart.X() -= nMarkPixel * nLayoutSign;
if (!bShowChanges)
- aStart.X() -= nLayoutSign; // cell grid
+ aStart.X() -= nLayoutSign; // cell grid
}
}
@@ -2076,9 +2076,9 @@ void ScTabView::PaintRangeFinder( long nNumber )
if (pData)
{
ScRange aRef = pData->aRef;
- aRef.Justify(); // Justify fuer die Abfragen unten
+ aRef.Justify(); // Justify fuer die Abfragen unten
- if ( aRef.aStart == aRef.aEnd ) //! Tab ignorieren?
+ if ( aRef.aStart == aRef.aEnd ) //! Tab ignorieren?
aViewData.GetDocument()->ExtendMerge(aRef);
if ( aRef.aStart.Tab() >= nTab && aRef.aEnd.Tab() <= nTab )
@@ -2088,8 +2088,8 @@ void ScTabView::PaintRangeFinder( long nNumber )
SCCOL nCol2 = aRef.aEnd.Col();
SCROW nRow2 = aRef.aEnd.Row();
- // wegnehmen -> Repaint
- // SC_UPDATE_MARKS: Invalidate, nicht bis zum Zeilenende
+ // wegnehmen -> Repaint
+ // SC_UPDATE_MARKS: Invalidate, nicht bis zum Zeilenende
BOOL bHiddenEdge = FALSE;
SCROW nTmp;
@@ -2124,13 +2124,13 @@ void ScTabView::PaintRangeFinder( long nNumber )
if ( nCol2 - nCol1 > 1 && nRow2 - nRow1 > 1 && !bHiddenEdge )
{
- // nur an den Raendern entlang
+ // nur an den Raendern entlang
PaintArea( nCol1, nRow1, nCol2, nRow1, SC_UPDATE_MARKS );
PaintArea( nCol1, nRow1+1, nCol1, nRow2-1, SC_UPDATE_MARKS );
PaintArea( nCol2, nRow1+1, nCol2, nRow2-1, SC_UPDATE_MARKS );
PaintArea( nCol1, nRow2, nCol2, nRow2, SC_UPDATE_MARKS );
}
- else // alles am Stueck
+ else // alles am Stueck
PaintArea( nCol1, nRow1, nCol2, nRow2, SC_UPDATE_MARKS );
}
}
@@ -2139,7 +2139,7 @@ void ScTabView::PaintRangeFinder( long nNumber )
}
}
-// fuer Chart-Daten-Markierung
+// fuer Chart-Daten-Markierung
void ScTabView::AddHighlightRange( const ScRange& rRange, const Color& rColor )
{
@@ -2158,7 +2158,7 @@ void ScTabView::ClearHighlightRanges()
if (pHighlightRanges)
{
ScHighlightRanges* pTemp = pHighlightRanges;
- pHighlightRanges = NULL; // Repaint ohne Highlight
+ pHighlightRanges = NULL; // Repaint ohne Highlight
SCTAB nTab = aViewData.GetTabNo();
ULONG nCount = pTemp->Count();
@@ -2201,7 +2201,7 @@ void ScTabView::DoChartSelection(
}
}
-// DrawDragRect - Drag&Drop-Rechteck zeichnen (XOR)
+// DrawDragRect - Drag&Drop-Rechteck zeichnen (XOR)
//UNUSED2008-05 void ScTabView::DrawDragRect( SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY,
//UNUSED2008-05 ScSplitPos ePos )
@@ -2217,7 +2217,7 @@ void ScTabView::DoChartSelection(
//UNUSED2008-05 pGridWin[ePos]->DrawDragRect( nStartX, nStartY, nEndX, nEndY );
//UNUSED2008-05 }
//UNUSED2008-05
-//UNUSED2008-05 // PaintCell - einzelne Zelle neu zeichnen
+//UNUSED2008-05 // PaintCell - einzelne Zelle neu zeichnen
//UNUSED2008-05
//UNUSED2008-05 void ScTabView::PaintCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
//UNUSED2008-05 {
@@ -2241,7 +2241,7 @@ void ScTabView::DoChartSelection(
//UNUSED2008-05 PaintTopArea( nCol, nCol );
//UNUSED2008-05 }
-// PaintGrid - Datenbereiche neu zeichnen
+// PaintGrid - Datenbereiche neu zeichnen
void ScTabView::PaintGrid()
{
@@ -2252,7 +2252,7 @@ void ScTabView::PaintGrid()
pGridWin[i]->Invalidate();
}
-// PaintTop - obere Kontrollelemente neu zeichnen
+// PaintTop - obere Kontrollelemente neu zeichnen
void ScTabView::PaintTop()
{
@@ -2284,22 +2284,22 @@ void ScTabView::CreateAnchorHandles(SdrHdlList& rHdl, const ScAddress& rAddress)
void ScTabView::PaintTopArea( SCCOL nStartCol, SCCOL nEndCol )
{
- // Pixel-Position der linken Kante
+ // Pixel-Position der linken Kante
if ( nStartCol < aViewData.GetPosX(SC_SPLIT_LEFT) ||
nStartCol < aViewData.GetPosX(SC_SPLIT_RIGHT) )
aViewData.RecalcPixPos();
- // Fixierung anpassen (UpdateFixX setzt HSplitPos neu)
+ // Fixierung anpassen (UpdateFixX setzt HSplitPos neu)
if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX && nStartCol < aViewData.GetFixPosX() )
if (aViewData.UpdateFixX())
RepeatResize();
- // zeichnen
+ // zeichnen
if (nStartCol>0)
- --nStartCol; //! allgemeiner ?
+ --nStartCol; //! allgemeiner ?
BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() );
long nLayoutSign = bLayoutRTL ? -1 : 1;
@@ -2325,7 +2325,7 @@ void ScTabView::PaintTopArea( SCCOL nStartCol, SCCOL nEndCol )
}
-// PaintLeft - linke Kontrollelemente neu zeichnen
+// PaintLeft - linke Kontrollelemente neu zeichnen
void ScTabView::PaintLeft()
{
@@ -2341,19 +2341,19 @@ void ScTabView::PaintLeft()
void ScTabView::PaintLeftArea( SCROW nStartRow, SCROW nEndRow )
{
- // Pixel-Position der oberen Kante
+ // Pixel-Position der oberen Kante
if ( nStartRow < aViewData.GetPosY(SC_SPLIT_TOP) ||
nStartRow < aViewData.GetPosY(SC_SPLIT_BOTTOM) )
aViewData.RecalcPixPos();
- // Fixierung anpassen (UpdateFixY setzt VSplitPos neu)
+ // Fixierung anpassen (UpdateFixY setzt VSplitPos neu)
if ( aViewData.GetVSplitMode() == SC_SPLIT_FIX && nStartRow < aViewData.GetFixPosY() )
if (aViewData.UpdateFixY())
RepeatResize();
- // zeichnen
+ // zeichnen
if (nStartRow>0)
--nStartRow;
@@ -2378,13 +2378,13 @@ void ScTabView::PaintLeftArea( SCROW nStartRow, SCROW nEndRow )
}
}
-// InvertBlockMark - Block invertieren
+// InvertBlockMark - Block invertieren
void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY,
SCCOL nEndX, SCROW nEndY)
{
if ( !aViewData.IsActive() )
- return; // invertiert wird nur auf aktiver View
+ return; // invertiert wird nur auf aktiver View
PutInOrder( nStartX, nEndX );
PutInOrder( nStartY, nEndY );
@@ -2396,8 +2396,8 @@ void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY,
if ( pDocSh->GetLockCount() )
{
- // if paint is locked, avoid repeated inverting
- // add repaint areas to paint lock data instead
+ // if paint is locked, avoid repeated inverting
+ // add repaint areas to paint lock data instead
pDocSh->PostPaint( nStartX,nStartY,nTab, nEndX,nEndY,nTab, PAINT_GRID );
return;
}
@@ -2427,7 +2427,7 @@ void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY,
if ( pDoc->IsLayoutRTL( nTab ) )
{
long nTemp = aStartPoint.X();
- aStartPoint.X() = aEndPoint.X() + 1; // +1 - excluding start of nEndX+1
+ aStartPoint.X() = aEndPoint.X() + 1; // +1 - excluding start of nEndX+1
aEndPoint.X() = nTemp;
}
else
@@ -2445,10 +2445,10 @@ void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY,
}
//
- // wenn Controls betroffen, neu malen
+ // wenn Controls betroffen, neu malen
//
- BOOL bHide = TRUE; // wird Teil der Markierung aufgehoben ?
+ BOOL bHide = TRUE; // wird Teil der Markierung aufgehoben ?
if (rMark.IsMarked())
{
ScRange aMarkRange;
@@ -2456,7 +2456,7 @@ void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY,
if ( aMarkRange.aStart.Col() <= nStartX && aMarkRange.aEnd.Col() >= nEndX &&
aMarkRange.aStart.Row() <= nStartY && aMarkRange.aEnd.Row() >= nEndY )
{
- bHide = FALSE; // der ganze Bereich ist markiert
+ bHide = FALSE; // der ganze Bereich ist markiert
}
}
}
@@ -2466,20 +2466,20 @@ BOOL ScTabView::PaintExtras()
BOOL bRet = FALSE;
ScDocument* pDoc = aViewData.GetDocument();
SCTAB nTab = aViewData.GetTabNo();
- if (!pDoc->HasTable(nTab)) // Tabelle geloescht ?
+ if (!pDoc->HasTable(nTab)) // Tabelle geloescht ?
{
SCTAB nCount = pDoc->GetTableCount();
aViewData.SetTabNo(nCount-1);
bRet = TRUE;
}
- pTabControl->UpdateStatus(); // TRUE = active
+ pTabControl->UpdateStatus(); // TRUE = active
return bRet;
}
void ScTabView::RecalcPPT()
{
- // called after changes that require the PPT values to be recalculated
- // (currently from detective operations)
+ // called after changes that require the PPT values to be recalculated
+ // (currently from detective operations)
double nOldX = aViewData.GetPPTX();
double nOldY = aViewData.GetPPTY();
@@ -2490,8 +2490,8 @@ void ScTabView::RecalcPPT()
BOOL bChangedY = ( aViewData.GetPPTY() != nOldY );
if ( bChangedX || bChangedY )
{
- // call view SetZoom (including draw scale, split update etc)
- // and paint only if values changed
+ // call view SetZoom (including draw scale, split update etc)
+ // and paint only if values changed
Fraction aZoomX = aViewData.GetZoomX();
Fraction aZoomY = aViewData.GetZoomY();
@@ -2509,29 +2509,29 @@ void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst )
{
if ( bActivate == aViewData.IsActive() && !bFirst )
{
- // keine Assertion mehr - kommt vor, wenn vorher im Drag&Drop
- // auf ein anderes Dokument umgeschaltet wurde
+ // keine Assertion mehr - kommt vor, wenn vorher im Drag&Drop
+ // auf ein anderes Dokument umgeschaltet wurde
return;
}
// wird nur bei MDI-(De)Activate gerufen
// aViewData.Activate hinten wegen Cursor-Show bei KillEditView
- // Markierung nicht mehr loeschen - wenn an der ViewData Activate(FALSE) gesetzt ist,
- // wird die Markierung nicht ausgegeben
+ // Markierung nicht mehr loeschen - wenn an der ViewData Activate(FALSE) gesetzt ist,
+ // wird die Markierung nicht ausgegeben
if (!bActivate)
{
ScModule* pScMod = SC_MOD();
BOOL bRefMode = pScMod->IsFormulaMode();
- // Referenzeingabe nicht abbrechen, um Referenzen auf
- // andere Dokumente zuzulassen
+ // Referenzeingabe nicht abbrechen, um Referenzen auf
+ // andere Dokumente zuzulassen
if (!bRefMode)
{
//pScMod->InputEnterHandler();
- // #80843# pass view to GetInputHdl, this view may not be current anymore
+ // #80843# pass view to GetInputHdl, this view may not be current anymore
ScInputHandler* pHdl = SC_MOD()->GetInputHdl(aViewData.GetViewShell());
if (pHdl)
pHdl->EnterHandler();
@@ -2542,15 +2542,15 @@ void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst )
aViewData.Activate(bActivate);
- PaintBlock(FALSE); // Repaint, Markierung je nach Active-Status
+ PaintBlock(FALSE); // Repaint, Markierung je nach Active-Status
if (!bActivate)
- HideAllCursors(); // Cursor
+ HideAllCursors(); // Cursor
else if (!bFirst)
ShowAllCursors();
//HMHif (pDrawView)
- //HMH DrawShowMarkHdl(bActivate); // Drawing-Markierung
+ //HMH DrawShowMarkHdl(bActivate); // Drawing-Markierung
if (bActivate)
{
@@ -2569,7 +2569,7 @@ void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst )
if ( pGridWin[i] )
{
eWin = (ScSplitPos) i;
- break; // for
+ break; // for
}
}
DBG_ASSERT( i<4, "und BUMM" );
@@ -2577,9 +2577,9 @@ void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst )
aViewData.SetActivePart( eWin );
}
}
- // hier nicht mehr selber GrabFocus rufen!
- // Wenn das Doc bearbeitet wird, ruft der Sfx selber GrabFocus am Fenster der Shell.
- // Wenn es z.B. ein Mailbody ist, darf es den Focus nicht bekommen (Bug #43638#)
+ // hier nicht mehr selber GrabFocus rufen!
+ // Wenn das Doc bearbeitet wird, ruft der Sfx selber GrabFocus am Fenster der Shell.
+ // Wenn es z.B. ein Mailbody ist, darf es den Focus nicht bekommen (Bug #43638#)
UpdateInputContext();
}
@@ -2596,7 +2596,7 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
BOOL bRefMode = SC_MOD()->IsFormulaMode();
- // #40565# the HasEditView call during SetCursor would fail otherwise
+ // #40565# the HasEditView call during SetCursor would fail otherwise
if ( aViewData.HasEditView(eOld) && !bRefMode )
UpdateInputLine();
@@ -2627,9 +2627,9 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
if ( bCapture || pGridWin[eWhich]->IsMouseCaptured() )
{
- // Tracking statt CaptureMouse, damit sauber abgebrochen werden kann
- // (SelectionEngine ruft CaptureMouse beim SetWindow)
- //! Irgendwann sollte die SelectionEngine selber StartTracking rufen!?!
+ // Tracking statt CaptureMouse, damit sauber abgebrochen werden kann
+ // (SelectionEngine ruft CaptureMouse beim SetWindow)
+ //! Irgendwann sollte die SelectionEngine selber StartTracking rufen!?!
pGridWin[eWhich]->ReleaseMouse();
pGridWin[eWhich]->StartTracking();
}
@@ -2660,16 +2660,16 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
SfxInPlaceClient* pClient = aViewData.GetViewShell()->GetIPClient();
BOOL bOleActive = ( pClient && pClient->IsObjectInPlaceActive() );
- // #103823# don't switch ViewShell's active window during RefInput, because the focus
- // might change, and subsequent SetReference calls wouldn't find the right EditView
+ // #103823# don't switch ViewShell's active window during RefInput, because the focus
+ // might change, and subsequent SetReference calls wouldn't find the right EditView
if ( !bRefMode && !bOleActive )
aViewData.GetViewShell()->SetWindow( pGridWin[eWhich] );
if ( bFocus && !aViewData.IsAnyFillMode() && !bRefMode )
{
- // GrabFocus nur, wenn vorher das andere GridWindow den Focus hatte
- // (z.B. wegen Suchen & Ersetzen)
-//! aViewData.GetViewShell()->GetViewFrame()->GetWindow().GrabFocus();
+ // GrabFocus nur, wenn vorher das andere GridWindow den Focus hatte
+ // (z.B. wegen Suchen & Ersetzen)
+//! aViewData.GetViewShell()->GetViewFrame()->GetWindow().GrabFocus();
pGridWin[eWhich]->GrabFocus();
}
@@ -2691,7 +2691,7 @@ void ScTabView::UpdateInputContext()
pWin->UpdateInputContext();
}
-// GetGridWidth - Breite eines Ausgabebereichs (fuer ViewData)
+// GetGridWidth - Breite eines Ausgabebereichs (fuer ViewData)
long ScTabView::GetGridWidth( ScHSplitPos eWhich )
{
@@ -2702,7 +2702,7 @@ long ScTabView::GetGridWidth( ScHSplitPos eWhich )
return 0;
}
-// GetGridHeight - Hoehe eines Ausgabebereichs (fuer ViewData)
+// GetGridHeight - Hoehe eines Ausgabebereichs (fuer ViewData)
long ScTabView::GetGridHeight( ScVSplitPos eWhich )
{
@@ -2728,7 +2728,7 @@ void ScTabView::ZoomChanged()
UpdateScrollBars();
- // VisArea...
+ // VisArea...
// AW: Discussed with NN if there is a reason that new map mode was only set for one window,
// but is not. Setting only on one window causes the first repaint to have the old mapMode
// in three of four views, so the overlay will save the wrong content e.g. when zooming out.
@@ -2749,11 +2749,11 @@ void ScTabView::ZoomChanged()
ScGridWindow* pWin = pGridWin[aViewData.GetActivePart()];
if (pWin)
{
- pWin->SetMapMode( pWin->GetDrawMapMode() ); // mit neuem Zoom
- SetNewVisArea(); // benutzt den gesetzten MapMode
+ pWin->SetMapMode( pWin->GetDrawMapMode() ); // mit neuem Zoom
+ SetNewVisArea(); // benutzt den gesetzten MapMode
} */
- InterpretVisible(); // #69343# have everything calculated before painting
+ InterpretVisible(); // #69343# have everything calculated before painting
SfxBindings& rBindings = aViewData.GetBindings();
rBindings.Invalidate( SID_ATTR_ZOOM );
@@ -2769,8 +2769,8 @@ void ScTabView::ZoomChanged()
// flush OverlayManager before changing the MapMode
pWin->flushOverlayManager();
- // #93650# make sure the EditView's position and size are updated
- // with the right (logic, not drawing) MapMode
+ // #93650# make sure the EditView's position and size are updated
+ // with the right (logic, not drawing) MapMode
pWin->SetMapMode( aViewData.GetLogicMode() );
UpdateEditView();
}
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index abbc0224704e..0eb88511c359 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +46,14 @@
#include "cell.hxx"
#include "dociter.hxx"
-extern USHORT nScFillModeMouseModifier; // global.cxx
+extern USHORT nScFillModeMouseModifier; // global.cxx
// STATIC DATA -----------------------------------------------------------
//==================================================================
//
-// --- Referenz-Eingabe / Fill-Cursor
+// --- Referenz-Eingabe / Fill-Cursor
//
void ScTabView::HideTip()
@@ -74,7 +74,7 @@ void ScTabView::ShowRefTip()
SCROW nStartY = aViewData.GetRefStartY();
SCCOL nEndX = aViewData.GetRefEndX();
SCROW nEndY = aViewData.GetRefEndY();
- if ( nEndX != nStartX || nEndY != nStartY ) // nicht fuer einzelne Zelle
+ if ( nEndX != nStartX || nEndY != nStartY ) // nicht fuer einzelne Zelle
{
BOOL bLeft = ( nEndX < nStartX );
BOOL bTop = ( nEndY < nStartY );
@@ -105,14 +105,14 @@ void ScTabView::ShowRefTip()
if ( !bTop && aViewData.HasEditView( eWhich ) &&
nEndY+1 == aViewData.GetEditViewRow() )
{
- // dann an der oberen Kante der editierten Zelle ausrichten
- aPos.Y() -= 2; // die 3 von oben
+ // dann an der oberen Kante der editierten Zelle ausrichten
+ aPos.Y() -= 2; // die 3 von oben
nFlags = ( nFlags & ~QUICKHELP_TOP ) | QUICKHELP_BOTTOM;
}
Rectangle aRect( pWin->OutputToScreenPixel( aPos ), Size(1,1) );
- //! Test, ob geaendert ??
+ //! Test, ob geaendert ??
HideTip();
nTipVisible = Help::ShowTip( pWin, aRect, aHelp, nFlags );
@@ -149,7 +149,7 @@ void ScTabView::StopRefMode()
}
pSelEngine->Reset();
- pSelEngine->SetAddMode( FALSE ); //! sollte das nicht bei Reset passieren?
+ pSelEngine->SetAddMode( FALSE ); //! sollte das nicht bei Reset passieren?
ScSplitPos eOld = pSelEngine->GetWhich();
ScSplitPos eNew = aViewData.GetActivePart();
@@ -163,11 +163,11 @@ void ScTabView::StopRefMode()
}
}
- // AlignToCursor(SC_FOLLOW_NONE): Only switch active part.
- // This must also be done if no RefMode was active (for RangeFinder dragging),
- // but if RefMode was set, AlignToCursor must be after SelectionEngine reset,
- // so the SelectionEngine SetWindow call from AlignToCursor doesn't capture
- // the mouse again when called from Tracking/MouseButtonUp (#94562#).
+ // AlignToCursor(SC_FOLLOW_NONE): Only switch active part.
+ // This must also be done if no RefMode was active (for RangeFinder dragging),
+ // but if RefMode was set, AlignToCursor must be after SelectionEngine reset,
+ // so the SelectionEngine SetWindow call from AlignToCursor doesn't capture
+ // the mouse again when called from Tracking/MouseButtonUp (#94562#).
AlignToCursor( aViewData.GetCurX(), aViewData.GetCurY(), SC_FOLLOW_NONE );
}
@@ -183,7 +183,7 @@ void ScTabView::DoneRefMode( BOOL bContinue )
HideTip();
UpdateShrinkOverlay();
- // Paint:
+ // Paint:
if ( bWasRef && aViewData.GetTabNo() >= aViewData.GetRefStartZ() &&
aViewData.GetTabNo() <= aViewData.GetRefEndZ() )
{
@@ -204,8 +204,8 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ )
if (!aViewData.IsRefMode())
{
- // Das kommt vor, wenn bei einem Referenz-Dialog als erstes mit Control in die
- // die Tabelle geklickt wird. Dann die neue Referenz an den alten Inhalt anhaengen:
+ // Das kommt vor, wenn bei einem Referenz-Dialog als erstes mit Control in die
+ // die Tabelle geklickt wird. Dann die neue Referenz an den alten Inhalt anhaengen:
ScModule* pScMod = SC_MOD();
if (pScMod->IsFormulaMode())
@@ -265,7 +265,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ )
PaintArea( nPaintStartX, nPaintStartY, nPaintEndX, nPaintEndY, SC_UPDATE_MARKS );
}
- // Tip-Hilfe fuer Auto-Fill
+ // Tip-Hilfe fuer Auto-Fill
if ( aViewData.GetRefType() == SC_REFTYPE_FILL && Help::IsQuickHelpEnabled() )
{
@@ -278,7 +278,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ )
if ( aViewData.GetFillMode() == SC_FILL_MATRIX && !(nScFillModeMouseModifier & KEY_MOD1) )
{
aHelpStr = ScGlobal::GetRscString( STR_TIP_RESIZEMATRIX );
- SCCOL nCols = nEndX + 1 - aViewData.GetRefStartX(); // Reihenfolge ist richtig
+ SCCOL nCols = nEndX + 1 - aViewData.GetRefStartX(); // Reihenfolge ist richtig
SCROW nRows = nEndY + 1 - aViewData.GetRefStartY();
aHelpStr.SearchAndReplace( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("%1")),
String::CreateFromInt32(nRows) );
@@ -290,7 +290,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ )
else if ( nEndX != aMarkRange.aEnd.Col() || nEndY != aMarkRange.aEnd.Row() )
aHelpStr = pDoc->GetAutoFillPreview( aMarkRange, nEndX, nEndY );
- // je nach Richtung die obere oder untere Ecke:
+ // je nach Richtung die obere oder untere Ecke:
SCCOL nAddX = ( nEndX >= aMarkRange.aEnd.Col() ) ? 1 : 0;
SCROW nAddY = ( nEndY >= aMarkRange.aEnd.Row() ) ? 1 : 0;
Point aPos = aViewData.GetScrPos( nEndX+nAddX, nEndY+nAddY, aViewData.GetActivePart() );
@@ -323,10 +323,10 @@ void ScTabView::InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eT
SCROW nEndY = nCurY;
pDoc->ExtendMerge( nStartX, nStartY, nEndX, nEndY, aViewData.GetTabNo() );
- //! nur Markierung ueber Inhalte zeichnen!
+ //! nur Markierung ueber Inhalte zeichnen!
PaintArea( nStartX,nStartY,nEndX,nEndY, SC_UPDATE_MARKS );
- // SetReference ohne Merge-Anpassung
+ // SetReference ohne Merge-Anpassung
ScRange aRef( nCurX,nCurY,nCurZ, nCurX,nCurY,nCurZ );
SC_MOD()->SetReference( aRef, pDoc, &rMark );
}
@@ -347,9 +347,9 @@ void ScTabView::SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible,
if ( nVisible == 0 )
nVisible = 1; // #i59893# don't use visible size 0
- // RTL layout uses a negative range to simulate a mirrored scroll bar.
- // SetScrollBar/GetScrollBarPos hide this so outside of these functions normal cell
- // addresses can be used.
+ // RTL layout uses a negative range to simulate a mirrored scroll bar.
+ // SetScrollBar/GetScrollBarPos hide this so outside of these functions normal cell
+ // addresses can be used.
if ( bLayoutRTL )
{
@@ -374,9 +374,9 @@ long ScTabView::GetScrollBarPos( ScrollBar& rScroll, BOOL bLayoutRTL )
return rScroll.GetThumbPos();
}
-// UpdateScrollBars - sichtbaren Bereich und Scrollweite der Scrollbars einstellen
+// UpdateScrollBars - sichtbaren Bereich und Scrollweite der Scrollbars einstellen
-long lcl_UpdateBar( ScrollBar& rScroll, SCCOLROW nSize ) // Size = (komplette) Zellen
+long lcl_UpdateBar( ScrollBar& rScroll, SCCOLROW nSize ) // Size = (komplette) Zellen
{
long nOldPos;
long nNewPos;
@@ -385,7 +385,7 @@ long lcl_UpdateBar( ScrollBar& rScroll, SCCOLROW nSize ) // Size = (kompl
rScroll.SetPageSize( static_cast<long>(nSize) );
nNewPos = rScroll.GetThumbPos();
#ifndef UNX
- rScroll.SetPageSize( 1 ); // immer moeglich !
+ rScroll.SetPageSize( 1 ); // immer moeglich !
#endif
return nNewPos - nOldPos;
@@ -396,25 +396,25 @@ long lcl_GetScrollRange( SCCOLROW nDocEnd, SCCOLROW nPos, SCCOLROW nVis, SCCOLRO
// get the end (positive) of a scroll bar range that always starts at 0
++nVis;
- ++nMax; // for partially visible cells
+ ++nMax; // for partially visible cells
SCCOLROW nEnd = Max(nDocEnd, (SCCOLROW)(nPos+nVis)) + nVis;
if (nEnd > nMax)
nEnd = nMax;
- return ( nEnd - nStart ); // for range starting at 0
+ return ( nEnd - nStart ); // for range starting at 0
}
void ScTabView::UpdateScrollBars()
{
- long nDiff;
- BOOL bTop = ( aViewData.GetVSplitMode() != SC_SPLIT_NONE );
- BOOL bRight = ( aViewData.GetHSplitMode() != SC_SPLIT_NONE );
- ScDocument* pDoc = aViewData.GetDocument();
- SCTAB nTab = aViewData.GetTabNo();
+ long nDiff;
+ BOOL bTop = ( aViewData.GetVSplitMode() != SC_SPLIT_NONE );
+ BOOL bRight = ( aViewData.GetHSplitMode() != SC_SPLIT_NONE );
+ ScDocument* pDoc = aViewData.GetDocument();
+ SCTAB nTab = aViewData.GetTabNo();
BOOL bMirror = pDoc->IsLayoutRTL( nTab ) != Application::GetSettings().GetLayoutRTL();
- SCCOL nUsedX;
- SCROW nUsedY;
- pDoc->GetTableArea( nTab, nUsedX, nUsedY ); //! cachen !!!!!!!!!!!!!!!
+ SCCOL nUsedX;
+ SCROW nUsedY;
+ pDoc->GetTableArea( nTab, nUsedX, nUsedY ); //! cachen !!!!!!!!!!!!!!!
SCCOL nVisXL = 0;
SCCOL nVisXR = 0;
@@ -450,7 +450,7 @@ void ScTabView::UpdateScrollBars()
SetScrollBar( aVScrollTop, nMaxYT, nVisYT, aViewData.GetPosY( SC_SPLIT_TOP ), FALSE );
}
- // Bereich testen
+ // Bereich testen
nDiff = lcl_UpdateBar( aHScrollLeft, nVisXL );
if (nDiff) ScrollX( nDiff, SC_SPLIT_LEFT );
@@ -468,7 +468,7 @@ void ScTabView::UpdateScrollBars()
if (nDiff) ScrollY( nDiff, SC_SPLIT_TOP );
}
- // set visible area for online spelling
+ // set visible area for online spelling
if ( aViewData.IsActive() )
{
@@ -483,12 +483,12 @@ void ScTabView::UpdateScrollBars()
if ( nEndY > MAXROW ) nEndY = MAXROW;
ScRange aVisible( nPosX, nPosY, nTab, nEndX, nEndY, nTab );
if ( pDoc->SetVisibleSpellRange( aVisible ) )
- SC_MOD()->AnythingChanged(); // if visible area has changed
+ SC_MOD()->AnythingChanged(); // if visible area has changed
}
}
#ifndef HDR_SLIDERSIZE
-#define HDR_SLIDERSIZE 2
+#define HDR_SLIDERSIZE 2
#endif
void ScTabView::InvertHorizontal( ScVSplitPos eWhich, long nDragPos )
@@ -501,7 +501,7 @@ void ScTabView::InvertHorizontal( ScVSplitPos eWhich, long nDragPos )
{
Rectangle aRect( 0,nDragPos, pWin->GetOutputSizePixel().Width()-1,nDragPos+HDR_SLIDERSIZE-1 );
pWin->Update();
- pWin->DoInvertRect( aRect ); // Pixel
+ pWin->DoInvertRect( aRect ); // Pixel
}
}
}
@@ -516,7 +516,7 @@ void ScTabView::InvertVertical( ScHSplitPos eWhich, long nDragPos )
{
Rectangle aRect( nDragPos,0, nDragPos+HDR_SLIDERSIZE-1,pWin->GetOutputSizePixel().Height()-1 );
pWin->Update();
- pWin->DoInvertRect( aRect ); // Pixel
+ pWin->DoInvertRect( aRect ); // Pixel
}
}
}
@@ -525,8 +525,8 @@ void ScTabView::InvertVertical( ScHSplitPos eWhich, long nDragPos )
void ScTabView::InterpretVisible()
{
- // make sure all visible cells are interpreted,
- // so the next paint will not execute a macro function
+ // make sure all visible cells are interpreted,
+ // so the next paint will not execute a macro function
ScDocument* pDoc = aViewData.GetDocument();
if ( !pDoc->GetAutoCalc() )
@@ -535,18 +535,18 @@ void ScTabView::InterpretVisible()
SCTAB nTab = aViewData.GetTabNo();
for (USHORT i=0; i<4; i++)
{
- // rely on gridwin pointers to find used panes
- // no IsVisible test in case the whole view is not yet shown
+ // rely on gridwin pointers to find used panes
+ // no IsVisible test in case the whole view is not yet shown
if (pGridWin[i])
{
ScHSplitPos eHWhich = WhichH( ScSplitPos(i) );
ScVSplitPos eVWhich = WhichV( ScSplitPos(i) );
- SCCOL nX1 = aViewData.GetPosX( eHWhich );
- SCROW nY1 = aViewData.GetPosY( eVWhich );
- SCCOL nX2 = nX1 + aViewData.VisibleCellsX( eHWhich );
- SCROW nY2 = nY1 + aViewData.VisibleCellsY( eVWhich );
+ SCCOL nX1 = aViewData.GetPosX( eHWhich );
+ SCROW nY1 = aViewData.GetPosY( eVWhich );
+ SCCOL nX2 = nX1 + aViewData.VisibleCellsX( eHWhich );
+ SCROW nY2 = nY1 + aViewData.VisibleCellsY( eVWhich );
if (nX2 > MAXCOL) nX2 = MAXCOL;
if (nY2 > MAXROW) nY2 = MAXROW;
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index f0ac3fc42869..a42ff860f08c 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,31 +118,31 @@ void __EXPORT ScTabView::Init()
explicitly because the parent frame window is already RTL disabled. */
pTabControl->EnableRTL( Application::GetSettings().GetLayoutRTL() );
- InitScrollBar( aHScrollLeft, MAXCOL+1 );
- InitScrollBar( aHScrollRight, MAXCOL+1 );
- InitScrollBar( aVScrollTop, MAXROW+1 );
- InitScrollBar( aVScrollBottom, MAXROW+1 );
+ InitScrollBar( aHScrollLeft, MAXCOL+1 );
+ InitScrollBar( aHScrollRight, MAXCOL+1 );
+ InitScrollBar( aVScrollTop, MAXROW+1 );
+ InitScrollBar( aVScrollBottom, MAXROW+1 );
/* #i97900# scrollbars remain in correct RTL mode, needed mirroring etc.
is now handled correctly at the respective places. */
- // Hier noch nichts anzeigen (Show), weil noch falsch angeordnet ist
- // Show kommt dann aus UpdateShow beim ersten Resize
- // pTabControl, pGridWin, aHScrollLeft, aVScrollBottom,
- // aCornerButton, aScrollBarBox, pHSplitter, pVSplitter
+ // Hier noch nichts anzeigen (Show), weil noch falsch angeordnet ist
+ // Show kommt dann aus UpdateShow beim ersten Resize
+ // pTabControl, pGridWin, aHScrollLeft, aVScrollBottom,
+ // aCornerButton, aScrollBarBox, pHSplitter, pVSplitter
- // Splitter
+ // Splitter
pHSplitter->SetSplitHdl( LINK( this, ScTabView, SplitHdl ) );
pVSplitter->SetSplitHdl( LINK( this, ScTabView, SplitHdl ) );
- // UpdateShow kommt beim Resize, oder bei Kopie einer bestehenden View aus dem ctor
+ // UpdateShow kommt beim Resize, oder bei Kopie einer bestehenden View aus dem ctor
pDrawActual = NULL;
- pDrawOld = NULL;
+ pDrawOld = NULL;
- // DrawView darf nicht im TabView - ctor angelegt werden,
- // wenn die ViewShell noch nicht konstruiert ist...
- // Das gilt auch fuer ViewOptionsHasChanged()
+ // DrawView darf nicht im TabView - ctor angelegt werden,
+ // wenn die ViewShell noch nicht konstruiert ist...
+ // Das gilt auch fuer ViewOptionsHasChanged()
TestHintWindow();
}
@@ -151,14 +151,14 @@ __EXPORT ScTabView::~ScTabView()
{
USHORT i;
- // remove selection object
+ // remove selection object
ScModule* pScMod = SC_MOD();
ScSelectionTransferObj* pOld = pScMod->GetSelectionTransfer();
if ( pOld && pOld->GetView() == this )
{
pOld->ForgetView();
pScMod->SetSelectionTransfer( NULL );
- TransferableHelper::ClearSelection( GetActiveWin() ); // may delete pOld
+ TransferableHelper::ClearSelection( GetActiveWin() ); // may delete pOld
}
DELETEZ(pBrushDocument);
@@ -170,7 +170,7 @@ __EXPORT ScTabView::~ScTabView()
DELETEZ(pDrawOld);
DELETEZ(pDrawActual);
- aViewData.KillEditView(); // solange GridWin's noch existieren
+ aViewData.KillEditView(); // solange GridWin's noch existieren
DELETEZ(pInputHintWindow);
@@ -230,19 +230,19 @@ void ScTabView::MakeDrawView( BYTE nForceDesignMode )
{
pGridWin[i]->SetMapMode(pGridWin[i]->GetDrawMapMode());
- pGridWin[i]->Update(); // wegen Invalidate im DrawView ctor (ShowPage),
+ pGridWin[i]->Update(); // wegen Invalidate im DrawView ctor (ShowPage),
// damit gleich gezeichnet werden kann
}
SfxRequest aSfxRequest(SID_OBJECT_SELECT, 0,aViewData.GetViewShell()->GetPool());
SetDrawFuncPtr(new FuSelection( aViewData.GetViewShell(), GetActiveWin(), pDrawView,
pLayer,aSfxRequest));
- // #106334# used when switching back from page preview: restore saved design mode state
- // (otherwise, keep the default from the draw view ctor)
+ // #106334# used when switching back from page preview: restore saved design mode state
+ // (otherwise, keep the default from the draw view ctor)
if ( nForceDesignMode != SC_FORCEMODE_NONE )
pDrawView->SetDesignMode( (BOOL)nForceDesignMode );
- // an der FormShell anmelden
+ // an der FormShell anmelden
FmFormShell* pFormSh = aViewData.GetViewShell()->GetFormShell();
if (pFormSh)
pFormSh->SetView(pDrawView);
@@ -271,12 +271,12 @@ void ScTabView::TabChanged()
{
if (pDrawView)
{
- DrawDeselectAll(); // beendet auch Text-Edit-Modus
+ DrawDeselectAll(); // beendet auch Text-Edit-Modus
USHORT i;
for (i=0; i<4; i++)
if (pGridWin[i])
- pDrawView->VCRemoveWin(pGridWin[i]); // fuer alte Page
+ pDrawView->VCRemoveWin(pGridWin[i]); // fuer alte Page
SCTAB nTab = aViewData.GetTabNo();
pDrawView->HideSdrPage();
@@ -285,17 +285,17 @@ void ScTabView::TabChanged()
UpdateLayerLocks();
pDrawView->RecalcScale();
- pDrawView->UpdateWorkArea(); // #54782# PageSize ist pro Page unterschiedlich
+ pDrawView->UpdateWorkArea(); // #54782# PageSize ist pro Page unterschiedlich
for (i=0; i<4; i++)
if (pGridWin[i])
- pDrawView->VCAddWin(pGridWin[i]); // fuer neue Page
+ pDrawView->VCAddWin(pGridWin[i]); // fuer neue Page
}
SfxBindings& rBindings = aViewData.GetBindings();
- // Es gibt keine einfache Moeglichkeit, alle Slots der FormShell zu invalidieren
- // (fuer disablete Slots auf geschuetzten Tabellen), darum hier einfach alles...
+ // Es gibt keine einfache Moeglichkeit, alle Slots der FormShell zu invalidieren
+ // (fuer disablete Slots auf geschuetzten Tabellen), darum hier einfach alles...
rBindings.InvalidateAll(FALSE);
#if 0
@@ -313,7 +313,7 @@ void ScTabView::TabChanged()
rBindings.Invalidate( FID_INS_ROW );
rBindings.Invalidate( FID_INS_COLUMN );
rBindings.Invalidate( FID_INS_CELL );
- rBindings.Invalidate( FID_INS_CELLSDOWN );
+ rBindings.Invalidate( FID_INS_CELLSDOWN );
rBindings.Invalidate( FID_INS_CELLSRIGHT );
rBindings.Invalidate( FID_DELETE_CELL );
@@ -429,7 +429,7 @@ void ScTabView::SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll
aViewData.SetZoom( rNewX, rNewY, bAll );
if (pDrawView)
pDrawView->RecalcScale();
- ZoomChanged(); // einzeln wegen CLOOKs
+ ZoomChanged(); // einzeln wegen CLOOKs
}
void ScTabView::RefreshZoom()
@@ -445,7 +445,7 @@ void ScTabView::SetPagebreakMode( BOOL bSet )
aViewData.SetPagebreakMode(bSet);
if (pDrawView)
pDrawView->RecalcScale();
- ZoomChanged(); // einzeln wegen CLOOKs
+ ZoomChanged(); // einzeln wegen CLOOKs
}
void ScTabView::ResetDrawDragMode()
@@ -456,7 +456,7 @@ void ScTabView::ResetDrawDragMode()
void ScTabView::ViewOptionsHasChanged( BOOL bHScrollChanged, BOOL bGraphicsChanged )
{
- // DrawView erzeugen, wenn Gitter angezeigt werden soll
+ // DrawView erzeugen, wenn Gitter angezeigt werden soll
if ( !pDrawView && aViewData.GetOptions().GetGridOptions().GetGridVisible() )
MakeDrawLayer();
@@ -464,7 +464,7 @@ void ScTabView::ViewOptionsHasChanged( BOOL bHScrollChanged, BOOL bGraphicsChang
pDrawView->UpdateUserViewOptions();
if (bGraphicsChanged)
- DrawEnableAnim(TRUE); // DrawEnableAnim checks the options state
+ DrawEnableAnim(TRUE); // DrawEnableAnim checks the options state
// if TabBar is set to visible, make sure its size is not 0
BOOL bGrow = ( aViewData.IsTabMode() && pTabControl->GetSizePixel().Width() <= 0 );
@@ -476,8 +476,8 @@ void ScTabView::ViewOptionsHasChanged( BOOL bHScrollChanged, BOOL bGraphicsChang
if ( bGrow || bShrink )
{
Size aSize = pTabControl->GetSizePixel();
- aSize.Width() = SC_TABBAR_DEFWIDTH; // initial size
- pTabControl->SetSizePixel(aSize); // DoResize is called later...
+ aSize.Width() = SC_TABBAR_DEFWIDTH; // initial size
+ pTabControl->SetSizePixel(aSize); // DoResize is called later...
}
}
@@ -508,7 +508,7 @@ void ScTabView::UpdateIMap( SdrObject* pObj )
void ScTabView::DrawMarkRect( const Rectangle& rRect )
{
- //! store rectangle for repaint during drag
+ //! store rectangle for repaint during drag
for (USHORT i=0; i<4; i++)
{
@@ -516,7 +516,7 @@ void ScTabView::DrawMarkRect( const Rectangle& rRect )
{
RasterOp aROp = pGridWin[i]->GetRasterOp();
BOOL bHasLine = pGridWin[i]->IsLineColor();
- Color aLine = pGridWin[i]->GetLineColor();
+ Color aLine = pGridWin[i]->GetLineColor();
BOOL bHasFill = pGridWin[i]->IsFillColor();
Color aFill = pGridWin[i]->GetFillColor();
@@ -544,15 +544,15 @@ void ScTabView::DrawEnableAnim(BOOL bSet)
USHORT i;
if ( pDrawView )
{
- // #71040# dont start animations if display of graphics is disabled
- // graphics are controlled by VOBJ_TYPE_OLE
+ // #71040# dont start animations if display of graphics is disabled
+ // graphics are controlled by VOBJ_TYPE_OLE
if ( bSet && aViewData.GetOptions().GetObjMode(VOBJ_TYPE_OLE) == VOBJ_MODE_SHOW )
{
if ( !pDrawView->IsAnimationEnabled() )
{
pDrawView->SetAnimationEnabled(TRUE);
- // Animierte GIFs muessen wieder gestartet werden:
+ // Animierte GIFs muessen wieder gestartet werden:
ScDocument* pDoc = aViewData.GetDocument();
for (i=0; i<4; i++)
if ( pGridWin[i] && pGridWin[i]->IsVisible() )
@@ -569,15 +569,15 @@ void ScTabView::DrawEnableAnim(BOOL bSet)
//HMHvoid ScTabView::DrawShowMarkHdl(BOOL bShow)
//HMH{
//HMHif (!pDrawView)
- //HMH return;
+ //HMH return;
//HMHif (bShow)
//HMH{
- //HMH if (!pDrawView->IsDisableHdl())
- //HMH pDrawView->ShowMarkHdl();
+ //HMH if (!pDrawView->IsDisableHdl())
+ //HMH pDrawView->ShowMarkHdl();
//HMH}
//HMHelse
- //HMH pDrawView->HideMarkHdl();
+ //HMH pDrawView->HideMarkHdl();
//HMH}
void ScTabView::UpdateDrawTextOutliner()
@@ -614,25 +614,25 @@ void ScTabView::MakeVisible( const Rectangle& rHMMRect )
Rectangle aRect = pWin->LogicToPixel( rHMMRect );
- long nScrollX=0, nScrollY=0; // Pixel
+ long nScrollX=0, nScrollY=0; // Pixel
- if ( aRect.Right() >= aWinSize.Width() ) // rechts raus
+ if ( aRect.Right() >= aWinSize.Width() ) // rechts raus
{
- nScrollX = aRect.Right() - aWinSize.Width() + 1; // rechter Rand sichtbar
+ nScrollX = aRect.Right() - aWinSize.Width() + 1; // rechter Rand sichtbar
if ( aRect.Left() < nScrollX )
- nScrollX = aRect.Left(); // links sichtbar (falls zu gross)
+ nScrollX = aRect.Left(); // links sichtbar (falls zu gross)
}
- if ( aRect.Bottom() >= aWinSize.Height() ) // unten raus
+ if ( aRect.Bottom() >= aWinSize.Height() ) // unten raus
{
- nScrollY = aRect.Bottom() - aWinSize.Height() + 1; // unterer Rand sichtbar
+ nScrollY = aRect.Bottom() - aWinSize.Height() + 1; // unterer Rand sichtbar
if ( aRect.Top() < nScrollY )
- nScrollY = aRect.Top(); // oben sichtbar (falls zu gross)
+ nScrollY = aRect.Top(); // oben sichtbar (falls zu gross)
}
- if ( aRect.Left() < 0 ) // links raus
- nScrollX = aRect.Left(); // linker Rand sichtbar
- if ( aRect.Top() < 0 ) // oben raus
- nScrollY = aRect.Top(); // oberer Rand sichtbar
+ if ( aRect.Left() < 0 ) // links raus
+ nScrollX = aRect.Left(); // linker Rand sichtbar
+ if ( aRect.Top() < 0 ) // oben raus
+ nScrollY = aRect.Top(); // oberer Rand sichtbar
if (nScrollX || nScrollY)
{
@@ -646,7 +646,7 @@ void ScTabView::MakeVisible( const Rectangle& rHMMRect )
SCCOL nPosX = aViewData.GetPosX(WhichH(eWhich));
SCROW nPosY = aViewData.GetPosY(WhichV(eWhich));
- long nLinesX=0, nLinesY=0; // Spalten/Zeilen - um mindestens nScrollX/Y scrollen
+ long nLinesX=0, nLinesY=0; // Spalten/Zeilen - um mindestens nScrollX/Y scrollen
if (nScrollX > 0)
while (nScrollX > 0 && nPosX < MAXCOL)
@@ -678,7 +678,7 @@ void ScTabView::MakeVisible( const Rectangle& rHMMRect )
--nLinesY;
}
- ScrollLines( nLinesX, nLinesY ); // ausfuehren
+ ScrollLines( nLinesX, nLinesY ); // ausfuehren
}
}
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 1733cf2e19b5..ebeeb76a6dc5 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#define ScTabViewShell
#include "scslots.hxx"
-#define SearchSettings
+#define SearchSettings
#include <svx/svxslots.hxx>
TYPEINIT2(ScTabViewShell,SfxViewShell,SfxListener);
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index ca47535ad2cf..7b4bc6899dfb 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
SdrView* __EXPORT ScTabViewShell::GetDrawView() const
{
- return ((ScTabViewShell*)this)->GetScDrawView(); // GetScDrawView ist nicht-const
+ return ((ScTabViewShell*)this)->GetScDrawView(); // GetScDrawView ist nicht-const
}
void ScTabViewShell::WindowChanged()
@@ -83,12 +83,12 @@ void ScTabViewShell::WindowChanged()
if (pDrView)
pDrView->SetActualWin(pWin);
- FuPoor* pFunc = GetDrawFuncPtr();
+ FuPoor* pFunc = GetDrawFuncPtr();
if (pFunc)
pFunc->SetWindow(pWin);
- // when font from InputContext is used,
- // this must be moved to change of cursor position:
+ // when font from InputContext is used,
+ // this must be moved to change of cursor position:
UpdateInputContext();
}
@@ -102,9 +102,9 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
ScTabView* pTabView = GetViewData()->GetView();
SfxBindings& rBindings = GetViewFrame()->GetBindings();
- Window* pWin = pTabView->GetActiveWin();
- ScDrawView* pView = pTabView->GetScDrawView();
- SdrModel* pDoc = pView->GetModel();
+ Window* pWin = pTabView->GetActiveWin();
+ ScDrawView* pView = pTabView->GetScDrawView();
+ SdrModel* pDoc = pView->GetModel();
const SfxItemSet *pArgs = rReq.GetArgs();
USHORT nNewId = rReq.GetSlot();
@@ -117,8 +117,8 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
}
//
- // Pseudo-Slots von Draw-Toolbox auswerten
- //! wird das ueberhaupt noch gebraucht ?????
+ // Pseudo-Slots von Draw-Toolbox auswerten
+ //! wird das ueberhaupt noch gebraucht ?????
//
if (nNewId == SID_INSERT_DRAW && pArgs)
@@ -130,20 +130,20 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
SvxDrawToolEnum eSel = (SvxDrawToolEnum)((const SvxDrawToolItem*)pItem)->GetValue();
switch (eSel)
{
- case SVX_SNAP_DRAW_SELECT: nNewId = SID_OBJECT_SELECT; break;
- case SVX_SNAP_DRAW_LINE: nNewId = SID_DRAW_LINE; break;
- case SVX_SNAP_DRAW_RECT: nNewId = SID_DRAW_RECT; break;
- case SVX_SNAP_DRAW_ELLIPSE: nNewId = SID_DRAW_ELLIPSE; break;
- case SVX_SNAP_DRAW_POLYGON_NOFILL: nNewId = SID_DRAW_POLYGON_NOFILL; break;
- case SVX_SNAP_DRAW_BEZIER_NOFILL: nNewId = SID_DRAW_BEZIER_NOFILL; break;
- case SVX_SNAP_DRAW_FREELINE_NOFILL: nNewId = SID_DRAW_FREELINE_NOFILL; break;
- case SVX_SNAP_DRAW_ARC: nNewId = SID_DRAW_ARC; break;
- case SVX_SNAP_DRAW_PIE: nNewId = SID_DRAW_PIE; break;
- case SVX_SNAP_DRAW_CIRCLECUT: nNewId = SID_DRAW_CIRCLECUT; break;
- case SVX_SNAP_DRAW_TEXT: nNewId = SID_DRAW_TEXT; break;
- case SVX_SNAP_DRAW_TEXT_VERTICAL: nNewId = SID_DRAW_TEXT_VERTICAL; break;
- case SVX_SNAP_DRAW_TEXT_MARQUEE: nNewId = SID_DRAW_TEXT_MARQUEE; break;
- case SVX_SNAP_DRAW_CAPTION: nNewId = SID_DRAW_CAPTION; break;
+ case SVX_SNAP_DRAW_SELECT: nNewId = SID_OBJECT_SELECT; break;
+ case SVX_SNAP_DRAW_LINE: nNewId = SID_DRAW_LINE; break;
+ case SVX_SNAP_DRAW_RECT: nNewId = SID_DRAW_RECT; break;
+ case SVX_SNAP_DRAW_ELLIPSE: nNewId = SID_DRAW_ELLIPSE; break;
+ case SVX_SNAP_DRAW_POLYGON_NOFILL: nNewId = SID_DRAW_POLYGON_NOFILL; break;
+ case SVX_SNAP_DRAW_BEZIER_NOFILL: nNewId = SID_DRAW_BEZIER_NOFILL; break;
+ case SVX_SNAP_DRAW_FREELINE_NOFILL: nNewId = SID_DRAW_FREELINE_NOFILL; break;
+ case SVX_SNAP_DRAW_ARC: nNewId = SID_DRAW_ARC; break;
+ case SVX_SNAP_DRAW_PIE: nNewId = SID_DRAW_PIE; break;
+ case SVX_SNAP_DRAW_CIRCLECUT: nNewId = SID_DRAW_CIRCLECUT; break;
+ case SVX_SNAP_DRAW_TEXT: nNewId = SID_DRAW_TEXT; break;
+ case SVX_SNAP_DRAW_TEXT_VERTICAL: nNewId = SID_DRAW_TEXT_VERTICAL; break;
+ case SVX_SNAP_DRAW_TEXT_MARQUEE: nNewId = SID_DRAW_TEXT_MARQUEE; break;
+ case SVX_SNAP_DRAW_CAPTION: nNewId = SID_DRAW_CAPTION; break;
case SVX_SNAP_DRAW_CAPTION_VERTICAL: nNewId = SID_DRAW_CAPTION_VERTICAL; break;
}
}
@@ -175,20 +175,20 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
}
bool bSwitchCustom = ( sStringItemValue.Len() && sDrawCustom.Len() && sStringItemValue != sDrawCustom );
- if (nNewId == SID_INSERT_FRAME) // vom Tbx-Button
+ if (nNewId == SID_INSERT_FRAME) // vom Tbx-Button
nNewId = SID_DRAW_TEXT;
- // #97016# CTRL-SID_OBJECT_SELECT is used to select the first object,
- // but not if SID_OBJECT_SELECT is the result of clicking a create function again,
- // so this must be tested before changing nNewId below.
+ // #97016# CTRL-SID_OBJECT_SELECT is used to select the first object,
+ // but not if SID_OBJECT_SELECT is the result of clicking a create function again,
+ // so this must be tested before changing nNewId below.
BOOL bSelectFirst = ( nNewId == SID_OBJECT_SELECT && (rReq.GetModifier() & KEY_MOD1) );
BOOL bEx = IsDrawSelMode();
if ( rReq.GetModifier() & KEY_MOD1 )
{
- // #97016# always allow keyboard selection also on background layer
- // #98185# also allow creation of default objects if the same object type
- // was already active
+ // #97016# always allow keyboard selection also on background layer
+ // #98185# also allow creation of default objects if the same object type
+ // was already active
bEx = TRUE;
}
else if ( nNewId == nDrawSfxId && ( nNewId != SID_FM_CREATE_CONTROL ||
@@ -197,14 +197,14 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
// #i52871# if a different custom shape is selected, the slot id can be the same,
// so the custom shape type string has to be compared, too.
- // SID_FM_CREATE_CONTROL mit nNewFormId==0 (ohne Parameter) kommt beim Deaktivieren
- // aus FuConstruct::SimpleMouseButtonUp
- // #59280# Execute fuer die Form-Shell, um im Controller zu deselektieren
+ // SID_FM_CREATE_CONTROL mit nNewFormId==0 (ohne Parameter) kommt beim Deaktivieren
+ // aus FuConstruct::SimpleMouseButtonUp
+ // #59280# Execute fuer die Form-Shell, um im Controller zu deselektieren
if ( nNewId == SID_FM_CREATE_CONTROL )
{
GetViewData()->GetDispatcher().Execute(SID_FM_LEAVE_CREATE);
GetViewFrame()->GetBindings().InvalidateAll(FALSE);
- //! was fuer einen Slot braucht der komische Controller wirklich, um das anzuzeigen????
+ //! was fuer einen Slot braucht der komische Controller wirklich, um das anzuzeigen????
}
bEx = !bEx;
@@ -215,10 +215,10 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
if ( nDrawSfxId == SID_FM_CREATE_CONTROL && nNewId != nDrawSfxId )
{
- // Wechsel von Control- zu Zeichenfunktion -> im Control-Controller deselektieren
+ // Wechsel von Control- zu Zeichenfunktion -> im Control-Controller deselektieren
GetViewData()->GetDispatcher().Execute(SID_FM_LEAVE_CREATE);
GetViewFrame()->GetBindings().InvalidateAll(FALSE);
- //! was fuer einen Slot braucht der komische Controller wirklich, um das anzuzeigen????
+ //! was fuer einen Slot braucht der komische Controller wirklich, um das anzuzeigen????
}
SetDrawSelMode(bEx);
@@ -227,7 +227,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
if ( bSelectFirst )
{
- // #97016# select first draw object if none is selected yet
+ // #97016# select first draw object if none is selected yet
if(!pView->AreObjectsMarked())
{
// select first object
@@ -243,7 +243,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
nDrawSfxId = nNewId;
sDrawCustom.Erase(); // value is set below for custom shapes
- if ( nNewId != SID_DRAW_CHART ) // Chart nicht mit DrawShell
+ if ( nNewId != SID_DRAW_CHART ) // Chart nicht mit DrawShell
{
if ( nNewId == SID_DRAW_TEXT || nNewId == SID_DRAW_TEXT_VERTICAL ||
nNewId == SID_DRAW_TEXT_MARQUEE || nNewId == SID_DRAW_NOTEEDIT )
@@ -361,7 +361,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
// #98185# Create default drawing objects via keyboard
// with qualifier construct directly
- FuPoor* pFuActual = GetDrawFuncPtr();
+ FuPoor* pFuActual = GetDrawFuncPtr();
if(pFuActual && (rReq.GetModifier() & KEY_MOD1))
{
@@ -395,9 +395,9 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
if ( nNewId == SID_DRAW_CAPTION || nNewId == SID_DRAW_CAPTION_VERTICAL )
{
- // #105815# use KeyInput to start edit mode (FuText is created).
- // For FuText objects, edit mode is handled within CreateDefaultObject.
- // KEY_F2 is handled in FuDraw::KeyInput.
+ // #105815# use KeyInput to start edit mode (FuText is created).
+ // For FuText objects, edit mode is handled within CreateDefaultObject.
+ // KEY_F2 is handled in FuDraw::KeyInput.
pFuActual->KeyInput( KeyEvent( 0, KeyCode( KEY_F2 ) ) );
}
@@ -409,8 +409,8 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
void ScTabViewShell::GetDrawState(SfxItemSet &rSet)
{
- SfxWhichIter aIter(rSet);
- USHORT nWhich = aIter.FirstWhich();
+ SfxWhichIter aIter(rSet);
+ USHORT nWhich = aIter.FirstWhich();
while ( nWhich )
{
@@ -418,7 +418,7 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet)
{
case SID_INSERT_DRAW:
{
- // SID_OBJECT_SELECT nur, wenn "harter" Selektionsmodus
+ // SID_OBJECT_SELECT nur, wenn "harter" Selektionsmodus
USHORT nPutId = nDrawSfxId;
if ( nPutId == SID_OBJECT_SELECT && !IsDrawSelMode() )
nPutId = USHRT_MAX;
@@ -457,7 +457,7 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet)
}
break;
- case SID_OBJECT_SELECT: // wichtig fuer den ollen Control-Controller
+ case SID_OBJECT_SELECT: // wichtig fuer den ollen Control-Controller
rSet.Put( SfxBoolItem( nWhich, nDrawSfxId == SID_OBJECT_SELECT && IsDrawSelMode() ) );
break;
}
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index c291d01d71c2..e10052d9213b 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +121,14 @@ USHORT lcl_ParseAddress(ScAddress& rScAddress, const String& aAddress, ScDocumen
void ScTabViewShell::Execute( SfxRequest& rReq )
{
- SfxViewFrame* pThisFrame = GetViewFrame();
- SfxBindings& rBindings = pThisFrame->GetBindings();
- ScModule* pScMod = SC_MOD();
- const SfxItemSet* pReqArgs = rReq.GetArgs();
- USHORT nSlot = rReq.GetSlot();
+ SfxViewFrame* pThisFrame = GetViewFrame();
+ SfxBindings& rBindings = pThisFrame->GetBindings();
+ ScModule* pScMod = SC_MOD();
+ const SfxItemSet* pReqArgs = rReq.GetArgs();
+ USHORT nSlot = rReq.GetSlot();
- if (nSlot != SID_CURRENTCELL) // der kommt beim MouseButtonUp
- HideListBox(); // Autofilter-DropDown-Listbox
+ if (nSlot != SID_CURRENTCELL) // der kommt beim MouseButtonUp
+ HideListBox(); // Autofilter-DropDown-Listbox
switch ( nSlot )
{
@@ -148,7 +148,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
else
aInsertPos = GetInsertPos();
- // als Link?
+ // als Link?
BOOL bAsLink = FALSE;
if ( pReqArgs->GetItemState(FN_PARAM_2,TRUE,&pItem) == SFX_ITEM_SET )
@@ -163,7 +163,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case SID_OPENDLG_EDIT_PRINTAREA:
{
- USHORT nId = ScPrintAreasDlgWrapper::GetChildWindowId();
+ USHORT nId = ScPrintAreasDlgWrapper::GetChildWindowId();
SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId );
pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
@@ -172,7 +172,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case SID_CHANGE_PRINTAREA:
{
- if ( pReqArgs ) // OK aus Dialog
+ if ( pReqArgs ) // OK aus Dialog
{
String aPrintStr;
String aRowStr;
@@ -196,7 +196,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
break;
case SID_ADD_PRINTAREA:
- case SID_DEFINE_PRINTAREA: // Menue oder Basic
+ case SID_DEFINE_PRINTAREA: // Menue oder Basic
{
BOOL bAdd = ( nSlot == SID_ADD_PRINTAREA );
if ( pReqArgs )
@@ -234,7 +234,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
break;
case FID_RESET_PRINTZOOM:
- SetPrintZoom( 100, 0 ); // 100%, nicht auf Seiten
+ SetPrintZoom( 100, 0 ); // 100%, nicht auf Seiten
rReq.Done();
break;
@@ -257,17 +257,17 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
SID_JUMPTOMARK, TRUE, &pItem ) == SFX_ITEM_SET )
aAddress = ((const SfxStringItem*)pItem)->GetValue();
- // #i14927# SID_CURRENTCELL with a single cell must unmark if FN_PARAM_1
- // isn't set (for recorded macros, because IsAPI is no longer available).
- // ScGridWindow::MouseButtonUp no longer executes the slot for a single
- // cell if there is a multi selection.
+ // #i14927# SID_CURRENTCELL with a single cell must unmark if FN_PARAM_1
+ // isn't set (for recorded macros, because IsAPI is no longer available).
+ // ScGridWindow::MouseButtonUp no longer executes the slot for a single
+ // cell if there is a multi selection.
BOOL bUnmark = ( nSlot == SID_CURRENTCELL );
if ( pReqArgs->GetItemState( FN_PARAM_1, TRUE, &pItem ) == SFX_ITEM_SET )
bUnmark = ((const SfxBoolItem*)pItem)->GetValue();
if ( nSlot == SID_JUMPTOMARK )
{
- // #106586# URL has to be decoded for escaped characters (%20)
+ // #106586# URL has to be decoded for escaped characters (%20)
aAddress = INetURLObject::decode( aAddress, INET_HEX_ESCAPE,
INetURLObject::DECODE_WITH_CHARSET,
RTL_TEXTENCODING_UTF8 );
@@ -275,13 +275,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
BOOL bFound = FALSE;
ScViewData* pViewData = GetViewData();
- ScDocument* pDoc = pViewData->GetDocument();
- ScMarkData& rMark = pViewData->GetMarkData();
- ScRange aScRange;
- ScAddress aScAddress;
+ ScDocument* pDoc = pViewData->GetDocument();
+ ScMarkData& rMark = pViewData->GetMarkData();
+ ScRange aScRange;
+ ScAddress aScAddress;
USHORT nResult = lcl_ParseRange(aScRange, aAddress, pDoc, nSlot);
- SCTAB nTab = pViewData->GetTabNo();
- BOOL bMark = TRUE;
+ SCTAB nTab = pViewData->GetTabNo();
+ BOOL bMark = TRUE;
// Is this a range ?
if( nResult & SCA_VALID )
@@ -315,9 +315,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
// Ist es benahmster Bereich (erst Namen dann DBBereiche) ?
else
{
- ScRangeUtil aRangeUtil;
+ ScRangeUtil aRangeUtil;
formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
- if( aRangeUtil.MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_NAMES, eConv ) ||
+ if( aRangeUtil.MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_NAMES, eConv ) ||
aRangeUtil.MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_DBASE, eConv ) )
{
nResult |= SCA_VALID;
@@ -332,13 +332,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
sal_Int32 nNumeric = aAddress.ToInt32();
if ( nNumeric > 0 && nNumeric <= MAXROW+1 )
{
- // 1-basierte Zeilennummer
+ // 1-basierte Zeilennummer
aScAddress.SetRow( (SCROW)(nNumeric - 1) );
aScAddress.SetCol( pViewData->GetCurX() );
aScAddress.SetTab( nTab );
aScRange = ScRange( aScAddress, aScAddress );
- bMark = FALSE;
+ bMark = FALSE;
nResult = SCA_VALID;
}
}
@@ -357,7 +357,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
// markieren
if( bMark )
{
- if (rMark.IsMarked()) // ist derselbe Bereich schon markiert?
+ if (rMark.IsMarked()) // ist derselbe Bereich schon markiert?
{
ScRange aOldMark;
rMark.GetMarkArea( aOldMark );
@@ -370,11 +370,11 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
bNothing = FALSE;
if (!bNothing)
- MarkRange( aScRange, FALSE ); // Cursor kommt hinterher...
+ MarkRange( aScRange, FALSE ); // Cursor kommt hinterher...
}
else
{
- // remove old selection, unless bUnmark argument is FALSE (from navigator)
+ // remove old selection, unless bUnmark argument is FALSE (from navigator)
if( bUnmark )
{
MoveCursorAbs( nCol, nRow,
@@ -385,19 +385,19 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
// und Cursor setzen
// zusammengefasste Zellen beruecksichtigen:
- while ( pDoc->IsHorOverlapped( nCol, nRow, nTab ) ) //! ViewData !!!
+ while ( pDoc->IsHorOverlapped( nCol, nRow, nTab ) ) //! ViewData !!!
--nCol;
while ( pDoc->IsVerOverlapped( nCol, nRow, nTab ) )
--nRow;
- // Navigator-Aufrufe sind nicht API!!!
+ // Navigator-Aufrufe sind nicht API!!!
if( bNothing )
{
if (rReq.IsAPI())
- rReq.Ignore(); // wenn Makro, dann gar nix
+ rReq.Ignore(); // wenn Makro, dann gar nix
else
- rReq.Done(); // sonst wenigstens aufzeichnen
+ rReq.Done(); // sonst wenigstens aufzeichnen
}
else
{
@@ -414,9 +414,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
rReq.SetReturnValue( SfxStringItem( SID_CURRENTCELL, aAddress ) );
}
- if (!bFound) // kein gueltiger Bereich
+ if (!bFound) // kein gueltiger Bereich
{
- // wenn es ein Tabellenname ist, umschalten (fuer Navigator/URL's)
+ // wenn es ein Tabellenname ist, umschalten (fuer Navigator/URL's)
SCTAB nNameTab;
if ( pDoc->GetTable( aAddress, nNameTab ) )
@@ -429,7 +429,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
if ( !bFound && nSlot == SID_JUMPTOMARK )
{
- // Grafik-Objekte probieren (nur bei URL's)
+ // Grafik-Objekte probieren (nur bei URL's)
bFound = SelectObject( aAddress );
}
@@ -450,7 +450,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case SID_CURRENTTAB:
if ( pReqArgs )
{
- // Tabelle fuer Basic ist 1-basiert
+ // Tabelle fuer Basic ist 1-basiert
SCTAB nTab = ((const SfxUInt16Item&)pReqArgs->Get(nSlot)).GetValue() - 1;
ScDocument* pDoc = GetViewData()->GetDocument();
if ( nTab < pDoc->GetTableCount() )
@@ -461,7 +461,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
if( ! rReq.IsAPI() )
rReq.Done();
}
- //! sonst Fehler ?
+ //! sonst Fehler ?
}
break;
@@ -471,9 +471,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
String aStrDocName( ((const SfxStringItem&)pReqArgs->
Get(nSlot)).GetValue() );
- SfxViewFrame* pViewFrame = NULL;
- ScDocShell* pDocSh = (ScDocShell*)SfxObjectShell::GetFirst();
- BOOL bFound = FALSE;
+ SfxViewFrame* pViewFrame = NULL;
+ ScDocShell* pDocSh = (ScDocShell*)SfxObjectShell::GetFirst();
+ BOOL bFound = FALSE;
// zu aktivierenden ViewFrame suchen
@@ -502,16 +502,16 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
if ( !pThisFrame->GetFrame().IsInPlace() ) // nicht bei OLE
{
- // print preview is now always in the same frame as the tab view
- // -> always switch this frame back to normal view
- // (ScPreviewShell ctor reads view data)
+ // print preview is now always in the same frame as the tab view
+ // -> always switch this frame back to normal view
+ // (ScPreviewShell ctor reads view data)
// #102785#; finish input
pScMod->InputEnterHandler();
pThisFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SFX_CALLMODE_ASYNCHRON );
}
- // else Fehler (z.B. Ole)
+ // else Fehler (z.B. Ole)
}
break;
@@ -520,8 +520,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
rReq.Done();
break;
- // SID_TABLE_ACTIVATE und SID_MARKAREA werden von Basic aus an der versteckten
- // View aufgerufen, um auf der sichtbaren View zu markieren/umzuschalten:
+ // SID_TABLE_ACTIVATE und SID_MARKAREA werden von Basic aus an der versteckten
+ // View aufgerufen, um auf der sichtbaren View zu markieren/umzuschalten:
case SID_TABLE_ACTIVATE:
DBG_ERROR("old slot SID_TABLE_ACTIVATE");
@@ -630,7 +630,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case FID_TOGGLEINPUTLINE:
{
- USHORT nId = ScInputWindowWrapper::GetChildWindowId();
+ USHORT nId = ScInputWindowWrapper::GetChildWindowId();
SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId );
BOOL bSet = ( pWnd == NULL );
const SfxPoolItem* pItem;
@@ -648,9 +648,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case FID_SCALE:
{
BOOL bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom();
- SvxZoomType eOldZoomType = GetZoomType();
- SvxZoomType eNewZoomType = eOldZoomType;
- const Fraction& rOldY = GetViewData()->GetZoomY(); // Y wird angezeigt
+ SvxZoomType eOldZoomType = GetZoomType();
+ SvxZoomType eNewZoomType = eOldZoomType;
+ const Fraction& rOldY = GetViewData()->GetZoomY(); // Y wird angezeigt
USHORT nOldZoom = (USHORT)(( rOldY.GetNumerator() * 100 )
/ rOldY.GetDenominator());
USHORT nZoom = nOldZoom;
@@ -662,16 +662,16 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
pReqArgs->Get(SID_ATTR_ZOOM);
eNewZoomType = rZoomItem.GetType();
- nZoom = rZoomItem.GetValue();
+ nZoom = rZoomItem.GetValue();
}
else
{
- SfxItemSet aSet ( GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM );
- SvxZoomItem aZoomItem( eOldZoomType, nOldZoom, SID_ATTR_ZOOM );
- //CHINA001 SvxZoomDialog* pDlg = NULL;
+ SfxItemSet aSet ( GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM );
+ SvxZoomItem aZoomItem( eOldZoomType, nOldZoom, SID_ATTR_ZOOM );
+ //CHINA001 SvxZoomDialog* pDlg = NULL;
AbstractSvxZoomDialog* pDlg = NULL;
- ScMarkData& rMark = GetViewData()->GetMarkData();
- USHORT nBtnFlags = SVX_ZOOM_ENABLE_50
+ ScMarkData& rMark = GetViewData()->GetMarkData();
+ USHORT nBtnFlags = SVX_ZOOM_ENABLE_50
| SVX_ZOOM_ENABLE_75
| SVX_ZOOM_ENABLE_100
| SVX_ZOOM_ENABLE_150
@@ -697,12 +697,12 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
if ( !bCancel )
{
- const SvxZoomItem& rZoomItem = (const SvxZoomItem&)
+ const SvxZoomItem& rZoomItem = (const SvxZoomItem&)
pDlg->GetOutputItemSet()->
Get( SID_ATTR_ZOOM );
eNewZoomType = rZoomItem.GetType();
- nZoom = rZoomItem.GetValue();
+ nZoom = rZoomItem.GetValue();
}
delete pDlg;
@@ -712,8 +712,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
if ( eNewZoomType == SVX_ZOOM_PERCENT )
{
- if ( nZoom < MINZOOM ) nZoom = MINZOOM;
- if ( nZoom > MAXZOOM ) nZoom = MAXZOOM;
+ if ( nZoom < MINZOOM ) nZoom = MINZOOM;
+ if ( nZoom > MAXZOOM ) nZoom = MAXZOOM;
}
else
{
@@ -897,11 +897,11 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
ScSplitMode eHSplit = GetViewData()->GetHSplitMode();
ScSplitMode eVSplit = GetViewData()->GetVSplitMode();
- if ( eHSplit == SC_SPLIT_NORMAL || eVSplit == SC_SPLIT_NORMAL ) // aufheben
+ if ( eHSplit == SC_SPLIT_NORMAL || eVSplit == SC_SPLIT_NORMAL ) // aufheben
RemoveSplit();
- else if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) // normal
+ else if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) // normal
FreezeSplitters( FALSE );
- else // erzeugen
+ else // erzeugen
SplitAtCursor();
rReq.Done();
@@ -913,21 +913,21 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
ScSplitMode eHSplit = GetViewData()->GetHSplitMode();
ScSplitMode eVSplit = GetViewData()->GetVSplitMode();
- if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) // aufheben
+ if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) // aufheben
RemoveSplit();
else
- FreezeSplitters( TRUE ); // erzeugen oder fixieren
+ FreezeSplitters( TRUE ); // erzeugen oder fixieren
rReq.Done();
InvalidateSplit();
}
break;
- // ----------------------------------------------------------------
+ // ----------------------------------------------------------------
case FID_CHG_SHOW:
{
- USHORT nId = ScHighlightChgDlgWrapper::GetChildWindowId();
+ USHORT nId = ScHighlightChgDlgWrapper::GetChildWindowId();
SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId );
pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
@@ -941,7 +941,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
rReq.Done ();
/*
- USHORT nId = ScAcceptChgDlgWrapper::GetChildWindowId();
+ USHORT nId = ScAcceptChgDlgWrapper::GetChildWindowId();
SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId );
pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
@@ -955,7 +955,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
ScAddress aCursorPos( pData->GetCurX(), pData->GetCurY(), pData->GetTabNo() );
ScDocShell* pDocSh = pData->GetDocShell();
- ScChangeAction* pAction = pDocSh->GetChangeAction( aCursorPos );
+ ScChangeAction* pAction = pDocSh->GetChangeAction( aCursorPos );
if ( pAction )
{
const SfxPoolItem* pItem;
@@ -977,8 +977,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
break;
case SID_CREATE_SW_DRAWVIEW:
- // wird von den Forms gerufen, wenn die DrawView mit allem Zubehoer
- // angelegt werden muss
+ // wird von den Forms gerufen, wenn die DrawView mit allem Zubehoer
+ // angelegt werden muss
if (!GetScDrawView())
{
GetViewData()->GetDocShell()->MakeDrawLayer();
@@ -988,8 +988,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case FID_PROTECT_DOC:
{
- ScDocument* pDoc = GetViewData()->GetDocument();
- SfxPasswordDialog* pDlg;
+ ScDocument* pDoc = GetViewData()->GetDocument();
+ SfxPasswordDialog* pDlg;
if( pReqArgs )
{
@@ -1005,14 +1005,14 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
ScDocProtection* pProtect = pDoc->GetDocProtection();
if (pProtect && pProtect->isProtected())
{
- BOOL bCancel = FALSE;
- String aPassword;
+ BOOL bCancel = FALSE;
+ String aPassword;
if (pProtect->isProtectedWithPass())
{
- String aText( ScResId(SCSTR_PASSWORD) );
+ String aText( ScResId(SCSTR_PASSWORD) );
- pDlg = new SfxPasswordDialog( GetDialogParent(), &aText );
+ pDlg = new SfxPasswordDialog( GetDialogParent(), &aText );
pDlg->SetText( ScResId(SCSTR_UNPROTECTDOC) );
pDlg->SetMinLen( 0 );
pDlg->SetHelpId( FID_PROTECT_DOC );
@@ -1035,7 +1035,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
String aText( ScResId(SCSTR_PASSWORDOPT) );
- pDlg = new SfxPasswordDialog( GetDialogParent(), &aText );
+ pDlg = new SfxPasswordDialog( GetDialogParent(), &aText );
pDlg->SetText( ScResId(SCSTR_PROTECTDOC) );
pDlg->SetMinLen( 0 );
pDlg->SetHelpId( FID_PROTECT_DOC );
@@ -1060,7 +1060,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case FID_PROTECT_TABLE:
{
ScDocument* pDoc = GetViewData()->GetDocument();
- SCTAB nTab = GetViewData()->GetTabNo();
+ SCTAB nTab = GetViewData()->GetTabNo();
bool bOldProtection = pDoc->IsTabProtected(nTab);
#if ENABLE_SHEET_PROTECTION
@@ -1134,8 +1134,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
}
#else
auto_ptr<SfxPasswordDialog> pDlg;
- String aPassword;
- BOOL bCancel = FALSE;
+ String aPassword;
+ BOOL bCancel = FALSE;
bool bNewProtection = ! bOldProtection;
if( pReqArgs )
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index ed09ec85ee8c..cd52b98ea5d6 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -74,7 +74,7 @@
#include "inputopt.hxx"
#include "inputwin.hxx"
#include "scresid.hxx"
-#include "dbcolect.hxx" // fuer ReImport
+#include "dbcolect.hxx" // fuer ReImport
#include "reffact.hxx"
#include "viewuno.hxx"
#include "dispuno.hxx"
@@ -101,7 +101,7 @@
void ActivateOlk( ScViewData* pViewData );
void DeActivateOlk( ScViewData* pViewData );
-extern SfxViewShell* pScActiveViewShell; // global.cxx
+extern SfxViewShell* pScActiveViewShell; // global.cxx
using namespace com::sun::star;
@@ -117,28 +117,28 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI)
{
SfxViewShell::Activate(bMDI);
- // hier kein GrabFocus, sonst gibt's Probleme wenn etwas inplace editiert wird!
+ // hier kein GrabFocus, sonst gibt's Probleme wenn etwas inplace editiert wird!
if ( bMDI )
{
- // fuer Eingabezeile (ClearCache)
+ // fuer Eingabezeile (ClearCache)
ScModule* pScMod = SC_MOD();
pScMod->ViewShellChanged();
ActivateView( TRUE, bFirstActivate );
ActivateOlk( GetViewData() );
- // #56870# AutoCorrect umsetzen, falls der Writer seins neu angelegt hat
+ // #56870# AutoCorrect umsetzen, falls der Writer seins neu angelegt hat
UpdateDrawTextOutliner();
- // RegisterNewTargetNames gibts nicht mehr
+ // RegisterNewTargetNames gibts nicht mehr
SfxViewFrame* pThisFrame = GetViewFrame();
if ( pInputHandler && pThisFrame->HasChildWindow(FID_INPUTLINE_STATUS) )
{
- // eigentlich nur beim Reload (letzte Version) noetig:
- // Das InputWindow bleibt stehen, aber die View mitsamt InputHandler wird
- // neu angelegt, darum muss der InputHandler am InputWindow gesetzt werden.
+ // eigentlich nur beim Reload (letzte Version) noetig:
+ // Das InputWindow bleibt stehen, aber die View mitsamt InputHandler wird
+ // neu angelegt, darum muss der InputHandler am InputWindow gesetzt werden.
SfxChildWindow* pChild = pThisFrame->GetChildWindow(FID_INPUTLINE_STATUS);
if (pChild)
{
@@ -175,7 +175,7 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI)
if ( aPendingUserData.hasElements() )
{
- // #89897# read user data from print preview now, after ctor
+ // #89897# read user data from print preview now, after ctor
DoReadUserDataSequence( aPendingUserData );
aPendingUserData.realloc( 0 );
}
@@ -203,7 +203,7 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI)
pHdl->SetRefScale( GetViewData()->GetZoomX(), GetViewData()->GetZoomY() );
}
- // Aenderungs-Dialog aktualisieren
+ // Aenderungs-Dialog aktualisieren
if ( pThisFrame->HasChildWindow(FID_CHG_ACCEPT) )
{
@@ -226,19 +226,19 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI)
}
}
- // don't call CheckSelectionTransfer here - activating a view should not change the
- // primary selection (may be happening just because the mouse was moved over the window)
+ // don't call CheckSelectionTransfer here - activating a view should not change the
+ // primary selection (may be happening just because the mouse was moved over the window)
- // Wenn Referenzeingabe-Tip-Hilfe hier wieder angezeigt werden soll (ShowRefTip),
- // muss sie beim Verschieben der View angepasst werden (gibt sonst Probleme unter OS/2
- // beim Umschalten zwischen Dokumenten)
+ // Wenn Referenzeingabe-Tip-Hilfe hier wieder angezeigt werden soll (ShowRefTip),
+ // muss sie beim Verschieben der View angepasst werden (gibt sonst Probleme unter OS/2
+ // beim Umschalten zwischen Dokumenten)
}
void __EXPORT ScTabViewShell::Deactivate(BOOL bMDI)
{
HideTip();
- ScDocument* pDoc=GetViewData()->GetDocument();
+ ScDocument* pDoc=GetViewData()->GetDocument();
ScChangeTrack* pChanges=pDoc->GetChangeTrack();
@@ -254,8 +254,8 @@ void __EXPORT ScTabViewShell::Deactivate(BOOL bMDI)
if( bMDI )
{
- // #85421# during shell deactivation, shells must not be switched, or the loop
- // through the shell stack (in SfxDispatcher::DoDeactivate_Impl) will not work
+ // #85421# during shell deactivation, shells must not be switched, or the loop
+ // through the shell stack (in SfxDispatcher::DoDeactivate_Impl) will not work
BOOL bOldDontSwitch = bDontSwitch;
bDontSwitch = TRUE;
@@ -275,10 +275,10 @@ void __EXPORT ScTabViewShell::Deactivate(BOOL bMDI)
}
else
{
- HideNoteMarker(); // Notiz-Anzeige
+ HideNoteMarker(); // Notiz-Anzeige
if ( pHdl )
- pHdl->HideTip(); // Formel-AutoEingabe-Tip abschalten
+ pHdl->HideTip(); // Formel-AutoEingabe-Tip abschalten
}
}
@@ -292,7 +292,7 @@ void ScTabViewShell::SetActive()
SfxViewFrame* pFrame = GetViewFrame();
pFrame->GetFrame().Appear();
- SFX_APP()->SetViewFrame( pFrame ); // immer erst Appear, dann SetViewFrame (#29290#)
+ SFX_APP()->SetViewFrame( pFrame ); // immer erst Appear, dann SetViewFrame (#29290#)
#endif
}
@@ -336,10 +336,10 @@ Size __EXPORT ScTabViewShell::GetOptimalSizePixel() const
{
Size aOptSize;
- SCTAB nCurTab = GetViewData()->GetTabNo();
- ScDocument* pDoc = GetViewData()->GetDocument();
- ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
- SfxStyleSheetBase* pStyleSheet = pStylePool->Find(
+ SCTAB nCurTab = GetViewData()->GetTabNo();
+ ScDocument* pDoc = GetViewData()->GetDocument();
+ ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
+ SfxStyleSheetBase* pStyleSheet = pStylePool->Find(
pDoc->GetPageStyle( nCurTab ),
SFX_STYLE_FAMILY_PAGE );
@@ -347,9 +347,9 @@ Size __EXPORT ScTabViewShell::GetOptimalSizePixel() const
if ( pStyleSheet )
{
- const SfxItemSet& rSet = pStyleSheet->GetItemSet();
- const SvxSizeItem& rItem = (const SvxSizeItem&)rSet.Get( ATTR_PAGE_SIZE );
- const Size& rPageSize = rItem.GetSize();
+ const SfxItemSet& rSet = pStyleSheet->GetItemSet();
+ const SvxSizeItem& rItem = (const SvxSizeItem&)rSet.Get( ATTR_PAGE_SIZE );
+ const Size& rPageSize = rItem.GetSize();
aOptSize.Width() = (long) (rPageSize.Width() * GetViewData()->GetPPTX());
aOptSize.Height() = (long) (rPageSize.Height() * GetViewData()->GetPPTY());
@@ -360,8 +360,8 @@ Size __EXPORT ScTabViewShell::GetOptimalSizePixel() const
//------------------------------------------------------------------
-// Zoom fuer In-Place berechnen
-// aus Verhaeltnis von VisArea und Fenstergroesse des GridWin
+// Zoom fuer In-Place berechnen
+// aus Verhaeltnis von VisArea und Fenstergroesse des GridWin
void ScTabViewShell::UpdateOleZoom()
{
@@ -421,11 +421,11 @@ void __EXPORT ScTabViewShell::InnerResizePixel( const Point &rOfs, const Size &r
aNewSize.Height() += aBorder.Top() + aBorder.Bottom();
}
- DoResize( rOfs, aNewSize, TRUE ); // rSize = Groesse von gridwin
+ DoResize( rOfs, aNewSize, TRUE ); // rSize = Groesse von gridwin
- UpdateOleZoom(); // Zoom fuer In-Place berechnen
+ UpdateOleZoom(); // Zoom fuer In-Place berechnen
-// GetViewData()->GetDocShell()->UpdateOle( GetViewData() );
+// GetViewData()->GetDocShell()->UpdateOle( GetViewData() );
GetViewData()->GetDocShell()->SetDocumentModified();
}
@@ -435,7 +435,7 @@ void __EXPORT ScTabViewShell::OuterResizePixel( const Point &rOfs, const Size &r
GetBorderSize( aBorder, rSize );
SetBorderPixel( aBorder );
- DoResize( rOfs, rSize ); // Position und Groesse von tabview wie uebergeben
+ DoResize( rOfs, rSize ); // Position und Groesse von tabview wie uebergeben
// ForceMove als Ersatz fuer den Sfx-Move-Mechanismus
// (aWinPos muss aktuell gehalten werden, damit ForceMove beim Ole-Deaktivieren klappt)
@@ -445,7 +445,7 @@ void __EXPORT ScTabViewShell::OuterResizePixel( const Point &rOfs, const Size &r
void __EXPORT ScTabViewShell::SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY )
{
- // fuer OLE...
+ // fuer OLE...
Fraction aFrac20( 1,5 );
Fraction aFrac400( 4,1 );
@@ -473,7 +473,7 @@ void __EXPORT ScTabViewShell::SetZoomFactor( const Fraction &rZoomX, const Fract
void __EXPORT ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const
{
- // auf ganze Zellen anpassen (in 1/100 mm)
+ // auf ganze Zellen anpassen (in 1/100 mm)
Size aPixelSize = rRect.GetSize();
Window* pWin = ((ScTabViewShell*)this)->GetActiveWin();
@@ -500,7 +500,7 @@ void __EXPORT ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const
rRect.SetSize( pWin->LogicToPixel( aLogicRect.GetSize() ) );
#if 0
- // auf ganze Zellen anpassen (in Pixeln)
+ // auf ganze Zellen anpassen (in Pixeln)
ScViewData* pViewData = ((ScTabViewShell*)this)->GetViewData();
Size aSize = rRect.GetSize();
@@ -542,7 +542,7 @@ void __EXPORT ScTabViewShell::Move()
void __EXPORT ScTabViewShell::ShowCursor(FASTBOOL /* bOn */)
{
-/*!!! ShowCursor wird nicht paarweise wie im gridwin gerufen.
+/*!!! ShowCursor wird nicht paarweise wie im gridwin gerufen.
Der CursorLockCount am Gridwin muss hier direkt auf 0 gesetzt werden
if (bOn)
@@ -590,10 +590,10 @@ void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::Proper
Window* pNewWin = GetActiveWin();
if (pNewWin && pNewWin != pOldWin)
{
- SetWindow( pNewWin ); //! ist diese ViewShell immer aktiv???
+ SetWindow( pNewWin ); //! ist diese ViewShell immer aktiv???
if (bFocus)
pNewWin->GrabFocus();
- WindowChanged(); // Drawing-Layer (z.B. #56771#)
+ WindowChanged(); // Drawing-Layer (z.B. #56771#)
}
if (GetViewData()->GetHSplitMode() == SC_SPLIT_FIX ||
@@ -606,7 +606,7 @@ void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::Proper
TestHintWindow();
- //! if ViewData has more tables than document, remove tables in ViewData
+ //! if ViewData has more tables than document, remove tables in ViewData
}
// DoReadUserData is also called from ctor when switching from print preview
@@ -625,10 +625,10 @@ void ScTabViewShell::DoReadUserData( const String& rData )
Window* pNewWin = GetActiveWin();
if (pNewWin && pNewWin != pOldWin)
{
- SetWindow( pNewWin ); //! ist diese ViewShell immer aktiv???
+ SetWindow( pNewWin ); //! ist diese ViewShell immer aktiv???
if (bFocus)
pNewWin->GrabFocus();
- WindowChanged(); // Drawing-Layer (z.B. #56771#)
+ WindowChanged(); // Drawing-Layer (z.B. #56771#)
}
if (GetViewData()->GetHSplitMode() == SC_SPLIT_FIX ||
@@ -641,7 +641,7 @@ void ScTabViewShell::DoReadUserData( const String& rData )
TestHintWindow();
- //! if ViewData has more tables than document, remove tables in ViewData
+ //! if ViewData has more tables than document, remove tables in ViewData
}
//------------------------------------------------------------------
@@ -727,12 +727,12 @@ void ScTabViewShell::SetDrawShell( BOOL bActive )
if ( !bActive )
{
- ResetDrawDragMode(); // Mirror / Rotate aus
+ ResetDrawDragMode(); // Mirror / Rotate aus
if (bWasDraw && (GetViewData()->GetHSplitMode() == SC_SPLIT_FIX ||
GetViewData()->GetVSplitMode() == SC_SPLIT_FIX))
{
- // Aktiven Teil an Cursor anpassen, etc.
+ // Aktiven Teil an Cursor anpassen, etc.
MoveCursorAbs( GetViewData()->GetCurX(), GetViewData()->GetCurY(),
SC_FOLLOW_NONE, FALSE, FALSE, TRUE );
}
@@ -761,8 +761,8 @@ void ScTabViewShell::SetPivotShell( BOOL bActive )
{
bActivePivotSh = bActive;
- // #68771# #76198# SetPivotShell is called from CursorPosChanged every time
- // -> don't change anything except switching between cell and pivot shell
+ // #68771# #76198# SetPivotShell is called from CursorPosChanged every time
+ // -> don't change anything except switching between cell and pivot shell
if ( eCurOST == OST_Pivot || eCurOST == OST_Cell )
{
@@ -857,10 +857,10 @@ void ScTabViewShell::SetEditShell(EditView* pView, BOOL bActive )
bActiveEditSh = bActive;
}
-void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce)
+void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce)
{
- ScViewData* pViewData = GetViewData();
- ScDocShell* pDocSh = pViewData->GetDocShell();
+ ScViewData* pViewData = GetViewData();
+ ScDocShell* pDocSh = pViewData->GetDocShell();
if(bDontSwitch) return;
@@ -891,14 +891,14 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce)
switch(eOST)
{
- case OST_Cell:
+ case OST_Cell:
{
AddSubShell(*pCellShell);
if(bPgBrk) AddSubShell(*pPageBreakShell);
bCellBrush = TRUE;
}
break;
- case OST_Editing:
+ case OST_Editing:
{
AddSubShell(*pCellShell);
if(bPgBrk) AddSubShell(*pPageBreakShell);
@@ -909,7 +909,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce)
}
}
break;
- case OST_DrawText:
+ case OST_DrawText:
{
if ( !pDrawTextShell )
{
@@ -919,7 +919,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce)
AddSubShell(*pDrawTextShell);
}
break;
- case OST_Drawing:
+ case OST_Drawing:
{
if (svx::checkForSelectedCustomShapes(
GetScDrawView(), true /* bOnlyExtruded */ )) {
@@ -946,7 +946,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce)
}
break;
- case OST_DrawForm:
+ case OST_DrawForm:
{
if ( !pDrawFormShell )
{
@@ -959,7 +959,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce)
}
break;
- case OST_Chart:
+ case OST_Chart:
{
if ( !pChartShell )
{
@@ -972,7 +972,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce)
}
break;
- case OST_OleObject:
+ case OST_OleObject:
{
if ( !pOleObjectShell )
{
@@ -985,7 +985,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce)
}
break;
- case OST_Graphic:
+ case OST_Graphic:
{
if ( !pGraphicShell)
{
@@ -998,7 +998,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce)
}
break;
- case OST_Media:
+ case OST_Media:
{
if ( !pMediaShell)
{
@@ -1010,7 +1010,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce)
}
break;
- case OST_Pivot:
+ case OST_Pivot:
{
AddSubShell(*pCellShell);
if(bPgBrk) AddSubShell(*pPageBreakShell);
@@ -1024,14 +1024,14 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce)
bCellBrush = TRUE;
}
break;
- case OST_Auditing:
+ case OST_Auditing:
{
AddSubShell(*pCellShell);
if(bPgBrk) AddSubShell(*pPageBreakShell);
if ( !pAuditingShell )
{
- pDocSh->MakeDrawLayer(); // die Wartezeit lieber jetzt als beim Klick
+ pDocSh->MakeDrawLayer(); // die Wartezeit lieber jetzt als beim Klick
pAuditingShell = new ScAuditingShell( GetViewData() );
pAuditingShell->SetRepeatTarget( &aTarget );
@@ -1080,12 +1080,12 @@ ObjectSelectionType ScTabViewShell::GetCurObjectSelectionType()
return eCurOST;
}
-// GetMySubShell / SetMySubShell: altes Verhalten simulieren,
-// dass es nur eine SubShell gibt (nur innerhalb der 5 eignenen SubShells)
+// GetMySubShell / SetMySubShell: altes Verhalten simulieren,
+// dass es nur eine SubShell gibt (nur innerhalb der 5 eignenen SubShells)
SfxShell* ScTabViewShell::GetMySubShell() const
{
- // GetSubShell() war frueher const, und GetSubShell(USHORT) sollte es auch sein...
+ // GetSubShell() war frueher const, und GetSubShell(USHORT) sollte es auch sein...
USHORT nPos = 0;
SfxShell* pSub = ((ScTabViewShell*)this)->GetSubShell(nPos);
@@ -1093,13 +1093,13 @@ SfxShell* ScTabViewShell::GetMySubShell() const
{
if ( pSub == pDrawShell || pSub == pDrawTextShell || pSub == pEditShell ||
pSub == pPivotShell || pSub == pAuditingShell || pSub == pDrawFormShell ||
- pSub == pCellShell || pSub == pOleObjectShell|| pSub == pChartShell ||
+ pSub == pCellShell || pSub == pOleObjectShell|| pSub == pChartShell ||
pSub == pGraphicShell || pSub == pMediaShell || pSub == pPageBreakShell)
- return pSub; // gefunden
+ return pSub; // gefunden
pSub = ((ScTabViewShell*)this)->GetSubShell(++nPos);
}
- return NULL; // keine von meinen dabei
+ return NULL; // keine von meinen dabei
}
//UNUSED2008-05 void ScTabViewShell::SetMySubShell( SfxShell* pShell )
@@ -1157,7 +1157,7 @@ ScTabViewShell* ScTabViewShell::GetActiveViewShell()
SfxPrinter* __EXPORT ScTabViewShell::GetPrinter( BOOL bCreate )
{
- // Drucker ist immer da (wird fuer die FontListe schon beim Starten angelegt)
+ // Drucker ist immer da (wird fuer die FontListe schon beim Starten angelegt)
return GetViewData()->GetDocShell()->GetPrinter(bCreate);
}
@@ -1168,16 +1168,16 @@ USHORT __EXPORT ScTabViewShell::SetPrinter( SfxPrinter *pNewPrinter, USHORT nDif
PrintDialog* __EXPORT ScTabViewShell::CreatePrintDialog( Window *pParent )
{
- ScDocShell* pDocShell = GetViewData()->GetDocShell();
- ScDocument* pDoc = pDocShell->GetDocument();
+ ScDocShell* pDocShell = GetViewData()->GetDocShell();
+ ScDocument* pDoc = pDocShell->GetDocument();
- pDoc->SetPrintOptions(); // Optionen aus OFA am Printer setzen
+ pDoc->SetPrintOptions(); // Optionen aus OFA am Printer setzen
SfxPrinter* pPrinter = GetPrinter();
- String aStrRange;
+ String aStrRange;
PrintDialog* pDlg = new PrintDialog( pParent, true );
- SCTAB nTabCount = pDoc->GetTableCount();
- long nDocPageMax = 0;
+ SCTAB nTabCount = pDoc->GetTableCount();
+ long nDocPageMax = 0;
pDlg->EnableSheetRange( true, PRINTSHEETS_ALL );
pDlg->EnableSheetRange( true, PRINTSHEETS_SELECTED_SHEETS );
@@ -1205,14 +1205,14 @@ PrintDialog* __EXPORT ScTabViewShell::CreatePrintDialog( Window *pParent )
}
}
- pDlg->SetRangeText ( aStrRange );
- pDlg->EnableRange ( PRINTDIALOG_ALL );
- pDlg->EnableRange ( PRINTDIALOG_RANGE );
- pDlg->SetFirstPage ( 1 );
- pDlg->SetMinPage ( 1 );
- pDlg->SetLastPage ( (USHORT)nDocPageMax );
- pDlg->SetMaxPage ( (USHORT)nDocPageMax );
- pDlg->EnableCollate ();
+ pDlg->SetRangeText ( aStrRange );
+ pDlg->EnableRange ( PRINTDIALOG_ALL );
+ pDlg->EnableRange ( PRINTDIALOG_RANGE );
+ pDlg->SetFirstPage ( 1 );
+ pDlg->SetMinPage ( 1 );
+ pDlg->SetLastPage ( (USHORT)nDocPageMax );
+ pDlg->SetMaxPage ( (USHORT)nDocPageMax );
+ pDlg->EnableCollate ();
return pDlg;
}
@@ -1222,7 +1222,7 @@ SfxTabPage* ScTabViewShell::CreatePrintOptionsPage( Window *pParent, const SfxIt
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
//CHINA001 return ScTpPrintOptions::Create( pParent, rOptions );
- ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT );
+ ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT );
if ( ScTpPrintOptionsCreate )
return (*ScTpPrintOptionsCreate)( pParent, rOptions);
return 0;
@@ -1239,8 +1239,8 @@ void __EXPORT ScTabViewShell::PreparePrint( PrintDialog* pPrintDialog )
ErrCode ScTabViewShell::DoPrint( SfxPrinter *pPrinter,
PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI )
{
- // #72527# if SID_PRINTDOCDIRECT is executed and there's a selection,
- // ask if only the selection should be printed
+ // #72527# if SID_PRINTDOCDIRECT is executed and there's a selection,
+ // ask if only the selection should be printed
const ScMarkData& rMarkData = GetViewData()->GetMarkData();
if ( !pPrintDialog && !bSilent && !bIsAPI && ( rMarkData.IsMarked() || rMarkData.IsMultiMarked() ) )
@@ -1292,7 +1292,7 @@ USHORT __EXPORT ScTabViewShell::Print( SfxProgress& rProgress, BOOL bIsAPI,
PrintDialog* pPrintDialog )
{
ScDocShell* pDocShell = GetViewData()->GetDocShell();
- pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen
+ pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen
SfxViewShell::Print( rProgress, bIsAPI, pPrintDialog );
pDocShell->Print( rProgress, pPrintDialog, &GetViewData()->GetMarkData(),
@@ -1410,7 +1410,7 @@ void ScTabViewShell::StopSimpleRefDialog()
{
Window* pWin = pWnd->GetWindow();
if (pWin && pWin->IsSystemWindow())
- ((SystemWindow*)pWin)->Close(); // calls abort handler
+ ((SystemWindow*)pWin)->Close(); // calls abort handler
}
}
@@ -1427,14 +1427,14 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
KeyCode aCode = rKEvt.GetKeyCode();
BOOL bShift = aCode.IsShift();
BOOL bControl = aCode.IsMod1();
- BOOL bAlt = aCode.IsMod2();
- USHORT nCode = aCode.GetCode();
- BOOL bUsed = FALSE;
- BOOL bInPlace = pScMod->IsEditMode(); // Editengine bekommt alles
- BOOL bAnyEdit = pScMod->IsInputMode(); // nur Zeichen & Backspace
- BOOL bDraw = IsDrawTextEdit();
+ BOOL bAlt = aCode.IsMod2();
+ USHORT nCode = aCode.GetCode();
+ BOOL bUsed = FALSE;
+ BOOL bInPlace = pScMod->IsEditMode(); // Editengine bekommt alles
+ BOOL bAnyEdit = pScMod->IsInputMode(); // nur Zeichen & Backspace
+ BOOL bDraw = IsDrawTextEdit();
- HideNoteMarker(); // Notiz-Anzeige
+ HideNoteMarker(); // Notiz-Anzeige
// don't do extra HideCursor/ShowCursor calls if EnterHandler will switch to a different sheet
BOOL bOnRefSheet = ( GetViewData()->GetRefTabNo() == GetViewData()->GetTabNo() );
@@ -1445,11 +1445,11 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
ScDocument* pDoc = GetViewData()->GetDocument();
if ( pDoc )
- pDoc->KeyInput( rKEvt ); // TimerDelays etc.
+ pDoc->KeyInput( rKEvt ); // TimerDelays etc.
if( bInPlace )
{
- bUsed = pScMod->InputKeyEvent( rKEvt ); // Eingabe
+ bUsed = pScMod->InputKeyEvent( rKEvt ); // Eingabe
if( !bUsed )
bUsed = sal::static_int_cast<BOOL>(SfxViewShell::KeyInput( rKEvt )); // accelerators
}
@@ -1467,39 +1467,39 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
switch ( nCode )
{
case KEY_RETURN:
- bIsType = bControl && !bAlt; // Control, Shift-Control-Return
+ bIsType = bControl && !bAlt; // Control, Shift-Control-Return
if ( !bIsType && nModi == 0 )
{
- // Will der InputHandler auch ein einfaches Return?
+ // Will der InputHandler auch ein einfaches Return?
ScInputHandler* pHdl = pScMod->GetInputHdl(this);
bIsType = pHdl && pHdl->TakesReturn();
}
break;
case KEY_SPACE:
- bIsType = !bControl && !bAlt; // ohne Modifier oder Shift-Space
+ bIsType = !bControl && !bAlt; // ohne Modifier oder Shift-Space
break;
case KEY_ESCAPE:
case KEY_BACKSPACE:
- bIsType = (nModi == 0); // nur ohne Modifier
+ bIsType = (nModi == 0); // nur ohne Modifier
break;
default:
bIsType = TRUE;
}
if( bIsType )
- bUsed = pScMod->InputKeyEvent( rKEvt ); // Eingabe
+ bUsed = pScMod->InputKeyEvent( rKEvt ); // Eingabe
if( !bUsed )
bUsed = sal::static_int_cast<BOOL>(SfxViewShell::KeyInput( rKEvt )); // accelerators
- if ( !bUsed && !bIsType && nCode != KEY_RETURN ) // Eingabe nochmal hinterher
+ if ( !bUsed && !bIsType && nCode != KEY_RETURN ) // Eingabe nochmal hinterher
bUsed = pScMod->InputKeyEvent( rKEvt );
}
else
{
- // #51889# Spezialfall: Copy/Cut bei Mehrfachselektion -> Fehlermeldung
- // (Slot ist disabled, SfxViewShell::KeyInput wuerde also kommentarlos verschluckt)
+ // #51889# Spezialfall: Copy/Cut bei Mehrfachselektion -> Fehlermeldung
+ // (Slot ist disabled, SfxViewShell::KeyInput wuerde also kommentarlos verschluckt)
KeyFuncType eFunc = aCode.GetFunction();
if ( eFunc == KEYFUNC_CUT )
{
@@ -1515,14 +1515,14 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
if (!bUsed)
bUsed = sal::static_int_cast<BOOL>(SfxViewShell::KeyInput( rKEvt )); // accelerators
- // #74696# during inplace editing, some slots are handled by the
- // container app and are executed during Window::KeyInput.
- // -> don't pass keys to input handler that would be used there
- // but should call slots instead.
+ // #74696# during inplace editing, some slots are handled by the
+ // container app and are executed during Window::KeyInput.
+ // -> don't pass keys to input handler that would be used there
+ // but should call slots instead.
BOOL bParent = ( GetViewFrame()->GetFrame().IsInPlace() && eFunc != KEYFUNC_DONTKNOW );
if( !bUsed && !bDraw && nCode != KEY_RETURN && !bParent )
- bUsed = pScMod->InputKeyEvent( rKEvt, TRUE ); // Eingabe
+ bUsed = pScMod->InputKeyEvent( rKEvt, TRUE ); // Eingabe
}
if (!bInPlace && !bUsed && !bDraw)
@@ -1534,7 +1534,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
BOOL bNormal = !bControl && !bAlt;
if ( !bAnyEdit && bNormal )
{
- // je nach Optionen mit Enter in den Edit-Modus schalten
+ // je nach Optionen mit Enter in den Edit-Modus schalten
const ScInputOptions& rOpt = pScMod->GetInputOptions();
if ( rOpt.GetEnterEdit() )
@@ -1544,7 +1544,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
}
}
- BOOL bEditReturn = bControl && !bShift; // An Edit-Engine weiter
+ BOOL bEditReturn = bControl && !bShift; // An Edit-Engine weiter
if ( !bUsed && !bEditReturn )
{
if ( bOnRefSheet )
@@ -1572,9 +1572,9 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
if ( bOnRefSheet )
ShowAllCursors();
- // hier kein UpdateInputHandler, weil bei Referenzeingabe auf ein
- // anderes Dokument diese ViewShell nicht die ist, auf der eingegeben
- // wird!
+ // hier kein UpdateInputHandler, weil bei Referenzeingabe auf ein
+ // anderes Dokument diese ViewShell nicht die ist, auf der eingegeben
+ // wird!
bUsed = TRUE;
}
@@ -1583,7 +1583,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
}
}
- // Alt-Cursortasten hart codiert, weil Alt nicht konfigurierbar ist
+ // Alt-Cursortasten hart codiert, weil Alt nicht konfigurierbar ist
if ( !bUsed && bAlt && !bControl )
{
@@ -1633,55 +1633,55 @@ BOOL ScTabViewShell::SfxKeyInput(const KeyEvent& rKeyEvent)
FASTBOOL __EXPORT ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent )
{
-// return SfxViewShell::KeyInput( rKeyEvent );
+// return SfxViewShell::KeyInput( rKeyEvent );
return TabKeyInput( rKeyEvent );
}
//------------------------------------------------------------------
#define __INIT_ScTabViewShell \
- eCurOST(OST_NONE), \
- nDrawSfxId(0), \
- nCtrlSfxId(USHRT_MAX), \
- nFormSfxId(USHRT_MAX), \
- pDrawShell(NULL), \
- pDrawTextShell(NULL), \
- pEditShell(NULL), \
- pPivotShell(NULL), \
- pAuditingShell(NULL), \
- pDrawFormShell(NULL), \
- pCellShell(NULL), \
- pOleObjectShell(NULL), \
- pChartShell(NULL), \
- pGraphicShell(NULL), \
- pMediaShell(NULL), \
- pPageBreakShell(NULL), \
- pExtrusionBarShell(NULL), \
- pFontworkBarShell(NULL), \
- pFormShell(NULL), \
- pInputHandler(NULL), \
- pCurFrameLine(NULL), \
- aTarget( this ), \
- pDialogDPObject(NULL), \
+ eCurOST(OST_NONE), \
+ nDrawSfxId(0), \
+ nCtrlSfxId(USHRT_MAX), \
+ nFormSfxId(USHRT_MAX), \
+ pDrawShell(NULL), \
+ pDrawTextShell(NULL), \
+ pEditShell(NULL), \
+ pPivotShell(NULL), \
+ pAuditingShell(NULL), \
+ pDrawFormShell(NULL), \
+ pCellShell(NULL), \
+ pOleObjectShell(NULL), \
+ pChartShell(NULL), \
+ pGraphicShell(NULL), \
+ pMediaShell(NULL), \
+ pPageBreakShell(NULL), \
+ pExtrusionBarShell(NULL), \
+ pFontworkBarShell(NULL), \
+ pFormShell(NULL), \
+ pInputHandler(NULL), \
+ pCurFrameLine(NULL), \
+ aTarget( this ), \
+ pDialogDPObject(NULL), \
pNavSettings(NULL), \
- bActiveDrawSh(FALSE), \
- bActiveDrawTextSh(FALSE), \
- bActivePivotSh(FALSE), \
- bActiveAuditingSh(FALSE), \
- bActiveDrawFormSh(FALSE), \
- bActiveOleObjectSh(FALSE), \
- bActiveChartSh(FALSE), \
- bActiveGraphicSh(FALSE), \
- bActiveMediaSh(FALSE), \
+ bActiveDrawSh(FALSE), \
+ bActiveDrawTextSh(FALSE), \
+ bActivePivotSh(FALSE), \
+ bActiveAuditingSh(FALSE), \
+ bActiveDrawFormSh(FALSE), \
+ bActiveOleObjectSh(FALSE), \
+ bActiveChartSh(FALSE), \
+ bActiveGraphicSh(FALSE), \
+ bActiveMediaSh(FALSE), \
bActiveEditSh(FALSE), \
bFormShellAtTop(FALSE), \
- bDontSwitch(FALSE), \
- bInFormatDialog(FALSE), \
- bPrintSelected(FALSE), \
- bReadOnly(FALSE), \
- pScSbxObject(NULL), \
- /*bChartDlgIsEdit(FALSE),*/ \
- bChartAreaValid(FALSE), \
+ bDontSwitch(FALSE), \
+ bInFormatDialog(FALSE), \
+ bPrintSelected(FALSE), \
+ bReadOnly(FALSE), \
+ pScSbxObject(NULL), \
+ /*bChartDlgIsEdit(FALSE),*/ \
+ bChartAreaValid(FALSE), \
nCurRefDlgId(0), \
pAccessibilityBroadcaster(NULL)
@@ -1696,14 +1696,14 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode )
bReadOnly = pDocSh->IsReadOnly();
- SetName( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("View")) ); // fuer SBX
+ SetName( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("View")) ); // fuer SBX
Color aColBlack( COL_BLACK );
-// SetPool( &pSfxApp->GetPool() );
+// SetPool( &pSfxApp->GetPool() );
SetPool( &SC_MOD()->GetPool() );
SetWindow( GetActiveWin() );
- pCurFrameLine = new SvxBorderLine( &aColBlack, 20, 0, 0 );
- pPivotSource = new ScArea;
+ pCurFrameLine = new SvxBorderLine( &aColBlack, 20, 0, 0 );
+ pPivotSource = new ScArea;
StartListening(*GetViewData()->GetDocShell(),TRUE);
StartListening(*GetViewFrame(),TRUE);
StartListening(*pSfxApp,TRUE); // #i62045# #i62046# application is needed for Calc's own hints
@@ -1730,46 +1730,46 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode )
if ( GetViewFrame()->GetFrame().IsInPlace() ) // inplace
{
- pDocSh->SetInplace( TRUE ); // schon so initialisiert
+ pDocSh->SetInplace( TRUE ); // schon so initialisiert
if (pDoc->IsEmbedded())
- pDoc->ResetEmbedded(); // keine blaue Markierung
+ pDoc->ResetEmbedded(); // keine blaue Markierung
}
else if ( bFirstView )
{
pDocSh->SetInplace( FALSE );
GetViewData()->RefreshZoom(); // recalculate PPT
if (!pDoc->IsEmbedded())
- pDoc->SetEmbedded( aVisArea ); // VisArea markieren
+ pDoc->SetEmbedded( aVisArea ); // VisArea markieren
}
}
// ViewInputHandler
- // #48721# jeder Task hat neuerdings sein eigenes InputWindow,
- // darum muesste eigentlich entweder jeder Task seinen InputHandler bekommen,
- // oder das InputWindow muesste sich beim App-InputHandler anmelden, wenn der
- // Task aktiv wird, oder das InputWindow muesste sich den InputHandler selbst
- // anlegen (dann immer ueber das InputWindow suchen, und nur wenn das nicht da
- // ist, den InputHandler von der App nehmen).
- // Als Sofortloesung bekommt erstmal jede View ihren Inputhandler, das gibt
- // nur noch Probleme, wenn zwei Views in einem Task-Fenster sind.
+ // #48721# jeder Task hat neuerdings sein eigenes InputWindow,
+ // darum muesste eigentlich entweder jeder Task seinen InputHandler bekommen,
+ // oder das InputWindow muesste sich beim App-InputHandler anmelden, wenn der
+ // Task aktiv wird, oder das InputWindow muesste sich den InputHandler selbst
+ // anlegen (dann immer ueber das InputWindow suchen, und nur wenn das nicht da
+ // ist, den InputHandler von der App nehmen).
+ // Als Sofortloesung bekommt erstmal jede View ihren Inputhandler, das gibt
+ // nur noch Probleme, wenn zwei Views in einem Task-Fenster sind.
pInputHandler = new ScInputHandler;
// Alte Version:
- // if ( !GetViewFrame()->ISA(SfxTopViewFrame) ) // OLE oder Plug-In
- // pInputHandler = new ScInputHandler;
+ // if ( !GetViewFrame()->ISA(SfxTopViewFrame) ) // OLE oder Plug-In
+ // pInputHandler = new ScInputHandler;
- // FormShell vor MakeDrawView anlegen, damit die DrawView auf jeden Fall
- // an der FormShell angemeldet werden kann
- // Gepusht wird die FormShell im ersten Activate
+ // FormShell vor MakeDrawView anlegen, damit die DrawView auf jeden Fall
+ // an der FormShell angemeldet werden kann
+ // Gepusht wird die FormShell im ersten Activate
pFormShell = new FmFormShell(this);
pFormShell->SetControlActivationHandler( LINK( this, ScTabViewShell, FormControlActivated ) );
- // DrawView darf nicht im TabView - ctor angelegt werden,
- // wenn die ViewShell noch nicht kostruiert ist...
+ // DrawView darf nicht im TabView - ctor angelegt werden,
+ // wenn die ViewShell noch nicht kostruiert ist...
if (pDoc->GetDrawLayer())
MakeDrawView( nForceDesignMode );
- ViewOptionsHasChanged(FALSE); // legt auch evtl. DrawView an
+ ViewOptionsHasChanged(FALSE); // legt auch evtl. DrawView an
SfxUndoManager* pMgr = pDocSh->GetUndoManager();
SetUndoManager( pMgr );
@@ -1782,9 +1782,9 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode )
pFormShell->SetRepeatTarget( &aTarget );
SetHelpId( HID_SCSHELL_TABVWSH );
- if ( bFirstView ) // first view?
+ if ( bFirstView ) // first view?
{
- pDoc->SetDocVisible( TRUE ); // used when creating new sheets
+ pDoc->SetDocVisible( TRUE ); // used when creating new sheets
if ( pDocSh->IsEmpty() )
{
// set first sheet's RTL flag (following will already be initialized because of SetDocVisible)
@@ -1793,7 +1793,7 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode )
// append additional sheets (not for OLE object)
if ( pDocSh->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED )
{
- SCTAB nInitTabCount = 3; //! konfigurierbar !!!
+ SCTAB nInitTabCount = 3; //! konfigurierbar !!!
for (SCTAB i=1; i<nInitTabCount; i++)
pDoc->MakeTable(i,false);
}
@@ -1803,7 +1803,7 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode )
// ReadExtOptions is now in Activate
- // Link-Update nicht verschachteln
+ // Link-Update nicht verschachteln
if ( pDocSh->GetCreateMode() != SFX_CREATE_MODE_INTERNAL &&
pDocSh->IsUpdateEnabled() ) // #105575#; update only in the first creation of the ViewShell
{
@@ -1832,7 +1832,7 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode )
}
}
- BOOL bReImport = FALSE; // importierte Daten aktualisieren
+ BOOL bReImport = FALSE; // importierte Daten aktualisieren
ScDBCollection* pDBColl = pDoc->GetDBCollection();
if ( pDBColl )
{
@@ -1912,19 +1912,19 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame,
{
RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScTabViewShell::ScTabViewShell" );
- const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions();
+ const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions();
- // if switching back from print preview,
- // restore the view settings that were active when creating the preview
- // #89897# ReadUserData must not happen from ctor, because the view's edit window
- // has to be shown by the sfx. ReadUserData is deferred until the first Activate call.
- // #106334# old DesignMode state from form layer must be restored, too
+ // if switching back from print preview,
+ // restore the view settings that were active when creating the preview
+ // #89897# ReadUserData must not happen from ctor, because the view's edit window
+ // has to be shown by the sfx. ReadUserData is deferred until the first Activate call.
+ // #106334# old DesignMode state from form layer must be restored, too
BYTE nForceDesignMode = SC_FORCEMODE_NONE;
if ( pOldSh && pOldSh->ISA( ScPreviewShell ) )
{
ScPreviewShell* pPreviewShell = ((ScPreviewShell*)pOldSh);
- aPendingUserData = pPreviewShell->GetSourceData(); // used in Activate
+ aPendingUserData = pPreviewShell->GetSourceData(); // used in Activate
nForceDesignMode = pPreviewShell->GetSourceDesignMode();
}
@@ -1932,7 +1932,7 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame,
if ( GetViewData()->GetDocShell()->IsPreview() )
{
- // preview for template dialog: always show whole page
+ // preview for template dialog: always show whole page
SetZoomType( SVX_ZOOM_WHOLEPAGE, TRUE ); // zoom value is recalculated at next Resize
}
else
@@ -1970,11 +1970,11 @@ __EXPORT ScTabViewShell::~ScTabViewShell()
SC_MOD()->ViewShellGone(this);
- RemoveSubShell(); // alle
+ RemoveSubShell(); // alle
SetWindow(0);
- // #54104# alles auf NULL, falls aus dem TabView-dtor noch darauf zugegriffen wird
- //! (soll eigentlich nicht !??!?!)
+ // #54104# alles auf NULL, falls aus dem TabView-dtor noch darauf zugegriffen wird
+ //! (soll eigentlich nicht !??!?!)
DELETEZ(pFontworkBarShell);
DELETEZ(pExtrusionBarShell);
@@ -2020,27 +2020,27 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData )
SCTAB nTab = GetViewData()->GetTabNo();
pDoc->GetName( nTab, rData.aTabName );
- rData.aTitle = pDocShell->GetTitle();
+ rData.aTitle = pDocShell->GetTitle();
const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject();
- rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
+ rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
if ( rData.aLongDocName.Len() )
rData.aShortDocName = rURLObj.GetName( INetURLObject::DECODE_UNAMBIGUOUS );
else
rData.aShortDocName = rData.aLongDocName = rData.aTitle;
- rData.nPageNo = 1;
- rData.nTotalPages = 99;
+ rData.nPageNo = 1;
+ rData.nTotalPages = 99;
- // eNumType kennt der Dialog selber
+ // eNumType kennt der Dialog selber
}
//------------------------------------------------------------------
void ScTabViewShell::SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest )
{
- bChartAreaValid = TRUE;
- aChartSource = rSource;
- aChartPos = rDest;
- nChartDestTab = GetViewData()->GetTabNo();
+ bChartAreaValid = TRUE;
+ aChartSource = rSource;
+ aChartPos = rDest;
+ nChartDestTab = GetViewData()->GetTabNo();
}
//UNUSED2008-05 void ScTabViewShell::ResetChartArea()
@@ -2050,9 +2050,9 @@ void ScTabViewShell::SetChartArea( const ScRangeListRef& rSource, const Rectangl
BOOL ScTabViewShell::GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const
{
- rSource = aChartSource;
- rDest = aChartPos;
- rTab = nChartDestTab;
+ rSource = aChartSource;
+ rDest = aChartPos;
+ rTab = nChartDestTab;
return bChartAreaValid;
}
@@ -2109,7 +2109,7 @@ void ScTabViewShell::GetTbxState( SfxItemSet& rSet )
rSet.Put( SfxUInt16Item( SID_TBXCTL_INSERT, nInsertCtrlState ) );
rSet.Put( SfxUInt16Item( SID_TBXCTL_INSCELLS, nInsCellsCtrlState ) );
- // ohne installiertes Chart darf Chart nicht Default sein...
+ // ohne installiertes Chart darf Chart nicht Default sein...
if ( nInsObjCtrlState == SID_DRAW_CHART && !SvtModuleOptions().IsChart() )
nInsObjCtrlState = SID_INSERT_OBJECT;
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index 1a3dd6928a17..472b35717139 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
- if (rHint.ISA(SfxSimpleHint)) // ohne Parameter
+ if (rHint.ISA(SfxSimpleHint)) // ohne Parameter
{
ULONG nSlot = ((SfxSimpleHint&)rHint).GetId();
switch ( nSlot )
@@ -76,7 +76,7 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
{
GetSelEngine()->Reset();
GetFunctionSet()->SetAnchorFlag(TRUE);
- // AnchorFlag, damit gleich mit Control angehaengt werden kann
+ // AnchorFlag, damit gleich mit Control angehaengt werden kann
}
}
break;
@@ -103,25 +103,25 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
case SC_HINT_DOC_SAVED:
{
- // beim "Save as" kann ein vorher schreibgeschuetztes Dokument
- // bearbeitbar werden, deshalb die Layer-Locks neu (#39884#)
- // (Invalidate etc. passiert schon vom Sfx her)
- // #42091# bei SID_EDITDOC kommt kein SFX_HINT_TITLECHANGED, darum
- // der eigene Hint aus DoSaveCompleted
- //! was ist mit SFX_HINT_SAVECOMPLETED ?
+ // beim "Save as" kann ein vorher schreibgeschuetztes Dokument
+ // bearbeitbar werden, deshalb die Layer-Locks neu (#39884#)
+ // (Invalidate etc. passiert schon vom Sfx her)
+ // #42091# bei SID_EDITDOC kommt kein SFX_HINT_TITLECHANGED, darum
+ // der eigene Hint aus DoSaveCompleted
+ //! was ist mit SFX_HINT_SAVECOMPLETED ?
UpdateLayerLocks();
- // #54891# Design-Modus bei jedem Speichern anzupassen, waere zuviel
- // (beim Speichern unter gleichem Namen soll er unveraendert bleiben)
- // Darum nur bei SFX_HINT_MODECHANGED (vom ViewFrame)
+ // #54891# Design-Modus bei jedem Speichern anzupassen, waere zuviel
+ // (beim Speichern unter gleichem Namen soll er unveraendert bleiben)
+ // Darum nur bei SFX_HINT_MODECHANGED (vom ViewFrame)
}
break;
case SFX_HINT_MODECHANGED:
- // #54891#/#58510# Da man sich nicht mehr darauf verlassen kann, woher
- // dieser Hint kommt, den Design-Modus immer dann umschalten, wenn der
- // ReadOnly-Status sich wirklich geaendert hat:
+ // #54891#/#58510# Da man sich nicht mehr darauf verlassen kann, woher
+ // dieser Hint kommt, den Design-Modus immer dann umschalten, wenn der
+ // ReadOnly-Status sich wirklich geaendert hat:
if ( GetViewData()->GetSfxDocShell()->IsReadOnly() != bReadOnly )
{
@@ -147,14 +147,14 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
break;
}
}
- else if (rHint.ISA(ScPaintHint)) // neu zeichnen
+ else if (rHint.ISA(ScPaintHint)) // neu zeichnen
{
ScPaintHint* pHint = (ScPaintHint*) &rHint;
USHORT nParts = pHint->GetParts();
SCTAB nTab = GetViewData()->GetTabNo();
if (pHint->GetStartTab() <= nTab && pHint->GetEndTab() >= nTab)
{
- if (nParts & PAINT_EXTRAS) // zuerst, falls Tabelle weg ist !!!
+ if (nParts & PAINT_EXTRAS) // zuerst, falls Tabelle weg ist !!!
if (PaintExtras())
nParts = PAINT_ALL;
@@ -163,7 +163,7 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
GetViewData()->GetDocShell()->UpdatePendingRowHeights( GetViewData()->GetTabNo() );
if (nParts & PAINT_SIZE)
- RepeatResize(); //! InvalidateBorder ???
+ RepeatResize(); //! InvalidateBorder ???
if (nParts & PAINT_GRID)
PaintArea( pHint->GetStartCol(), pHint->GetStartRow(),
pHint->GetEndCol(), pHint->GetEndRow() );
@@ -185,9 +185,9 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
HideNoteMarker();
}
}
- else if (rHint.ISA(ScEditViewHint)) // Edit-View anlegen
+ else if (rHint.ISA(ScEditViewHint)) // Edit-View anlegen
{
- // ScEditViewHint kommt nur an aktiver View an
+ // ScEditViewHint kommt nur an aktiver View an
ScEditViewHint* pHint = (ScEditViewHint*) &rHint;
SCTAB nTab = GetViewData()->GetTabNo();
@@ -200,25 +200,25 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
MakeEditView( pHint->GetEngine(), nCol, nRow );
- StopEditShell(); // sollte nicht gesetzt sein
+ StopEditShell(); // sollte nicht gesetzt sein
ScSplitPos eActive = GetViewData()->GetActivePart();
if ( GetViewData()->HasEditView(eActive) )
{
- // MakeEditView geht schief, wenn der Cursor ausserhalb des
- // Bildschirms steht. GetEditView gibt dann eine nicht aktive
- // View zurueck, darum die Abfrage HasEditView.
+ // MakeEditView geht schief, wenn der Cursor ausserhalb des
+ // Bildschirms steht. GetEditView gibt dann eine nicht aktive
+ // View zurueck, darum die Abfrage HasEditView.
- EditView* pView = GetViewData()->GetEditView(eActive); // ist nicht 0
+ EditView* pView = GetViewData()->GetEditView(eActive); // ist nicht 0
SetEditShell(pView ,TRUE);
}
}
}
}
- else if (rHint.ISA(ScTablesHint)) // Tabelle eingefuegt / geloescht
+ else if (rHint.ISA(ScTablesHint)) // Tabelle eingefuegt / geloescht
{
- // aktuelle Tabelle zuerst holen (kann bei DeleteTab an ViewData geaendert werden)
+ // aktuelle Tabelle zuerst holen (kann bei DeleteTab an ViewData geaendert werden)
SCTAB nActiveTab = GetViewData()->GetTabNo();
const ScTablesHint& rTabHint = (const ScTablesHint&)rHint;
@@ -245,43 +245,43 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
DBG_ERROR("unbekannter ScTablesHint");
}
- // hier keine Abfrage auf IsActive() mehr, weil die Aktion von Basic ausgehen
- // kann und dann auch die aktive View umgeschaltet werden muss.
+ // hier keine Abfrage auf IsActive() mehr, weil die Aktion von Basic ausgehen
+ // kann und dann auch die aktive View umgeschaltet werden muss.
SCTAB nNewTab = nActiveTab;
BOOL bForce = FALSE;
switch (nId)
{
case SC_TAB_INSERTED:
- if ( nTab1 <= nNewTab ) // vorher eingefuegt
+ if ( nTab1 <= nNewTab ) // vorher eingefuegt
++nNewTab;
break;
case SC_TAB_DELETED:
- if ( nTab1 < nNewTab ) // vorher geloescht
+ if ( nTab1 < nNewTab ) // vorher geloescht
--nNewTab;
- else if ( nTab1 == nNewTab ) // aktuelle geloescht
+ else if ( nTab1 == nNewTab ) // aktuelle geloescht
bForce = TRUE;
break;
case SC_TAB_MOVED:
- if ( nNewTab == nTab1 ) // verschobene Tabelle
+ if ( nNewTab == nTab1 ) // verschobene Tabelle
nNewTab = nTab2;
- else if ( nTab1 < nTab2 ) // nach hinten verschoben
+ else if ( nTab1 < nTab2 ) // nach hinten verschoben
{
- if ( nNewTab > nTab1 && nNewTab <= nTab2 ) // nachrueckender Bereich
+ if ( nNewTab > nTab1 && nNewTab <= nTab2 ) // nachrueckender Bereich
--nNewTab;
}
- else // nach vorne verschoben
+ else // nach vorne verschoben
{
- if ( nNewTab >= nTab2 && nNewTab < nTab1 ) // nachrueckender Bereich
+ if ( nNewTab >= nTab2 && nNewTab < nTab1 ) // nachrueckender Bereich
++nNewTab;
}
break;
case SC_TAB_COPIED:
- if ( nNewTab >= nTab2 ) // vorher eingefuegt
+ if ( nNewTab >= nTab2 ) // vorher eingefuegt
++nNewTab;
break;
case SC_TAB_HIDDEN:
- if ( nTab1 == nNewTab ) // aktuelle ausgeblendet
+ if ( nTab1 == nNewTab ) // aktuelle ausgeblendet
bForce = TRUE;
break;
}
@@ -310,17 +310,17 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
//------------------------------------------------------------------
-void ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc,
- ScViewData* pViewData,
+void ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc,
+ ScViewData* pViewData,
SvxNumberInfoItem** ppItem )
{
//------------------------------
// NumberInfo-Item konstruieren:
//------------------------------
- ScBaseCell* pCell = NULL;
- SvxNumberValueType eValType = SVX_VALUE_TYPE_UNDEFINED;
- double nCellValue = 0;
- String aCellString;
+ ScBaseCell* pCell = NULL;
+ SvxNumberValueType eValType = SVX_VALUE_TYPE_UNDEFINED;
+ double nCellValue = 0;
+ String aCellString;
pDoc->GetCell( pViewData->GetCurX(),
pViewData->GetCurY(),
@@ -403,7 +403,7 @@ void ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc,
//------------------------------------------------------------------
void ScTabViewShell::UpdateNumberFormatter(
- ScDocument* pDoc,
+ ScDocument* pDoc,
const SvxNumberInfoItem& rInfoItem )
{
const sal_uInt32 nDelCount = rInfoItem.GetDelCount();
diff --git a/sc/source/ui/view/tabvwsh8.cxx b/sc/source/ui/view/tabvwsh8.cxx
index b3612fa0c6f2..da9809db7142 100644
--- a/sc/source/ui/view/tabvwsh8.cxx
+++ b/sc/source/ui/view/tabvwsh8.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,10 +63,10 @@ void ScTabViewShell::SetDefaultFrameLine( const SvxBorderLine* pLine )
BOOL __EXPORT ScTabViewShell::HasSelection( BOOL bText ) const
{
BOOL bHas = FALSE;
- ScViewData* pData = (ScViewData*)GetViewData(); // const weggecasted
+ ScViewData* pData = (ScViewData*)GetViewData(); // const weggecasted
if ( bText )
{
- // Text enthalten: Anzahl2 >= 1
+ // Text enthalten: Anzahl2 >= 1
ScDocument* pDoc = pData->GetDocument();
ScMarkData& rMark = pData->GetMarkData();
ScAddress aCursor( pData->GetCurX(), pData->GetCurY(), pData->GetTabNo() );
diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx
index 30f9c50fd925..d1beb28fb23c 100644
--- a/sc/source/ui/view/tabvwsh9.cxx
+++ b/sc/source/ui/view/tabvwsh9.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,20 +53,20 @@
// forwards -> galwrap.cxx (wg. CLOOKs)
-USHORT GallerySGA_FORMAT_GRAPHIC();
-Graphic GalleryGetGraphic ();
-BOOL GalleryIsLinkage ();
-String GalleryGetFullPath ();
-String GalleryGetFilterName ();
+USHORT GallerySGA_FORMAT_GRAPHIC();
+Graphic GalleryGetGraphic ();
+BOOL GalleryIsLinkage ();
+String GalleryGetFullPath ();
+String GalleryGetFilterName ();
// forwards -> imapwrap.cxx (wg. CLOOKs)
class SvxIMapDlg;
-USHORT ScIMapChildWindowId();
-SvxIMapDlg* ScGetIMapDlg();
-const void* ScIMapDlgGetObj( SvxIMapDlg* pDlg );
-const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg );
+USHORT ScIMapChildWindowId();
+SvxIMapDlg* ScGetIMapDlg();
+const void* ScIMapDlgGetObj( SvxIMapDlg* pDlg );
+const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg );
//------------------------------------------------------------------
@@ -83,7 +83,7 @@ void ScTabViewShell::ExecChildWin(SfxRequest& rReq)
rReq.Ignore();
}
break;
-
+
case SID_AVMEDIA_PLAYER:
{
SfxViewFrame* pThisFrame = GetViewFrame();
@@ -131,10 +131,10 @@ void ScTabViewShell::ExecGallery( SfxRequest& rReq )
MakeDrawLayer();
Graphic aGraphic = GalleryGetGraphic();
- Point aPos = GetInsertPos();
+ Point aPos = GetInsertPos();
String aPath, aFilter;
- if ( GalleryIsLinkage() ) // als Link einfuegen?
+ if ( GalleryIsLinkage() ) // als Link einfuegen?
{
aPath = GalleryGetFullPath();
aFilter = GalleryGetFilterName();
@@ -144,8 +144,8 @@ void ScTabViewShell::ExecGallery( SfxRequest& rReq )
}
else if ( nFormats & SGA_FORMAT_SOUND )
{
- // #98115# for sounds (linked or not), insert a hyperlink button,
- // like in Impress and Writer
+ // #98115# for sounds (linked or not), insert a hyperlink button,
+ // like in Impress and Writer
GalleryExplorer* pGal = SVX_GALLERY();
if ( pGal )
@@ -190,7 +190,7 @@ void ScTabViewShell::ExecImageMap( SfxRequest& rReq )
if ( pThisFrame->HasChildWindow( nId ) )
{
- SvxIMapDlg* pDlg = ScGetIMapDlg();
+ SvxIMapDlg* pDlg = ScGetIMapDlg();
if ( pDlg )
{
SdrView* pDrView = GetSdrView();
@@ -214,13 +214,13 @@ void ScTabViewShell::ExecImageMap( SfxRequest& rReq )
if ( pMark )
{
- SdrObject* pSdrObj = pMark->GetMarkedSdrObj();
- SvxIMapDlg* pDlg = ScGetIMapDlg();
+ SdrObject* pSdrObj = pMark->GetMarkedSdrObj();
+ SvxIMapDlg* pDlg = ScGetIMapDlg();
if ( ScIMapDlgGetObj(pDlg) == (void*) pSdrObj )
{
- const ImageMap& rImageMap = ScIMapDlgGetMap(pDlg);
- ScIMapInfo* pIMapInfo = ScDrawLayer::GetIMapInfo( pSdrObj );
+ const ImageMap& rImageMap = ScIMapDlgGetMap(pDlg);
+ ScIMapInfo* pIMapInfo = ScDrawLayer::GetIMapInfo( pSdrObj );
if ( !pIMapInfo )
pSdrObj->InsertUserData( new ScIMapInfo( rImageMap ) );
@@ -245,7 +245,7 @@ void ScTabViewShell::GetImageMapState( SfxItemSet& rSet )
{
case SID_IMAP:
{
- // Disabled wird nicht mehr...
+ // Disabled wird nicht mehr...
BOOL bThere = FALSE;
SfxViewFrame* pThisFrame = GetViewFrame();
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 7734f3e24ff8..436fe7eab168 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -74,8 +74,8 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode )
String aStr;
ScSubTotalFunc eFunc = (ScSubTotalFunc) SC_MOD()->GetAppOptions().GetStatusFunc();
- ScViewData* pViewData = GetViewData();
- ScMarkData& rMark = pViewData->GetMarkData();
+ ScViewData* pViewData = GetViewData();
+ ScMarkData& rMark = pViewData->GetMarkData();
bool bIgnoreError = (rMark.IsMarked() || rMark.IsMultiMarked());
if (bIgnoreError && (eFunc == SUBTOTAL_FUNC_CNT || eFunc == SUBTOTAL_FUNC_CNT2))
@@ -90,12 +90,12 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode )
USHORT nGlobStrId = 0;
switch (eFunc)
{
- case SUBTOTAL_FUNC_AVE: nGlobStrId = STR_FUN_TEXT_AVG; break;
- case SUBTOTAL_FUNC_CNT: nGlobStrId = STR_FUN_TEXT_COUNT; break;
+ case SUBTOTAL_FUNC_AVE: nGlobStrId = STR_FUN_TEXT_AVG; break;
+ case SUBTOTAL_FUNC_CNT: nGlobStrId = STR_FUN_TEXT_COUNT; break;
case SUBTOTAL_FUNC_CNT2: nGlobStrId = STR_FUN_TEXT_COUNT2; break;
- case SUBTOTAL_FUNC_MAX: nGlobStrId = STR_FUN_TEXT_MAX; break;
- case SUBTOTAL_FUNC_MIN: nGlobStrId = STR_FUN_TEXT_MIN; break;
- case SUBTOTAL_FUNC_SUM: nGlobStrId = STR_FUN_TEXT_SUM; break;
+ case SUBTOTAL_FUNC_MAX: nGlobStrId = STR_FUN_TEXT_MAX; break;
+ case SUBTOTAL_FUNC_MIN: nGlobStrId = STR_FUN_TEXT_MIN; break;
+ case SUBTOTAL_FUNC_SUM: nGlobStrId = STR_FUN_TEXT_SUM; break;
default:
{
// added to avoid warnings
@@ -103,10 +103,10 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode )
}
if (nGlobStrId)
{
- ScDocument* pDoc = pViewData->GetDocument();
- SCCOL nPosX = pViewData->GetCurX();
- SCROW nPosY = pViewData->GetCurY();
- SCTAB nTab = pViewData->GetTabNo();
+ ScDocument* pDoc = pViewData->GetDocument();
+ SCCOL nPosX = pViewData->GetCurX();
+ SCROW nPosY = pViewData->GetCurY();
+ SCTAB nTab = pViewData->GetTabNo();
aStr = ScGlobal::GetRscString(nGlobStrId);
aStr += '=';
@@ -119,12 +119,12 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode )
aStr += '0';
else
{
- // Anzahl im Standardformat, die anderen nach Cursorposition
+ // Anzahl im Standardformat, die anderen nach Cursorposition
SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
sal_uInt32 nNumFmt = 0;
if ( eFunc != SUBTOTAL_FUNC_CNT && eFunc != SUBTOTAL_FUNC_CNT2 )
{
- // Zahlformat aus Attributen oder Formel
+ // Zahlformat aus Attributen oder Formel
pDoc->GetNumberFormat( nPosX, nPosY, nTab, nNumFmt );
if ( (nNumFmt % SV_COUNTRY_LANGUAGE_OFFSET) == 0 )
{
@@ -132,12 +132,12 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode )
pDoc->GetCell( nPosX, nPosY, nTab, pCell );
if (pCell && pCell->GetCellType() == CELLTYPE_FORMULA)
{
-
+
nNumFmt = ((ScFormulaCell*)pCell)->GetStandardFormat(*pFormatter, nNumFmt );
}
}
}
-
+
String aValStr;
Color* pDummy;
pFormatter->GetOutputString( nVal, nNumFmt, aValStr, &pDummy );
@@ -154,24 +154,24 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode )
-// Funktionen, die je nach Selektion disabled sind
-// Default:
-// SID_DELETE,
-// SID_DELETE_CONTENTS,
-// FID_DELETE_CELL
-// FID_VALIDATION
+// Funktionen, die je nach Selektion disabled sind
+// Default:
+// SID_DELETE,
+// SID_DELETE_CONTENTS,
+// FID_DELETE_CELL
+// FID_VALIDATION
void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
{
- ScViewData* pViewData = GetViewData();
- ScDocument* pDoc = pViewData->GetDocument();
+ ScViewData* pViewData = GetViewData();
+ ScDocument* pDoc = pViewData->GetDocument();
ScDocShell* pDocShell = pViewData->GetDocShell();
- ScMarkData& rMark = pViewData->GetMarkData();
- SCCOL nPosX = pViewData->GetCurX();
- SCROW nPosY = pViewData->GetCurY();
- SCTAB nTab = pViewData->GetTabNo();
- USHORT nMyId = 0;
+ ScMarkData& rMark = pViewData->GetMarkData();
+ SCCOL nPosX = pViewData->GetCurX();
+ SCROW nPosY = pViewData->GetCurY();
+ SCTAB nTab = pViewData->GetTabNo();
+ USHORT nMyId = 0;
SfxViewFrame* pThisFrame = GetViewFrame();
BOOL bOle = GetViewFrame()->GetFrame().IsInPlace();
@@ -179,8 +179,8 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
SCTAB nTabCount = pDoc->GetTableCount();
SCTAB nTabSelCount = rMark.GetSelectCount();
- SfxWhichIter aIter(rSet);
- USHORT nWhich = aIter.FirstWhich();
+ SfxWhichIter aIter(rSet);
+ USHORT nWhich = aIter.FirstWhich();
while ( nWhich )
{
@@ -235,7 +235,7 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
case SID_SEARCH_OPTIONS:
{
- USHORT nOptions = 0xffff; // alles erlaubt
+ USHORT nOptions = 0xffff; // alles erlaubt
// wenn ReadOnly, kein Ersetzen:
if (GetViewData()->GetDocShell()->IsReadOnly())
nOptions &= ~( SEARCH_OPTIONS_REPLACE | SEARCH_OPTIONS_REPLACE_ALL );
@@ -246,16 +246,16 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
case SID_CURRENTCELL:
{
ScAddress aScAddress( GetViewData()->GetCurX(), GetViewData()->GetCurY(), 0 );
- String aAddr;
+ String aAddr;
aScAddress.Format( aAddr, SCA_ABS, NULL, pDoc->GetAddressConvention() );
- SfxStringItem aPosItem( SID_CURRENTCELL, aAddr );
+ SfxStringItem aPosItem( SID_CURRENTCELL, aAddr );
rSet.Put( aPosItem );
}
break;
case SID_CURRENTTAB:
- // Tabelle fuer Basic ist 1-basiert
+ // Tabelle fuer Basic ist 1-basiert
rSet.Put( SfxUInt16Item( nWhich, static_cast<sal_uInt16>(GetViewData()->GetTabNo()) + 1 ) );
break;
@@ -284,7 +284,7 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
case FID_RESET_PRINTZOOM:
{
- // disablen, wenn schon Default eingestellt
+ // disablen, wenn schon Default eingestellt
String aStyleName = pDoc->GetPageStyle( nTab );
ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
@@ -453,7 +453,7 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
break;
case SID_FORMATPAGE:
- //! bei geschuetzten Tabellen ???
+ //! bei geschuetzten Tabellen ???
if ( pDocShell && ( pDocShell->IsReadOnly() || pDocShell->IsDocShared() ) )
rSet.DisableItem( nWhich );
break;
@@ -480,16 +480,16 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet )
//------------------------------------------------------------------
void ScTabViewShell::ExecuteCellFormatDlg( SfxRequest& rReq, USHORT nTabPage )
{
- //CHINA001 ScAttrDlg* pDlg = NULL;
- SfxAbstractTabDialog * pDlg = NULL; //CHINA001
- ScDocument* pDoc = GetViewData()->GetDocument();
+ //CHINA001 ScAttrDlg* pDlg = NULL;
+ SfxAbstractTabDialog * pDlg = NULL; //CHINA001
+ ScDocument* pDoc = GetViewData()->GetDocument();
- SvxBoxItem aLineOuter( ATTR_BORDER );
- SvxBoxInfoItem aLineInner( ATTR_BORDER_INNER );
+ SvxBoxItem aLineOuter( ATTR_BORDER );
+ SvxBoxInfoItem aLineInner( ATTR_BORDER_INNER );
- SvxNumberInfoItem* pNumberInfoItem = NULL;
- const ScPatternAttr* pOldAttrs = GetSelectionPattern();
- SfxItemSet* pOldSet = new SfxItemSet(
+ SvxNumberInfoItem* pNumberInfoItem = NULL;
+ const ScPatternAttr* pOldAttrs = GetSelectionPattern();
+ SfxItemSet* pOldSet = new SfxItemSet(
pOldAttrs->GetItemSet() );
@@ -608,20 +608,20 @@ void ScTabViewShell::UpdateInputHandler( BOOL bForce /* = FALSE */, BOOL bStopEd
if ( pHdl )
{
- String aString;
- const EditTextObject* pObject = NULL;
- ScViewData* pViewData = GetViewData();
- ScDocument* pDoc = pViewData->GetDocument();
- CellType eType;
- SCCOL nPosX = pViewData->GetCurX();
- SCROW nPosY = pViewData->GetCurY();
- SCTAB nTab = pViewData->GetTabNo();
- SCTAB nStartTab = 0;
- SCTAB nEndTab = 0;
- SCCOL nStartCol = 0;
- SCROW nStartRow = 0;
- SCCOL nEndCol = 0;
- SCROW nEndRow = 0;
+ String aString;
+ const EditTextObject* pObject = NULL;
+ ScViewData* pViewData = GetViewData();
+ ScDocument* pDoc = pViewData->GetDocument();
+ CellType eType;
+ SCCOL nPosX = pViewData->GetCurX();
+ SCROW nPosY = pViewData->GetCurY();
+ SCTAB nTab = pViewData->GetTabNo();
+ SCTAB nStartTab = 0;
+ SCTAB nEndTab = 0;
+ SCCOL nStartCol = 0;
+ SCROW nStartRow = 0;
+ SCCOL nEndCol = 0;
+ SCROW nEndRow = 0;
pViewData->GetSimpleArea( nStartCol, nStartRow, nStartTab,
nEndCol, nEndRow, nEndTab );
@@ -631,7 +631,7 @@ void ScTabViewShell::UpdateInputHandler( BOOL bForce /* = FALSE */, BOOL bStopEd
PutInOrder( nStartTab, nEndTab );
BOOL bHideFormula = FALSE;
- BOOL bHideAll = FALSE;
+ BOOL bHideAll = FALSE;
if (pDoc->IsTabProtected(nTab))
{
@@ -639,7 +639,7 @@ void ScTabViewShell::UpdateInputHandler( BOOL bForce /* = FALSE */, BOOL bStopEd
pDoc->GetAttr( nPosX,nPosY,nTab,
ATTR_PROTECTION);
bHideFormula = pProt->GetHideFormula();
- bHideAll = pProt->GetHideCell();
+ bHideAll = pProt->GetHideCell();
}
if (!bHideAll)
@@ -661,10 +661,10 @@ void ScTabViewShell::UpdateInputHandler( BOOL bForce /* = FALSE */, BOOL bStopEd
pDoc->GetInputString( nPosX, nPosY, nTab, aString );
if (eType == CELLTYPE_STRING)
{
- // Bei Bedarf ein ' vorneweg, damit der String nicht ungewollt
- // als Zahl interpretiert wird, und um dem Benutzer zu zeigen,
- // dass es ein String ist (#35060#).
- //! Auch bei Zahlformat "Text"? -> dann beim Editieren wegnehmen
+ // Bei Bedarf ein ' vorneweg, damit der String nicht ungewollt
+ // als Zahl interpretiert wird, und um dem Benutzer zu zeigen,
+ // dass es ein String ist (#35060#).
+ //! Auch bei Zahlformat "Text"? -> dann beim Editieren wegnehmen
SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
sal_uInt32 nNumFmt;
@@ -676,21 +676,21 @@ void ScTabViewShell::UpdateInputHandler( BOOL bForce /* = FALSE */, BOOL bStopEd
}
}
- ScInputHdlState aState( ScAddress( nPosX, nPosY, nTab ),
+ ScInputHdlState aState( ScAddress( nPosX, nPosY, nTab ),
ScAddress( nStartCol, nStartRow, nTab ),
- ScAddress( nEndCol, nEndRow, nTab ),
+ ScAddress( nEndCol, nEndRow, nTab ),
aString,
pObject );
- // if using the view's local input handler, this view can always be set
- // as current view inside NotifyChange.
+ // if using the view's local input handler, this view can always be set
+ // as current view inside NotifyChange.
ScTabViewShell* pSourceSh = pInputHandler ? this : NULL;
pHdl->NotifyChange( &aState, bForce, pSourceSh, bStopEditing );
}
SfxBindings& rBindings = GetViewFrame()->GetBindings();
- rBindings.Invalidate( SID_STATUS_SUM ); // immer zusammen mit Eingabezeile
+ rBindings.Invalidate( SID_STATUS_SUM ); // immer zusammen mit Eingabezeile
rBindings.Invalidate( SID_ATTR_SIZE );
rBindings.Invalidate( SID_TABLE_CELL );
}
@@ -705,7 +705,7 @@ void ScTabViewShell::UpdateInputHandlerCellAdjust( SvxCellHorJustify eJust )
void __EXPORT ScTabViewShell::ExecuteSave( SfxRequest& rReq )
{
- // nur SID_SAVEDOC / SID_SAVEASDOC
+ // nur SID_SAVEDOC / SID_SAVEASDOC
// Eingabe auf jeden Fall abschliessen, auch wenn eine Formel bearbeitet wird
SC_MOD()->InputEnterHandler();
@@ -779,8 +779,8 @@ void ScTabViewShell::ExecuteUndo(SfxRequest& rReq)
GetViewFrame()->GetBindings().InvalidateAll(sal_False);
}
break;
-// default:
-// GetViewFrame()->ExecuteSlot( rReq );
+// default:
+// GetViewFrame()->ExecuteSlot( rReq );
}
}
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 8f4a203ea14d..c010400cc3bb 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using namespace com::sun::star;
void ScTabViewShell::ConnectObject( SdrOle2Obj* pObj )
{
- // wird aus dem Paint gerufen
+ // wird aus dem Paint gerufen
uno::Reference < embed::XEmbeddedObject > xObj = pObj->GetObjRef();
Window* pWin = GetActiveWin();
- // #41412# wenn schon connected ist, nicht nochmal SetObjArea/SetSizeScale
+ // #41412# wenn schon connected ist, nicht nochmal SetObjArea/SetSizeScale
SfxInPlaceClient* pClient = FindIPClient( xObj, pWin );
if ( !pClient )
@@ -101,7 +101,7 @@ void ScTabViewShell::ConnectObject( SdrOle2Obj* pObj )
Fraction aScaleWidth (aDrawSize.Width(), aOleSize.Width() );
Fraction aScaleHeight(aDrawSize.Height(), aOleSize.Height() );
- aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj
+ aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj
aScaleHeight.ReduceInaccurate(10);
pClient->SetSizeScale(aScaleWidth,aScaleHeight);
@@ -125,9 +125,9 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb )
BOOL bErrorShown = FALSE;
// linked objects aren't supported
-// if ( xIPObj->IsLink() )
-// nErr = xIPObj->DoVerb(nVerb); // gelinkt -> ohne Client etc.
-// else
+// if ( xIPObj->IsLink() )
+// nErr = xIPObj->DoVerb(nVerb); // gelinkt -> ohne Client etc.
+// else
{
SfxInPlaceClient* pClient = FindIPClient( xObj, pWin );
if ( !pClient )
@@ -144,7 +144,7 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb )
if ( pClient->GetAspect() != embed::Aspects::MSOLE_ICON
&& ( xObj->getStatus( pClient->GetAspect() ) & embed::EmbedMisc::MS_EMBED_RECOMPOSEONRESIZE ) )
{
- // scale must always be 1 - change VisArea if different from client size
+ // scale must always be 1 - change VisArea if different from client size
if ( aDrawSize != aOleSize )
{
@@ -159,11 +159,11 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb )
}
else
{
- // calculate scale from client and VisArea size
+ // calculate scale from client and VisArea size
Fraction aScaleWidth (aDrawSize.Width(), aOleSize.Width() );
Fraction aScaleHeight(aDrawSize.Height(), aOleSize.Height() );
- aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj
+ aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj
aScaleHeight.ReduceInaccurate(10);
pClient->SetSizeScale(aScaleWidth,aScaleHeight);
}
@@ -212,7 +212,7 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb )
if (nErr != ERRCODE_NONE && !bErrorShown)
ErrorHandler::HandleError(nErr);
- //! SetDocumentName sollte schon im Sfx passieren ???
+ //! SetDocumentName sollte schon im Sfx passieren ???
//TODO/LATER: how "SetDocumentName"?
//xIPObj->SetDocumentName( GetViewData()->GetDocShell()->GetTitle() );
@@ -223,7 +223,7 @@ ErrCode __EXPORT ScTabViewShell::DoVerb(long nVerb)
{
SdrView* pView = GetSdrView();
if (!pView)
- return ERRCODE_SO_NOTIMPL; // soll nicht sein
+ return ERRCODE_SO_NOTIMPL; // soll nicht sein
SdrOle2Obj* pOle2Obj = NULL;
SdrGrafObj* pGrafObj = NULL;
@@ -275,7 +275,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
UpdateInputHandler();
}
- // Rahmen fuer Chart einfuegen wird abgebrochen:
+ // Rahmen fuer Chart einfuegen wird abgebrochen:
FuPoor* pPoor = GetDrawFuncPtr();
if ( pPoor && pPoor->GetSlotID() == SID_DRAW_CHART )
GetViewData()->GetDispatcher().Execute(SID_DRAW_CHART, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD);
@@ -283,13 +283,13 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
MakeDrawLayer();
SfxBindings& rBindings = GetViewFrame()->GetBindings();
- ScTabView* pTabView = GetViewData()->GetView();
- Window* pWin = pTabView->GetActiveWin();
- ScDrawView* pView = pTabView->GetScDrawView();
- ScDocShell* pDocSh = GetViewData()->GetDocShell();
- ScDocument* pDoc = pDocSh->GetDocument();
-// SdrModel* pDrModel = pDocSh->MakeDrawLayer();
- SdrModel* pDrModel = pView->GetModel();
+ ScTabView* pTabView = GetViewData()->GetView();
+ Window* pWin = pTabView->GetActiveWin();
+ ScDrawView* pView = pTabView->GetScDrawView();
+ ScDocShell* pDocSh = GetViewData()->GetDocShell();
+ ScDocument* pDoc = pDocSh->GetDocument();
+// SdrModel* pDrModel = pDocSh->MakeDrawLayer();
+ SdrModel* pDrModel = pView->GetModel();
switch ( nSlot )
{
@@ -305,7 +305,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
case SID_INSERT_DIAGRAM:
FuInsertChart(this, pWin, pView, pDrModel, rReq);
-//? SC_MOD()->SetFunctionDlg( NULL );//XXX
+//? SC_MOD()->SetFunctionDlg( NULL );//XXX
break;
case SID_INSERT_OBJECT:
@@ -320,7 +320,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
case SID_OBJECTRESIZE:
{
- // Der Server moechte die Clientgrosse verandern
+ // Der Server moechte die Clientgrosse verandern
SfxInPlaceClient* pClient = GetIPClient();
@@ -376,7 +376,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
if(pDescriptorItem)
{
- //! merge with ScViewFunc::PasteDataFormat (SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE)?
+ //! merge with ScViewFunc::PasteDataFormat (SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE)?
ScDrawView* pDrView = GetScDrawView();
SdrPageView* pPageView = pDrView ? pDrView->GetSdrPageView() : NULL;
@@ -470,7 +470,7 @@ void ScTabViewShell::GetDrawInsState(SfxItemSet &rSet)
break;
case SID_INSERT_APPLET:
- // wenn SOLAR_JAVA nicht definiert ist, immer disablen
+ // wenn SOLAR_JAVA nicht definiert ist, immer disablen
#ifdef SOLAR_JAVA
if (bOle || bTabProt)
#endif
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 7d1cbb05761b..ace1aae4df97 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -74,8 +74,8 @@
void ScTabViewShell::SetCurRefDlgId( USHORT nNew )
{
- // CurRefDlgId is stored in ScModule to find if a ref dialog is open,
- // and in the view to identify the view that has opened the dialog
+ // CurRefDlgId is stored in ScModule to find if a ref dialog is open,
+ // and in the view to identify the view that has opened the dialog
nCurRefDlgId = nNew;
}
@@ -83,18 +83,18 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
SfxBindings* pB, SfxChildWindow* pCW, SfxChildWinInfo* pInfo,
Window* pParent, USHORT nSlotId )
{
- // Dialog nur aufmachen, wenn ueber ScModule::SetRefDialog gerufen, damit
- // z.B. nach einem Absturz offene Ref-Dialoge nicht wiederkommen (#42341#).
+ // Dialog nur aufmachen, wenn ueber ScModule::SetRefDialog gerufen, damit
+ // z.B. nach einem Absturz offene Ref-Dialoge nicht wiederkommen (#42341#).
if ( SC_MOD()->GetCurRefDlgId() != nSlotId )
return NULL;
if ( nCurRefDlgId != nSlotId )
{
- // the dialog has been opened in a different view
- // -> lock the dispatcher for this view (modal mode)
+ // the dialog has been opened in a different view
+ // -> lock the dispatcher for this view (modal mode)
- GetViewData()->GetDispatcher().Lock( TRUE ); // lock is reset when closing dialog
+ GetViewData()->GetDispatcher().Lock( TRUE ); // lock is reset when closing dialog
return NULL;
}
@@ -129,13 +129,13 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
if ( !pDlgData )
{
- ScConsolidateParam aConsParam;
+ ScConsolidateParam aConsParam;
SCCOL nStartCol, nEndCol;
SCROW nStartRow, nEndRow;
SCTAB nStartTab, nEndTab;
GetViewData()->GetSimpleArea( nStartCol, nStartRow, nStartTab,
- nEndCol, nEndRow, nEndTab );
+ nEndCol, nEndRow, nEndTab );
PutInOrder( nStartCol, nEndCol );
PutInOrder( nStartRow, nEndRow );
@@ -158,7 +158,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
case SID_DEFINE_DBNAME:
{
- // wenn auf einem bestehenden Bereich aufgerufen, den markieren
+ // wenn auf einem bestehenden Bereich aufgerufen, den markieren
GetDBData( TRUE, SC_DB_OLD );
const ScMarkData& rMark = GetViewData()->GetMarkData();
if ( !rMark.IsMarked() && !rMark.IsMultiMarked() )
@@ -170,8 +170,8 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
case SID_SPECIAL_FILTER:
{
- ScQueryParam aQueryParam;
- SfxItemSet aArgSet( GetPool(),
+ ScQueryParam aQueryParam;
+ SfxItemSet aArgSet( GetPool(),
SCITEM_QUERYDATA,
SCITEM_QUERYDATA );
@@ -195,8 +195,8 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
case SID_FILTER:
{
- ScQueryParam aQueryParam;
- SfxItemSet aArgSet( GetPool(),
+ ScQueryParam aQueryParam;
+ SfxItemSet aArgSet( GetPool(),
SCITEM_QUERYDATA,
SCITEM_QUERYDATA );
@@ -216,8 +216,8 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
case SID_OPENDLG_TABOP:
{
- ScViewData* pViewData = GetViewData();
- ScRefAddress aCurPos ( pViewData->GetCurX(),
+ ScViewData* pViewData = GetViewData();
+ ScRefAddress aCurPos ( pViewData->GetCurX(),
pViewData->GetCurY(),
pViewData->GetTabNo(),
FALSE, FALSE, FALSE );
@@ -228,7 +228,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
case SID_OPENDLG_SOLVE:
{
- ScViewData* pViewData = GetViewData();
+ ScViewData* pViewData = GetViewData();
ScAddress aCurPos( pViewData->GetCurX(),
pViewData->GetCurY(),
pViewData->GetTabNo());
@@ -246,7 +246,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
case SID_OPENDLG_PIVOTTABLE:
{
- // all settings must be in pDialogDPObject
+ // all settings must be in pDialogDPObject
if( pDialogDPObject )
{
@@ -279,7 +279,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
case SID_OPENDLG_FUNCTION:
{
- // Dialog schaut selber, was in der Zelle steht
+ // Dialog schaut selber, was in der Zelle steht
pResult = new ScFormulaDlg( pB, pCW, pParent, GetViewData(),ScGlobal::GetStarCalcFunctionMgr() );
}
@@ -287,7 +287,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
case FID_CHG_SHOW:
{
- // Dialog schaut selber, was in der Zelle steht
+ // Dialog schaut selber, was in der Zelle steht
pResult = new ScHighlightChgDlg( pB, pCW, pParent, GetViewData() );
}
@@ -295,7 +295,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
case WID_SIMPLE_REF:
{
- // Dialog schaut selber, was in der Zelle steht
+ // Dialog schaut selber, was in der Zelle steht
ScViewData* pViewData = GetViewData();
pViewData->SetRefTabNo( pViewData->GetTabNo() );
@@ -311,9 +311,9 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
if (pResult)
{
- // Die Dialoge gehen immer mit eingeklapptem Zusaetze-Button auf,
- // darum muss die Groesse ueber das Initialize gerettet werden
- // (oder den Zusaetze-Status mit speichern !!!)
+ // Die Dialoge gehen immer mit eingeklapptem Zusaetze-Button auf,
+ // darum muss die Groesse ueber das Initialize gerettet werden
+ // (oder den Zusaetze-Status mit speichern !!!)
Size aSize = pResult->GetSizePixel();
pResult->Initialize( pInfo );
diff --git a/sc/source/ui/view/tabvwshd.cxx b/sc/source/ui/view/tabvwshd.cxx
index 4ef5186a25a0..0a9bb9e57b6a 100644
--- a/sc/source/ui/view/tabvwshd.cxx
+++ b/sc/source/ui/view/tabvwshd.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +58,13 @@
#define IS_AVAILABLE(WhichId,ppItem) \
(pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
-//! Parent-Window fuer Dialoge
-//! Problem: OLE Server!
+//! Parent-Window fuer Dialoge
+//! Problem: OLE Server!
Window* ScTabViewShell::GetDialogParent()
{
- // #95513# if a ref-input dialog is open, use it as parent
- // (necessary when a slot is executed from the dialog's OK handler)
+ // #95513# if a ref-input dialog is open, use it as parent
+ // (necessary when a slot is executed from the dialog's OK handler)
if ( nCurRefDlgId && nCurRefDlgId == SC_MOD()->GetCurRefDlgId() )
{
SfxViewFrame* pViewFrm = GetViewFrame();
@@ -91,7 +91,7 @@ Window* ScTabViewShell::GetDialogParent()
// return pEnv->GetEditWin();
}
- return GetActiveWin(); // for normal views, too
+ return GetActiveWin(); // for normal views, too
}
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index c0af39226c3f..7d0fec8de376 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ String __EXPORT ScTabViewShell::GetSelectionText( BOOL bWholeWord )
}
else
{
- // #i111531# with 1M rows it was necessary to limit the range
+ // #i111531# with 1M rows it was necessary to limit the range
// to the actually used data area.
SCCOL nCol1, nCol2;
SCROW nRow1, nRow2;
@@ -114,10 +114,10 @@ String __EXPORT ScTabViewShell::GetSelectionText( BOOL bWholeWord )
aStrSelection.ConvertLineEnd( LINEEND_CR );
- // Tab/CR durch Space ersetzen, wenn fuer Dialog oder per Basic/SelectionTextExt,
- // oder wenn es eine einzelne Zeile ist.
- // Sonst mehrzeilig mit Tabs beibehalten (z.B. Mail oder Basic/SelectionText).
- // Fuer Mail werden die Tabs dann spaeter in (mehrere) Spaces gewandelt.
+ // Tab/CR durch Space ersetzen, wenn fuer Dialog oder per Basic/SelectionTextExt,
+ // oder wenn es eine einzelne Zeile ist.
+ // Sonst mehrzeilig mit Tabs beibehalten (z.B. Mail oder Basic/SelectionText).
+ // Fuer Mail werden die Tabs dann spaeter in (mehrere) Spaces gewandelt.
if ( bInFormatDialog || bWholeWord || aRange.aEnd.Row() == aRange.aStart.Row() )
{
@@ -141,22 +141,22 @@ void ScTabViewShell::InsertURL( const String& rName, const String& rURL, const S
USHORT nMode )
{
SvxLinkInsertMode eMode = (SvxLinkInsertMode) nMode;
- BOOL bAsText = ( eMode != HLINK_BUTTON ); // Default ist jetzt Text
+ BOOL bAsText = ( eMode != HLINK_BUTTON ); // Default ist jetzt Text
if ( bAsText )
{
if ( GetViewData()->IsActive() )
{
- // if the view is active, always use InsertURLField, which starts EditMode
- // and selects the URL, so it can be changed from the URL bar / dialog
+ // if the view is active, always use InsertURLField, which starts EditMode
+ // and selects the URL, so it can be changed from the URL bar / dialog
InsertURLField( rName, rURL, rTarget );
}
else
{
- // #91216# if the view is not active, InsertURLField doesn't work
- // -> use InsertBookmark to directly manipulate cell content
- // bTryReplace=TRUE -> if cell contains only one URL, replace it
+ // #91216# if the view is not active, InsertURLField doesn't work
+ // -> use InsertBookmark to directly manipulate cell content
+ // bTryReplace=TRUE -> if cell contains only one URL, replace it
SCCOL nPosX = GetViewData()->GetCurX();
SCROW nPosY = GetViewData()->GetCurY();
@@ -179,7 +179,7 @@ void lcl_SelectFieldAfterInsert( EditView& rView )
ESelection aSel = rView.GetSelection();
if ( aSel.nStartPos == aSel.nEndPos && aSel.nStartPos > 0 )
{
- // Cursor is behind the inserted field -> extend selection to the left
+ // Cursor is behind the inserted field -> extend selection to the left
--aSel.nStartPos;
rView.SetSelection( aSel );
@@ -192,9 +192,9 @@ void ScTabViewShell::InsertURLField( const String& rName, const String& rURL, co
aURLField.SetTargetFrame( rTarget );
SvxFieldItem aURLItem( aURLField, EE_FEATURE_FIELD );
- ScViewData* pViewData = GetViewData();
- ScModule* pScMod = SC_MOD();
- ScInputHandler* pHdl = pScMod->GetInputHdl( pViewData->GetViewShell() );
+ ScViewData* pViewData = GetViewData();
+ ScModule* pScMod = SC_MOD();
+ ScInputHandler* pHdl = pScMod->GetInputHdl( pViewData->GetViewShell() );
BOOL bSelectFirst = FALSE;
if ( !pScMod->IsEditMode() )
@@ -211,8 +211,8 @@ void ScTabViewShell::InsertURLField( const String& rName, const String& rURL, co
pScMod->SetInputMode( SC_INPUT_TABLE );
}
- EditView* pTopView = pHdl->GetTopView();
- EditView* pTableView = pHdl->GetTableView();
+ EditView* pTopView = pHdl->GetTopView();
+ EditView* pTableView = pHdl->GetTableView();
DBG_ASSERT( pTopView || pTableView, "No EditView" );
if ( bSelectFirst )
@@ -241,9 +241,9 @@ void ScTabViewShell::InsertURLField( const String& rName, const String& rURL, co
void ScTabViewShell::ExecSearch( SfxRequest& rReq )
{
- const SfxItemSet* pReqArgs = rReq.GetArgs();
- USHORT nSlot = rReq.GetSlot();
- const SfxPoolItem* pItem;
+ const SfxItemSet* pReqArgs = rReq.GetArgs();
+ USHORT nSlot = rReq.GetSlot();
+ const SfxPoolItem* pItem;
switch ( nSlot )
{
@@ -266,7 +266,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
if (pReqArgs && SFX_ITEM_SET ==
pReqArgs->GetItemState(SID_SEARCH_ITEM, FALSE, &pItem))
{
- // Search-Item merken
+ // Search-Item merken
DBG_ASSERT( pItem->ISA(SvxSearchItem), "falsches Item" );
ScGlobal::SetSearchItem( *(const SvxSearchItem*) pItem );
}
@@ -282,11 +282,11 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
{
if (pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState(nSlot, FALSE, &pItem))
{
- // SearchItem holen
+ // SearchItem holen
SvxSearchItem aSearchItem = ScGlobal::GetSearchItem();
- // SearchItem fuellen
+ // SearchItem fuellen
aSearchItem.SetSearchString(((SfxStringItem*)pItem)->GetValue());
if(SFX_ITEM_SET == pReqArgs->GetItemState(FN_PARAM_1, FALSE, &pItem))
@@ -301,7 +301,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
else
aSearchItem.SetCommand(SVX_SEARCHCMD_FIND_ALL);
- // Request ausfuehren (dabei wird das SearchItem gespeichert)
+ // Request ausfuehren (dabei wird das SearchItem gespeichert)
aSearchItem.SetWhich(SID_SEARCH_ITEM);
GetViewData()->GetDispatcher().Execute( FID_SEARCH_NOW,
@@ -318,7 +318,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
break;
case FID_REPEAT_SEARCH:
{
- // nochmal mit ScGlobal::GetSearchItem()
+ // nochmal mit ScGlobal::GetSearchItem()
SvxSearchItem aSearchItem = ScGlobal::GetSearchItem();
aSearchItem.SetWhich(SID_SEARCH_ITEM);
@@ -328,7 +328,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
&aSearchItem, 0L );
}
break;
-// case FID_SEARCH_COUNT:
+// case FID_SEARCH_COUNT:
}
}
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 20a10f149a3a..ee282e5ebd4f 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,15 +70,15 @@ using namespace com::sun::star;
void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
{
- ScViewData* pViewData = GetViewData();
- ScDocument* pDoc = pViewData->GetDocument();
+ ScViewData* pViewData = GetViewData();
+ ScDocument* pDoc = pViewData->GetDocument();
- SCTAB nCurrentTab = pViewData->GetTabNo();
- SCTAB nTabCount = pDoc->GetTableCount();
- USHORT nSlot = rReq.GetSlot();
+ SCTAB nCurrentTab = pViewData->GetTabNo();
+ SCTAB nTabCount = pDoc->GetTableCount();
+ USHORT nSlot = rReq.GetSlot();
const SfxItemSet* pReqArgs = rReq.GetArgs();
- HideListBox(); // Autofilter-DropDown-Listbox
+ HideListBox(); // Autofilter-DropDown-Listbox
switch ( nSlot )
{
@@ -95,7 +95,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
bVisible = ((const SfxBoolItem*)pItem)->GetValue();
}
- if( ! bVisible ) // ausblenden
+ if( ! bVisible ) // ausblenden
{
ScMarkData& rMark = pViewData->GetMarkData();
SCTAB nTabSelCount = rMark.GetSelectCount();
@@ -110,7 +110,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
if (pDoc->GetTable( aName, nHideTab ))
HideTable( nHideTab );
}
- else // einblenden
+ else // einblenden
{
ShowTable( aName );
}
@@ -139,7 +139,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
if (!aName.Len())
{
- pDoc->GetName( nCurrentTab, aName ); // aktuelle Tabelle
+ pDoc->GetName( nCurrentTab, aName ); // aktuelle Tabelle
rReq.AppendItem( SfxStringItem( FID_TABLE_HIDE, aName ) );
}
@@ -208,24 +208,24 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
case FID_INS_TABLE:
case FID_INS_TABLE_EXT:
{
- ScMarkData& rMark = pViewData->GetMarkData();
- SCTAB nTabSelCount = rMark.GetSelectCount();
- SCTAB nTabNr = nCurrentTab;
+ ScMarkData& rMark = pViewData->GetMarkData();
+ SCTAB nTabSelCount = rMark.GetSelectCount();
+ SCTAB nTabNr = nCurrentTab;
if ( !pDoc->IsDocEditable() )
- break; // gesperrt
+ break; // gesperrt
- if ( pReqArgs != NULL ) // von Basic
+ if ( pReqArgs != NULL ) // von Basic
{
BOOL bOk = FALSE;
- const SfxPoolItem* pTabItem;
- const SfxPoolItem* pNameItem;
- String aName;
+ const SfxPoolItem* pTabItem;
+ const SfxPoolItem* pNameItem;
+ String aName;
if ( IS_AVAILABLE( FN_PARAM_1, &pTabItem ) &&
IS_AVAILABLE( nSlot, &pNameItem ) )
{
- // Tabellennr. von Basic: 1-basiert
+ // Tabellennr. von Basic: 1-basiert
aName = ((const SfxStringItem*)pNameItem)->GetValue();
nTabNr = ((const SfxUInt16Item*)pTabItem)->GetValue() - 1;
@@ -235,13 +235,13 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
if (bOk)
rReq.Done( *pReqArgs );
- //! sonst Fehler setzen
+ //! sonst Fehler setzen
}
- else // Dialog
+ else // Dialog
{
-//CHINA001 ScInsertTableDlg* pDlg = new ScInsertTableDlg(
-//CHINA001 GetDialogParent(),
-//CHINA001 *pViewData,nTabSelCount);
+//CHINA001 ScInsertTableDlg* pDlg = new ScInsertTableDlg(
+//CHINA001 GetDialogParent(),
+//CHINA001 *pViewData,nTabSelCount);
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -272,7 +272,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
}
else
{
- SCTAB nTabAfter = nTabNr+1;
+ SCTAB nTabAfter = nTabNr+1;
for(SCTAB j=nCurrentTab+1;j<nTabCount;j++)
{
@@ -296,7 +296,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
if(nCount==1 && pDlg->GetFirstTable()->Len()>0)
{
rReq.AppendItem( SfxStringItem( FID_INS_TABLE, *pDlg->GetFirstTable() ) );
- rReq.AppendItem( SfxUInt16Item( FN_PARAM_1, static_cast<sal_uInt16>(nTabNr) + 1 ) ); // 1-based
+ rReq.AppendItem( SfxUInt16Item( FN_PARAM_1, static_cast<sal_uInt16>(nTabNr) + 1 ) ); // 1-based
rReq.Done();
InsertTable( *pDlg->GetFirstTable(), nTabNr );
@@ -306,7 +306,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
}
else
{
- SCTAB nTabAfter = nTabNr+1;
+ SCTAB nTabAfter = nTabNr+1;
SCTAB nSelHigh=0;
for(SCTAB i=0;i<nTabCount;i++)
@@ -331,7 +331,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
if(nCount==1 && pDlg->GetFirstTable()->Len()>0)
{
rReq.AppendItem( SfxStringItem( FID_INS_TABLE, *pDlg->GetFirstTable() ) );
- rReq.AppendItem( SfxUInt16Item( FN_PARAM_1, static_cast<sal_uInt16>(nTabAfter) + 1 ) ); // 1-based
+ rReq.AppendItem( SfxUInt16Item( FN_PARAM_1, static_cast<sal_uInt16>(nTabAfter) + 1 ) ); // 1-based
rReq.Done();
InsertTable( *pDlg->GetFirstTable(), nTabAfter);
@@ -353,12 +353,12 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
case FID_TAB_RENAME:
case FID_TAB_MENU_RENAME:
{
- // FID_TAB_MENU_RENAME - "umbenennen" im Menu
- // FID_TAB_RENAME - "Name"-Property fuer Basic
- // Execute ist gleich, aber im GetState wird MENU_RENAME evtl. disabled
+ // FID_TAB_MENU_RENAME - "umbenennen" im Menu
+ // FID_TAB_RENAME - "Name"-Property fuer Basic
+ // Execute ist gleich, aber im GetState wird MENU_RENAME evtl. disabled
if ( nSlot == FID_TAB_MENU_RENAME )
- nSlot = FID_TAB_RENAME; // Execute ist gleich
+ nSlot = FID_TAB_RENAME; // Execute ist gleich
SCTAB nTabNr = pViewData->GetTabNo();
ScMarkData& rMark = pViewData->GetMarkData();
@@ -372,8 +372,8 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
break; // kein Rename
#if 0
- // ScSbxObject wird nicht mehr benutzt, stattdessen aus dem
- // ScSbxTable::Notify die richtige Tabelle an der Basic-View eingestellt
+ // ScSbxObject wird nicht mehr benutzt, stattdessen aus dem
+ // ScSbxTable::Notify die richtige Tabelle an der Basic-View eingestellt
if( rReq.IsAPI() )
{
SbxObject* pObj = GetScSbxObject();
@@ -387,9 +387,9 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
if( pReqArgs != NULL )
{
- BOOL bDone = FALSE;
+ BOOL bDone = FALSE;
const SfxPoolItem* pItem;
- String aName;
+ String aName;
if( IS_AVAILABLE( FN_PARAM_1, &pItem ) )
nTabNr = ((const SfxUInt16Item*)pItem)->GetValue();
@@ -414,11 +414,11 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
}
else
{
- USHORT nRet = RET_OK;
- BOOL bDone = FALSE;
- String aErrMsg ( ScGlobal::GetRscString( STR_INVALIDTABNAME ) );
- String aName;
- String aDlgTitle;
+ USHORT nRet = RET_OK;
+ BOOL bDone = FALSE;
+ String aErrMsg ( ScGlobal::GetRscString( STR_INVALIDTABNAME ) );
+ String aName;
+ String aDlgTitle;
switch ( nSlot )
{
@@ -433,12 +433,12 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
break;
}
-//CHINA001 ScStringInputDlg* pDlg =
-//CHINA001 new ScStringInputDlg( GetDialogParent(),
-//CHINA001 aDlgTitle,
-//CHINA001 String(ScResId(SCSTR_NAME)),
-//CHINA001 aName,
-//CHINA001 nSlot );
+//CHINA001 ScStringInputDlg* pDlg =
+//CHINA001 new ScStringInputDlg( GetDialogParent(),
+//CHINA001 aDlgTitle,
+//CHINA001 String(ScResId(SCSTR_NAME)),
+//CHINA001 aName,
+//CHINA001 nSlot );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
@@ -497,7 +497,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
case FID_TAB_MOVE:
{
if ( pDoc->GetChangeTrack() != NULL )
- break; // bei aktiviertem ChangeTracking kein TabMove
+ break; // bei aktiviertem ChangeTracking kein TabMove
BOOL bDoIt = FALSE;
USHORT nDoc = 0;
@@ -514,7 +514,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
aDocName = ((const SfxStringItem*)pItem)->GetValue();
if( IS_AVAILABLE( FN_PARAM_1, &pItem ) )
{
- // Tabelle ist 1-basiert
+ // Tabelle ist 1-basiert
nTab = ((const SfxUInt16Item*)pItem)->GetValue() - 1;
if ( nTab >= nTableCount )
nTab = SC_TAB_APPEND;
@@ -524,9 +524,9 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
if( aDocName.Len() )
{
- SfxObjectShell* pSh = SfxObjectShell::GetFirst();
- ScDocShell* pScSh = NULL;
- USHORT i=0;
+ SfxObjectShell* pSh = SfxObjectShell::GetFirst();
+ ScDocShell* pScSh = NULL;
+ USHORT i=0;
while ( pSh )
{
@@ -545,7 +545,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
break;
}
- i++; // nur die ScDocShell's zaehlen
+ i++; // nur die ScDocShell's zaehlen
}
pSh = SfxObjectShell::GetNext( *pSh );
}
@@ -556,7 +556,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
bDoIt = TRUE;
}
- if ( bDoIt && nTab >= nTableCount ) // ggf. anhaengen
+ if ( bDoIt && nTab >= nTableCount ) // ggf. anhaengen
nTab = SC_TAB_APPEND;
}
else
@@ -569,8 +569,8 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
SCTAB nTableCount = pDoc->GetTableCount();
- ScMarkData& rMark = GetViewData()->GetMarkData();
- SCTAB nTabSelCount = rMark.GetSelectCount();
+ ScMarkData& rMark = GetViewData()->GetMarkData();
+ SCTAB nTabSelCount = rMark.GetSelectCount();
if(nTableCount==nTabSelCount)
@@ -600,7 +600,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
}
}
rReq.AppendItem( SfxStringItem( FID_TAB_MOVE, aFoundDocName ) );
- // Tabelle ist 1-basiert, wenn nicht APPEND
+ // Tabelle ist 1-basiert, wenn nicht APPEND
SCTAB nBasicTab = ( nTab <= MAXTAB ) ? (nTab+1) : nTab;
rReq.AppendItem( SfxUInt16Item( FN_PARAM_1, static_cast<sal_uInt16>(nBasicTab) ) );
rReq.AppendItem( SfxBoolItem( FN_PARAM_2, bCpy ) );
@@ -610,7 +610,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
if( bDoIt )
{
- rReq.Done(); // aufzeichnen, solange das Dokument noch aktiv ist
+ rReq.Done(); // aufzeichnen, solange das Dokument noch aktiv ist
MoveTable( nDoc, nTab, bCpy );
}
@@ -619,12 +619,12 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
case FID_DELETE_TABLE:
{
- // Parameter war ueberfluessig, weil die Methode an der Table haengt
+ // Parameter war ueberfluessig, weil die Methode an der Table haengt
BOOL bDoIt = rReq.IsAPI();
if( !bDoIt )
{
- // wenn's nicht von Basic kommt, nochmal nachfragen:
+ // wenn's nicht von Basic kommt, nochmal nachfragen:
#if ENABLE_LAYOUT
// Using layout::QueryBox without client code modification is
@@ -640,7 +640,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
}
if( bDoIt )
{
- SCTAB nNewTab = nCurrentTab;
+ SCTAB nNewTab = nCurrentTab;
SCTAB nFirstTab=0;
BOOL bTabFlag=FALSE;
ScMarkData& rMark = pViewData->GetMarkData();
@@ -674,7 +674,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
const ScMarkData& rMark = pViewData->GetMarkData();
if ( rMark.GetSelectCount() != 0 )
{
- // handle several sheets
+ // handle several sheets
SfxUndoManager* pUndoManager = pDocSh->GetUndoManager();
String aUndo = ScGlobal::GetRscString( STR_UNDO_TAB_RTL );
@@ -829,17 +829,17 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
void ScTabViewShell::GetStateTable( SfxItemSet& rSet )
{
- ScViewData* pViewData = GetViewData();
- ScDocument* pDoc = pViewData->GetDocument();
+ ScViewData* pViewData = GetViewData();
+ ScDocument* pDoc = pViewData->GetDocument();
ScDocShell* pDocShell = pViewData->GetDocShell();
- ScMarkData& rMark = GetViewData()->GetMarkData();
- SCTAB nTab = pViewData->GetTabNo();
+ ScMarkData& rMark = GetViewData()->GetMarkData();
+ SCTAB nTab = pViewData->GetTabNo();
SCTAB nTabCount = pDoc->GetTableCount();
SCTAB nTabSelCount = rMark.GetSelectCount();
- SfxWhichIter aIter(rSet);
- USHORT nWhich = aIter.FirstWhich();
+ SfxWhichIter aIter(rSet);
+ USHORT nWhich = aIter.FirstWhich();
while ( nWhich )
{
@@ -908,8 +908,8 @@ void ScTabViewShell::GetStateTable( SfxItemSet& rSet )
rSet.DisableItem( nWhich );
break;
- // FID_TAB_MENU_RENAME - "umbenennen" im Menu
- // FID_TAB_RENAME - "Name"-Property fuer Basic
+ // FID_TAB_MENU_RENAME - "umbenennen" im Menu
+ // FID_TAB_RENAME - "Name"-Property fuer Basic
case FID_TAB_MENU_RENAME:
if ( !pDoc->IsDocEditable() ||
diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx
index b30b07c43cb9..36ecba5d7d7b 100644
--- a/sc/source/ui/view/tabvwshg.cxx
+++ b/sc/source/ui/view/tabvwshg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ void ScTabViewShell::InsertURLButton( const String& rName, const String& rURL,
const String& rTarget,
const Point* pInsPos )
{
- // Tabelle geschuetzt ?
+ // Tabelle geschuetzt ?
ScViewData* pViewData = GetViewData();
ScDocument* pDoc = pViewData->GetDocument();
@@ -72,10 +72,10 @@ void ScTabViewShell::InsertURLButton( const String& rName, const String& rURL,
MakeDrawLayer();
- ScTabView* pView = pViewData->GetView();
-// SdrView* pDrView = pView->GetSdrView();
+ ScTabView* pView = pViewData->GetView();
+// SdrView* pDrView = pView->GetSdrView();
ScDrawView* pDrView = pView->GetScDrawView();
- SdrModel* pModel = pDrView->GetModel();
+ SdrModel* pModel = pDrView->GetModel();
SdrObject* pObj = SdrObjFactory::MakeNewObject(FmFormInventor, OBJ_FM_BUTTON,
pDrView->GetSdrPageView()->GetPage(), pModel);
@@ -126,12 +126,12 @@ void ScTabViewShell::InsertURLButton( const String& rName, const String& rURL,
aPos.X() -= aSize.Width();
pObj->SetLogicRect(Rectangle(aPos, aSize));
-// pObj->Resize(Point(), Fraction(1, 1), Fraction(1, 1));
+// pObj->Resize(Point(), Fraction(1, 1), Fraction(1, 1));
- // am alten VC-Button musste die Position/Groesse nochmal explizit
- // gesetzt werden - das scheint mit UnoControls nicht noetig zu sein
+ // am alten VC-Button musste die Position/Groesse nochmal explizit
+ // gesetzt werden - das scheint mit UnoControls nicht noetig zu sein
- // nicht markieren wenn Ole
+ // nicht markieren wenn Ole
pDrView->InsertObjectSafe( pObj, *pDrView->GetSdrPageView() );
}
diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx
index 480514741bae..8f6639753cb4 100644
--- a/sc/source/ui/view/tabvwshh.cxx
+++ b/sc/source/ui/view/tabvwshh.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 "document.hxx"
#include "docsh.hxx"
#include "sc.hrc"
-#include "drwlayer.hxx" // GetVisibleName
+#include "drwlayer.hxx" // GetVisibleName
#include "retypepassdlg.hxx"
#include "tabprotection.hxx"
@@ -59,13 +59,13 @@ using namespace com::sun::star;
void ScTabViewShell::ExecuteSbx( SfxRequest& /* rReq */ )
{
- // SID_RANGE_OFFSET (Offset),
- // SID_PIVOT_CREATE (DataPilotCreate) - removed (old Basic)
+ // SID_RANGE_OFFSET (Offset),
+ // SID_PIVOT_CREATE (DataPilotCreate) - removed (old Basic)
}
void ScTabViewShell::GetSbxState( SfxItemSet& /* rSet */ )
{
- // SID_RANGE_REGION (CurrentRegion) - removed (old Basic)
+ // SID_RANGE_REGION (CurrentRegion) - removed (old Basic)
}
//------------------------------------------------------------------
@@ -75,7 +75,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq )
USHORT nSlotId = rReq.GetSlot();
const SfxItemSet* pReqArgs = rReq.GetArgs();
- // Objekte aktivieren/deaktivieren immer auf der sichtbaren View
+ // Objekte aktivieren/deaktivieren immer auf der sichtbaren View
ScTabViewShell* pVisibleSh = this;
if ( nSlotId == SID_OLE_SELECT || nSlotId == SID_OLE_ACTIVATE || nSlotId == SID_OLE_DEACTIVATE )
@@ -88,7 +88,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq )
case SID_OLE_SELECT:
case SID_OLE_ACTIVATE:
{
- // in beiden Faellen erstmal auf der sichtbaren View selektieren
+ // in beiden Faellen erstmal auf der sichtbaren View selektieren
String aName;
SdrView* pDrView = GetSdrView();
@@ -100,7 +100,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq )
}
pVisibleSh->SelectObject( aName );
- // aktivieren
+ // aktivieren
if ( nSlotId == SID_OLE_ACTIVATE )
pVisibleSh->DoVerb( 0 );
@@ -123,7 +123,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq )
if ( nNewVal < 0 )
nNewVal = 0;
- //! von irgendwas in 1/100mm umrechnen ??????
+ //! von irgendwas in 1/100mm umrechnen ??????
SdrView* pDrView = GetSdrView();
if ( pDrView )
@@ -151,7 +151,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq )
}
}
if (!bDone)
- SbxBase::SetError( SbxERR_BAD_PARAMETER ); // Basic-Fehler
+ SbxBase::SetError( SbxERR_BAD_PARAMETER ); // Basic-Fehler
}
break;
@@ -180,7 +180,7 @@ uno::Reference < embed::XEmbeddedObject > lcl_GetSelectedObj( SdrView* pDrView )
void ScTabViewShell::GetObjectState( SfxItemSet& rSet )
{
- // SID_OLE_OBJECT - removed (old Basic)
+ // SID_OLE_OBJECT - removed (old Basic)
SfxWhichIter aIter(rSet);
USHORT nWhich = aIter.FirstWhich();
@@ -223,7 +223,7 @@ void ScTabViewShell::GetObjectState( SfxItemSet& rSet )
else // if ( nWhich == SID_OBJECT_HEIGHT )
nVal = aRect.GetHeight();
- //! von 1/100mm in irgendwas umrechnen ??????
+ //! von 1/100mm in irgendwas umrechnen ??????
rSet.Put( SfxInt32Item( nWhich, nVal ) );
}
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 7b35328f68bb..50cd9a26b11f 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,13 +76,13 @@ using namespace com::sun::star;
// STATIC DATA -----------------------------------------------------------
-#define SC_GROWY_SMALL_EXTRA 100
-#define SC_GROWY_BIG_EXTRA 200
+#define SC_GROWY_SMALL_EXTRA 100
+#define SC_GROWY_BIG_EXTRA 200
#define TAG_TABBARWIDTH "tw:"
-static BOOL bMoveArea = FALSE; //! Member?
-USHORT nEditAdjust = SVX_ADJUST_LEFT; //! Member !!!
+static BOOL bMoveArea = FALSE; //! Member?
+USHORT nEditAdjust = SVX_ADJUST_LEFT; //! Member !!!
//==================================================================
@@ -296,39 +296,39 @@ void ScViewDataTable::ReadUserDataSequence(const uno::Sequence <beans::PropertyV
//==================================================================
ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh )
- : pDocShell ( pDocSh ),
- pDoc ( NULL ),
- pView ( pViewSh ),
- pViewShell ( pViewSh ),
- pOptions ( new ScViewOptions ),
+ : pDocShell ( pDocSh ),
+ pDoc ( NULL ),
+ pView ( pViewSh ),
+ pViewShell ( pViewSh ),
+ pOptions ( new ScViewOptions ),
pSpellingView ( NULL ),
- aLogicMode ( MAP_100TH_MM ),
+ aLogicMode ( MAP_100TH_MM ),
eDefZoomType( SVX_ZOOM_PERCENT ),
aDefZoomX ( 1,1 ),
aDefZoomY ( 1,1 ),
aDefPageZoomX( 3,5 ),
aDefPageZoomY( 3,5 ),
- eRefType ( SC_REFTYPE_NONE ),
- nTabNo ( 0 ),
- nRefTabNo ( 0 ),
+ eRefType ( SC_REFTYPE_NONE ),
+ nTabNo ( 0 ),
+ nRefTabNo ( 0 ),
eEditActivePart( SC_SPLIT_BOTTOMLEFT ),
- bActive ( TRUE ), //! wie initialisieren?
- bIsRefMode ( FALSE ),
+ bActive ( TRUE ), //! wie initialisieren?
+ bIsRefMode ( FALSE ),
bDelMarkValid( FALSE ),
- nFillMode ( SC_FILL_NONE ),
- bPagebreak ( FALSE ),
+ nFillMode ( SC_FILL_NONE ),
+ bPagebreak ( FALSE ),
bSelCtrlMouseClick( FALSE )
{
- SetGridMode ( TRUE );
- SetSyntaxMode ( FALSE );
- SetHeaderMode ( TRUE );
- SetTabMode ( TRUE );
- SetVScrollMode ( TRUE );
- SetHScrollMode ( TRUE );
- SetOutlineMode ( TRUE );
+ SetGridMode ( TRUE );
+ SetSyntaxMode ( FALSE );
+ SetHeaderMode ( TRUE );
+ SetTabMode ( TRUE );
+ SetVScrollMode ( TRUE );
+ SetHScrollMode ( TRUE );
+ SetOutlineMode ( TRUE );
- aScrSize = Size( (long) ( STD_COL_WIDTH * PIXEL_PER_TWIPS * OLE_STD_CELLS_X ),
+ aScrSize = Size( (long) ( STD_COL_WIDTH * PIXEL_PER_TWIPS * OLE_STD_CELLS_X ),
(long) ( ScGlobal::nStdRowHeight * PIXEL_PER_TWIPS * OLE_STD_CELLS_Y ) );
pTabData[0] = new ScViewDataTable;
for ( SCTAB i = 1; i <= MAXTAB; i++ )
@@ -350,7 +350,7 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh )
*pOptions = pDoc->GetViewOptions();
}
- // keine ausgeblendete Tabelle anzeigen:
+ // keine ausgeblendete Tabelle anzeigen:
if (pDoc && !pDoc->IsVisible(nTabNo))
{
while ( !pDoc->IsVisible(nTabNo) && pDoc->HasTable(nTabNo+1) )
@@ -364,37 +364,37 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh )
}
ScViewData::ScViewData( const ScViewData& rViewData )
- : pDocShell ( rViewData.pDocShell ),
- pDoc ( rViewData.pDoc ),
- pView ( rViewData.pView ),
- pViewShell ( rViewData.pViewShell ),
- pOptions ( new ScViewOptions( *(rViewData.pOptions) ) ),
+ : pDocShell ( rViewData.pDocShell ),
+ pDoc ( rViewData.pDoc ),
+ pView ( rViewData.pView ),
+ pViewShell ( rViewData.pViewShell ),
+ pOptions ( new ScViewOptions( *(rViewData.pOptions) ) ),
pSpellingView ( rViewData.pSpellingView ),
- aLogicMode ( rViewData.aLogicMode ),
+ aLogicMode ( rViewData.aLogicMode ),
eDefZoomType( rViewData.eDefZoomType ),
aDefZoomX ( rViewData.aDefZoomX ),
aDefZoomY ( rViewData.aDefZoomY ),
aDefPageZoomX( rViewData.aDefPageZoomX ),
aDefPageZoomY( rViewData.aDefPageZoomY ),
- eRefType ( SC_REFTYPE_NONE ),
- nTabNo ( rViewData.nTabNo ),
- nRefTabNo ( rViewData.nTabNo ), // kein RefMode
+ eRefType ( SC_REFTYPE_NONE ),
+ nTabNo ( rViewData.nTabNo ),
+ nRefTabNo ( rViewData.nTabNo ), // kein RefMode
eEditActivePart( rViewData.eEditActivePart ),
- bActive ( TRUE ), //! wie initialisieren?
- bIsRefMode ( FALSE ),
+ bActive ( TRUE ), //! wie initialisieren?
+ bIsRefMode ( FALSE ),
bDelMarkValid( FALSE ),
- nFillMode ( SC_FILL_NONE ),
- bPagebreak ( rViewData.bPagebreak ),
+ nFillMode ( SC_FILL_NONE ),
+ bPagebreak ( rViewData.bPagebreak ),
bSelCtrlMouseClick( rViewData.bSelCtrlMouseClick )
{
- SetGridMode ( rViewData.IsGridMode() );
- SetSyntaxMode ( rViewData.IsSyntaxMode() );
- SetHeaderMode ( rViewData.IsHeaderMode() );
- SetTabMode ( rViewData.IsTabMode() );
- SetVScrollMode ( rViewData.IsVScrollMode() );
- SetHScrollMode ( rViewData.IsHScrollMode() );
- SetOutlineMode ( rViewData.IsOutlineMode() );
+ SetGridMode ( rViewData.IsGridMode() );
+ SetSyntaxMode ( rViewData.IsSyntaxMode() );
+ SetHeaderMode ( rViewData.IsHeaderMode() );
+ SetTabMode ( rViewData.IsTabMode() );
+ SetVScrollMode ( rViewData.IsVScrollMode() );
+ SetHScrollMode ( rViewData.IsHScrollMode() );
+ SetOutlineMode ( rViewData.IsOutlineMode() );
aScrSize = rViewData.aScrSize;
for ( SCTAB i = 0; i <= MAXTAB; i++ )
@@ -428,7 +428,7 @@ void ScViewData::InitData( ScDocument* pDocument )
//UNUSED2008-05 DBG_ERROR("ScViewData::InitFrom mit NULL");
//UNUSED2008-05 return;
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 aScrSize = pRef->aScrSize;
//UNUSED2008-05 nTabNo = pRef->nTabNo;
//UNUSED2008-05 eDefZoomType = pRef->eDefZoomType;
@@ -438,7 +438,7 @@ void ScViewData::InitData( ScDocument* pDocument )
//UNUSED2008-05 aDefPageZoomY = pRef->aDefPageZoomY;
//UNUSED2008-05 bPagebreak = pRef->bPagebreak;
//UNUSED2008-05 aLogicMode = pRef->aLogicMode;
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 SetGridMode ( pRef->IsGridMode() );
//UNUSED2008-05 SetSyntaxMode ( pRef->IsSyntaxMode() );
//UNUSED2008-05 SetHeaderMode ( pRef->IsHeaderMode() );
@@ -446,7 +446,7 @@ void ScViewData::InitData( ScDocument* pDocument )
//UNUSED2008-05 SetVScrollMode ( pRef->IsVScrollMode() );
//UNUSED2008-05 SetHScrollMode ( pRef->IsHScrollMode() );
//UNUSED2008-05 SetOutlineMode ( pRef->IsOutlineMode() );
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 for (SCTAB i=0; i<=MAXTAB; i++)
//UNUSED2008-05 {
//UNUSED2008-05 delete pTabData[i];
@@ -458,7 +458,7 @@ void ScViewData::InitData( ScDocument* pDocument )
//UNUSED2008-05 pThisTab = pTabData[nTabNo];
//UNUSED2008-05 CalcPPT();
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 void ScViewData::SetDocShell( ScDocShell* pShell )
//UNUSED2008-05 {
//UNUSED2008-05 pDocShell = pShell;
@@ -536,7 +536,7 @@ void ScViewData::DeleteTab( SCTAB nTab )
void ScViewData::CopyTab( SCTAB nSrcTab, SCTAB nDestTab )
{
if (nDestTab==SC_TAB_APPEND)
- nDestTab = pDoc->GetTableCount() - 1; // am Doc muss vorher kopiert worden sein
+ nDestTab = pDoc->GetTableCount() - 1; // am Doc muss vorher kopiert worden sein
if (nDestTab > MAXTAB)
{
@@ -581,7 +581,7 @@ void ScViewData::MoveTab( SCTAB nSrcTab, SCTAB nDestTab )
UpdateThis();
aMarkData.DeleteTab( nSrcTab );
- aMarkData.InsertTab( nInsTab ); // ggf. angepasst
+ aMarkData.InsertTab( nInsTab ); // ggf. angepasst
}
//UNUSED2008-05 void ScViewData::UpdateOle( ScSplitPos /* eWhich */ )
@@ -593,13 +593,13 @@ void ScViewData::SetViewShell( ScTabViewShell* pViewSh )
{
if (pViewSh)
{
- pViewShell = pViewSh;
- pView = pViewSh;
+ pViewShell = pViewSh;
+ pView = pViewSh;
}
else
{
- pViewShell = NULL;
- pView = NULL;
+ pViewShell = NULL;
+ pView = NULL;
}
}
void ScViewData::CreateTabData( std::vector< SCTAB >& rvTabs )
@@ -623,7 +623,7 @@ void ScViewData::SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs )
{
if ( pTabData[i] )
pTabData[i]->eZoomType = eNew;
- }
+ }
eDefZoomType = eNew;
}
else
@@ -650,7 +650,7 @@ void ScViewData::SetZoomType( SvxZoomType eNew, BOOL bAll )
if ( aMarkData.GetTableSelect(i) )
vTabs.push_back( i );
}
- }
+ }
SetZoomType( eNew, vTabs );
}
@@ -739,7 +739,7 @@ void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAl
if ( aMarkData.GetTableSelect(i) )
vTabs.push_back( i );
}
- }
+ }
SetZoom( rNewX, rNewY, vTabs );
}
@@ -795,10 +795,10 @@ ScMarkType ScViewData::GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark )
ScMarkType ScViewData::GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& rStartTab,
SCCOL& rEndCol, SCROW& rEndRow, SCTAB& rEndTab ) const
{
- // parameter bMergeMark is no longer needed: The view's selection is never modified
- // (a local copy is used), and a multi selection that adds to a single range can always
- // be treated like a single selection (#108266# - GetSimpleArea isn't used in selection
- // handling itself)
+ // parameter bMergeMark is no longer needed: The view's selection is never modified
+ // (a local copy is used), and a multi selection that adds to a single range can always
+ // be treated like a single selection (#108266# - GetSimpleArea isn't used in selection
+ // handling itself)
ScRange aRange;
ScMarkData aNewMark( aMarkData ); // use a local copy for MarkToSimple
@@ -809,7 +809,7 @@ ScMarkType ScViewData::GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB&
ScMarkType ScViewData::GetSimpleArea( ScRange& rRange ) const
{
- // parameter bMergeMark is no longer needed, see above
+ // parameter bMergeMark is no longer needed, see above
ScMarkData aNewMark( aMarkData ); // use a local copy for MarkToSimple
return GetSimpleArea( rRange, aNewMark);
@@ -817,9 +817,9 @@ ScMarkType ScViewData::GetSimpleArea( ScRange& rRange ) const
void ScViewData::GetMultiArea( ScRangeListRef& rRange ) const
{
- // parameter bMergeMark is no longer needed, see GetSimpleArea
+ // parameter bMergeMark is no longer needed, see GetSimpleArea
- ScMarkData aNewMark( aMarkData ); // use a local copy for MarkToSimple
+ ScMarkData aNewMark( aMarkData ); // use a local copy for MarkToSimple
BOOL bMulti = aNewMark.IsMultiMarked();
if (bMulti)
@@ -886,8 +886,8 @@ void ScViewData::SetFillMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, S
nFillMode = SC_FILL_FILL;
nFillStartX = nStartCol;
nFillStartY = nStartRow;
- nFillEndX = nEndCol;
- nFillEndY = nEndRow;
+ nFillEndX = nEndCol;
+ nFillEndY = nEndRow;
}
void ScViewData::SetDragMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
@@ -896,13 +896,13 @@ void ScViewData::SetDragMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, S
nFillMode = nMode;
nFillStartX = nStartCol;
nFillStartY = nStartRow;
- nFillEndX = nEndCol;
- nFillEndY = nEndRow;
+ nFillEndX = nEndCol;
+ nFillEndY = nEndRow;
}
void ScViewData::ResetFillMode()
{
- nFillMode = SC_FILL_NONE;
+ nFillMode = SC_FILL_NONE;
}
void ScViewData::GetFillData( SCCOL& rStartCol, SCROW& rStartRow,
@@ -961,7 +961,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
BOOL bWasThere = FALSE;
if (pEditView[eWhich])
{
- // Wenn die View schon da ist, nichts aufrufen, was die Cursorposition aendert
+ // Wenn die View schon da ist, nichts aufrufen, was die Cursorposition aendert
if (bEditActive[eWhich])
bWasThere = TRUE;
@@ -979,7 +979,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
pEditView[eWhich] = new EditView( pNewEngine, pWin );
}
- // bei IdleFormat wird manchmal ein Cursor gemalt, wenn die View schon weg ist (23576)
+ // bei IdleFormat wird manchmal ein Cursor gemalt, wenn die View schon weg ist (23576)
ULONG nEC = pNewEngine->GetControlWord();
pNewEngine->SetControlWord(nEC & ~EE_CNTRL_DOIDLEFORMAT);
@@ -996,14 +996,14 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
BOOL bBreak = ( eJust == SVX_HOR_JUSTIFY_BLOCK ) ||
((SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK)).GetValue();
- BOOL bAsianVertical = pNewEngine->IsVertical(); // set by InputHandler
+ BOOL bAsianVertical = pNewEngine->IsVertical(); // set by InputHandler
Rectangle aPixRect = ScEditUtil( pDoc, nNewX,nNewY,nTabNo, GetScrPos(nNewX,nNewY,eWhich),
pWin, nPPTX,nPPTY,GetZoomX(),GetZoomY() ).
GetEditArea( pPattern, TRUE );
- // when right-aligned, leave space for the cursor
- // in vertical mode, editing is always right-aligned
+ // when right-aligned, leave space for the cursor
+ // in vertical mode, editing is always right-aligned
if ( nEditAdjust == SVX_ADJUST_RIGHT || bAsianVertical )
aPixRect.Right() += 1;
@@ -1016,7 +1016,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
// switching sheets or reference input on a different part
eEditActivePart = eWhich;
- // modify members nEditCol etc. only if also extending for needed area
+ // modify members nEditCol etc. only if also extending for needed area
nEditCol = nNewX;
nEditRow = nNewY;
const ScMergeAttr* pMergeAttr = (ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE);
@@ -1028,49 +1028,49 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
nEditEndRow += pMergeAttr->GetRowMerge() - 1;
nEditStartCol = nEditCol;
- // For growing use only the alignment value from the attribute, numbers
- // (existing or started) with default aligment extend to the right.
+ // For growing use only the alignment value from the attribute, numbers
+ // (existing or started) with default aligment extend to the right.
BOOL bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER );
- BOOL bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left
- BOOL bGrowBackwards = bGrowToLeft; // logical left
+ BOOL bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left
+ BOOL bGrowBackwards = bGrowToLeft; // logical left
if ( bLayoutRTL )
- bGrowBackwards = !bGrowBackwards; // invert on RTL sheet
+ bGrowBackwards = !bGrowBackwards; // invert on RTL sheet
if ( bAsianVertical )
- bGrowCentered = bGrowToLeft = bGrowBackwards = FALSE; // keep old behavior for asian mode
+ bGrowCentered = bGrowToLeft = bGrowBackwards = FALSE; // keep old behavior for asian mode
long nSizeXPix;
if (bBreak && !bAsianVertical)
- nSizeXPix = aPixRect.GetWidth(); // Papersize -> kein H-Scrolling
+ nSizeXPix = aPixRect.GetWidth(); // Papersize -> kein H-Scrolling
else
{
DBG_ASSERT(pView,"keine View fuer EditView");
if ( bGrowCentered )
{
- // growing into both directions until one edge is reached
- //! should be limited to whole cells in both directions
+ // growing into both directions until one edge is reached
+ //! should be limited to whole cells in both directions
long nLeft = aPixRect.Left();
long nRight = pView->GetGridWidth(eHWhich) - aPixRect.Right();
nSizeXPix = aPixRect.GetWidth() + 2 * Min( nLeft, nRight );
}
else if ( bGrowToLeft )
- nSizeXPix = aPixRect.Right(); // space that's available in the window when growing to the left
+ nSizeXPix = aPixRect.Right(); // space that's available in the window when growing to the left
else
nSizeXPix = pView->GetGridWidth(eHWhich) - aPixRect.Left();
if ( nSizeXPix <= 0 )
- nSizeXPix = aPixRect.GetWidth(); // editing outside to the right of the window -> keep cell width
+ nSizeXPix = aPixRect.GetWidth(); // editing outside to the right of the window -> keep cell width
}
DBG_ASSERT(pView,"keine View fuer EditView");
long nSizeYPix = pView->GetGridHeight(WhichV(eWhich)) - aPixRect.Top();
if ( nSizeYPix <= 0 )
- nSizeYPix = aPixRect.GetHeight(); // editing outside below the window -> keep cell height
+ nSizeYPix = aPixRect.GetHeight(); // editing outside below the window -> keep cell height
Size aPaperSize = pView->GetActiveWin()->PixelToLogic( Size( nSizeXPix, nSizeYPix ), GetLogicMode() );
if ( bBreak && !bAsianVertical && SC_MOD()->GetInputOptions().GetTextWysiwyg() )
{
- // #95593# if text is formatted for printer, use the exact same paper width
- // (and same line breaks) as for output.
+ // #95593# if text is formatted for printer, use the exact same paper width
+ // (and same line breaks) as for output.
Fraction aFract(1,1);
Rectangle aUtilRect = ScEditUtil( pDoc,nNewX,nNewY,nTabNo, Point(0,0), pWin,
@@ -1091,7 +1091,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
else if ( nEditAdjust == SVX_ADJUST_CENTER )
{
aVis.Right() = ( aPaper.Width() - 1 + nDiff ) / 2;
- bMoveArea = TRUE; // always
+ bMoveArea = TRUE; // always
}
else
{
@@ -1110,20 +1110,20 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
pEditView[eWhich]->SetVisArea(aVis);
//
- // UpdateMode has been disabled in ScInputHandler::StartTable
- // must be enabled before EditGrowY (GetTextHeight)
+ // UpdateMode has been disabled in ScInputHandler::StartTable
+ // must be enabled before EditGrowY (GetTextHeight)
pNewEngine->SetUpdateMode( TRUE );
pNewEngine->SetStatusEventHdl( LINK( this, ScViewData, EditEngineHdl ) );
- EditGrowY( TRUE ); // adjust to existing text content
+ EditGrowY( TRUE ); // adjust to existing text content
EditGrowX();
Point aDocPos = pEditView[eWhich]->GetWindowPosTopLeft(0);
if (aDocPos.Y() < aOutputArea.Top())
pEditView[eWhich]->Scroll( 0, aOutputArea.Top() - aDocPos.Y() );
- //! Status (Event) zuruecksetzen
+ //! Status (Event) zuruecksetzen
}
// hier muss bEditActive schon gesetzt sein
@@ -1131,11 +1131,11 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
if (!bWasThere)
pNewEngine->InsertView(pEditView[eWhich]);
- // Hintergrundfarbe der Zelle
+ // Hintergrundfarbe der Zelle
Color aBackCol = ((const SvxBrushItem&)pPattern->GetItem(ATTR_BACKGROUND)).GetColor();
ScModule* pScMod = SC_MOD();
- // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
+ // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
if ( aBackCol.GetTransparency() > 0 ||
Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
{
@@ -1143,8 +1143,8 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
}
pEditView[eWhich]->SetBackgroundColor( aBackCol );
- pEditView[eWhich]->Invalidate(); // noetig ??
- // noetig, wenn Position geaendert
+ pEditView[eWhich]->Invalidate(); // noetig ??
+ // noetig, wenn Position geaendert
}
IMPL_LINK_INLINE_START( ScViewData, EmptyEditHdl, EditStatus *, EMPTYARG )
@@ -1191,27 +1191,27 @@ void ScViewData::EditGrowX()
SCCOL nLeft = GetPosX(eHWhich);
SCCOL nRight = nLeft + VisibleCellsX(eHWhich);
- Size aSize = pEngine->GetPaperSize();
- Rectangle aArea = pCurView->GetOutputArea();
- long nOldRight = aArea.Right();
+ Size aSize = pEngine->GetPaperSize();
+ Rectangle aArea = pCurView->GetOutputArea();
+ long nOldRight = aArea.Right();
- // Margin ist schon bei der urspruenglichen Breite beruecksichtigt
+ // Margin ist schon bei der urspruenglichen Breite beruecksichtigt
long nTextWidth = pEngine->CalcTextWidth();
BOOL bChanged = FALSE;
BOOL bAsianVertical = pEngine->IsVertical();
- // get bGrow... variables the same way as in SetEditEngine
+ // get bGrow... variables the same way as in SetEditEngine
const ScPatternAttr* pPattern = pLocalDoc->GetPattern( nEditCol, nEditRow, nTabNo );
SvxCellHorJustify eJust = (SvxCellHorJustify)((const SvxHorJustifyItem&)
pPattern->GetItem( ATTR_HOR_JUSTIFY )).GetValue();
BOOL bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER );
- BOOL bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left
- BOOL bGrowBackwards = bGrowToLeft; // logical left
+ BOOL bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left
+ BOOL bGrowBackwards = bGrowToLeft; // logical left
if ( bLayoutRTL )
- bGrowBackwards = !bGrowBackwards; // invert on RTL sheet
+ bGrowBackwards = !bGrowBackwards; // invert on RTL sheet
if ( bAsianVertical )
- bGrowCentered = bGrowToLeft = bGrowBackwards = FALSE; // keep old behavior for asian mode
+ bGrowCentered = bGrowToLeft = bGrowBackwards = FALSE; // keep old behavior for asian mode
BOOL bUnevenGrow = FALSE;
if ( bGrowCentered )
@@ -1304,7 +1304,7 @@ void ScViewData::EditGrowX()
if ( bGrowCentered )
{
- // switch to center-aligned (undo?) and reset VisArea to center
+ // switch to center-aligned (undo?) and reset VisArea to center
pEngine->SetDefaultItem( SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST ) );
@@ -1315,16 +1315,16 @@ void ScViewData::EditGrowX()
}
else if ( bGrowToLeft )
{
- // switch to right-aligned (undo?) and reset VisArea to the right
+ // switch to right-aligned (undo?) and reset VisArea to the right
pEngine->SetDefaultItem( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) );
aVis.Right() = aSize.Width() - 1;
- aVis.Left() = aSize.Width() - aArea.GetWidth(); // with the new, increased area
+ aVis.Left() = aSize.Width() - aArea.GetWidth(); // with the new, increased area
}
else
{
- // switch to left-aligned (undo?) and reset VisArea to the left
+ // switch to left-aligned (undo?) and reset VisArea to the left
pEngine->SetDefaultItem( SvxAdjustItem( SVX_ADJUST_LEFT, EE_PARA_JUST ) );
@@ -1338,10 +1338,10 @@ void ScViewData::EditGrowX()
pCurView->SetOutputArea(aArea);
- // In vertical mode, the whole text is moved to the next cell (right-aligned),
- // so everything must be repainted. Otherwise, paint only the new area.
- // If growing in centered alignment, if the cells left and right have different sizes,
- // the whole text will move, and may not even obscure all of the original display.
+ // In vertical mode, the whole text is moved to the next cell (right-aligned),
+ // so everything must be repainted. Otherwise, paint only the new area.
+ // If growing in centered alignment, if the cells left and right have different sizes,
+ // the whole text will move, and may not even obscure all of the original display.
if ( bUnevenGrow )
{
aArea.Left() = pWin->PixelToLogic( Point(0,0) ).X();
@@ -1365,10 +1365,10 @@ void ScViewData::EditGrowY( BOOL bInitial )
ULONG nControl = pEditView[eWhich]->GetControlWord();
if ( nControl & EV_CNTRL_AUTOSCROLL )
{
- // if end of screen had already been reached and scrolling enabled,
- // don't further try to grow the edit area
+ // if end of screen had already been reached and scrolling enabled,
+ // don't further try to grow the edit area
- pCurView->SetOutputArea( pCurView->GetOutputArea() ); // re-align to pixels
+ pCurView->SetOutputArea( pCurView->GetOutputArea() ); // re-align to pixels
return;
}
@@ -1377,23 +1377,23 @@ void ScViewData::EditGrowY( BOOL bInitial )
SCROW nBottom = GetPosY(eVWhich) + VisibleCellsY(eVWhich);
- Size aSize = pEngine->GetPaperSize();
- Rectangle aArea = pCurView->GetOutputArea();
- long nOldBottom = aArea.Bottom();
- long nTextHeight = pEngine->GetTextHeight();
+ Size aSize = pEngine->GetPaperSize();
+ Rectangle aArea = pCurView->GetOutputArea();
+ long nOldBottom = aArea.Bottom();
+ long nTextHeight = pEngine->GetTextHeight();
- // #106635# When editing a formula in a cell with optimal height, allow a larger portion
- // to be clipped before extending to following rows, to avoid obscuring cells for
- // reference input (next row is likely to be useful in formulas).
+ // #106635# When editing a formula in a cell with optimal height, allow a larger portion
+ // to be clipped before extending to following rows, to avoid obscuring cells for
+ // reference input (next row is likely to be useful in formulas).
long nAllowedExtra = SC_GROWY_SMALL_EXTRA;
if ( nEditEndRow == nEditRow && !( pDoc->GetRowFlags( nEditRow, nTabNo ) & CR_MANUALSIZE ) &&
pEngine->GetParagraphCount() <= 1 )
{
- // If the (only) paragraph starts with a '=', it's a formula.
- // If this is the initial call and the text is empty, allow the larger value, too,
- // because this occurs in the normal progress of editing a formula.
- // Subsequent calls with empty text might involve changed attributes (including
- // font height), so they are treated like normal text.
+ // If the (only) paragraph starts with a '=', it's a formula.
+ // If this is the initial call and the text is empty, allow the larger value, too,
+ // because this occurs in the normal progress of editing a formula.
+ // Subsequent calls with empty text might involve changed attributes (including
+ // font height), so they are treated like normal text.
String aText = pEngine->GetText( (USHORT) 0 );
if ( ( aText.Len() == 0 && bInitial ) || aText.GetChar(0) == (sal_Unicode)'=' )
nAllowedExtra = SC_GROWY_BIG_EXTRA;
@@ -1411,11 +1411,11 @@ void ScViewData::EditGrowY( BOOL bInitial )
if ( aArea.Bottom() > aArea.Top() + aSize.Height() - 1 )
{
aArea.Bottom() = aArea.Top() + aSize.Height() - 1;
- bMaxReached = TRUE; // don't occupy more cells beyond paper size
+ bMaxReached = TRUE; // don't occupy more cells beyond paper size
}
bChanged = TRUE;
- nAllowedExtra = SC_GROWY_SMALL_EXTRA; // larger value is only for first row
+ nAllowedExtra = SC_GROWY_SMALL_EXTRA; // larger value is only for first row
}
if (bChanged)
@@ -1505,8 +1505,8 @@ void ScViewData::SetTabNo( SCTAB nNewTab )
CreateTabData(nTabNo);
pThisTab = pTabData[nTabNo];
- CalcPPT(); // for common column width correction
- RecalcPixPos(); //! nicht immer noetig!
+ CalcPPT(); // for common column width correction
+ RecalcPixPos(); //! nicht immer noetig!
}
void ScViewData::SetActivePart( ScSplitPos eNewActive )
@@ -1561,8 +1561,8 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich,
USHORT nTSize;
- SCCOL nPosX = GetPosX(eWhichX);
- SCCOL nX;
+ SCCOL nPosX = GetPosX(eWhichX);
+ SCCOL nX;
long nScrPosX=0;
if (nWhereX >= nPosX)
@@ -1592,8 +1592,8 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich,
}
}
- SCROW nPosY = GetPosY(eWhichY);
- SCROW nY;
+ SCROW nPosY = GetPosY(eWhichY);
+ SCROW nY;
long nScrPosY=0;
if (nWhereY >= nPosY)
@@ -1634,7 +1634,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich,
if ( pDoc->IsLayoutRTL( nTabNo ) )
{
- // mirror horizontal position
+ // mirror horizontal position
nScrPosX = aScrSize.Width() - 1 - nScrPosX;
}
@@ -1644,7 +1644,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich,
}
//
-// Anzahl Zellen auf einem Bildschirm
+// Anzahl Zellen auf einem Bildschirm
//
SCCOL ScViewData::CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHORT nScrSizeX ) const
@@ -1654,19 +1654,19 @@ SCCOL ScViewData::CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHO
if (pView)
((ScViewData*)this)->aScrSize.Width() = pView->GetGridWidth(eWhichX);
- SCsCOL nX;
- USHORT nScrPosX = 0;
+ SCsCOL nX;
+ USHORT nScrPosX = 0;
if (nScrSizeX == SC_SIZE_NONE) nScrSizeX = (USHORT) aScrSize.Width();
if (nDir==1)
- nX = nPosX; // vorwaerts
+ nX = nPosX; // vorwaerts
else
- nX = nPosX-1; // rueckwaerts
+ nX = nPosX-1; // rueckwaerts
BOOL bOut = FALSE;
for ( ; nScrPosX<=nScrSizeX && !bOut; nX = sal::static_int_cast<SCsCOL>(nX + nDir) )
{
- SCsCOL nColNo = nX;
+ SCsCOL nColNo = nX;
if ( nColNo < 0 || nColNo > MAXCOL )
bOut = TRUE;
else
@@ -1706,7 +1706,7 @@ SCROW ScViewData::CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, USHO
nY = nPosY;
long nScrPosY = 0;
AddPixelsWhile( nScrPosY, nScrSizeY, nY, MAXROW, nPPTY, pDoc, nTabNo);
- // Original loop ended on last evaluated +1 or if that was MAXROW even
+ // Original loop ended on last evaluated +1 or if that was MAXROW even
// on MAXROW+2.
nY += (nY == MAXROW ? 2 : 1);
nY -= nPosY;
@@ -1717,7 +1717,7 @@ SCROW ScViewData::CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, USHO
nY = nPosY-1;
long nScrPosY = 0;
AddPixelsWhileBackward( nScrPosY, nScrSizeY, nY, 0, nPPTY, pDoc, nTabNo);
- // Original loop ended on last evaluated -1 or if that was 0 even on
+ // Original loop ended on last evaluated -1 or if that was 0 even on
// -2.
nY -= (nY == 0 ? 2 : 1);
nY = (nPosY-1)-nY;
@@ -1751,7 +1751,7 @@ SCROW ScViewData::PrevCellsY( ScVSplitPos eWhichY ) const
//UNUSED2008-05 {
//UNUSED2008-05 return CellsAtX( MAXCOL+1, -1, eWhichX, SC_SIZE_NONE );
//UNUSED2008-05 }
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 SCROW ScViewData::LastCellsY( ScVSplitPos eWhichY ) const
//UNUSED2008-05 {
//UNUSED2008-05 return CellsAtY( MAXROW+1, -1, eWhichY, SC_SIZE_NONE );
@@ -1773,7 +1773,7 @@ BOOL ScViewData::GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& r
{
SCROW nLastRow = nRow;
if (pDoc->RowHidden(nRow, nTabNo, NULL, &nLastRow))
- {
+ {
nRow = nLastRow;
continue;
}
@@ -1798,14 +1798,14 @@ BOOL ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich,
SCsCOL& rPosX, SCsROW& rPosY,
BOOL bTestMerge, BOOL bRepair, BOOL bNextIfLarge )
{
- // special handling of 0 is now in ScViewFunctionSet::SetCursorAtPoint
+ // special handling of 0 is now in ScViewFunctionSet::SetCursorAtPoint
ScHSplitPos eHWhich = WhichH(eWhich);
ScVSplitPos eVWhich = WhichV(eWhich);
if ( pDoc->IsLayoutRTL( nTabNo ) )
{
- // mirror horizontal position
+ // mirror horizontal position
if (pView)
aScrSize.Width() = pView->GetGridWidth(eHWhich);
nClickX = aScrSize.Width() - 1 - nClickX;
@@ -1848,7 +1848,7 @@ BOOL ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich,
}
}
- if (bNextIfLarge) // zu grosse Zellen ?
+ if (bNextIfLarge) // zu grosse Zellen ?
{
if ( rPosX == nStartPosX && nClickX > 0 )
{
@@ -1873,7 +1873,7 @@ BOOL ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich,
if (bTestMerge)
{
- //! public Methode um Position anzupassen
+ //! public Methode um Position anzupassen
BOOL bHOver = FALSE;
while (pDoc->IsHorOverlapped( rPosX, rPosY, nTabNo ))
@@ -1992,7 +1992,7 @@ void ScViewData::SetPosY( ScVSplitPos eWhich, SCROW nNewPosY )
pThisTab->nPosY[eWhich] = 0;
}
-void ScViewData::RecalcPixPos() // nach Zoom-Aenderungen
+void ScViewData::RecalcPixPos() // nach Zoom-Aenderungen
{
for (USHORT eWhich=0; eWhich<2; eWhich++)
{
@@ -2112,7 +2112,7 @@ void ScViewData::SetScreen( const Rectangle& rVisArea )
{
SetScreenPos( rVisArea.TopLeft() );
- // hier ohne GetOutputFactor(), weil fuer Ausgabe in Metafile
+ // hier ohne GetOutputFactor(), weil fuer Ausgabe in Metafile
aScrSize = rVisArea.GetSize();
aScrSize.Width() = (long)
@@ -2185,12 +2185,12 @@ void ScViewData::CalcPPT()
{
nPPTX = ScGlobal::nScreenPPTX * (double) GetZoomX();
if (pDocShell)
- nPPTX = nPPTX / pDocShell->GetOutputFactor(); // Faktor ist Drucker zu Bildschirm
+ nPPTX = nPPTX / pDocShell->GetOutputFactor(); // Faktor ist Drucker zu Bildschirm
nPPTY = ScGlobal::nScreenPPTY * (double) GetZoomY();
- // #83616# if detective objects are present,
- // try to adjust horizontal scale so the most common column width has minimal rounding errors,
- // to avoid differences between cell and drawing layer output
+ // #83616# if detective objects are present,
+ // try to adjust horizontal scale so the most common column width has minimal rounding errors,
+ // to avoid differences between cell and drawing layer output
if ( pDoc && pDoc->HasDetectiveObjects(nTabNo) )
{
@@ -2198,7 +2198,7 @@ void ScViewData::CalcPPT()
SCROW nDummy = 0;
pDoc->GetTableArea( nTabNo, nEndCol, nDummy );
if (nEndCol<20)
- nEndCol = 20; // same end position as when determining draw scale
+ nEndCol = 20; // same end position as when determining draw scale
USHORT nTwips = pDoc->GetCommonWidth( nEndCol, nTabNo );
if ( nTwips )
@@ -2206,8 +2206,8 @@ void ScViewData::CalcPPT()
double fOriginal = nTwips * nPPTX;
if ( fOriginal < static_cast<double>(nEndCol) )
{
- // if one column is smaller than the column count,
- // rounding errors are likely to add up to a whole column.
+ // if one column is smaller than the column count,
+ // rounding errors are likely to add up to a whole column.
double fRounded = ::rtl::math::approxFloor( fOriginal + 0.5 );
if ( fRounded > 0.0 )
@@ -2223,18 +2223,18 @@ void ScViewData::CalcPPT()
//------------------------------------------------------------------
-#define SC_OLD_TABSEP '/'
-#define SC_NEW_TABSEP '+'
+#define SC_OLD_TABSEP '/'
+#define SC_NEW_TABSEP '+'
void ScViewData::WriteUserData(String& rData)
{
- // nZoom (bis 364v) oder nZoom/nPageZoom/bPageMode (ab 364w)
- // nTab
+ // nZoom (bis 364v) oder nZoom/nPageZoom/bPageMode (ab 364w)
+ // nTab
// Tab-ControlBreite
- // pro Tabelle:
- // CursorX/CursorY/HSplitMode/VSplitMode/HSplitPos/VSplitPos/SplitActive/
- // PosX[links]/PosX[rechts]/PosY[oben]/PosY[unten]
- // wenn Zeilen groesser 8192, "+" statt "/"
+ // pro Tabelle:
+ // CursorX/CursorY/HSplitMode/VSplitMode/HSplitPos/VSplitPos/SplitActive/
+ // PosX[links]/PosX[rechts]/PosY[oben]/PosY[unten]
+ // wenn Zeilen groesser 8192, "+" statt "/"
USHORT nZoom = (USHORT)((pThisTab->aZoomY.GetNumerator() * 100) / pThisTab->aZoomY.GetDenominator());
rData = String::CreateFromInt32( nZoom );
@@ -2256,16 +2256,16 @@ void ScViewData::WriteUserData(String& rData)
SCTAB nTabCount = pDoc->GetTableCount();
for (SCTAB i=0; i<nTabCount; i++)
{
- rData += ';'; // Numerierung darf auf keinen Fall durcheinanderkommen
+ rData += ';'; // Numerierung darf auf keinen Fall durcheinanderkommen
if (pTabData[i])
{
- sal_Unicode cTabSep = SC_OLD_TABSEP; // wie 3.1
+ sal_Unicode cTabSep = SC_OLD_TABSEP; // wie 3.1
if ( pTabData[i]->nCurY > MAXROW_30 ||
pTabData[i]->nPosY[0] > MAXROW_30 || pTabData[i]->nPosY[1] > MAXROW_30 ||
( pTabData[i]->eVSplitMode == SC_SPLIT_FIX &&
pTabData[i]->nFixPosY > MAXROW_30 ) )
{
- cTabSep = SC_NEW_TABSEP; // um eine 3.1-Version nicht umzubringen
+ cTabSep = SC_NEW_TABSEP; // um eine 3.1-Version nicht umzubringen
}
@@ -2302,14 +2302,14 @@ void ScViewData::WriteUserData(String& rData)
void ScViewData::ReadUserData(const String& rData)
{
- if (!rData.Len()) // Leerer String kommt bei "neu Laden"
- return; // dann auch ohne Assertion beenden
+ if (!rData.Len()) // Leerer String kommt bei "neu Laden"
+ return; // dann auch ohne Assertion beenden
xub_StrLen nCount = rData.GetTokenCount(';');
if ( nCount <= 2 )
{
- // #45208# beim Reload in der Seitenansicht sind evtl. die Preview-UserData
- // stehengelassen worden. Den Zoom von der Preview will man hier nicht...
+ // #45208# beim Reload in der Seitenansicht sind evtl. die Preview-UserData
+ // stehengelassen worden. Den Zoom von der Preview will man hier nicht...
DBG_ERROR("ReadUserData: das sind nicht meine Daten");
return;
}
@@ -2324,19 +2324,19 @@ void ScViewData::ReadUserData(const String& rData)
Fraction aZoomX, aZoomY, aPageZoomX, aPageZoomY; //! evaluate (all sheets?)
- String aZoomStr = rData.GetToken(0); // Zoom/PageZoom/Modus
+ String aZoomStr = rData.GetToken(0); // Zoom/PageZoom/Modus
USHORT nNormZoom = sal::static_int_cast<USHORT>(aZoomStr.GetToken(0,'/').ToInt32());
if ( nNormZoom >= MINZOOM && nNormZoom <= MAXZOOM )
- aZoomX = aZoomY = Fraction( nNormZoom, 100 ); // "normaler" Zoom (immer)
+ aZoomX = aZoomY = Fraction( nNormZoom, 100 ); // "normaler" Zoom (immer)
USHORT nPageZoom = sal::static_int_cast<USHORT>(aZoomStr.GetToken(1,'/').ToInt32());
if ( nPageZoom >= MINZOOM && nPageZoom <= MAXZOOM )
- aPageZoomX = aPageZoomY = Fraction( nPageZoom, 100 ); // Pagebreak-Zoom, wenn gesetzt
- sal_Unicode cMode = aZoomStr.GetToken(2,'/').GetChar(0); // 0 oder "0"/"1"
+ aPageZoomX = aPageZoomY = Fraction( nPageZoom, 100 ); // Pagebreak-Zoom, wenn gesetzt
+ sal_Unicode cMode = aZoomStr.GetToken(2,'/').GetChar(0); // 0 oder "0"/"1"
SetPagebreakMode( cMode == '1' );
// SetPagebreakMode muss immer gerufen werden wegen CalcPPT / RecalcPixPos()
//
- // Tabelle kann ungueltig geworden sein (z.B. letzte Version):
+ // Tabelle kann ungueltig geworden sein (z.B. letzte Version):
//
SCTAB nNewTab = static_cast<SCTAB>(rData.GetToken(1).ToInt32());
if (pDoc->HasTable( nNewTab ))
@@ -2401,15 +2401,15 @@ void ScViewData::ReadUserData(const String& rData)
pTabData[nPos]->nPosY[0] = SanitizeRow( aTabOpt.GetToken(9,cTabSep).ToInt32());
pTabData[nPos]->nPosY[1] = SanitizeRow( aTabOpt.GetToken(10,cTabSep).ToInt32());
- // Test, ob der aktive Teil laut SplitMode ueberhaupt existiert
- // (Bug #44516#)
+ // Test, ob der aktive Teil laut SplitMode ueberhaupt existiert
+ // (Bug #44516#)
ScSplitPos eTest = pTabData[nPos]->eWhichActive;
if ( ( WhichH( eTest ) == SC_SPLIT_RIGHT &&
pTabData[nPos]->eHSplitMode == SC_SPLIT_NONE ) ||
( WhichV( eTest ) == SC_SPLIT_TOP &&
pTabData[nPos]->eVSplitMode == SC_SPLIT_NONE ) )
{
- // dann wieder auf Default (unten links)
+ // dann wieder auf Default (unten links)
pTabData[nPos]->eWhichActive = SC_SPLIT_BOTTOMLEFT;
DBG_ERROR("SplitPos musste korrigiert werden");
}
@@ -2957,12 +2957,12 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
void ScViewData::SetOptions( const ScViewOptions& rOpt )
{
- // if visibility of horiz. ScrollBar is changed, TabBar may have to be resized...
+ // if visibility of horiz. ScrollBar is changed, TabBar may have to be resized...
BOOL bHScrollChanged = ( rOpt.GetOption(VOPT_HSCROLL) != pOptions->GetOption(VOPT_HSCROLL) );
- // if graphics are turned on or off, animation has to be started or stopped
- // graphics are controlled by VOBJ_TYPE_OLE
- BOOL bGraphicsChanged = ( pOptions->GetObjMode(VOBJ_TYPE_OLE) !=
+ // if graphics are turned on or off, animation has to be started or stopped
+ // graphics are controlled by VOBJ_TYPE_OLE
+ BOOL bGraphicsChanged = ( pOptions->GetObjMode(VOBJ_TYPE_OLE) !=
rOpt.GetObjMode(VOBJ_TYPE_OLE) );
*pOptions = rOpt;
@@ -2991,10 +2991,10 @@ BOOL ScViewData::IsOle()
return pDocShell && pDocShell->IsOle();
}
-BOOL ScViewData::UpdateFixX( SCTAB nTab ) // TRUE = Wert geaendert
+BOOL ScViewData::UpdateFixX( SCTAB nTab ) // TRUE = Wert geaendert
{
- if (!ValidTab(nTab)) // Default
- nTab=nTabNo; // akuelle Tabelle
+ if (!ValidTab(nTab)) // Default
+ nTab=nTabNo; // akuelle Tabelle
if (!pView || pTabData[nTab]->eHSplitMode != SC_SPLIT_FIX)
return FALSE;
@@ -3019,17 +3019,17 @@ BOOL ScViewData::UpdateFixX( SCTAB nTab ) // TRUE = Wert geaendert
{
pTabData[nTab]->nHSplitPos = nNewPos;
if (nTab == nTabNo)
- RecalcPixPos(); //! sollte nicht noetig sein !!!
+ RecalcPixPos(); //! sollte nicht noetig sein !!!
return TRUE;
}
return FALSE;
}
-BOOL ScViewData::UpdateFixY( SCTAB nTab ) // TRUE = Wert geaendert
+BOOL ScViewData::UpdateFixY( SCTAB nTab ) // TRUE = Wert geaendert
{
- if (!ValidTab(nTab)) // Default
- nTab=nTabNo; // akuelle Tabelle
+ if (!ValidTab(nTab)) // Default
+ nTab=nTabNo; // akuelle Tabelle
if (!pView || pTabData[nTab]->eVSplitMode != SC_SPLIT_FIX)
return FALSE;
@@ -3054,7 +3054,7 @@ BOOL ScViewData::UpdateFixY( SCTAB nTab ) // TRUE = Wert geaendert
{
pTabData[nTab]->nVSplitPos = nNewPos;
if (nTab == nTabNo)
- RecalcPixPos(); //! sollte nicht noetig sein !!!
+ RecalcPixPos(); //! sollte nicht noetig sein !!!
return TRUE;
}
@@ -3078,9 +3078,9 @@ void ScViewData::UpdateOutlinerFlags( Outliner& rOutl ) const
rOutl.SetCalcFieldValueHdl( LINK( SC_MOD(), ScModule, CalcFieldValueHdl ) );
- // #97417# don't call GetSpellChecker if online spelling isn't enabled.
- // The language for AutoCorrect etc. is taken from the pool defaults
- // (set in ScDocument::UpdateDrawLanguages)
+ // #97417# don't call GetSpellChecker if online spelling isn't enabled.
+ // The language for AutoCorrect etc. is taken from the pool defaults
+ // (set in ScDocument::UpdateDrawLanguages)
if ( bOnlineSpell )
{
@@ -3099,7 +3099,7 @@ ScAddress ScViewData::GetCurPos() const
// static
-void ScViewData::AddPixelsWhile( long & rScrY, long nEndPixels, SCROW & rPosY,
+void ScViewData::AddPixelsWhile( long & rScrY, long nEndPixels, SCROW & rPosY,
SCROW nEndRow, double nPPTY, const ScDocument * pDoc, SCTAB nTabNo )
{
SCROW nRow = rPosY;
@@ -3140,7 +3140,7 @@ void ScViewData::AddPixelsWhile( long & rScrY, long nEndPixels, SCROW & rPosY,
// static
void ScViewData::AddPixelsWhileBackward( long & rScrY, long nEndPixels,
- SCROW & rPosY, SCROW nStartRow, double nPPTY, const ScDocument * pDoc,
+ SCROW & rPosY, SCROW nStartRow, double nPPTY, const ScDocument * pDoc,
SCTAB nTabNo )
{
SCROW nRow = rPosY;
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index a125cbea6f50..89cabba14acc 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include "attrib.hxx"
#include "autoform.hxx"
-#include "cell.hxx" // EnterAutoSum
+#include "cell.hxx" // EnterAutoSum
#include "compiler.hxx"
#include "docfunc.hxx"
#include "docpool.hxx"
@@ -237,7 +237,7 @@ ScAutoSum lcl_IsAutoSumData( ScDocument* pDoc, SCCOL nCol, SCROW nRow,
//----------------------------------------------------------------------------
-#define SC_AUTOSUM_MAXCOUNT 20
+#define SC_AUTOSUM_MAXCOUNT 20
ScAutoSum lcl_SeekAutoSumData( ScDocument* pDoc, SCCOL& nCol, SCROW& nRow,
SCTAB nTab, ScDirection eDir, SCCOLROW& nExtend )
@@ -408,11 +408,11 @@ BOOL ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList )
SCCOL nStartCol = nCol;
SCROW nStartRow = nRow;
- SCCOL nEndCol = nCol;
- SCROW nEndRow = nRow;
- SCCOL nSeekCol = nCol;
- SCROW nSeekRow = nRow;
- SCCOLROW nExtend; // wird per Reference gueltig bei ScAutoSumSum
+ SCCOL nEndCol = nCol;
+ SCROW nEndRow = nRow;
+ SCCOL nSeekCol = nCol;
+ SCROW nSeekRow = nRow;
+ SCCOLROW nExtend; // wird per Reference gueltig bei ScAutoSumSum
BOOL bCol = FALSE;
BOOL bRow = FALSE;
@@ -443,19 +443,19 @@ BOOL ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList )
{
if ( bRow )
{
- nStartRow = nSeekRow; // nSeekRow evtl. per Reference angepasst
+ nStartRow = nSeekRow; // nSeekRow evtl. per Reference angepasst
if ( eSum == ScAutoSumSum )
- nEndRow = nStartRow; // nur Summen summieren
+ nEndRow = nStartRow; // nur Summen summieren
else
- nEndRow = nRow - 1; // Datenbereich evtl. nach unten erweitern
+ nEndRow = nRow - 1; // Datenbereich evtl. nach unten erweitern
}
else
{
- nStartCol = nSeekCol; // nSeekCol evtl. per Reference angepasst
+ nStartCol = nSeekCol; // nSeekCol evtl. per Reference angepasst
if ( eSum == ScAutoSumSum )
- nEndCol = nStartCol; // nur Summen summieren
+ nEndCol = nStartCol; // nur Summen summieren
else
- nEndCol = nCol - 1; // Datenbereich evtl. nach rechts erweitern
+ nEndCol = nCol - 1; // Datenbereich evtl. nach rechts erweitern
}
BOOL bContinue = FALSE;
do
@@ -464,7 +464,7 @@ BOOL ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList )
{
if ( bRow )
{
- while ( nStartRow != 0 && lcl_IsAutoSumData( pDoc, nCol,
+ while ( nStartRow != 0 && lcl_IsAutoSumData( pDoc, nCol,
nStartRow-1, nTab, DIR_TOP, nExtend /*out*/ ) == eSum )
--nStartRow;
}
@@ -504,7 +504,7 @@ BOOL ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList )
//----------------------------------------------------------------------------
-void ScViewFunc::EnterAutoSum(const ScRangeList& rRangeList, sal_Bool bSubTotal) // Block mit Summen fuellen
+void ScViewFunc::EnterAutoSum(const ScRangeList& rRangeList, sal_Bool bSubTotal) // Block mit Summen fuellen
{
String aFormula = GetAutoSumFormula( rRangeList, bSubTotal );
EnterBlock( aFormula, NULL );
@@ -749,7 +749,7 @@ String ScViewFunc::GetAutoSumFormula( const ScRangeList& rRangeList, bool bSubTo
void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData )
{
- // Mehrfachselektion vorher abfragen...
+ // Mehrfachselektion vorher abfragen...
SCCOL nCol = GetViewData()->GetCurX();
SCROW nRow = GetViewData()->GetCurY();
@@ -759,10 +759,10 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData
{
rMark.MarkToSimple();
if ( rMark.IsMultiMarked() )
- { // "Einfuegen auf Mehrfachselektion nicht moeglich"
+ { // "Einfuegen auf Mehrfachselektion nicht moeglich"
ErrorMessage(STR_MSSG_PASTEFROMCLIP_0);
- // insert into single cell
+ // insert into single cell
if ( pData )
EnterData( nCol, nRow, nTab, pData );
else
@@ -787,7 +787,7 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData
}
}
- // Einfuegen per PasteFromClip
+ // Einfuegen per PasteFromClip
WaitObject aWait( GetFrameWin() );
@@ -796,9 +796,9 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData
ScDocument* pInsDoc = new ScDocument( SCDOCMODE_CLIP );
pInsDoc->ResetClip( pDoc, nTab );
- if (aNewStr.GetChar(0) == '=') // Formel ?
+ if (aNewStr.GetChar(0) == '=') // Formel ?
{
- // SetString geht nicht, weil in Clipboard-Dokumenten nicht kompiliert wird!
+ // SetString geht nicht, weil in Clipboard-Dokumenten nicht kompiliert wird!
ScFormulaCell* pFCell = new ScFormulaCell( pDoc, aPos, aNewStr );
pInsDoc->PutCell( nCol, nRow, nTab, pFCell );
}
@@ -815,7 +815,7 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData
const SfxUInt32Item* pItem = (SfxUInt32Item*) pInsDoc->GetAttr(
nCol, nRow, nTab, ATTR_VALUE_FORMAT );
if ( pItem )
- { // Numberformat setzen wenn inkompatibel
+ { // Numberformat setzen wenn inkompatibel
// MarkData wurde bereits in PasteFromClip MarkToSimple'ed
ScRange aRange;
rMark.GetMarkArea( aRange );
@@ -867,7 +867,7 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData
//----------------------------------------------------------------------------
-// manueller Seitenumbruch
+// manueller Seitenumbruch
void ScViewFunc::InsertPageBreak( BOOL bColumn, BOOL bRecord, const ScAddress* pPos,
BOOL bSetModified )
@@ -883,7 +883,7 @@ void ScViewFunc::InsertPageBreak( BOOL bColumn, BOOL bRecord, const ScAddress* p
InsertPageBreak( bColumn, aCursor, bRecord, bSetModified, FALSE );
if ( bSuccess && bSetModified )
- UpdatePageBreakData( TRUE ); // fuer PageBreak-Modus
+ UpdatePageBreakData( TRUE ); // fuer PageBreak-Modus
}
@@ -903,7 +903,7 @@ void ScViewFunc::DeletePageBreak( BOOL bColumn, BOOL bRecord, const ScAddress* p
RemovePageBreak( bColumn, aCursor, bRecord, bSetModified, FALSE );
if ( bSuccess && bSetModified )
- UpdatePageBreakData( TRUE ); // fuer PageBreak-Modus
+ UpdatePageBreakData( TRUE ); // fuer PageBreak-Modus
}
//----------------------------------------------------------------------------
@@ -955,12 +955,12 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint,
const String* pRepCol, const String* pRepRow,
BOOL bAddPrint )
{
- // on all selected tables
+ // on all selected tables
- ScDocShell* pDocSh = GetViewData()->GetDocShell();
- ScDocument* pDoc = pDocSh->GetDocument();
- SCTAB nTabCount = pDoc->GetTableCount();
- ScMarkData& rMark = GetViewData()->GetMarkData();
+ ScDocShell* pDocSh = GetViewData()->GetDocShell();
+ ScDocument* pDoc = pDocSh->GetDocument();
+ SCTAB nTabCount = pDoc->GetTableCount();
+ ScMarkData& rMark = GetViewData()->GetMarkData();
SCTAB nTab;
BOOL bUndo (pDoc->IsUndoEnabled());
@@ -973,7 +973,7 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint,
{
ScRange aRange( 0,0,nTab );
- // print ranges
+ // print ranges
if( !bAddPrint )
pDoc->ClearPrintRanges( nTab );
@@ -1021,7 +1021,7 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint,
}
}
- // repeat columns
+ // repeat columns
if ( pRepCol )
{
@@ -1032,7 +1032,7 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint,
pDoc->SetRepeatColRange( nTab, &aRange );
}
- // repeat rows
+ // repeat rows
if ( pRepRow )
{
@@ -1044,7 +1044,7 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint,
}
}
- // undo (for all tables)
+ // undo (for all tables)
if (bUndo)
{
SCTAB nCurTab = GetViewData()->GetTabNo();
@@ -1053,7 +1053,7 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint,
new ScUndoPrintRange( pDocSh, nCurTab, pOldRanges, pNewRanges ) );
}
- // update page breaks
+ // update page breaks
for (nTab=0; nTab<nTabCount; nTab++)
if (rMark.GetTableSelect(nTab))
@@ -1066,11 +1066,11 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint,
}
//----------------------------------------------------------------------------
-// Zellen zusammenfassen
+// Zellen zusammenfassen
-BOOL ScViewFunc::TestMergeCells() // Vorab-Test (fuer Menue)
+BOOL ScViewFunc::TestMergeCells() // Vorab-Test (fuer Menue)
{
- // simple test: TRUE if there's a selection but no multi selection and not filtered
+ // simple test: TRUE if there's a selection but no multi selection and not filtered
const ScMarkData& rMark = GetViewData()->GetMarkData();
if ( rMark.IsMarked() || rMark.IsMultiMarked() )
@@ -1087,8 +1087,8 @@ BOOL ScViewFunc::TestMergeCells() // Vorab-Test (fuer Menue)
BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord )
{
- // Editable- und Verschachtelungs-Abfrage muss vorneweg sein (auch in DocFunc),
- // damit dann nicht die Inhalte-QueryBox kommt
+ // Editable- und Verschachtelungs-Abfrage muss vorneweg sein (auch in DocFunc),
+ // damit dann nicht die Inhalte-QueryBox kommt
ScEditableTester aTester( this );
if (!aTester.IsEditable())
{
@@ -1123,7 +1123,7 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord )
if ( pDoc->HasAttrib( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab,
HASATTR_MERGED | HASATTR_OVERLAPPED ) )
- { // "Zusammenfassen nicht verschachteln !"
+ { // "Zusammenfassen nicht verschachteln !"
ErrorMessage(STR_MSSG_MERGECELLS_0);
return FALSE;
}
@@ -1210,7 +1210,7 @@ BOOL ScViewFunc::RemoveMerge( BOOL bRecord )
if (bOk)
pDocSh->UpdateOle(GetViewData());
}
- return TRUE; //! bOk ??
+ return TRUE; //! bOk ??
}
//----------------------------------------------------------------------------
@@ -1279,7 +1279,7 @@ void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow,
FillAuto( aRange, &rMark, eDir, nCount, bRecord, FALSE );
if (bSuccess)
{
- MarkRange( aRange, FALSE ); // aRange ist in FillAuto veraendert worden
+ MarkRange( aRange, FALSE ); // aRange ist in FillAuto veraendert worden
pDocSh->UpdateOle(GetViewData());
UpdateScrollBars();
@@ -1352,12 +1352,12 @@ void ScViewFunc::FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL
aMarkRange = ScRange( GetViewData()->GetCurX(), GetViewData()->GetCurY(), nTab );
ScDocument* pUndoDoc = NULL;
-// if ( bRecord )
+// if ( bRecord )
if (bUndo)
{
pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
pUndoDoc->InitUndo( pDoc, nTab, nTab );
-// pUndoDoc->SelectTable( nTab, TRUE ); // nur fuer Markierung
+// pUndoDoc->SelectTable( nTab, TRUE ); // nur fuer Markierung
SCTAB nTabCount = pDoc->GetTableCount();
for (SCTAB i=0; i<nTabCount; i++)
@@ -1367,7 +1367,7 @@ void ScViewFunc::FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL
aMarkRange.aStart.SetTab( i );
aMarkRange.aEnd.SetTab( i );
pDoc->CopyToDocument( aMarkRange, IDF_ALL, bMulti, pUndoDoc );
-// pUndoDoc->SelectTable( i, TRUE );
+// pUndoDoc->SelectTable( i, TRUE );
}
}
@@ -1380,9 +1380,9 @@ void ScViewFunc::FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL
pDoc->FillTab( aMarkRange, rMark, nFlags, nFunction, bSkipEmpty, bAsLink );
}
-// if ( bRecord )
+// if ( bRecord )
if (bUndo)
- { //! fuer ChangeTrack erst zum Schluss
+ { //! fuer ChangeTrack erst zum Schluss
pDocSh->GetUndoManager()->AddUndoAction(
new ScUndoFillTable( pDocSh, rMark,
aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), nTab,
@@ -1476,7 +1476,7 @@ void ScViewFunc::TransliterateText( sal_Int32 nType )
ScMarkData aFuncMark = GetViewData()->GetMarkData();
if ( !aFuncMark.IsMarked() && !aFuncMark.IsMultiMarked() )
{
- // no selection -> use cursor position
+ // no selection -> use cursor position
ScAddress aCursor( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() );
aFuncMark.SetMarkArea( ScRange( aCursor ) );
@@ -1491,7 +1491,7 @@ void ScViewFunc::TransliterateText( sal_Int32 nType )
}
//----------------------------------------------------------------------------
-// AutoFormat
+// AutoFormat
ScAutoFormatData* ScViewFunc::CreateAutoFormatData()
{
@@ -1599,7 +1599,7 @@ void ScViewFunc::AutoFormat( USHORT nFormatNo, BOOL bRecord )
nEndCol, nEndRow, nEndTab, PAINT_GRID );
}
- if ( bRecord ) // Draw-Undo erst jetzt verfuegbar
+ if ( bRecord ) // Draw-Undo erst jetzt verfuegbar
{
pDocSh->GetUndoManager()->AddUndoAction(
new ScUndoAutoFormat( pDocSh,
@@ -1618,7 +1618,7 @@ void ScViewFunc::AutoFormat( USHORT nFormatNo, BOOL bRecord )
//----------------------------------------------------------------------------
-// Suchen & Ersetzen
+// Suchen & Ersetzen
void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
BOOL bAddUndo, BOOL bIsApi )
@@ -1653,7 +1653,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
}
}
else
- { //! mindestens eine ist immer selektiert
+ { //! mindestens eine ist immer selektiert
nStartTab = nEndTab = rMark.GetFirstSelected();
for ( SCTAB j = nStartTab + 1; j <= nLastTab; j++ )
{
@@ -1682,14 +1682,14 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
|| nCommand == SVX_SEARCHCMD_FIND_ALL)
bAddUndo = FALSE;
- //! bAttrib bei Undo beruecksichtigen !!!
+ //! bAttrib bei Undo beruecksichtigen !!!
ScDocument* pUndoDoc = NULL;
ScMarkData* pUndoMark = NULL;
String aUndoStr;
if (bAddUndo)
{
- pUndoMark = new ScMarkData( rMark ); // Markierung wird veraendert
+ pUndoMark = new ScMarkData( rMark ); // Markierung wird veraendert
if ( nCommand == SVX_SEARCHCMD_REPLACE_ALL )
{
pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
@@ -1698,17 +1698,17 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
}
if ( bAllTables )
- { //! alles selektieren, erst nachdem pUndoMark erzeugt wurde
+ { //! alles selektieren, erst nachdem pUndoMark erzeugt wurde
for ( SCTAB j = nStartTab; j <= nEndTab; j++ )
{
rMark.SelectTable( j, TRUE );
}
}
- DoneBlockMode(TRUE); // Markierung nicht loeschen!
+ DoneBlockMode(TRUE); // Markierung nicht loeschen!
InitOwnBlockMode();
- // wenn vom Anfang an gesucht wird, nicht nochmal fragen ob vom Anfang gesucht werden soll
+ // wenn vom Anfang an gesucht wird, nicht nochmal fragen ob vom Anfang gesucht werden soll
BOOL bFirst = TRUE;
if ( nCol == 0 && nRow == 0 && nTab == nStartTab && !pSearchItem->GetBackward() )
bFirst = FALSE;
@@ -1730,7 +1730,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
pUndoDoc = NULL;
}
- break; // Abbruch while True
+ break; // Abbruch while True
}
else if ( bFirst && (nCommand == SVX_SEARCHCMD_FIND ||
nCommand == SVX_SEARCHCMD_REPLACE) )
@@ -1742,7 +1742,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
nRetVal = RET_NO;
else
{
- // Suchen-Dialog als Parent, wenn vorhanden
+ // Suchen-Dialog als Parent, wenn vorhanden
Window* pParent = GetParentOrChild(SID_SEARCH_DLG);
USHORT nStrId;
if ( pSearchItem->GetBackward() )
@@ -1775,38 +1775,38 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
}
else
{
- break; // Abbruch while True
+ break; // Abbruch while True
}
}
- else // nichts gefunden
+ else // nichts gefunden
{
if ( nCommand == SVX_SEARCHCMD_FIND_ALL || nCommand == SVX_SEARCHCMD_REPLACE_ALL )
{
- pDocSh->PostPaintGridAll(); // Markierung
+ pDocSh->PostPaintGridAll(); // Markierung
}
GetFrameWin()->LeaveWait();
if (!bIsApi)
{
- // Suchen-Dialog als Parent, wenn vorhanden
+ // Suchen-Dialog als Parent, wenn vorhanden
Window* pParent = GetParentOrChild(SID_SEARCH_DLG);
// "nichts gefunden"
InfoBox aBox( pParent, ScGlobal::GetRscString( STR_MSSG_SEARCHANDREPLACE_0 ) );
aBox.Execute();
}
- break; // Abbruch while True
+ break; // Abbruch while True
}
- } // of while TRUE
+ } // of while TRUE
if ( pOldSelectedTables )
- { // urspruenglich selektierte Tabellen wiederherstellen
+ { // urspruenglich selektierte Tabellen wiederherstellen
for ( SCTAB j = nStartTab; j <= nEndTab; j++ )
{
rMark.SelectTable( j, pOldSelectedTables[j] );
}
if ( bFound )
- { // durch Fundstelle neu selektierte Tabelle bleibt
+ { // durch Fundstelle neu selektierte Tabelle bleibt
rMark.SelectTable( nTab, TRUE );
// wenn vorher nur eine selektiert war, ist es ein Tausch
//! wenn nicht, ist jetzt evtl. eine mehr selektiert
@@ -1823,8 +1823,8 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
if ( nTab != GetViewData()->GetTabNo() )
SetTabNo( nTab );
- // wenn nichts markiert ist, DoneBlockMode, damit von hier aus
- // direkt per Shift-Cursor markiert werden kann:
+ // wenn nichts markiert ist, DoneBlockMode, damit von hier aus
+ // direkt per Shift-Cursor markiert werden kann:
if (!rMark.IsMarked() && !rMark.IsMultiMarked())
DoneBlockMode(TRUE);
@@ -1841,17 +1841,17 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
pDocSh->SetDocumentModified();
}
else if ( nCommand == SVX_SEARCHCMD_FIND_ALL )
- pDocSh->PostPaintGridAll(); // Markierung
+ pDocSh->PostPaintGridAll(); // Markierung
GetFrameWin()->LeaveWait();
}
- delete pUndoDoc; // loeschen wenn nicht benutzt
- delete pUndoMark; // kann immer geloescht werden
+ delete pUndoDoc; // loeschen wenn nicht benutzt
+ delete pUndoMark; // kann immer geloescht werden
}
//----------------------------------------------------------------------------
-// Zielwertsuche
+// Zielwertsuche
void ScViewFunc::Solve( const ScSolveParam& rParam )
{
@@ -1875,12 +1875,12 @@ void ScViewFunc::Solve( const ScSolveParam& rParam )
aTargetValStr = *(rParam.pStrTargetVal);
String aMsgStr;
- String aResStr;
- double nSolveResult;
+ String aResStr;
+ double nSolveResult;
GetFrameWin()->EnterWait();
- BOOL bExact =
+ BOOL bExact =
pDoc->Solver(
rParam.aRefFormulaCell.Col(),
rParam.aRefFormulaCell.Row(),
@@ -1929,7 +1929,7 @@ void ScViewFunc::Solve( const ScSolveParam& rParam )
//----------------------------------------------------------------------------
-// Mehrfachoperation
+// Mehrfachoperation
void ScViewFunc::TabOp( const ScTabOpParam& rParam, BOOL bRecord )
{
@@ -1950,17 +1950,17 @@ void ScViewFunc::TabOp( const ScTabOpParam& rParam, BOOL bRecord )
void ScViewFunc::MakeScenario( const String& rName, const String& rComment,
const Color& rColor, USHORT nFlags )
{
- ScDocShell* pDocSh = GetViewData()->GetDocShell();
- ScMarkData& rMark = GetViewData()->GetMarkData();
- SCTAB nTab = GetViewData()->GetTabNo();
+ ScDocShell* pDocSh = GetViewData()->GetDocShell();
+ ScMarkData& rMark = GetViewData()->GetMarkData();
+ SCTAB nTab = GetViewData()->GetTabNo();
SCTAB nNewTab = pDocSh->MakeScenario( nTab, rName, rComment, rColor, nFlags, rMark );
if (nFlags & SC_SCENARIO_COPYALL)
- SetTabNo( nNewTab, TRUE ); // SC_SCENARIO_COPYALL -> sichtbar
+ SetTabNo( nNewTab, TRUE ); // SC_SCENARIO_COPYALL -> sichtbar
else
{
SfxBindings& rBindings = GetViewData()->GetBindings();
- rBindings.Invalidate( SID_STATUS_DOCPOS ); // Statusbar
+ rBindings.Invalidate( SID_STATUS_DOCPOS ); // Statusbar
rBindings.Invalidate( SID_TABLES_COUNT );
rBindings.Invalidate( SID_SELECT_SCENARIO );
rBindings.Invalidate( FID_TABLE_SHOW );
@@ -1979,7 +1979,7 @@ void ScViewFunc::ExtendScenario()
return;
}
- // Undo: Attribute anwenden
+ // Undo: Attribute anwenden
ScDocument* pDoc = GetViewData()->GetDocument();
ScPatternAttr aPattern( pDoc->GetPool() );
@@ -1993,8 +1993,8 @@ void ScViewFunc::ExtendScenario()
void ScViewFunc::UseScenario( const String& rName )
{
- ScDocShell* pDocSh = GetViewData()->GetDocShell();
- SCTAB nTab = GetViewData()->GetTabNo();
+ ScDocShell* pDocSh = GetViewData()->GetDocShell();
+ SCTAB nTab = GetViewData()->GetTabNo();
DoneBlockMode();
InitOwnBlockMode();
@@ -2003,11 +2003,11 @@ void ScViewFunc::UseScenario( const String& rName )
//----------------------------------------------------------------------------
-// Tabelle einfuegen
+// Tabelle einfuegen
BOOL ScViewFunc::InsertTable( const String& rName, SCTAB nTab, BOOL bRecord )
{
- // Reihenfolge Tabelle/Name ist bei DocFunc umgekehrt
+ // Reihenfolge Tabelle/Name ist bei DocFunc umgekehrt
BOOL bSuccess = GetViewData()->GetDocShell()->GetDocFunc().
InsertTable( nTab, rName, bRecord, FALSE );
if (bSuccess)
@@ -2017,13 +2017,13 @@ BOOL ScViewFunc::InsertTable( const String& rName, SCTAB nTab, BOOL bRecord )
}
//----------------------------------------------------------------------------
-// Tabellen einfuegen
+// Tabellen einfuegen
BOOL ScViewFunc::InsertTables(SvStrings *pNames, SCTAB nTab,
SCTAB nCount, BOOL bRecord )
{
- ScDocShell* pDocSh = GetViewData()->GetDocShell();
- ScDocument* pDoc = pDocSh->GetDocument();
+ ScDocShell* pDocSh = GetViewData()->GetDocShell();
+ ScDocument* pDoc = pDocSh->GetDocument();
if (bRecord && !pDoc->IsUndoEnabled())
bRecord = FALSE;
@@ -2034,7 +2034,7 @@ BOOL ScViewFunc::InsertTables(SvStrings *pNames, SCTAB nTab,
if (bRecord)
{
pNameList= new SvStrings;
- pDoc->BeginDrawUndo(); // InsertTab erzeugt ein SdrUndoNewPage
+ pDoc->BeginDrawUndo(); // InsertTab erzeugt ein SdrUndoNewPage
}
BOOL bFlag=FALSE;
@@ -2076,7 +2076,7 @@ BOOL ScViewFunc::InsertTables(SvStrings *pNames, SCTAB nTab,
pDocSh->GetUndoManager()->AddUndoAction(
new ScUndoInsertTables( pDocSh, nTab, FALSE, pNameList));
- // Views updaten:
+ // Views updaten:
SetTabNo( nTab, TRUE );
pDocSh->PostPaintExtras();
@@ -2103,7 +2103,7 @@ BOOL ScViewFunc::AppendTable( const String& rName, BOOL bRecord )
WaitObject aWait( GetFrameWin() );
if (bRecord)
- pDoc->BeginDrawUndo(); // InsertTab erzeugt ein SdrUndoNewPage
+ pDoc->BeginDrawUndo(); // InsertTab erzeugt ein SdrUndoNewPage
if (pDoc->InsertTab( SC_TAB_APPEND, rName ))
{
@@ -2129,8 +2129,8 @@ BOOL ScViewFunc::AppendTable( const String& rName, BOOL bRecord )
BOOL ScViewFunc::DeleteTable( SCTAB nTab, BOOL bRecord )
{
- ScDocShell* pDocSh = GetViewData()->GetDocShell();
- ScDocument* pDoc = pDocSh->GetDocument();
+ ScDocShell* pDocSh = GetViewData()->GetDocShell();
+ ScDocument* pDoc = pDocSh->GetDocument();
BOOL bSuccess = pDocSh->GetDocFunc().DeleteTable( nTab, bRecord, FALSE );
if (bSuccess)
@@ -2145,11 +2145,11 @@ BOOL ScViewFunc::DeleteTable( SCTAB nTab, BOOL bRecord )
BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord )
{
- ScDocShell* pDocSh = GetViewData()->GetDocShell();
- ScDocument* pDoc = pDocSh->GetDocument();
+ ScDocShell* pDocSh = GetViewData()->GetDocShell();
+ ScDocument* pDoc = pDocSh->GetDocument();
BOOL bVbaEnabled = pDoc ? pDoc->IsInVBAMode() : FALSE;
- SCTAB nNewTab = TheTabs[0];
- int i;
+ SCTAB nNewTab = TheTabs[0];
+ int i;
WaitObject aWait( GetFrameWin() );
if (bRecord && !pDoc->IsUndoEnabled())
bRecord = FALSE;
@@ -2163,19 +2163,19 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord )
if (bRecord)
{
pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-// pUndoDoc->InitDrawLayer( pDocSh );
+// pUndoDoc->InitDrawLayer( pDocSh );
SCTAB nCount = pDoc->GetTableCount();
-// pUndoDoc->InitUndo( pDoc, 0, nCount-1 ); // incl. Ref.
+// pUndoDoc->InitUndo( pDoc, 0, nCount-1 ); // incl. Ref.
String aOldName;
for(i=0;i<TheTabs.Count();i++)
{
SCTAB nTab = TheTabs[sal::static_int_cast<USHORT>(i)];
if (i==0)
- pUndoDoc->InitUndo( pDoc, nTab,nTab, TRUE,TRUE ); // incl. Spalten/Zeilenflags
+ pUndoDoc->InitUndo( pDoc, nTab,nTab, TRUE,TRUE ); // incl. Spalten/Zeilenflags
else
- pUndoDoc->AddUndoTab( nTab,nTab, TRUE,TRUE ); // incl. Spalten/Zeilenflags
+ pUndoDoc->AddUndoTab( nTab,nTab, TRUE,TRUE ); // incl. Spalten/Zeilenflags
pDoc->CopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,FALSE, pUndoDoc );
pDoc->GetName( nTab, aOldName );
@@ -2206,13 +2206,13 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord )
if ( pDoc->IsTabProtected( nTab ) )
pUndoDoc->SetTabProtection(nTab, pDoc->GetTabProtection(nTab));
- // Drawing-Layer muss sein Undo selbst in der Hand behalten !!!
- // pUndoDoc->TransferDrawPage(pDoc, nTab,nTab);
+ // Drawing-Layer muss sein Undo selbst in der Hand behalten !!!
+ // pUndoDoc->TransferDrawPage(pDoc, nTab,nTab);
}
- pUndoDoc->AddUndoTab( 0, nCount-1 ); // alle Tabs fuer Referenzen
+ pUndoDoc->AddUndoTab( 0, nCount-1 ); // alle Tabs fuer Referenzen
- pDoc->BeginDrawUndo(); // DeleteTab erzeugt ein SdrUndoDelPage
+ pDoc->BeginDrawUndo(); // DeleteTab erzeugt ein SdrUndoDelPage
pUndoData = new ScRefUndoData( pDoc );
}
@@ -2253,7 +2253,7 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord )
if (bWasLinked)
{
- pDocSh->UpdateLinks(); // Link-Manager updaten
+ pDocSh->UpdateLinks(); // Link-Manager updaten
GetViewData()->GetBindings().Invalidate(SID_LINKS);
}
@@ -2278,12 +2278,12 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord )
BOOL ScViewFunc::RenameTable( const String& rName, SCTAB nTab )
{
- // Reihenfolge Tabelle/Name ist bei DocFunc umgekehrt
+ // Reihenfolge Tabelle/Name ist bei DocFunc umgekehrt
BOOL bSuccess = GetViewData()->GetDocShell()->GetDocFunc().
RenameTable( nTab, rName, TRUE, FALSE );
if (bSuccess)
{
- // Der Tabellenname koennte in einer Formel vorkommen...
+ // Der Tabellenname koennte in einer Formel vorkommen...
GetViewData()->GetViewShell()->UpdateInputHandler();
}
return bSuccess;
@@ -2342,7 +2342,7 @@ void ScViewFunc::InsertTableLink( const String& rFile,
ScDocShell* pSrcSh = aLoader.GetDocShell();
ScDocument* pSrcDoc = pSrcSh->GetDocument();
SCTAB nTab = MAXTAB+1;
- if (!rTabName.Len()) // kein Name angegeben -> erste Tabelle
+ if (!rTabName.Len()) // kein Name angegeben -> erste Tabelle
nTab = 0;
else
{
@@ -2364,7 +2364,7 @@ void ScViewFunc::InsertTableLink( const String& rFile,
//----------------------------------------------------------------------------
-// Tabellen aus anderem Dokument kopieren / linken
+// Tabellen aus anderem Dokument kopieren / linken
void ScViewFunc::ImportTables( ScDocShell* pSrcShell,
SCTAB nCount, const SCTAB* pSrcTabs, BOOL bLink,SCTAB nTab )
@@ -2384,19 +2384,19 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell,
pDocSh->MakeDrawLayer();
if (bUndo)
- pDoc->BeginDrawUndo(); // drawing layer must do its own undo actions
+ pDoc->BeginDrawUndo(); // drawing layer must do its own undo actions
SCTAB nInsCount = 0;
SCTAB i;
for( i=0; i<nCount; i++ )
- { // #63304# insert sheets first and update all references
+ { // #63304# insert sheets first and update all references
String aName;
pSrcDoc->GetName( pSrcTabs[i], aName );
pDoc->CreateValidTabName( aName );
if ( !pDoc->InsertTab( nTab+i, aName ) )
{
- bError = TRUE; // total error
- break; // for
+ bError = TRUE; // total error
+ break; // for
}
++nInsCount;
}
@@ -2405,11 +2405,11 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell,
SCTAB nSrcTab = pSrcTabs[i];
SCTAB nDestTab1=nTab+i;
ULONG nErrVal = pDoc->TransferTab( pSrcDoc, nSrcTab, nDestTab1,
- FALSE ); // no insert
+ FALSE ); // no insert
switch (nErrVal)
{
- case 0: // interner Fehler oder voll Fehler
+ case 0: // interner Fehler oder voll Fehler
bError = TRUE;
break;
case 2:
@@ -2466,7 +2466,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell,
aFileName, aFilterName, aOptions, aTabStr, nRefresh );
}
- if (!bWasThere) // Link pro Quelldokument nur einmal eintragen
+ if (!bWasThere) // Link pro Quelldokument nur einmal eintragen
{
ScTableLink* pLink = new ScTableLink( pDocSh, aFileName, aFilterName, aOptions, nRefresh );
pLink->SetInCreate( TRUE );
@@ -2508,13 +2508,13 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell,
//----------------------------------------------------------------------------
-// Tabelle in anderes Dokument verschieben / kopieren
+// Tabelle in anderes Dokument verschieben / kopieren
void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
{
- ScDocument* pDoc = GetViewData()->GetDocument();
+ ScDocument* pDoc = GetViewData()->GetDocument();
ScDocShell* pDocShell = GetViewData()->GetDocShell();
- ScDocument* pDestDoc = NULL;
+ ScDocument* pDestDoc = NULL;
ScDocShell* pDestShell = NULL;
ScTabViewShell* pDestViewSh = NULL;
BOOL bUndo (pDoc->IsUndoEnabled());
@@ -2524,10 +2524,10 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
{
nDestTab = 0; // als erstes einfuegen
- // ohne SFX_CALLMODE_RECORD ausfuehren, weil schon im Move-Befehl enthalten:
+ // ohne SFX_CALLMODE_RECORD ausfuehren, weil schon im Move-Befehl enthalten:
String aUrl = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("private:factory/"));
- aUrl.AppendAscii(RTL_CONSTASCII_STRINGPARAM( STRING_SCAPP )); // "scalc"
+ aUrl.AppendAscii(RTL_CONSTASCII_STRINGPARAM( STRING_SCAPP )); // "scalc"
SfxStringItem aItem( SID_FILE_NAME, aUrl );
SfxStringItem aTarget( SID_TARGETNAME, String::CreateFromAscii("_blank") );
@@ -2571,11 +2571,11 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
FALSE );
}
- ScMarkData& rMark = GetViewData()->GetMarkData();
- SCTAB nTabCount = pDoc->GetTableCount();
- SCTAB nTabSelCount = rMark.GetSelectCount();
+ ScMarkData& rMark = GetViewData()->GetMarkData();
+ SCTAB nTabCount = pDoc->GetTableCount();
+ SCTAB nTabSelCount = rMark.GetSelectCount();
- SvShorts TheTabs;
+ SvShorts TheTabs;
for(SCTAB i=0;i<nTabCount;i++)
{
@@ -2603,21 +2603,21 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
pDestShell->MakeDrawLayer();
if (!bNewDoc && bUndo)
- pDestDoc->BeginDrawUndo(); // drawing layer must do its own undo actions
+ pDestDoc->BeginDrawUndo(); // drawing layer must do its own undo actions
ULONG nErrVal =1;
if(nDestTab==SC_TAB_APPEND)
nDestTab=pDestDoc->GetTableCount();
SCTAB nDestTab1=nDestTab;
for( USHORT j=0; j<TheTabs.Count(); j++, nDestTab1++ )
- { // #63304# insert sheets first and update all references
+ { // #63304# insert sheets first and update all references
String aName;
pDoc->GetName( TheTabs[j], aName );
pDestDoc->CreateValidTabName( aName );
if ( !pDestDoc->InsertTab( nDestTab1, aName ) )
{
- nErrVal = 0; // total error
- break; // for
+ nErrVal = 0; // total error
+ break; // for
}
}
if ( nErrVal > 0 )
@@ -2626,7 +2626,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
for(USHORT i=0;i<TheTabs.Count();i++)
{
nErrVal = pDestDoc->TransferTab( pDoc, TheTabs[i], nDestTab1,
- FALSE ); // no insert
+ FALSE ); // no insert
// TransferTab doesn't copy drawing objects with bInsertNew=FALSE
if ( nErrVal > 0 )
@@ -2672,7 +2672,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
GetFrameWin()->LeaveWait();
switch (nErrVal)
{
- case 0: // interner Fehler oder voll Fehler
+ case 0: // interner Fehler oder voll Fehler
{
ErrorMessage(STR_TABINSERT_ERROR);
return;
@@ -2693,7 +2693,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
default:
break;
}
- //pDestShell->GetUndoManager()->Clear(); //! Undo implementieren !!!
+ //pDestShell->GetUndoManager()->Clear(); //! Undo implementieren !!!
/*
String sName;
pDestDoc->GetName(nDestTab, sName);
@@ -2710,18 +2710,18 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
if (bNewDoc)
{
- // ChartListenerCollection must be updated before DeleteTab
+ // ChartListenerCollection must be updated before DeleteTab
if ( pDestDoc->IsChartListenerCollectionNeedsUpdate() )
pDestDoc->UpdateChartListenerCollection();
pDestDoc->DeleteTab(static_cast<SCTAB>(TheTabs.Count())); // alte erste Tabelle
-//? pDestDoc->SelectTable(0, TRUE); // neue erste Tabelle selektieren
+//? pDestDoc->SelectTable(0, TRUE); // neue erste Tabelle selektieren
if (pDestViewSh)
- pDestViewSh->TabChanged(); // Pages auf dem Drawing-Layer
+ pDestViewSh->TabChanged(); // Pages auf dem Drawing-Layer
pDestShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB,
PAINT_GRID | PAINT_TOP | PAINT_LEFT |
PAINT_EXTRAS | PAINT_SIZE );
- // PAINT_SIZE fuer Gliederung
+ // PAINT_SIZE fuer Gliederung
}
else
{
@@ -2735,17 +2735,17 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
pDestShell->SetDocumentModified();
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) );
}
- else // innerhalb des Dokuments
+ else // innerhalb des Dokuments
{
- ScMarkData& rMark = GetViewData()->GetMarkData();
- SCTAB nTabCount = pDoc->GetTableCount();
+ ScMarkData& rMark = GetViewData()->GetMarkData();
+ SCTAB nTabCount = pDoc->GetTableCount();
- SvShorts TheTabs;
- SvShorts TheDestTabs;
- SvStrings TheTabNames;
- String aDestName;
- String *pString;
+ SvShorts TheTabs;
+ SvShorts TheDestTabs;
+ SvStrings TheTabNames;
+ String aDestName;
+ String *pString;
for(SCTAB i=0;i<nTabCount;i++)
{
@@ -2770,14 +2770,14 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
}
if (bCopy && bUndo)
- pDoc->BeginDrawUndo(); // drawing layer must do its own undo actions
+ pDoc->BeginDrawUndo(); // drawing layer must do its own undo actions
pDoc->GetName( nDestTab, aDestName);
SCTAB nDestTab1=nDestTab;
SCTAB nMovTab=0;
for(int j=0;j<TheTabNames.Count();j++)
{
- nTabCount = pDoc->GetTableCount();
+ nTabCount = pDoc->GetTableCount();
pString=TheTabNames[sal::static_int_cast<USHORT>(j)];
if(!pDoc->GetTable(*pString,nMovTab))
{
@@ -2787,7 +2787,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy )
{
nDestTab1=nTabCount;
}
- pDocShell->MoveTable( nMovTab, nDestTab1, bCopy, FALSE ); // Undo ist hier
+ pDocShell->MoveTable( nMovTab, nDestTab1, bCopy, FALSE ); // Undo ist hier
if(bCopy && pDoc->IsScenario(nMovTab))
{
@@ -2910,7 +2910,7 @@ void ScViewFunc::HideTable( SCTAB nTab )
pDocSh->GetUndoManager()->AddUndoAction( new ScUndoShowHideTab( pDocSh, nTab, FALSE ) );
}
- // Views updaten:
+ // Views updaten:
pDocSh->Broadcast( ScTablesHint( SC_TAB_HIDDEN, nTab ) );
SetTabNo( nTab, TRUE );
@@ -2934,16 +2934,16 @@ void ScViewFunc::InsertSpecialChar( const String& rStr, const Font& rFont )
return;
}
- const sal_Unicode* pChar = rStr.GetBuffer();
- ScTabViewShell* pViewShell = GetViewData()->GetViewShell();
- SvxFontItem aFontItem( rFont.GetFamily(),
+ const sal_Unicode* pChar = rStr.GetBuffer();
+ ScTabViewShell* pViewShell = GetViewData()->GetViewShell();
+ SvxFontItem aFontItem( rFont.GetFamily(),
rFont.GetName(),
rFont.GetStyleName(),
rFont.GetPitch(),
rFont.GetCharSet(),
ATTR_FONT );
- // if string contains WEAK characters, set all fonts
+ // if string contains WEAK characters, set all fonts
BYTE nScript;
ScDocument* pDoc = GetViewData()->GetDocument();
if ( pDoc->HasStringWeakCharacters( rStr ) )
@@ -2962,42 +2962,42 @@ void ScViewFunc::InsertSpecialChar( const String& rStr, const Font& rFont )
//----------------------------------------------------------------------------
-void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine,
+void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine,
const SvxBorderLine* pDestLine,
const SvxBorderLine* pSrcLine,
- BOOL bColor )
+ BOOL bColor )
{
if ( pSrcLine && pDestLine )
{
if ( bColor )
{
- rLine.SetColor ( pSrcLine->GetColor() );
- rLine.SetOutWidth ( pDestLine->GetOutWidth() );
- rLine.SetInWidth ( pDestLine->GetInWidth() );
- rLine.SetDistance ( pDestLine->GetDistance() );
+ rLine.SetColor ( pSrcLine->GetColor() );
+ rLine.SetOutWidth ( pDestLine->GetOutWidth() );
+ rLine.SetInWidth ( pDestLine->GetInWidth() );
+ rLine.SetDistance ( pDestLine->GetDistance() );
}
else
{
- rLine.SetColor ( pDestLine->GetColor() );
- rLine.SetOutWidth ( pSrcLine->GetOutWidth() );
- rLine.SetInWidth ( pSrcLine->GetInWidth() );
- rLine.SetDistance ( pSrcLine->GetDistance() );
+ rLine.SetColor ( pDestLine->GetColor() );
+ rLine.SetOutWidth ( pSrcLine->GetOutWidth() );
+ rLine.SetInWidth ( pSrcLine->GetInWidth() );
+ rLine.SetDistance ( pSrcLine->GetDistance() );
}
}
}
#define SET_LINE_ATTRIBUTES(LINE,BOXLINE) \
- pBoxLine = aBoxItem.Get##LINE(); \
- if ( pBoxLine ) \
- { \
- if ( pLine ) \
- { \
- UpdateLineAttrs( aLine, pBoxLine, pLine, bColorOnly ); \
- aBoxItem.SetLine( &aLine, BOXLINE ); \
- } \
- else \
- aBoxItem.SetLine( NULL, BOXLINE ); \
+ pBoxLine = aBoxItem.Get##LINE(); \
+ if ( pBoxLine ) \
+ { \
+ if ( pLine ) \
+ { \
+ UpdateLineAttrs( aLine, pBoxLine, pLine, bColorOnly ); \
+ aBoxItem.SetLine( &aLine, BOXLINE ); \
+ } \
+ else \
+ aBoxItem.SetLine( NULL, BOXLINE ); \
}
@@ -3014,14 +3014,14 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine,
return;
}
- ScDocument* pDoc = GetViewData()->GetDocument();
+ ScDocument* pDoc = GetViewData()->GetDocument();
ScMarkData aFuncMark( GetViewData()->GetMarkData() ); // local copy for UnmarkFiltered
ScViewUtil::UnmarkFiltered( aFuncMark, pDoc );
- ScDocShell* pDocSh = GetViewData()->GetDocShell();
- const ScPatternAttr* pSelAttrs = GetSelectionPattern();
+ ScDocShell* pDocSh = GetViewData()->GetDocShell();
+ const ScPatternAttr* pSelAttrs = GetSelectionPattern();
const SfxItemSet& rSelItemSet = pSelAttrs->GetItemSet();
- const SfxPoolItem* pBorderAttr = NULL;
+ const SfxPoolItem* pBorderAttr = NULL;
SfxItemState eItemState = rSelItemSet.GetItemState( ATTR_BORDER, TRUE, &pBorderAttr );
const SfxPoolItem* pTLBRItem = 0;
@@ -3036,18 +3036,18 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine,
// none of the lines don't care?
if( (eItemState != SFX_ITEM_DONTCARE) && (eTLBRState != SFX_ITEM_DONTCARE) && (eBLTRState != SFX_ITEM_DONTCARE) )
{
- SfxItemSet* pOldSet = new SfxItemSet(
+ SfxItemSet* pOldSet = new SfxItemSet(
*(pDoc->GetPool()),
ATTR_PATTERN_START,
ATTR_PATTERN_END );
- SfxItemSet* pNewSet = new SfxItemSet(
+ SfxItemSet* pNewSet = new SfxItemSet(
*(pDoc->GetPool()),
ATTR_PATTERN_START,
ATTR_PATTERN_END );
//------------------------------------------------------------
- const SvxBorderLine* pBoxLine = NULL;
- SvxBorderLine aLine;
+ const SvxBorderLine* pBoxLine = NULL;
+ SvxBorderLine aLine;
// hier wird die pBoxLine benutzt:
@@ -3124,10 +3124,10 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine,
void ScViewFunc::SetConditionalFormat( const ScConditionalFormat& rNew )
{
ScDocument* pDoc = GetViewData()->GetDocument();
- ULONG nIndex = pDoc->AddCondFormat(rNew); // dafuer gibt's kein Undo
+ ULONG nIndex = pDoc->AddCondFormat(rNew); // dafuer gibt's kein Undo
SfxUInt32Item aItem( ATTR_CONDITIONAL, nIndex );
- ApplyAttr( aItem ); // mit Paint und Undo...
+ ApplyAttr( aItem ); // mit Paint und Undo...
}
@@ -3136,10 +3136,10 @@ void ScViewFunc::SetConditionalFormat( const ScConditionalFormat& rNew )
void ScViewFunc::SetValidation( const ScValidationData& rNew )
{
ScDocument* pDoc = GetViewData()->GetDocument();
- ULONG nIndex = pDoc->AddValidationEntry(rNew); // dafuer gibt's kein Undo
+ ULONG nIndex = pDoc->AddValidationEntry(rNew); // dafuer gibt's kein Undo
SfxUInt32Item aItem( ATTR_VALIDDATA, nIndex );
- ApplyAttr( aItem ); // mit Paint und Undo...
+ ApplyAttr( aItem ); // mit Paint und Undo...
}
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 24fab9ac2eba..8fc5acde8afc 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
//#define _SI_NOCONTROL
#define _SVBOXITM_HXX
-#define _SVCONTNR_HXX //
+#define _SVCONTNR_HXX //
#define _SDR_NOTRANSFORM
@@ -197,7 +197,7 @@
#include "drwtrans.hxx"
#include "rangenam.hxx"
#include "dbcolect.hxx"
-#include "impex.hxx" // Sylk-ID fuer CB
+#include "impex.hxx" // Sylk-ID fuer CB
#include "chgtrack.hxx"
#include "waitoff.hxx"
#include "scmod.hxx"
@@ -218,33 +218,33 @@ using namespace com::sun::star;
//============================================================================
-// GlobalName der Writer-DocShell kommt jetzt aus comphelper/classids.hxx
+// GlobalName der Writer-DocShell kommt jetzt aus comphelper/classids.hxx
//----------------------------------------------------------------------------
-// C U T
+// C U T
void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects )
{
UpdateInputLine();
ScEditableTester aTester( this );
- if (!aTester.IsEditable()) // selection editable?
+ if (!aTester.IsEditable()) // selection editable?
{
ErrorMessage( aTester.GetMessageId() );
return;
}
- ScRange aRange; // zu loeschender Bereich
+ ScRange aRange; // zu loeschender Bereich
if ( GetViewData()->GetSimpleArea( aRange ) == SC_MARK_SIMPLE )
{
ScDocument* pDoc = GetViewData()->GetDocument();
ScDocShell* pDocSh = GetViewData()->GetDocShell();
ScMarkData& rMark = GetViewData()->GetMarkData();
- const BOOL bRecord(pDoc->IsUndoEnabled()); // Undo/Redo
+ const BOOL bRecord(pDoc->IsUndoEnabled()); // Undo/Redo
ScDocShellModificator aModificator( *pDocSh );
- if ( !rMark.IsMarked() && !rMark.IsMultiMarked() ) // mark the range if not marked yet
+ if ( !rMark.IsMarked() && !rMark.IsMultiMarked() ) // mark the range if not marked yet
{
DoneBlockMode();
InitOwnBlockMode();
@@ -252,9 +252,9 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects )
MarkDataChanged();
}
- CopyToClip( pClipDoc, TRUE, FALSE, bIncludeObjects ); // Ab ins Clipboard
+ CopyToClip( pClipDoc, TRUE, FALSE, bIncludeObjects ); // Ab ins Clipboard
- ScAddress aOldEnd( aRange.aEnd ); // Zusammengefasste Zellen im Bereich?
+ ScAddress aOldEnd( aRange.aEnd ); // Zusammengefasste Zellen im Bereich?
pDoc->ExtendMerge( aRange, TRUE );
ScDocument* pUndoDoc = NULL;
@@ -273,7 +273,7 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects )
USHORT nExtFlags = 0;
pDocSh->UpdatePaintExt( nExtFlags, aRange );
- HideCursor(); // Cursor aendert sich !
+ HideCursor(); // Cursor aendert sich !
rMark.MarkToMulti();
pDoc->DeleteSelection( IDF_ALL, rMark );
@@ -284,12 +284,12 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects )
if ( !AdjustRowHeight( aRange.aStart.Row(), aRange.aEnd.Row() ) )
pDocSh->PostPaint( aRange, PAINT_GRID, nExtFlags );
- if ( bRecord ) // erst jetzt ist Draw-Undo verfuegbar
+ if ( bRecord ) // erst jetzt ist Draw-Undo verfuegbar
pDocSh->GetUndoManager()->AddUndoAction(
new ScUndoCut( pDocSh, aRange, aOldEnd, rMark, pUndoDoc ) );
aModificator.SetDocumentModified();
- ShowCursor(); // Cursor aendert sich !
+ ShowCursor(); // Cursor aendert sich !
pDocSh->UpdateOle(GetViewData());
CellContentChanged();
@@ -300,7 +300,7 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects )
//----------------------------------------------------------------------------
-// C O P Y
+// C O P Y
BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bIncludeObjects, BOOL bStopEdit )
{
@@ -320,17 +320,17 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI
rMark ) )
{
BOOL bSysClip = FALSE;
- if ( !pClipDoc ) // no clip doc specified
+ if ( !pClipDoc ) // no clip doc specified
{
- pClipDoc = new ScDocument( SCDOCMODE_CLIP ); // create one (deleted by ScTransferObj)
- bSysClip = TRUE; // and copy into system
+ pClipDoc = new ScDocument( SCDOCMODE_CLIP ); // create one (deleted by ScTransferObj)
+ bSysClip = TRUE; // and copy into system
}
if ( !bCut )
{
ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
if ( pChangeTrack )
- pChangeTrack->ResetLastCut(); // kein CutMode mehr
+ pChangeTrack->ResetLastCut(); // kein CutMode mehr
}
if ( bSysClip && bIncludeObjects )
@@ -364,11 +364,11 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI
if ( ScGlobal::pDrawClipDocShellRef )
{
SfxObjectShellRef aPersistRef( &(*ScGlobal::pDrawClipDocShellRef) );
- pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive
+ pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive
}
- pTransferObj->CopyToClipboard( GetActiveWin() ); // system clipboard
- SC_MOD()->SetClipObject( pTransferObj, NULL ); // internal clipboard
+ pTransferObj->CopyToClipboard( GetActiveWin() ); // system clipboard
+ SC_MOD()->SetClipObject( pTransferObj, NULL ); // internal clipboard
}
bDone = TRUE;
@@ -434,7 +434,7 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI
if (nRowDelta)
aClipParam.meDirection = ScClipParam::Row;
}
-
+
SCCOL nColSize = p->aEnd.Col() - p->aStart.Col() + 1;
SCROW nRowSize = p->aEnd.Row() - p->aStart.Row() + 1;
@@ -446,7 +446,7 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI
}
if (aClipParam.meDirection == ScClipParam::Row && nColSize != nPrevColSize)
{
- // likewise, row-oriented ranges must have identical
+ // likewise, row-oriented ranges must have identical
// column size.
bValidRanges = false;
break;
@@ -466,7 +466,7 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI
ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
if ( pChangeTrack )
- pChangeTrack->ResetLastCut(); // kein CutMode mehr
+ pChangeTrack->ResetLastCut(); // kein CutMode mehr
{
ScDocShell* pDocSh = GetViewData()->GetDocShell();
@@ -481,11 +481,11 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI
if ( ScGlobal::pDrawClipDocShellRef )
{
SfxObjectShellRef aPersistRef( &(*ScGlobal::pDrawClipDocShellRef) );
- pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive
+ pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive
}
- pTransferObj->CopyToClipboard( GetActiveWin() ); // system clipboard
- SC_MOD()->SetClipObject( pTransferObj, NULL ); // internal clipboard
+ pTransferObj->CopyToClipboard( GetActiveWin() ); // system clipboard
+ SC_MOD()->SetClipObject( pTransferObj, NULL ); // internal clipboard
}
bSuccess = true;
@@ -542,7 +542,7 @@ ScTransferObj* ScViewFunc::CopyToTransferable()
}
//----------------------------------------------------------------------------
-// P A S T E
+// P A S T E
void ScViewFunc::PasteDraw()
{
@@ -572,7 +572,7 @@ void ScViewFunc::PasteFromSystem()
uno::Reference<datatransfer::XTransferable> aOwnClipRef( pOwnClip );
PasteFromClip( IDF_ALL, pOwnClip->GetDocument(),
PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE,
- TRUE ); // allow warning dialog
+ TRUE ); // allow warning dialog
}
else if (pDrawClip)
PasteDraw();
@@ -580,15 +580,15 @@ void ScViewFunc::PasteFromSystem()
{
TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pWin ) );
-// if (pClipObj.Is())
+// if (pClipObj.Is())
{
ULONG nBiff8 = SotExchange::RegisterFormatName(
String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Biff8")));
ULONG nBiff5 = SotExchange::RegisterFormatName(
String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Biff5")));
- // als erstes SvDraw-Model, dann Grafik
- // (Grafik darf nur bei einzelner Grafik drinstehen)
+ // als erstes SvDraw-Model, dann Grafik
+ // (Grafik darf nur bei einzelner Grafik drinstehen)
if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_DRAWING ))
{
@@ -606,7 +606,7 @@ void ScViewFunc::PasteFromSystem()
PasteFromSystem( SOT_FORMATSTR_ID_SVXB );
else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_EMBED_SOURCE ))
{
- // If it's a Writer object, insert RTF instead of OLE
+ // If it's a Writer object, insert RTF instead of OLE
BOOL bDoRtf = FALSE;
TransferableObjectDescriptor aObjDesc;
@@ -650,15 +650,15 @@ void ScViewFunc::PasteFromSystem()
PasteFromSystem( SOT_FORMATSTR_ID_EMBED_SOURCE_OLE );
else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_LINK_SOURCE_OLE ))
PasteFromSystem( SOT_FORMATSTR_ID_LINK_SOURCE_OLE );
-// else
-// ErrorMessage(STR_PASTE_ERROR);
+// else
+// ErrorMessage(STR_PASTE_ERROR);
}
-// else
-// ErrorMessage(STR_PASTE_ERROR);
+// else
+// ErrorMessage(STR_PASTE_ERROR);
}
- // keine Fehlermeldung, weil SID_PASTE in der idl das FastCall-Flag hat,
- // also auch gerufen wird, wenn nichts im Clipboard steht (#42531#)
+ // keine Fehlermeldung, weil SID_PASTE in der idl das FastCall-Flag hat,
+ // also auch gerufen wird, wenn nichts im Clipboard steht (#42531#)
}
void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTransferable>& rxTransferable )
@@ -683,7 +683,7 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran
{
PasteFromClip( IDF_ALL, pOwnClip->GetDocument(),
PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE,
- TRUE ); // allow warning dialog
+ TRUE ); // allow warning dialog
}
else if (pDrawClip)
{
@@ -703,8 +703,8 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran
ULONG nBiff5 = SotExchange::RegisterFormatName(
String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Biff5")));
ULONG nFormatId = 0;
- // als erstes SvDraw-Model, dann Grafik
- // (Grafik darf nur bei einzelner Grafik drinstehen)
+ // als erstes SvDraw-Model, dann Grafik
+ // (Grafik darf nur bei einzelner Grafik drinstehen)
if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_DRAWING ))
nFormatId = SOT_FORMATSTR_ID_DRAWING;
@@ -712,7 +712,7 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran
nFormatId = SOT_FORMATSTR_ID_SVXB;
else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_EMBED_SOURCE ))
{
- // If it's a Writer object, insert RTF instead of OLE
+ // If it's a Writer object, insert RTF instead of OLE
BOOL bDoRtf = FALSE;
TransferableObjectDescriptor aObjDesc;
if( aDataHelper.GetTransferableObjectDescriptor( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR, aObjDesc ) )
@@ -778,7 +778,7 @@ BOOL ScViewFunc::PasteFromSystem( ULONG nFormatId, BOOL bApi )
uno::Reference<datatransfer::XTransferable> aOwnClipRef( pOwnClip );
PasteFromClip( IDF_ALL, pOwnClip->GetDocument(),
PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE,
- !bApi ); // allow warning dialog
+ !bApi ); // allow warning dialog
}
else
{
@@ -788,7 +788,7 @@ BOOL ScViewFunc::PasteFromSystem( ULONG nFormatId, BOOL bApi )
bRet = PasteDataFormat( nFormatId, aDataHelper.GetTransferable(),
GetViewData()->GetCurX(), GetViewData()->GetCurY(),
- NULL, FALSE, !bApi ); // allow warning dialog
+ NULL, FALSE, !bApi ); // allow warning dialog
if ( !bRet && !bApi )
ErrorMessage(STR_PASTE_ERROR);
@@ -798,7 +798,7 @@ BOOL ScViewFunc::PasteFromSystem( ULONG nFormatId, BOOL bApi )
//----------------------------------------------------------------------------
-// P A S T E
+// P A S T E
BOOL ScViewFunc::PasteOnDrawObject( const uno::Reference<datatransfer::XTransferable>& rxTransferable,
SdrObject* pHitObj, BOOL bLink )
@@ -832,7 +832,7 @@ BOOL ScViewFunc::PasteOnDrawObject( const uno::Reference<datatransfer::XTransfer
}
else
{
- // ham' wa noch nich
+ // ham' wa noch nich
}
return bRet;
}
@@ -848,10 +848,10 @@ BOOL lcl_SelHasAttrib( ScDocument* pDoc, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
}
//
-// Einfuegen auf Tabelle:
+// Einfuegen auf Tabelle:
//
-// internes Paste
+// internes Paste
namespace {
@@ -890,7 +890,7 @@ bool lcl_checkDestRangeForOverwrite(const ScRange& rDestRange, const ScDocument*
ScReplaceWarnBox aBox(pParentWnd);
if (aBox.Execute() != RET_YES)
{
- // changing the configuration is within the ScReplaceWarnBox
+ // changing the configuration is within the ScReplaceWarnBox
return false;
}
}
@@ -911,7 +911,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
return FALSE;
}
- // fuer Undo etc. immer alle oder keine Inhalte sichern
+ // fuer Undo etc. immer alle oder keine Inhalte sichern
USHORT nContFlags = IDF_NONE;
if (nFlags & IDF_CONTENTS)
nContFlags |= IDF_CONTENTS;
@@ -930,13 +930,13 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
nFlags, pClipDoc, nFunction, bSkipEmpty, bTranspose, bAsLink, bAllowDialogs,
eMoveMode, nContFlags, nUndoFlags);
- BOOL bCutMode = pClipDoc->IsCutMode(); // if transposing, take from original clipdoc
+ BOOL bCutMode = pClipDoc->IsCutMode(); // if transposing, take from original clipdoc
BOOL bIncludeFiltered = bCutMode;
// paste drawing: also if IDF_NOTE is set (to create drawing layer for note captions)
BOOL bPasteDraw = ( pClipDoc->GetDrawLayer() && ( nFlags & (IDF_OBJECTS|IDF_NOTE) ) );
- ScDocShellRef aTransShellRef; // for objects in xTransClip - must remain valid as long as xTransClip
+ ScDocShellRef aTransShellRef; // for objects in xTransClip - must remain valid as long as xTransClip
ScDocument* pOrigClipDoc = NULL;
::std::auto_ptr< ScDocument > xTransClip;
if ( bTranspose )
@@ -946,16 +946,16 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
// include filtered rows until TransposeClip can skip them
bIncludeFiltered = TRUE;
pClipDoc->GetClipArea( nX, nY, TRUE );
- if ( nY > static_cast<sal_Int32>(MAXCOL) ) // zuviele Zeilen zum Transponieren
+ if ( nY > static_cast<sal_Int32>(MAXCOL) ) // zuviele Zeilen zum Transponieren
{
ErrorMessage(STR_PASTE_FULL);
return FALSE;
}
- pOrigClipDoc = pClipDoc; // fuer Referenzen
+ pOrigClipDoc = pClipDoc; // fuer Referenzen
if ( bPasteDraw )
{
- aTransShellRef = new ScDocShell; // DocShell needs a Ref immediately
+ aTransShellRef = new ScDocShell; // DocShell needs a Ref immediately
aTransShellRef->DoInitNew(NULL);
}
ScDrawLayer::SetGlobalDrawPersist(aTransShellRef);
@@ -975,9 +975,9 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
SCTAB nEndTab;
SCCOL nClipSizeX;
SCROW nClipSizeY;
- pClipDoc->GetClipArea( nClipSizeX, nClipSizeY, TRUE ); // size in clipboard doc
+ pClipDoc->GetClipArea( nClipSizeX, nClipSizeY, TRUE ); // size in clipboard doc
- // size in target doc: include filtered rows only if CutMode is set
+ // size in target doc: include filtered rows only if CutMode is set
SCCOL nDestSizeX;
SCROW nDestSizeY;
pClipDoc->GetClipArea( nDestSizeX, nDestSizeY, bIncludeFiltered );
@@ -1059,10 +1059,10 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
SCCOL nBlockAddX = nEndCol-nStartCol;
SCROW nBlockAddY = nEndRow-nStartRow;
- // #58422# Nachfrage, wenn die Selektion groesser als 1 Zeile/Spalte, aber kleiner
- // als das Clipboard ist (dann wird ueber die Selektion hinaus eingefuegt)
+ // #58422# Nachfrage, wenn die Selektion groesser als 1 Zeile/Spalte, aber kleiner
+ // als das Clipboard ist (dann wird ueber die Selektion hinaus eingefuegt)
- // ClipSize is not size, but difference
+ // ClipSize is not size, but difference
if ( ( nBlockAddX != 0 && nBlockAddX < nDestSizeX ) ||
( nBlockAddY != 0 && nBlockAddY < nDestSizeY ) ||
( bMarkIsFiltered && nUnfilteredRows < nDestSizeY+1 ) )
@@ -1078,12 +1078,12 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
}
if (nBlockAddX > nDestSizeX)
- nMarkAddX = nBlockAddX - nDestSizeX; // fuer Merge-Test
+ nMarkAddX = nBlockAddX - nDestSizeX; // fuer Merge-Test
else
nEndCol = nStartCol + nDestSizeX;
if (nBlockAddY > nDestSizeY)
- nMarkAddY = nBlockAddY - nDestSizeY; // fuer Merge-Test
+ nMarkAddY = nBlockAddY - nDestSizeY; // fuer Merge-Test
else
{
nEndRow = nStartRow + nDestSizeY;
@@ -1126,26 +1126,26 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
bool bOffLimits = !ValidCol(nEndCol) || !ValidRow(nEndRow);
- // Zielbereich, wie er angezeigt wird:
+ // Zielbereich, wie er angezeigt wird:
ScRange aUserRange( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab );
- // Sollen Zellen eingefuegt werden?
- // (zu grosse nEndCol/nEndRow werden weiter unten erkannt)
+ // Sollen Zellen eingefuegt werden?
+ // (zu grosse nEndCol/nEndRow werden weiter unten erkannt)
BOOL bInsertCells = ( eMoveMode != INS_NONE && !bOffLimits );
if ( bInsertCells )
{
- // #94115# Instead of EnterListAction, the paste undo action is merged into the
- // insert action, so Repeat can insert the right cells
+ // #94115# Instead of EnterListAction, the paste undo action is merged into the
+ // insert action, so Repeat can insert the right cells
- MarkRange( aUserRange ); // wird vor CopyFromClip sowieso gesetzt
+ MarkRange( aUserRange ); // wird vor CopyFromClip sowieso gesetzt
// #72930# CutMode is reset on insertion of cols/rows but needed again on cell move
BOOL bCut = pClipDoc->IsCutMode();
- if (!InsertCells( eMoveMode, bRecord, TRUE )) // is inserting possible?
+ if (!InsertCells( eMoveMode, bRecord, TRUE )) // is inserting possible?
{
return FALSE;
- // #i21036# EnterListAction isn't used, and InsertCells doesn't insert
- // its undo action on failure, so no undo handling is needed here
+ // #i21036# EnterListAction isn't used, and InsertCells doesn't insert
+ // its undo action on failure, so no undo handling is needed here
}
if ( bCut )
pClipDoc->SetCutMode( bCut );
@@ -1163,11 +1163,11 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
}
}
- SCCOL nClipStartX; // Clipboard-Bereich erweitern
+ SCCOL nClipStartX; // Clipboard-Bereich erweitern
SCROW nClipStartY;
pClipDoc->GetClipStart( nClipStartX, nClipStartY );
SCCOL nUndoEndCol = nClipStartX + nClipSizeX;
- SCROW nUndoEndRow = nClipStartY + nClipSizeY; // end of source area in clipboard document
+ SCROW nUndoEndRow = nClipStartY + nClipSizeY; // end of source area in clipboard document
BOOL bClipOver = FALSE;
// #i68690# ExtendMerge for the clip doc must be called with the clipboard's sheet numbers.
// The same end column/row can be used for all calls because the clip doc doesn't contain
@@ -1177,15 +1177,15 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
if ( pClipDoc->ExtendMerge( nClipStartX,nClipStartY, nUndoEndCol,nUndoEndRow, nClipTab, FALSE ) )
bClipOver = TRUE;
nUndoEndCol -= nClipStartX + nClipSizeX;
- nUndoEndRow -= nClipStartY + nClipSizeY; // now contains only the difference added by ExtendMerge
+ nUndoEndRow -= nClipStartY + nClipSizeY; // now contains only the difference added by ExtendMerge
nUndoEndCol = sal::static_int_cast<SCCOL>( nUndoEndCol + nEndCol );
nUndoEndRow = sal::static_int_cast<SCROW>( nUndoEndRow + nEndRow ); // destination area, expanded for merged cells
-// if (nUndoEndCol < nEndCol) nUndoEndCol = nEndCol;
-// if (nUndoEndRow < nEndRow) nUndoEndRow = nEndRow;
+// if (nUndoEndCol < nEndCol) nUndoEndCol = nEndCol;
+// if (nUndoEndRow < nEndRow) nUndoEndRow = nEndRow;
-// nUndoEndCol += nMarkAddX;
-// nUndoEndRow += nMarkAddY;
+// nUndoEndCol += nMarkAddX;
+// nUndoEndRow += nMarkAddY;
if (nUndoEndCol>MAXCOL || nUndoEndRow>MAXROW)
{
@@ -1195,7 +1195,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
pDoc->ExtendMergeSel( nStartCol,nStartRow, nUndoEndCol,nUndoEndRow, aFilteredMark, FALSE );
- // Test auf Zellschutz
+ // Test auf Zellschutz
ScEditableTester aTester( pDoc, nStartTab, nStartCol,nStartRow, nUndoEndCol,nUndoEndRow );
if (!aTester.IsEditable())
@@ -1207,10 +1207,10 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
//! Test auf Ueberlappung
//! nur wirkliche Schnittmenge testen !!!!!!!
- // pDoc->HasCommonAttr( StartCol,nStartRow, nUndoEndCol,nUndoEndRow, nStartTab,
- // pClipDoc, nClipStartX, nClipStartY );
+ // pDoc->HasCommonAttr( StartCol,nStartRow, nUndoEndCol,nUndoEndRow, nStartTab,
+ // pClipDoc, nClipStartX, nClipStartY );
- ScDocFunc& rDocFunc = pDocSh->GetDocFunc();
+ ScDocFunc& rDocFunc = pDocSh->GetDocFunc();
if ( bRecord )
{
String aUndo = ScGlobal::GetRscString( pClipDoc->IsCutMode() ? STR_UNDO_MOVE : STR_UNDO_COPY );
@@ -1245,15 +1245,15 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
{
ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
if ( pChangeTrack )
- pChangeTrack->ResetLastCut(); // kein CutMode mehr
+ pChangeTrack->ResetLastCut(); // kein CutMode mehr
}
BOOL bColInfo = ( nStartRow==0 && nEndRow==MAXROW );
BOOL bRowInfo = ( nStartCol==0 && nEndCol==MAXCOL );
- ScDocument* pUndoDoc = NULL;
+ ScDocument* pUndoDoc = NULL;
ScDocument* pRefUndoDoc = NULL;
- ScDocument* pRedoDoc = NULL;
+ ScDocument* pRedoDoc = NULL;
ScRefUndoData* pUndoData = NULL;
if ( bRecord )
@@ -1277,7 +1277,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
USHORT nExtFlags = 0;
pDocSh->UpdatePaintExt( nExtFlags, nStartCol, nStartRow, nStartTab,
- nEndCol, nEndRow, nEndTab ); // content before the change
+ nEndCol, nEndRow, nEndTab ); // content before the change
if (GetViewData()->IsActive())
{
@@ -1287,11 +1287,11 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
rMark.SetMarkArea( aUserRange );
MarkDataChanged();
- HideCursor(); // Cursor aendert sich !
+ HideCursor(); // Cursor aendert sich !
//
- // Aus Clipboard kopieren,
- // wenn gerechnet werden soll, Originaldaten merken
+ // Aus Clipboard kopieren,
+ // wenn gerechnet werden soll, Originaldaten merken
//
ScDocument* pMixDoc = NULL;
@@ -1318,7 +1318,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
USHORT nNoObjFlags = nFlags & ~IDF_OBJECTS;
if (!bAsLink)
{
- // copy normally (original range)
+ // copy normally (original range)
pDoc->CopyFromClip( aUserRange, aFilteredMark, nNoObjFlags,
pRefUndoDoc, pClipDoc, TRUE, FALSE, bIncludeFiltered,
bSkipEmpty, (bMarkIsFiltered ? &aRangeList : NULL) );
@@ -1329,13 +1329,13 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
}
else if (!bTranspose)
{
- // copy with bAsLink=TRUE
+ // copy with bAsLink=TRUE
pDoc->CopyFromClip( aUserRange, aFilteredMark, nNoObjFlags, pRefUndoDoc, pClipDoc,
TRUE, TRUE, bIncludeFiltered, bSkipEmpty );
}
else
{
- // alle Inhalte kopieren (im TransClipDoc stehen nur Formeln)
+ // alle Inhalte kopieren (im TransClipDoc stehen nur Formeln)
pDoc->CopyFromClip( aUserRange, aFilteredMark, nContFlags, pRefUndoDoc, pClipDoc );
}
@@ -1346,17 +1346,17 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
pDoc->ExtendMergeSel( nStartCol, nStartRow, nEndCol, nEndRow, aFilteredMark, TRUE ); // Refresh
// und Bereich neu
- if ( pMixDoc ) // Rechenfunktionen mit Original-Daten auszufuehren ?
+ if ( pMixDoc ) // Rechenfunktionen mit Original-Daten auszufuehren ?
{
pDoc->MixDocument( aUserRange, nFunction, bSkipEmpty, pMixDoc );
}
delete pMixDoc;
- AdjustBlockHeight(); // update row heights before pasting objects
+ AdjustBlockHeight(); // update row heights before pasting objects
if ( nFlags & IDF_OBJECTS )
{
- // Paste the drawing objects after the row heights have been updated.
+ // Paste the drawing objects after the row heights have been updated.
pDoc->CopyFromClip( aUserRange, aFilteredMark, IDF_OBJECTS, pRefUndoDoc, pClipDoc,
TRUE, FALSE, bIncludeFiltered );
@@ -1367,10 +1367,10 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
//
pDocSh->UpdatePaintExt( nExtFlags, nStartCol, nStartRow, nStartTab,
- nEndCol, nEndRow, nEndTab ); // content after the change
+ nEndCol, nEndRow, nEndTab ); // content after the change
- // ggf. Autofilter-Koepfe loeschen
+ // ggf. Autofilter-Koepfe loeschen
if (bCutMode)
if (pDoc->RefreshAutoFilter( nClipStartX,nClipStartY, nClipStartX+nClipSizeX,
nClipStartY+nClipSizeY, nStartTab ))
@@ -1378,9 +1378,9 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
nClipStartX+nClipSizeX,nClipStartY,nStartTab,
PAINT_GRID );
- ShowCursor(); // Cursor aendert sich !
+ ShowCursor(); // Cursor aendert sich !
- //! Block-Bereich bei RefUndoDoc weglassen !!!
+ //! Block-Bereich bei RefUndoDoc weglassen !!!
if ( bRecord )
{
@@ -1392,13 +1392,13 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
pRedoDoc = new ScDocument( SCDOCMODE_UNDO );
pRedoDoc->InitUndo( pDoc, nStartTab, nEndTab, bColInfo, bRowInfo );
- // angepasste Referenzen ins Redo-Doc
+ // angepasste Referenzen ins Redo-Doc
SCTAB nTabCount = pDoc->GetTableCount();
pRedoDoc->AddUndoTab( 0, nTabCount-1 );
pDoc->CopyUpdated( pRefUndoDoc, pRedoDoc );
- // alte Referenzen ins Undo-Doc
+ // alte Referenzen ins Undo-Doc
//! Tabellen selektieren ?
pUndoDoc->AddUndoTab( 0, nTabCount-1 );
@@ -1408,10 +1408,10 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
delete pRefUndoDoc;
}
- // DeleteUnchanged for pUndoData is in ScUndoPaste ctor,
- // UndoData for redo is made during first undo
+ // DeleteUnchanged for pUndoData is in ScUndoPaste ctor,
+ // UndoData for redo is made during first undo
- ScUndoPasteOptions aOptions; // store options for repeat
+ ScUndoPasteOptions aOptions; // store options for repeat
aOptions.nFunction = nFunction;
aOptions.bSkipEmpty = bSkipEmpty;
aOptions.bTranspose = bTranspose;
@@ -1423,12 +1423,12 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
nUndoEndCol, nUndoEndRow, nEndTab, aFilteredMark,
pUndoDoc, pRedoDoc, nFlags | nUndoFlags,
pUndoData, NULL, NULL, NULL,
- FALSE, &aOptions ); // FALSE = Redo data not yet copied
+ FALSE, &aOptions ); // FALSE = Redo data not yet copied
if ( bInsertCells )
{
- // Merge the paste undo action into the insert action.
- // Use ScUndoWrapper so the ScUndoPaste pointer can be stored in the insert action.
+ // Merge the paste undo action into the insert action.
+ // Use ScUndoWrapper so the ScUndoPaste pointer can be stored in the insert action.
pUndoMgr->AddUndoAction( new ScUndoWrapper( pUndo ), TRUE );
}
@@ -1441,12 +1441,12 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
if (bColInfo)
{
nPaint |= PAINT_TOP;
- nUndoEndCol = MAXCOL; // nur zum Zeichnen !
+ nUndoEndCol = MAXCOL; // nur zum Zeichnen !
}
if (bRowInfo)
{
nPaint |= PAINT_LEFT;
- nUndoEndRow = MAXROW; // nur zum Zeichnen !
+ nUndoEndRow = MAXROW; // nur zum Zeichnen !
}
pDocSh->PostPaint( nStartCol, nStartRow, nStartTab,
nUndoEndCol, nUndoEndRow, nEndTab, nPaint, nExtFlags );
@@ -1459,7 +1459,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
bool ScViewFunc::PasteMultiRangesFromClip(
sal_uInt16 nFlags, ScDocument* pClipDoc, sal_uInt16 nFunction,
- bool bSkipEmpty, bool bTranspose, bool bAsLink, bool bAllowDialogs,
+ bool bSkipEmpty, bool bTranspose, bool bAsLink, bool bAllowDialogs,
InsCellCmd eMoveMode, sal_uInt16 /*nContFlags*/, sal_uInt16 nUndoFlags)
{
ScViewData& rViewData = *GetViewData();
@@ -1505,7 +1505,7 @@ bool ScViewFunc::PasteMultiRangesFromClip(
// For multi-selection paste, we don't support cell duplication for larger
// destination range. In case the destination is marked, we reset it to
// the clip size.
- ScRange aMarkedRange(rCurPos.Col(), rCurPos.Row(), nTab1,
+ ScRange aMarkedRange(rCurPos.Col(), rCurPos.Row(), nTab1,
rCurPos.Col()+nColSize-1, rCurPos.Row()+nRowSize-1, nTab2);
// Extend the marked range to account for filtered rows in the destination
@@ -1516,8 +1516,8 @@ bool ScViewFunc::PasteMultiRangesFromClip(
return false;
}
- bool bAskIfNotEmpty =
- bAllowDialogs && (nFlags & IDF_CONTENTS) &&
+ bool bAskIfNotEmpty =
+ bAllowDialogs && (nFlags & IDF_CONTENTS) &&
nFunction == PASTE_NOFUNC && SC_MOD()->GetInputOptions().GetReplaceCellsWarn();
if (bAskIfNotEmpty)
@@ -1566,10 +1566,10 @@ bool ScViewFunc::PasteMultiRangesFromClip(
CursorSwitcher aCursorSwitch(this);
sal_uInt16 nNoObjFlags = nFlags & ~IDF_OBJECTS;
- pDoc->CopyMultiRangeFromClip(rCurPos, aMark, nNoObjFlags, pClipDoc,
+ pDoc->CopyMultiRangeFromClip(rCurPos, aMark, nNoObjFlags, pClipDoc,
true, bAsLink, false, bSkipEmpty);
- if (pMixDoc.get())
+ if (pMixDoc.get())
pDoc->MixDocument(aMarkedRange, nFunction, bSkipEmpty, pMixDoc.get());
AdjustBlockHeight(); // update row heights before pasting objects
@@ -1577,7 +1577,7 @@ bool ScViewFunc::PasteMultiRangesFromClip(
if (nFlags & IDF_OBJECTS)
{
// Paste the drawing objects after the row heights have been updated.
- pDoc->CopyMultiRangeFromClip(rCurPos, aMark, IDF_OBJECTS, pClipDoc,
+ pDoc->CopyMultiRangeFromClip(rCurPos, aMark, IDF_OBJECTS, pClipDoc,
true, false, false, true);
}
@@ -1599,13 +1599,13 @@ bool ScViewFunc::PasteMultiRangesFromClip(
aOptions.bAsLink = bAsLink;
aOptions.eMoveMode = eMoveMode;
- ScUndoPaste* pUndo = new ScUndoPaste(pDocSh,
- aMarkedRange.aStart.Col(),
- aMarkedRange.aStart.Row(),
- aMarkedRange.aStart.Tab(),
- aMarkedRange.aEnd.Col(),
- aMarkedRange.aEnd.Row(),
- aMarkedRange.aEnd.Tab(),
+ ScUndoPaste* pUndo = new ScUndoPaste(pDocSh,
+ aMarkedRange.aStart.Col(),
+ aMarkedRange.aStart.Row(),
+ aMarkedRange.aStart.Tab(),
+ aMarkedRange.aEnd.Col(),
+ aMarkedRange.aEnd.Row(),
+ aMarkedRange.aEnd.Tab(),
aMark, pUndoDoc.release(), NULL, nFlags|nUndoFlags, NULL, NULL, NULL, NULL, false, &aOptions);
if (bInsertCells)
@@ -1651,22 +1651,22 @@ void ScViewFunc::PostPasteFromClip(const ScRange& rPasteRange, const ScMarkData&
//----------------------------------------------------------------------------
-// D R A G A N D D R O P
+// D R A G A N D D R O P
//
-// innerhalb des Dokuments
+// innerhalb des Dokuments
BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
BOOL bCut, BOOL bRecord, BOOL bPaint, BOOL bApi )
{
ScDocShell* pDocSh = GetViewData()->GetDocShell();
- HideAllCursors(); // wegen zusammengefassten
+ HideAllCursors(); // wegen zusammengefassten
BOOL bSuccess = TRUE;
SCTAB nDestTab = rDestPos.Tab();
const ScMarkData& rMark = GetViewData()->GetMarkData();
if ( rSource.aStart.Tab() == nDestTab && rSource.aEnd.Tab() == nDestTab && rMark.GetSelectCount() > 1 )
{
- // moving within one table and several tables selected -> apply to all selected tables
+ // moving within one table and several tables selected -> apply to all selected tables
if ( bRecord )
{
@@ -1674,7 +1674,7 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo );
}
- // collect ranges of consecutive selected tables
+ // collect ranges of consecutive selected tables
ScRange aLocalSource = rSource;
ScAddress aLocalDest = rDestPos;
@@ -1706,7 +1706,7 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
}
else
{
- // move the block as specified
+ // move the block as specified
bSuccess = pDocSh->GetDocFunc().MoveBlock(
rSource, rDestPos, bCut, bRecord, bPaint, bApi );
}
@@ -1714,7 +1714,7 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
ShowAllCursors();
if (bSuccess)
{
- // Zielbereich markieren
+ // Zielbereich markieren
ScAddress aDestEnd(
rDestPos.Col() + rSource.aEnd.Col() - rSource.aStart.Col(),
rDestPos.Row() + rSource.aEnd.Row() - rSource.aStart.Row(),
@@ -1732,7 +1732,7 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
aDestEnd.SetRow( rDestPos.Row() + nPastedCount - 1 );
}
- MarkRange( ScRange( rDestPos, aDestEnd ), FALSE ); //! FALSE ???
+ MarkRange( ScRange( rDestPos, aDestEnd ), FALSE ); //! FALSE ???
pDocSh->UpdateOle(GetViewData());
SelectionChanged();
@@ -1740,11 +1740,11 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos,
return bSuccess;
}
-// Link innerhalb des Dokuments
+// Link innerhalb des Dokuments
BOOL ScViewFunc::LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, BOOL bApi )
{
- // Test auf Ueberlappung
+ // Test auf Ueberlappung
if ( rSource.aStart.Tab() == rDestPos.Tab() )
{
@@ -1760,7 +1760,7 @@ BOOL ScViewFunc::LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, B
}
}
- // Ausfuehren per Paste
+ // Ausfuehren per Paste
ScDocument* pDoc = GetViewData()->GetDocument();
ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP );
@@ -1768,16 +1768,16 @@ BOOL ScViewFunc::LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, B
rSource.aEnd.Col(), rSource.aEnd.Row(),
rSource.aStart.Tab(), pClipDoc );
- // Zielbereich markieren (Cursor setzen, keine Markierung)
+ // Zielbereich markieren (Cursor setzen, keine Markierung)
if ( GetViewData()->GetTabNo() != rDestPos.Tab() )
SetTabNo( rDestPos.Tab() );
MoveCursorAbs( rDestPos.Col(), rDestPos.Row(), SC_FOLLOW_NONE, FALSE, FALSE );
- // Paste
+ // Paste
- PasteFromClip( IDF_ALL, pClipDoc, PASTE_NOFUNC, FALSE, FALSE, TRUE ); // als Link
+ PasteFromClip( IDF_ALL, pClipDoc, PASTE_NOFUNC, FALSE, FALSE, TRUE ); // als Link
delete pClipDoc;
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 123464cd5fda..5b997d2e9ce4 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 ScViewFunc::DoRefConversion( BOOL bRecord )
aMarkRange = ScRange( GetViewData()->GetCurX(),
GetViewData()->GetCurY(), GetViewData()->GetTabNo() );
}
- ScEditableTester aTester( pDoc, aMarkRange.aStart.Col(), aMarkRange.aStart.Row(),
+ ScEditableTester aTester( pDoc, aMarkRange.aStart.Col(), aMarkRange.aStart.Row(),
aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(),rMark );
if (!aTester.IsEditable())
{
@@ -225,7 +225,7 @@ void ScViewFunc::DoRefConversion( BOOL bRecord )
pUndoDoc->InitUndo( pDoc, nTab, nTab );
if ( rMark.GetSelectCount() > 1 )
- {
+ {
for (SCTAB i=0; i<nTabCount; i++)
if ( rMark.GetTableSelect(i) && i != nTab )
pUndoDoc->AddUndoTab( i, i );
@@ -263,8 +263,8 @@ void ScViewFunc::DoRefConversion( BOOL bRecord )
if (aFinder.GetFound())
{
ScAddress aPos = ((ScFormulaCell*)pCell)->aPos;
- String aNew = aFinder.GetText();
- ScCompiler aComp( pDoc, aPos);
+ String aNew = aFinder.GetText();
+ ScCompiler aComp( pDoc, aPos);
aComp.SetGrammar(pDoc->GetGrammar());
ScTokenArray* pArr = aComp.CompileString( aNew );
ScFormulaCell* pNewCell = new ScFormulaCell( pDoc, aPos,
@@ -285,7 +285,7 @@ void ScViewFunc::DoRefConversion( BOOL bRecord )
pRedoDoc->InitUndo( pDoc, nTab, nTab );
if ( rMark.GetSelectCount() > 1 )
- {
+ {
for (SCTAB i=0; i<nTabCount; i++)
if ( rMark.GetTableSelect(i) && i != nTab )
pRedoDoc->AddUndoTab( i, i );
@@ -308,7 +308,7 @@ void ScViewFunc::DoRefConversion( BOOL bRecord )
if (!bOk)
ErrorMessage(STR_ERR_NOREF);
}
-// Thesaurus - Undo ok
+// Thesaurus - Undo ok
void ScViewFunc::DoThesaurus( BOOL bRecord )
{
SCCOL nCol;
@@ -330,12 +330,12 @@ void ScViewFunc::DoThesaurus( BOOL bRecord )
BOOL bIsEditMode = GetViewData()->HasEditView(eWhich);
if (bRecord && !pDoc->IsUndoEnabled())
bRecord = FALSE;
- if (bIsEditMode) // Edit-Mode aktiv
+ if (bIsEditMode) // Edit-Mode aktiv
{
GetViewData()->GetEditView(eWhich, pEditView, nCol, nRow);
pEditSel = new ESelection(pEditView->GetSelection());
SC_MOD()->InputEnterHandler();
- GetViewData()->GetBindings().Update(); // sonst kommt der Sfx durcheinander...
+ GetViewData()->GetBindings().Update(); // sonst kommt der Sfx durcheinander...
}
else
{
@@ -360,12 +360,12 @@ void ScViewFunc::DoThesaurus( BOOL bRecord )
com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellChecker1>
xSpeller = LinguMgr::GetSpellChecker();
- //! if (...) // thesaurus not available
- //! {
- //! ErrorMessage(STR_EXPORT_ASCII_WARNING);
- //! delete pEditSel;
- //! return;
- //! }
+ //! if (...) // thesaurus not available
+ //! {
+ //! ErrorMessage(STR_EXPORT_ASCII_WARNING);
+ //! delete pEditSel;
+ //! return;
+ //! }
pThesaurusEngine = new ScEditEngineDefaulter( pDoc->GetEnginePool() );
pThesaurusEngine->SetEditTextObjectPool( pDoc->GetEditPool() );
@@ -373,7 +373,7 @@ void ScViewFunc::DoThesaurus( BOOL bRecord )
pThesaurusEngine->SetSpeller(xSpeller);
MakeEditView(pThesaurusEngine, nCol, nRow );
const ScPatternAttr* pPattern = NULL;
- SfxItemSet* pEditDefaults = new SfxItemSet(pThesaurusEngine->GetEmptyItemSet());
+ SfxItemSet* pEditDefaults = new SfxItemSet(pThesaurusEngine->GetEmptyItemSet());
pPattern = pDoc->GetPattern(nCol, nRow, nTab);
if (pPattern )
{
@@ -409,12 +409,12 @@ void ScViewFunc::DoThesaurus( BOOL bRecord )
pThesaurusEngine->ClearModifyFlag();
- // language is now in EditEngine attributes -> no longer passed to StartThesaurus
+ // language is now in EditEngine attributes -> no longer passed to StartThesaurus
eState = pEditView->StartThesaurus();
DBG_ASSERT(eState != EE_SPELL_NOSPELLER, "No SpellChecker");
- if (eState == EE_SPELL_ERRORFOUND) // sollte spaeter durch Wrapper geschehen!
+ if (eState == EE_SPELL_ERRORFOUND) // sollte spaeter durch Wrapper geschehen!
{
LanguageType eLnge = ScViewUtil::GetEffLanguage( pDoc, ScAddress( nCol, nRow, nTab ) );
SvtLanguageTable aLangTab;
@@ -439,7 +439,7 @@ void ScViewFunc::DoThesaurus( BOOL bRecord )
pDoc->SetString(nCol, nRow, nTab, sNewString);
}
// erack! it's broadcasted
-// pDoc->SetDirty();
+// pDoc->SetDirty();
pDocSh->SetDocumentModified();
if (bRecord)
{
@@ -458,7 +458,7 @@ void ScViewFunc::DoThesaurus( BOOL bRecord )
pDocSh->PostPaintGridAll();
}
-//UNUSED2008-05 // Spelling Checker - Undo ok
+//UNUSED2008-05 // Spelling Checker - Undo ok
//UNUSED2008-05 void ScViewFunc::DoSpellingChecker( BOOL bRecord )
//UNUSED2008-05 {
//UNUSED2008-05 DoSheetConversion( ScConversionParam( SC_CONVERSION_SPELLCHECK ), bRecord );
@@ -615,13 +615,13 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, BOOL bR
//UNUSED2008-05 String aErr = aLangTab.GetString((LanguageType) (ULONG) nLang);
//UNUSED2008-05 ErrorHandler::HandleError(*new StringErrorInfo(
//UNUSED2008-05 ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aErr) );
-//UNUSED2008-05
+//UNUSED2008-05
//UNUSED2008-05 return 0;
//UNUSED2008-05 }
//UNUSED2008-05 IMPL_LINK_INLINE_END( ScViewFunc, SpellError, void *, nLang )
// Pasten von FORMAT_FILE-Items
-// wird nicht direkt aus Drop aufgerufen, sondern asynchron -> Dialoge sind erlaubt
+// wird nicht direkt aus Drop aufgerufen, sondern asynchron -> Dialoge sind erlaubt
BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink )
{
@@ -638,7 +638,7 @@ BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink )
&aMediaURLItem, 0L ) );
}
- if (!bLink) // bei bLink nur Grafik oder URL
+ if (!bLink) // bei bLink nur Grafik oder URL
{
// 1. Kann ich die Datei oeffnen?
const SfxFilter* pFlt = NULL;
@@ -674,7 +674,7 @@ BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink )
Graphic aGraphic;
GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter();
-// GraphicProgress aGraphicProgress(&aGraphicFilter);
+// GraphicProgress aGraphicProgress(&aGraphicFilter);
if (!pGraphicFilter->ImportGraphic(aGraphic, aURL,
GRFILTER_FORMAT_DONTKNOW, &nFilterFormat ))
@@ -691,7 +691,7 @@ BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink )
}
}
- if (bLink) // bei bLink alles, was nicht Grafik ist, als URL
+ if (bLink) // bei bLink alles, was nicht Grafik ist, als URL
{
Rectangle aRect( rPos, Size(0,0) );
ScRange aRange = GetViewData()->GetDocument()->
@@ -750,7 +750,7 @@ void ScViewFunc::InsertBookmark( const String& rDescription, const String& rURL,
nPosX >= pViewData->GetEditStartCol() && nPosX <= pViewData->GetEditEndCol() &&
nPosY >= pViewData->GetEditStartRow() && nPosY <= pViewData->GetEditEndRow() )
{
- // in die gerade editierte Zelle einfuegen
+ // in die gerade editierte Zelle einfuegen
String aTargetFrame;
if (pTarget)
@@ -759,7 +759,7 @@ void ScViewFunc::InsertBookmark( const String& rDescription, const String& rURL,
return;
}
- // in nicht editierte Zelle einfuegen
+ // in nicht editierte Zelle einfuegen
ScDocument* pDoc = GetViewData()->GetDocument();
SCTAB nTab = GetViewData()->GetTabNo();
@@ -791,10 +791,10 @@ void ScViewFunc::InsertBookmark( const String& rDescription, const String& rURL,
if ( bTryReplace && HasBookmarkAtCursor( NULL ) )
{
- // if called from hyperlink slot and cell contains only a URL,
- // replace old URL with new one
+ // if called from hyperlink slot and cell contains only a URL,
+ // replace old URL with new one
- aInsSel = ESelection( 0, 0, 0, 1 ); // replace first character (field)
+ aInsSel = ESelection( 0, 0, 0, 1 ); // replace first character (field)
}
SvxURLField aField( rURL, rDescription, SVXURLFORMAT_APPDEFAULT );
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index dc4e96bbbf34..1ea0761c61a1 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include <comphelper/processfactory.hxx>
#include <sot/formats.hxx>
-#define SOT_FORMATSTR_ID_STARCALC_CURRENT SOT_FORMATSTR_ID_STARCALC_50
+#define SOT_FORMATSTR_ID_STARCALC_CURRENT SOT_FORMATSTR_ID_STARCALC_50
#include "viewfunc.hxx"
#include "docsh.hxx"
@@ -71,7 +71,7 @@
#include "sc.hrc"
#include "filter.hxx"
#include "scextopt.hxx"
-#include "tabvwsh.hxx" // wegen GetViewFrame
+#include "tabvwsh.hxx" // wegen GetViewFrame
#include "compiler.hxx"
#include "asciiopt.hxx"
@@ -92,17 +92,17 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
ScDocument* pDoc = GetViewData()->GetDocument();
pDoc->SetPastingDrawFromOtherDoc( TRUE );
- Point aPos; // inserting position (1/100 mm)
+ Point aPos; // inserting position (1/100 mm)
if (pLogicPos)
aPos = *pLogicPos;
else
{
- // inserting position isn't needed for text formats
+ // inserting position isn't needed for text formats
BOOL bIsTextFormat = ( ScImportExport::IsFormatSupported( nFormatId ) ||
nFormatId == FORMAT_RTF );
if ( !bIsTextFormat )
{
- // Window MapMode isn't drawing MapMode if DrawingLayer hasn't been created yet
+ // Window MapMode isn't drawing MapMode if DrawingLayer hasn't been created yet
SCTAB nTab = GetViewData()->GetTabNo();
long nXT = 0;
@@ -119,7 +119,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
BOOL bRet = FALSE;
//
- // handle individual formats
+ // handle individual formats
//
if ( nFormatId == SOT_FORMATSTR_ID_EMBED_SOURCE ||
@@ -153,7 +153,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
nSrcTab = 0;
ScMarkData aSrcMark;
- aSrcMark.SelectOneTable( nSrcTab ); // for CopyToClip
+ aSrcMark.SelectOneTable( nSrcTab ); // for CopyToClip
ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP );
SCCOL nFirstCol, nLastCol;
@@ -299,7 +299,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
//TODO/LATER: if format is not available, create picture
}
}
- else if ( nFormatId == SOT_FORMATSTR_ID_LINK ) // LINK is also in ScImportExport
+ else if ( nFormatId == SOT_FORMATSTR_ID_LINK ) // LINK is also in ScImportExport
{
bRet = PasteDDE( rxTransferable );
}
@@ -307,7 +307,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
{
if ( nFormatId == SOT_FORMAT_RTF && aDataHelper.HasFormat( SOT_FORMATSTR_ID_EDITENGINE ) )
{
- // use EditView's PasteSpecial / Drop
+ // use EditView's PasteSpecial / Drop
PasteRTF( nPosX, nPosY, rxTransferable );
bRet = TRUE;
}
@@ -372,7 +372,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
}
else if (nFormatId == SOT_FORMATSTR_ID_SBA_DATAEXCHANGE)
{
- // import of database data into table
+ // import of database data into table
String sDataDesc;
if ( aDataHelper.GetString( nFormatId, sDataDesc ) )
@@ -382,10 +382,10 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
ScDocShell* pDocSh = GetViewData()->GetDocShell();
SCTAB nTab = GetViewData()->GetTabNo();
- ClickCursor(nPosX, nPosY, FALSE); // set cursor position
+ ClickCursor(nPosX, nPosY, FALSE); // set cursor position
- // Creation of database area "Import1" isn't here, but in the DocShell
- // slot execute, so it can be added to the undo action
+ // Creation of database area "Import1" isn't here, but in the DocShell
+ // slot execute, so it can be added to the undo action
ScDBData* pDBData = pDocSh->GetDBData( ScRange(nPosX,nPosY,nTab), SC_DB_OLD, SC_DBSEL_KEEP );
String sTarget;
@@ -411,7 +411,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
pCursorItem.reset(new SfxUsrAnyItem(FN_PARAM_3, aDesc[::svx::daCursor]));
}
- // asynchronous, to avoid doing the whole import in drop handler
+ // asynchronous, to avoid doing the whole import in drop handler
SfxDispatcher& rDisp = GetViewData()->GetDispatcher();
rDisp.Execute(SID_SBA_IMPORT, SFX_CALLMODE_ASYNCHRON,
&aDataDesc, &aTarget, &aAreaNew, pCursorItem.get(), (void*)0 );
@@ -421,7 +421,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
}
else if (nFormatId == SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE)
{
- // insert database field control
+ // insert database field control
if ( ::svx::OColumnTransferable::canExtractColumnDescriptor( aDataHelper.GetDataFlavorExVector(), CTF_COLUMN_DESCRIPTOR | CTF_CONTROL_EXCHANGE ) )
{
@@ -491,7 +491,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
SotStorageStreamRef xStm;
if( aDataHelper.GetSotStorageStream( SOT_FORMATSTR_ID_DRAWING, xStm ) )
{
- MakeDrawLayer(); // before loading model, so 3D factory has been created
+ MakeDrawLayer(); // before loading model, so 3D factory has been created
SvtPathOptions aPathOpt;
String aPath = aPathOpt.GetPalettePath();
@@ -523,10 +523,10 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
pObject = aIter.Next();
}
- nObjCount += pPage->GetObjCount(); // #105888# count group object only once
+ nObjCount += pPage->GetObjCount(); // #105888# count group object only once
}
- PasteDraw( aPos, pModel, (nObjCount > 1) ); // grouped if more than 1 object
+ PasteDraw( aPos, pModel, (nObjCount > 1) ); // grouped if more than 1 object
delete pModel;
aDragShellRef->DoClose();
bRet = TRUE;
@@ -534,17 +534,17 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
}
else if ( (nFormatId == SOT_FORMATSTR_ID_BIFF_5) || (nFormatId == SOT_FORMATSTR_ID_BIFF_8) )
{
- // do excel import into a clipboard document
+ // do excel import into a clipboard document
//TODO/MBA: testing
uno::Reference < io::XInputStream > xStm;
if( aDataHelper.GetInputStream( nFormatId, xStm ) )
{
#if 0
- SotStorage aDest( "d:\\test.xls" ); // to see the file
+ SotStorage aDest( "d:\\test.xls" ); // to see the file
pStor->CopyTo( &aDest );
#endif
ScDocument* pInsDoc = new ScDocument( SCDOCMODE_CLIP );
- SCTAB nSrcTab = 0; // Biff5 in clipboard: always sheet 0
+ SCTAB nSrcTab = 0; // Biff5 in clipboard: always sheet 0
pInsDoc->ResetClip( pDoc, nSrcTab );
SfxMedium aMed;
@@ -566,7 +566,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
}
else
{
- DBG_ERROR("no dimension"); //! possible?
+ DBG_ERROR("no dimension"); //! possible?
SCCOL nFirstCol, nLastCol;
SCROW nFirstRow, nLastRow;
if ( pInsDoc->GetDataStart( nSrcTab, nFirstCol, nFirstRow ) )
@@ -657,8 +657,8 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx
{
TransferableDataHelper aDataHelper( rxTransferable );
- // get link data from transferable before string data,
- // so the source knows it will be used for a link
+ // get link data from transferable before string data,
+ // so the source knows it will be used for a link
uno::Sequence<sal_Int8> aSequence;
if ( !aDataHelper.GetSequence( SOT_FORMATSTR_ID_LINK, aSequence ) )
@@ -667,7 +667,7 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx
return FALSE;
}
- // check size (only if string is available in transferable)
+ // check size (only if string is available in transferable)
USHORT nCols = 1;
USHORT nRows = 1;
@@ -676,7 +676,7 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx
String aDataStr;
if ( aDataHelper.GetString( SOT_FORMAT_STRING, aDataStr ) )
{
- // get size from string the same way as in ScDdeLink::DataChanged
+ // get size from string the same way as in ScDdeLink::DataChanged
aDataStr.ConvertLineEnd(LINEEND_LF);
xub_StrLen nLen = aDataStr.Len();
@@ -693,7 +693,7 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx
}
}
- // create formula
+ // create formula
long nSeqLen = aSequence.getLength();
sal_Char* pData = (sal_Char*)aSequence.getConstArray();
@@ -727,7 +727,7 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx
aFormula += aQuote;
aFormula += ScCompiler::GetNativeSymbol( ocClose);
- // mark range
+ // mark range
SCTAB nTab = GetViewData()->GetTabNo();
SCCOL nCurX = GetViewData()->GetCurX();
@@ -738,7 +738,7 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx
MarkCursor( nCurX+static_cast<SCCOL>(nCols)-1, nCurY+static_cast<SCROW>(nRows)-1, nTab );
ShowAllCursors();
- // enter formula
+ // enter formula
EnterMatrix( aFormula );
CursorPosChanged();
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index 6f25af2a0826..d744582f4a40 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ void ScViewFunc::DetectiveAddPred()
if (!bDone)
Sound::Beep();
- RecalcPPT(); //! use broadcast in DocFunc instead?
+ RecalcPPT(); //! use broadcast in DocFunc instead?
}
void ScViewFunc::DetectiveDelPred()
@@ -151,7 +151,7 @@ void ScViewFunc::ShowNote( bool bShow )
void ScViewFunc::EditNote()
{
- // zum Editieren einblenden und aktivieren
+ // zum Editieren einblenden und aktivieren
ScDocShell* pDocSh = GetViewData()->GetDocShell();
ScDocument* pDoc = pDocSh->GetDocument();
@@ -187,7 +187,7 @@ void ScViewFunc::EditNote()
GetViewData()->GetDispatcher().Execute( SID_DRAW_NOTEEDIT, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD );
// jetzt den erzeugten FuText holen und in den EditModus setzen
FuPoor* pPoor = GetDrawFuncPtr();
- if ( pPoor && (pPoor->GetSlotID() == SID_DRAW_NOTEEDIT) ) // hat keine RTTI
+ if ( pPoor && (pPoor->GetSlotID() == SID_DRAW_NOTEEDIT) ) // hat keine RTTI
{
ScrollToObject( pCaption ); // Objekt komplett sichtbar machen
static_cast< FuText* >( pPoor )->SetInEditMode( pCaption );
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx
index afa06ddfee3e..277cbd4a67a6 100644
--- a/sc/source/ui/view/viewfun7.cxx
+++ b/sc/source/ui/view/viewfun7.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/embed/Aspects.hpp>
-#include "document.hxx" // fuer MapMode Initialisierung in PasteDraw
+#include "document.hxx" // fuer MapMode Initialisierung in PasteDraw
#include "viewfunc.hxx"
#include "tabvwsh.hxx"
#include "drawview.hxx"
@@ -69,7 +69,7 @@ using namespace com::sun::star;
void lcl_AdjustInsertPos( ScViewData* pData, Point& rPos, Size& rSize )
{
-// SdrPage* pPage = pData->GetDocument()->GetDrawLayer()->GetPage( pData->GetTabNo() );
+// SdrPage* pPage = pData->GetDocument()->GetDrawLayer()->GetPage( pData->GetTabNo() );
SdrPage* pPage = pData->GetScDrawView()->GetModel()->GetPage( static_cast<sal_uInt16>(pData->GetTabNo()) );
DBG_ASSERT(pPage,"pPage ???");
Size aPgSize( pPage->GetSize() );
@@ -82,7 +82,7 @@ void lcl_AdjustInsertPos( ScViewData* pData, Point& rPos, Size& rSize )
rPos.X() += x + 80;
if( y < 0 )
rPos.Y() += y + 200;
- rPos.X() += rSize.Width() / 2; // Position bei Paste gibt Mittelpunkt an
+ rPos.X() += rSize.Width() / 2; // Position bei Paste gibt Mittelpunkt an
rPos.Y() += rSize.Height() / 2;
}
@@ -92,8 +92,8 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
MakeDrawLayer();
Point aPos( rLogicPos );
- // #64184# MapMode am Outliner-RefDevice muss stimmen (wie in FuText::MakeOutliner)
- //! mit FuText::MakeOutliner zusammenfassen?
+ // #64184# MapMode am Outliner-RefDevice muss stimmen (wie in FuText::MakeOutliner)
+ //! mit FuText::MakeOutliner zusammenfassen?
MapMode aOldMapMode;
OutputDevice* pRef = GetViewData()->GetDocument()->GetDrawLayer()->GetRefDevice();
if (pRef)
@@ -168,7 +168,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
pNeuObj->SetModel(pDrawModel);
pNeuObj->SetPage(pDestPage);
- // #68787# copy graphics within the same model - always needs new name
+ // #68787# copy graphics within the same model - always needs new name
if ( pNeuObj->ISA(SdrGrafObj) && !bPasteIsMove )
pNeuObj->SetName(((ScDrawLayer*)pDrawModel)->GetNewGraphicName());
@@ -177,8 +177,8 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
pDestPage->InsertObject( pNeuObj );
pScDrawView->AddUndo(new SdrUndoInsertObj( *pNeuObj ));
- // Chart braucht nicht mehr getrennt behandelt zu werden,
- // weil es seine Daten jetzt selber hat
+ // Chart braucht nicht mehr getrennt behandelt zu werden,
+ // weil es seine Daten jetzt selber hat
}
}
@@ -188,7 +188,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
}
else
{
- bPasteIsMove = FALSE; // kein internes Verschieben passiert
+ bPasteIsMove = FALSE; // kein internes Verschieben passiert
SdrView aView(pModel); // #i71529# never create a base class of SdrView directly!
SdrPageView* pPv = aView.ShowSdrPage(aView.GetModel()->GetPage(0));
@@ -196,8 +196,8 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
Size aSize = aView.GetAllMarkedRect().GetSize();
lcl_AdjustInsertPos( GetViewData(), aPos, aSize );
- // #41333# Markierung nicht aendern, wenn Ole-Objekt aktiv
- // (bei Drop aus Ole-Objekt wuerde sonst mitten im ExecuteDrag deaktiviert!)
+ // #41333# Markierung nicht aendern, wenn Ole-Objekt aktiv
+ // (bei Drop aus Ole-Objekt wuerde sonst mitten im ExecuteDrag deaktiviert!)
ULONG nOptions = 0;
SfxInPlaceClient* pClient = GetViewData()->GetViewShell()->GetIPClient();
@@ -293,7 +293,7 @@ BOOL ScViewFunc::PasteObject( const Point& rPos, const uno::Reference < embed::X
aSz.Height = aSize.Height();
xObj->setVisualAreaSize( nAspect, aSz );
}
-
+
awt::Size aSz;
try
{
@@ -303,9 +303,9 @@ BOOL ScViewFunc::PasteObject( const Point& rPos, const uno::Reference < embed::X
{
// the default size will be set later
}
-
+
aSize = Size( aSz.Width, aSz.Height );
- aSize = OutputDevice::LogicToLogic( aSize, aMapObj, aMap100 ); // fuer SdrOle2Obj
+ aSize = OutputDevice::LogicToLogic( aSize, aMapObj, aMap100 ); // fuer SdrOle2Obj
if( aSize.Height() == 0 || aSize.Width() == 0 )
{
@@ -329,7 +329,7 @@ BOOL ScViewFunc::PasteObject( const Point& rPos, const uno::Reference < embed::X
SdrOle2Obj* pSdrObj = new SdrOle2Obj( aObjRef, aName, aRect );
SdrPageView* pPV = pDrView->GetSdrPageView();
- pDrView->InsertObjectSafe( pSdrObj, *pPV ); // nicht markieren wenn Ole
+ pDrView->InsertObjectSafe( pSdrObj, *pPV ); // nicht markieren wenn Ole
GetViewData()->GetViewShell()->SetDrawShell( TRUE );
return TRUE;
}
@@ -364,7 +364,7 @@ BOOL ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic,
if (aSourceMap.GetMapUnit() == MAP_PIXEL)
{
- // Pixel-Korrektur beruecksichtigen, damit Bitmap auf dem Bildschirm stimmt
+ // Pixel-Korrektur beruecksichtigen, damit Bitmap auf dem Bildschirm stimmt
Fraction aScaleX, aScaleY;
pScDrawView->CalcNormScale( aScaleX, aScaleY );
@@ -373,7 +373,7 @@ BOOL ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic,
}
Size aSize = pWin->LogicToLogic( rGraphic.GetPrefSize(), &aSourceMap, &aDestMap );
-// lcl_AdjustInsertPos( GetViewData(), aPos, aSize );
+// lcl_AdjustInsertPos( GetViewData(), aPos, aSize );
if ( GetViewData()->GetDocument()->IsNegativePage( GetViewData()->GetTabNo() ) )
aPos.X() -= aSize.Width();
@@ -384,10 +384,10 @@ BOOL ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic,
// #118522# calling SetGraphicLink here doesn't work
- // #49961# Pfad wird nicht mehr als Name der Grafik gesetzt
+ // #49961# Pfad wird nicht mehr als Name der Grafik gesetzt
ScDrawLayer* pLayer = (ScDrawLayer*) pScDrawView->GetModel();
- String aName = pLayer->GetNewGraphicName(); // "Grafik x"
+ String aName = pLayer->GetNewGraphicName(); // "Grafik x"
pGrafObj->SetName(aName);
// nicht markieren wenn Ole
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 231eb4e67562..c594e3b32773 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include <vcl/virdev.hxx>
#include <vcl/waitobj.hxx>
#include <vcl/wrkwin.hxx>
-#include <stdlib.h> // qsort
+#include <stdlib.h> // qsort
#include "viewfunc.hxx"
#include "tabvwsh.hxx"
@@ -74,7 +74,7 @@
#include "global.hxx"
#include "stlsheet.hxx"
#include "editutil.hxx"
-//CHINA001 #include "namecrea.hxx" // wegen Flags
+//CHINA001 #include "namecrea.hxx" // wegen Flags
#include "cell.hxx"
#include "scresid.hxx"
#include "inputhdl.hxx"
@@ -112,11 +112,11 @@ ScViewFunc::~ScViewFunc()
void ScViewFunc::StartFormatArea()
{
- // ueberhaupt aktiviert?
+ // ueberhaupt aktiviert?
if ( !SC_MOD()->GetInputOptions().GetExtendFormat() )
return;
- // start only with single cell (marked or cursor position)
+ // start only with single cell (marked or cursor position)
ScRange aMarkRange;
BOOL bOk = (GetViewData()->GetSimpleArea( aMarkRange ) == SC_MARK_SIMPLE);
if ( bOk && aMarkRange.aStart != aMarkRange.aEnd )
@@ -129,24 +129,24 @@ void ScViewFunc::StartFormatArea()
aFormatArea = ScRange( aFormatSource );
}
else
- bFormatValid = FALSE; // keinen alten Bereich behalten
+ bFormatValid = FALSE; // keinen alten Bereich behalten
}
BOOL ScViewFunc::TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrChanged )
{
- // ueberhaupt aktiviert?
+ // ueberhaupt aktiviert?
if ( !SC_MOD()->GetInputOptions().GetExtendFormat() )
return FALSE;
- // Test: Eingabe mit Zahlformat (bAttrChanged) immer als neue Attributierung behandeln
- // (alte Area verwerfen). Wenn das nicht gewollt ist, den if-Teil weglassen:
+ // Test: Eingabe mit Zahlformat (bAttrChanged) immer als neue Attributierung behandeln
+ // (alte Area verwerfen). Wenn das nicht gewollt ist, den if-Teil weglassen:
if ( bAttrChanged )
{
StartFormatArea();
return FALSE;
}
- //! Abfrage, ob Zelle leer war ???
+ //! Abfrage, ob Zelle leer war ???
BOOL bFound = FALSE;
ScRange aNewRange = aFormatArea;
@@ -154,18 +154,18 @@ BOOL ScViewFunc::TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrC
{
if ( nRow >= aFormatArea.aStart.Row() && nRow <= aFormatArea.aEnd.Row() )
{
- // innerhalb ?
+ // innerhalb ?
if ( nCol >= aFormatArea.aStart.Col() && nCol <= aFormatArea.aEnd.Col() )
{
- bFound = TRUE; // Bereich nicht aendern
+ bFound = TRUE; // Bereich nicht aendern
}
- // links ?
+ // links ?
if ( nCol+1 == aFormatArea.aStart.Col() )
{
bFound = TRUE;
aNewRange.aStart.SetCol( nCol );
}
- // rechts ?
+ // rechts ?
if ( nCol == aFormatArea.aEnd.Col()+1 )
{
bFound = TRUE;
@@ -174,13 +174,13 @@ BOOL ScViewFunc::TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrC
}
if ( nCol >= aFormatArea.aStart.Col() && nCol <= aFormatArea.aEnd.Col() )
{
- // oben ?
+ // oben ?
if ( nRow+1 == aFormatArea.aStart.Row() )
{
bFound = TRUE;
aNewRange.aStart.SetRow( nRow );
}
- // unten ?
+ // unten ?
if ( nRow == aFormatArea.aEnd.Row()+1 )
{
bFound = TRUE;
@@ -190,12 +190,12 @@ BOOL ScViewFunc::TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrC
}
if (bFound)
- aFormatArea = aNewRange; // erweitern
+ aFormatArea = aNewRange; // erweitern
else
{
- bFormatValid = FALSE; // ausserhalb -> abbrechen
- if ( bAttrChanged ) // Wert mit Zahlformat eingegeben?
- StartFormatArea(); // dann ggf. neu starten
+ bFormatValid = FALSE; // ausserhalb -> abbrechen
+ if ( bAttrChanged ) // Wert mit Zahlformat eingegeben?
+ StartFormatArea(); // dann ggf. neu starten
}
return bFound;
@@ -214,7 +214,7 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab,
if ( !((const ScMergeAttr&)pSource->GetItem(ATTR_MERGE)).IsMerged() )
{
const ScPatternAttr* pDocOld = pDoc->GetPattern( nCol, nRow, nTab );
- // pDocOld ist nur bis zum Apply... gueltig!
+ // pDocOld ist nur bis zum Apply... gueltig!
ScPatternAttr* pOldPattern = NULL;
if ( bAddUndo )
@@ -224,7 +224,7 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab,
if ( pSrcStyle && pSrcStyle != pDocOld->GetStyleSheet() )
pDoc->ApplyStyle( nCol, nRow, nTab, *pSrcStyle );
pDoc->ApplyPattern( nCol, nRow, nTab, *pSource );
- AdjustRowHeight( nRow, nRow, TRUE ); //! nicht doppelt ?
+ AdjustRowHeight( nRow, nRow, TRUE ); //! nicht doppelt ?
if ( bAddUndo )
{
@@ -235,17 +235,17 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab,
pOldPattern, pNewPattern, pSource,
TRUE ) );
- delete pOldPattern; // wird im Undo kopiert (Pool)
+ delete pOldPattern; // wird im Undo kopiert (Pool)
}
}
- if ( bAttrChanged ) // Wert mit Zahlformat eingegeben?
- aFormatSource.Set( nCol, nRow, nTab ); // dann als neue Quelle
+ if ( bAttrChanged ) // Wert mit Zahlformat eingegeben?
+ aFormatSource.Set( nCol, nRow, nTab ); // dann als neue Quelle
}
//------------------------------------------------------------------------------------
-// Hilfsroutinen
+// Hilfsroutinen
USHORT ScViewFunc::GetOptimalColWidth( SCCOL nCol, SCTAB nTab, BOOL bFormula )
{
@@ -289,7 +289,7 @@ BOOL ScViewFunc::SelectionEditable( BOOL* pOnlyNotBecauseOfMatrix /* = NULL */ )
return bRet;
}
-#ifndef LRU_MAX
+#ifndef LRU_MAX
#define LRU_MAX 10
#endif
@@ -312,22 +312,22 @@ BOOL lcl_AddFunction( ScAppOptions& rAppOpt, USHORT nOpCode )
USHORT* pOldList = rAppOpt.GetLRUFuncList();
USHORT nPos;
for (nPos=0; nPos<nOldCount; nPos++)
- if (pOldList[nPos] == nOpCode) // is the function already in the list?
+ if (pOldList[nPos] == nOpCode) // is the function already in the list?
{
if ( nPos == 0 )
- return FALSE; // already at the top -> no change
+ return FALSE; // already at the top -> no change
- // count doesn't change, so the original array is modified
+ // count doesn't change, so the original array is modified
for (USHORT nCopy=nPos; nCopy>0; nCopy--)
pOldList[nCopy] = pOldList[nCopy-1];
pOldList[0] = nOpCode;
- return TRUE; // list has changed
+ return TRUE; // list has changed
}
if ( !lcl_FunctionKnown( nOpCode ) )
- return FALSE; // not in function list -> no change
+ return FALSE; // not in function list -> no change
USHORT nNewCount = Min( (USHORT)(nOldCount + 1), (USHORT)LRU_MAX );
USHORT nNewList[LRU_MAX];
@@ -336,12 +336,12 @@ BOOL lcl_AddFunction( ScAppOptions& rAppOpt, USHORT nOpCode )
nNewList[nPos] = pOldList[nPos-1];
rAppOpt.SetLRUFuncList( nNewList, nNewCount );
- return TRUE; // list has changed
+ return TRUE; // list has changed
}
-// eigentliche Funktionen
+// eigentliche Funktionen
-// Eingabe - Undo OK
+// Eingabe - Undo OK
void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString,
BOOL bRecord, const EditTextObject* pData )
@@ -363,18 +363,18 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
BOOL bEditDeleted = FALSE;
BYTE nOldScript = 0;
- ScBaseCell** ppOldCells = NULL;
- BOOL* pHasFormat = NULL;
- ULONG* pOldFormats = NULL;
- SCTAB* pTabs = NULL;
+ ScBaseCell** ppOldCells = NULL;
+ BOOL* pHasFormat = NULL;
+ ULONG* pOldFormats = NULL;
+ SCTAB* pTabs = NULL;
SCTAB nUndoPos = 0;
EditTextObject* pUndoData = NULL;
if ( bRecord )
{
- ppOldCells = new ScBaseCell*[nSelCount];
- pHasFormat = new BOOL[nSelCount];
- pOldFormats = new ULONG[nSelCount];
- pTabs = new SCTAB[nSelCount];
+ ppOldCells = new ScBaseCell*[nSelCount];
+ pHasFormat = new BOOL[nSelCount];
+ pOldFormats = new ULONG[nSelCount];
+ pTabs = new SCTAB[nSelCount];
nUndoPos = 0;
for (i=0; i<nTabCount; i++)
@@ -459,7 +459,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
BOOL bNumFmtChanged = FALSE;
if ( bFormula )
- { // Formel, compile mit AutoCorrection
+ { // Formel, compile mit AutoCorrection
for (i=0; i<nTabCount; i++)
if (rMark.GetTableSelect(i))
break;
@@ -482,7 +482,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
ScTokenArray* pArrFirst = pArr = aComp.CompileString( aFormula );
BOOL bCorrected = aComp.IsCorrected();
if ( bCorrected )
- { // probieren, mit erster Parser-Korrektur neu zu parsen
+ { // probieren, mit erster Parser-Korrektur neu zu parsen
pArr = aComp.CompileString( aComp.GetCorrectedFormula() );
}
if ( !pArr->GetCodeError() )
@@ -503,7 +503,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
aCorrectedFormula = aComp.GetCorrectedFormula();
short nResult;
if ( aCorrectedFormula.Len() == 1 )
- nResult = RET_NO; // leere Formel, nur '='
+ nResult = RET_NO; // leere Formel, nur '='
else
{
String aMessage( ScResId( SCSTR_FORMULA_AUTOCORRECTION ) );
@@ -539,8 +539,8 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
USHORT nError = pArr->GetCodeError();
if ( !nError )
{
- // #68693# update list of recent functions with all functions that
- // are not within parentheses
+ // #68693# update list of recent functions with all functions that
+ // are not within parentheses
ScModule* pScMod = SC_MOD();
ScAppOptions aAppOpt = pScMod->GetAppOptions();
@@ -607,7 +607,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
}
pDoc->PutCell( aPos, pCell );
if ( !bAutoCalc )
- { // einmal nur die Zelle berechnen und wieder dirty setzen
+ { // einmal nur die Zelle berechnen und wieder dirty setzen
pCell->Interpret();
pCell->SetDirtyVar();
pDoc->PutInFormulaTree( pCell );
@@ -625,7 +625,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
bNumFmtChanged = TRUE;
}
- // row height must be changed if new text has a different script type
+ // row height must be changed if new text has a different script type
for (i=0; i<nTabCount && !bEditDeleted; i++)
if (rMark.GetTableSelect(i))
if ( pDoc->GetScriptType( nCol, nRow, i ) != nOldScript )
@@ -641,7 +641,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
DoAutoAttributes(nCol, nRow, nTab, bNumFmtChanged, bRecord);
if ( bRecord )
- { // wg. ChangeTrack erst jetzt
+ { // wg. ChangeTrack erst jetzt
pDocSh->GetUndoManager()->AddUndoAction(
new ScUndoEnterData( pDocSh, nCol, nRow, nTab, nUndoPos, pTabs,
ppOldCells, pHasFormat, pOldFormats,
@@ -676,11 +676,11 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS
else
{
ErrorMessage(aTester.GetMessageId());
- PaintArea( nCol, nRow, nCol, nRow ); // da steht evtl. noch die Edit-Engine
+ PaintArea( nCol, nRow, nCol, nRow ); // da steht evtl. noch die Edit-Engine
}
}
-// Wert in einzele Zelle eintragen (nur auf nTab)
+// Wert in einzele Zelle eintragen (nur auf nTab)
void ScViewFunc::EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rValue )
{
@@ -701,7 +701,7 @@ void ScViewFunc::EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& r
|| pDoc->HasAttrib(
nCol,nRow,nTab, nCol,nRow,nTab, HASATTR_NEEDHEIGHT );
- // Undo
+ // Undo
ScBaseCell* pUndoCell = (bUndo && pOldCell) ? pOldCell->CloneWithoutNote( *pDoc ) : 0;
pDoc->SetValue( nCol, nRow, nTab, rValue );
@@ -713,7 +713,7 @@ void ScViewFunc::EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& r
new ScUndoEnterValue( pDocSh, aPos, pUndoCell, rValue, bNeedHeight ) );
}
-/*! Zeilenhoehe anpassen? Dann auch bei Undo...
+/*! Zeilenhoehe anpassen? Dann auch bei Undo...
if (bNeedHeight)
AdjustRowHeight(nRow,nRow);
*/
@@ -742,7 +742,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb
if (aTester.IsEditable())
{
//
- // Test auf Attribute
+ // Test auf Attribute
//
BOOL bSimple = FALSE;
BOOL bCommon = FALSE;
@@ -754,7 +754,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb
ScTabEditEngine aEngine( *pOldPattern, pDoc->GetEnginePool() );
aEngine.SetText(*pData);
- if (bTestSimple) // Testen, ob einfacher String ohne Attribute
+ if (bTestSimple) // Testen, ob einfacher String ohne Attribute
{
ScEditAttrTester aAttrTester( &aEngine );
bSimple = !aAttrTester.NeedsObject();
@@ -770,11 +770,11 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb
bSimple = TRUE;
}
- if (bCommon) // Attribute fuer Tabelle
+ if (bCommon) // Attribute fuer Tabelle
{
pCellAttrs = new ScPatternAttr( *pOldPattern );
pCellAttrs->GetFromEditItemSet( &aAttrTester.GetAttribs() );
- //! remove common attributes from EditEngine?
+ //! remove common attributes from EditEngine?
}
}
@@ -782,20 +782,20 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb
aString = ScEditUtil::GetSpaceDelimitedString(aEngine);
//
- // Undo
+ // Undo
//
SCTAB nTabCount = pDoc->GetTableCount();
SCTAB nSelCount = rMark.GetSelectCount();
SCTAB i;
- ScBaseCell** ppOldCells = NULL;
- SCTAB* pTabs = NULL;
+ ScBaseCell** ppOldCells = NULL;
+ SCTAB* pTabs = NULL;
SCTAB nPos = 0;
EditTextObject* pUndoData = NULL;
if (bRecord && !bSimple)
{
- ppOldCells = new ScBaseCell*[nSelCount];
- pTabs = new SCTAB[nSelCount];
+ ppOldCells = new ScBaseCell*[nSelCount];
+ pTabs = new SCTAB[nSelCount];
nPos = 0;
for (i=0; i<nTabCount; i++)
@@ -814,11 +814,11 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb
}
//
- // Daten eintragen
+ // Daten eintragen
//
if (bCommon)
- pDoc->ApplyPattern(nCol,nRow,nTab,*pCellAttrs); //! Undo
+ pDoc->ApplyPattern(nCol,nRow,nTab,*pCellAttrs); //! Undo
if (bSimple)
{
@@ -834,7 +834,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb
pDoc->PutCell( nCol, nRow, i, new ScEditCell( pData, pDoc, NULL ) );
if ( bRecord )
- { // wg. ChangeTrack erst jetzt
+ { // wg. ChangeTrack erst jetzt
pDocSh->GetUndoManager()->AddUndoAction(
new ScUndoEnterData( pDocSh, nCol, nRow, nTab, nPos, pTabs,
ppOldCells, NULL, NULL, aString,
@@ -877,7 +877,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb
else
{
ErrorMessage(aTester.GetMessageId());
- PaintArea( nCol, nRow, nCol, nRow ); // da steht evtl. noch die Edit-Engine
+ PaintArea( nCol, nRow, nCol, nRow ); // da steht evtl. noch die Edit-Engine
}
}
@@ -896,8 +896,8 @@ void ScViewFunc::EnterMatrix( const String& rString )
const ScMarkData& rMark = pData->GetMarkData();
if ( !rMark.IsMarked() && !rMark.IsMultiMarked() )
{
- // nichts markiert -> automatisch Block mit Groesse des Ergebnisses
- // Formel temporaer berechnen, um an die Groesse heranzukommen
+ // nichts markiert -> automatisch Block mit Groesse des Ergebnisses
+ // Formel temporaer berechnen, um an die Groesse heranzukommen
ScDocument* pDoc = pData->GetDocument();
SCCOL nCol = pData->GetCurX();
@@ -977,7 +977,7 @@ const ScPatternAttr* ScViewFunc::GetSelectionPattern()
ScDocument* pDoc = GetViewData()->GetDocument();
if ( rMark.IsMarked() || rMark.IsMultiMarked() )
{
- // MarkToMulti is no longer necessary for pDoc->GetSelectionPattern
+ // MarkToMulti is no longer necessary for pDoc->GetSelectionPattern
const ScPatternAttr* pAttr = pDoc->GetSelectionPattern( rMark );
return pAttr;
}
@@ -987,15 +987,15 @@ const ScPatternAttr* ScViewFunc::GetSelectionPattern()
SCROW nRow = GetViewData()->GetCurY();
SCTAB nTab = GetViewData()->GetTabNo();
- ScMarkData aTempMark( rMark ); // copy sheet selection
+ ScMarkData aTempMark( rMark ); // copy sheet selection
aTempMark.SetMarkArea( ScRange( nCol, nRow, nTab ) );
const ScPatternAttr* pAttr = pDoc->GetSelectionPattern( aTempMark );
return pAttr;
}
}
-void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter,
- SvxBoxInfoItem& rLineInner )
+void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter,
+ SvxBoxInfoItem& rLineInner )
{
ScDocument* pDoc = GetViewData()->GetDocument();
const ScMarkData& rMark = GetViewData()->GetMarkData();
@@ -1004,8 +1004,8 @@ void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter,
{
if ( rMark.IsMultiMarked() )
{
- ScMarkData aNewMark( rMark ); // use local copy for MarkToSimple
- aNewMark.MarkToSimple(); // simple block is needed for GetSelectionFrame
+ ScMarkData aNewMark( rMark ); // use local copy for MarkToSimple
+ aNewMark.MarkToSimple(); // simple block is needed for GetSelectionFrame
pDoc->GetSelectionFrame( aNewMark, rLineOuter, rLineInner );
}
else
@@ -1018,7 +1018,7 @@ void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter,
GetViewData()->GetCurY(),
GetViewData()->GetTabNo() );
- rLineOuter = (const SvxBoxItem&) (pAttrs->GetItem( ATTR_BORDER ));
+ rLineOuter = (const SvxBoxItem&) (pAttrs->GetItem( ATTR_BORDER ));
rLineInner = (const SvxBoxInfoItem&)(pAttrs->GetItem( ATTR_BORDER_INNER ));
rLineInner.SetTable(FALSE);
rLineInner.SetDist(TRUE);
@@ -1027,14 +1027,14 @@ void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter,
}
//
-// Attribute anwenden - Undo OK
+// Attribute anwenden - Undo OK
//
-// kompletter Set ( ATTR_STARTINDEX, ATTR_ENDINDEX )
+// kompletter Set ( ATTR_STARTINDEX, ATTR_ENDINDEX )
//
void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet,
const SfxItemSet* pOldSet,
- BOOL bRecord )
+ BOOL bRecord )
{
// nur wegen Matrix nicht editierbar? Attribute trotzdem ok
BOOL bOnlyNotBecauseOfMatrix;
@@ -1049,7 +1049,7 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet,
aNewAttrs.DeleteUnchanged( &aOldAttrs );
if ( pDialogSet->GetItemState( ATTR_VALUE_FORMAT ) == SFX_ITEM_SET )
- { // #82521# don't reset to default SYSTEM GENERAL if not intended
+ { // #82521# don't reset to default SYSTEM GENERAL if not intended
sal_uInt32 nOldFormat =
((const SfxUInt32Item&)pOldSet->Get( ATTR_VALUE_FORMAT )).GetValue();
sal_uInt32 nNewFormat =
@@ -1069,7 +1069,7 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet,
aNewAttrs.GetItemSet().Put(
SvxLanguageItem( eNewLang, ATTR_LANGUAGE_FORMAT ) );
- // #40606# nur die Sprache geaendert -> Zahlformat-Attribut nicht anfassen
+ // #40606# nur die Sprache geaendert -> Zahlformat-Attribut nicht anfassen
sal_uInt32 nNewMod = nNewFormat % SV_COUNTRY_LANGUAGE_OFFSET;
if ( nNewMod == ( nOldFormat % SV_COUNTRY_LANGUAGE_OFFSET ) &&
nNewMod <= SV_MAX_ANZ_STANDARD_FORMATE )
@@ -1078,14 +1078,14 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet,
}
}
- const SvxBoxItem* pOldOuter = (const SvxBoxItem*) &pOldSet->Get( ATTR_BORDER );
- const SvxBoxItem* pNewOuter = (const SvxBoxItem*) &pDialogSet->Get( ATTR_BORDER );
+ const SvxBoxItem* pOldOuter = (const SvxBoxItem*) &pOldSet->Get( ATTR_BORDER );
+ const SvxBoxItem* pNewOuter = (const SvxBoxItem*) &pDialogSet->Get( ATTR_BORDER );
const SvxBoxInfoItem* pOldInner = (const SvxBoxInfoItem*) &pOldSet->Get( ATTR_BORDER_INNER );
const SvxBoxInfoItem* pNewInner = (const SvxBoxInfoItem*) &pDialogSet->Get( ATTR_BORDER_INNER );
- SfxItemSet& rNewSet = aNewAttrs.GetItemSet();
- SfxItemPool* pNewPool = rNewSet.GetPool();
+ SfxItemSet& rNewSet = aNewAttrs.GetItemSet();
+ SfxItemPool* pNewPool = rNewSet.GetPool();
- pNewPool->Put( *pNewOuter ); // noch nicht loeschen
+ pNewPool->Put( *pNewOuter ); // noch nicht loeschen
pNewPool->Put( *pNewInner );
rNewSet.ClearItem( ATTR_BORDER );
rNewSet.ClearItem( ATTR_BORDER_INNER );
@@ -1103,7 +1103,7 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet,
if ( pNewOuter==pOldOuter && pNewInner==pOldInner )
bFrame = FALSE;
- // das sollte doch der Pool abfangen: ?!??!??
+ // das sollte doch der Pool abfangen: ?!??!??
if ( bFrame && pNewOuter && pNewInner )
if ( *pNewOuter == *pOldOuter && *pNewInner == *pOldInner )
@@ -1123,7 +1123,7 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet,
bFrame = FALSE;
if (!bFrame)
- ApplySelectionPattern( aNewAttrs, bRecord ); // nur normale
+ ApplySelectionPattern( aNewAttrs, bRecord ); // nur normale
else
{
// wenn neue Items Default-Items sind, so muessen die
@@ -1138,10 +1138,10 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet,
bRecord );
}
- pNewPool->Remove( *pNewOuter ); // freigeben
+ pNewPool->Remove( *pNewOuter ); // freigeben
pNewPool->Remove( *pNewInner );
- // Hoehen anpassen
+ // Hoehen anpassen
AdjustBlockHeight();
// CellContentChanged wird von ApplySelectionPattern / ApplyPatternLines gerufen
@@ -1161,7 +1161,7 @@ void ScViewFunc::ApplyAttr( const SfxPoolItem& rAttrItem )
ATTR_PATTERN_START, ATTR_PATTERN_END ) );
aNewAttrs.GetItemSet().Put( rAttrItem );
- // Wenn Ausrichtung eingestellt wird (ueber Buttons), immer Einzug 0
+ // Wenn Ausrichtung eingestellt wird (ueber Buttons), immer Einzug 0
if ( rAttrItem.Which() == ATTR_HOR_JUSTIFY )
aNewAttrs.GetItemSet().Put( SfxUInt16Item( ATTR_INDENT, 0 ) );
ApplySelectionPattern( aNewAttrs );
@@ -1172,7 +1172,7 @@ void ScViewFunc::ApplyAttr( const SfxPoolItem& rAttrItem )
}
-// Pattern und Rahmen
+// Pattern und Rahmen
void ScViewFunc::ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem* pNewOuter,
const SvxBoxInfoItem* pNewInner, BOOL bRecord )
@@ -1193,7 +1193,7 @@ void ScViewFunc::ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem
else
{
aMarkRange = ScRange( GetViewData()->GetCurX(),
- GetViewData()->GetCurY(), GetViewData()->GetTabNo() );
+ GetViewData()->GetCurY(), GetViewData()->GetTabNo() );
DoneBlockMode();
InitOwnBlockMode();
aFuncMark.SetMarkArea(aMarkRange);
@@ -1245,24 +1245,24 @@ void ScViewFunc::ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem
StartFormatArea();
}
-// nur Pattern
+// nur Pattern
void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
BOOL bRecord, BOOL bCursorOnly )
{
- ScViewData* pViewData = GetViewData();
- ScDocShell* pDocSh = pViewData->GetDocShell();
- ScDocument* pDoc = pDocSh->GetDocument();
+ ScViewData* pViewData = GetViewData();
+ ScDocShell* pDocSh = pViewData->GetDocShell();
+ ScDocument* pDoc = pDocSh->GetDocument();
ScMarkData aFuncMark( pViewData->GetMarkData() ); // local copy for UnmarkFiltered
ScViewUtil::UnmarkFiltered( aFuncMark, pDoc );
if (bRecord && !pDoc->IsUndoEnabled())
bRecord = FALSE;
- // State from old ItemSet doesn't matter for paint flags, as any change will be
- // from SFX_ITEM_SET in the new ItemSet (default is ignored in ApplyPattern).
- // New alignment is checked (check in PostPaint isn't enough) in case a right
- // alignment is changed to left.
+ // State from old ItemSet doesn't matter for paint flags, as any change will be
+ // from SFX_ITEM_SET in the new ItemSet (default is ignored in ApplyPattern).
+ // New alignment is checked (check in PostPaint isn't enough) in case a right
+ // alignment is changed to left.
const SfxItemSet& rNewSet = rAttr.GetItemSet();
BOOL bSetLines = rNewSet.GetItemState( ATTR_BORDER, TRUE ) == SFX_ITEM_SET ||
rNewSet.GetItemState( ATTR_SHADOW, TRUE ) == SFX_ITEM_SET;
@@ -1345,7 +1345,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
aModificator.SetDocumentModified();
CellContentChanged();
}
- else // einzelne Zelle - Undo einfacher
+ else // einzelne Zelle - Undo einfacher
{
SCCOL nCol = pViewData->GetCurX();
SCROW nRow = pViewData->GetCurY();
@@ -1363,9 +1363,9 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
new ScUndoCursorAttr( pDocSh,
nCol, nRow, nTab,
pOldPat, pNewPat, &rAttr,
- FALSE ) ); // FALSE = nicht automatisch
+ FALSE ) ); // FALSE = nicht automatisch
}
- delete pOldPat; // wird im Undo kopiert (Pool)
+ delete pOldPat; // wird im Undo kopiert (Pool)
pDocSh->PostPaint( nCol,nRow,nTab, nCol,nRow,nTab, PAINT_GRID, nExtFlags | SC_PF_TESTMERGE );
pDocSh->UpdateOle(GetViewData());
@@ -1410,7 +1410,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
void ScViewFunc::ApplyUserItemSet( const SfxItemSet& rItemSet )
{
- // ItemSet from UI, may have different pool
+ // ItemSet from UI, may have different pool
BOOL bOnlyNotBecauseOfMatrix;
if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix )
@@ -1432,13 +1432,13 @@ const SfxStyleSheet* ScViewFunc::GetStyleSheetFromMarked()
// Don't use UnmarkFiltered in slot state functions, for performance reasons.
// The displayed state is always that of the whole selection including filtered rows.
- const ScStyleSheet* pSheet = NULL;
- ScViewData* pViewData = GetViewData();
- ScDocument* pDoc = pViewData->GetDocument();
- ScMarkData& rMark = pViewData->GetMarkData();
+ const ScStyleSheet* pSheet = NULL;
+ ScViewData* pViewData = GetViewData();
+ ScDocument* pDoc = pViewData->GetDocument();
+ ScMarkData& rMark = pViewData->GetMarkData();
if ( rMark.IsMarked() || rMark.IsMultiMarked() )
- pSheet = pDoc->GetSelectionStyle( rMark ); // MarkToMulti isn't necessary
+ pSheet = pDoc->GetSelectionStyle( rMark ); // MarkToMulti isn't necessary
else
pSheet = pDoc->GetStyle( pViewData->GetCurX(),
pViewData->GetCurY(),
@@ -1460,12 +1460,12 @@ void ScViewFunc::SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, BOOL bRecord
if ( !pStyleSheet) return;
// -------------------------------------------------------------------
- ScViewData* pViewData = GetViewData();
- ScDocShell* pDocSh = pViewData->GetDocShell();
- ScDocument* pDoc = pDocSh->GetDocument();
+ ScViewData* pViewData = GetViewData();
+ ScDocShell* pDocSh = pViewData->GetDocShell();
+ ScDocument* pDoc = pDocSh->GetDocument();
ScMarkData aFuncMark( pViewData->GetMarkData() ); // local copy for UnmarkFiltered
ScViewUtil::UnmarkFiltered( aFuncMark, pDoc );
- SCTAB nTabCount = pDoc->GetTableCount();
+ SCTAB nTabCount = pDoc->GetTableCount();
if (bRecord && !pDoc->IsUndoEnabled())
bRecord = FALSE;
@@ -1550,9 +1550,9 @@ void ScViewFunc::RemoveStyleSheetInUse( SfxStyleSheet* pStyleSheet )
if ( !pStyleSheet) return;
// -------------------------------------------------------------------
- ScViewData* pViewData = GetViewData();
- ScDocument* pDoc = pViewData->GetDocument();
- ScDocShell* pDocSh = pViewData->GetDocShell();
+ ScViewData* pViewData = GetViewData();
+ ScDocument* pDoc = pViewData->GetDocument();
+ ScDocShell* pDocSh = pViewData->GetDocShell();
ScDocShellModificator aModificator( *pDocSh );
@@ -1577,9 +1577,9 @@ void ScViewFunc::UpdateStyleSheetInUse( SfxStyleSheet* pStyleSheet )
if ( !pStyleSheet) return;
// -------------------------------------------------------------------
- ScViewData* pViewData = GetViewData();
- ScDocument* pDoc = pViewData->GetDocument();
- ScDocShell* pDocSh = pViewData->GetDocShell();
+ ScViewData* pViewData = GetViewData();
+ ScDocument* pDoc = pViewData->GetDocument();
+ ScDocShell* pDocSh = pViewData->GetDocShell();
ScDocShellModificator aModificator( *pDocSh );
@@ -1599,7 +1599,7 @@ void ScViewFunc::UpdateStyleSheetInUse( SfxStyleSheet* pStyleSheet )
pHdl->ForgetLastPattern();
}
-// Zellen einfuegen - Undo OK
+// Zellen einfuegen - Undo OK
BOOL ScViewFunc::InsertCells( InsCellCmd eCmd, BOOL bRecord, BOOL bPartOfPaste )
{
@@ -1638,7 +1638,7 @@ BOOL ScViewFunc::InsertCells( InsCellCmd eCmd, BOOL bRecord, BOOL bPartOfPaste )
}
}
-// Zellen loeschen - Undo OK
+// Zellen loeschen - Undo OK
void ScViewFunc::DeleteCells( DelCellCmd eCmd, BOOL bRecord )
{
@@ -1690,7 +1690,7 @@ void ScViewFunc::DeleteCells( DelCellCmd eCmd, BOOL bRecord )
}
}
- // #58106# Cursor direkt hinter den geloeschten Bereich setzen
+ // #58106# Cursor direkt hinter den geloeschten Bereich setzen
SCCOL nCurX = GetViewData()->GetCurX();
SCROW nCurY = GetViewData()->GetCurY();
if ( eCmd==DEL_CELLSLEFT || eCmd==DEL_DELCOLS )
@@ -1732,7 +1732,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord )
nRangeCnt = 1;
}
- // Test ob erlaubt
+ // Test ob erlaubt
SCCOLROW* pOneRange = pRanges;
USHORT nErrorId = 0;
@@ -1799,16 +1799,16 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord )
return;
}
- // ausfuehren
+ // ausfuehren
- WaitObject aWait( GetFrameWin() ); // wichtig wegen TrackFormulas bei UpdateReference
+ WaitObject aWait( GetFrameWin() ); // wichtig wegen TrackFormulas bei UpdateReference
ScDocument* pUndoDoc = NULL;
ScRefUndoData* pUndoData = NULL;
if (bRecord)
{
pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
- pUndoDoc->InitUndo( pDoc, nTab, nTab, !bRows, bRows ); // Zeilenhoehen
+ pUndoDoc->InitUndo( pDoc, nTab, nTab, !bRows, bRows ); // Zeilenhoehen
pOneRange = pRanges;
for (nRangeNo=0; nRangeNo<nRangeCnt; nRangeNo++)
@@ -1823,7 +1823,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord )
IDF_ALL,FALSE,pUndoDoc );
}
- // alle Formeln wegen Referenzen
+ // alle Formeln wegen Referenzen
SCTAB nTabCount = pDoc->GetTableCount();
pUndoDoc->AddUndoTab( 0, nTabCount-1, FALSE, FALSE );
pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,MAXTAB, IDF_FORMULA,FALSE,pUndoDoc );
@@ -1833,7 +1833,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord )
pDoc->BeginDrawUndo();
}
- pOneRange = &pRanges[2*nRangeCnt]; // rueckwaerts
+ pOneRange = &pRanges[2*nRangeCnt]; // rueckwaerts
for (nRangeNo=0; nRangeNo<nRangeCnt; nRangeNo++)
{
SCCOLROW nEnd = *(--pOneRange);
@@ -1876,7 +1876,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord )
CellContentChanged();
- // #58106# Cursor direkt hinter den ersten geloeschten Bereich setzen
+ // #58106# Cursor direkt hinter den ersten geloeschten Bereich setzen
SCCOL nCurX = GetViewData()->GetCurX();
SCROW nCurY = GetViewData()->GetCurY();
if ( bRows )
@@ -1890,7 +1890,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord )
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
}
-// Inhalte loeschen
+// Inhalte loeschen
void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
{
@@ -1928,15 +1928,15 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
aMarkRange.aEnd = aMarkRange.aStart;
if ( pDoc->HasAttrib( aMarkRange, HASATTR_MERGED ) )
{
-// InitOwnBlockMode();
+// InitOwnBlockMode();
aFuncMark.SetMarkArea( aMarkRange );
}
else
bSimple = TRUE;
}
- aFuncMark.SetMarking(FALSE); // for MarkToMulti
- aFuncMark.MarkToSimple(); // before bMulti test below
+ aFuncMark.SetMarking(FALSE); // for MarkToMulti
+ aFuncMark.MarkToSimple(); // before bMulti test below
DBG_ASSERT( aFuncMark.IsMarked() || aFuncMark.IsMultiMarked() || bSimple, "delete what?" );
@@ -1965,16 +1965,16 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
bObjects = FALSE;
}
- USHORT nExtFlags = 0; // extra flags are needed only if attributes are deleted
+ USHORT nExtFlags = 0; // extra flags are needed only if attributes are deleted
if ( nFlags & IDF_ATTRIB )
pDocSh->UpdatePaintExt( nExtFlags, aMarkRange );
- // Reihenfolge:
- // 1) BeginDrawUndo
- // 2) Objekte loeschen (DrawUndo wird gefuellt)
- // 3) Inhalte fuer Undo kopieren
- // 4) Inhalte loeschen
- // 5) Undo-Aktion anlegen
+ // Reihenfolge:
+ // 1) BeginDrawUndo
+ // 2) Objekte loeschen (DrawUndo wird gefuellt)
+ // 3) Inhalte fuer Undo kopieren
+ // 4) Inhalte loeschen
+ // 5) Undo-Aktion anlegen
BOOL bDrawUndo = bObjects || ( nFlags & IDF_NOTE ); // needed for shown notes
if ( bDrawUndo && bRecord )
@@ -1986,7 +1986,7 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
pDoc->DeleteObjectsInSelection( aFuncMark );
else
pDoc->DeleteObjectsInArea( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(),
-/*!*/ aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(),
+/*!*/ aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(),
aFuncMark );
}
@@ -2003,21 +2003,21 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
aCopyRange.aStart.SetTab(0);
aCopyRange.aEnd.SetTab(nTabCount-1);
- // bei "Format/Standard" alle Attribute kopieren, weil CopyToDocument
- // nur mit IDF_HARDATTR zu langsam ist:
+ // bei "Format/Standard" alle Attribute kopieren, weil CopyToDocument
+ // nur mit IDF_HARDATTR zu langsam ist:
USHORT nUndoDocFlags = nFlags;
if (nFlags & IDF_ATTRIB)
nUndoDocFlags |= IDF_ATTRIB;
- if (nFlags & IDF_EDITATTR) // Edit-Engine-Attribute
- nUndoDocFlags |= IDF_STRING; // -> Zellen werden geaendert
+ if (nFlags & IDF_EDITATTR) // Edit-Engine-Attribute
+ nUndoDocFlags |= IDF_STRING; // -> Zellen werden geaendert
if (nFlags & IDF_NOTE)
- nUndoDocFlags |= IDF_CONTENTS; // #68795# copy all cells with their notes
+ nUndoDocFlags |= IDF_CONTENTS; // #68795# copy all cells with their notes
// do not copy note captions to undo document
nUndoDocFlags |= IDF_NOCAPTIONS;
pDoc->CopyToDocument( aCopyRange, nUndoDocFlags, bMulti, pUndoDoc, &aFuncMark );
}
- HideAllCursors(); // falls Zusammenfassung aufgehoben wird
+ HideAllCursors(); // falls Zusammenfassung aufgehoben wird
if (bSimple)
pDoc->DeleteArea( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(),
aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(),
@@ -2065,11 +2065,11 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
if ( nFlags & IDF_CONTENTS )
ForgetFormatArea();
else
- StartFormatArea(); // Attribute loeschen ist auch Attributierung
+ StartFormatArea(); // Attribute loeschen ist auch Attributierung
}
}
-// Spaltenbreiten/Zeilenhoehen (ueber Header) - Undo OK
+// Spaltenbreiten/Zeilenhoehen (ueber Header) - Undo OK
void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges,
ScSizeMode eMode, USHORT nSizeTwips,
@@ -2127,13 +2127,13 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
bFormula = rOpts.GetOption( VOPT_FORMULAS );
}
- ScDocument* pUndoDoc = NULL;
+ ScDocument* pUndoDoc = NULL;
ScOutlineTable* pUndoTab = NULL;
SCCOLROW* pUndoRanges = NULL;
if ( bRecord )
{
- pDoc->BeginDrawUndo(); // Drawing Updates
+ pDoc->BeginDrawUndo(); // Drawing Updates
pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
for (nTab=0; nTab<nTabCount; nTab++)
@@ -2162,7 +2162,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
pUndoRanges = new SCCOLROW[ 2*nRangeCnt ];
memmove( pUndoRanges, pRanges, 2*nRangeCnt*sizeof(SCCOLROW) );
- //! outlines from all tables?
+ //! outlines from all tables?
ScOutlineTable* pTable = pDoc->GetOutlineTable( nCurTab );
if (pTable)
pUndoTab = new ScOutlineTable( *pTable );
@@ -2179,22 +2179,22 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
{
const SCCOLROW* pTabRanges = pRanges;
- pDoc->IncSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln
+ pDoc->IncSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln
pDoc->InitializeNoteCaptions( nTab );
for (SCCOLROW nRangeNo=0; nRangeNo<nRangeCnt; nRangeNo++)
{
SCCOLROW nStartNo = *(pTabRanges++);
SCCOLROW nEndNo = *(pTabRanges++);
- if ( !bWidth ) // Hoehen immer blockweise
+ if ( !bWidth ) // Hoehen immer blockweise
{
if ( eMode==SC_SIZE_OPTIMAL || eMode==SC_SIZE_VISOPT )
{
BOOL bAll = ( eMode==SC_SIZE_OPTIMAL );
if (!bAll)
{
- // fuer alle eingeblendeten CR_MANUALSIZE loeschen,
- // dann SetOptimalHeight mit bShrink = FALSE
+ // fuer alle eingeblendeten CR_MANUALSIZE loeschen,
+ // dann SetOptimalHeight mit bShrink = FALSE
for (SCROW nRow = nStartNo; nRow <= nEndNo; ++nRow)
{
SCROW nLastRow = nRow;
@@ -2228,15 +2228,15 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
if (bAll)
pDoc->ShowRows( nStartNo, nEndNo, nTab, TRUE );
- // Manual-Flag wird bei bAll=TRUE schon in SetOptimalHeight gesetzt
- // (an bei Extra-Height, sonst aus).
+ // Manual-Flag wird bei bAll=TRUE schon in SetOptimalHeight gesetzt
+ // (an bei Extra-Height, sonst aus).
}
else if ( eMode==SC_SIZE_DIRECT )
{
if (nSizeTwips)
{
pDoc->SetRowHeightRange( nStartNo, nEndNo, nTab, nSizeTwips );
- pDoc->SetManualHeight( nStartNo, nEndNo, nTab, TRUE ); // height was set manually
+ pDoc->SetManualHeight( nStartNo, nEndNo, nTab, TRUE ); // height was set manually
}
pDoc->ShowRows( nStartNo, nEndNo, nTab, nSizeTwips != 0 );
}
@@ -2245,7 +2245,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
pDoc->ShowRows( nStartNo, nEndNo, nTab, TRUE );
}
}
- else // Spaltenbreiten
+ else // Spaltenbreiten
{
for (SCCOL nCol=static_cast<SCCOL>(nStartNo); nCol<=static_cast<SCCOL>(nEndNo); nCol++)
{
@@ -2263,7 +2263,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
}
}
- // Outline anpassen
+ // Outline anpassen
if (bWidth)
{
@@ -2277,7 +2277,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
bOutline = TRUE;
}
}
- pDoc->DecSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln
+ pDoc->DecSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln
}
@@ -2312,7 +2312,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
static_cast<SCCOL>(nEnd),MAXROW,nTab,
HASATTR_MERGED | HASATTR_OVERLAPPED ))
nStart = 0;
- if (nStart > 0) // weiter oben anfangen wegen Linien und Cursor
+ if (nStart > 0) // weiter oben anfangen wegen Linien und Cursor
--nStart;
pDocSh->PostPaint( static_cast<SCCOL>(nStart), 0, nTab,
MAXCOL, MAXROW, nTab, PAINT_GRID | PAINT_TOP );
@@ -2361,7 +2361,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR
}
}
-// Spaltenbreiten/Zeilenhoehen (ueber Blockmarken)
+// Spaltenbreiten/Zeilenhoehen (ueber Blockmarken)
void ScViewFunc::SetMarkedWidthOrHeight( BOOL bWidth, ScSizeMode eMode, USHORT nSizeTwips,
BOOL bRecord, BOOL bPaint )
@@ -2396,8 +2396,8 @@ void ScViewFunc::SetMarkedWidthOrHeight( BOOL bWidth, ScSizeMode eMode, USHORT n
void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal )
{
- //! Schrittweiten einstellbar
- // Schrittweite ist auch Minimum
+ //! Schrittweiten einstellbar
+ // Schrittweite ist auch Minimum
USHORT nStepX = STD_COL_WIDTH / 5;
USHORT nStepY = ScGlobal::nStdRowHeight;
@@ -2427,15 +2427,15 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal )
SCCOLROW nRange[2];
if ( eDir == DIR_LEFT || eDir == DIR_RIGHT )
{
- if (bOptimal) // Breite dieser einen Zelle
+ if (bOptimal) // Breite dieser einen Zelle
{
if ( bAnyEdit )
{
- // beim Editieren die aktuelle Breite der Eingabe
+ // beim Editieren die aktuelle Breite der Eingabe
ScInputHandler* pHdl = pScMod->GetInputHdl( GetViewData()->GetViewShell() );
if (pHdl)
{
- long nEdit = pHdl->GetTextSize().Width(); // in 1/100mm
+ long nEdit = pHdl->GetTextSize().Width(); // in 1/100mm
const ScPatternAttr* pPattern = pDoc->GetPattern( nCol, nRow, nTab );
const SvxMarginItem& rMItem =
@@ -2474,7 +2474,7 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal )
nWidth = STD_COL_WIDTH;
}
}
- else // vergroessern / verkleinern
+ else // vergroessern / verkleinern
{
if ( eDir == DIR_RIGHT )
nWidth = sal::static_int_cast<USHORT>( nWidth + nStepX );
@@ -2486,7 +2486,7 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal )
nRange[0] = nRange[1] = nCol;
SetWidthOrHeight( TRUE, 1, nRange, SC_SIZE_DIRECT, nWidth );
- // hier bei Breite auch Hoehe anpassen (nur die eine Zeile)
+ // hier bei Breite auch Hoehe anpassen (nur die eine Zeile)
if (!bAnyEdit)
{
@@ -2516,7 +2516,7 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal )
nHeight = sal::static_int_cast<USHORT>( nHeight - nStepY );
if ( nHeight < nStepY ) nHeight = nStepY;
if ( nHeight > MAX_COL_HEIGHT ) nHeight = MAX_COL_HEIGHT;
- //! MAX_COL_HEIGHT umbenennen in MAX_ROW_HEIGHT in global.hxx !!!!!!
+ //! MAX_COL_HEIGHT umbenennen in MAX_ROW_HEIGHT in global.hxx !!!!!!
}
nRange[0] = nRange[1] = nRow;
SetWidthOrHeight( FALSE, 1, nRange, eMode, nHeight );
@@ -2529,7 +2529,7 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal )
{
ScInputHandler* pHdl = pScMod->GetInputHdl( GetViewData()->GetViewShell() );
if (pHdl)
- pHdl->SetModified(); // damit bei Enter die Hoehe angepasst wird
+ pHdl->SetModified(); // damit bei Enter die Hoehe angepasst wird
}
}
@@ -2547,7 +2547,7 @@ void ScViewFunc::ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect )
ScDocFunc aFunc(*pDocSh);
bool bUndo(pDoc->IsUndoEnabled());
- // modifying several tables is handled here
+ // modifying several tables is handled here
if (bUndo)
{
@@ -2563,7 +2563,7 @@ void ScViewFunc::ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect )
if (bUndo)
pDocSh->GetUndoManager()->LeaveListAction();
- UpdateLayerLocks(); //! broadcast to all views
+ UpdateLayerLocks(); //! broadcast to all views
}
void ScViewFunc::Protect( SCTAB nTab, const String& rPassword )
@@ -2578,7 +2578,7 @@ void ScViewFunc::Protect( SCTAB nTab, const String& rPassword )
aFunc.Protect( nTab, rPassword, FALSE );
else
{
- // modifying several tables is handled here
+ // modifying several tables is handled here
if (bUndo)
{
@@ -2595,7 +2595,7 @@ void ScViewFunc::Protect( SCTAB nTab, const String& rPassword )
pDocSh->GetUndoManager()->LeaveListAction();
}
- UpdateLayerLocks(); //! broadcast to all views
+ UpdateLayerLocks(); //! broadcast to all views
}
BOOL ScViewFunc::Unprotect( SCTAB nTab, const String& rPassword )
@@ -2611,7 +2611,7 @@ BOOL ScViewFunc::Unprotect( SCTAB nTab, const String& rPassword )
bChanged = aFunc.Unprotect( nTab, rPassword, FALSE );
else
{
- // modifying several tables is handled here
+ // modifying several tables is handled here
if (bUndo)
{
@@ -2630,7 +2630,7 @@ BOOL ScViewFunc::Unprotect( SCTAB nTab, const String& rPassword )
}
if (bChanged)
- UpdateLayerLocks(); //! broadcast to all views
+ UpdateLayerLocks(); //! broadcast to all views
return bChanged;
}
@@ -2655,14 +2655,14 @@ void ScViewFunc::SetNumberFormat( short nFormatType, ULONG nAdd )
return;
}
- sal_uInt32 nNumberFormat = 0;
- ScViewData* pViewData = GetViewData();
- ScDocument* pDoc = pViewData->GetDocument();
- SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable();
- LanguageType eLanguage = ScGlobal::eLnge;
- ScPatternAttr aNewAttrs( pDoc->GetPool() );
+ sal_uInt32 nNumberFormat = 0;
+ ScViewData* pViewData = GetViewData();
+ ScDocument* pDoc = pViewData->GetDocument();
+ SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable();
+ LanguageType eLanguage = ScGlobal::eLnge;
+ ScPatternAttr aNewAttrs( pDoc->GetPool() );
- // #67936# always take language from cursor position, even if there is a selection
+ // #67936# always take language from cursor position, even if there is a selection
sal_uInt32 nCurrentNumberFormat;
pDoc->GetNumberFormat( pViewData->GetCurX(),
@@ -2671,13 +2671,13 @@ void ScViewFunc::SetNumberFormat( short nFormatType, ULONG nAdd )
nCurrentNumberFormat );
const SvNumberformat* pEntry = pNumberFormatter->GetEntry( nCurrentNumberFormat );
if (pEntry)
- eLanguage = pEntry->GetLanguage(); // sonst ScGlobal::eLnge behalten
+ eLanguage = pEntry->GetLanguage(); // sonst ScGlobal::eLnge behalten
- nNumberFormat = pNumberFormatter->GetStandardFormat( nFormatType, eLanguage ) + nAdd;
+ nNumberFormat = pNumberFormatter->GetStandardFormat( nFormatType, eLanguage ) + nAdd;
SfxItemSet& rSet = aNewAttrs.GetItemSet();
rSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNumberFormat ) );
- // ATTR_LANGUAGE_FORMAT nicht
+ // ATTR_LANGUAGE_FORMAT nicht
ApplySelectionPattern( aNewAttrs, TRUE );
}
@@ -2691,11 +2691,11 @@ void ScViewFunc::SetNumFmtByStr( const String& rCode )
return;
}
- ScViewData* pViewData = GetViewData();
- ScDocument* pDoc = pViewData->GetDocument();
- SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
+ ScViewData* pViewData = GetViewData();
+ ScDocument* pDoc = pViewData->GetDocument();
+ SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
- // Sprache immer von Cursorposition
+ // Sprache immer von Cursorposition
sal_uInt32 nCurrentNumberFormat;
pDoc->GetNumberFormat( pViewData->GetCurX(), pViewData->GetCurY(),
@@ -2703,21 +2703,21 @@ void ScViewFunc::SetNumFmtByStr( const String& rCode )
const SvNumberformat* pEntry = pFormatter->GetEntry( nCurrentNumberFormat );
LanguageType eLanguage = pEntry ? pEntry->GetLanguage() : ScGlobal::eLnge;
- // Index fuer String bestimmen
+ // Index fuer String bestimmen
BOOL bOk = TRUE;
sal_uInt32 nNumberFormat = pFormatter->GetEntryKey( rCode, eLanguage );
if ( nNumberFormat == NUMBERFORMAT_ENTRY_NOT_FOUND )
{
- // neu eintragen
+ // neu eintragen
- String aFormat = rCode; // wird veraendert
- xub_StrLen nErrPos = 0;
- short nType = 0; //! ???
+ String aFormat = rCode; // wird veraendert
+ xub_StrLen nErrPos = 0;
+ short nType = 0; //! ???
bOk = pFormatter->PutEntry( aFormat, nErrPos, nType, nNumberFormat, eLanguage );
}
- if ( bOk ) // gueltiges Format?
+ if ( bOk ) // gueltiges Format?
{
ScPatternAttr aNewAttrs( pDoc->GetPool() );
SfxItemSet& rSet = aNewAttrs.GetItemSet();
@@ -2726,7 +2726,7 @@ void ScViewFunc::SetNumFmtByStr( const String& rCode )
ApplySelectionPattern( aNewAttrs, TRUE );
}
- //! sonst Fehler zuerueckgeben / Meldung ausgeben ???
+ //! sonst Fehler zuerueckgeben / Meldung ausgeben ???
}
void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement )
@@ -2739,8 +2739,8 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement )
return;
}
- ScDocument* pDoc = GetViewData()->GetDocument();
- SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
+ ScDocument* pDoc = GetViewData()->GetDocument();
+ SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
SCCOL nCol = GetViewData()->GetCurX();
SCROW nRow = GetViewData()->GetCurY();
@@ -2755,7 +2755,7 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement )
return;
}
- // was haben wir denn da?
+ // was haben wir denn da?
sal_uInt32 nNewFormat = nOldFormat;
BOOL bError = FALSE;
@@ -2769,20 +2769,20 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement )
if ( 0 == ( nOldType & (
NUMBERFORMAT_NUMBER | NUMBERFORMAT_CURRENCY | NUMBERFORMAT_PERCENT ) ) )
{
- // Datum, Zeit, Bruch, logisch, Text kann nicht angepasst werden
- //! bei Wisssenschaftlich kann es der Numberformatter auch nicht
+ // Datum, Zeit, Bruch, logisch, Text kann nicht angepasst werden
+ //! bei Wisssenschaftlich kann es der Numberformatter auch nicht
bError = TRUE;
}
- //! Das SvNumberformat hat einen Member bStandard, verraet ihn aber nicht
+ //! Das SvNumberformat hat einen Member bStandard, verraet ihn aber nicht
BOOL bWasStandard = ( nOldFormat == pFormatter->GetStandardIndex( eLanguage ) );
if (bWasStandard)
{
- // bei "Standard" die Nachkommastellen abhaengig vom Zellinhalt
- // 0 bei leer oder Text -> keine Nachkommastellen
+ // bei "Standard" die Nachkommastellen abhaengig vom Zellinhalt
+ // 0 bei leer oder Text -> keine Nachkommastellen
double nVal = pDoc->GetValue( ScAddress( nCol, nRow, nTab ) );
- // Die Wege des Numberformatters sind unergruendlich, darum ausprobieren:
+ // Die Wege des Numberformatters sind unergruendlich, darum ausprobieren:
String aOut;
Color* pCol;
((SvNumberformat*)pOldEntry)->GetOutputString( nVal, aOut, &pCol );
@@ -2790,7 +2790,7 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement )
nPrecision = 0;
// 'E' fuer Exponential ist fest im Numberformatter
if ( aOut.Search('E') != STRING_NOTFOUND )
- bError = TRUE; // Exponential nicht veraendern
+ bError = TRUE; // Exponential nicht veraendern
else
{
String aDecSep( pFormatter->GetFormatDecimalSep( nOldFormat ) );
@@ -2806,16 +2806,16 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement )
if (bIncrement)
{
if (nPrecision<20)
- ++nPrecision; // erhoehen
+ ++nPrecision; // erhoehen
else
- bError = TRUE; // 20 ist Maximum
+ bError = TRUE; // 20 ist Maximum
}
else
{
if (nPrecision)
- --nPrecision; // vermindern
+ --nPrecision; // vermindern
else
- bError = TRUE; // weniger als 0 geht nicht
+ bError = TRUE; // weniger als 0 geht nicht
}
}
@@ -2843,18 +2843,18 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement )
ScPatternAttr aNewAttrs( pDoc->GetPool() );
SfxItemSet& rSet = aNewAttrs.GetItemSet();
rSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNewFormat ) );
- // ATTR_LANGUAGE_FORMAT nicht
+ // ATTR_LANGUAGE_FORMAT nicht
ApplySelectionPattern( aNewAttrs, TRUE );
}
else
- Sound::Beep(); // war nix
+ Sound::Beep(); // war nix
}
void ScViewFunc::ChangeIndent( BOOL bIncrement )
{
ScViewData* pViewData = GetViewData();
- ScDocShell* pDocSh = pViewData->GetDocShell();
- ScMarkData& rMark = pViewData->GetMarkData();
+ ScDocShell* pDocSh = pViewData->GetDocShell();
+ ScMarkData& rMark = pViewData->GetMarkData();
ScMarkData aWorkMark = rMark;
ScViewUtil::UnmarkFiltered( aWorkMark, pDocSh->GetDocument() );
@@ -2878,8 +2878,8 @@ void ScViewFunc::ChangeIndent( BOOL bIncrement )
BOOL ScViewFunc::InsertName( const String& rName, const String& rSymbol,
const String& rType )
{
- // Type = P,R,C,F (und Kombinationen)
- //! Undo...
+ // Type = P,R,C,F (und Kombinationen)
+ //! Undo...
BOOL bOk = FALSE;
ScDocShell* pDocSh = GetViewData()->GetDocShell();
@@ -2903,32 +2903,32 @@ BOOL ScViewFunc::InsertName( const String& rName, const String& rSymbol,
nType |= RT_CRITERIA;
pNewEntry->AddType(nType);
- if ( !pNewEntry->GetErrCode() ) // Text gueltig?
+ if ( !pNewEntry->GetErrCode() ) // Text gueltig?
{
ScDocShellModificator aModificator( *pDocSh );
- pDoc->CompileNameFormula( TRUE ); // CreateFormulaString
+ pDoc->CompileNameFormula( TRUE ); // CreateFormulaString
// Eintrag bereits vorhanden? Dann vorher entfernen (=Aendern)
USHORT nFoundAt;
if ( pList->SearchName( rName, nFoundAt ) )
- { // alten Index uebernehmen
+ { // alten Index uebernehmen
pNewEntry->SetIndex( ((ScRangeData*)pList->At(nFoundAt))->GetIndex() );
pList->AtFree( nFoundAt );
}
if ( pList->Insert( pNewEntry ) )
{
- pNewEntry = NULL; // nicht loeschen
+ pNewEntry = NULL; // nicht loeschen
bOk = TRUE;
}
- pDoc->CompileNameFormula( FALSE ); // CompileFormulaString
+ pDoc->CompileNameFormula( FALSE ); // CompileFormulaString
aModificator.SetDocumentModified();
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREAS_CHANGED ) );
}
- delete pNewEntry; // wenn er nicht eingefuegt wurde
+ delete pNewEntry; // wenn er nicht eingefuegt wurde
return bOk;
}
@@ -2967,7 +2967,7 @@ USHORT ScViewFunc::GetCreateNameFlags()
bOk = FALSE;
if (bOk)
nFlags |= NAME_TOP;
- else // Bottom nur wenn nicht Top
+ else // Bottom nur wenn nicht Top
{
bOk = TRUE;
for (i=nFirstCol; i<=nLastCol && bOk; i++)
@@ -2986,7 +2986,7 @@ USHORT ScViewFunc::GetCreateNameFlags()
bOk = FALSE;
if (bOk)
nFlags |= NAME_LEFT;
- else // Right nur wenn nicht Left
+ else // Right nur wenn nicht Left
{
bOk = TRUE;
for (j=nFirstRow; j<=nLastRow && bOk; j++)
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx
index a6b4e320d3ab..45af1cce46ee 100644
--- a/sc/source/ui/view/viewutil.cxx
+++ b/sc/source/ui/view/viewutil.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,17 +67,17 @@
//==================================================================
-// static
+// static
void ScViewUtil::PutItemScript( SfxItemSet& rShellSet, const SfxItemSet& rCoreSet,
USHORT nWhichId, USHORT nScript )
{
- // take the effective item from rCoreSet according to nScript
- // and put in rShellSet under the (base) nWhichId
+ // take the effective item from rCoreSet according to nScript
+ // and put in rShellSet under the (base) nWhichId
SfxItemPool& rPool = *rShellSet.GetPool();
SvxScriptSetItem aSetItem( rPool.GetSlotId(nWhichId), rPool );
- // use PutExtended with eDefaultAs = SFX_ITEM_SET, so defaults from rCoreSet
- // (document pool) are read and put into rShellSet (MessagePool)
+ // use PutExtended with eDefaultAs = SFX_ITEM_SET, so defaults from rCoreSet
+ // (document pool) are read and put into rShellSet (MessagePool)
aSetItem.GetItemSet().PutExtended( rCoreSet, SFX_ITEM_DONTCARE, SFX_ITEM_SET );
const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScript );
if (pI)
@@ -86,10 +86,10 @@ void ScViewUtil::PutItemScript( SfxItemSet& rShellSet, const SfxItemSet& rCoreSe
rShellSet.InvalidateItem( nWhichId );
}
-// static
+// static
USHORT ScViewUtil::GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos )
{
- // used for thesaurus
+ // used for thesaurus
BYTE nScript = pDoc->GetScriptType( rPos.Col(), rPos.Row(), rPos.Tab() );
USHORT nWhich = ( nScript == SCRIPTTYPE_ASIAN ) ? ATTR_CJK_FONT_LANGUAGE :
@@ -100,7 +100,7 @@ USHORT ScViewUtil::GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos )
if (pLangIt)
{
eLnge = (LanguageType) pLangIt->GetValue();
- if (eLnge == LANGUAGE_DONTKNOW) //! can this happen?
+ if (eLnge == LANGUAGE_DONTKNOW) //! can this happen?
{
LanguageType eLatin, eCjk, eCtl;
pDoc->GetLanguage( eLatin, eCjk, eCtl );
@@ -116,7 +116,7 @@ USHORT ScViewUtil::GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos )
return eLnge;
}
-// static
+// static
sal_Int32 ScViewUtil::GetTransliterationType( USHORT nSlotID )
{
sal_Int32 nType = 0;
@@ -153,7 +153,7 @@ sal_Int32 ScViewUtil::GetTransliterationType( USHORT nSlotID )
return nType;
}
-// static
+// static
BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction,
const ScChangeViewSettings& rSettings,
ScDocument& rDocument )
@@ -171,7 +171,7 @@ BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction,
{
if ( rSettings.IsEveryoneButMe() )
{
- // GetUser() am ChangeTrack ist der aktuelle Benutzer
+ // GetUser() am ChangeTrack ist der aktuelle Benutzer
ScChangeTrack* pTrack = rDocument.GetChangeTrack();
if ( !pTrack || rAction.GetUser() == pTrack->GetUser() )
return FALSE;
@@ -201,7 +201,7 @@ BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction,
const DateTime& rFirst = rSettings.GetTheFirstDateTime();
const DateTime& rLast = rSettings.GetTheLastDateTime();
switch ( rSettings.GetTheDateMode() )
- { // korrespondiert mit ScHighlightChgDlg::OKBtnHdl
+ { // korrespondiert mit ScHighlightChgDlg::OKBtnHdl
case SCDM_DATE_BEFORE:
if ( aDateTime > rFirst )
return FALSE;
@@ -365,8 +365,8 @@ void ScViewUtil::HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, USH
BOOL ScViewUtil::ExecuteCharMap( const SvxFontItem& rOldFont,
SfxViewFrame& rFrame,
- SvxFontItem& rNewFont,
- String& rString )
+ SvxFontItem& rNewFont,
+ String& rString )
{
BOOL bRet = FALSE;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
diff --git a/sc/source/ui/view/waitoff.cxx b/sc/source/ui/view/waitoff.cxx
index 2e3c3e8476af..236eecf8c8bb 100644
--- a/sc/source/ui/view/waitoff.cxx
+++ b/sc/source/ui/view/waitoff.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/uiconfig/scalc/toolbar/arrowshapes.xml b/sc/uiconfig/scalc/toolbar/arrowshapes.xml
index 4a53519494ea..17b654bd2b25 100644
--- a/sc/uiconfig/scalc/toolbar/arrowshapes.xml
+++ b/sc/uiconfig/scalc/toolbar/arrowshapes.xml
@@ -18,17 +18,17 @@
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
<toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sc/uiconfig/scalc/toolbar/basicshapes.xml b/sc/uiconfig/scalc/toolbar/basicshapes.xml
index e65778305788..bd4b96708264 100644
--- a/sc/uiconfig/scalc/toolbar/basicshapes.xml
+++ b/sc/uiconfig/scalc/toolbar/basicshapes.xml
@@ -18,12 +18,12 @@
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
<toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sc/uiconfig/scalc/toolbar/flowchartshapes.xml b/sc/uiconfig/scalc/toolbar/flowchartshapes.xml
index bb1d1099dbd4..556445479b6e 100644
--- a/sc/uiconfig/scalc/toolbar/flowchartshapes.xml
+++ b/sc/uiconfig/scalc/toolbar/flowchartshapes.xml
@@ -18,19 +18,19 @@
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-connector" toolbar:helpid="helpid:11005" />
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-off-page-connector" toolbar:helpid="helpid:11005" />
<toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-card" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-punched-tape" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-summing-junction" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-or" toolbar:helpid="helpid:11005" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-collate" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sort" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-extract" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-merge" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-stored-data" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-delay" toolbar:helpid="helpid:11005" />
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
- <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-sequential-access" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-magnetic-disk" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-direct-access-storage" toolbar:helpid="helpid:11005" />
+ <toolbar:toolbaritem xlink:href=".uno:FlowChartShapes.flowchart-display" toolbar:helpid="helpid:11005" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sc/uiconfig/scalc/toolbar/previewbar.xml b/sc/uiconfig/scalc/toolbar/previewbar.xml
index ef1acbe344ce..3d5bf041bf2e 100644
--- a/sc/uiconfig/scalc/toolbar/previewbar.xml
+++ b/sc/uiconfig/scalc/toolbar/previewbar.xml
@@ -17,6 +17,6 @@
<toolbar:toolbaritem xlink:href=".uno:Margins" toolbar:helpid="helpid:26504" />
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ScalingFactor" toolbar:helpid="helpid:26505" />
- <toolbar:toolbarseparator/>
+ <toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:helpid="helpid:5325" />
</toolbar:toolbar>
diff --git a/sc/uiconfig/scalc/toolbar/symbolshapes.xml b/sc/uiconfig/scalc/toolbar/symbolshapes.xml
index 0fa6aee313db..272a9dbba702 100644
--- a/sc/uiconfig/scalc/toolbar/symbolshapes.xml
+++ b/sc/uiconfig/scalc/toolbar/symbolshapes.xml
@@ -18,7 +18,7 @@
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.brace-pair" toolbar:helpid="helpid:11003" />
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.left-brace" toolbar:helpid="helpid:11003" />
<toolbar:toolbaritem xlink:href=".uno:SymbolShapes.right-brace" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
- <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.quad-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.octagon-bevel" toolbar:helpid="helpid:11003" />
+ <toolbar:toolbaritem xlink:href=".uno:SymbolShapes.diamond-bevel" toolbar:helpid="helpid:11003" />
</toolbar:toolbar> \ No newline at end of file
diff --git a/sc/util/createExtPackage.pl b/sc/util/createExtPackage.pl
index 06ac16673dec..c087df790a4f 100644
--- a/sc/util/createExtPackage.pl
+++ b/sc/util/createExtPackage.pl
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER 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,19 +32,19 @@ my $zipName = shift || die 'must provide a ext name';
my $rdbName = shift || die 'must provide a types library';
my $libName = shift || die 'must provide a component library';
-die "can't access type library $rdbName" unless -f $rdbName;
-die "can't access component library $libName" unless -f $libName;
+die "can't access type library $rdbName" unless -f $rdbName;
+die "can't access component library $libName" unless -f $libName;
# Read the zip
my $zip = Archive::Zip->new();
if ( -f $zipName )
{
- # be stupid and recreate zip every time
+ # be stupid and recreate zip every time
# in another iteration lets try to overwrite it instead
my $result = 0;
$result = unlink($zipName);
- if ( result != 0 )
+ if ( result != 0 )
{
die 'can not delete old extension';
}
diff --git a/sc/util/hidother.src b/sc/util/hidother.src
index ffdb5c329399..7ebb549bb6bf 100644
--- a/sc/util/hidother.src
+++ b/sc/util/hidother.src
@@ -24,67 +24,67 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include "../inc/scfuncs.hrc" // HID_FUNC_XXX
+#include "../inc/scfuncs.hrc" // HID_FUNC_XXX
-// Help-IDs fuer Dokument-Fenster
+// Help-IDs fuer Dokument-Fenster
-hidspecial HID_SC_WIN_GRIDWIN { HelpID = HID_SC_WIN_GRIDWIN; };
-hidspecial HID_SC_WIN_PREVIEW { HelpID = HID_SC_WIN_PREVIEW; };
+hidspecial HID_SC_WIN_GRIDWIN { HelpID = HID_SC_WIN_GRIDWIN; };
+hidspecial HID_SC_WIN_PREVIEW { HelpID = HID_SC_WIN_PREVIEW; };
-// Help-IDs fuer Shells (Helferlein)
+// Help-IDs fuer Shells (Helferlein)
-hidspecial HID_SCSHELL_TABVWSH { HelpID = HID_SCSHELL_TABVWSH; };
-hidspecial HID_SCSHELL_PREVWSH { HelpID = HID_SCSHELL_PREVWSH; };
-hidspecial HID_SCSHELL_AUDIT { HelpID = HID_SCSHELL_AUDIT; };
-hidspecial HID_SCSHELL_PIVOTSH { HelpID = HID_SCSHELL_PIVOTSH; };
-hidspecial HID_SCSHELL_DRAWSH { HelpID = HID_SCSHELL_DRAWSH; };
-hidspecial HID_SCSHELL_DRTXTOB { HelpID = HID_SCSHELL_DRTXTOB; };
+hidspecial HID_SCSHELL_TABVWSH { HelpID = HID_SCSHELL_TABVWSH; };
+hidspecial HID_SCSHELL_PREVWSH { HelpID = HID_SCSHELL_PREVWSH; };
+hidspecial HID_SCSHELL_AUDIT { HelpID = HID_SCSHELL_AUDIT; };
+hidspecial HID_SCSHELL_PIVOTSH { HelpID = HID_SCSHELL_PIVOTSH; };
+hidspecial HID_SCSHELL_DRAWSH { HelpID = HID_SCSHELL_DRAWSH; };
+hidspecial HID_SCSHELL_DRTXTOB { HelpID = HID_SCSHELL_DRTXTOB; };
hidspecial HID_SCSHELL_DRAWFORMSH{ HelpID = HID_SCSHELL_DRAWFORMSH ; };
-hidspecial HID_SCSHELL_CELLSH { HelpID = HID_SCSHELL_CELLSH ; };
-hidspecial HID_SCSHELL_FORMATSH { HelpID = HID_SCSHELL_FORMATSH ; };
-hidspecial HID_SCSHELL_OLEOBEJCTSH { HelpID = HID_SCSHELL_OLEOBEJCTSH ; };
-hidspecial HID_SCSHELL_CHARTSH { HelpID = HID_SCSHELL_CHARTSH ; };
-hidspecial HID_SCSHELL_GRAPHIC { HelpID = HID_SCSHELL_GRAPHIC ; };
-hidspecial HID_SCSHELL_PAGEBREAK { HelpID = HID_SCSHELL_PAGEBREAK ; };
+hidspecial HID_SCSHELL_CELLSH { HelpID = HID_SCSHELL_CELLSH ; };
+hidspecial HID_SCSHELL_FORMATSH { HelpID = HID_SCSHELL_FORMATSH ; };
+hidspecial HID_SCSHELL_OLEOBEJCTSH { HelpID = HID_SCSHELL_OLEOBEJCTSH ; };
+hidspecial HID_SCSHELL_CHARTSH { HelpID = HID_SCSHELL_CHARTSH ; };
+hidspecial HID_SCSHELL_GRAPHIC { HelpID = HID_SCSHELL_GRAPHIC ; };
+hidspecial HID_SCSHELL_PAGEBREAK { HelpID = HID_SCSHELL_PAGEBREAK ; };
-// Help-IDs fuer Standard-Vorlagen
+// Help-IDs fuer Standard-Vorlagen
-hidspecial HID_SC_SHEET_CELL_STD { HelpID = HID_SC_SHEET_CELL_STD; };
-hidspecial HID_SC_SHEET_CELL_ERG { HelpID = HID_SC_SHEET_CELL_ERG; };
-hidspecial HID_SC_SHEET_CELL_ERG1 { HelpID = HID_SC_SHEET_CELL_ERG1; };
-hidspecial HID_SC_SHEET_CELL_UEB { HelpID = HID_SC_SHEET_CELL_UEB; };
-hidspecial HID_SC_SHEET_CELL_UEB1 { HelpID = HID_SC_SHEET_CELL_UEB1; };
-hidspecial HID_SC_SHEET_PAGE_STD { HelpID = HID_SC_SHEET_PAGE_STD; };
-hidspecial HID_SC_SHEET_PAGE_REP { HelpID = HID_SC_SHEET_PAGE_REP; };
+hidspecial HID_SC_SHEET_CELL_STD { HelpID = HID_SC_SHEET_CELL_STD; };
+hidspecial HID_SC_SHEET_CELL_ERG { HelpID = HID_SC_SHEET_CELL_ERG; };
+hidspecial HID_SC_SHEET_CELL_ERG1 { HelpID = HID_SC_SHEET_CELL_ERG1; };
+hidspecial HID_SC_SHEET_CELL_UEB { HelpID = HID_SC_SHEET_CELL_UEB; };
+hidspecial HID_SC_SHEET_CELL_UEB1 { HelpID = HID_SC_SHEET_CELL_UEB1; };
+hidspecial HID_SC_SHEET_PAGE_STD { HelpID = HID_SC_SHEET_PAGE_STD; };
+hidspecial HID_SC_SHEET_PAGE_REP { HelpID = HID_SC_SHEET_PAGE_REP; };
-// Elemente in der Eingabezeile
+// Elemente in der Eingabezeile
-hidspecial HID_INSWIN_POS { HelpID = HID_INSWIN_POS; };
-hidspecial HID_INSWIN_CALC { HelpID = HID_INSWIN_CALC; };
-hidspecial HID_INSWIN_CANCEL { HelpID = HID_INSWIN_CANCEL; };
-hidspecial HID_INSWIN_OK { HelpID = HID_INSWIN_OK; };
-hidspecial HID_INSWIN_SUMME { HelpID = HID_INSWIN_SUMME; };
-hidspecial HID_INSWIN_FUNC { HelpID = HID_INSWIN_FUNC; };
-hidspecial HID_INSWIN_INPUT { HelpID = HID_INSWIN_INPUT; };
+hidspecial HID_INSWIN_POS { HelpID = HID_INSWIN_POS; };
+hidspecial HID_INSWIN_CALC { HelpID = HID_INSWIN_CALC; };
+hidspecial HID_INSWIN_CANCEL { HelpID = HID_INSWIN_CANCEL; };
+hidspecial HID_INSWIN_OK { HelpID = HID_INSWIN_OK; };
+hidspecial HID_INSWIN_SUMME { HelpID = HID_INSWIN_SUMME; };
+hidspecial HID_INSWIN_FUNC { HelpID = HID_INSWIN_FUNC; };
+hidspecial HID_INSWIN_INPUT { HelpID = HID_INSWIN_INPUT; };
-// andere Controls, die vom Code aus die HelpID bekommen
+// andere Controls, die vom Code aus die HelpID bekommen
-hidspecial HID_SC_HEADER_EDIT { HelpID = HID_SC_HEADER_EDIT; };
-hidspecial HID_SC_FOOTER_EDIT { HelpID = HID_SC_FOOTER_EDIT; };
+hidspecial HID_SC_HEADER_EDIT { HelpID = HID_SC_HEADER_EDIT; };
+hidspecial HID_SC_FOOTER_EDIT { HelpID = HID_SC_FOOTER_EDIT; };
-hidspecial HID_SC_SCENWIN_TOP { HelpID = HID_SC_SCENWIN_TOP; };
+hidspecial HID_SC_SCENWIN_TOP { HelpID = HID_SC_SCENWIN_TOP; };
hidspecial HID_SC_SCENWIN_BOTTOM { HelpID = HID_SC_SCENWIN_BOTTOM; };
-hidspecial HID_SC_INPUTWIN { HelpID = HID_SC_INPUTWIN; };
-hidspecial HID_SC_RENAME_NAME { HelpID = HID_SC_RENAME_NAME; };
-hidspecial HID_SC_APPEND_NAME { HelpID = HID_SC_APPEND_NAME; };
-hidspecial HID_SC_AUTOFMT_NAME { HelpID = HID_SC_AUTOFMT_NAME; };
-hidspecial HID_SC_ADD_AUTOFMT { HelpID = HID_SC_ADD_AUTOFMT; };
-hidspecial HID_SC_REN_AFMT_NAME { HelpID = HID_SC_REN_AFMT_NAME; };
-hidspecial HID_SC_REN_AFMT_DLG { HelpID = HID_SC_REN_AFMT_DLG; };
+hidspecial HID_SC_INPUTWIN { HelpID = HID_SC_INPUTWIN; };
+hidspecial HID_SC_RENAME_NAME { HelpID = HID_SC_RENAME_NAME; };
+hidspecial HID_SC_APPEND_NAME { HelpID = HID_SC_APPEND_NAME; };
+hidspecial HID_SC_AUTOFMT_NAME { HelpID = HID_SC_AUTOFMT_NAME; };
+hidspecial HID_SC_ADD_AUTOFMT { HelpID = HID_SC_ADD_AUTOFMT; };
+hidspecial HID_SC_REN_AFMT_NAME { HelpID = HID_SC_REN_AFMT_NAME; };
+hidspecial HID_SC_REN_AFMT_DLG { HelpID = HID_SC_REN_AFMT_DLG; };
hidspecial HID_SC_RENAME_AUTOFMT { HelpID = HID_SC_RENAME_AUTOFMT; };
-hidspecial HID_PASSWD_TABLE { HelpID = HID_PASSWD_TABLE; };
-hidspecial HID_PASSWD_DOC { HelpID = HID_PASSWD_DOC; };
+hidspecial HID_PASSWD_TABLE { HelpID = HID_PASSWD_TABLE; };
+hidspecial HID_PASSWD_DOC { HelpID = HID_PASSWD_DOC; };
hidspecial HID_CHG_PROTECT { HelpID = HID_CHG_PROTECT; };
hidspecial HID_SCDLG_LINKAREAURL { HelpID = HID_SCDLG_LINKAREAURL; };
hidspecial HID_SC_RENAME_OBJECT { HelpID = HID_SC_RENAME_OBJECT; };
@@ -103,7 +103,7 @@ hidspecial HID_SC_DPDATEGROUP_LB { HelpId = HID_SC_DPDATEGROUP_LB; };
hidspecial HID_SC_SOLVEROPTIONS_LB { HelpId = HID_SC_SOLVEROPTIONS_LB; };
-// 2. Seite Funktionsautopilot: nur als Unique-IDs
+// 2. Seite Funktionsautopilot: nur als Unique-IDs
hidspecial HID_SC_FAP_PAGE { HelpID = HID_SC_FAP_PAGE; };
hidspecial HID_SC_FAP_EDIT1 { HelpID = HID_SC_FAP_EDIT1; };
@@ -111,274 +111,274 @@ hidspecial HID_SC_FAP_EDIT2 { HelpID = HID_SC_FAP_EDIT2; };
hidspecial HID_SC_FAP_EDIT3 { HelpID = HID_SC_FAP_EDIT3; };
hidspecial HID_SC_FAP_EDIT4 { HelpID = HID_SC_FAP_EDIT4; };
-// Funktionen fuer Funkionsautopiloten
+// Funktionen fuer Funkionsautopiloten
-hidspecial HID_FUNC_DBANZAHL { HelpID = HID_FUNC_DBANZAHL; };
-hidspecial HID_FUNC_DBANZAHL2 { HelpID = HID_FUNC_DBANZAHL2; };
+hidspecial HID_FUNC_DBANZAHL { HelpID = HID_FUNC_DBANZAHL; };
+hidspecial HID_FUNC_DBANZAHL2 { HelpID = HID_FUNC_DBANZAHL2; };
hidspecial HID_FUNC_DBMITTELWERT { HelpID = HID_FUNC_DBMITTELWERT; };
-hidspecial HID_FUNC_DBAUSZUG { HelpID = HID_FUNC_DBAUSZUG; };
-hidspecial HID_FUNC_DBMAX { HelpID = HID_FUNC_DBMAX; };
-hidspecial HID_FUNC_DBMIN { HelpID = HID_FUNC_DBMIN; };
-hidspecial HID_FUNC_DBPRODUKT { HelpID = HID_FUNC_DBPRODUKT; };
-hidspecial HID_FUNC_DBSTDABW { HelpID = HID_FUNC_DBSTDABW; };
-hidspecial HID_FUNC_DBSTDABWN { HelpID = HID_FUNC_DBSTDABWN; };
-hidspecial HID_FUNC_DBSUMME { HelpID = HID_FUNC_DBSUMME; };
-hidspecial HID_FUNC_DBVARIANZ { HelpID = HID_FUNC_DBVARIANZ; };
-hidspecial HID_FUNC_DBVARIANZEN { HelpID = HID_FUNC_DBVARIANZEN; };
-hidspecial HID_FUNC_DATUM { HelpID = HID_FUNC_DATUM; };
-hidspecial HID_FUNC_DATWERT { HelpID = HID_FUNC_DATWERT; };
-hidspecial HID_FUNC_TAG { HelpID = HID_FUNC_TAG; };
-hidspecial HID_FUNC_TAGE360 { HelpID = HID_FUNC_TAGE360; };
-hidspecial HID_FUNC_STUNDE { HelpID = HID_FUNC_STUNDE; };
-hidspecial HID_FUNC_MINUTE { HelpID = HID_FUNC_MINUTE; };
-hidspecial HID_FUNC_MONAT { HelpID = HID_FUNC_MONAT; };
-hidspecial HID_FUNC_JETZT { HelpID = HID_FUNC_JETZT; };
-hidspecial HID_FUNC_SEKUNDE { HelpID = HID_FUNC_SEKUNDE; };
-hidspecial HID_FUNC_ZEIT { HelpID = HID_FUNC_ZEIT; };
-hidspecial HID_FUNC_ZEITWERT { HelpID = HID_FUNC_ZEITWERT; };
-hidspecial HID_FUNC_HEUTE { HelpID = HID_FUNC_HEUTE; };
-hidspecial HID_FUNC_WOCHENTAG { HelpID = HID_FUNC_WOCHENTAG; };
-hidspecial HID_FUNC_JAHR { HelpID = HID_FUNC_JAHR; };
-hidspecial HID_FUNC_TAGE { HelpID = HID_FUNC_TAGE; };
-hidspecial HID_FUNC_KALENDERWOCHE { HelpID = HID_FUNC_KALENDERWOCHE; };
-hidspecial HID_FUNC_OSTERSONNTAG { HelpID = HID_FUNC_OSTERSONNTAG; };
-hidspecial HID_FUNC_BW { HelpID = HID_FUNC_BW; };
-hidspecial HID_FUNC_ZW { HelpID = HID_FUNC_ZW; };
-hidspecial HID_FUNC_ZZR { HelpID = HID_FUNC_ZZR; };
-hidspecial HID_FUNC_RMZ { HelpID = HID_FUNC_RMZ; };
-hidspecial HID_FUNC_ZINS { HelpID = HID_FUNC_ZINS; };
-hidspecial HID_FUNC_ZINSZ { HelpID = HID_FUNC_ZINSZ; };
-hidspecial HID_FUNC_KAPZ { HelpID = HID_FUNC_KAPZ; };
-hidspecial HID_FUNC_KUMKAPITAL { HelpID = HID_FUNC_KUMKAPITAL; };
-hidspecial HID_FUNC_KUMZINSZ { HelpID = HID_FUNC_KUMZINSZ; };
-hidspecial HID_FUNC_DIA { HelpID = HID_FUNC_DIA; };
-hidspecial HID_FUNC_LIA { HelpID = HID_FUNC_LIA; };
-hidspecial HID_FUNC_GDA { HelpID = HID_FUNC_GDA; };
-hidspecial HID_FUNC_GDA2 { HelpID = HID_FUNC_GDA2; };
-hidspecial HID_FUNC_VDB { HelpID = HID_FUNC_VDB; };
-hidspecial HID_FUNC_EFFEKTIV { HelpID = HID_FUNC_EFFEKTIV; };
-hidspecial HID_FUNC_NOMINAL { HelpID = HID_FUNC_NOMINAL; };
-hidspecial HID_FUNC_NBW { HelpID = HID_FUNC_NBW; };
-hidspecial HID_FUNC_IKV { HelpID = HID_FUNC_IKV; };
-hidspecial HID_FUNC_QIKV { HelpID = HID_FUNC_QIKV; };
-hidspecial HID_FUNC_ISPMT { HelpID = HID_FUNC_ISPMT; };
-hidspecial HID_FUNC_LAUFZEIT { HelpID = HID_FUNC_LAUFZEIT; };
-hidspecial HID_FUNC_ZGZ { HelpID = HID_FUNC_ZGZ; };
-hidspecial HID_FUNC_ISTBEZUG { HelpID = HID_FUNC_ISTBEZUG; };
-hidspecial HID_FUNC_ISTFEHL { HelpID = HID_FUNC_ISTFEHL; };
-hidspecial HID_FUNC_ISTFEHLER { HelpID = HID_FUNC_ISTFEHLER; };
-hidspecial HID_FUNC_ISTLEER { HelpID = HID_FUNC_ISTLEER; };
-hidspecial HID_FUNC_ISTLOG { HelpID = HID_FUNC_ISTLOG; };
-hidspecial HID_FUNC_ISTNV { HelpID = HID_FUNC_ISTNV; };
-hidspecial HID_FUNC_ISTKTEXT { HelpID = HID_FUNC_ISTKTEXT; };
-hidspecial HID_FUNC_ISTTEXT { HelpID = HID_FUNC_ISTTEXT; };
-hidspecial HID_FUNC_ISTZAHL { HelpID = HID_FUNC_ISTZAHL; };
-hidspecial HID_FUNC_ISTFORMEL { HelpID = HID_FUNC_ISTFORMEL; };
-hidspecial HID_FUNC_FORMEL { HelpID = HID_FUNC_FORMEL; };
-hidspecial HID_FUNC_N { HelpID = HID_FUNC_N; };
-hidspecial HID_FUNC_NV { HelpID = HID_FUNC_NV; };
-hidspecial HID_FUNC_TYP { HelpID = HID_FUNC_TYP; };
-hidspecial HID_FUNC_ZELLE { HelpID = HID_FUNC_ZELLE; };
-hidspecial HID_FUNC_AKTUELL { HelpID = HID_FUNC_AKTUELL; };
-hidspecial HID_FUNC_FALSCH { HelpID = HID_FUNC_FALSCH; };
-hidspecial HID_FUNC_NICHT { HelpID = HID_FUNC_NICHT; };
-hidspecial HID_FUNC_WAHR { HelpID = HID_FUNC_WAHR; };
-hidspecial HID_FUNC_WENN { HelpID = HID_FUNC_WENN; };
-hidspecial HID_FUNC_ODER { HelpID = HID_FUNC_ODER; };
-hidspecial HID_FUNC_UND { HelpID = HID_FUNC_UND; };
-hidspecial HID_FUNC_ABS { HelpID = HID_FUNC_ABS; };
-hidspecial HID_FUNC_POTENZ { HelpID = HID_FUNC_POTENZ; };
-hidspecial HID_FUNC_ANZAHLLEEREZELLEN { HelpID = HID_FUNC_ANZAHLLEEREZELLEN; };
-hidspecial HID_FUNC_PI { HelpID = HID_FUNC_PI; };
-hidspecial HID_FUNC_SUMME { HelpID = HID_FUNC_SUMME; };
-hidspecial HID_FUNC_QUADRATESUMME { HelpID = HID_FUNC_QUADRATESUMME; };
-hidspecial HID_FUNC_PRODUKT { HelpID = HID_FUNC_PRODUKT; };
-hidspecial HID_FUNC_SUMMEWENN { HelpID = HID_FUNC_SUMMEWENN; };
-hidspecial HID_FUNC_ZAEHLENWENN { HelpID = HID_FUNC_ZAEHLENWENN; };
-hidspecial HID_FUNC_WURZEL { HelpID = HID_FUNC_WURZEL; };
-hidspecial HID_FUNC_ZUFALLSZAHL { HelpID = HID_FUNC_ZUFALLSZAHL; };
-hidspecial HID_FUNC_ISTGERADE { HelpID = HID_FUNC_ISTGERADE; };
-hidspecial HID_FUNC_ISTUNGERADE { HelpID = HID_FUNC_ISTUNGERADE; };
-hidspecial HID_FUNC_KOMBINATIONEN { HelpID = HID_FUNC_KOMBINATIONEN; };
-hidspecial HID_FUNC_KOMBINATIONEN2 { HelpID = HID_FUNC_KOMBINATIONEN2; };
-hidspecial HID_FUNC_ARCCOS { HelpID = HID_FUNC_ARCCOS; };
-hidspecial HID_FUNC_ARCSIN { HelpID = HID_FUNC_ARCSIN; };
-hidspecial HID_FUNC_ARCOSHYP { HelpID = HID_FUNC_ARCOSHYP; };
-hidspecial HID_FUNC_ARSINHYP { HelpID = HID_FUNC_ARSINHYP; };
-hidspecial HID_FUNC_ARCCOT { HelpID = HID_FUNC_ARCCOT; };
-hidspecial HID_FUNC_ARCTAN { HelpID = HID_FUNC_ARCTAN; };
-hidspecial HID_FUNC_ARCOTHYP { HelpID = HID_FUNC_ARCOTHYP; };
-hidspecial HID_FUNC_ARTANHYP { HelpID = HID_FUNC_ARTANHYP; };
-hidspecial HID_FUNC_COS { HelpID = HID_FUNC_COS; };
-hidspecial HID_FUNC_SIN { HelpID = HID_FUNC_SIN; };
-hidspecial HID_FUNC_COT { HelpID = HID_FUNC_COT; };
-hidspecial HID_FUNC_TAN { HelpID = HID_FUNC_TAN; };
-hidspecial HID_FUNC_COSHYP { HelpID = HID_FUNC_COSHYP; };
-hidspecial HID_FUNC_SINHYP { HelpID = HID_FUNC_SINHYP; };
-hidspecial HID_FUNC_COTHYP { HelpID = HID_FUNC_COTHYP; };
-hidspecial HID_FUNC_TANHYP { HelpID = HID_FUNC_TANHYP; };
-hidspecial HID_FUNC_ARCTAN2 { HelpID = HID_FUNC_ARCTAN2; };
-hidspecial HID_FUNC_DEG { HelpID = HID_FUNC_DEG; };
-hidspecial HID_FUNC_RAD { HelpID = HID_FUNC_RAD; };
-hidspecial HID_FUNC_EXP { HelpID = HID_FUNC_EXP; };
-hidspecial HID_FUNC_LOG { HelpID = HID_FUNC_LOG; };
-hidspecial HID_FUNC_LN { HelpID = HID_FUNC_LN; };
-hidspecial HID_FUNC_LOG10 { HelpID = HID_FUNC_LOG10; };
-hidspecial HID_FUNC_FAKULTAET { HelpID = HID_FUNC_FAKULTAET; };
-hidspecial HID_FUNC_REST { HelpID = HID_FUNC_REST; };
-hidspecial HID_FUNC_VORZEICHEN { HelpID = HID_FUNC_VORZEICHEN; };
-hidspecial HID_FUNC_TEILERGEBNIS { HelpID = HID_FUNC_TEILERGEBNIS; };
-hidspecial HID_FUNC_GANZZAHL { HelpID = HID_FUNC_GANZZAHL; };
-hidspecial HID_FUNC_KUERZEN { HelpID = HID_FUNC_KUERZEN; };
-hidspecial HID_FUNC_RUNDEN { HelpID = HID_FUNC_RUNDEN; };
-hidspecial HID_FUNC_AUFRUNDEN { HelpID = HID_FUNC_AUFRUNDEN; };
-hidspecial HID_FUNC_ABRUNDEN { HelpID = HID_FUNC_ABRUNDEN; };
-hidspecial HID_FUNC_GERADE { HelpID = HID_FUNC_GERADE; };
-hidspecial HID_FUNC_UNGERADE { HelpID = HID_FUNC_UNGERADE; };
-hidspecial HID_FUNC_OBERGRENZE { HelpID = HID_FUNC_OBERGRENZE; };
-hidspecial HID_FUNC_UNTERGRENZE { HelpID = HID_FUNC_UNTERGRENZE; };
-hidspecial HID_FUNC_GGT { HelpID = HID_FUNC_GGT; };
-hidspecial HID_FUNC_KGV { HelpID = HID_FUNC_KGV; };
-hidspecial HID_FUNC_MTRANS { HelpID = HID_FUNC_MTRANS; };
-hidspecial HID_FUNC_MMULT { HelpID = HID_FUNC_MMULT; };
-hidspecial HID_FUNC_MDET { HelpID = HID_FUNC_MDET; };
-hidspecial HID_FUNC_MINV { HelpID = HID_FUNC_MINV; };
-hidspecial HID_FUNC_EINHEITSMATRIX { HelpID = HID_FUNC_EINHEITSMATRIX; };
-hidspecial HID_FUNC_SUMMENPRODUKT { HelpID = HID_FUNC_SUMMENPRODUKT; };
-hidspecial HID_FUNC_SUMMEX2MY2 { HelpID = HID_FUNC_SUMMEX2MY2; };
-hidspecial HID_FUNC_SUMMEX2PY2 { HelpID = HID_FUNC_SUMMEX2PY2; };
-hidspecial HID_FUNC_SUMMEXMY2 { HelpID = HID_FUNC_SUMMEXMY2; };
-hidspecial HID_FUNC_HAEUFIGKEIT { HelpID = HID_FUNC_HAEUFIGKEIT; };
-hidspecial HID_FUNC_RGP { HelpID = HID_FUNC_RGP; };
-hidspecial HID_FUNC_RKP { HelpID = HID_FUNC_RKP; };
-hidspecial HID_FUNC_TREND { HelpID = HID_FUNC_TREND; };
-hidspecial HID_FUNC_VARIATION { HelpID = HID_FUNC_VARIATION; };
-hidspecial HID_FUNC_ANZAHL { HelpID = HID_FUNC_ANZAHL; };
-hidspecial HID_FUNC_ANZAHL2 { HelpID = HID_FUNC_ANZAHL2; };
-hidspecial HID_FUNC_MAX { HelpID = HID_FUNC_MAX; };
-hidspecial HID_FUNC_MIN { HelpID = HID_FUNC_MIN; };
-hidspecial HID_FUNC_VARIANZ { HelpID = HID_FUNC_VARIANZ; };
-hidspecial HID_FUNC_VARIANZEN { HelpID = HID_FUNC_VARIANZEN; };
-hidspecial HID_FUNC_STABW { HelpID = HID_FUNC_STABW; };
-hidspecial HID_FUNC_STABWN { HelpID = HID_FUNC_STABWN; };
-hidspecial HID_FUNC_MITTELWERT { HelpID = HID_FUNC_MITTELWERT; };
-hidspecial HID_FUNC_SUMQUADABW { HelpID = HID_FUNC_SUMQUADABW; };
-hidspecial HID_FUNC_MITTELABW { HelpID = HID_FUNC_MITTELABW; };
-hidspecial HID_FUNC_SCHIEFE { HelpID = HID_FUNC_SCHIEFE; };
-hidspecial HID_FUNC_KURT { HelpID = HID_FUNC_KURT; };
-hidspecial HID_FUNC_GEOMITTEL { HelpID = HID_FUNC_GEOMITTEL; };
-hidspecial HID_FUNC_HARMITTEL { HelpID = HID_FUNC_HARMITTEL; };
-hidspecial HID_FUNC_MODALWERT { HelpID = HID_FUNC_MODALWERT; };
-hidspecial HID_FUNC_MEDIAN { HelpID = HID_FUNC_MEDIAN; };
-hidspecial HID_FUNC_QUANTIL { HelpID = HID_FUNC_QUANTIL; };
-hidspecial HID_FUNC_QUARTILE { HelpID = HID_FUNC_QUARTILE; };
-hidspecial HID_FUNC_KGROESSTE { HelpID = HID_FUNC_KGROESSTE; };
-hidspecial HID_FUNC_KKLEINSTE { HelpID = HID_FUNC_KKLEINSTE; };
-hidspecial HID_FUNC_QUANTILSRANG { HelpID = HID_FUNC_QUANTILSRANG; };
-hidspecial HID_FUNC_RANG { HelpID = HID_FUNC_RANG; };
-hidspecial HID_FUNC_GESTUTZTMITTEL { HelpID = HID_FUNC_GESTUTZTMITTEL; };
-hidspecial HID_FUNC_WAHRSCHBEREICH { HelpID = HID_FUNC_WAHRSCHBEREICH; };
-hidspecial HID_FUNC_B { HelpID = HID_FUNC_B; };
-hidspecial HID_FUNC_PHI { HelpID = HID_FUNC_PHI; };
-hidspecial HID_FUNC_GAUSS { HelpID = HID_FUNC_GAUSS; };
-hidspecial HID_FUNC_FISHER { HelpID = HID_FUNC_FISHER; };
-hidspecial HID_FUNC_FISHERINV { HelpID = HID_FUNC_FISHERINV; };
-hidspecial HID_FUNC_BINOMVERT { HelpID = HID_FUNC_BINOMVERT; };
-hidspecial HID_FUNC_NEGBINOMVERT { HelpID = HID_FUNC_NEGBINOMVERT; };
-hidspecial HID_FUNC_KRITBINOM { HelpID = HID_FUNC_KRITBINOM; };
-hidspecial HID_FUNC_POISSON { HelpID = HID_FUNC_POISSON; };
-hidspecial HID_FUNC_NORMVERT { HelpID = HID_FUNC_NORMVERT; };
-hidspecial HID_FUNC_NORMINV { HelpID = HID_FUNC_NORMINV; };
-hidspecial HID_FUNC_STANDNORMVERT { HelpID = HID_FUNC_STANDNORMVERT; };
-hidspecial HID_FUNC_STANDNORMINV { HelpID = HID_FUNC_STANDNORMINV; };
-hidspecial HID_FUNC_LOGNORMVERT { HelpID = HID_FUNC_LOGNORMVERT; };
-hidspecial HID_FUNC_LOGINV { HelpID = HID_FUNC_LOGINV; };
-hidspecial HID_FUNC_EXPONVERT { HelpID = HID_FUNC_EXPONVERT; };
-hidspecial HID_FUNC_GAMMAVERT { HelpID = HID_FUNC_GAMMAVERT; };
-hidspecial HID_FUNC_GAMMAINV { HelpID = HID_FUNC_GAMMAINV; };
-hidspecial HID_FUNC_GAMMALN { HelpID = HID_FUNC_GAMMALN; };
-hidspecial HID_FUNC_BETAVERT { HelpID = HID_FUNC_BETAVERT; };
-hidspecial HID_FUNC_BETAINV { HelpID = HID_FUNC_BETAINV; };
-hidspecial HID_FUNC_WEIBULL { HelpID = HID_FUNC_WEIBULL; };
-hidspecial HID_FUNC_HYPGEOMVERT { HelpID = HID_FUNC_HYPGEOMVERT; };
-hidspecial HID_FUNC_TVERT { HelpID = HID_FUNC_TVERT; };
-hidspecial HID_FUNC_TINV { HelpID = HID_FUNC_TINV; };
-hidspecial HID_FUNC_FVERT { HelpID = HID_FUNC_FVERT; };
-hidspecial HID_FUNC_FINV { HelpID = HID_FUNC_FINV; };
-hidspecial HID_FUNC_CHIVERT { HelpID = HID_FUNC_CHIVERT; };
-hidspecial HID_FUNC_CHIINV { HelpID = HID_FUNC_CHIINV; };
-hidspecial HID_FUNC_STANDARDISIERUNG { HelpID = HID_FUNC_STANDARDISIERUNG; };
-hidspecial HID_FUNC_VARIATIONEN { HelpID = HID_FUNC_VARIATIONEN; };
-hidspecial HID_FUNC_VARIATIONEN2 { HelpID = HID_FUNC_VARIATIONEN2; };
-hidspecial HID_FUNC_KONFIDENZ { HelpID = HID_FUNC_KONFIDENZ; };
-hidspecial HID_FUNC_GTEST { HelpID = HID_FUNC_GTEST; };
-hidspecial HID_FUNC_CHITEST { HelpID = HID_FUNC_CHITEST; };
-hidspecial HID_FUNC_FTEST { HelpID = HID_FUNC_FTEST; };
-hidspecial HID_FUNC_TTEST { HelpID = HID_FUNC_TTEST; };
-hidspecial HID_FUNC_BESTIMMTHEITSMASS { HelpID = HID_FUNC_BESTIMMTHEITSMASS; };
-hidspecial HID_FUNC_ACHSENABSCHNITT { HelpID = HID_FUNC_ACHSENABSCHNITT; };
-hidspecial HID_FUNC_STEIGUNG { HelpID = HID_FUNC_STEIGUNG; };
-hidspecial HID_FUNC_STFEHLERYX { HelpID = HID_FUNC_STFEHLERYX; };
-hidspecial HID_FUNC_PEARSON { HelpID = HID_FUNC_PEARSON; };
-hidspecial HID_FUNC_KORREL { HelpID = HID_FUNC_KORREL; };
-hidspecial HID_FUNC_KOVAR { HelpID = HID_FUNC_KOVAR; };
-hidspecial HID_FUNC_SCHAETZER { HelpID = HID_FUNC_SCHAETZER; };
-hidspecial HID_FUNC_MINA { HelpID = HID_FUNC_MINA; };
-hidspecial HID_FUNC_MAXA { HelpID = HID_FUNC_MAXA; };
-hidspecial HID_FUNC_MITTELWERTA { HelpID = HID_FUNC_MITTELWERTA; };
-hidspecial HID_FUNC_STABWA { HelpID = HID_FUNC_STABWA; };
-hidspecial HID_FUNC_STABWNA { HelpID = HID_FUNC_STABWNA; };
-hidspecial HID_FUNC_VARIANZA { HelpID = HID_FUNC_VARIANZA; };
-hidspecial HID_FUNC_VARIANZENA { HelpID = HID_FUNC_VARIANZENA; };
-hidspecial HID_FUNC_ADRESSE { HelpID = HID_FUNC_ADRESSE; };
-hidspecial HID_FUNC_BEREICHE { HelpID = HID_FUNC_BEREICHE; };
-hidspecial HID_FUNC_WAHL { HelpID = HID_FUNC_WAHL; };
-hidspecial HID_FUNC_SPALTE { HelpID = HID_FUNC_SPALTE; };
-hidspecial HID_FUNC_ZEILE { HelpID = HID_FUNC_ZEILE; };
-hidspecial HID_FUNC_SPALTEN { HelpID = HID_FUNC_SPALTEN; };
-hidspecial HID_FUNC_ZEILEN { HelpID = HID_FUNC_ZEILEN; };
-hidspecial HID_FUNC_WVERWEIS { HelpID = HID_FUNC_WVERWEIS; };
-hidspecial HID_FUNC_SVERWEIS { HelpID = HID_FUNC_SVERWEIS; };
-hidspecial HID_FUNC_INDEX { HelpID = HID_FUNC_INDEX; };
-hidspecial HID_FUNC_INDIREKT { HelpID = HID_FUNC_INDIREKT; };
-hidspecial HID_FUNC_VERWEIS { HelpID = HID_FUNC_VERWEIS; };
-hidspecial HID_FUNC_VERGLEICH { HelpID = HID_FUNC_VERGLEICH; };
-hidspecial HID_FUNC_VERSCHIEBUNG { HelpID = HID_FUNC_VERSCHIEBUNG; };
-hidspecial HID_FUNC_FEHLERTYP { HelpID = HID_FUNC_FEHLERTYP; };
-hidspecial HID_FUNC_VORLAGE { HelpID = HID_FUNC_VORLAGE; };
-hidspecial HID_FUNC_DDE { HelpID = HID_FUNC_DDE; };
-hidspecial HID_FUNC_TABELLE { HelpID = HID_FUNC_TABELLE; };
-hidspecial HID_FUNC_TABELLEN { HelpID = HID_FUNC_TABELLEN; };
-hidspecial HID_FUNC_HYPERLINK { HelpID = HID_FUNC_HYPERLINK; };
+hidspecial HID_FUNC_DBAUSZUG { HelpID = HID_FUNC_DBAUSZUG; };
+hidspecial HID_FUNC_DBMAX { HelpID = HID_FUNC_DBMAX; };
+hidspecial HID_FUNC_DBMIN { HelpID = HID_FUNC_DBMIN; };
+hidspecial HID_FUNC_DBPRODUKT { HelpID = HID_FUNC_DBPRODUKT; };
+hidspecial HID_FUNC_DBSTDABW { HelpID = HID_FUNC_DBSTDABW; };
+hidspecial HID_FUNC_DBSTDABWN { HelpID = HID_FUNC_DBSTDABWN; };
+hidspecial HID_FUNC_DBSUMME { HelpID = HID_FUNC_DBSUMME; };
+hidspecial HID_FUNC_DBVARIANZ { HelpID = HID_FUNC_DBVARIANZ; };
+hidspecial HID_FUNC_DBVARIANZEN { HelpID = HID_FUNC_DBVARIANZEN; };
+hidspecial HID_FUNC_DATUM { HelpID = HID_FUNC_DATUM; };
+hidspecial HID_FUNC_DATWERT { HelpID = HID_FUNC_DATWERT; };
+hidspecial HID_FUNC_TAG { HelpID = HID_FUNC_TAG; };
+hidspecial HID_FUNC_TAGE360 { HelpID = HID_FUNC_TAGE360; };
+hidspecial HID_FUNC_STUNDE { HelpID = HID_FUNC_STUNDE; };
+hidspecial HID_FUNC_MINUTE { HelpID = HID_FUNC_MINUTE; };
+hidspecial HID_FUNC_MONAT { HelpID = HID_FUNC_MONAT; };
+hidspecial HID_FUNC_JETZT { HelpID = HID_FUNC_JETZT; };
+hidspecial HID_FUNC_SEKUNDE { HelpID = HID_FUNC_SEKUNDE; };
+hidspecial HID_FUNC_ZEIT { HelpID = HID_FUNC_ZEIT; };
+hidspecial HID_FUNC_ZEITWERT { HelpID = HID_FUNC_ZEITWERT; };
+hidspecial HID_FUNC_HEUTE { HelpID = HID_FUNC_HEUTE; };
+hidspecial HID_FUNC_WOCHENTAG { HelpID = HID_FUNC_WOCHENTAG; };
+hidspecial HID_FUNC_JAHR { HelpID = HID_FUNC_JAHR; };
+hidspecial HID_FUNC_TAGE { HelpID = HID_FUNC_TAGE; };
+hidspecial HID_FUNC_KALENDERWOCHE { HelpID = HID_FUNC_KALENDERWOCHE; };
+hidspecial HID_FUNC_OSTERSONNTAG { HelpID = HID_FUNC_OSTERSONNTAG; };
+hidspecial HID_FUNC_BW { HelpID = HID_FUNC_BW; };
+hidspecial HID_FUNC_ZW { HelpID = HID_FUNC_ZW; };
+hidspecial HID_FUNC_ZZR { HelpID = HID_FUNC_ZZR; };
+hidspecial HID_FUNC_RMZ { HelpID = HID_FUNC_RMZ; };
+hidspecial HID_FUNC_ZINS { HelpID = HID_FUNC_ZINS; };
+hidspecial HID_FUNC_ZINSZ { HelpID = HID_FUNC_ZINSZ; };
+hidspecial HID_FUNC_KAPZ { HelpID = HID_FUNC_KAPZ; };
+hidspecial HID_FUNC_KUMKAPITAL { HelpID = HID_FUNC_KUMKAPITAL; };
+hidspecial HID_FUNC_KUMZINSZ { HelpID = HID_FUNC_KUMZINSZ; };
+hidspecial HID_FUNC_DIA { HelpID = HID_FUNC_DIA; };
+hidspecial HID_FUNC_LIA { HelpID = HID_FUNC_LIA; };
+hidspecial HID_FUNC_GDA { HelpID = HID_FUNC_GDA; };
+hidspecial HID_FUNC_GDA2 { HelpID = HID_FUNC_GDA2; };
+hidspecial HID_FUNC_VDB { HelpID = HID_FUNC_VDB; };
+hidspecial HID_FUNC_EFFEKTIV { HelpID = HID_FUNC_EFFEKTIV; };
+hidspecial HID_FUNC_NOMINAL { HelpID = HID_FUNC_NOMINAL; };
+hidspecial HID_FUNC_NBW { HelpID = HID_FUNC_NBW; };
+hidspecial HID_FUNC_IKV { HelpID = HID_FUNC_IKV; };
+hidspecial HID_FUNC_QIKV { HelpID = HID_FUNC_QIKV; };
+hidspecial HID_FUNC_ISPMT { HelpID = HID_FUNC_ISPMT; };
+hidspecial HID_FUNC_LAUFZEIT { HelpID = HID_FUNC_LAUFZEIT; };
+hidspecial HID_FUNC_ZGZ { HelpID = HID_FUNC_ZGZ; };
+hidspecial HID_FUNC_ISTBEZUG { HelpID = HID_FUNC_ISTBEZUG; };
+hidspecial HID_FUNC_ISTFEHL { HelpID = HID_FUNC_ISTFEHL; };
+hidspecial HID_FUNC_ISTFEHLER { HelpID = HID_FUNC_ISTFEHLER; };
+hidspecial HID_FUNC_ISTLEER { HelpID = HID_FUNC_ISTLEER; };
+hidspecial HID_FUNC_ISTLOG { HelpID = HID_FUNC_ISTLOG; };
+hidspecial HID_FUNC_ISTNV { HelpID = HID_FUNC_ISTNV; };
+hidspecial HID_FUNC_ISTKTEXT { HelpID = HID_FUNC_ISTKTEXT; };
+hidspecial HID_FUNC_ISTTEXT { HelpID = HID_FUNC_ISTTEXT; };
+hidspecial HID_FUNC_ISTZAHL { HelpID = HID_FUNC_ISTZAHL; };
+hidspecial HID_FUNC_ISTFORMEL { HelpID = HID_FUNC_ISTFORMEL; };
+hidspecial HID_FUNC_FORMEL { HelpID = HID_FUNC_FORMEL; };
+hidspecial HID_FUNC_N { HelpID = HID_FUNC_N; };
+hidspecial HID_FUNC_NV { HelpID = HID_FUNC_NV; };
+hidspecial HID_FUNC_TYP { HelpID = HID_FUNC_TYP; };
+hidspecial HID_FUNC_ZELLE { HelpID = HID_FUNC_ZELLE; };
+hidspecial HID_FUNC_AKTUELL { HelpID = HID_FUNC_AKTUELL; };
+hidspecial HID_FUNC_FALSCH { HelpID = HID_FUNC_FALSCH; };
+hidspecial HID_FUNC_NICHT { HelpID = HID_FUNC_NICHT; };
+hidspecial HID_FUNC_WAHR { HelpID = HID_FUNC_WAHR; };
+hidspecial HID_FUNC_WENN { HelpID = HID_FUNC_WENN; };
+hidspecial HID_FUNC_ODER { HelpID = HID_FUNC_ODER; };
+hidspecial HID_FUNC_UND { HelpID = HID_FUNC_UND; };
+hidspecial HID_FUNC_ABS { HelpID = HID_FUNC_ABS; };
+hidspecial HID_FUNC_POTENZ { HelpID = HID_FUNC_POTENZ; };
+hidspecial HID_FUNC_ANZAHLLEEREZELLEN { HelpID = HID_FUNC_ANZAHLLEEREZELLEN; };
+hidspecial HID_FUNC_PI { HelpID = HID_FUNC_PI; };
+hidspecial HID_FUNC_SUMME { HelpID = HID_FUNC_SUMME; };
+hidspecial HID_FUNC_QUADRATESUMME { HelpID = HID_FUNC_QUADRATESUMME; };
+hidspecial HID_FUNC_PRODUKT { HelpID = HID_FUNC_PRODUKT; };
+hidspecial HID_FUNC_SUMMEWENN { HelpID = HID_FUNC_SUMMEWENN; };
+hidspecial HID_FUNC_ZAEHLENWENN { HelpID = HID_FUNC_ZAEHLENWENN; };
+hidspecial HID_FUNC_WURZEL { HelpID = HID_FUNC_WURZEL; };
+hidspecial HID_FUNC_ZUFALLSZAHL { HelpID = HID_FUNC_ZUFALLSZAHL; };
+hidspecial HID_FUNC_ISTGERADE { HelpID = HID_FUNC_ISTGERADE; };
+hidspecial HID_FUNC_ISTUNGERADE { HelpID = HID_FUNC_ISTUNGERADE; };
+hidspecial HID_FUNC_KOMBINATIONEN { HelpID = HID_FUNC_KOMBINATIONEN; };
+hidspecial HID_FUNC_KOMBINATIONEN2 { HelpID = HID_FUNC_KOMBINATIONEN2; };
+hidspecial HID_FUNC_ARCCOS { HelpID = HID_FUNC_ARCCOS; };
+hidspecial HID_FUNC_ARCSIN { HelpID = HID_FUNC_ARCSIN; };
+hidspecial HID_FUNC_ARCOSHYP { HelpID = HID_FUNC_ARCOSHYP; };
+hidspecial HID_FUNC_ARSINHYP { HelpID = HID_FUNC_ARSINHYP; };
+hidspecial HID_FUNC_ARCCOT { HelpID = HID_FUNC_ARCCOT; };
+hidspecial HID_FUNC_ARCTAN { HelpID = HID_FUNC_ARCTAN; };
+hidspecial HID_FUNC_ARCOTHYP { HelpID = HID_FUNC_ARCOTHYP; };
+hidspecial HID_FUNC_ARTANHYP { HelpID = HID_FUNC_ARTANHYP; };
+hidspecial HID_FUNC_COS { HelpID = HID_FUNC_COS; };
+hidspecial HID_FUNC_SIN { HelpID = HID_FUNC_SIN; };
+hidspecial HID_FUNC_COT { HelpID = HID_FUNC_COT; };
+hidspecial HID_FUNC_TAN { HelpID = HID_FUNC_TAN; };
+hidspecial HID_FUNC_COSHYP { HelpID = HID_FUNC_COSHYP; };
+hidspecial HID_FUNC_SINHYP { HelpID = HID_FUNC_SINHYP; };
+hidspecial HID_FUNC_COTHYP { HelpID = HID_FUNC_COTHYP; };
+hidspecial HID_FUNC_TANHYP { HelpID = HID_FUNC_TANHYP; };
+hidspecial HID_FUNC_ARCTAN2 { HelpID = HID_FUNC_ARCTAN2; };
+hidspecial HID_FUNC_DEG { HelpID = HID_FUNC_DEG; };
+hidspecial HID_FUNC_RAD { HelpID = HID_FUNC_RAD; };
+hidspecial HID_FUNC_EXP { HelpID = HID_FUNC_EXP; };
+hidspecial HID_FUNC_LOG { HelpID = HID_FUNC_LOG; };
+hidspecial HID_FUNC_LN { HelpID = HID_FUNC_LN; };
+hidspecial HID_FUNC_LOG10 { HelpID = HID_FUNC_LOG10; };
+hidspecial HID_FUNC_FAKULTAET { HelpID = HID_FUNC_FAKULTAET; };
+hidspecial HID_FUNC_REST { HelpID = HID_FUNC_REST; };
+hidspecial HID_FUNC_VORZEICHEN { HelpID = HID_FUNC_VORZEICHEN; };
+hidspecial HID_FUNC_TEILERGEBNIS { HelpID = HID_FUNC_TEILERGEBNIS; };
+hidspecial HID_FUNC_GANZZAHL { HelpID = HID_FUNC_GANZZAHL; };
+hidspecial HID_FUNC_KUERZEN { HelpID = HID_FUNC_KUERZEN; };
+hidspecial HID_FUNC_RUNDEN { HelpID = HID_FUNC_RUNDEN; };
+hidspecial HID_FUNC_AUFRUNDEN { HelpID = HID_FUNC_AUFRUNDEN; };
+hidspecial HID_FUNC_ABRUNDEN { HelpID = HID_FUNC_ABRUNDEN; };
+hidspecial HID_FUNC_GERADE { HelpID = HID_FUNC_GERADE; };
+hidspecial HID_FUNC_UNGERADE { HelpID = HID_FUNC_UNGERADE; };
+hidspecial HID_FUNC_OBERGRENZE { HelpID = HID_FUNC_OBERGRENZE; };
+hidspecial HID_FUNC_UNTERGRENZE { HelpID = HID_FUNC_UNTERGRENZE; };
+hidspecial HID_FUNC_GGT { HelpID = HID_FUNC_GGT; };
+hidspecial HID_FUNC_KGV { HelpID = HID_FUNC_KGV; };
+hidspecial HID_FUNC_MTRANS { HelpID = HID_FUNC_MTRANS; };
+hidspecial HID_FUNC_MMULT { HelpID = HID_FUNC_MMULT; };
+hidspecial HID_FUNC_MDET { HelpID = HID_FUNC_MDET; };
+hidspecial HID_FUNC_MINV { HelpID = HID_FUNC_MINV; };
+hidspecial HID_FUNC_EINHEITSMATRIX { HelpID = HID_FUNC_EINHEITSMATRIX; };
+hidspecial HID_FUNC_SUMMENPRODUKT { HelpID = HID_FUNC_SUMMENPRODUKT; };
+hidspecial HID_FUNC_SUMMEX2MY2 { HelpID = HID_FUNC_SUMMEX2MY2; };
+hidspecial HID_FUNC_SUMMEX2PY2 { HelpID = HID_FUNC_SUMMEX2PY2; };
+hidspecial HID_FUNC_SUMMEXMY2 { HelpID = HID_FUNC_SUMMEXMY2; };
+hidspecial HID_FUNC_HAEUFIGKEIT { HelpID = HID_FUNC_HAEUFIGKEIT; };
+hidspecial HID_FUNC_RGP { HelpID = HID_FUNC_RGP; };
+hidspecial HID_FUNC_RKP { HelpID = HID_FUNC_RKP; };
+hidspecial HID_FUNC_TREND { HelpID = HID_FUNC_TREND; };
+hidspecial HID_FUNC_VARIATION { HelpID = HID_FUNC_VARIATION; };
+hidspecial HID_FUNC_ANZAHL { HelpID = HID_FUNC_ANZAHL; };
+hidspecial HID_FUNC_ANZAHL2 { HelpID = HID_FUNC_ANZAHL2; };
+hidspecial HID_FUNC_MAX { HelpID = HID_FUNC_MAX; };
+hidspecial HID_FUNC_MIN { HelpID = HID_FUNC_MIN; };
+hidspecial HID_FUNC_VARIANZ { HelpID = HID_FUNC_VARIANZ; };
+hidspecial HID_FUNC_VARIANZEN { HelpID = HID_FUNC_VARIANZEN; };
+hidspecial HID_FUNC_STABW { HelpID = HID_FUNC_STABW; };
+hidspecial HID_FUNC_STABWN { HelpID = HID_FUNC_STABWN; };
+hidspecial HID_FUNC_MITTELWERT { HelpID = HID_FUNC_MITTELWERT; };
+hidspecial HID_FUNC_SUMQUADABW { HelpID = HID_FUNC_SUMQUADABW; };
+hidspecial HID_FUNC_MITTELABW { HelpID = HID_FUNC_MITTELABW; };
+hidspecial HID_FUNC_SCHIEFE { HelpID = HID_FUNC_SCHIEFE; };
+hidspecial HID_FUNC_KURT { HelpID = HID_FUNC_KURT; };
+hidspecial HID_FUNC_GEOMITTEL { HelpID = HID_FUNC_GEOMITTEL; };
+hidspecial HID_FUNC_HARMITTEL { HelpID = HID_FUNC_HARMITTEL; };
+hidspecial HID_FUNC_MODALWERT { HelpID = HID_FUNC_MODALWERT; };
+hidspecial HID_FUNC_MEDIAN { HelpID = HID_FUNC_MEDIAN; };
+hidspecial HID_FUNC_QUANTIL { HelpID = HID_FUNC_QUANTIL; };
+hidspecial HID_FUNC_QUARTILE { HelpID = HID_FUNC_QUARTILE; };
+hidspecial HID_FUNC_KGROESSTE { HelpID = HID_FUNC_KGROESSTE; };
+hidspecial HID_FUNC_KKLEINSTE { HelpID = HID_FUNC_KKLEINSTE; };
+hidspecial HID_FUNC_QUANTILSRANG { HelpID = HID_FUNC_QUANTILSRANG; };
+hidspecial HID_FUNC_RANG { HelpID = HID_FUNC_RANG; };
+hidspecial HID_FUNC_GESTUTZTMITTEL { HelpID = HID_FUNC_GESTUTZTMITTEL; };
+hidspecial HID_FUNC_WAHRSCHBEREICH { HelpID = HID_FUNC_WAHRSCHBEREICH; };
+hidspecial HID_FUNC_B { HelpID = HID_FUNC_B; };
+hidspecial HID_FUNC_PHI { HelpID = HID_FUNC_PHI; };
+hidspecial HID_FUNC_GAUSS { HelpID = HID_FUNC_GAUSS; };
+hidspecial HID_FUNC_FISHER { HelpID = HID_FUNC_FISHER; };
+hidspecial HID_FUNC_FISHERINV { HelpID = HID_FUNC_FISHERINV; };
+hidspecial HID_FUNC_BINOMVERT { HelpID = HID_FUNC_BINOMVERT; };
+hidspecial HID_FUNC_NEGBINOMVERT { HelpID = HID_FUNC_NEGBINOMVERT; };
+hidspecial HID_FUNC_KRITBINOM { HelpID = HID_FUNC_KRITBINOM; };
+hidspecial HID_FUNC_POISSON { HelpID = HID_FUNC_POISSON; };
+hidspecial HID_FUNC_NORMVERT { HelpID = HID_FUNC_NORMVERT; };
+hidspecial HID_FUNC_NORMINV { HelpID = HID_FUNC_NORMINV; };
+hidspecial HID_FUNC_STANDNORMVERT { HelpID = HID_FUNC_STANDNORMVERT; };
+hidspecial HID_FUNC_STANDNORMINV { HelpID = HID_FUNC_STANDNORMINV; };
+hidspecial HID_FUNC_LOGNORMVERT { HelpID = HID_FUNC_LOGNORMVERT; };
+hidspecial HID_FUNC_LOGINV { HelpID = HID_FUNC_LOGINV; };
+hidspecial HID_FUNC_EXPONVERT { HelpID = HID_FUNC_EXPONVERT; };
+hidspecial HID_FUNC_GAMMAVERT { HelpID = HID_FUNC_GAMMAVERT; };
+hidspecial HID_FUNC_GAMMAINV { HelpID = HID_FUNC_GAMMAINV; };
+hidspecial HID_FUNC_GAMMALN { HelpID = HID_FUNC_GAMMALN; };
+hidspecial HID_FUNC_BETAVERT { HelpID = HID_FUNC_BETAVERT; };
+hidspecial HID_FUNC_BETAINV { HelpID = HID_FUNC_BETAINV; };
+hidspecial HID_FUNC_WEIBULL { HelpID = HID_FUNC_WEIBULL; };
+hidspecial HID_FUNC_HYPGEOMVERT { HelpID = HID_FUNC_HYPGEOMVERT; };
+hidspecial HID_FUNC_TVERT { HelpID = HID_FUNC_TVERT; };
+hidspecial HID_FUNC_TINV { HelpID = HID_FUNC_TINV; };
+hidspecial HID_FUNC_FVERT { HelpID = HID_FUNC_FVERT; };
+hidspecial HID_FUNC_FINV { HelpID = HID_FUNC_FINV; };
+hidspecial HID_FUNC_CHIVERT { HelpID = HID_FUNC_CHIVERT; };
+hidspecial HID_FUNC_CHIINV { HelpID = HID_FUNC_CHIINV; };
+hidspecial HID_FUNC_STANDARDISIERUNG { HelpID = HID_FUNC_STANDARDISIERUNG; };
+hidspecial HID_FUNC_VARIATIONEN { HelpID = HID_FUNC_VARIATIONEN; };
+hidspecial HID_FUNC_VARIATIONEN2 { HelpID = HID_FUNC_VARIATIONEN2; };
+hidspecial HID_FUNC_KONFIDENZ { HelpID = HID_FUNC_KONFIDENZ; };
+hidspecial HID_FUNC_GTEST { HelpID = HID_FUNC_GTEST; };
+hidspecial HID_FUNC_CHITEST { HelpID = HID_FUNC_CHITEST; };
+hidspecial HID_FUNC_FTEST { HelpID = HID_FUNC_FTEST; };
+hidspecial HID_FUNC_TTEST { HelpID = HID_FUNC_TTEST; };
+hidspecial HID_FUNC_BESTIMMTHEITSMASS { HelpID = HID_FUNC_BESTIMMTHEITSMASS; };
+hidspecial HID_FUNC_ACHSENABSCHNITT { HelpID = HID_FUNC_ACHSENABSCHNITT; };
+hidspecial HID_FUNC_STEIGUNG { HelpID = HID_FUNC_STEIGUNG; };
+hidspecial HID_FUNC_STFEHLERYX { HelpID = HID_FUNC_STFEHLERYX; };
+hidspecial HID_FUNC_PEARSON { HelpID = HID_FUNC_PEARSON; };
+hidspecial HID_FUNC_KORREL { HelpID = HID_FUNC_KORREL; };
+hidspecial HID_FUNC_KOVAR { HelpID = HID_FUNC_KOVAR; };
+hidspecial HID_FUNC_SCHAETZER { HelpID = HID_FUNC_SCHAETZER; };
+hidspecial HID_FUNC_MINA { HelpID = HID_FUNC_MINA; };
+hidspecial HID_FUNC_MAXA { HelpID = HID_FUNC_MAXA; };
+hidspecial HID_FUNC_MITTELWERTA { HelpID = HID_FUNC_MITTELWERTA; };
+hidspecial HID_FUNC_STABWA { HelpID = HID_FUNC_STABWA; };
+hidspecial HID_FUNC_STABWNA { HelpID = HID_FUNC_STABWNA; };
+hidspecial HID_FUNC_VARIANZA { HelpID = HID_FUNC_VARIANZA; };
+hidspecial HID_FUNC_VARIANZENA { HelpID = HID_FUNC_VARIANZENA; };
+hidspecial HID_FUNC_ADRESSE { HelpID = HID_FUNC_ADRESSE; };
+hidspecial HID_FUNC_BEREICHE { HelpID = HID_FUNC_BEREICHE; };
+hidspecial HID_FUNC_WAHL { HelpID = HID_FUNC_WAHL; };
+hidspecial HID_FUNC_SPALTE { HelpID = HID_FUNC_SPALTE; };
+hidspecial HID_FUNC_ZEILE { HelpID = HID_FUNC_ZEILE; };
+hidspecial HID_FUNC_SPALTEN { HelpID = HID_FUNC_SPALTEN; };
+hidspecial HID_FUNC_ZEILEN { HelpID = HID_FUNC_ZEILEN; };
+hidspecial HID_FUNC_WVERWEIS { HelpID = HID_FUNC_WVERWEIS; };
+hidspecial HID_FUNC_SVERWEIS { HelpID = HID_FUNC_SVERWEIS; };
+hidspecial HID_FUNC_INDEX { HelpID = HID_FUNC_INDEX; };
+hidspecial HID_FUNC_INDIREKT { HelpID = HID_FUNC_INDIREKT; };
+hidspecial HID_FUNC_VERWEIS { HelpID = HID_FUNC_VERWEIS; };
+hidspecial HID_FUNC_VERGLEICH { HelpID = HID_FUNC_VERGLEICH; };
+hidspecial HID_FUNC_VERSCHIEBUNG { HelpID = HID_FUNC_VERSCHIEBUNG; };
+hidspecial HID_FUNC_FEHLERTYP { HelpID = HID_FUNC_FEHLERTYP; };
+hidspecial HID_FUNC_VORLAGE { HelpID = HID_FUNC_VORLAGE; };
+hidspecial HID_FUNC_DDE { HelpID = HID_FUNC_DDE; };
+hidspecial HID_FUNC_TABELLE { HelpID = HID_FUNC_TABELLE; };
+hidspecial HID_FUNC_TABELLEN { HelpID = HID_FUNC_TABELLEN; };
+hidspecial HID_FUNC_HYPERLINK { HelpID = HID_FUNC_HYPERLINK; };
hidspecial HID_FUNC_GETPIVOTDATA { HelpID = HID_FUNC_GETPIVOTDATA; };
-hidspecial HID_FUNC_CODE { HelpID = HID_FUNC_CODE; };
-hidspecial HID_FUNC_DM { HelpID = HID_FUNC_DM; };
-hidspecial HID_FUNC_ZEICHEN { HelpID = HID_FUNC_ZEICHEN; };
-hidspecial HID_FUNC_SAEUBERN { HelpID = HID_FUNC_SAEUBERN; };
-hidspecial HID_FUNC_VERKETTEN { HelpID = HID_FUNC_VERKETTEN; };
-hidspecial HID_FUNC_IDENTISCH { HelpID = HID_FUNC_IDENTISCH; };
-hidspecial HID_FUNC_FINDEN { HelpID = HID_FUNC_FINDEN; };
-hidspecial HID_FUNC_SUCHEN { HelpID = HID_FUNC_SUCHEN; };
-hidspecial HID_FUNC_GLAETTEN { HelpID = HID_FUNC_GLAETTEN; };
-hidspecial HID_FUNC_GROSS2 { HelpID = HID_FUNC_GROSS2; };
-hidspecial HID_FUNC_GROSS { HelpID = HID_FUNC_GROSS; };
-hidspecial HID_FUNC_KLEIN { HelpID = HID_FUNC_KLEIN; };
-hidspecial HID_FUNC_WERT { HelpID = HID_FUNC_WERT; };
-hidspecial HID_FUNC_TEXT { HelpID = HID_FUNC_TEXT; };
-hidspecial HID_FUNC_T { HelpID = HID_FUNC_T; };
-hidspecial HID_FUNC_ERSETZEN { HelpID = HID_FUNC_ERSETZEN; };
-hidspecial HID_FUNC_FEST { HelpID = HID_FUNC_FEST; };
-hidspecial HID_FUNC_LAENGE { HelpID = HID_FUNC_LAENGE; };
-hidspecial HID_FUNC_LINKS { HelpID = HID_FUNC_LINKS; };
-hidspecial HID_FUNC_RECHTS { HelpID = HID_FUNC_RECHTS; };
-hidspecial HID_FUNC_TEIL { HelpID = HID_FUNC_TEIL; };
-hidspecial HID_FUNC_WIEDERHOLEN { HelpID = HID_FUNC_WIEDERHOLEN; };
-hidspecial HID_FUNC_WECHSELN { HelpID = HID_FUNC_WECHSELN; };
-hidspecial HID_FUNC_BASIS { HelpID = HID_FUNC_BASIS; };
-hidspecial HID_FUNC_DEZIMAL { HelpID = HID_FUNC_DEZIMAL; };
-hidspecial HID_FUNC_UMRECHNEN { HelpID = HID_FUNC_UMRECHNEN; };
-hidspecial HID_FUNC_ROEMISCH { HelpID = HID_FUNC_ROEMISCH; };
-hidspecial HID_FUNC_ARABISCH { HelpID = HID_FUNC_ARABISCH; };
+hidspecial HID_FUNC_CODE { HelpID = HID_FUNC_CODE; };
+hidspecial HID_FUNC_DM { HelpID = HID_FUNC_DM; };
+hidspecial HID_FUNC_ZEICHEN { HelpID = HID_FUNC_ZEICHEN; };
+hidspecial HID_FUNC_SAEUBERN { HelpID = HID_FUNC_SAEUBERN; };
+hidspecial HID_FUNC_VERKETTEN { HelpID = HID_FUNC_VERKETTEN; };
+hidspecial HID_FUNC_IDENTISCH { HelpID = HID_FUNC_IDENTISCH; };
+hidspecial HID_FUNC_FINDEN { HelpID = HID_FUNC_FINDEN; };
+hidspecial HID_FUNC_SUCHEN { HelpID = HID_FUNC_SUCHEN; };
+hidspecial HID_FUNC_GLAETTEN { HelpID = HID_FUNC_GLAETTEN; };
+hidspecial HID_FUNC_GROSS2 { HelpID = HID_FUNC_GROSS2; };
+hidspecial HID_FUNC_GROSS { HelpID = HID_FUNC_GROSS; };
+hidspecial HID_FUNC_KLEIN { HelpID = HID_FUNC_KLEIN; };
+hidspecial HID_FUNC_WERT { HelpID = HID_FUNC_WERT; };
+hidspecial HID_FUNC_TEXT { HelpID = HID_FUNC_TEXT; };
+hidspecial HID_FUNC_T { HelpID = HID_FUNC_T; };
+hidspecial HID_FUNC_ERSETZEN { HelpID = HID_FUNC_ERSETZEN; };
+hidspecial HID_FUNC_FEST { HelpID = HID_FUNC_FEST; };
+hidspecial HID_FUNC_LAENGE { HelpID = HID_FUNC_LAENGE; };
+hidspecial HID_FUNC_LINKS { HelpID = HID_FUNC_LINKS; };
+hidspecial HID_FUNC_RECHTS { HelpID = HID_FUNC_RECHTS; };
+hidspecial HID_FUNC_TEIL { HelpID = HID_FUNC_TEIL; };
+hidspecial HID_FUNC_WIEDERHOLEN { HelpID = HID_FUNC_WIEDERHOLEN; };
+hidspecial HID_FUNC_WECHSELN { HelpID = HID_FUNC_WECHSELN; };
+hidspecial HID_FUNC_BASIS { HelpID = HID_FUNC_BASIS; };
+hidspecial HID_FUNC_DEZIMAL { HelpID = HID_FUNC_DEZIMAL; };
+hidspecial HID_FUNC_UMRECHNEN { HelpID = HID_FUNC_UMRECHNEN; };
+hidspecial HID_FUNC_ROEMISCH { HelpID = HID_FUNC_ROEMISCH; };
+hidspecial HID_FUNC_ARABISCH { HelpID = HID_FUNC_ARABISCH; };
hidspecial HID_FUNC_INFO { HelpID = HID_FUNC_INFO; };
hidspecial HID_FUNC_BAHTTEXT { HelpID = HID_FUNC_BAHTTEXT; };
hidspecial HID_FUNC_JIS { HelpID = HID_FUNC_JIS; };
@@ -393,99 +393,99 @@ hidspecial HID_FUNC_CHISQINV { HelpID = HID_FUNC_CHISQINV; };
// ... and from Analysis Addin
-hidspecial HID_AAI_FUNC_WORKDAY { HelpID = HID_AAI_FUNC_WORKDAY; };
-hidspecial HID_AAI_FUNC_YEARFRAC { HelpID = HID_AAI_FUNC_YEARFRAC; };
-hidspecial HID_AAI_FUNC_EDATE { HelpID = HID_AAI_FUNC_EDATE; };
-hidspecial HID_AAI_FUNC_WEEKNUM { HelpID = HID_AAI_FUNC_WEEKNUM; };
-hidspecial HID_AAI_FUNC_EOMONTH { HelpID = HID_AAI_FUNC_EOMONTH; };
-hidspecial HID_AAI_FUNC_NETWORKDAYS { HelpID = HID_AAI_FUNC_NETWORKDAYS; };
-hidspecial HID_AAI_FUNC_AMORDEGRC { HelpID = HID_AAI_FUNC_AMORDEGRC; };
-hidspecial HID_AAI_FUNC_AMORLINC { HelpID = HID_AAI_FUNC_AMORLINC; };
-hidspecial HID_AAI_FUNC_ACCRINT { HelpID = HID_AAI_FUNC_ACCRINT; };
-hidspecial HID_AAI_FUNC_ACCRINTM { HelpID = HID_AAI_FUNC_ACCRINTM; };
-hidspecial HID_AAI_FUNC_RECEIVED { HelpID = HID_AAI_FUNC_RECEIVED; };
-hidspecial HID_AAI_FUNC_DISC { HelpID = HID_AAI_FUNC_DISC; };
-hidspecial HID_AAI_FUNC_DURATION { HelpID = HID_AAI_FUNC_DURATION; };
-hidspecial HID_AAI_FUNC_EFFECT { HelpID = HID_AAI_FUNC_EFFECT; };
-hidspecial HID_AAI_FUNC_CUMPRINC { HelpID = HID_AAI_FUNC_CUMPRINC; };
-hidspecial HID_AAI_FUNC_CUMIPMT { HelpID = HID_AAI_FUNC_CUMIPMT; };
-hidspecial HID_AAI_FUNC_PRICE { HelpID = HID_AAI_FUNC_PRICE; };
-hidspecial HID_AAI_FUNC_PRICEDISC { HelpID = HID_AAI_FUNC_PRICEDISC; };
-hidspecial HID_AAI_FUNC_PRICEMAT { HelpID = HID_AAI_FUNC_PRICEMAT; };
-hidspecial HID_AAI_FUNC_MDURATION { HelpID = HID_AAI_FUNC_MDURATION; };
-hidspecial HID_AAI_FUNC_NOMINAL { HelpID = HID_AAI_FUNC_NOMINAL; };
-hidspecial HID_AAI_FUNC_DOLLARFR { HelpID = HID_AAI_FUNC_DOLLARFR; };
-hidspecial HID_AAI_FUNC_DOLLARDE { HelpID = HID_AAI_FUNC_DOLLARDE; };
-hidspecial HID_AAI_FUNC_YIELD { HelpID = HID_AAI_FUNC_YIELD; };
-hidspecial HID_AAI_FUNC_YIELDDISC { HelpID = HID_AAI_FUNC_YIELDDISC; };
-hidspecial HID_AAI_FUNC_YIELDMAT { HelpID = HID_AAI_FUNC_YIELDMAT; };
-hidspecial HID_AAI_FUNC_TBILLEQ { HelpID = HID_AAI_FUNC_TBILLEQ; };
-hidspecial HID_AAI_FUNC_TBILLPRICE { HelpID = HID_AAI_FUNC_TBILLPRICE; };
-hidspecial HID_AAI_FUNC_TBILLYIELD { HelpID = HID_AAI_FUNC_TBILLYIELD; };
-hidspecial HID_AAI_FUNC_ODDFPRICE { HelpID = HID_AAI_FUNC_ODDFPRICE; };
-hidspecial HID_AAI_FUNC_ODDFYIELD { HelpID = HID_AAI_FUNC_ODDFYIELD; };
-hidspecial HID_AAI_FUNC_ODDLPRICE { HelpID = HID_AAI_FUNC_ODDLPRICE; };
-hidspecial HID_AAI_FUNC_ODDLYIELD { HelpID = HID_AAI_FUNC_ODDLYIELD; };
-hidspecial HID_AAI_FUNC_XIRR { HelpID = HID_AAI_FUNC_XIRR; };
-hidspecial HID_AAI_FUNC_XNPV { HelpID = HID_AAI_FUNC_XNPV; };
-hidspecial HID_AAI_FUNC_INTRATE { HelpID = HID_AAI_FUNC_INTRATE; };
-hidspecial HID_AAI_FUNC_COUPNCD { HelpID = HID_AAI_FUNC_COUPNCD; };
-hidspecial HID_AAI_FUNC_COUPDAYS { HelpID = HID_AAI_FUNC_COUPDAYS; };
-hidspecial HID_AAI_FUNC_COUPDAYSNC { HelpID = HID_AAI_FUNC_COUPDAYSNC; };
-hidspecial HID_AAI_FUNC_COUPDAYBS { HelpID = HID_AAI_FUNC_COUPDAYBS; };
-hidspecial HID_AAI_FUNC_COUPPCD { HelpID = HID_AAI_FUNC_COUPPCD; };
-hidspecial HID_AAI_FUNC_COUPNUM { HelpID = HID_AAI_FUNC_COUPNUM; };
-hidspecial HID_AAI_FUNC_FVSCHEDULE { HelpID = HID_AAI_FUNC_FVSCHEDULE; };
-hidspecial HID_AAI_FUNC_ISEVEN { HelpID = HID_AAI_FUNC_ISEVEN; };
-hidspecial HID_AAI_FUNC_ISODD { HelpID = HID_AAI_FUNC_ISODD; };
-hidspecial HID_AAI_FUNC_GCD { HelpID = HID_AAI_FUNC_GCD; };
-hidspecial HID_AAI_FUNC_LCM { HelpID = HID_AAI_FUNC_LCM; };
-hidspecial HID_AAI_FUNC_MULTINOMIAL { HelpID = HID_AAI_FUNC_MULTINOMIAL; };
-hidspecial HID_AAI_FUNC_SERIESSUM { HelpID = HID_AAI_FUNC_SERIESSUM; };
-hidspecial HID_AAI_FUNC_QUOTIENT { HelpID = HID_AAI_FUNC_QUOTIENT; };
-hidspecial HID_AAI_FUNC_MROUND { HelpID = HID_AAI_FUNC_MROUND; };
-hidspecial HID_AAI_FUNC_SQRTPI { HelpID = HID_AAI_FUNC_SQRTPI; };
-hidspecial HID_AAI_FUNC_RANDBETWEEN { HelpID = HID_AAI_FUNC_RANDBETWEEN; };
-hidspecial HID_AAI_FUNC_BESSELI { HelpID = HID_AAI_FUNC_BESSELI; };
-hidspecial HID_AAI_FUNC_BESSELJ { HelpID = HID_AAI_FUNC_BESSELJ; };
-hidspecial HID_AAI_FUNC_BESSELK { HelpID = HID_AAI_FUNC_BESSELK; };
-hidspecial HID_AAI_FUNC_BESSELY { HelpID = HID_AAI_FUNC_BESSELY; };
-hidspecial HID_AAI_FUNC_BIN2DEC { HelpID = HID_AAI_FUNC_BIN2DEC; };
-hidspecial HID_AAI_FUNC_BIN2HEX { HelpID = HID_AAI_FUNC_BIN2HEX; };
-hidspecial HID_AAI_FUNC_BIN2OCT { HelpID = HID_AAI_FUNC_BIN2OCT; };
-hidspecial HID_AAI_FUNC_DELTA { HelpID = HID_AAI_FUNC_DELTA; };
-hidspecial HID_AAI_FUNC_DEC2BIN { HelpID = HID_AAI_FUNC_DEC2BIN; };
-hidspecial HID_AAI_FUNC_DEC2HEX { HelpID = HID_AAI_FUNC_DEC2HEX; };
-hidspecial HID_AAI_FUNC_DEC2OCT { HelpID = HID_AAI_FUNC_DEC2OCT; };
-hidspecial HID_AAI_FUNC_ERF { HelpID = HID_AAI_FUNC_ERF; };
-hidspecial HID_AAI_FUNC_ERFC { HelpID = HID_AAI_FUNC_ERFC; };
-hidspecial HID_AAI_FUNC_GESTEP { HelpID = HID_AAI_FUNC_GESTEP; };
-hidspecial HID_AAI_FUNC_HEX2BIN { HelpID = HID_AAI_FUNC_HEX2BIN; };
-hidspecial HID_AAI_FUNC_HEX2DEC { HelpID = HID_AAI_FUNC_HEX2DEC; };
-hidspecial HID_AAI_FUNC_HEX2OCT { HelpID = HID_AAI_FUNC_HEX2OCT; };
-hidspecial HID_AAI_FUNC_IMABS { HelpID = HID_AAI_FUNC_IMABS; };
-hidspecial HID_AAI_FUNC_IMAGINARY { HelpID = HID_AAI_FUNC_IMAGINARY; };
-hidspecial HID_AAI_FUNC_IMPOWER { HelpID = HID_AAI_FUNC_IMPOWER; };
-hidspecial HID_AAI_FUNC_IMARGUMENT { HelpID = HID_AAI_FUNC_IMARGUMENT; };
-hidspecial HID_AAI_FUNC_IMCOS { HelpID = HID_AAI_FUNC_IMCOS; };
-hidspecial HID_AAI_FUNC_IMDIV { HelpID = HID_AAI_FUNC_IMDIV; };
-hidspecial HID_AAI_FUNC_IMEXP { HelpID = HID_AAI_FUNC_IMEXP; };
-hidspecial HID_AAI_FUNC_IMCONJUGATE { HelpID = HID_AAI_FUNC_IMCONJUGATE; };
-hidspecial HID_AAI_FUNC_IMLN { HelpID = HID_AAI_FUNC_IMLN; };
-hidspecial HID_AAI_FUNC_IMLOG10 { HelpID = HID_AAI_FUNC_IMLOG10; };
-hidspecial HID_AAI_FUNC_IMLOG2 { HelpID = HID_AAI_FUNC_IMLOG2; };
-hidspecial HID_AAI_FUNC_IMPRODUCT { HelpID = HID_AAI_FUNC_IMPRODUCT; };
-hidspecial HID_AAI_FUNC_IMREAL { HelpID = HID_AAI_FUNC_IMREAL; };
-hidspecial HID_AAI_FUNC_IMSIN { HelpID = HID_AAI_FUNC_IMSIN; };
-hidspecial HID_AAI_FUNC_IMSUB { HelpID = HID_AAI_FUNC_IMSUB; };
-hidspecial HID_AAI_FUNC_IMSUM { HelpID = HID_AAI_FUNC_IMSUM; };
-hidspecial HID_AAI_FUNC_IMSQRT { HelpID = HID_AAI_FUNC_IMSQRT; };
-hidspecial HID_AAI_FUNC_COMPLEX { HelpID = HID_AAI_FUNC_COMPLEX; };
-hidspecial HID_AAI_FUNC_OCT2BIN { HelpID = HID_AAI_FUNC_OCT2BIN; };
-hidspecial HID_AAI_FUNC_OCT2DEZ { HelpID = HID_AAI_FUNC_OCT2DEZ; };
-hidspecial HID_AAI_FUNC_OCT2HEX { HelpID = HID_AAI_FUNC_OCT2HEX; };
-hidspecial HID_AAI_FUNC_CONVERT { HelpID = HID_AAI_FUNC_CONVERT; };
-hidspecial HID_AAI_FUNC_FACTDOUBLE { HelpID = HID_AAI_FUNC_FACTDOUBLE; };
+hidspecial HID_AAI_FUNC_WORKDAY { HelpID = HID_AAI_FUNC_WORKDAY; };
+hidspecial HID_AAI_FUNC_YEARFRAC { HelpID = HID_AAI_FUNC_YEARFRAC; };
+hidspecial HID_AAI_FUNC_EDATE { HelpID = HID_AAI_FUNC_EDATE; };
+hidspecial HID_AAI_FUNC_WEEKNUM { HelpID = HID_AAI_FUNC_WEEKNUM; };
+hidspecial HID_AAI_FUNC_EOMONTH { HelpID = HID_AAI_FUNC_EOMONTH; };
+hidspecial HID_AAI_FUNC_NETWORKDAYS { HelpID = HID_AAI_FUNC_NETWORKDAYS; };
+hidspecial HID_AAI_FUNC_AMORDEGRC { HelpID = HID_AAI_FUNC_AMORDEGRC; };
+hidspecial HID_AAI_FUNC_AMORLINC { HelpID = HID_AAI_FUNC_AMORLINC; };
+hidspecial HID_AAI_FUNC_ACCRINT { HelpID = HID_AAI_FUNC_ACCRINT; };
+hidspecial HID_AAI_FUNC_ACCRINTM { HelpID = HID_AAI_FUNC_ACCRINTM; };
+hidspecial HID_AAI_FUNC_RECEIVED { HelpID = HID_AAI_FUNC_RECEIVED; };
+hidspecial HID_AAI_FUNC_DISC { HelpID = HID_AAI_FUNC_DISC; };
+hidspecial HID_AAI_FUNC_DURATION { HelpID = HID_AAI_FUNC_DURATION; };
+hidspecial HID_AAI_FUNC_EFFECT { HelpID = HID_AAI_FUNC_EFFECT; };
+hidspecial HID_AAI_FUNC_CUMPRINC { HelpID = HID_AAI_FUNC_CUMPRINC; };
+hidspecial HID_AAI_FUNC_CUMIPMT { HelpID = HID_AAI_FUNC_CUMIPMT; };
+hidspecial HID_AAI_FUNC_PRICE { HelpID = HID_AAI_FUNC_PRICE; };
+hidspecial HID_AAI_FUNC_PRICEDISC { HelpID = HID_AAI_FUNC_PRICEDISC; };
+hidspecial HID_AAI_FUNC_PRICEMAT { HelpID = HID_AAI_FUNC_PRICEMAT; };
+hidspecial HID_AAI_FUNC_MDURATION { HelpID = HID_AAI_FUNC_MDURATION; };
+hidspecial HID_AAI_FUNC_NOMINAL { HelpID = HID_AAI_FUNC_NOMINAL; };
+hidspecial HID_AAI_FUNC_DOLLARFR { HelpID = HID_AAI_FUNC_DOLLARFR; };
+hidspecial HID_AAI_FUNC_DOLLARDE { HelpID = HID_AAI_FUNC_DOLLARDE; };
+hidspecial HID_AAI_FUNC_YIELD { HelpID = HID_AAI_FUNC_YIELD; };
+hidspecial HID_AAI_FUNC_YIELDDISC { HelpID = HID_AAI_FUNC_YIELDDISC; };
+hidspecial HID_AAI_FUNC_YIELDMAT { HelpID = HID_AAI_FUNC_YIELDMAT; };
+hidspecial HID_AAI_FUNC_TBILLEQ { HelpID = HID_AAI_FUNC_TBILLEQ; };
+hidspecial HID_AAI_FUNC_TBILLPRICE { HelpID = HID_AAI_FUNC_TBILLPRICE; };
+hidspecial HID_AAI_FUNC_TBILLYIELD { HelpID = HID_AAI_FUNC_TBILLYIELD; };
+hidspecial HID_AAI_FUNC_ODDFPRICE { HelpID = HID_AAI_FUNC_ODDFPRICE; };
+hidspecial HID_AAI_FUNC_ODDFYIELD { HelpID = HID_AAI_FUNC_ODDFYIELD; };
+hidspecial HID_AAI_FUNC_ODDLPRICE { HelpID = HID_AAI_FUNC_ODDLPRICE; };
+hidspecial HID_AAI_FUNC_ODDLYIELD { HelpID = HID_AAI_FUNC_ODDLYIELD; };
+hidspecial HID_AAI_FUNC_XIRR { HelpID = HID_AAI_FUNC_XIRR; };
+hidspecial HID_AAI_FUNC_XNPV { HelpID = HID_AAI_FUNC_XNPV; };
+hidspecial HID_AAI_FUNC_INTRATE { HelpID = HID_AAI_FUNC_INTRATE; };
+hidspecial HID_AAI_FUNC_COUPNCD { HelpID = HID_AAI_FUNC_COUPNCD; };
+hidspecial HID_AAI_FUNC_COUPDAYS { HelpID = HID_AAI_FUNC_COUPDAYS; };
+hidspecial HID_AAI_FUNC_COUPDAYSNC { HelpID = HID_AAI_FUNC_COUPDAYSNC; };
+hidspecial HID_AAI_FUNC_COUPDAYBS { HelpID = HID_AAI_FUNC_COUPDAYBS; };
+hidspecial HID_AAI_FUNC_COUPPCD { HelpID = HID_AAI_FUNC_COUPPCD; };
+hidspecial HID_AAI_FUNC_COUPNUM { HelpID = HID_AAI_FUNC_COUPNUM; };
+hidspecial HID_AAI_FUNC_FVSCHEDULE { HelpID = HID_AAI_FUNC_FVSCHEDULE; };
+hidspecial HID_AAI_FUNC_ISEVEN { HelpID = HID_AAI_FUNC_ISEVEN; };
+hidspecial HID_AAI_FUNC_ISODD { HelpID = HID_AAI_FUNC_ISODD; };
+hidspecial HID_AAI_FUNC_GCD { HelpID = HID_AAI_FUNC_GCD; };
+hidspecial HID_AAI_FUNC_LCM { HelpID = HID_AAI_FUNC_LCM; };
+hidspecial HID_AAI_FUNC_MULTINOMIAL { HelpID = HID_AAI_FUNC_MULTINOMIAL; };
+hidspecial HID_AAI_FUNC_SERIESSUM { HelpID = HID_AAI_FUNC_SERIESSUM; };
+hidspecial HID_AAI_FUNC_QUOTIENT { HelpID = HID_AAI_FUNC_QUOTIENT; };
+hidspecial HID_AAI_FUNC_MROUND { HelpID = HID_AAI_FUNC_MROUND; };
+hidspecial HID_AAI_FUNC_SQRTPI { HelpID = HID_AAI_FUNC_SQRTPI; };
+hidspecial HID_AAI_FUNC_RANDBETWEEN { HelpID = HID_AAI_FUNC_RANDBETWEEN; };
+hidspecial HID_AAI_FUNC_BESSELI { HelpID = HID_AAI_FUNC_BESSELI; };
+hidspecial HID_AAI_FUNC_BESSELJ { HelpID = HID_AAI_FUNC_BESSELJ; };
+hidspecial HID_AAI_FUNC_BESSELK { HelpID = HID_AAI_FUNC_BESSELK; };
+hidspecial HID_AAI_FUNC_BESSELY { HelpID = HID_AAI_FUNC_BESSELY; };
+hidspecial HID_AAI_FUNC_BIN2DEC { HelpID = HID_AAI_FUNC_BIN2DEC; };
+hidspecial HID_AAI_FUNC_BIN2HEX { HelpID = HID_AAI_FUNC_BIN2HEX; };
+hidspecial HID_AAI_FUNC_BIN2OCT { HelpID = HID_AAI_FUNC_BIN2OCT; };
+hidspecial HID_AAI_FUNC_DELTA { HelpID = HID_AAI_FUNC_DELTA; };
+hidspecial HID_AAI_FUNC_DEC2BIN { HelpID = HID_AAI_FUNC_DEC2BIN; };
+hidspecial HID_AAI_FUNC_DEC2HEX { HelpID = HID_AAI_FUNC_DEC2HEX; };
+hidspecial HID_AAI_FUNC_DEC2OCT { HelpID = HID_AAI_FUNC_DEC2OCT; };
+hidspecial HID_AAI_FUNC_ERF { HelpID = HID_AAI_FUNC_ERF; };
+hidspecial HID_AAI_FUNC_ERFC { HelpID = HID_AAI_FUNC_ERFC; };
+hidspecial HID_AAI_FUNC_GESTEP { HelpID = HID_AAI_FUNC_GESTEP; };
+hidspecial HID_AAI_FUNC_HEX2BIN { HelpID = HID_AAI_FUNC_HEX2BIN; };
+hidspecial HID_AAI_FUNC_HEX2DEC { HelpID = HID_AAI_FUNC_HEX2DEC; };
+hidspecial HID_AAI_FUNC_HEX2OCT { HelpID = HID_AAI_FUNC_HEX2OCT; };
+hidspecial HID_AAI_FUNC_IMABS { HelpID = HID_AAI_FUNC_IMABS; };
+hidspecial HID_AAI_FUNC_IMAGINARY { HelpID = HID_AAI_FUNC_IMAGINARY; };
+hidspecial HID_AAI_FUNC_IMPOWER { HelpID = HID_AAI_FUNC_IMPOWER; };
+hidspecial HID_AAI_FUNC_IMARGUMENT { HelpID = HID_AAI_FUNC_IMARGUMENT; };
+hidspecial HID_AAI_FUNC_IMCOS { HelpID = HID_AAI_FUNC_IMCOS; };
+hidspecial HID_AAI_FUNC_IMDIV { HelpID = HID_AAI_FUNC_IMDIV; };
+hidspecial HID_AAI_FUNC_IMEXP { HelpID = HID_AAI_FUNC_IMEXP; };
+hidspecial HID_AAI_FUNC_IMCONJUGATE { HelpID = HID_AAI_FUNC_IMCONJUGATE; };
+hidspecial HID_AAI_FUNC_IMLN { HelpID = HID_AAI_FUNC_IMLN; };
+hidspecial HID_AAI_FUNC_IMLOG10 { HelpID = HID_AAI_FUNC_IMLOG10; };
+hidspecial HID_AAI_FUNC_IMLOG2 { HelpID = HID_AAI_FUNC_IMLOG2; };
+hidspecial HID_AAI_FUNC_IMPRODUCT { HelpID = HID_AAI_FUNC_IMPRODUCT; };
+hidspecial HID_AAI_FUNC_IMREAL { HelpID = HID_AAI_FUNC_IMREAL; };
+hidspecial HID_AAI_FUNC_IMSIN { HelpID = HID_AAI_FUNC_IMSIN; };
+hidspecial HID_AAI_FUNC_IMSUB { HelpID = HID_AAI_FUNC_IMSUB; };
+hidspecial HID_AAI_FUNC_IMSUM { HelpID = HID_AAI_FUNC_IMSUM; };
+hidspecial HID_AAI_FUNC_IMSQRT { HelpID = HID_AAI_FUNC_IMSQRT; };
+hidspecial HID_AAI_FUNC_COMPLEX { HelpID = HID_AAI_FUNC_COMPLEX; };
+hidspecial HID_AAI_FUNC_OCT2BIN { HelpID = HID_AAI_FUNC_OCT2BIN; };
+hidspecial HID_AAI_FUNC_OCT2DEZ { HelpID = HID_AAI_FUNC_OCT2DEZ; };
+hidspecial HID_AAI_FUNC_OCT2HEX { HelpID = HID_AAI_FUNC_OCT2HEX; };
+hidspecial HID_AAI_FUNC_CONVERT { HelpID = HID_AAI_FUNC_CONVERT; };
+hidspecial HID_AAI_FUNC_FACTDOUBLE { HelpID = HID_AAI_FUNC_FACTDOUBLE; };
// ... and from DateFunc Addin
diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx
index 68424abfc9c0..8efc499e809c 100644
--- a/sc/workben/addin.cxx
+++ b/sc/workben/addin.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ using namespace com::sun::star;
SMART_UNO_IMPLEMENTATION( ScTestAddIn, UsrObject );
-#define SCADDIN_SERVICE L"com.sun.star.sheet.AddIn"
-#define SCTESTADDIN_SERVICE L"stardiv.one.sheet.DemoAddIn"
+#define SCADDIN_SERVICE L"com.sun.star.sheet.AddIn"
+#define SCTESTADDIN_SERVICE L"stardiv.one.sheet.DemoAddIn"
//------------------------------------------------------------------------
@@ -121,7 +121,7 @@ void * SAL_CALL component_getFactory(
return pRet;
}
-} // extern C
+} // extern C
//------------------------------------------------------------------------
@@ -167,90 +167,90 @@ UString ScTestAddIn::getProgrammaticFuntionName(const UString& aDisplayName)
UString ScTestAddIn::getDisplayFunctionName(const UString& aProgrammaticName)
THROWS( (UsrSystemException) )
{
- // return translated strings
+ // return translated strings
UString aRet;
- if ( aProgrammaticName == L"countParams" ) aRet = L"ParamAnzahl";
- else if ( aProgrammaticName == L"addOne" ) aRet = L"PlusEins";
- else if ( aProgrammaticName == L"repeatStr" ) aRet = L"WiederholeString";
+ if ( aProgrammaticName == L"countParams" ) aRet = L"ParamAnzahl";
+ else if ( aProgrammaticName == L"addOne" ) aRet = L"PlusEins";
+ else if ( aProgrammaticName == L"repeatStr" ) aRet = L"WiederholeString";
else if ( aProgrammaticName == L"getDateString" ) aRet = L"Datumsstring";
else if ( aProgrammaticName == L"getColorValue" ) aRet = L"Farbwert";
- else if ( aProgrammaticName == L"transpose" ) aRet = L"Transponieren";
+ else if ( aProgrammaticName == L"transpose" ) aRet = L"Transponieren";
else if ( aProgrammaticName == L"transposeInt" ) aRet = L"IntegerTransponieren";
else if ( aProgrammaticName == L"repeatMultiple" )aRet = L"Mehrfach";
- else if ( aProgrammaticName == L"getStrOrVal" ) aRet = L"StringOderWert";
- else if ( aProgrammaticName == L"callAsync" ) aRet = L"Asynchron";
+ else if ( aProgrammaticName == L"getStrOrVal" ) aRet = L"StringOderWert";
+ else if ( aProgrammaticName == L"callAsync" ) aRet = L"Asynchron";
return aRet;
}
UString ScTestAddIn::getFunctionDescription(const UString& aProgrammaticName)
THROWS( (UsrSystemException) )
{
- // return translated strings
+ // return translated strings
UString aRet;
- if ( aProgrammaticName == L"countParams" ) aRet = L"Gibt die Anzahl der Parameter zurueck.";
- else if ( aProgrammaticName == L"addOne" ) aRet = L"Addiert 1 zur uebergebenen Zahl.";
- else if ( aProgrammaticName == L"repeatStr" ) aRet = L"Wiederholt eine Zeichenkette.";
+ if ( aProgrammaticName == L"countParams" ) aRet = L"Gibt die Anzahl der Parameter zurueck.";
+ else if ( aProgrammaticName == L"addOne" ) aRet = L"Addiert 1 zur uebergebenen Zahl.";
+ else if ( aProgrammaticName == L"repeatStr" ) aRet = L"Wiederholt eine Zeichenkette.";
else if ( aProgrammaticName == L"getDateString" ) aRet = L"Wandelt ein Datum in eine Zeichenkette.";
else if ( aProgrammaticName == L"getColorValue" ) aRet = L"Gibt den Farbwert eines Zellbereichs zurueck. Bei transparentem Hintergrund wird -1 zurueckgegeben";
- else if ( aProgrammaticName == L"transpose" ) aRet = L"Transponiert eine Matrix.";
+ else if ( aProgrammaticName == L"transpose" ) aRet = L"Transponiert eine Matrix.";
else if ( aProgrammaticName == L"transposeInt" ) aRet = L"Transponiert eine Matrix mit Ganzzahlen.";
else if ( aProgrammaticName == L"repeatMultiple" )aRet = L"Wiederholt mehrere Bestandteile.";
- else if ( aProgrammaticName == L"getStrOrVal" ) aRet = L"Gibt einen String oder einen Wert zurueck.";
- else if ( aProgrammaticName == L"callAsync" ) aRet = L"Test fuer asynchrone Funktion.";
+ else if ( aProgrammaticName == L"getStrOrVal" ) aRet = L"Gibt einen String oder einen Wert zurueck.";
+ else if ( aProgrammaticName == L"callAsync" ) aRet = L"Test fuer asynchrone Funktion.";
return aRet;
}
UString ScTestAddIn::getDisplayArgumentName(const UString& aProgrammaticFunctionName,
INT32 nArgument) THROWS( (UsrSystemException) )
{
- // return translated strings
+ // return translated strings
UString aRet;
if ( aProgrammaticFunctionName == L"countParams" )
{
- if ( nArgument == 0 ) aRet = L"Parameter";
+ if ( nArgument == 0 ) aRet = L"Parameter";
}
else if ( aProgrammaticFunctionName == L"addOne" )
{
- if ( nArgument == 0 ) aRet = L"Wert";
+ if ( nArgument == 0 ) aRet = L"Wert";
}
else if ( aProgrammaticFunctionName == L"repeatStr" )
{
- if ( nArgument == 0 ) aRet = L"String";
- else if ( nArgument == 1 ) aRet = L"Anzahl";
+ if ( nArgument == 0 ) aRet = L"String";
+ else if ( nArgument == 1 ) aRet = L"Anzahl";
}
else if ( aProgrammaticFunctionName == L"getDateString" )
{
- if ( nArgument == 0 ) aRet = L"Dokument";
- else if ( nArgument == 1 ) aRet = L"Wert";
+ if ( nArgument == 0 ) aRet = L"Dokument";
+ else if ( nArgument == 1 ) aRet = L"Wert";
}
else if ( aProgrammaticFunctionName == L"getColorValue" )
{
- if ( nArgument == 0 ) aRet = L"Bereich";
+ if ( nArgument == 0 ) aRet = L"Bereich";
}
else if ( aProgrammaticFunctionName == L"transpose" )
{
- if ( nArgument == 0 ) aRet = L"Matrix";
+ if ( nArgument == 0 ) aRet = L"Matrix";
}
else if ( aProgrammaticFunctionName == L"transposeInt" )
{
- if ( nArgument == 0 ) aRet = L"Matrix";
+ if ( nArgument == 0 ) aRet = L"Matrix";
}
else if ( aProgrammaticFunctionName == L"repeatMultiple" )
{
- if ( nArgument == 0 ) aRet = L"Anzahl";
- else if ( nArgument == 1 ) aRet = L"Trenner";
- else if ( nArgument == 2 ) aRet = L"Inhalt";
+ if ( nArgument == 0 ) aRet = L"Anzahl";
+ else if ( nArgument == 1 ) aRet = L"Trenner";
+ else if ( nArgument == 2 ) aRet = L"Inhalt";
}
else if ( aProgrammaticFunctionName == L"getStrOrVal" )
{
- if ( nArgument == 0 ) aRet = L"Flag";
+ if ( nArgument == 0 ) aRet = L"Flag";
}
else if ( aProgrammaticFunctionName == L"callAsync" )
{
- if ( nArgument == 0 ) aRet = L"Name";
+ if ( nArgument == 0 ) aRet = L"Name";
}
return aRet;
}
@@ -258,52 +258,52 @@ UString ScTestAddIn::getDisplayArgumentName(const UString& aProgrammaticFunction
UString ScTestAddIn::getArgumentDescription(const UString& aProgrammaticFunctionName,
INT32 nArgument) THROWS( (UsrSystemException) )
{
- // return translated strings
+ // return translated strings
UString aRet;
if ( aProgrammaticFunctionName == L"countParams" )
{
- if ( nArgument == 0 ) aRet = L"Beliebiger Parameter";
+ if ( nArgument == 0 ) aRet = L"Beliebiger Parameter";
}
else if ( aProgrammaticFunctionName == L"addOne" )
{
- if ( nArgument == 0 ) aRet = L"Der Wert, zu dem 1 addiert wird";
+ if ( nArgument == 0 ) aRet = L"Der Wert, zu dem 1 addiert wird";
}
else if ( aProgrammaticFunctionName == L"repeatStr" )
{
- if ( nArgument == 0 ) aRet = L"Der Text, der wiederholt wird";
- else if ( nArgument == 1 ) aRet = L"Die Anzahl der Wiederholungen";
+ if ( nArgument == 0 ) aRet = L"Der Text, der wiederholt wird";
+ else if ( nArgument == 1 ) aRet = L"Die Anzahl der Wiederholungen";
}
else if ( aProgrammaticFunctionName == L"getDateString" )
{
- if ( nArgument == 0 ) aRet = L"(intern)";
- else if ( nArgument == 1 ) aRet = L"Der Wert, der als Datum formatiert wird";
+ if ( nArgument == 0 ) aRet = L"(intern)";
+ else if ( nArgument == 1 ) aRet = L"Der Wert, der als Datum formatiert wird";
}
else if ( aProgrammaticFunctionName == L"getColorValue" )
{
- if ( nArgument == 0 ) aRet = L"Der Bereich, dessen Hintergrundfarbe abgefragt wird";
+ if ( nArgument == 0 ) aRet = L"Der Bereich, dessen Hintergrundfarbe abgefragt wird";
}
else if ( aProgrammaticFunctionName == L"transpose" )
{
- if ( nArgument == 0 ) aRet = L"Die Matrix, die transponiert werden soll";
+ if ( nArgument == 0 ) aRet = L"Die Matrix, die transponiert werden soll";
}
else if ( aProgrammaticFunctionName == L"transposeInt" )
{
- if ( nArgument == 0 ) aRet = L"Die Matrix, die transponiert werden soll";
+ if ( nArgument == 0 ) aRet = L"Die Matrix, die transponiert werden soll";
}
else if ( aProgrammaticFunctionName == L"repeatMultiple" )
{
- if ( nArgument == 0 ) aRet = L"Anzahl der Wiederholungen";
- else if ( nArgument == 1 ) aRet = L"Text, der zwischen den Inhalten erscheint";
- else if ( nArgument == 2 ) aRet = L"Mehrere Inhalte";
+ if ( nArgument == 0 ) aRet = L"Anzahl der Wiederholungen";
+ else if ( nArgument == 1 ) aRet = L"Text, der zwischen den Inhalten erscheint";
+ else if ( nArgument == 2 ) aRet = L"Mehrere Inhalte";
}
else if ( aProgrammaticFunctionName == L"getStrOrVal" )
{
- if ( nArgument == 0 ) aRet = L"Wenn Flag 0 ist, wird ein Wert zurueckgegeben, sonst ein String.";
+ if ( nArgument == 0 ) aRet = L"Wenn Flag 0 ist, wird ein Wert zurueckgegeben, sonst ein String.";
}
else if ( aProgrammaticFunctionName == L"callAsync" )
{
- if ( nArgument == 0 ) aRet = L"Ein String";
+ if ( nArgument == 0 ) aRet = L"Ein String";
}
return aRet;
}
@@ -311,28 +311,28 @@ UString ScTestAddIn::getArgumentDescription(const UString& aProgrammaticFunction
UString ScTestAddIn::getProgrammaticCategoryName(const UString& aProgrammaticFunctionName)
THROWS( (UsrSystemException) )
{
- // return non-translated strings
+ // return non-translated strings
UString aRet;
- if ( aProgrammaticFunctionName == L"countParams" ) aRet = L"Information";
- else if ( aProgrammaticFunctionName == L"addOne" ) aRet = L"Mathematical";
- else if ( aProgrammaticFunctionName == L"repeatStr" ) aRet = L"Text";
+ if ( aProgrammaticFunctionName == L"countParams" ) aRet = L"Information";
+ else if ( aProgrammaticFunctionName == L"addOne" ) aRet = L"Mathematical";
+ else if ( aProgrammaticFunctionName == L"repeatStr" ) aRet = L"Text";
else if ( aProgrammaticFunctionName == L"getDateString" ) aRet = L"Date&Time";
else if ( aProgrammaticFunctionName == L"getColorValue" ) aRet = L"Spreadsheet";
- else if ( aProgrammaticFunctionName == L"transpose" ) aRet = L"Matrix";
+ else if ( aProgrammaticFunctionName == L"transpose" ) aRet = L"Matrix";
else if ( aProgrammaticFunctionName == L"transposeInt" ) aRet = L"Matrix";
else if ( aProgrammaticFunctionName == L"repeatMultiple" )aRet = L"Text";
- else if ( aProgrammaticFunctionName == L"getStrOrVal" ) aRet = L"Add-In";
- else if ( aProgrammaticFunctionName == L"callAsync" ) aRet = L"Realtime"; // new group
+ else if ( aProgrammaticFunctionName == L"getStrOrVal" ) aRet = L"Add-In";
+ else if ( aProgrammaticFunctionName == L"callAsync" ) aRet = L"Realtime"; // new group
return aRet;
}
UString ScTestAddIn::getDisplayCategoryName(const UString& aProgrammaticFunctionName)
THROWS( (UsrSystemException) )
{
- // return translated strings
+ // return translated strings
- return L"irgendwas"; // not used for predefined categories
+ return L"irgendwas"; // not used for predefined categories
}
// XLocalizable
@@ -340,8 +340,8 @@ UString ScTestAddIn::getDisplayCategoryName(const UString& aProgrammaticFunction
void ScTestAddIn::setLocale(const lang::Locale& eLocale) THROWS( (UsrSystemException) )
{
aFuncLoc = eLocale;
-// DBG_ERROR( UStringToString(aFuncLoc.Language, CHARSET_SYSTEM) + String("-") +
-// UStringToString(aFuncLoc.Country, CHARSET_SYSTEM) );
+// DBG_ERROR( UStringToString(aFuncLoc.Language, CHARSET_SYSTEM) + String("-") +
+// UStringToString(aFuncLoc.Country, CHARSET_SYSTEM) );
}
::com::sun::star::lang::Locale SAL_CALL ScTestAddIn::getLocale( ) throw(::com::sun::star::uno::RuntimeException)
@@ -374,7 +374,7 @@ double SAL_CALL ScTestAddIn::addOne( double fValue ) throw(::com::sun::star::uno
::rtl::OUString SAL_CALL ScTestAddIn::getDateString( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCaller, double fValue ) throw(::com::sun::star::uno::RuntimeException)
{
uno::Any aDateAny = xCaller->getPropertyValue( L"NullDate" );
-//! if ( aDateAny.getReflection()->equals( *Date_getReflection() ) )
+//! if ( aDateAny.getReflection()->equals( *Date_getReflection() ) )
{
util::Date aDate;
aDateAny >>= aDate;
@@ -407,7 +407,7 @@ sal_Int32 SAL_CALL ScTestAddIn::getColorValue( const ::com::sun::star::uno::Refe
long nRet = -1;
uno::Any aTrans = xProp->getPropertyValue( L"IsCellBackgroundTransparent" );
BOOL bIsTrans;
- aTrans >>= bIsTrans; //! dont use >>= for BOOL
+ aTrans >>= bIsTrans; //! dont use >>= for BOOL
if (!bIsTrans)
{
uno::Any aCol = xProp->getPropertyValue( L"CellBackColor" );
@@ -427,7 +427,7 @@ double lcl_GetDoubleElement( const uno::Sequence< uno::Sequence<double> >& aMatr
if ( nCol < rRowSeq.getLength() )
return rRowSeq.getConstArray()[nCol];
}
- return 0.0; // error
+ return 0.0; // error
}
INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence<INT32> >& aMatrix, long nCol, long nRow )
@@ -438,7 +438,7 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence<INT32> >& aMatrix,
if ( nCol < rRowSeq.getLength() )
return rRowSeq.getConstArray()[nCol];
}
- return 0.0; // error
+ return 0.0; // error
}
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL ScTestAddIn::transpose( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aMatrix ) throw(::com::sun::star::uno::RuntimeException)
@@ -484,7 +484,7 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence<INT32> >& aMatrix,
::rtl::OUString SAL_CALL ScTestAddIn::repeatMultiple( sal_Int32 nCount, const ::com::sun::star::uno::Any& aFirst, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aFollow ) throw(::com::sun::star::uno::RuntimeException)
{
String aSeparator;
- if ( !aFirst.hasValue() ) // not specified
+ if ( !aFirst.hasValue() ) // not specified
aSeparator = ';';
else
{
@@ -492,7 +492,7 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence<INT32> >& aMatrix,
aFirst >>= aUStr;
aSeparator = OUStringToString( aUStr, CHARSET_SYSTEM );
}
-
+
String aContent;
long nContCount = aFollow.getLength();
const uno::Any* pArr = aFollow.getConstArray();
@@ -568,7 +568,7 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence<INT32> >& aMatrix,
::rtl::OUString SAL_CALL ScTestAddIn::getServiceName( ) throw(::com::sun::star::uno::RuntimeException)
{
- return SCTESTADDIN_SERVICE; // name of specific AddIn service
+ return SCTESTADDIN_SERVICE; // name of specific AddIn service
}
// XServiceInfo
diff --git a/sc/workben/addin.hxx b/sc/workben/addin.hxx
index 958bf34d92b5..55248faf6e92 100644
--- a/sc/workben/addin.hxx
+++ b/sc/workben/addin.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <stardiv/starcalc/test/XTestAddIn.hpp>
-#include <cppuhelper/implbase4.hxx> // helper for implementations
+#include <cppuhelper/implbase4.hxx> // helper for implementations
com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ScTestAddIn_CreateInstance(
@@ -47,20 +47,20 @@ class ScTestAddIn : public cppu::WeakImplHelper4<
com::sun::star::lang::XServiceInfo >
{
private:
- com::sun::star::uno::Reference<com::sun::star::sheet::XVolatileResult> xAlphaResult; //! Test
- com::sun::star::uno::Reference<com::sun::star::sheet::XVolatileResult> xNumResult; //! Test
- com::sun::star::lang::Locale aFuncLoc;
+ com::sun::star::uno::Reference<com::sun::star::sheet::XVolatileResult> xAlphaResult; //! Test
+ com::sun::star::uno::Reference<com::sun::star::sheet::XVolatileResult> xNumResult; //! Test
+ com::sun::star::lang::Locale aFuncLoc;
public:
ScTestAddIn();
- virtual ~ScTestAddIn();
+ virtual ~ScTestAddIn();
-// SMART_UNO_DECLARATION( ScTestAddIn, UsrObject );
-// friend Reflection * ScTestAddIn_getReflection();
-// virtual BOOL queryInterface( Uik, XInterfaceRef& );
-// virtual XIdlClassRef getIdlClass(void);
+// SMART_UNO_DECLARATION( ScTestAddIn, UsrObject );
+// friend Reflection * ScTestAddIn_getReflection();
+// virtual BOOL queryInterface( Uik, XInterfaceRef& );
+// virtual XIdlClassRef getIdlClass(void);
- static UString getImplementationName_Static();
+ static UString getImplementationName_Static();
static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static();
// XAddIn
diff --git a/sc/workben/map.idl b/sc/workben/map.idl
index 8c198970dd2c..c90433ef55ff 100644
--- a/sc/workben/map.idl
+++ b/sc/workben/map.idl
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/workben/result.cxx b/sc/workben/result.cxx
index 9198692357e6..9ca4d490731a 100644
--- a/sc/workben/result.cxx
+++ b/sc/workben/result.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ void ScAddInResult::NewValue()
}
// else void
-// sheet::ResultEvent aEvent( (UsrObject*)this, aAny );
+// sheet::ResultEvent aEvent( (UsrObject*)this, aAny );
sheet::ResultEvent aEvent( (cppu::OWeakObject*)this, aAny );
for ( USHORT n=0; n<aListeners.Count(); n++ )
@@ -95,9 +95,9 @@ void SAL_CALL ScAddInResult::addResultListener( const ::com::sun::star::uno::Ref
if ( aListeners.Count() == 1 )
{
- acquire(); // one Ref for all listeners
+ acquire(); // one Ref for all listeners
- NewValue(); //! Test
+ NewValue(); //! Test
}
}
@@ -115,9 +115,9 @@ void SAL_CALL ScAddInResult::removeResultListener( const ::com::sun::star::uno::
if ( aListeners.Count() == 0 )
{
- nTickCount = 0; //! Test
+ nTickCount = 0; //! Test
- release(); // release listener Ref
+ release(); // release listener Ref
}
break;
diff --git a/sc/workben/result.hxx b/sc/workben/result.hxx
index 1248eb290916..9beb6882fcd0 100644
--- a/sc/workben/result.hxx
+++ b/sc/workben/result.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,7 @@
#include <com/sun/star/sheet/XVolatileResult.hpp>
-#include <cppuhelper/implbase1.hxx> // helper for implementations
+#include <cppuhelper/implbase1.hxx> // helper for implementations
//class XResultListenerRef;
@@ -47,23 +47,23 @@ class ScAddInResult : public cppu::WeakImplHelper1<
com::sun::star::sheet::XVolatileResult>
{
private:
- String aArg;
- long nTickCount;
- XResultListenerArr_Impl aListeners;
- Timer aTimer;
+ String aArg;
+ long nTickCount;
+ XResultListenerArr_Impl aListeners;
+ Timer aTimer;
DECL_LINK( TimeoutHdl, Timer* );
- void NewValue();
+ void NewValue();
public:
ScAddInResult(const String& rStr);
- virtual ~ScAddInResult();
+ virtual ~ScAddInResult();
-// SMART_UNO_DECLARATION( ScAddInResult, UsrObject );
+// SMART_UNO_DECLARATION( ScAddInResult, UsrObject );
-// virtual BOOL queryInterface( Uik, XInterfaceRef& );
-// virtual XIdlClassRef getIdlClass(void);
+// virtual BOOL queryInterface( Uik, XInterfaceRef& );
+// virtual XIdlClassRef getIdlClass(void);
// XVolatileResult
virtual void SAL_CALL addResultListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XResultListener >& aListener ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx
index 4caa49e3adcd..d91e76af3a86 100644
--- a/sc/workben/test.cxx
+++ b/sc/workben/test.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,14 +55,14 @@
#include <stardiv/one/sheet/scdata.hxx>
#include <stardiv/one/sheet/scattr.hxx>
-//! das muss als Konstante in irgendeine idl-Datei!!!!
-#define TEXTCONTROLCHAR_PARAGRAPH_BREAK 0
+//! das muss als Konstante in irgendeine idl-Datei!!!!
+#define TEXTCONTROLCHAR_PARAGRAPH_BREAK 0
class MyFixedText : public FixedText
{
protected:
- void RequestHelp( const HelpEvent& rHEvt );
+ void RequestHelp( const HelpEvent& rHEvt );
public:
MyFixedText(Window* pParent) : FixedText(pParent) {}
};
@@ -70,18 +70,18 @@ public:
class MyWindow : public Window
{
private:
- NumericField aCountField;
- PushButton aCountButton;
- MyFixedText aTimeText;
- NumericField aColField;
- NumericField aRowField;
- NumericField aPosField;
- NumericField aLenField;
- Edit aTextEdit;
- PushButton aTextButton;
- PushButton aBlaButton;
- PushButton aTabButton;
- PushButton aViewButton;
+ NumericField aCountField;
+ PushButton aCountButton;
+ MyFixedText aTimeText;
+ NumericField aColField;
+ NumericField aRowField;
+ NumericField aPosField;
+ NumericField aLenField;
+ Edit aTextEdit;
+ PushButton aTextButton;
+ PushButton aBlaButton;
+ PushButton aTabButton;
+ PushButton aViewButton;
public:
MyWindow( Window *pParent );
@@ -98,21 +98,21 @@ public:
class ScTestListener : public XSelectionChangeListener, public UsrObject
{
private:
- FixedText* pFixedText;
+ FixedText* pFixedText;
public:
ScTestListener(FixedText* pF);
- virtual ~ScTestListener();
+ virtual ~ScTestListener();
SMART_UNO_DECLARATION( ScTestListener, UsrObject );
- virtual XInterface * queryInterface( UsrUik );
- virtual XIdlClassRef getIdlClass(void);
+ virtual XInterface * queryInterface( UsrUik );
+ virtual XIdlClassRef getIdlClass(void);
- virtual void disposing(const EventObject& Source);
+ virtual void disposing(const EventObject& Source);
// XSelectionChangeListener
- virtual void selectionChanged(const EventObject& aEvent);
+ virtual void selectionChanged(const EventObject& aEvent);
};
//-----------------------------------------------------------------------
@@ -184,9 +184,9 @@ extern "C" Window* __LOADONCALLAPI CreateWindow( Window *pParent, const String&
void MyFixedText::RequestHelp( const HelpEvent& rHEvt )
{
- String aTxtStr=GetText();
- Size aTxtSize=GetTextSize(aTxtStr);
- Point aShowPoint= OutputToScreenPixel(Point(0,0));
+ String aTxtStr=GetText();
+ Size aTxtSize=GetTextSize(aTxtStr);
+ Point aShowPoint= OutputToScreenPixel(Point(0,0));
if ( ( rHEvt.GetMode() & HELPMODE_QUICK ) == HELPMODE_QUICK &&
aTxtSize.Width()>GetSizePixel().Width())
Help::ShowQuickHelp( Rectangle(aShowPoint,aTxtSize), aTxtStr, QUICKHELP_TOP|QUICKHELP_LEFT );
@@ -275,8 +275,8 @@ XSpreadsheetDocumentRef lcl_GetDocument()
xSSI->newInstance()->queryInterface( XModelCollection::getSmartUik() );
USHORT nCount = aCollRef->getCount();
- XSpreadsheetDocumentRef xModel; // Calc-Model
- for (USHORT nMod=0; nMod<nCount && !xModel; nMod++) // Calc-Doc suchen
+ XSpreadsheetDocumentRef xModel; // Calc-Model
+ for (USHORT nMod=0; nMod<nCount && !xModel; nMod++) // Calc-Doc suchen
{
XModelRef aRef = aCollRef->getItemByIndex( nMod );
if ( aRef )
@@ -292,23 +292,23 @@ XSpreadsheetDocumentRef lcl_GetDocument()
XInterfaceRef lcl_GetView()
{
XInterfaceRef xView;
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (xDoc)
- xView = xDoc->getDDELinks(); //! temporaer zum Testen !!!!!!!!!
+ xView = xDoc->getDDELinks(); //! temporaer zum Testen !!!!!!!!!
return xView;
}
//-----------------------------------------------------------------------
-void lcl_OutputNames( const XInterfaceRef& xSource, // XNameAccess
+void lcl_OutputNames( const XInterfaceRef& xSource, // XNameAccess
const XSpreadsheetDocumentRef& xDoc,
USHORT nCol, USHORT nRow, USHORT nTab )
{
CellAddress aAdr;
- aAdr.Sheet = nTab;
- aAdr.Column = nCol;
- aAdr.Row = nRow;
+ aAdr.Sheet = nTab;
+ aAdr.Column = nCol;
+ aAdr.Row = nRow;
XNameAccessRef xNames = (XNameAccess*)xSource->queryInterface(XNameAccess::getSmartUik());
if (!xNames) return;
@@ -347,7 +347,7 @@ void lcl_SetText( const XTextRef& xText )
XParagraphCursorRef xPara = (XParagraphCursor*)
xCursor->queryInterface(XParagraphCursor::getSmartUik());
- if (!xPos.is() || !xControl.is() || !xPara.is()) return; // PropertySet kann fehlen
+ if (!xPos.is() || !xControl.is() || !xPara.is()) return; // PropertySet kann fehlen
xText->setText(L"bla fasel");
xCursor->gotoEnd(FALSE);
@@ -357,7 +357,7 @@ void lcl_SetText( const XTextRef& xText )
xCursor->gotoStart(FALSE);
xPara->gotoEndOfParagraph(FALSE);
- xCursor->goLeft(5, TRUE); // letzte 5 Zeichen im 1. Absatz
+ xCursor->goLeft(5, TRUE); // letzte 5 Zeichen im 1. Absatz
if (xProp.is())
xProp->setPropertyValue(L"Bold", UsrAny((BOOL)TRUE));
}
@@ -366,7 +366,7 @@ void lcl_SetText( const XTextRef& xText )
void lcl_DoCount()
{
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (xDoc)
{
XActionLockableRef xLock = (XActionLockable*)
@@ -374,7 +374,7 @@ void lcl_DoCount()
XCalculateRef xCalc = (XCalculate*)
xDoc->queryInterface(XCalculate::getSmartUik());
if (xLock)
- xLock->addActionLock(); // nicht zwischendurch painten
+ xLock->addActionLock(); // nicht zwischendurch painten
if (xCalc)
xCalc->setAutomaticCalculation(FALSE);
@@ -390,7 +390,7 @@ void lcl_DoCount()
XCellRef xCell = xDoc->getCell(aPos);
if ( xCell )
{
- // Wert der Zelle um 1 hochzaehlen
+ // Wert der Zelle um 1 hochzaehlen
double fVal = xCell->getValue();
fVal += 1.0;
@@ -420,7 +420,7 @@ void lcl_GlobalCell()
void lcl_Annotations( FixedText& aTimeText )
{
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (xDoc)
{
CellAddress aPos;
@@ -485,7 +485,7 @@ void lcl_Annotations( FixedText& aTimeText )
void lcl_Cursor( FixedText& aTimeText )
{
aTimeText.SetText( "..." );
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (xDoc)
{
XActionLockableRef xLock = (XActionLockable*)
@@ -519,7 +519,7 @@ void lcl_Cursor( FixedText& aTimeText )
xColl = xCC->getRanges();
if ( xColl )
{
- // XText ist drin, wenn's ne einzelne Zelle ist
+ // XText ist drin, wenn's ne einzelne Zelle ist
xText = (XText*)xColl->queryInterface(XText::getSmartUik());
if ( xText )
{
@@ -528,11 +528,11 @@ void lcl_Cursor( FixedText& aTimeText )
}
CellRangeAddress aSecond;
- aSecond.Sheet = 0;
- aSecond.StartColumn = 3;
- aSecond.StartRow = 4;
- aSecond.EndColumn = 3;
- aSecond.EndRow = 4;
+ aSecond.Sheet = 0;
+ aSecond.StartColumn = 3;
+ aSecond.StartRow = 4;
+ aSecond.EndColumn = 3;
+ aSecond.EndRow = 4;
xRC->gotoUnion(aSecond);
xColl = xCC->getRanges();
@@ -550,10 +550,10 @@ void lcl_Cursor( FixedText& aTimeText )
{
//ShadowFormat* pOld = (ShadowFormat*)aAny.get();
ShadowFormat aNew;
- aNew.Location = SHADOWLOCATION_BOTTOMRIGHT;
- aNew.ShadowWidth = 100;
- aNew.IsTransparent = FALSE;
- aNew.Color = 0xff0000L;
+ aNew.Location = SHADOWLOCATION_BOTTOMRIGHT;
+ aNew.ShadowWidth = 100;
+ aNew.IsTransparent = FALSE;
+ aNew.Color = 0xff0000L;
aAny.set( &aNew, aAny.getReflection() );
xProp->setPropertyValue(L"ShadowFormat", aAny);
}
@@ -580,10 +580,10 @@ void lcl_Cursor( FixedText& aTimeText )
{
//CellProtection* pOld = (CellProtection*)aAny.get();
CellProtection aNew;
- aNew.Locked = FALSE;
- aNew.FormulaHidden = FALSE;
- aNew.Hidden = FALSE;
- aNew.PrintHidden = FALSE;
+ aNew.Locked = FALSE;
+ aNew.FormulaHidden = FALSE;
+ aNew.Hidden = FALSE;
+ aNew.PrintHidden = FALSE;
aAny.set( &aNew, aAny.getReflection() );
xProp->setPropertyValue(L"CellProtection", aAny);
}
@@ -612,7 +612,7 @@ void lcl_Cursor( FixedText& aTimeText )
void lcl_Cells( FixedText& aTimeText )
{
aTimeText.SetText( "..." );
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (xDoc)
{
long nCount = 0;
@@ -620,15 +620,15 @@ void lcl_Cells( FixedText& aTimeText )
XActionLockableRef xLock = (XActionLockable*)
xDoc->queryInterface(XActionLockable::getSmartUik());
-// if (xLock)
-// xLock->addActionLock();
+// if (xLock)
+// xLock->addActionLock();
CellRangeAddress aRngAddr;
- aRngAddr.Sheet = 0;
+ aRngAddr.Sheet = 0;
aRngAddr.StartColumn = 0;
- aRngAddr.StartRow = 0;
- aRngAddr.EndColumn = 9;
- aRngAddr.EndRow = 19;
+ aRngAddr.StartRow = 0;
+ aRngAddr.EndColumn = 9;
+ aRngAddr.EndRow = 19;
XCellRangeRef xRange = xDoc->getCellRange(aRngAddr);
if (xRange)
{
@@ -659,15 +659,15 @@ void lcl_Cells( FixedText& aTimeText )
aTimeText.SetText(String(nCount)+String(" ")+String(nEnd-nStart)+String(" ms"));
-// if (xLock)
-// xLock->removeActionLock();
+// if (xLock)
+// xLock->removeActionLock();
}
}
void lcl_Sheet( FixedText& aTimeText )
{
aTimeText.SetText( "..." );
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (!xDoc) return;
XSpreadsheetsRef xSheets = xDoc->getSheets();
if (!xSheets) return;
@@ -699,8 +699,8 @@ void lcl_Sheet( FixedText& aTimeText )
if (!xCol) return;
UINT16 nWidth = TypeConversion::toUINT16(xCol->getPropertyValue(L"Width"));
-// UINT16 nNewWidth = nWidth + 100;
-// xCol->setPropertyValue(L"Width", UsrAny(nNewWidth));
+// UINT16 nNewWidth = nWidth + 100;
+// xCol->setPropertyValue(L"Width", UsrAny(nNewWidth));
xCol->setPropertyValue(L"OptimalWidth", UsrAny((BOOL)TRUE));
xCol->setPropertyValue(L"NewPage", UsrAny((BOOL)FALSE));
@@ -711,10 +711,10 @@ void lcl_Sheet( FixedText& aTimeText )
{
//ShadowFormat* pOld = (ShadowFormat*)aAny.get();
ShadowFormat aNew;
- aNew.Location = SHADOWLOCATION_BOTTOMRIGHT;
- aNew.ShadowWidth = 100;
- aNew.IsTransparent = FALSE;
- aNew.Color = 0xff0000L;
+ aNew.Location = SHADOWLOCATION_BOTTOMRIGHT;
+ aNew.ShadowWidth = 100;
+ aNew.IsTransparent = FALSE;
+ aNew.Color = 0xff0000L;
aAny.set( &aNew, aAny.getReflection() );
xCol->setPropertyValue(L"ShadowFormat", aAny);
}
@@ -739,7 +739,7 @@ void lcl_Sheet( FixedText& aTimeText )
void lcl_Names( FixedText& aTimeText )
{
aTimeText.SetText( "..." );
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (!xDoc) return;
XNamedRangesRef xNames = xDoc->getNamedRanges();
if (!xNames) return;
@@ -763,7 +763,7 @@ void lcl_Names( FixedText& aTimeText )
void lcl_Sheets( FixedText& aTimeText )
{
aTimeText.SetText( "..." );
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (!xDoc) return;
XSpreadsheetsRef xSheets = xDoc->getSheets();
if (!xSheets) return;
@@ -781,17 +781,17 @@ void lcl_Sheets( FixedText& aTimeText )
void lcl_Goal( FixedText& aTimeText )
{
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (!xDoc) return;
XGoalSeekRef xGoal = (XGoalSeek*)xDoc->queryInterface(XGoalSeek::getSmartUik());
if (!xGoal) return;
double fResult;
- CellAddress aFormula; // A1
+ CellAddress aFormula; // A1
aFormula.Sheet = 0;
aFormula.Column = 0;
aFormula.Row = 0;
- CellAddress aVar; // A2
+ CellAddress aVar; // A2
aVar.Sheet = 0;
aVar.Column = 0;
aVar.Row = 1;
@@ -799,7 +799,7 @@ void lcl_Goal( FixedText& aTimeText )
if (bFound)
{
- CellAddress aOut; // A3
+ CellAddress aOut; // A3
aOut.Sheet = 0;
aOut.Column = 0;
aOut.Row = 2;
@@ -812,8 +812,8 @@ void lcl_Goal( FixedText& aTimeText )
void lcl_TabOp( FixedText& aTimeText )
{
- // Mehrfachoperation auf Tabelle2
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ // Mehrfachoperation auf Tabelle2
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (!xDoc) return;
XCellRangeRef xRange;
@@ -824,22 +824,22 @@ void lcl_TabOp( FixedText& aTimeText )
CellAddress aRowCell;
TableOperationMode nMode;
- aRangeAddr.Sheet = 1; // c9:e11
- aRangeAddr.StartColumn = 2;
- aRangeAddr.StartRow = 8;
- aRangeAddr.EndColumn = 4;
- aRangeAddr.EndRow = 10;
- aFormulaRange.Sheet = 1; // c6:c7
- aFormulaRange.StartColumn = 2;
- aFormulaRange.StartRow = 5;
- aFormulaRange.EndColumn = 2;
- aFormulaRange.EndRow = 6;
- aColumnCell.Sheet = 0; // nicht benutzt
- aColumnCell.Column = 0;
- aColumnCell.Row = 0;
- aRowCell.Sheet = 1; // c5
- aRowCell.Column = 2;
- aRowCell.Row = 4;
+ aRangeAddr.Sheet = 1; // c9:e11
+ aRangeAddr.StartColumn = 2;
+ aRangeAddr.StartRow = 8;
+ aRangeAddr.EndColumn = 4;
+ aRangeAddr.EndRow = 10;
+ aFormulaRange.Sheet = 1; // c6:c7
+ aFormulaRange.StartColumn = 2;
+ aFormulaRange.StartRow = 5;
+ aFormulaRange.EndColumn = 2;
+ aFormulaRange.EndRow = 6;
+ aColumnCell.Sheet = 0; // nicht benutzt
+ aColumnCell.Column = 0;
+ aColumnCell.Row = 0;
+ aRowCell.Sheet = 1; // c5
+ aRowCell.Column = 2;
+ aRowCell.Row = 4;
nMode = TABLEOP_ROW;
xRange = xDoc->getCellRange(aRangeAddr);
@@ -848,22 +848,22 @@ void lcl_TabOp( FixedText& aTimeText )
if (!xGoal) return;
xGoal->setTableOperation( nMode, aFormulaRange, aColumnCell, aRowCell );
- aRangeAddr.Sheet = 1; // b19:d21
- aRangeAddr.StartColumn = 1;
- aRangeAddr.StartRow = 18;
- aRangeAddr.EndColumn = 3;
- aRangeAddr.EndRow = 20;
- aFormulaRange.Sheet = 1; // c16:d16
- aFormulaRange.StartColumn = 2;
- aFormulaRange.StartRow = 15;
- aFormulaRange.EndColumn = 3;
- aFormulaRange.EndRow = 15;
- aColumnCell.Sheet = 1; // b16
- aColumnCell.Column = 1;
- aColumnCell.Row = 15;
- aRowCell.Sheet = 0; // nicht benutzt
- aRowCell.Column = 0;
- aRowCell.Row = 0;
+ aRangeAddr.Sheet = 1; // b19:d21
+ aRangeAddr.StartColumn = 1;
+ aRangeAddr.StartRow = 18;
+ aRangeAddr.EndColumn = 3;
+ aRangeAddr.EndRow = 20;
+ aFormulaRange.Sheet = 1; // c16:d16
+ aFormulaRange.StartColumn = 2;
+ aFormulaRange.StartRow = 15;
+ aFormulaRange.EndColumn = 3;
+ aFormulaRange.EndRow = 15;
+ aColumnCell.Sheet = 1; // b16
+ aColumnCell.Column = 1;
+ aColumnCell.Row = 15;
+ aRowCell.Sheet = 0; // nicht benutzt
+ aRowCell.Column = 0;
+ aRowCell.Row = 0;
nMode = TABLEOP_COLUMN;
xRange = xDoc->getCellRange(aRangeAddr);
@@ -872,22 +872,22 @@ void lcl_TabOp( FixedText& aTimeText )
if (!xGoal) return;
xGoal->setTableOperation( nMode, aFormulaRange, aColumnCell, aRowCell );
- aRangeAddr.Sheet = 1; // b29:e32
- aRangeAddr.StartColumn = 1;
- aRangeAddr.StartRow = 28;
- aRangeAddr.EndColumn = 4;
- aRangeAddr.EndRow = 31;
- aFormulaRange.Sheet = 1; // c27:c27
- aFormulaRange.StartColumn = 2;
- aFormulaRange.StartRow = 26;
- aFormulaRange.EndColumn = 2;
- aFormulaRange.EndRow = 26;
- aColumnCell.Sheet = 1; // c25
- aColumnCell.Column = 2;
- aColumnCell.Row = 24;
- aRowCell.Sheet = 1; // c26
- aRowCell.Column = 2;
- aRowCell.Row = 25;
+ aRangeAddr.Sheet = 1; // b29:e32
+ aRangeAddr.StartColumn = 1;
+ aRangeAddr.StartRow = 28;
+ aRangeAddr.EndColumn = 4;
+ aRangeAddr.EndRow = 31;
+ aFormulaRange.Sheet = 1; // c27:c27
+ aFormulaRange.StartColumn = 2;
+ aFormulaRange.StartRow = 26;
+ aFormulaRange.EndColumn = 2;
+ aFormulaRange.EndRow = 26;
+ aColumnCell.Sheet = 1; // c25
+ aColumnCell.Column = 2;
+ aColumnCell.Row = 24;
+ aRowCell.Sheet = 1; // c26
+ aRowCell.Column = 2;
+ aRowCell.Row = 25;
nMode = TABLEOP_BOTH;
xRange = xDoc->getCellRange(aRangeAddr);
@@ -910,7 +910,7 @@ void lcl_Fill( FixedText& aTimeText )
XCellSeriesRef xFill = (XCellSeries*)xSelInt->queryInterface(XCellSeries::getSmartUik());
if (!xFill) return;
-// xFill->fillAuto( FILL_DIRECTION_TO_BOTTOM, 2 );
+// xFill->fillAuto( FILL_DIRECTION_TO_BOTTOM, 2 );
xFill->fillSeries( FILL_DIRECTION_TO_LEFT, FILL_MODE_GROWTH, FILL_DATE_DAY,
2.0, 1000.0 );
@@ -919,7 +919,7 @@ void lcl_Fill( FixedText& aTimeText )
void lcl_Audi( FixedText& aTimeText )
{
aTimeText.SetText( "..." );
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (!xDoc) return;
XSpreadsheetsRef xSheets = xDoc->getSheets();
if (!xSheets) return;
@@ -930,15 +930,15 @@ void lcl_Audi( FixedText& aTimeText )
if (!xAudi) return;
CellAddress aPosition;
- aPosition.Sheet = 0;
- aPosition.Column = 0;
- aPosition.Row = 0;
+ aPosition.Sheet = 0;
+ aPosition.Column = 0;
+ aPosition.Row = 0;
xAudi->showDependents(aPosition);
}
void lcl_Consoli( FixedText& aTimeText )
{
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (!xDoc) return;
XConsolidationRef xCons = (XConsolidation*)xDoc->queryInterface(XConsolidation::getSmartUik());
if (!xCons) return;
@@ -963,19 +963,19 @@ void lcl_Sort( FixedText& aTimeText )
Sequence<SortField> aFields = xDesc->getSortFields();
if (aFields.getLen())
{
- // 1.Feld umkehren
+ // 1.Feld umkehren
SortField* pAry = aFields.getArray();
if (!pAry) return;
pAry[0].Ascending = !pAry[0].Ascending;
}
- else // neue Sequence, 1. Spalte aufsteigend
+ else // neue Sequence, 1. Spalte aufsteigend
{
aFields = Sequence<SortField>(1);
SortField* pAry = aFields.getArray();
if (!pAry) return;
- pAry[0].Field = 0;
+ pAry[0].Field = 0;
pAry[0].Ascending = TRUE;
- pAry[0].Type = SORT_FIELD_AUTOMATIC;
+ pAry[0].Type = SORT_FIELD_AUTOMATIC;
}
xDesc->setSortFields(aFields);
@@ -1016,7 +1016,7 @@ void lcl_Filter( FixedText& aTimeText )
Sequence<TableFilterField> aFields = xDesc->getFilterFields();
if (aFields.getLen())
{
- // 1.Feld zwischen 1. und 2. Spalte toggeln
+ // 1.Feld zwischen 1. und 2. Spalte toggeln
TableFilterField* pAry = aFields.getArray();
if (!pAry) return;
pAry[0].Field = pAry[0].Field ? 0 : 1;
@@ -1025,14 +1025,14 @@ void lcl_Filter( FixedText& aTimeText )
xFilter->filter(xDesc);
#endif
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (!xDoc) return;
CellRangeAddress aAddress;
- aAddress.Sheet = 3;
+ aAddress.Sheet = 3;
aAddress.StartColumn = 0;
- aAddress.StartRow = 0;
- aAddress.EndColumn = 1;
- aAddress.EndRow = 2;
+ aAddress.StartRow = 0;
+ aAddress.EndColumn = 1;
+ aAddress.EndRow = 2;
XCellRangeRef xRange = xDoc->getCellRange(aAddress);
if (!xRange) return;
XAdvancedFilterSourceRef xSource = (XAdvancedFilterSource*)
@@ -1088,7 +1088,7 @@ void lcl_Outline( FixedText& aTimeText )
{
static BOOL bOutline = FALSE;
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (!xDoc) return;
XSpreadsheetsRef xSheets = xDoc->getSheets();
if (!xSheets) return;
@@ -1120,19 +1120,19 @@ void lcl_Bla( FixedText& aTimeText )
{
aTimeText.SetText("...");
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (!xDoc) return;
XActionLockableRef xLock = (XActionLockable*)xDoc->queryInterface(XActionLockable::getSmartUik());
if (!xLock) return;
xLock->addActionLock();
xLock->addActionLock();
- USHORT nCount = xLock->resetActionLocks(); // sollte 2 sein
+ USHORT nCount = xLock->resetActionLocks(); // sollte 2 sein
String aBla = nCount;
xLock->setActionLocks(nCount);
xLock->removeActionLock();
xLock->removeActionLock();
- aBla += '/'; aBla += xLock->resetActionLocks(); // sollte 0 sein
+ aBla += '/'; aBla += xLock->resetActionLocks(); // sollte 0 sein
aTimeText.SetText(aBla);
}
@@ -1164,7 +1164,7 @@ void lcl_CellCursor( FixedText& aTimeText )
if (!xFC) return;
CellAddress aPos;
- aPos.Sheet = 0; // ignored
+ aPos.Sheet = 0; // ignored
aPos.Row = 3;
aPos.Column = 2;
@@ -1194,7 +1194,7 @@ void lcl_CellCursor( FixedText& aTimeText )
void lcl_Notes( FixedText& aTimeText )
{
aTimeText.SetText( "..." );
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (!xDoc) return;
XSpreadsheetsRef xSheets = xDoc->getSheets();
if (!xSheets) return;
@@ -1207,9 +1207,9 @@ void lcl_Notes( FixedText& aTimeText )
if (!xNIndex) return;
CellAddress aPos;
- aPos.Column = 0;
- aPos.Row = 0;
- aPos.Sheet = 0;
+ aPos.Column = 0;
+ aPos.Row = 0;
+ aPos.Sheet = 0;
xNotes->addAnnotation( L"neu", aPos );
ULONG nCount = xNIndex->getCount();
@@ -1229,7 +1229,7 @@ void lcl_Notes( FixedText& aTimeText )
void lcl_Scenario( FixedText& aTimeText )
{
aTimeText.SetText( "..." );
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (!xDoc) return;
XSpreadsheetsRef xSheets = xDoc->getSheets();
if (!xSheets) return;
@@ -1242,16 +1242,16 @@ void lcl_Scenario( FixedText& aTimeText )
Sequence<CellRangeAddress> aRanges(2);
CellRangeAddress* pAry = aRanges.getArray();
if (!pAry) return;
- pAry[0].Sheet = 0;
- pAry[0].StartColumn = 0;
- pAry[0].StartRow = 0;
- pAry[0].EndColumn = 1;
- pAry[0].EndRow = 1;
- pAry[1].Sheet = 0;
- pAry[1].StartColumn = 3;
- pAry[1].StartRow = 3;
- pAry[1].EndColumn = 4;
- pAry[1].EndRow = 4;
+ pAry[0].Sheet = 0;
+ pAry[0].StartColumn = 0;
+ pAry[0].StartRow = 0;
+ pAry[0].EndColumn = 1;
+ pAry[0].EndRow = 1;
+ pAry[1].Sheet = 0;
+ pAry[1].StartColumn = 3;
+ pAry[1].StartRow = 3;
+ pAry[1].EndColumn = 4;
+ pAry[1].EndRow = 4;
xColl->addScenario( aRanges, L"bla", L"bla blubb" );
@@ -1266,11 +1266,11 @@ void lcl_Scenario( FixedText& aTimeText )
aRanges = Sequence<CellRangeAddress>(1);
pAry = aRanges.getArray();
if (!pAry) return;
- pAry[0].Sheet = 0;
- pAry[0].StartColumn = 6;
- pAry[0].StartRow = 6;
- pAry[0].EndColumn = 7;
- pAry[0].EndRow = 7;
+ pAry[0].Sheet = 0;
+ pAry[0].StartColumn = 6;
+ pAry[0].StartRow = 6;
+ pAry[0].EndColumn = 7;
+ pAry[0].EndRow = 7;
xScen->addRanges( aRanges );
@@ -1285,7 +1285,7 @@ void lcl_Formula( FixedText& aTimeText )
{
aTimeText.SetText("...");
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (!xDoc) return;
CellAddress aPos;
aPos.Sheet = 0;
@@ -1294,8 +1294,8 @@ void lcl_Formula( FixedText& aTimeText )
XCellRef xCell = xDoc->getCell(aPos);
if (!xCell) return;
-// String aStr = OUStringToString( xCell->getFormula(), CHARSET_SYSTEM );
-// aTimeText.SetText(aStr);
+// String aStr = OUStringToString( xCell->getFormula(), CHARSET_SYSTEM );
+// aTimeText.SetText(aStr);
XTextRef xText = (XText*)xCell->queryInterface(XText::getSmartUik());
if (!xText) return;
@@ -1303,21 +1303,21 @@ void lcl_Formula( FixedText& aTimeText )
aTimeText.SetText(aStr);
}
-void lcl_DBRange( FixedText& aTimeText ) // 23
+void lcl_DBRange( FixedText& aTimeText ) // 23
{
aTimeText.SetText("...");
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (!xDoc) return;
XDatabaseRangesRef xDBs = xDoc->getDatabaseRanges();
if (!xDBs) return;
CellRangeAddress aRange;
- aRange.Sheet = 0;
- aRange.StartColumn = 1;
- aRange.StartRow = 1;
- aRange.EndColumn = 3;
- aRange.EndRow = 10;
+ aRange.Sheet = 0;
+ aRange.StartColumn = 1;
+ aRange.StartRow = 1;
+ aRange.EndColumn = 3;
+ aRange.EndRow = 10;
xDBs->addRange( L"blubb", aRange );
@@ -1336,7 +1336,7 @@ void lcl_DBRange( FixedText& aTimeText ) // 23
xDB->setDataArea(aDBRange);
}
-void lcl_FillTab( FixedText& aTimeText ) // 24
+void lcl_FillTab( FixedText& aTimeText ) // 24
{
aTimeText.SetText("...");
@@ -1355,7 +1355,7 @@ void lcl_FillTab( FixedText& aTimeText ) // 24
aTimeText.SetText(nCount);
}
-void lcl_Listener( FixedText& aTimeText ) // 25
+void lcl_Listener( FixedText& aTimeText ) // 25
{
XInterfaceRef xInt = lcl_GetView();
if (!xInt) return;
@@ -1364,7 +1364,7 @@ void lcl_Listener( FixedText& aTimeText ) // 25
xView->addSelectionChangeListener( new ScTestListener(&aTimeText) );
}
-void lcl_CellAttrib( FixedText& aTimeText ) // 26
+void lcl_CellAttrib( FixedText& aTimeText ) // 26
{
XInterfaceRef xInt = lcl_GetView();
if (!xInt) return;
@@ -1405,23 +1405,23 @@ void lcl_CellAttrib( FixedText& aTimeText ) // 26
xProp->setPropertyValue(L"Underlined", UsrAny((BOOL)TRUE));
}
-void lcl_Styles( FixedText& aTimeText ) // 27
+void lcl_Styles( FixedText& aTimeText ) // 27
{
aTimeText.SetText("...");
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (!xDoc) return;
XStyleFamiliesRef xFamilies = xDoc->getStyleFamilies();
if (!xFamilies) return;
- XStyleFamilyRef xFamily = xFamilies->getStyleFamilyByType( STYLE_FAMILY_CELL );
-// XStyleFamilyRef xFamily = xFamilies->getStyleFamilyByType( STYLE_FAMILY_PAGE );
+ XStyleFamilyRef xFamily = xFamilies->getStyleFamilyByType( STYLE_FAMILY_CELL );
+// XStyleFamilyRef xFamily = xFamilies->getStyleFamilyByType( STYLE_FAMILY_PAGE );
if (!xFamily) return;
long nCount = xFamily->getCount();
aTimeText.SetText(nCount);
XStyleRef xStyle = xFamily->getStyleByName(L"rot");
if (!xStyle) return;
-// XPropertySetRef xProp = (XPropertySet*)xStyle->queryInterface(XPropertySet::getSmartUik());
-// if (!xProp) return;
+// XPropertySetRef xProp = (XPropertySet*)xStyle->queryInterface(XPropertySet::getSmartUik());
+// if (!xProp) return;
XStyleRef xNew = xFamily->addStyle( L"gaga", xStyle );
if (!xNew) return;
@@ -1439,15 +1439,15 @@ void lcl_Styles( FixedText& aTimeText ) // 27
xFamily->removeStyle( L"rot" );
}
-void lcl_PageStyle( FixedText& aTimeText ) // 28
+void lcl_PageStyle( FixedText& aTimeText ) // 28
{
aTimeText.SetText("...");
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (!xDoc) return;
XStyleFamiliesRef xFamilies = xDoc->getStyleFamilies();
if (!xFamilies) return;
- XStyleFamilyRef xFamily = xFamilies->getStyleFamilyByType( STYLE_FAMILY_PAGE );
+ XStyleFamilyRef xFamily = xFamilies->getStyleFamilyByType( STYLE_FAMILY_PAGE );
if (!xFamily) return;
XStyleRef xStyle = xFamily->getStyleByName(L"Standard");
if (!xStyle) return;
@@ -1458,8 +1458,8 @@ void lcl_PageStyle( FixedText& aTimeText ) // 28
aAny = xProp->getPropertyValue(L"RightPageHeaderContent");
// geht nicht:
-// if ( !XHeaderFooterContent_getReflection()->equals(*aAny.getReflection()) )
-// return;
+// if ( !XHeaderFooterContent_getReflection()->equals(*aAny.getReflection()) )
+// return;
XHeaderFooterContentRef* pxContent = (XHeaderFooterContentRef*)aAny.get();
if (!pxContent || !pxContent->is()) return;
@@ -1476,18 +1476,18 @@ void lcl_PageStyle( FixedText& aTimeText ) // 28
xProp->setPropertyValue(L"RightPageHeaderContent", aAny);
}
-void lcl_AutoForm( FixedText& aTimeText ) // 29
+void lcl_AutoForm( FixedText& aTimeText ) // 29
{
XInterfaceRef xInt = lcl_GetView();
if (!xInt) return;
#if 0
- //! Test - AutoFormat muss von der App kommen
+ //! Test - AutoFormat muss von der App kommen
XStarCalcViewRef xView = (XStarCalcView*)xInt->queryInterface(XStarCalcView::getSmartUik());
if (!xView) return;
XTableAutoFormatsRef xFormats = xView->getTableAutoFormats();
if (!xFormats) return;
- //! Test
+ //! Test
#endif
XTableAutoFormatsRef xFormats;
@@ -1518,9 +1518,9 @@ void lcl_AutoForm( FixedText& aTimeText ) // 29
}
}
-void lcl_Pivot( FixedText& aTimeText ) // 30
+void lcl_Pivot( FixedText& aTimeText ) // 30
{
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (!xDoc) return;
XSpreadsheetsRef xSheets = xDoc->getSheets();
@@ -1544,7 +1544,7 @@ void lcl_Pivot( FixedText& aTimeText ) // 30
XDataPilotTableRef xTable = xPivots->getTableByIndex(nP);
if (!xTable) return;
-// xTable->refreshTable();
+// xTable->refreshTable();
XDataPilotDescriptorRef xDesc = (XDataPilotDescriptor*)
xTable->queryInterface(XDataPilotDescriptor::getSmartUik());
@@ -1701,7 +1701,7 @@ IMPL_LINK(MyWindow, TextHdl, PushButton*, EMPTYARG)
aTimeText.SetText("...");
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (xDoc)
{
CellAddress aPos;
@@ -1743,7 +1743,7 @@ IMPL_LINK(MyWindow, BlaHdl, PushButton*, EMPTYARG)
{
aTimeText.SetText("...");
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (xDoc)
{
CellAddress aPos;
@@ -1767,7 +1767,7 @@ IMPL_LINK(MyWindow, BlaHdl, PushButton*, EMPTYARG)
if ( xCursor && xType )
{
#if 0
- // Feld einfuegen
+ // Feld einfuegen
XTextPositionRef xPos = (XTextPosition*)
xCursor->queryInterface(XTextPosition::getSmartUik());
if ( xPos )
@@ -1776,7 +1776,7 @@ IMPL_LINK(MyWindow, BlaHdl, PushButton*, EMPTYARG)
XTextFieldRef xField = xTypes->insertTextField( xType, xPos );
if (xField)
{
- // Eigenschaften setzen
+ // Eigenschaften setzen
XPropertySetRef xProp = (XPropertySet*)xField->
queryInterface(XPropertySet::getSmartUik());
if ( xProp )
@@ -1790,7 +1790,7 @@ IMPL_LINK(MyWindow, BlaHdl, PushButton*, EMPTYARG)
}
#endif
- // letztes Feld loeschen
+ // letztes Feld loeschen
XIndexAccessRef xIndex = (XIndexAccess*)
xType->queryInterface(XIndexAccess::getSmartUik());
if (xIndex)
@@ -1812,7 +1812,7 @@ IMPL_LINK(MyWindow, BlaHdl, PushButton*, EMPTYARG)
xProp->getPropertyValue(L"URL") ),
CHARSET_SYSTEM );
}
- if ( i+1 == nCount ) // letztes
+ if ( i+1 == nCount ) // letztes
{
XTextFieldRef xField = (XTextField*)xInt->
queryInterface(XTextField::getSmartUik());
@@ -1840,7 +1840,7 @@ IMPL_LINK(MyWindow, TabHdl, PushButton*, EMPTYARG)
{
String aResult;
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
if (xDoc)
{
XSpreadsheetsRef xSheets = xDoc->getSheets();
@@ -1931,7 +1931,7 @@ void lcl_FillCells(XCellCollectionRef xColl)
IMPL_LINK(MyWindow, ViewHdl, PushButton*, EMPTYARG)
{
- XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
+ XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model
XInterfaceRef xInt = lcl_GetView();
if (!xInt) return 0;
XDocumentViewRef xView = (XDocumentView*)xInt->queryInterface(XDocumentView::getSmartUik());
@@ -1964,12 +1964,12 @@ IMPL_LINK(MyWindow, ViewHdl, PushButton*, EMPTYARG)
XAutoFormattableRef xAuto = (XAutoFormattable*)xSelInt->
queryInterface(XAutoFormattable::getSmartUik());
if ( xAuto )
- xAuto->applyAutoFormat( L"gaga" );
+ xAuto->applyAutoFormat( L"gaga" );
XFormulaArrayRef xArr = (XFormulaArray*)xSelInt->queryInterface(XFormulaArray::getSmartUik());
if ( xArr )
{
-// xArr->setFormulaArray( "123" );
+// xArr->setFormulaArray( "123" );
String aFormula = OUStringToString( xArr->getFormulaArray(), CHARSET_SYSTEM );
aTimeText.SetText(aFormula);
}
@@ -1984,7 +1984,7 @@ IMPL_LINK(MyWindow, ViewHdl, PushButton*, EMPTYARG)
xText->setText(StringToOUString(aStr, CHARSET_SYSTEM));
}
- // Zelle selektieren
+ // Zelle selektieren
#if 0
if (xDoc)
@@ -2001,15 +2001,15 @@ IMPL_LINK(MyWindow, ViewHdl, PushButton*, EMPTYARG)
XPrintableRef xPrint = (XPrintable*)xInt->queryInterface(XPrintable::getSmartUik());
String aName = OUStringToString( xPrint->getPrinterName(), CHARSET_SYSTEM );
-// aTimeText.SetText(aName);
+// aTimeText.SetText(aName);
xPrint->setPrinterName(L"HP5_2");
-// xPrint->setPrinterName(L"blubb");
+// xPrint->setPrinterName(L"blubb");
-// XPropertySetRef xOptions;
-// xPrint->print(xOptions);
+// XPropertySetRef xOptions;
+// xPrint->print(xOptions);
-/* XViewPaneRef xPane = (XViewPane*)xInt->queryInterface(XViewPane::getSmartUik());
+/* XViewPaneRef xPane = (XViewPane*)xInt->queryInterface(XViewPane::getSmartUik());
if (!xPane) return 0;
xPane->setScrollRow( 2 );
*/
@@ -2026,12 +2026,12 @@ IMPL_LINK(MyWindow, ViewHdl, PushButton*, EMPTYARG)
XActionLockableRef xLock = (XActionLockable*)
xDoc->queryInterface(XActionLockable::getSmartUik());
if (xLock)
- xLock->addActionLock(); // nicht zwischendurch painten
+ xLock->addActionLock(); // nicht zwischendurch painten
-// lcl_FillCells(xColl);
+// lcl_FillCells(xColl);
if (xLock)
- xLock->removeActionLock(); // nicht zwischendurch painten
+ xLock->removeActionLock(); // nicht zwischendurch painten
XStarCalcViewRef xCalc = (XStarCalcView*)xInt->queryInterface(XStarCalcView::getSmartUik());
if (!xCalc) return 0;
diff --git a/sc/workben/testadd.idl b/sc/workben/testadd.idl
index c5684820e66a..b80ad26c2f83 100644
--- a/sc/workben/testadd.idl
+++ b/sc/workben/testadd.idl
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT 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/xml/ScSpreadsheetSettingsObj.xml b/sc/xml/ScSpreadsheetSettingsObj.xml
index 4a083524d9fa..3754f26b94a0 100644
--- a/sc/xml/ScSpreadsheetSettingsObj.xml
+++ b/sc/xml/ScSpreadsheetSettingsObj.xml
@@ -6,7 +6,7 @@
<author>Niklas Nebel</author>
<name>com.sun.star.comp.office.ScSpreadsheetSettingsObj</name>
<description>
- This component provides access to the configuration
+ This component provides access to the configuration
which is global for all views of a spreadsheet document.
</description>
<loader-name>com.sun.star.loader.SharedLibrary</loader-name>
diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index 0d206d0286dd..78de6abe00a1 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,16 +38,16 @@
#include "analysis.hrc"
#include "bessel.hxx"
-#define ADDIN_SERVICE "com.sun.star.sheet.AddIn"
-#define MY_SERVICE "com.sun.star.sheet.addin.Analysis"
-#define MY_IMPLNAME "com.sun.star.sheet.addin.AnalysisImpl"
+#define ADDIN_SERVICE "com.sun.star.sheet.AddIn"
+#define MY_SERVICE "com.sun.star.sheet.addin.Analysis"
+#define MY_IMPLNAME "com.sun.star.sheet.addin.AnalysisImpl"
using namespace ::rtl;
using namespace ::com::sun::star;
//------------------------------------------------------------------
//
-// entry points for service registration / instantiation
+// entry points for service registration / instantiation
//
//------------------------------------------------------------------
@@ -66,15 +66,15 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, registry::XReg
{
try
{
- STRING aImpl = STRFROMASCII( "/" );
+ STRING aImpl = STRFROMASCII( "/" );
aImpl += AnalysisAddIn::getImplementationName_Static();
aImpl += STRFROMASCII( "/UNO/SERVICES" );
- REF( registry::XRegistryKey ) xNewKey(
+ REF( registry::XRegistryKey ) xNewKey(
reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( aImpl ) );
- SEQ( STRING ) aSequ = AnalysisAddIn::getSupportedServiceNames_Static();
- const STRING* pArray = aSequ.getConstArray();
+ SEQ( STRING ) aSequ = AnalysisAddIn::getSupportedServiceNames_Static();
+ const STRING* pArray = aSequ.getConstArray();
for( sal_Int32 i = 0 ; i < aSequ.getLength() ; i++ )
xNewKey->createKey( pArray[ i ] );
@@ -92,11 +92,11 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, registry::XReg
void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
{
- void* pRet = 0;
+ void* pRet = 0;
if( pServiceManager && STRING::createFromAscii( pImplName ) == AnalysisAddIn::getImplementationName_Static() )
{
- REF( lang::XSingleServiceFactory ) xFactory( cppu::createOneInstanceFactory(
+ REF( lang::XSingleServiceFactory ) xFactory( cppu::createOneInstanceFactory(
reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
AnalysisAddIn::getImplementationName_Static(),
AnalysisAddIn_CreateInstance,
@@ -113,14 +113,14 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceMa
}
-} // extern C
+} // extern C
//------------------------------------------------------------------------
//
-// "normal" service implementation
+// "normal" service implementation
//
//------------------------------------------------------------------------
@@ -129,7 +129,7 @@ ResMgr& AnalysisAddIn::GetResMgr( void ) THROWDEF_RTE
{
if( !pResMgr )
{
- InitData(); // try to get resource manager
+ InitData(); // try to get resource manager
if( !pResMgr )
THROW_RTE;
@@ -149,8 +149,8 @@ class AnalysisResourcePublisher : public Resource
{
public:
AnalysisResourcePublisher( const AnalysisResId& rId ) : Resource( rId ) {}
- BOOL IsAvailableRes( const ResId& rId ) const { return Resource::IsAvailableRes( rId ); }
- void FreeResource() { Resource::FreeResource(); }
+ BOOL IsAvailableRes( const ResId& rId ) const { return Resource::IsAvailableRes( rId ); }
+ void FreeResource() { Resource::FreeResource(); }
};
@@ -171,13 +171,13 @@ AnalysisFuncRes::AnalysisFuncRes( ResId& rRes, ResMgr& rResMgr, sal_uInt16 nInd,
STRING AnalysisAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) THROWDEF_RTE
{
- STRING aRet;
- AnalysisResourcePublisher aResPubl( AnalysisResId( RID_ANALYSIS_FUNCTION_DESCRIPTIONS, GetResMgr() ) );
- AnalysisResId aRes( nResId, GetResMgr() );
+ STRING aRet;
+ AnalysisResourcePublisher aResPubl( AnalysisResId( RID_ANALYSIS_FUNCTION_DESCRIPTIONS, GetResMgr() ) );
+ AnalysisResId aRes( nResId, GetResMgr() );
aRes.SetRT( RSC_RESOURCE );
if( aResPubl.IsAvailableRes( aRes ) )
{
- AnalysisFuncRes aSubRes( aRes, GetResMgr(), nStrIndex, aRet );
+ AnalysisFuncRes aSubRes( aRes, GetResMgr(), nStrIndex, aRet );
}
aResPubl.FreeResource();
@@ -191,7 +191,7 @@ void AnalysisAddIn::InitData( void )
if( pResMgr )
delete pResMgr;
- OString aModName( "analysis" );
+ OString aModName( "analysis" );
pResMgr = ResMgr::CreateResMgr( ( const sal_Char* ) aModName,
aFuncLoc );
@@ -233,8 +233,8 @@ AnalysisAddIn::~AnalysisAddIn()
if( pCDL )
delete pCDL;
-// if( pResMgr ) no delete, because _all_ resource managers are deleted _before_ this dtor is called
-// delete pResMgr;
+// if( pResMgr ) no delete, because _all_ resource managers are deleted _before_ this dtor is called
+// delete pResMgr;
if( pDefLocales )
delete[] pDefLocales;
@@ -256,7 +256,7 @@ sal_Int32 AnalysisAddIn::getDateMode(
//-----------------------------------------------------------------------------
-#define MAXFACTDOUBLE 300
+#define MAXFACTDOUBLE 300
double AnalysisAddIn::FactDouble( sal_Int32 nNum ) THROWDEF_RTE_IAE
{
@@ -267,17 +267,17 @@ double AnalysisAddIn::FactDouble( sal_Int32 nNum ) THROWDEF_RTE_IAE
{
pFactDoubles = new double[ MAXFACTDOUBLE + 1 ];
- pFactDoubles[ 0 ] = 1.0; // by default
+ pFactDoubles[ 0 ] = 1.0; // by default
- double fOdd = 1.0;
- double fEven = 2.0;
+ double fOdd = 1.0;
+ double fEven = 2.0;
pFactDoubles[ 1 ] = fOdd;
pFactDoubles[ 2 ] = fEven;
- sal_Bool bOdd = sal_True;
+ sal_Bool bOdd = sal_True;
- for( sal_uInt16 nCnt = 3 ; nCnt <= MAXFACTDOUBLE ; nCnt++ )
+ for( sal_uInt16 nCnt = 3 ; nCnt <= MAXFACTDOUBLE ; nCnt++ )
{
if( bOdd )
{
@@ -307,8 +307,8 @@ STRING AnalysisAddIn::getImplementationName_Static()
SEQ( STRING ) AnalysisAddIn::getSupportedServiceNames_Static()
{
- SEQ( STRING ) aRet(2);
- STRING* pArray = aRet.getArray();
+ SEQ( STRING ) aRet(2);
+ STRING* pArray = aRet.getArray();
pArray[0] = STRFROMASCII( ADDIN_SERVICE );
pArray[1] = STRFROMASCII( MY_SERVICE );
return aRet;
@@ -358,7 +358,7 @@ void SAL_CALL AnalysisAddIn::setLocale( const lang::Locale& eLocale ) THROWDEF_R
{
aFuncLoc = eLocale;
- InitData(); // change of locale invalidates resources!
+ InitData(); // change of locale invalidates resources!
}
lang::Locale SAL_CALL AnalysisAddIn::getLocale() THROWDEF_RTE
@@ -371,8 +371,8 @@ lang::Locale SAL_CALL AnalysisAddIn::getLocale() THROWDEF_RTE
STRING SAL_CALL AnalysisAddIn::getProgrammaticFuntionName( const STRING& ) THROWDEF_RTE
{
- // not used by calc
- // (but should be implemented for other uses of the AddIn service)
+ // not used by calc
+ // (but should be implemented for other uses of the AddIn service)
return STRING();
}
@@ -380,9 +380,9 @@ STRING SAL_CALL AnalysisAddIn::getProgrammaticFuntionName( const STRING& ) THROW
STRING SAL_CALL AnalysisAddIn::getDisplayFunctionName( const STRING& aProgrammaticName ) THROWDEF_RTE
{
- STRING aRet;
+ STRING aRet;
- const FuncData* p = pFD->Get( aProgrammaticName );
+ const FuncData* p = pFD->Get( aProgrammaticName );
if( p )
{
aRet = GetDisplFuncStr( p->GetUINameID() );
@@ -401,9 +401,9 @@ STRING SAL_CALL AnalysisAddIn::getDisplayFunctionName( const STRING& aProgrammat
STRING SAL_CALL AnalysisAddIn::getFunctionDescription( const STRING& aProgrammaticName ) THROWDEF_RTE
{
- STRING aRet;
+ STRING aRet;
- const FuncData* p = pFD->Get( aProgrammaticName );
+ const FuncData* p = pFD->Get( aProgrammaticName );
if( p )
aRet = GetFuncDescrStr( p->GetDescrID(), 1 );
@@ -413,12 +413,12 @@ STRING SAL_CALL AnalysisAddIn::getFunctionDescription( const STRING& aProgrammat
STRING SAL_CALL AnalysisAddIn::getDisplayArgumentName( const STRING& aName, sal_Int32 nArg ) THROWDEF_RTE
{
- STRING aRet;
+ STRING aRet;
- const FuncData* p = pFD->Get( aName );
+ const FuncData* p = pFD->Get( aName );
if( p && nArg <= 0xFFFF )
{
- sal_uInt16 nStr = p->GetStrIndex( sal_uInt16( nArg ) );
+ sal_uInt16 nStr = p->GetStrIndex( sal_uInt16( nArg ) );
if( nStr /*&& nStr < 4*/ )
aRet = GetFuncDescrStr( p->GetDescrID(), nStr );
else
@@ -431,12 +431,12 @@ STRING SAL_CALL AnalysisAddIn::getDisplayArgumentName( const STRING& aName, sal_
STRING SAL_CALL AnalysisAddIn::getArgumentDescription( const STRING& aName, sal_Int32 nArg ) THROWDEF_RTE
{
- STRING aRet;
+ STRING aRet;
- const FuncData* p = pFD->Get( aName );
+ const FuncData* p = pFD->Get( aName );
if( p && nArg <= 0xFFFF )
{
- sal_uInt16 nStr = p->GetStrIndex( sal_uInt16( nArg ) );
+ sal_uInt16 nStr = p->GetStrIndex( sal_uInt16( nArg ) );
if( nStr /*&& nStr < 4*/ )
aRet = GetFuncDescrStr( p->GetDescrID(), nStr + 1 );
else
@@ -447,28 +447,28 @@ STRING SAL_CALL AnalysisAddIn::getArgumentDescription( const STRING& aName, sal_
}
-static const char* pDefCatName = "Add-In";
+static const char* pDefCatName = "Add-In";
STRING SAL_CALL AnalysisAddIn::getProgrammaticCategoryName( const STRING& aName ) THROWDEF_RTE
{
- // return non-translated strings
-// return STRFROMASCII( "Add-In" );
- const FuncData* p = pFD->Get( aName );
- STRING aRet;
+ // return non-translated strings
+// return STRFROMASCII( "Add-In" );
+ const FuncData* p = pFD->Get( aName );
+ STRING aRet;
if( p )
{
- const sal_Char* pStr;
+ const sal_Char* pStr;
switch( p->GetCategory() )
{
- case FDCat_DateTime: pStr = "Date&Time"; break;
- case FDCat_Finance: pStr = "Financial"; break;
- case FDCat_Inf: pStr = "Information"; break;
- case FDCat_Math: pStr = "Mathematical"; break;
- case FDCat_Tech: pStr = "Technical"; break;
+ case FDCat_DateTime: pStr = "Date&Time"; break;
+ case FDCat_Finance: pStr = "Financial"; break;
+ case FDCat_Inf: pStr = "Information"; break;
+ case FDCat_Math: pStr = "Mathematical"; break;
+ case FDCat_Tech: pStr = "Technical"; break;
default:
- pStr = pDefCatName; break;
+ pStr = pDefCatName; break;
}
aRet = STRFROMASCII( pStr );
@@ -482,23 +482,23 @@ STRING SAL_CALL AnalysisAddIn::getProgrammaticCategoryName( const STRING& aName
STRING SAL_CALL AnalysisAddIn::getDisplayCategoryName( const STRING& aProgrammaticFunctionName ) THROWDEF_RTE
{
- // return translated strings, not used for predefined categories
-// return STRFROMASCII( "Add-In" );
- const FuncData* p = pFD->Get( aProgrammaticFunctionName );
- STRING aRet;
+ // return translated strings, not used for predefined categories
+// return STRFROMASCII( "Add-In" );
+ const FuncData* p = pFD->Get( aProgrammaticFunctionName );
+ STRING aRet;
if( p )
{
- const sal_Char* pStr;
+ const sal_Char* pStr;
switch( p->GetCategory() )
{
- case FDCat_DateTime: pStr = "Date&Time"; break;
- case FDCat_Finance: pStr = "Financial"; break;
- case FDCat_Inf: pStr = "Information"; break;
- case FDCat_Math: pStr = "Mathematical"; break;
- case FDCat_Tech: pStr = "Technical"; break;
+ case FDCat_DateTime: pStr = "Date&Time"; break;
+ case FDCat_Finance: pStr = "Financial"; break;
+ case FDCat_Inf: pStr = "Information"; break;
+ case FDCat_Math: pStr = "Mathematical"; break;
+ case FDCat_Tech: pStr = "Technical"; break;
default:
- pStr = pDefCatName; break;
+ pStr = pDefCatName; break;
}
aRet = STRFROMASCII( pStr );
@@ -510,9 +510,9 @@ STRING SAL_CALL AnalysisAddIn::getDisplayCategoryName( const STRING& aProgrammat
}
-static const sal_Char* pLang[] = { "de", "en" };
-static const sal_Char* pCoun[] = { "DE", "US" };
-static const sal_uInt32 nNumOfLoc = sizeof( pLang ) / sizeof( sal_Char* );
+static const sal_Char* pLang[] = { "de", "en" };
+static const sal_Char* pCoun[] = { "DE", "US" };
+static const sal_uInt32 nNumOfLoc = sizeof( pLang ) / sizeof( sal_Char* );
void AnalysisAddIn::InitDefLocales( void )
@@ -541,17 +541,17 @@ inline const CSS::lang::Locale& AnalysisAddIn::GetLocale( sal_uInt32 nInd )
SEQofLocName SAL_CALL AnalysisAddIn::getCompatibilityNames( const STRING& aProgrammaticName ) THROWDEF_RTE
{
- const FuncData* p = pFD->Get( aProgrammaticName );
+ const FuncData* p = pFD->Get( aProgrammaticName );
if( !p )
return SEQofLocName( 0 );
- const StringList& r = p->GetCompNameList();
- sal_uInt32 nCount = r.Count();
+ const StringList& r = p->GetCompNameList();
+ sal_uInt32 nCount = r.Count();
- SEQofLocName aRet( nCount );
+ SEQofLocName aRet( nCount );
- CSS::sheet::LocalizedName* pArray = aRet.getArray();
+ CSS::sheet::LocalizedName* pArray = aRet.getArray();
for( sal_uInt32 n = 0 ; n < nCount ; n++ )
{
@@ -581,13 +581,13 @@ sal_Int32 SAL_CALL AnalysisAddIn::getWorkday( constREFXPS& xOptions,
if( !nDays )
return nDate;
- sal_Int32 nNullDate = GetNullDate( xOptions );
+ sal_Int32 nNullDate = GetNullDate( xOptions );
- SortedIndividualInt32List aSrtLst;
+ SortedIndividualInt32List aSrtLst;
aSrtLst.InsertHolidayList( aAnyConv, xOptions, aHDay, nNullDate, sal_False );
- sal_Int32 nActDate = nDate + nNullDate;
+ sal_Int32 nActDate = nDate + nNullDate;
if( nDays > 0 )
{
@@ -605,7 +605,7 @@ sal_Int32 SAL_CALL AnalysisAddIn::getWorkday( constREFXPS& xOptions,
nDays--;
}
else
- nActDate++; // jump over weekend
+ nActDate++; // jump over weekend
}
}
else
@@ -624,7 +624,7 @@ sal_Int32 SAL_CALL AnalysisAddIn::getWorkday( constREFXPS& xOptions,
nDays++;
}
else
- nActDate--; // jump over weekend
+ nActDate--; // jump over weekend
}
}
@@ -657,11 +657,11 @@ sal_Int32 SAL_CALL AnalysisAddIn::getWeeknum( constREFXPS& xOpt, sal_Int32 nDate
{
nDate += GetNullDate( xOpt );
- sal_uInt16 nDay, nMonth, nYear;
+ sal_uInt16 nDay, nMonth, nYear;
DaysToDate( nDate, nDay, nMonth, nYear );
- sal_Int32 nFirstInYear = DateToDays( 1, 1, nYear );
- sal_uInt16 nFirstDayInYear = GetDayOfWeek( nFirstInYear );
+ sal_Int32 nFirstInYear = DateToDays( 1, 1, nYear );
+ sal_uInt16 nFirstDayInYear = GetDayOfWeek( nFirstInYear );
return ( nDate - nFirstInYear + ( ( nMode == 1 )? ( nFirstDayInYear + 1 ) % 7 : nFirstDayInYear ) ) / 7 + 1;
}
@@ -669,12 +669,12 @@ sal_Int32 SAL_CALL AnalysisAddIn::getWeeknum( constREFXPS& xOpt, sal_Int32 nDate
sal_Int32 SAL_CALL AnalysisAddIn::getEomonth( constREFXPS& xOpt, sal_Int32 nDate, sal_Int32 nMonths ) THROWDEF_RTE_IAE
{
- sal_Int32 nNullDate = GetNullDate( xOpt );
+ sal_Int32 nNullDate = GetNullDate( xOpt );
nDate += nNullDate;
- sal_uInt16 nDay, nMonth, nYear;
+ sal_uInt16 nDay, nMonth, nYear;
DaysToDate( nDate, nDay, nMonth, nYear );
- sal_Int32 nNewMonth = nMonth + nMonths;
+ sal_Int32 nNewMonth = nMonth + nMonths;
if( nNewMonth > 12 )
{
@@ -697,15 +697,15 @@ sal_Int32 SAL_CALL AnalysisAddIn::getEomonth( constREFXPS& xOpt, sal_Int32 nDate
sal_Int32 SAL_CALL AnalysisAddIn::getNetworkdays( constREFXPS& xOpt,
sal_Int32 nStartDate, sal_Int32 nEndDate, const ANY& aHDay ) THROWDEF_RTE_IAE
{
- sal_Int32 nNullDate = GetNullDate( xOpt );
+ sal_Int32 nNullDate = GetNullDate( xOpt );
- SortedIndividualInt32List aSrtLst;
+ SortedIndividualInt32List aSrtLst;
aSrtLst.InsertHolidayList( aAnyConv, xOpt, aHDay, nNullDate, sal_False );
- sal_Int32 nActDate = nStartDate + nNullDate;
- sal_Int32 nStopDate = nEndDate + nNullDate;
- sal_Int32 nCnt = 0;
+ sal_Int32 nActDate = nStartDate + nNullDate;
+ sal_Int32 nStopDate = nEndDate + nNullDate;
+ sal_Int32 nCnt = 0;
if( nActDate <= nStopDate )
{
@@ -781,7 +781,7 @@ AnalysisAddIn::getMultinomial( constREFXPS& xOpt, const SEQSEQ( sal_Int32 )& aVL
double SAL_CALL AnalysisAddIn::getSeriessum( double fX, double fN, double fM, const SEQSEQ( double )& aCoeffList ) THROWDEF_RTE_IAE
{
- double fRet = 0.0;
+ double fRet = 0.0;
// #i32269# 0^0 is undefined, Excel returns #NUM! error
if( fX == 0.0 && fN == 0 )
@@ -789,16 +789,16 @@ double SAL_CALL AnalysisAddIn::getSeriessum( double fX, double fN, double fM, co
if( fX != 0.0 )
{
- sal_Int32 n1, n2;
- sal_Int32 nE1 = aCoeffList.getLength();
- sal_Int32 nE2;
- //sal_Int32 nZ = 0;
+ sal_Int32 n1, n2;
+ sal_Int32 nE1 = aCoeffList.getLength();
+ sal_Int32 nE2;
+ //sal_Int32 nZ = 0;
for( n1 = 0 ; n1 < nE1 ; n1++ )
{
- const SEQ( double )& rList = aCoeffList[ n1 ];
+ const SEQ( double )& rList = aCoeffList[ n1 ];
nE2 = rList.getLength();
- const double* pList = rList.getConstArray();
+ const double* pList = rList.getConstArray();
for( n2 = 0 ; n2 < nE2 ; n2++ )
{
@@ -868,8 +868,8 @@ double SAL_CALL AnalysisAddIn::getGcd( constREFXPS& xOpt, const SEQSEQ( double )
if( aValList.Count() == 0 )
return 0.0;
- const double* p = aValList.First();
- double f = *p;
+ const double* p = aValList.First();
+ double f = *p;
p = aValList.Next();
@@ -893,8 +893,8 @@ double SAL_CALL AnalysisAddIn::getLcm( constREFXPS& xOpt, const SEQSEQ( double )
if( aValList.Count() == 0 )
return 0.0;
- const double* p = aValList.First();
- double f = *p;
+ const double* p = aValList.First();
+ double f = *p;
if( f == 0.0 )
return f;
@@ -903,7 +903,7 @@ double SAL_CALL AnalysisAddIn::getLcm( constREFXPS& xOpt, const SEQSEQ( double )
while( p )
{
- double fTmp = *p;
+ double fTmp = *p;
if( f == 0.0 )
return f;
else
@@ -944,7 +944,7 @@ double SAL_CALL AnalysisAddIn::getBessely( double fNum, sal_Int32 nOrder ) THROW
if( nOrder < 0 || fNum <= 0.0 )
THROW_IAE;
-// return yn( nOrder, fNum );
+// return yn( nOrder, fNum );
double fRet = sca::analysis::BesselY( fNum, nOrder );
RETURN_FINITE( fRet );
}
@@ -1110,7 +1110,7 @@ double SAL_CALL AnalysisAddIn::getImaginary( const STRING& aNum ) THROWDEF_RTE_I
STRING SAL_CALL AnalysisAddIn::getImpower( const STRING& aNum, double f ) THROWDEF_RTE_IAE
{
- Complex z( aNum );
+ Complex z( aNum );
z.Power( f );
@@ -1127,7 +1127,7 @@ double SAL_CALL AnalysisAddIn::getImargument( const STRING& aNum ) THROWDEF_RTE_
STRING SAL_CALL AnalysisAddIn::getImcos( const STRING& aNum ) THROWDEF_RTE_IAE
{
- Complex z( aNum );
+ Complex z( aNum );
z.Cos();
@@ -1137,7 +1137,7 @@ STRING SAL_CALL AnalysisAddIn::getImcos( const STRING& aNum ) THROWDEF_RTE_IAE
STRING SAL_CALL AnalysisAddIn::getImdiv( const STRING& aDivid, const STRING& aDivis ) THROWDEF_RTE_IAE
{
- Complex z( aDivid );
+ Complex z( aDivid );
z.Div( Complex( aDivis ) );
@@ -1147,7 +1147,7 @@ STRING SAL_CALL AnalysisAddIn::getImdiv( const STRING& aDivid, const STRING& aDi
STRING SAL_CALL AnalysisAddIn::getImexp( const STRING& aNum ) THROWDEF_RTE_IAE
{
- Complex z( aNum );
+ Complex z( aNum );
z.Exp();
@@ -1157,7 +1157,7 @@ STRING SAL_CALL AnalysisAddIn::getImexp( const STRING& aNum ) THROWDEF_RTE_IAE
STRING SAL_CALL AnalysisAddIn::getImconjugate( const STRING& aNum ) THROWDEF_RTE_IAE
{
- Complex z( aNum );
+ Complex z( aNum );
z.Conjugate();
@@ -1167,7 +1167,7 @@ STRING SAL_CALL AnalysisAddIn::getImconjugate( const STRING& aNum ) THROWDEF_RTE
STRING SAL_CALL AnalysisAddIn::getImln( const STRING& aNum ) THROWDEF_RTE_IAE
{
- Complex z( aNum );
+ Complex z( aNum );
z.Ln();
@@ -1177,7 +1177,7 @@ STRING SAL_CALL AnalysisAddIn::getImln( const STRING& aNum ) THROWDEF_RTE_IAE
STRING SAL_CALL AnalysisAddIn::getImlog10( const STRING& aNum ) THROWDEF_RTE_IAE
{
- Complex z( aNum );
+ Complex z( aNum );
z.Log10();
@@ -1187,7 +1187,7 @@ STRING SAL_CALL AnalysisAddIn::getImlog10( const STRING& aNum ) THROWDEF_RTE_IAE
STRING SAL_CALL AnalysisAddIn::getImlog2( const STRING& aNum ) THROWDEF_RTE_IAE
{
- Complex z( aNum );
+ Complex z( aNum );
z.Log2();
@@ -1197,17 +1197,17 @@ STRING SAL_CALL AnalysisAddIn::getImlog2( const STRING& aNum ) THROWDEF_RTE_IAE
STRING SAL_CALL AnalysisAddIn::getImproduct( constREFXPS&, const SEQSEQ( STRING )& aNum1, const SEQ( uno::Any )& aNL ) THROWDEF_RTE_IAE
{
- ComplexList z_list;
+ ComplexList z_list;
z_list.Append( aNum1, AH_IgnoreEmpty );
z_list.Append( aNL, AH_IgnoreEmpty );
- const Complex* p = z_list.First();
+ const Complex* p = z_list.First();
if( !p )
return Complex( 0 ).GetString();
- Complex z( *p );
+ Complex z( *p );
for( p = z_list.Next() ; p ; p = z_list.Next() )
z.Mult( *p );
@@ -1225,7 +1225,7 @@ double SAL_CALL AnalysisAddIn::getImreal( const STRING& aNum ) THROWDEF_RTE_IAE
STRING SAL_CALL AnalysisAddIn::getImsin( const STRING& aNum ) THROWDEF_RTE_IAE
{
- Complex z( aNum );
+ Complex z( aNum );
z.Sin();
@@ -1235,7 +1235,7 @@ STRING SAL_CALL AnalysisAddIn::getImsin( const STRING& aNum ) THROWDEF_RTE_IAE
STRING SAL_CALL AnalysisAddIn::getImsub( const STRING& aNum1, const STRING& aNum2 ) THROWDEF_RTE_IAE
{
- Complex z( aNum1 );
+ Complex z( aNum1 );
z.Sub( Complex( aNum2 ) );
@@ -1245,17 +1245,17 @@ STRING SAL_CALL AnalysisAddIn::getImsub( const STRING& aNum1, const STRING& aNum
STRING SAL_CALL AnalysisAddIn::getImsum( constREFXPS&, const SEQSEQ( STRING )& aNum1, const SEQ( CSS::uno::Any )& aFollowingPars ) THROWDEF_RTE_IAE
{
- ComplexList z_list;
+ ComplexList z_list;
z_list.Append( aNum1, AH_IgnoreEmpty );
z_list.Append( aFollowingPars, AH_IgnoreEmpty );
- const Complex* p = z_list.First();
+ const Complex* p = z_list.First();
if( !p )
return Complex( 0 ).GetString();
- Complex z( *p );
+ Complex z( *p );
for( p = z_list.Next() ; p ; p = z_list.Next() )
z.Add( *p );
@@ -1266,9 +1266,9 @@ STRING SAL_CALL AnalysisAddIn::getImsum( constREFXPS&, const SEQSEQ( STRING )& a
STRING SAL_CALL AnalysisAddIn::getImsqrt( const STRING& aNum ) THROWDEF_RTE_IAE
{
- Complex z( aNum );
+ Complex z( aNum );
-// z.Power( 0.5 );
+// z.Power( 0.5 );
z.Sqrt();
return z.GetString();
@@ -1277,7 +1277,7 @@ STRING SAL_CALL AnalysisAddIn::getImsqrt( const STRING& aNum ) THROWDEF_RTE_IAE
STRING SAL_CALL AnalysisAddIn::getComplex( double fR, double fI, const ANY& rSuff ) THROWDEF_RTE_IAE
{
- sal_Bool bi;
+ sal_Bool bi;
switch( rSuff.getValueTypeClass() )
{
@@ -1286,7 +1286,7 @@ STRING SAL_CALL AnalysisAddIn::getComplex( double fR, double fI, const ANY& rSuf
break;
case uno::TypeClass_STRING:
{
- const STRING* pSuff = ( const STRING* ) rSuff.getValue();
+ const STRING* pSuff = ( const STRING* ) rSuff.getValue();
bi = pSuff->compareToAscii( "i" ) == 0 || pSuff->getLength() == 0;
if( !bi && pSuff->compareToAscii( "j" ) != 0 )
THROW_IAE;
diff --git a/scaddins/source/analysis/analysis.hrc b/scaddins/source/analysis/analysis.hrc
index 7b5b94ff178c..1cb2580fdebb 100644
--- a/scaddins/source/analysis/analysis.hrc
+++ b/scaddins/source/analysis/analysis.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
@@ -28,303 +28,303 @@
#define SCADDINS_ANALYSIS_HRC
-#define ANALYSIS_RESOURCE_START 1000
+#define ANALYSIS_RESOURCE_START 1000
-#define RID_ANALYSIS_FUNCTION_DESCRIPTIONS (ANALYSIS_RESOURCE_START+1000)
-#define RID_ANALYSIS_FUNCTION_NAMES (ANALYSIS_RESOURCE_START+2000)
-#define RID_ANALYSIS_DEFFUNCTION_NAMES (ANALYSIS_RESOURCE_START+3000)
+#define RID_ANALYSIS_FUNCTION_DESCRIPTIONS (ANALYSIS_RESOURCE_START+1000)
+#define RID_ANALYSIS_FUNCTION_NAMES (ANALYSIS_RESOURCE_START+2000)
+#define RID_ANALYSIS_DEFFUNCTION_NAMES (ANALYSIS_RESOURCE_START+3000)
-#define ANALYSIS_FUNCDESC_START (ANALYSIS_RESOURCE_START)
+#define ANALYSIS_FUNCDESC_START (ANALYSIS_RESOURCE_START)
-#define ANALYSIS_Workday (ANALYSIS_FUNCDESC_START)
-#define ANALYSIS_Yearfrac (ANALYSIS_FUNCDESC_START+1)
-#define ANALYSIS_Edate (ANALYSIS_FUNCDESC_START+2)
+#define ANALYSIS_Workday (ANALYSIS_FUNCDESC_START)
+#define ANALYSIS_Yearfrac (ANALYSIS_FUNCDESC_START+1)
+#define ANALYSIS_Edate (ANALYSIS_FUNCDESC_START+2)
#define ANALYSIS_Weeknum (ANALYSIS_FUNCDESC_START+3)
#define ANALYSIS_Eomonth (ANALYSIS_FUNCDESC_START+4)
-#define ANALYSIS_Networkdays (ANALYSIS_FUNCDESC_START+5)
+#define ANALYSIS_Networkdays (ANALYSIS_FUNCDESC_START+5)
#define ANALYSIS_Iseven (ANALYSIS_FUNCDESC_START+6)
#define ANALYSIS_Isodd (ANALYSIS_FUNCDESC_START+7)
-#define ANALYSIS_Multinomial (ANALYSIS_FUNCDESC_START+8)
-#define ANALYSIS_Seriessum (ANALYSIS_FUNCDESC_START+9)
-#define ANALYSIS_Quotient (ANALYSIS_FUNCDESC_START+10)
-#define ANALYSIS_Mround (ANALYSIS_FUNCDESC_START+11)
+#define ANALYSIS_Multinomial (ANALYSIS_FUNCDESC_START+8)
+#define ANALYSIS_Seriessum (ANALYSIS_FUNCDESC_START+9)
+#define ANALYSIS_Quotient (ANALYSIS_FUNCDESC_START+10)
+#define ANALYSIS_Mround (ANALYSIS_FUNCDESC_START+11)
#define ANALYSIS_Sqrtpi (ANALYSIS_FUNCDESC_START+12)
-#define ANALYSIS_Randbetween (ANALYSIS_FUNCDESC_START+13)
+#define ANALYSIS_Randbetween (ANALYSIS_FUNCDESC_START+13)
#define ANALYSIS_Gcd (ANALYSIS_FUNCDESC_START+14)
#define ANALYSIS_Lcm (ANALYSIS_FUNCDESC_START+15)
#define ANALYSIS_Besseli (ANALYSIS_FUNCDESC_START+16)
#define ANALYSIS_Besselj (ANALYSIS_FUNCDESC_START+17)
#define ANALYSIS_Besselk (ANALYSIS_FUNCDESC_START+18)
#define ANALYSIS_Bessely (ANALYSIS_FUNCDESC_START+19)
-#define ANALYSIS_Bin2Oct (ANALYSIS_FUNCDESC_START+20)
-#define ANALYSIS_Bin2Dec (ANALYSIS_FUNCDESC_START+21)
-#define ANALYSIS_Bin2Hex (ANALYSIS_FUNCDESC_START+22)
-#define ANALYSIS_Oct2Bin (ANALYSIS_FUNCDESC_START+23)
-#define ANALYSIS_Oct2Dec (ANALYSIS_FUNCDESC_START+24)
-#define ANALYSIS_Oct2Hex (ANALYSIS_FUNCDESC_START+25)
-#define ANALYSIS_Dec2Bin (ANALYSIS_FUNCDESC_START+26)
-#define ANALYSIS_Dec2Hex (ANALYSIS_FUNCDESC_START+27)
-#define ANALYSIS_Dec2Oct (ANALYSIS_FUNCDESC_START+28)
-#define ANALYSIS_Hex2Bin (ANALYSIS_FUNCDESC_START+29)
-#define ANALYSIS_Hex2Dec (ANALYSIS_FUNCDESC_START+30)
-#define ANALYSIS_Hex2Oct (ANALYSIS_FUNCDESC_START+31)
-#define ANALYSIS_Delta (ANALYSIS_FUNCDESC_START+32)
-#define ANALYSIS_Erf (ANALYSIS_FUNCDESC_START+33)
-#define ANALYSIS_Erfc (ANALYSIS_FUNCDESC_START+34)
+#define ANALYSIS_Bin2Oct (ANALYSIS_FUNCDESC_START+20)
+#define ANALYSIS_Bin2Dec (ANALYSIS_FUNCDESC_START+21)
+#define ANALYSIS_Bin2Hex (ANALYSIS_FUNCDESC_START+22)
+#define ANALYSIS_Oct2Bin (ANALYSIS_FUNCDESC_START+23)
+#define ANALYSIS_Oct2Dec (ANALYSIS_FUNCDESC_START+24)
+#define ANALYSIS_Oct2Hex (ANALYSIS_FUNCDESC_START+25)
+#define ANALYSIS_Dec2Bin (ANALYSIS_FUNCDESC_START+26)
+#define ANALYSIS_Dec2Hex (ANALYSIS_FUNCDESC_START+27)
+#define ANALYSIS_Dec2Oct (ANALYSIS_FUNCDESC_START+28)
+#define ANALYSIS_Hex2Bin (ANALYSIS_FUNCDESC_START+29)
+#define ANALYSIS_Hex2Dec (ANALYSIS_FUNCDESC_START+30)
+#define ANALYSIS_Hex2Oct (ANALYSIS_FUNCDESC_START+31)
+#define ANALYSIS_Delta (ANALYSIS_FUNCDESC_START+32)
+#define ANALYSIS_Erf (ANALYSIS_FUNCDESC_START+33)
+#define ANALYSIS_Erfc (ANALYSIS_FUNCDESC_START+34)
#define ANALYSIS_Gestep (ANALYSIS_FUNCDESC_START+35)
-#define ANALYSIS_Factdouble (ANALYSIS_FUNCDESC_START+36)
-#define ANALYSIS_Imabs (ANALYSIS_FUNCDESC_START+37)
-#define ANALYSIS_Imaginary (ANALYSIS_FUNCDESC_START+38)
-#define ANALYSIS_Impower (ANALYSIS_FUNCDESC_START+39)
-#define ANALYSIS_Imargument (ANALYSIS_FUNCDESC_START+40)
-#define ANALYSIS_Imcos (ANALYSIS_FUNCDESC_START+41)
-#define ANALYSIS_Imdiv (ANALYSIS_FUNCDESC_START+42)
-#define ANALYSIS_Imexp (ANALYSIS_FUNCDESC_START+43)
-#define ANALYSIS_Imconjugate (ANALYSIS_FUNCDESC_START+44)
-#define ANALYSIS_Imln (ANALYSIS_FUNCDESC_START+45)
-#define ANALYSIS_Imlog10 (ANALYSIS_FUNCDESC_START+46)
-#define ANALYSIS_Imlog2 (ANALYSIS_FUNCDESC_START+47)
-#define ANALYSIS_Improduct (ANALYSIS_FUNCDESC_START+48)
-#define ANALYSIS_Imreal (ANALYSIS_FUNCDESC_START+49)
-#define ANALYSIS_Imsin (ANALYSIS_FUNCDESC_START+50)
-#define ANALYSIS_Imsub (ANALYSIS_FUNCDESC_START+51)
-#define ANALYSIS_Imsqrt (ANALYSIS_FUNCDESC_START+52)
-#define ANALYSIS_Imsum (ANALYSIS_FUNCDESC_START+53)
-#define ANALYSIS_Complex (ANALYSIS_FUNCDESC_START+54)
+#define ANALYSIS_Factdouble (ANALYSIS_FUNCDESC_START+36)
+#define ANALYSIS_Imabs (ANALYSIS_FUNCDESC_START+37)
+#define ANALYSIS_Imaginary (ANALYSIS_FUNCDESC_START+38)
+#define ANALYSIS_Impower (ANALYSIS_FUNCDESC_START+39)
+#define ANALYSIS_Imargument (ANALYSIS_FUNCDESC_START+40)
+#define ANALYSIS_Imcos (ANALYSIS_FUNCDESC_START+41)
+#define ANALYSIS_Imdiv (ANALYSIS_FUNCDESC_START+42)
+#define ANALYSIS_Imexp (ANALYSIS_FUNCDESC_START+43)
+#define ANALYSIS_Imconjugate (ANALYSIS_FUNCDESC_START+44)
+#define ANALYSIS_Imln (ANALYSIS_FUNCDESC_START+45)
+#define ANALYSIS_Imlog10 (ANALYSIS_FUNCDESC_START+46)
+#define ANALYSIS_Imlog2 (ANALYSIS_FUNCDESC_START+47)
+#define ANALYSIS_Improduct (ANALYSIS_FUNCDESC_START+48)
+#define ANALYSIS_Imreal (ANALYSIS_FUNCDESC_START+49)
+#define ANALYSIS_Imsin (ANALYSIS_FUNCDESC_START+50)
+#define ANALYSIS_Imsub (ANALYSIS_FUNCDESC_START+51)
+#define ANALYSIS_Imsqrt (ANALYSIS_FUNCDESC_START+52)
+#define ANALYSIS_Imsum (ANALYSIS_FUNCDESC_START+53)
+#define ANALYSIS_Complex (ANALYSIS_FUNCDESC_START+54)
#define ANALYSIS_Convert (ANALYSIS_FUNCDESC_START+55)
-#define ANALYSIS_Amordegrc (ANALYSIS_FUNCDESC_START+56)
-#define ANALYSIS_Amorlinc (ANALYSIS_FUNCDESC_START+57)
-#define ANALYSIS_Accrint (ANALYSIS_FUNCDESC_START+58)
-#define ANALYSIS_Accrintm (ANALYSIS_FUNCDESC_START+59)
-#define ANALYSIS_Received (ANALYSIS_FUNCDESC_START+60)
-#define ANALYSIS_Disc (ANALYSIS_FUNCDESC_START+61)
-#define ANALYSIS_Duration (ANALYSIS_FUNCDESC_START+62)
+#define ANALYSIS_Amordegrc (ANALYSIS_FUNCDESC_START+56)
+#define ANALYSIS_Amorlinc (ANALYSIS_FUNCDESC_START+57)
+#define ANALYSIS_Accrint (ANALYSIS_FUNCDESC_START+58)
+#define ANALYSIS_Accrintm (ANALYSIS_FUNCDESC_START+59)
+#define ANALYSIS_Received (ANALYSIS_FUNCDESC_START+60)
+#define ANALYSIS_Disc (ANALYSIS_FUNCDESC_START+61)
+#define ANALYSIS_Duration (ANALYSIS_FUNCDESC_START+62)
#define ANALYSIS_Effect (ANALYSIS_FUNCDESC_START+63)
#define ANALYSIS_Cumprinc (ANALYSIS_FUNCDESC_START+64)
#define ANALYSIS_Cumipmt (ANALYSIS_FUNCDESC_START+65)
-#define ANALYSIS_Price (ANALYSIS_FUNCDESC_START+66)
-#define ANALYSIS_Pricedisc (ANALYSIS_FUNCDESC_START+67)
-#define ANALYSIS_Pricemat (ANALYSIS_FUNCDESC_START+68)
-#define ANALYSIS_Mduration (ANALYSIS_FUNCDESC_START+69)
+#define ANALYSIS_Price (ANALYSIS_FUNCDESC_START+66)
+#define ANALYSIS_Pricedisc (ANALYSIS_FUNCDESC_START+67)
+#define ANALYSIS_Pricemat (ANALYSIS_FUNCDESC_START+68)
+#define ANALYSIS_Mduration (ANALYSIS_FUNCDESC_START+69)
#define ANALYSIS_Nominal (ANALYSIS_FUNCDESC_START+70)
-#define ANALYSIS_Dollarfr (ANALYSIS_FUNCDESC_START+71)
-#define ANALYSIS_Dollarde (ANALYSIS_FUNCDESC_START+72)
-#define ANALYSIS_Yield (ANALYSIS_FUNCDESC_START+73)
-#define ANALYSIS_Yielddisc (ANALYSIS_FUNCDESC_START+74)
-#define ANALYSIS_Yieldmat (ANALYSIS_FUNCDESC_START+75)
-#define ANALYSIS_Tbilleq (ANALYSIS_FUNCDESC_START+76)
-#define ANALYSIS_Tbillprice (ANALYSIS_FUNCDESC_START+77)
-#define ANALYSIS_Tbillyield (ANALYSIS_FUNCDESC_START+78)
-#define ANALYSIS_Oddfprice (ANALYSIS_FUNCDESC_START+79)
-#define ANALYSIS_Oddfyield (ANALYSIS_FUNCDESC_START+80)
-#define ANALYSIS_Oddlprice (ANALYSIS_FUNCDESC_START+81)
-#define ANALYSIS_Oddlyield (ANALYSIS_FUNCDESC_START+82)
-#define ANALYSIS_Xirr (ANALYSIS_FUNCDESC_START+83)
-#define ANALYSIS_Xnpv (ANALYSIS_FUNCDESC_START+84)
-#define ANALYSIS_Intrate (ANALYSIS_FUNCDESC_START+85)
-#define ANALYSIS_Coupncd (ANALYSIS_FUNCDESC_START+86)
-#define ANALYSIS_Coupdays (ANALYSIS_FUNCDESC_START+87)
-#define ANALYSIS_Coupdaysnc (ANALYSIS_FUNCDESC_START+88)
-#define ANALYSIS_Coupdaybs (ANALYSIS_FUNCDESC_START+89)
-#define ANALYSIS_Couppcd (ANALYSIS_FUNCDESC_START+90)
-#define ANALYSIS_Coupnum (ANALYSIS_FUNCDESC_START+91)
-#define ANALYSIS_Fvschedule (ANALYSIS_FUNCDESC_START+92)
+#define ANALYSIS_Dollarfr (ANALYSIS_FUNCDESC_START+71)
+#define ANALYSIS_Dollarde (ANALYSIS_FUNCDESC_START+72)
+#define ANALYSIS_Yield (ANALYSIS_FUNCDESC_START+73)
+#define ANALYSIS_Yielddisc (ANALYSIS_FUNCDESC_START+74)
+#define ANALYSIS_Yieldmat (ANALYSIS_FUNCDESC_START+75)
+#define ANALYSIS_Tbilleq (ANALYSIS_FUNCDESC_START+76)
+#define ANALYSIS_Tbillprice (ANALYSIS_FUNCDESC_START+77)
+#define ANALYSIS_Tbillyield (ANALYSIS_FUNCDESC_START+78)
+#define ANALYSIS_Oddfprice (ANALYSIS_FUNCDESC_START+79)
+#define ANALYSIS_Oddfyield (ANALYSIS_FUNCDESC_START+80)
+#define ANALYSIS_Oddlprice (ANALYSIS_FUNCDESC_START+81)
+#define ANALYSIS_Oddlyield (ANALYSIS_FUNCDESC_START+82)
+#define ANALYSIS_Xirr (ANALYSIS_FUNCDESC_START+83)
+#define ANALYSIS_Xnpv (ANALYSIS_FUNCDESC_START+84)
+#define ANALYSIS_Intrate (ANALYSIS_FUNCDESC_START+85)
+#define ANALYSIS_Coupncd (ANALYSIS_FUNCDESC_START+86)
+#define ANALYSIS_Coupdays (ANALYSIS_FUNCDESC_START+87)
+#define ANALYSIS_Coupdaysnc (ANALYSIS_FUNCDESC_START+88)
+#define ANALYSIS_Coupdaybs (ANALYSIS_FUNCDESC_START+89)
+#define ANALYSIS_Couppcd (ANALYSIS_FUNCDESC_START+90)
+#define ANALYSIS_Coupnum (ANALYSIS_FUNCDESC_START+91)
+#define ANALYSIS_Fvschedule (ANALYSIS_FUNCDESC_START+92)
-#define ANALYSIS_FUNCNAME_START (1)
+#define ANALYSIS_FUNCNAME_START (1)
-#define ANALYSIS_FUNCNAME_Workday (ANALYSIS_FUNCNAME_START)
-#define ANALYSIS_FUNCNAME_Yearfrac (ANALYSIS_FUNCNAME_START+1)
-#define ANALYSIS_FUNCNAME_Edate (ANALYSIS_FUNCNAME_START+2)
-#define ANALYSIS_FUNCNAME_Weeknum (ANALYSIS_FUNCNAME_START+3)
-#define ANALYSIS_FUNCNAME_Eomonth (ANALYSIS_FUNCNAME_START+4)
-#define ANALYSIS_FUNCNAME_Networkdays (ANALYSIS_FUNCNAME_START+5)
-#define ANALYSIS_FUNCNAME_Iseven (ANALYSIS_FUNCNAME_START+6)
-#define ANALYSIS_FUNCNAME_Isodd (ANALYSIS_FUNCNAME_START+7)
-#define ANALYSIS_FUNCNAME_Multinomial (ANALYSIS_FUNCNAME_START+8)
-#define ANALYSIS_FUNCNAME_Seriessum (ANALYSIS_FUNCNAME_START+9)
-#define ANALYSIS_FUNCNAME_Quotient (ANALYSIS_FUNCNAME_START+10)
-#define ANALYSIS_FUNCNAME_Mround (ANALYSIS_FUNCNAME_START+11)
-#define ANALYSIS_FUNCNAME_Sqrtpi (ANALYSIS_FUNCNAME_START+12)
-#define ANALYSIS_FUNCNAME_Randbetween (ANALYSIS_FUNCNAME_START+13)
-#define ANALYSIS_FUNCNAME_Gcd (ANALYSIS_FUNCNAME_START+14)
-#define ANALYSIS_FUNCNAME_Lcm (ANALYSIS_FUNCNAME_START+15)
-#define ANALYSIS_FUNCNAME_Besseli (ANALYSIS_FUNCNAME_START+16)
-#define ANALYSIS_FUNCNAME_Besselj (ANALYSIS_FUNCNAME_START+17)
-#define ANALYSIS_FUNCNAME_Besselk (ANALYSIS_FUNCNAME_START+18)
-#define ANALYSIS_FUNCNAME_Bessely (ANALYSIS_FUNCNAME_START+19)
-#define ANALYSIS_FUNCNAME_Bin2Oct (ANALYSIS_FUNCNAME_START+20)
-#define ANALYSIS_FUNCNAME_Bin2Dec (ANALYSIS_FUNCNAME_START+21)
-#define ANALYSIS_FUNCNAME_Bin2Hex (ANALYSIS_FUNCNAME_START+22)
-#define ANALYSIS_FUNCNAME_Oct2Bin (ANALYSIS_FUNCNAME_START+23)
-#define ANALYSIS_FUNCNAME_Oct2Dec (ANALYSIS_FUNCNAME_START+24)
-#define ANALYSIS_FUNCNAME_Oct2Hex (ANALYSIS_FUNCNAME_START+25)
-#define ANALYSIS_FUNCNAME_Dec2Bin (ANALYSIS_FUNCNAME_START+26)
-#define ANALYSIS_FUNCNAME_Dec2Hex (ANALYSIS_FUNCNAME_START+27)
-#define ANALYSIS_FUNCNAME_Dec2Oct (ANALYSIS_FUNCNAME_START+28)
-#define ANALYSIS_FUNCNAME_Hex2Bin (ANALYSIS_FUNCNAME_START+29)
-#define ANALYSIS_FUNCNAME_Hex2Dec (ANALYSIS_FUNCNAME_START+30)
-#define ANALYSIS_FUNCNAME_Hex2Oct (ANALYSIS_FUNCNAME_START+31)
-#define ANALYSIS_FUNCNAME_Delta (ANALYSIS_FUNCNAME_START+32)
-#define ANALYSIS_FUNCNAME_Erf (ANALYSIS_FUNCNAME_START+33)
-#define ANALYSIS_FUNCNAME_Erfc (ANALYSIS_FUNCNAME_START+34)
-#define ANALYSIS_FUNCNAME_Gestep (ANALYSIS_FUNCNAME_START+35)
-#define ANALYSIS_FUNCNAME_Factdouble (ANALYSIS_FUNCNAME_START+36)
-#define ANALYSIS_FUNCNAME_Imabs (ANALYSIS_FUNCNAME_START+37)
-#define ANALYSIS_FUNCNAME_Imaginary (ANALYSIS_FUNCNAME_START+38)
-#define ANALYSIS_FUNCNAME_Impower (ANALYSIS_FUNCNAME_START+39)
-#define ANALYSIS_FUNCNAME_Imargument (ANALYSIS_FUNCNAME_START+40)
-#define ANALYSIS_FUNCNAME_Imcos (ANALYSIS_FUNCNAME_START+41)
-#define ANALYSIS_FUNCNAME_Imdiv (ANALYSIS_FUNCNAME_START+42)
-#define ANALYSIS_FUNCNAME_Imexp (ANALYSIS_FUNCNAME_START+43)
-#define ANALYSIS_FUNCNAME_Imconjugate (ANALYSIS_FUNCNAME_START+44)
-#define ANALYSIS_FUNCNAME_Imln (ANALYSIS_FUNCNAME_START+45)
-#define ANALYSIS_FUNCNAME_Imlog10 (ANALYSIS_FUNCNAME_START+46)
-#define ANALYSIS_FUNCNAME_Imlog2 (ANALYSIS_FUNCNAME_START+47)
-#define ANALYSIS_FUNCNAME_Improduct (ANALYSIS_FUNCNAME_START+48)
-#define ANALYSIS_FUNCNAME_Imreal (ANALYSIS_FUNCNAME_START+49)
-#define ANALYSIS_FUNCNAME_Imsin (ANALYSIS_FUNCNAME_START+50)
-#define ANALYSIS_FUNCNAME_Imsub (ANALYSIS_FUNCNAME_START+51)
-#define ANALYSIS_FUNCNAME_Imsqrt (ANALYSIS_FUNCNAME_START+52)
-#define ANALYSIS_FUNCNAME_Imsum (ANALYSIS_FUNCNAME_START+53)
-#define ANALYSIS_FUNCNAME_Complex (ANALYSIS_FUNCNAME_START+54)
-#define ANALYSIS_FUNCNAME_Convert (ANALYSIS_FUNCNAME_START+55)
-#define ANALYSIS_FUNCNAME_Amordegrc (ANALYSIS_FUNCNAME_START+56)
-#define ANALYSIS_FUNCNAME_Amorlinc (ANALYSIS_FUNCNAME_START+57)
-#define ANALYSIS_FUNCNAME_Accrint (ANALYSIS_FUNCNAME_START+58)
-#define ANALYSIS_FUNCNAME_Accrintm (ANALYSIS_FUNCNAME_START+59)
-#define ANALYSIS_FUNCNAME_Received (ANALYSIS_FUNCNAME_START+60)
-#define ANALYSIS_FUNCNAME_Disc (ANALYSIS_FUNCNAME_START+61)
-#define ANALYSIS_FUNCNAME_Duration (ANALYSIS_FUNCNAME_START+62)
-#define ANALYSIS_FUNCNAME_Effect (ANALYSIS_FUNCNAME_START+63)
-#define ANALYSIS_FUNCNAME_Cumprinc (ANALYSIS_FUNCNAME_START+64)
-#define ANALYSIS_FUNCNAME_Cumipmt (ANALYSIS_FUNCNAME_START+65)
-#define ANALYSIS_FUNCNAME_Price (ANALYSIS_FUNCNAME_START+66)
-#define ANALYSIS_FUNCNAME_Pricedisc (ANALYSIS_FUNCNAME_START+67)
-#define ANALYSIS_FUNCNAME_Pricemat (ANALYSIS_FUNCNAME_START+68)
-#define ANALYSIS_FUNCNAME_Mduration (ANALYSIS_FUNCNAME_START+69)
-#define ANALYSIS_FUNCNAME_Nominal (ANALYSIS_FUNCNAME_START+70)
-#define ANALYSIS_FUNCNAME_Dollarfr (ANALYSIS_FUNCNAME_START+71)
-#define ANALYSIS_FUNCNAME_Dollarde (ANALYSIS_FUNCNAME_START+72)
-#define ANALYSIS_FUNCNAME_Yield (ANALYSIS_FUNCNAME_START+73)
-#define ANALYSIS_FUNCNAME_Yielddisc (ANALYSIS_FUNCNAME_START+74)
-#define ANALYSIS_FUNCNAME_Yieldmat (ANALYSIS_FUNCNAME_START+75)
-#define ANALYSIS_FUNCNAME_Tbilleq (ANALYSIS_FUNCNAME_START+76)
-#define ANALYSIS_FUNCNAME_Tbillprice (ANALYSIS_FUNCNAME_START+77)
-#define ANALYSIS_FUNCNAME_Tbillyield (ANALYSIS_FUNCNAME_START+78)
-#define ANALYSIS_FUNCNAME_Oddfprice (ANALYSIS_FUNCNAME_START+79)
-#define ANALYSIS_FUNCNAME_Oddfyield (ANALYSIS_FUNCNAME_START+80)
-#define ANALYSIS_FUNCNAME_Oddlprice (ANALYSIS_FUNCNAME_START+81)
-#define ANALYSIS_FUNCNAME_Oddlyield (ANALYSIS_FUNCNAME_START+82)
-#define ANALYSIS_FUNCNAME_Xirr (ANALYSIS_FUNCNAME_START+83)
-#define ANALYSIS_FUNCNAME_Xnpv (ANALYSIS_FUNCNAME_START+84)
-#define ANALYSIS_FUNCNAME_Intrate (ANALYSIS_FUNCNAME_START+85)
-#define ANALYSIS_FUNCNAME_Coupncd (ANALYSIS_FUNCNAME_START+86)
-#define ANALYSIS_FUNCNAME_Coupdays (ANALYSIS_FUNCNAME_START+87)
-#define ANALYSIS_FUNCNAME_Coupdaysnc (ANALYSIS_FUNCNAME_START+88)
-#define ANALYSIS_FUNCNAME_Coupdaybs (ANALYSIS_FUNCNAME_START+89)
-#define ANALYSIS_FUNCNAME_Couppcd (ANALYSIS_FUNCNAME_START+90)
-#define ANALYSIS_FUNCNAME_Coupnum (ANALYSIS_FUNCNAME_START+91)
-#define ANALYSIS_FUNCNAME_Fvschedule (ANALYSIS_FUNCNAME_START+92)
+#define ANALYSIS_FUNCNAME_Workday (ANALYSIS_FUNCNAME_START)
+#define ANALYSIS_FUNCNAME_Yearfrac (ANALYSIS_FUNCNAME_START+1)
+#define ANALYSIS_FUNCNAME_Edate (ANALYSIS_FUNCNAME_START+2)
+#define ANALYSIS_FUNCNAME_Weeknum (ANALYSIS_FUNCNAME_START+3)
+#define ANALYSIS_FUNCNAME_Eomonth (ANALYSIS_FUNCNAME_START+4)
+#define ANALYSIS_FUNCNAME_Networkdays (ANALYSIS_FUNCNAME_START+5)
+#define ANALYSIS_FUNCNAME_Iseven (ANALYSIS_FUNCNAME_START+6)
+#define ANALYSIS_FUNCNAME_Isodd (ANALYSIS_FUNCNAME_START+7)
+#define ANALYSIS_FUNCNAME_Multinomial (ANALYSIS_FUNCNAME_START+8)
+#define ANALYSIS_FUNCNAME_Seriessum (ANALYSIS_FUNCNAME_START+9)
+#define ANALYSIS_FUNCNAME_Quotient (ANALYSIS_FUNCNAME_START+10)
+#define ANALYSIS_FUNCNAME_Mround (ANALYSIS_FUNCNAME_START+11)
+#define ANALYSIS_FUNCNAME_Sqrtpi (ANALYSIS_FUNCNAME_START+12)
+#define ANALYSIS_FUNCNAME_Randbetween (ANALYSIS_FUNCNAME_START+13)
+#define ANALYSIS_FUNCNAME_Gcd (ANALYSIS_FUNCNAME_START+14)
+#define ANALYSIS_FUNCNAME_Lcm (ANALYSIS_FUNCNAME_START+15)
+#define ANALYSIS_FUNCNAME_Besseli (ANALYSIS_FUNCNAME_START+16)
+#define ANALYSIS_FUNCNAME_Besselj (ANALYSIS_FUNCNAME_START+17)
+#define ANALYSIS_FUNCNAME_Besselk (ANALYSIS_FUNCNAME_START+18)
+#define ANALYSIS_FUNCNAME_Bessely (ANALYSIS_FUNCNAME_START+19)
+#define ANALYSIS_FUNCNAME_Bin2Oct (ANALYSIS_FUNCNAME_START+20)
+#define ANALYSIS_FUNCNAME_Bin2Dec (ANALYSIS_FUNCNAME_START+21)
+#define ANALYSIS_FUNCNAME_Bin2Hex (ANALYSIS_FUNCNAME_START+22)
+#define ANALYSIS_FUNCNAME_Oct2Bin (ANALYSIS_FUNCNAME_START+23)
+#define ANALYSIS_FUNCNAME_Oct2Dec (ANALYSIS_FUNCNAME_START+24)
+#define ANALYSIS_FUNCNAME_Oct2Hex (ANALYSIS_FUNCNAME_START+25)
+#define ANALYSIS_FUNCNAME_Dec2Bin (ANALYSIS_FUNCNAME_START+26)
+#define ANALYSIS_FUNCNAME_Dec2Hex (ANALYSIS_FUNCNAME_START+27)
+#define ANALYSIS_FUNCNAME_Dec2Oct (ANALYSIS_FUNCNAME_START+28)
+#define ANALYSIS_FUNCNAME_Hex2Bin (ANALYSIS_FUNCNAME_START+29)
+#define ANALYSIS_FUNCNAME_Hex2Dec (ANALYSIS_FUNCNAME_START+30)
+#define ANALYSIS_FUNCNAME_Hex2Oct (ANALYSIS_FUNCNAME_START+31)
+#define ANALYSIS_FUNCNAME_Delta (ANALYSIS_FUNCNAME_START+32)
+#define ANALYSIS_FUNCNAME_Erf (ANALYSIS_FUNCNAME_START+33)
+#define ANALYSIS_FUNCNAME_Erfc (ANALYSIS_FUNCNAME_START+34)
+#define ANALYSIS_FUNCNAME_Gestep (ANALYSIS_FUNCNAME_START+35)
+#define ANALYSIS_FUNCNAME_Factdouble (ANALYSIS_FUNCNAME_START+36)
+#define ANALYSIS_FUNCNAME_Imabs (ANALYSIS_FUNCNAME_START+37)
+#define ANALYSIS_FUNCNAME_Imaginary (ANALYSIS_FUNCNAME_START+38)
+#define ANALYSIS_FUNCNAME_Impower (ANALYSIS_FUNCNAME_START+39)
+#define ANALYSIS_FUNCNAME_Imargument (ANALYSIS_FUNCNAME_START+40)
+#define ANALYSIS_FUNCNAME_Imcos (ANALYSIS_FUNCNAME_START+41)
+#define ANALYSIS_FUNCNAME_Imdiv (ANALYSIS_FUNCNAME_START+42)
+#define ANALYSIS_FUNCNAME_Imexp (ANALYSIS_FUNCNAME_START+43)
+#define ANALYSIS_FUNCNAME_Imconjugate (ANALYSIS_FUNCNAME_START+44)
+#define ANALYSIS_FUNCNAME_Imln (ANALYSIS_FUNCNAME_START+45)
+#define ANALYSIS_FUNCNAME_Imlog10 (ANALYSIS_FUNCNAME_START+46)
+#define ANALYSIS_FUNCNAME_Imlog2 (ANALYSIS_FUNCNAME_START+47)
+#define ANALYSIS_FUNCNAME_Improduct (ANALYSIS_FUNCNAME_START+48)
+#define ANALYSIS_FUNCNAME_Imreal (ANALYSIS_FUNCNAME_START+49)
+#define ANALYSIS_FUNCNAME_Imsin (ANALYSIS_FUNCNAME_START+50)
+#define ANALYSIS_FUNCNAME_Imsub (ANALYSIS_FUNCNAME_START+51)
+#define ANALYSIS_FUNCNAME_Imsqrt (ANALYSIS_FUNCNAME_START+52)
+#define ANALYSIS_FUNCNAME_Imsum (ANALYSIS_FUNCNAME_START+53)
+#define ANALYSIS_FUNCNAME_Complex (ANALYSIS_FUNCNAME_START+54)
+#define ANALYSIS_FUNCNAME_Convert (ANALYSIS_FUNCNAME_START+55)
+#define ANALYSIS_FUNCNAME_Amordegrc (ANALYSIS_FUNCNAME_START+56)
+#define ANALYSIS_FUNCNAME_Amorlinc (ANALYSIS_FUNCNAME_START+57)
+#define ANALYSIS_FUNCNAME_Accrint (ANALYSIS_FUNCNAME_START+58)
+#define ANALYSIS_FUNCNAME_Accrintm (ANALYSIS_FUNCNAME_START+59)
+#define ANALYSIS_FUNCNAME_Received (ANALYSIS_FUNCNAME_START+60)
+#define ANALYSIS_FUNCNAME_Disc (ANALYSIS_FUNCNAME_START+61)
+#define ANALYSIS_FUNCNAME_Duration (ANALYSIS_FUNCNAME_START+62)
+#define ANALYSIS_FUNCNAME_Effect (ANALYSIS_FUNCNAME_START+63)
+#define ANALYSIS_FUNCNAME_Cumprinc (ANALYSIS_FUNCNAME_START+64)
+#define ANALYSIS_FUNCNAME_Cumipmt (ANALYSIS_FUNCNAME_START+65)
+#define ANALYSIS_FUNCNAME_Price (ANALYSIS_FUNCNAME_START+66)
+#define ANALYSIS_FUNCNAME_Pricedisc (ANALYSIS_FUNCNAME_START+67)
+#define ANALYSIS_FUNCNAME_Pricemat (ANALYSIS_FUNCNAME_START+68)
+#define ANALYSIS_FUNCNAME_Mduration (ANALYSIS_FUNCNAME_START+69)
+#define ANALYSIS_FUNCNAME_Nominal (ANALYSIS_FUNCNAME_START+70)
+#define ANALYSIS_FUNCNAME_Dollarfr (ANALYSIS_FUNCNAME_START+71)
+#define ANALYSIS_FUNCNAME_Dollarde (ANALYSIS_FUNCNAME_START+72)
+#define ANALYSIS_FUNCNAME_Yield (ANALYSIS_FUNCNAME_START+73)
+#define ANALYSIS_FUNCNAME_Yielddisc (ANALYSIS_FUNCNAME_START+74)
+#define ANALYSIS_FUNCNAME_Yieldmat (ANALYSIS_FUNCNAME_START+75)
+#define ANALYSIS_FUNCNAME_Tbilleq (ANALYSIS_FUNCNAME_START+76)
+#define ANALYSIS_FUNCNAME_Tbillprice (ANALYSIS_FUNCNAME_START+77)
+#define ANALYSIS_FUNCNAME_Tbillyield (ANALYSIS_FUNCNAME_START+78)
+#define ANALYSIS_FUNCNAME_Oddfprice (ANALYSIS_FUNCNAME_START+79)
+#define ANALYSIS_FUNCNAME_Oddfyield (ANALYSIS_FUNCNAME_START+80)
+#define ANALYSIS_FUNCNAME_Oddlprice (ANALYSIS_FUNCNAME_START+81)
+#define ANALYSIS_FUNCNAME_Oddlyield (ANALYSIS_FUNCNAME_START+82)
+#define ANALYSIS_FUNCNAME_Xirr (ANALYSIS_FUNCNAME_START+83)
+#define ANALYSIS_FUNCNAME_Xnpv (ANALYSIS_FUNCNAME_START+84)
+#define ANALYSIS_FUNCNAME_Intrate (ANALYSIS_FUNCNAME_START+85)
+#define ANALYSIS_FUNCNAME_Coupncd (ANALYSIS_FUNCNAME_START+86)
+#define ANALYSIS_FUNCNAME_Coupdays (ANALYSIS_FUNCNAME_START+87)
+#define ANALYSIS_FUNCNAME_Coupdaysnc (ANALYSIS_FUNCNAME_START+88)
+#define ANALYSIS_FUNCNAME_Coupdaybs (ANALYSIS_FUNCNAME_START+89)
+#define ANALYSIS_FUNCNAME_Couppcd (ANALYSIS_FUNCNAME_START+90)
+#define ANALYSIS_FUNCNAME_Coupnum (ANALYSIS_FUNCNAME_START+91)
+#define ANALYSIS_FUNCNAME_Fvschedule (ANALYSIS_FUNCNAME_START+92)
-#define ANALYSIS_DEFFUNCNAME_START (RID_ANALYSIS_DEFFUNCTION_NAMES+1)
+#define ANALYSIS_DEFFUNCNAME_START (RID_ANALYSIS_DEFFUNCTION_NAMES+1)
-#define ANALYSIS_DEFFUNCNAME_Workday (ANALYSIS_DEFFUNCNAME_START)
-#define ANALYSIS_DEFFUNCNAME_Yearfrac (ANALYSIS_DEFFUNCNAME_START+1)
-#define ANALYSIS_DEFFUNCNAME_Edate (ANALYSIS_DEFFUNCNAME_START+2)
-#define ANALYSIS_DEFFUNCNAME_Weeknum (ANALYSIS_DEFFUNCNAME_START+3)
-#define ANALYSIS_DEFFUNCNAME_Eomonth (ANALYSIS_DEFFUNCNAME_START+4)
-#define ANALYSIS_DEFFUNCNAME_Networkdays (ANALYSIS_DEFFUNCNAME_START+5)
-#define ANALYSIS_DEFFUNCNAME_Iseven (ANALYSIS_DEFFUNCNAME_START+6)
-#define ANALYSIS_DEFFUNCNAME_Isodd (ANALYSIS_DEFFUNCNAME_START+7)
-#define ANALYSIS_DEFFUNCNAME_Multinomial (ANALYSIS_DEFFUNCNAME_START+8)
-#define ANALYSIS_DEFFUNCNAME_Seriessum (ANALYSIS_DEFFUNCNAME_START+9)
-#define ANALYSIS_DEFFUNCNAME_Quotient (ANALYSIS_DEFFUNCNAME_START+10)
-#define ANALYSIS_DEFFUNCNAME_Mround (ANALYSIS_DEFFUNCNAME_START+11)
-#define ANALYSIS_DEFFUNCNAME_Sqrtpi (ANALYSIS_DEFFUNCNAME_START+12)
-#define ANALYSIS_DEFFUNCNAME_Randbetween (ANALYSIS_DEFFUNCNAME_START+13)
-#define ANALYSIS_DEFFUNCNAME_Gcd (ANALYSIS_DEFFUNCNAME_START+14)
-#define ANALYSIS_DEFFUNCNAME_Lcm (ANALYSIS_DEFFUNCNAME_START+15)
-#define ANALYSIS_DEFFUNCNAME_Besseli (ANALYSIS_DEFFUNCNAME_START+16)
-#define ANALYSIS_DEFFUNCNAME_Besselj (ANALYSIS_DEFFUNCNAME_START+17)
-#define ANALYSIS_DEFFUNCNAME_Besselk (ANALYSIS_DEFFUNCNAME_START+18)
-#define ANALYSIS_DEFFUNCNAME_Bessely (ANALYSIS_DEFFUNCNAME_START+19)
-#define ANALYSIS_DEFFUNCNAME_Bin2Oct (ANALYSIS_DEFFUNCNAME_START+20)
-#define ANALYSIS_DEFFUNCNAME_Bin2Dec (ANALYSIS_DEFFUNCNAME_START+21)
-#define ANALYSIS_DEFFUNCNAME_Bin2Hex (ANALYSIS_DEFFUNCNAME_START+22)
-#define ANALYSIS_DEFFUNCNAME_Oct2Bin (ANALYSIS_DEFFUNCNAME_START+23)
-#define ANALYSIS_DEFFUNCNAME_Oct2Dec (ANALYSIS_DEFFUNCNAME_START+24)
-#define ANALYSIS_DEFFUNCNAME_Oct2Hex (ANALYSIS_DEFFUNCNAME_START+25)
-#define ANALYSIS_DEFFUNCNAME_Dec2Bin (ANALYSIS_DEFFUNCNAME_START+26)
-#define ANALYSIS_DEFFUNCNAME_Dec2Hex (ANALYSIS_DEFFUNCNAME_START+27)
-#define ANALYSIS_DEFFUNCNAME_Dec2Oct (ANALYSIS_DEFFUNCNAME_START+28)
-#define ANALYSIS_DEFFUNCNAME_Hex2Bin (ANALYSIS_DEFFUNCNAME_START+29)
-#define ANALYSIS_DEFFUNCNAME_Hex2Dec (ANALYSIS_DEFFUNCNAME_START+30)
-#define ANALYSIS_DEFFUNCNAME_Hex2Oct (ANALYSIS_DEFFUNCNAME_START+31)
-#define ANALYSIS_DEFFUNCNAME_Delta (ANALYSIS_DEFFUNCNAME_START+32)
-#define ANALYSIS_DEFFUNCNAME_Erf (ANALYSIS_DEFFUNCNAME_START+33)
-#define ANALYSIS_DEFFUNCNAME_Erfc (ANALYSIS_DEFFUNCNAME_START+34)
-#define ANALYSIS_DEFFUNCNAME_Gestep (ANALYSIS_DEFFUNCNAME_START+35)
-#define ANALYSIS_DEFFUNCNAME_Factdouble (ANALYSIS_DEFFUNCNAME_START+36)
-#define ANALYSIS_DEFFUNCNAME_Imabs (ANALYSIS_DEFFUNCNAME_START+37)
-#define ANALYSIS_DEFFUNCNAME_Imaginary (ANALYSIS_DEFFUNCNAME_START+38)
-#define ANALYSIS_DEFFUNCNAME_Impower (ANALYSIS_DEFFUNCNAME_START+39)
-#define ANALYSIS_DEFFUNCNAME_Imargument (ANALYSIS_DEFFUNCNAME_START+40)
-#define ANALYSIS_DEFFUNCNAME_Imcos (ANALYSIS_DEFFUNCNAME_START+41)
-#define ANALYSIS_DEFFUNCNAME_Imdiv (ANALYSIS_DEFFUNCNAME_START+42)
-#define ANALYSIS_DEFFUNCNAME_Imexp (ANALYSIS_DEFFUNCNAME_START+43)
-#define ANALYSIS_DEFFUNCNAME_Imconjugate (ANALYSIS_DEFFUNCNAME_START+44)
-#define ANALYSIS_DEFFUNCNAME_Imln (ANALYSIS_DEFFUNCNAME_START+45)
-#define ANALYSIS_DEFFUNCNAME_Imlog10 (ANALYSIS_DEFFUNCNAME_START+46)
-#define ANALYSIS_DEFFUNCNAME_Imlog2 (ANALYSIS_DEFFUNCNAME_START+47)
-#define ANALYSIS_DEFFUNCNAME_Improduct (ANALYSIS_DEFFUNCNAME_START+48)
-#define ANALYSIS_DEFFUNCNAME_Imreal (ANALYSIS_DEFFUNCNAME_START+49)
-#define ANALYSIS_DEFFUNCNAME_Imsin (ANALYSIS_DEFFUNCNAME_START+50)
-#define ANALYSIS_DEFFUNCNAME_Imsub (ANALYSIS_DEFFUNCNAME_START+51)
-#define ANALYSIS_DEFFUNCNAME_Imsqrt (ANALYSIS_DEFFUNCNAME_START+52)
-#define ANALYSIS_DEFFUNCNAME_Imsum (ANALYSIS_DEFFUNCNAME_START+53)
-#define ANALYSIS_DEFFUNCNAME_Complex (ANALYSIS_DEFFUNCNAME_START+54)
-#define ANALYSIS_DEFFUNCNAME_Convert (ANALYSIS_DEFFUNCNAME_START+55)
-#define ANALYSIS_DEFFUNCNAME_Amordegrc (ANALYSIS_DEFFUNCNAME_START+56)
-#define ANALYSIS_DEFFUNCNAME_Amorlinc (ANALYSIS_DEFFUNCNAME_START+57)
-#define ANALYSIS_DEFFUNCNAME_Accrint (ANALYSIS_DEFFUNCNAME_START+58)
-#define ANALYSIS_DEFFUNCNAME_Accrintm (ANALYSIS_DEFFUNCNAME_START+59)
-#define ANALYSIS_DEFFUNCNAME_Received (ANALYSIS_DEFFUNCNAME_START+60)
-#define ANALYSIS_DEFFUNCNAME_Disc (ANALYSIS_DEFFUNCNAME_START+61)
-#define ANALYSIS_DEFFUNCNAME_Duration (ANALYSIS_DEFFUNCNAME_START+62)
-#define ANALYSIS_DEFFUNCNAME_Effect (ANALYSIS_DEFFUNCNAME_START+63)
-#define ANALYSIS_DEFFUNCNAME_Cumprinc (ANALYSIS_DEFFUNCNAME_START+64)
-#define ANALYSIS_DEFFUNCNAME_Cumipmt (ANALYSIS_DEFFUNCNAME_START+65)
-#define ANALYSIS_DEFFUNCNAME_Price (ANALYSIS_DEFFUNCNAME_START+66)
-#define ANALYSIS_DEFFUNCNAME_Pricedisc (ANALYSIS_DEFFUNCNAME_START+67)
-#define ANALYSIS_DEFFUNCNAME_Pricemat (ANALYSIS_DEFFUNCNAME_START+68)
-#define ANALYSIS_DEFFUNCNAME_Mduration (ANALYSIS_DEFFUNCNAME_START+69)
-#define ANALYSIS_DEFFUNCNAME_Nominal (ANALYSIS_DEFFUNCNAME_START+70)
-#define ANALYSIS_DEFFUNCNAME_Dollarfr (ANALYSIS_DEFFUNCNAME_START+71)
-#define ANALYSIS_DEFFUNCNAME_Dollarde (ANALYSIS_DEFFUNCNAME_START+72)
-#define ANALYSIS_DEFFUNCNAME_Yield (ANALYSIS_DEFFUNCNAME_START+73)
-#define ANALYSIS_DEFFUNCNAME_Yielddisc (ANALYSIS_DEFFUNCNAME_START+74)
-#define ANALYSIS_DEFFUNCNAME_Yieldmat (ANALYSIS_DEFFUNCNAME_START+75)
-#define ANALYSIS_DEFFUNCNAME_Tbilleq (ANALYSIS_DEFFUNCNAME_START+76)
-#define ANALYSIS_DEFFUNCNAME_Tbillprice (ANALYSIS_DEFFUNCNAME_START+77)
-#define ANALYSIS_DEFFUNCNAME_Tbillyield (ANALYSIS_DEFFUNCNAME_START+78)
-#define ANALYSIS_DEFFUNCNAME_Oddfprice (ANALYSIS_DEFFUNCNAME_START+79)
-#define ANALYSIS_DEFFUNCNAME_Oddfyield (ANALYSIS_DEFFUNCNAME_START+80)
-#define ANALYSIS_DEFFUNCNAME_Oddlprice (ANALYSIS_DEFFUNCNAME_START+81)
-#define ANALYSIS_DEFFUNCNAME_Oddlyield (ANALYSIS_DEFFUNCNAME_START+82)
-#define ANALYSIS_DEFFUNCNAME_Xirr (ANALYSIS_DEFFUNCNAME_START+83)
-#define ANALYSIS_DEFFUNCNAME_Xnpv (ANALYSIS_DEFFUNCNAME_START+84)
-#define ANALYSIS_DEFFUNCNAME_Intrate (ANALYSIS_DEFFUNCNAME_START+85)
-#define ANALYSIS_DEFFUNCNAME_Coupncd (ANALYSIS_DEFFUNCNAME_START+86)
-#define ANALYSIS_DEFFUNCNAME_Coupdays (ANALYSIS_DEFFUNCNAME_START+87)
-#define ANALYSIS_DEFFUNCNAME_Coupdaysnc (ANALYSIS_DEFFUNCNAME_START+88)
-#define ANALYSIS_DEFFUNCNAME_Coupdaybs (ANALYSIS_DEFFUNCNAME_START+89)
-#define ANALYSIS_DEFFUNCNAME_Couppcd (ANALYSIS_DEFFUNCNAME_START+90)
-#define ANALYSIS_DEFFUNCNAME_Coupnum (ANALYSIS_DEFFUNCNAME_START+91)
-#define ANALYSIS_DEFFUNCNAME_Fvschedule (ANALYSIS_DEFFUNCNAME_START+92)
+#define ANALYSIS_DEFFUNCNAME_Workday (ANALYSIS_DEFFUNCNAME_START)
+#define ANALYSIS_DEFFUNCNAME_Yearfrac (ANALYSIS_DEFFUNCNAME_START+1)
+#define ANALYSIS_DEFFUNCNAME_Edate (ANALYSIS_DEFFUNCNAME_START+2)
+#define ANALYSIS_DEFFUNCNAME_Weeknum (ANALYSIS_DEFFUNCNAME_START+3)
+#define ANALYSIS_DEFFUNCNAME_Eomonth (ANALYSIS_DEFFUNCNAME_START+4)
+#define ANALYSIS_DEFFUNCNAME_Networkdays (ANALYSIS_DEFFUNCNAME_START+5)
+#define ANALYSIS_DEFFUNCNAME_Iseven (ANALYSIS_DEFFUNCNAME_START+6)
+#define ANALYSIS_DEFFUNCNAME_Isodd (ANALYSIS_DEFFUNCNAME_START+7)
+#define ANALYSIS_DEFFUNCNAME_Multinomial (ANALYSIS_DEFFUNCNAME_START+8)
+#define ANALYSIS_DEFFUNCNAME_Seriessum (ANALYSIS_DEFFUNCNAME_START+9)
+#define ANALYSIS_DEFFUNCNAME_Quotient (ANALYSIS_DEFFUNCNAME_START+10)
+#define ANALYSIS_DEFFUNCNAME_Mround (ANALYSIS_DEFFUNCNAME_START+11)
+#define ANALYSIS_DEFFUNCNAME_Sqrtpi (ANALYSIS_DEFFUNCNAME_START+12)
+#define ANALYSIS_DEFFUNCNAME_Randbetween (ANALYSIS_DEFFUNCNAME_START+13)
+#define ANALYSIS_DEFFUNCNAME_Gcd (ANALYSIS_DEFFUNCNAME_START+14)
+#define ANALYSIS_DEFFUNCNAME_Lcm (ANALYSIS_DEFFUNCNAME_START+15)
+#define ANALYSIS_DEFFUNCNAME_Besseli (ANALYSIS_DEFFUNCNAME_START+16)
+#define ANALYSIS_DEFFUNCNAME_Besselj (ANALYSIS_DEFFUNCNAME_START+17)
+#define ANALYSIS_DEFFUNCNAME_Besselk (ANALYSIS_DEFFUNCNAME_START+18)
+#define ANALYSIS_DEFFUNCNAME_Bessely (ANALYSIS_DEFFUNCNAME_START+19)
+#define ANALYSIS_DEFFUNCNAME_Bin2Oct (ANALYSIS_DEFFUNCNAME_START+20)
+#define ANALYSIS_DEFFUNCNAME_Bin2Dec (ANALYSIS_DEFFUNCNAME_START+21)
+#define ANALYSIS_DEFFUNCNAME_Bin2Hex (ANALYSIS_DEFFUNCNAME_START+22)
+#define ANALYSIS_DEFFUNCNAME_Oct2Bin (ANALYSIS_DEFFUNCNAME_START+23)
+#define ANALYSIS_DEFFUNCNAME_Oct2Dec (ANALYSIS_DEFFUNCNAME_START+24)
+#define ANALYSIS_DEFFUNCNAME_Oct2Hex (ANALYSIS_DEFFUNCNAME_START+25)
+#define ANALYSIS_DEFFUNCNAME_Dec2Bin (ANALYSIS_DEFFUNCNAME_START+26)
+#define ANALYSIS_DEFFUNCNAME_Dec2Hex (ANALYSIS_DEFFUNCNAME_START+27)
+#define ANALYSIS_DEFFUNCNAME_Dec2Oct (ANALYSIS_DEFFUNCNAME_START+28)
+#define ANALYSIS_DEFFUNCNAME_Hex2Bin (ANALYSIS_DEFFUNCNAME_START+29)
+#define ANALYSIS_DEFFUNCNAME_Hex2Dec (ANALYSIS_DEFFUNCNAME_START+30)
+#define ANALYSIS_DEFFUNCNAME_Hex2Oct (ANALYSIS_DEFFUNCNAME_START+31)
+#define ANALYSIS_DEFFUNCNAME_Delta (ANALYSIS_DEFFUNCNAME_START+32)
+#define ANALYSIS_DEFFUNCNAME_Erf (ANALYSIS_DEFFUNCNAME_START+33)
+#define ANALYSIS_DEFFUNCNAME_Erfc (ANALYSIS_DEFFUNCNAME_START+34)
+#define ANALYSIS_DEFFUNCNAME_Gestep (ANALYSIS_DEFFUNCNAME_START+35)
+#define ANALYSIS_DEFFUNCNAME_Factdouble (ANALYSIS_DEFFUNCNAME_START+36)
+#define ANALYSIS_DEFFUNCNAME_Imabs (ANALYSIS_DEFFUNCNAME_START+37)
+#define ANALYSIS_DEFFUNCNAME_Imaginary (ANALYSIS_DEFFUNCNAME_START+38)
+#define ANALYSIS_DEFFUNCNAME_Impower (ANALYSIS_DEFFUNCNAME_START+39)
+#define ANALYSIS_DEFFUNCNAME_Imargument (ANALYSIS_DEFFUNCNAME_START+40)
+#define ANALYSIS_DEFFUNCNAME_Imcos (ANALYSIS_DEFFUNCNAME_START+41)
+#define ANALYSIS_DEFFUNCNAME_Imdiv (ANALYSIS_DEFFUNCNAME_START+42)
+#define ANALYSIS_DEFFUNCNAME_Imexp (ANALYSIS_DEFFUNCNAME_START+43)
+#define ANALYSIS_DEFFUNCNAME_Imconjugate (ANALYSIS_DEFFUNCNAME_START+44)
+#define ANALYSIS_DEFFUNCNAME_Imln (ANALYSIS_DEFFUNCNAME_START+45)
+#define ANALYSIS_DEFFUNCNAME_Imlog10 (ANALYSIS_DEFFUNCNAME_START+46)
+#define ANALYSIS_DEFFUNCNAME_Imlog2 (ANALYSIS_DEFFUNCNAME_START+47)
+#define ANALYSIS_DEFFUNCNAME_Improduct (ANALYSIS_DEFFUNCNAME_START+48)
+#define ANALYSIS_DEFFUNCNAME_Imreal (ANALYSIS_DEFFUNCNAME_START+49)
+#define ANALYSIS_DEFFUNCNAME_Imsin (ANALYSIS_DEFFUNCNAME_START+50)
+#define ANALYSIS_DEFFUNCNAME_Imsub (ANALYSIS_DEFFUNCNAME_START+51)
+#define ANALYSIS_DEFFUNCNAME_Imsqrt (ANALYSIS_DEFFUNCNAME_START+52)
+#define ANALYSIS_DEFFUNCNAME_Imsum (ANALYSIS_DEFFUNCNAME_START+53)
+#define ANALYSIS_DEFFUNCNAME_Complex (ANALYSIS_DEFFUNCNAME_START+54)
+#define ANALYSIS_DEFFUNCNAME_Convert (ANALYSIS_DEFFUNCNAME_START+55)
+#define ANALYSIS_DEFFUNCNAME_Amordegrc (ANALYSIS_DEFFUNCNAME_START+56)
+#define ANALYSIS_DEFFUNCNAME_Amorlinc (ANALYSIS_DEFFUNCNAME_START+57)
+#define ANALYSIS_DEFFUNCNAME_Accrint (ANALYSIS_DEFFUNCNAME_START+58)
+#define ANALYSIS_DEFFUNCNAME_Accrintm (ANALYSIS_DEFFUNCNAME_START+59)
+#define ANALYSIS_DEFFUNCNAME_Received (ANALYSIS_DEFFUNCNAME_START+60)
+#define ANALYSIS_DEFFUNCNAME_Disc (ANALYSIS_DEFFUNCNAME_START+61)
+#define ANALYSIS_DEFFUNCNAME_Duration (ANALYSIS_DEFFUNCNAME_START+62)
+#define ANALYSIS_DEFFUNCNAME_Effect (ANALYSIS_DEFFUNCNAME_START+63)
+#define ANALYSIS_DEFFUNCNAME_Cumprinc (ANALYSIS_DEFFUNCNAME_START+64)
+#define ANALYSIS_DEFFUNCNAME_Cumipmt (ANALYSIS_DEFFUNCNAME_START+65)
+#define ANALYSIS_DEFFUNCNAME_Price (ANALYSIS_DEFFUNCNAME_START+66)
+#define ANALYSIS_DEFFUNCNAME_Pricedisc (ANALYSIS_DEFFUNCNAME_START+67)
+#define ANALYSIS_DEFFUNCNAME_Pricemat (ANALYSIS_DEFFUNCNAME_START+68)
+#define ANALYSIS_DEFFUNCNAME_Mduration (ANALYSIS_DEFFUNCNAME_START+69)
+#define ANALYSIS_DEFFUNCNAME_Nominal (ANALYSIS_DEFFUNCNAME_START+70)
+#define ANALYSIS_DEFFUNCNAME_Dollarfr (ANALYSIS_DEFFUNCNAME_START+71)
+#define ANALYSIS_DEFFUNCNAME_Dollarde (ANALYSIS_DEFFUNCNAME_START+72)
+#define ANALYSIS_DEFFUNCNAME_Yield (ANALYSIS_DEFFUNCNAME_START+73)
+#define ANALYSIS_DEFFUNCNAME_Yielddisc (ANALYSIS_DEFFUNCNAME_START+74)
+#define ANALYSIS_DEFFUNCNAME_Yieldmat (ANALYSIS_DEFFUNCNAME_START+75)
+#define ANALYSIS_DEFFUNCNAME_Tbilleq (ANALYSIS_DEFFUNCNAME_START+76)
+#define ANALYSIS_DEFFUNCNAME_Tbillprice (ANALYSIS_DEFFUNCNAME_START+77)
+#define ANALYSIS_DEFFUNCNAME_Tbillyield (ANALYSIS_DEFFUNCNAME_START+78)
+#define ANALYSIS_DEFFUNCNAME_Oddfprice (ANALYSIS_DEFFUNCNAME_START+79)
+#define ANALYSIS_DEFFUNCNAME_Oddfyield (ANALYSIS_DEFFUNCNAME_START+80)
+#define ANALYSIS_DEFFUNCNAME_Oddlprice (ANALYSIS_DEFFUNCNAME_START+81)
+#define ANALYSIS_DEFFUNCNAME_Oddlyield (ANALYSIS_DEFFUNCNAME_START+82)
+#define ANALYSIS_DEFFUNCNAME_Xirr (ANALYSIS_DEFFUNCNAME_START+83)
+#define ANALYSIS_DEFFUNCNAME_Xnpv (ANALYSIS_DEFFUNCNAME_START+84)
+#define ANALYSIS_DEFFUNCNAME_Intrate (ANALYSIS_DEFFUNCNAME_START+85)
+#define ANALYSIS_DEFFUNCNAME_Coupncd (ANALYSIS_DEFFUNCNAME_START+86)
+#define ANALYSIS_DEFFUNCNAME_Coupdays (ANALYSIS_DEFFUNCNAME_START+87)
+#define ANALYSIS_DEFFUNCNAME_Coupdaysnc (ANALYSIS_DEFFUNCNAME_START+88)
+#define ANALYSIS_DEFFUNCNAME_Coupdaybs (ANALYSIS_DEFFUNCNAME_START+89)
+#define ANALYSIS_DEFFUNCNAME_Couppcd (ANALYSIS_DEFFUNCNAME_START+90)
+#define ANALYSIS_DEFFUNCNAME_Coupnum (ANALYSIS_DEFFUNCNAME_START+91)
+#define ANALYSIS_DEFFUNCNAME_Fvschedule (ANALYSIS_DEFFUNCNAME_START+92)
#endif
diff --git a/scaddins/source/analysis/analysis.hxx b/scaddins/source/analysis/analysis.hxx
index ff789838b299..17a56f81bcc2 100644
--- a/scaddins/source/analysis/analysis.hxx
+++ b/scaddins/source/analysis/analysis.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@
#include <com/sun/star/sheet/XCompatibilityNames.hpp>
#include <com/sun/star/sheet/NoConvergenceException.hpp>
-#include <cppuhelper/implbase5.hxx> // helper for implementations
+#include <cppuhelper/implbase5.hxx> // helper for implementations
#include "analysisdefs.hxx"
#include "analysishelper.hxx"
@@ -61,21 +61,21 @@ class AnalysisAddIn : public cppu::WeakImplHelper5<
CSS::lang::XServiceInfo >
{
private:
- CSS::lang::Locale aFuncLoc;
- CSS::lang::Locale* pDefLocales;
- FuncDataList* pFD;
- double* pFactDoubles;
- ConvertDataList* pCDL;
- ResMgr* pResMgr;
+ CSS::lang::Locale aFuncLoc;
+ CSS::lang::Locale* pDefLocales;
+ FuncDataList* pFD;
+ double* pFactDoubles;
+ ConvertDataList* pCDL;
+ ResMgr* pResMgr;
ScaAnyConverter aAnyConv;
- ResMgr& GetResMgr( void ) THROWDEF_RTE;
- STRING GetDisplFuncStr( sal_uInt16 nFuncNum ) THROWDEF_RTE;
- STRING GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) THROWDEF_RTE;
- void InitDefLocales( void );
- inline const CSS::lang::Locale& GetLocale( sal_uInt32 nInd );
- void InitData( void );
+ ResMgr& GetResMgr( void ) THROWDEF_RTE;
+ STRING GetDisplFuncStr( sal_uInt16 nFuncNum ) THROWDEF_RTE;
+ STRING GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) THROWDEF_RTE;
+ void InitDefLocales( void );
+ inline const CSS::lang::Locale& GetLocale( sal_uInt32 nInd );
+ void InitData( void );
/// Converts an Any to sal_Int32 in the range from 0 to 4 (date calculation mode).
sal_Int32 getDateMode(
@@ -86,75 +86,75 @@ private:
public:
AnalysisAddIn(
const CSS::uno::Reference< CSS::lang::XMultiServiceFactory >& xServiceFact );
- virtual ~AnalysisAddIn();
+ virtual ~AnalysisAddIn();
- double FactDouble( sal_Int32 nNum ) THROWDEF_RTE_IAE;
+ double FactDouble( sal_Int32 nNum ) THROWDEF_RTE_IAE;
- static STRING getImplementationName_Static();
- static SEQ( STRING ) getSupportedServiceNames_Static();
+ static STRING getImplementationName_Static();
+ static SEQ( STRING ) getSupportedServiceNames_Static();
// XAddIn
- virtual STRING SAL_CALL getProgrammaticFuntionName( const STRING& aDisplayName ) THROWDEF_RTE;
- virtual STRING SAL_CALL getDisplayFunctionName( const STRING& aProgrammaticName ) THROWDEF_RTE;
- virtual STRING SAL_CALL getFunctionDescription( const STRING& aProgrammaticName ) THROWDEF_RTE;
- virtual STRING SAL_CALL getDisplayArgumentName( const STRING& aProgrammaticFunctionName, sal_Int32 nArgument ) THROWDEF_RTE;
- virtual STRING SAL_CALL getArgumentDescription( const STRING& aProgrammaticFunctionName, sal_Int32 nArgument ) THROWDEF_RTE;
- virtual STRING SAL_CALL getProgrammaticCategoryName( const STRING& aProgrammaticFunctionName ) THROWDEF_RTE;
- virtual STRING SAL_CALL getDisplayCategoryName( const STRING& aProgrammaticFunctionName ) THROWDEF_RTE;
+ virtual STRING SAL_CALL getProgrammaticFuntionName( const STRING& aDisplayName ) THROWDEF_RTE;
+ virtual STRING SAL_CALL getDisplayFunctionName( const STRING& aProgrammaticName ) THROWDEF_RTE;
+ virtual STRING SAL_CALL getFunctionDescription( const STRING& aProgrammaticName ) THROWDEF_RTE;
+ virtual STRING SAL_CALL getDisplayArgumentName( const STRING& aProgrammaticFunctionName, sal_Int32 nArgument ) THROWDEF_RTE;
+ virtual STRING SAL_CALL getArgumentDescription( const STRING& aProgrammaticFunctionName, sal_Int32 nArgument ) THROWDEF_RTE;
+ virtual STRING SAL_CALL getProgrammaticCategoryName( const STRING& aProgrammaticFunctionName ) THROWDEF_RTE;
+ virtual STRING SAL_CALL getDisplayCategoryName( const STRING& aProgrammaticFunctionName ) THROWDEF_RTE;
// XCompatibilityNames
virtual SEQofLocName SAL_CALL getCompatibilityNames( const STRING& aProgrammaticName ) THROWDEF_RTE;
// XLocalizable
- virtual void SAL_CALL setLocale( const CSS::lang::Locale& eLocale ) THROWDEF_RTE;
+ virtual void SAL_CALL setLocale( const CSS::lang::Locale& eLocale ) THROWDEF_RTE;
virtual CSS::lang::Locale SAL_CALL getLocale( ) THROWDEF_RTE;
// XServiceName
- virtual STRING SAL_CALL getServiceName( ) THROWDEF_RTE;
+ virtual STRING SAL_CALL getServiceName( ) THROWDEF_RTE;
// XServiceInfo
- virtual STRING SAL_CALL getImplementationName( ) THROWDEF_RTE;
- virtual sal_Bool SAL_CALL supportsService( const STRING& ServiceName ) THROWDEF_RTE;
- virtual SEQ( STRING ) SAL_CALL getSupportedServiceNames( ) THROWDEF_RTE;
+ virtual STRING SAL_CALL getImplementationName( ) THROWDEF_RTE;
+ virtual sal_Bool SAL_CALL supportsService( const STRING& ServiceName ) THROWDEF_RTE;
+ virtual SEQ( STRING ) SAL_CALL getSupportedServiceNames( ) THROWDEF_RTE;
- // methods from own interfaces start here
+ // methods from own interfaces start here
// XAnalysis
-// virtual double SAL_CALL get_Test( constREFXPS&, sal_Int32 nMode, double f1, double f2, double f3 ) THROWDEF_RTE;
+// virtual double SAL_CALL get_Test( constREFXPS&, sal_Int32 nMode, double f1, double f2, double f3 ) THROWDEF_RTE;
- virtual sal_Int32 SAL_CALL getWorkday( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nDays, const ANY& aHDay ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getYearfrac( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nEndDate, const ANY& aMode ) THROWDEF_RTE_IAE;
- virtual sal_Int32 SAL_CALL getEdate( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nMonths ) THROWDEF_RTE_IAE;
- virtual sal_Int32 SAL_CALL getWeeknum( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nMode ) THROWDEF_RTE_IAE;
- virtual sal_Int32 SAL_CALL getEomonth( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nMonths ) THROWDEF_RTE_IAE;
- virtual sal_Int32 SAL_CALL getNetworkdays( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nEndDate, const ANY& aHDay ) THROWDEF_RTE_IAE;
+ virtual sal_Int32 SAL_CALL getWorkday( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nDays, const ANY& aHDay ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getYearfrac( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nEndDate, const ANY& aMode ) THROWDEF_RTE_IAE;
+ virtual sal_Int32 SAL_CALL getEdate( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nMonths ) THROWDEF_RTE_IAE;
+ virtual sal_Int32 SAL_CALL getWeeknum( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nMode ) THROWDEF_RTE_IAE;
+ virtual sal_Int32 SAL_CALL getEomonth( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nMonths ) THROWDEF_RTE_IAE;
+ virtual sal_Int32 SAL_CALL getNetworkdays( constREFXPS&, sal_Int32 nStartDate, sal_Int32 nEndDate, const ANY& aHDay ) THROWDEF_RTE_IAE;
- virtual sal_Int32 SAL_CALL getIseven( sal_Int32 nVal ) THROWDEF_RTE_IAE;
- virtual sal_Int32 SAL_CALL getIsodd( sal_Int32 nVal ) THROWDEF_RTE_IAE;
+ virtual sal_Int32 SAL_CALL getIseven( sal_Int32 nVal ) THROWDEF_RTE_IAE;
+ virtual sal_Int32 SAL_CALL getIsodd( sal_Int32 nVal ) THROWDEF_RTE_IAE;
virtual double SAL_CALL getMultinomial( constREFXPS& xOpt, const SEQSEQ( sal_Int32 )& aVLst, const SEQ( com::sun::star::uno::Any )& aOptVLst ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getSeriessum( double fX, double fN, double fM, const SEQSEQ( double )& aCoeffList ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getQuotient( double fNum, double fDenum ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getSeriessum( double fX, double fN, double fM, const SEQSEQ( double )& aCoeffList ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getQuotient( double fNum, double fDenum ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getMround( double fNum, double fMult ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getSqrtpi( double fNum ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getMround( double fNum, double fMult ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getSqrtpi( double fNum ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getRandbetween( double fMin, double fMax ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getRandbetween( double fMin, double fMax ) THROWDEF_RTE_IAE;
virtual double SAL_CALL getGcd( constREFXPS& xOpt, const SEQSEQ( double )& aVLst, const SEQ( ANY )& aOptVLst ) THROWDEF_RTE_IAE;
virtual double SAL_CALL getLcm( constREFXPS& xOpt, const SEQSEQ( double )& aVLst, const SEQ( ANY )& aOptVLst ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getBesseli( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE_NCE;
- virtual double SAL_CALL getBesselj( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE_NCE;
- virtual double SAL_CALL getBesselk( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE_NCE;
- virtual double SAL_CALL getBessely( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE_NCE;
+ virtual double SAL_CALL getBesseli( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE_NCE;
+ virtual double SAL_CALL getBesselj( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE_NCE;
+ virtual double SAL_CALL getBesselk( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE_NCE;
+ virtual double SAL_CALL getBessely( double fNum, sal_Int32 nOrder ) THROWDEF_RTE_IAE_NCE;
virtual STRING SAL_CALL getBin2Oct( constREFXPS& xOpt, const STRING& aNum, const ANY& rPlaces ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getBin2Dec( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getBin2Dec( const STRING& aNum ) THROWDEF_RTE_IAE;
virtual STRING SAL_CALL getBin2Hex( constREFXPS& xOpt, const STRING& aNum, const ANY& rPlaces ) THROWDEF_RTE_IAE;
virtual STRING SAL_CALL getOct2Bin( constREFXPS& xOpt, const STRING& aNum, const ANY& rPlaces ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getOct2Dec( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getOct2Dec( const STRING& aNum ) THROWDEF_RTE_IAE;
virtual STRING SAL_CALL getOct2Hex( constREFXPS& xOpt, const STRING& aNum, const ANY& rPlaces ) THROWDEF_RTE_IAE;
virtual STRING SAL_CALL getDec2Bin( constREFXPS& xOpt, sal_Int32 fNum, const ANY& rPlaces ) THROWDEF_RTE_IAE;
@@ -162,77 +162,77 @@ public:
virtual STRING SAL_CALL getDec2Hex( constREFXPS& xOpt, double fNum, const ANY& rPlaces ) THROWDEF_RTE_IAE;
virtual STRING SAL_CALL getHex2Bin( constREFXPS& xOpt, const STRING& aNum, const ANY& rPlaces ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getHex2Dec( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getHex2Dec( const STRING& aNum ) THROWDEF_RTE_IAE;
virtual STRING SAL_CALL getHex2Oct( constREFXPS& xOpt, const STRING& aNum, const ANY& rPlaces ) THROWDEF_RTE_IAE;
virtual sal_Int32 SAL_CALL getDelta( constREFXPS& xOpt, double fNum1, const ANY& rNum2 ) THROWDEF_RTE_IAE;
virtual double SAL_CALL getErf( constREFXPS& xOpt, double fLowerLimit, const ANY& rUpperLimit ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getErfc( double fLowerLimit ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getErfc( double fLowerLimit ) THROWDEF_RTE_IAE;
virtual sal_Int32 SAL_CALL getGestep( constREFXPS& xOpt, double fNum, const ANY& rStep ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getFactdouble( sal_Int32 nNum ) THROWDEF_RTE_IAE;
-
- virtual double SAL_CALL getImabs( const STRING& aNum ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getImaginary( const STRING& aNum ) THROWDEF_RTE_IAE;
- virtual STRING SAL_CALL getImpower( const STRING& aNum, double fPower ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getImargument( const STRING& aNum ) THROWDEF_RTE_IAE;
- virtual STRING SAL_CALL getImcos( const STRING& aNum ) THROWDEF_RTE_IAE;
- virtual STRING SAL_CALL getImdiv( const STRING& aDivident, const STRING& aDivisor ) THROWDEF_RTE_IAE;
- virtual STRING SAL_CALL getImexp( const STRING& aNum ) THROWDEF_RTE_IAE;
- virtual STRING SAL_CALL getImconjugate( const STRING& aNum ) THROWDEF_RTE_IAE;
- virtual STRING SAL_CALL getImln( const STRING& aNum ) THROWDEF_RTE_IAE;
- virtual STRING SAL_CALL getImlog10( const STRING& aNum ) THROWDEF_RTE_IAE;
- virtual STRING SAL_CALL getImlog2( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getFactdouble( sal_Int32 nNum ) THROWDEF_RTE_IAE;
+
+ virtual double SAL_CALL getImabs( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getImaginary( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getImpower( const STRING& aNum, double fPower ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getImargument( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getImcos( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getImdiv( const STRING& aDivident, const STRING& aDivisor ) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getImexp( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getImconjugate( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getImln( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getImlog10( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getImlog2( const STRING& aNum ) THROWDEF_RTE_IAE;
virtual STRING SAL_CALL getImproduct( constREFXPS& xOpt, const SEQSEQ( STRING )& aNum1, const SEQ_ANY& aNumList ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getImreal( const STRING& aNum ) THROWDEF_RTE_IAE;
- virtual STRING SAL_CALL getImsin( const STRING& aNum ) THROWDEF_RTE_IAE;
- virtual STRING SAL_CALL getImsub( const STRING& aNum1, const STRING& aNum2 ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getImreal( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getImsin( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getImsub( const STRING& aNum1, const STRING& aNum2 ) THROWDEF_RTE_IAE;
virtual STRING SAL_CALL getImsum( constREFXPS& xOpt, const SEQSEQ( STRING )& aNum1, const SEQ( ANY )& aFollowingPars ) THROWDEF_RTE_IAE;
- virtual STRING SAL_CALL getImsqrt( const STRING& aNum ) THROWDEF_RTE_IAE;
- virtual STRING SAL_CALL getComplex( double fReal, double fImaginary, const ANY& rSuffix ) THROWDEF_RTE_IAE;
-
- virtual double SAL_CALL getConvert( double fVal, const STRING& aFromUnit, const STRING& aToUnit ) THROWDEF_RTE_IAE;
-
- virtual double SAL_CALL getAmordegrc( constREFXPS&, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal, double fPer, double fRate, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getAmorlinc( constREFXPS&, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal, double fPer, double fRate, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getAccrint( constREFXPS& xOpt, sal_Int32 nIssue, sal_Int32 nFirstInter, sal_Int32 nSettle, double fRate, const ANY& rVal, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getAccrintm( constREFXPS& xOpt, sal_Int32 nIssue, sal_Int32 nSettle, double fRate, const ANY& rVal, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getReceived( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fDisc, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getDisc( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getDuration( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fYield, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getEffect( double fNominal, sal_Int32 nPeriods ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getCumprinc( double fRate, sal_Int32 nNumPeriods, double fVal, sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getCumipmt( double fRate, sal_Int32 nNumPeriods, double fVal, sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getPrice( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getPricedisc( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fDisc, double fRedemp, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getPricemat( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, double fRate, double fYield, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getMduration( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fYield, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getNominal( double fRate, sal_Int32 nPeriods ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getDollarfr( double fDollarDec, sal_Int32 nFrac ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getDollarde( double fDollarFrac, sal_Int32 nFrac ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getYield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fPrice, double fRedemp, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getYielddisc( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getYieldmat( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, double fRate, double fPrice, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getTbilleq( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fDisc ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getTbillprice( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fDisc ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getTbillyield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getOddfprice( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, sal_Int32 nFirstCoup, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getOddfyield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, sal_Int32 nFirstCoup, double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getOddlprice( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getOddlyield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest, double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const ANY& rOptBase) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getImsqrt( const STRING& aNum ) THROWDEF_RTE_IAE;
+ virtual STRING SAL_CALL getComplex( double fReal, double fImaginary, const ANY& rSuffix ) THROWDEF_RTE_IAE;
+
+ virtual double SAL_CALL getConvert( double fVal, const STRING& aFromUnit, const STRING& aToUnit ) THROWDEF_RTE_IAE;
+
+ virtual double SAL_CALL getAmordegrc( constREFXPS&, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal, double fPer, double fRate, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getAmorlinc( constREFXPS&, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal, double fPer, double fRate, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getAccrint( constREFXPS& xOpt, sal_Int32 nIssue, sal_Int32 nFirstInter, sal_Int32 nSettle, double fRate, const ANY& rVal, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getAccrintm( constREFXPS& xOpt, sal_Int32 nIssue, sal_Int32 nSettle, double fRate, const ANY& rVal, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getReceived( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fDisc, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getDisc( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getDuration( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fYield, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getEffect( double fNominal, sal_Int32 nPeriods ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getCumprinc( double fRate, sal_Int32 nNumPeriods, double fVal, sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getCumipmt( double fRate, sal_Int32 nNumPeriods, double fVal, sal_Int32 nStartPer, sal_Int32 nEndPer, sal_Int32 nPayType ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getPrice( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getPricedisc( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fDisc, double fRedemp, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getPricemat( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, double fRate, double fYield, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getMduration( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fYield, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getNominal( double fRate, sal_Int32 nPeriods ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getDollarfr( double fDollarDec, sal_Int32 nFrac ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getDollarde( double fDollarFrac, sal_Int32 nFrac ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getYield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fPrice, double fRedemp, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getYielddisc( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice, double fRedemp, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getYieldmat( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, double fRate, double fPrice, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getTbilleq( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fDisc ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getTbillprice( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fDisc ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getTbillyield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getOddfprice( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, sal_Int32 nFirstCoup, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getOddfyield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue, sal_Int32 nFirstCoup, double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getOddlprice( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest, double fRate, double fYield, double fRedemp, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getOddlyield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest, double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, const ANY& rOptBase) THROWDEF_RTE_IAE;
virtual double SAL_CALL getXirr( constREFXPS& xOpt, const SEQSEQ( double )& rValues, const SEQSEQ( sal_Int32 )& rDates, const ANY& rGuess ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getXnpv( double fRate, const SEQSEQ( double )& rValues, const SEQSEQ( sal_Int32 )& rDates ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getIntrate( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fRedemp, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getCoupncd( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getCoupdays( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getCoupdaysnc( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getCoupdaybs( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getCouppcd( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getCoupnum( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
- virtual double SAL_CALL getFvschedule( double fPrinc, const SEQSEQ( double )& rSchedule ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getXnpv( double fRate, const SEQSEQ( double )& rValues, const SEQSEQ( sal_Int32 )& rDates ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getIntrate( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fInvest, double fRedemp, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getCoupncd( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getCoupdays( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getCoupdaysnc( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getCoupdaybs( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getCouppcd( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getCoupnum( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, const ANY& rOptBase ) THROWDEF_RTE_IAE;
+ virtual double SAL_CALL getFvschedule( double fPrinc, const SEQSEQ( double )& rSchedule ) THROWDEF_RTE_IAE;
};
//------------------------------------------------------------------
diff --git a/scaddins/source/analysis/analysis.src b/scaddins/source/analysis/analysis.src
index f513ca660734..7b730061b2c0 100644
--- a/scaddins/source/analysis/analysis.src
+++ b/scaddins/source/analysis/analysis.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,37 +33,37 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
{
Resource ANALYSIS_Workday
{
- String 1 // description Workday
+ String 1 // description Workday
{
Text [ en-US ] = "Returns the serial number of the date before or after a specified number of workdays";
};
- String 2 // name of parameter 1 Workday
+ String 2 // name of parameter 1 Workday
{
Text [ en-US ] = "Start date";
};
- String 3 // description of parameter 1 Workday
+ String 3 // description of parameter 1 Workday
{
Text [ en-US ] = "The start date";
};
- String 4 // name of parameter 2 Workday
+ String 4 // name of parameter 2 Workday
{
Text [ en-US ] = "Days";
};
- String 5 // description of parameter 2 Workday
+ String 5 // description of parameter 2 Workday
{
Text [ en-US ] = "The number of workdays before or after the start date";
};
- String 6 // name of parameter 3 Workday
+ String 6 // name of parameter 3 Workday
{
Text [ en-US ] = "Holidays";
};
- String 7 // description of parameter 3 Workday
+ String 7 // description of parameter 3 Workday
{
Text [ en-US ] = "List of date values of days off (vacation, holidays, etc.)";
};
@@ -71,37 +71,37 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Yearfrac
{
- String 1 // description Yearfrac
+ String 1 // description Yearfrac
{
Text [ en-US ] = "Returns the number of whole days between 'start date' and 'end date' as a year fraction";
};
- String 2 // name of parameter 1 Yearfrac
+ String 2 // name of parameter 1 Yearfrac
{
Text [ en-US ] = "Start date";
};
- String 3 // description of parameter 1 Yearfrac
+ String 3 // description of parameter 1 Yearfrac
{
Text [ en-US ] = "The start date";
};
- String 4 // name of parameter 2 Yearfrac
+ String 4 // name of parameter 2 Yearfrac
{
Text [ en-US ] = "End date";
};
- String 5 // description of parameter 2 Yearfrac
+ String 5 // description of parameter 2 Yearfrac
{
Text [ en-US ] = "The end date";
};
- String 6 // name of parameter 3 Yearfrac
+ String 6 // name of parameter 3 Yearfrac
{
Text [ en-US ] = "Basis";
};
- String 7 // description of parameter 3 Yearfrac
+ String 7 // description of parameter 3 Yearfrac
{
Text [ en-US ] = "Basis for determining the interest days";
};
@@ -109,27 +109,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Edate
{
- String 1 // description Edate
+ String 1 // description Edate
{
Text [ en-US ] = "Returns the serial number of the date that is a specified number of months before or after the start date";
};
- String 2 // name of parameter 1 Edate
+ String 2 // name of parameter 1 Edate
{
Text [ en-US ] = "Start date";
};
- String 3 // description of parameter 1 Edate
+ String 3 // description of parameter 1 Edate
{
Text [ en-US ] = "The start date";
};
- String 4 // name of parameter 2 Edate
+ String 4 // name of parameter 2 Edate
{
Text [ en-US ] = "Months";
};
- String 5 // description of parameter 2 Edate
+ String 5 // description of parameter 2 Edate
{
Text [ en-US ] = "Number of months before or after the start date";
};
@@ -137,27 +137,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Weeknum
{
- String 1 // description Weeknum_add
+ String 1 // description Weeknum_add
{
Text [ en-US ] = "Returns the number of the calendar week in which the specified date occurs.";
};
- String 2 // name of parameter 1 Weeknum_add
+ String 2 // name of parameter 1 Weeknum_add
{
Text [ en-US ] = "Date";
};
- String 3 // description of parameter 1 Weeknum_add
+ String 3 // description of parameter 1 Weeknum_add
{
Text [ en-US ] = "The date";
};
- String 4 // name of parameter 2 Weeknum_add
+ String 4 // name of parameter 2 Weeknum_add
{
Text [ en-US ] = "Return type";
};
- String 5 // description of parameter 2 Weeknum_add
+ String 5 // description of parameter 2 Weeknum_add
{
Text [ en-US ] = "A number from 1 to 3 that specifies the day with which a week begins";
};
@@ -165,27 +165,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Eomonth
{
- String 1 // description EoMonth
+ String 1 // description EoMonth
{
Text[ en-US ] = "Returns the serial number of the last day of the month that comes a certain number of months before or after the start date";
};
- String 2 // name of parameter 1 EoMonth
+ String 2 // name of parameter 1 EoMonth
{
Text [ en-US ] = "Start date";
};
- String 3 // description of parameter 1 EoMonth
+ String 3 // description of parameter 1 EoMonth
{
Text [ en-US ] = "The start date";
};
- String 4 // name of parameter 2 EoMonth
+ String 4 // name of parameter 2 EoMonth
{
Text [ en-US ] = "Months";
};
- String 5 // description of parameter 2 EoMonth
+ String 5 // description of parameter 2 EoMonth
{
Text [ en-US ] = "Number of months before or after the start date";
};
@@ -193,37 +193,37 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Networkdays
{
- String 1 // description Networkdays
+ String 1 // description Networkdays
{
Text [ en-US ] = "Returns the number of workdays between two dates";
};
- String 2 // name of parameter 1 Networkdays
+ String 2 // name of parameter 1 Networkdays
{
Text [ en-US ] = "Start date";
};
- String 3 // description of parameter 1 Networkdays
+ String 3 // description of parameter 1 Networkdays
{
Text [ en-US ] = "The start date";
};
- String 4 // name of parameter 2 Networkdays
+ String 4 // name of parameter 2 Networkdays
{
Text [ en-US ] = "End date";
};
- String 5 // description of parameter 2 Networkdays
+ String 5 // description of parameter 2 Networkdays
{
Text [ en-US ] = "The end date";
};
- String 6 // name of parameter 3 Networkdays
+ String 6 // name of parameter 3 Networkdays
{
Text [ en-US ] = "Holidays";
};
- String 7 // description of parameter 3 Networkdays
+ String 7 // description of parameter 3 Networkdays
{
Text [ en-US ] = "List of date values representing days off (vacation, holidays, etc.)";
};
@@ -231,17 +231,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Iseven
{
- String 1 // description Iseven_add
+ String 1 // description Iseven_add
{
Text [ en-US ] = "Returns the value 'true' if the number is even";
};
- String 2 // name of parameter 1 Iseven_add
+ String 2 // name of parameter 1 Iseven_add
{
Text [ en-US ] = "Number";
};
- String 3 // description of parameter 1 Iseven_add
+ String 3 // description of parameter 1 Iseven_add
{
Text [ en-US ] = "The number";
};
@@ -249,17 +249,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Isodd
{
- String 1 // description Isodd_add
+ String 1 // description Isodd_add
{
Text [ en-US ] = "Returns the value 'true' if the number is odd";
};
- String 2 // name of parameter 1 Isodd_add
+ String 2 // name of parameter 1 Isodd_add
{
Text [ en-US ] = "Number";
};
- String 3 // description of parameter 1 Isodd_add
+ String 3 // description of parameter 1 Isodd_add
{
Text [ en-US ] = "The number";
};
@@ -267,17 +267,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Multinomial
{
- String 1 // description Multinomial
+ String 1 // description Multinomial
{
Text [ en-US ] = "Returns the multinomial coefficient of a set of numbers";
};
- String 2 // name of parameter 1 Multinomial
+ String 2 // name of parameter 1 Multinomial
{
Text [ en-US ] = "Number(s)";
};
- String 3 // description of parameter 1 Multinomial
+ String 3 // description of parameter 1 Multinomial
{
Text [ en-US ] = "Number or list of numbers for which you want the multinomial coefficient";
};
@@ -285,47 +285,47 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Seriessum
{
- String 1 // description Seriessum
+ String 1 // description Seriessum
{
Text [ en-US ] = "Returns the sum of a power series";
};
- String 2 // name of parameter 1 Seriessum
+ String 2 // name of parameter 1 Seriessum
{
Text [ en-US ] = "X";
};
- String 3 // description of parameter 1 Seriessum
+ String 3 // description of parameter 1 Seriessum
{
Text [ en-US ] = "The independent variable of the power series";
};
- String 4 // name of parameter 2 Seriessum
+ String 4 // name of parameter 2 Seriessum
{
Text [ en-US ] = "N";
};
- String 5 // description of parameter 2 Seriessum
+ String 5 // description of parameter 2 Seriessum
{
Text [ en-US ] = "The initial power to which x is to be raised";
};
- String 6 // name of parameter 3 Seriessum
+ String 6 // name of parameter 3 Seriessum
{
Text [ en-US ] = "M";
};
- String 7 // description of parameter 3 Seriessum
+ String 7 // description of parameter 3 Seriessum
{
Text [ en-US ] = "The increment by which to increase n for each term in the series";
};
- String 8 // name of parameter 4 Seriessum
+ String 8 // name of parameter 4 Seriessum
{
Text [ en-US ] = "Coefficients";
};
- String 9 // description of parameter 4 Seriessum
+ String 9 // description of parameter 4 Seriessum
{
Text [ en-US ] = "Set of coefficients by which each successive power of the variable x is multiplied";
};
@@ -333,27 +333,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Quotient
{
- String 1 // description Quotient
+ String 1 // description Quotient
{
Text [ en-US ] = "Returns the integer portion of a division";
};
- String 2 // name of parameter 1 Quotient
+ String 2 // name of parameter 1 Quotient
{
Text [ en-US ] = "Numerator";
};
- String 3 // description of parameter 1 Quotient
+ String 3 // description of parameter 1 Quotient
{
Text [ en-US ] = "The dividend";
};
- String 4 // name of parameter 2 Quotient
+ String 4 // name of parameter 2 Quotient
{
Text [ en-US ] = "Denominator";
};
- String 5 // description of parameter 2 Quotient
+ String 5 // description of parameter 2 Quotient
{
Text [ en-US ] = "The divisor";
};
@@ -361,27 +361,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Mround
{
- String 1 // description Mround
+ String 1 // description Mround
{
Text [ en-US ] = "Returns a number rounded to a specified multiple";
};
- String 2 // name of parameter 1 Mround
+ String 2 // name of parameter 1 Mround
{
Text [ en-US ] = "Number";
};
- String 3 // description of parameter 1 Mround
+ String 3 // description of parameter 1 Mround
{
Text [ en-US ] = "The number to round off";
};
- String 4 // name of parameter 2 Mround
+ String 4 // name of parameter 2 Mround
{
Text [ en-US ] = "Multiple";
};
- String 5 // description of parameter 2 Mround
+ String 5 // description of parameter 2 Mround
{
Text [ en-US ] = "The multiple to which you want to round number";
};
@@ -389,17 +389,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Sqrtpi
{
- String 1 // description SqrtPI
+ String 1 // description SqrtPI
{
Text [ en-US ] = "Returns the square root of a number which has been multiplied by pi";
};
- String 2 // name of parameter 1 SqrtPI
+ String 2 // name of parameter 1 SqrtPI
{
Text [ en-US ] = "Number";
};
- String 3 // description of parameter 1 SqrtPI
+ String 3 // description of parameter 1 SqrtPI
{
Text [ en-US ] = "The number by which pi is multiplied";
};
@@ -407,27 +407,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Randbetween
{
- String 1 // description Randbetween
+ String 1 // description Randbetween
{
Text [ en-US ] = "Returns a random integer between the numbers you specify";
};
- String 2 // name of parameter 1 Randbetween
+ String 2 // name of parameter 1 Randbetween
{
Text [ en-US ] = "Bottom";
};
- String 3 // description of parameter 1 Randbetween
+ String 3 // description of parameter 1 Randbetween
{
Text [ en-US ] = "The smallest integer returned";
};
- String 4 // name of parameter 2 Randbetween
+ String 4 // name of parameter 2 Randbetween
{
Text [ en-US ] = "Top";
};
- String 5 // description of parameter 2 Randbetween
+ String 5 // description of parameter 2 Randbetween
{
Text [ en-US ] = "The largest integer returned";
};
@@ -435,17 +435,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Gcd
{
- String 1 // description Gcd_add
+ String 1 // description Gcd_add
{
Text [ en-US ] = "Returns the greatest common divisor";
};
- String 2 // name of parameter 1 Gcd_add
+ String 2 // name of parameter 1 Gcd_add
{
Text [ en-US ] = "Number(s)";
};
- String 3 // description of parameter 1 Gcd_add
+ String 3 // description of parameter 1 Gcd_add
{
Text [ en-US ] = "Number or list of numbers";
};
@@ -453,17 +453,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Lcm
{
- String 1 // description Lcm_add
+ String 1 // description Lcm_add
{
Text [ en-US ] = "Returns the least common multiple";
};
- String 2 // name of parameter 1 Lcm_add
+ String 2 // name of parameter 1 Lcm_add
{
Text [ en-US ] = "Number(s)";
};
- String 3 // description of parameter 1 Lcm_add
+ String 3 // description of parameter 1 Lcm_add
{
Text [ en-US ] = "Number or list of numbers";
};
@@ -471,27 +471,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Besseli
{
- String 1 // description BesselI
+ String 1 // description BesselI
{
Text [ en-US ] = "Returns the modified Bessel function In(x)";
};
- String 2 // name of parameter 1 BesselI
+ String 2 // name of parameter 1 BesselI
{
Text [ en-US ] = "X";
};
- String 3 // description of parameter 1 BesselI
+ String 3 // description of parameter 1 BesselI
{
Text [ en-US ] = "The value at which the function is to be evaluated";
};
- String 4 // name of parameter 2 BesselI
+ String 4 // name of parameter 2 BesselI
{
Text [ en-US ] = "N";
};
- String 5 // description of parameter 2 BesselI
+ String 5 // description of parameter 2 BesselI
{
Text [ en-US ] = "The order of the Bessel function";
};
@@ -499,27 +499,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Besselj
{
- String 1 // description BesselJ
+ String 1 // description BesselJ
{
Text [ en-US ] = "Returns the Bessel function Jn(x)";
};
- String 2 // name of parameter 1 BesselJ
+ String 2 // name of parameter 1 BesselJ
{
Text [ en-US ] = "X";
};
- String 3 // description of parameter 1 BesselJ
+ String 3 // description of parameter 1 BesselJ
{
Text [ en-US ] = "The value at which the function is to be evaluated";
};
- String 4 // name of parameter 2 BesselJ
+ String 4 // name of parameter 2 BesselJ
{
Text [ en-US ] = "N";
};
- String 5 // description of parameter 2 BesselJ
+ String 5 // description of parameter 2 BesselJ
{
Text [ en-US ] = "The order of the Bessel function";
};
@@ -527,27 +527,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Besselk
{
- String 1 // description BesselK
+ String 1 // description BesselK
{
Text [ en-US ] = "Returns the Bessel function Kn(x)";
};
- String 2 // name of parameter 1 BesselK
+ String 2 // name of parameter 1 BesselK
{
Text [ en-US ] = "X";
};
- String 3 // description of parameter 1 BesselK
+ String 3 // description of parameter 1 BesselK
{
Text [ en-US ] = "The value at which the function is to be evaluated";
};
- String 4 // name of parameter 2 BesselK
+ String 4 // name of parameter 2 BesselK
{
Text [ en-US ] = "N";
};
- String 5 // description of parameter 2 BesselK
+ String 5 // description of parameter 2 BesselK
{
Text [ en-US ] = "The order of the Bessel function";
};
@@ -555,27 +555,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Bessely
{
- String 1 // description BesselY
+ String 1 // description BesselY
{
Text [ en-US ] = "Returns the Bessel function Yn(x)";
};
- String 2 // name of parameter 1 BesselY
+ String 2 // name of parameter 1 BesselY
{
Text [ en-US ] = "X";
};
- String 3 // description of parameter 1 BesselY
+ String 3 // description of parameter 1 BesselY
{
Text [ en-US ] = "The value at which the function is to be evaluated";
};
- String 4 // name of parameter 2 BesselY
+ String 4 // name of parameter 2 BesselY
{
Text [ en-US ] = "N";
};
- String 5 // description of parameter 2 BesselY
+ String 5 // description of parameter 2 BesselY
{
Text [ en-US ] = "The order of the Bessel function";
};
@@ -583,27 +583,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Bin2Oct
{
- String 1 // description Bin2Oct
+ String 1 // description Bin2Oct
{
Text [ en-US ] = "Converts a binary number to an octal number";
};
- String 2 // name of parameter 1 Bin2Oct
+ String 2 // name of parameter 1 Bin2Oct
{
Text [ en-US ] = "Number";
};
- String 3 // description of parameter 1 Bin2Oct
+ String 3 // description of parameter 1 Bin2Oct
{
Text [ en-US ] = "The binary number to be converted (as text)";
};
- String 4 // name of parameter 2 Bin2Oct
+ String 4 // name of parameter 2 Bin2Oct
{
Text [ en-US ] = "Places";
};
- String 5 // description of parameter 2 Bin2Oct
+ String 5 // description of parameter 2 Bin2Oct
{
Text [ en-US ] = "Number of places used";
};
@@ -611,17 +611,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Bin2Dec
{
- String 1 // description Bin2Dec
+ String 1 // description Bin2Dec
{
Text [ en-US ] = "Converts a binary number to a decimal number";
};
- String 2 // name of parameter 1 Bin2Dec
+ String 2 // name of parameter 1 Bin2Dec
{
Text [ en-US ] = "Number";
};
- String 3 // description of parameter 1 Bin2Dec
+ String 3 // description of parameter 1 Bin2Dec
{
Text [ en-US ] = "The binary number to be converted (as text)";
};
@@ -629,27 +629,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Bin2Hex
{
- String 1 // description Bin2Hex
+ String 1 // description Bin2Hex
{
Text [ en-US ] = "Converts a binary number to a hexadecimal number";
};
- String 2 // name of parameter 1 Bin2Hex
+ String 2 // name of parameter 1 Bin2Hex
{
Text [ en-US ] = "Number";
};
- String 3 // description of parameter 1 Bin2Hex
+ String 3 // description of parameter 1 Bin2Hex
{
Text [ en-US ] = "The binary number to be converted (as text)";
};
- String 4 // name of parameter 2 Bin2Hex
+ String 4 // name of parameter 2 Bin2Hex
{
Text [ en-US ] = "Places";
};
- String 5 // description of parameter 2 Bin2Hex
+ String 5 // description of parameter 2 Bin2Hex
{
Text [ en-US ] = "Number of places used.";
};
@@ -657,27 +657,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Oct2Bin
{
- String 1 // description Oct2Bin
+ String 1 // description Oct2Bin
{
Text [ en-US ] = "Converts an octal number to a binary number";
};
- String 2 // name of parameter 1 Oct2Bin
+ String 2 // name of parameter 1 Oct2Bin
{
Text [ en-US ] = "Number";
};
- String 3 // description of parameter 1 Oct2Bin
+ String 3 // description of parameter 1 Oct2Bin
{
Text [ en-US ] = "The octal number to be converted (as text)";
};
- String 4 // name of parameter 2 Oct2Bin
+ String 4 // name of parameter 2 Oct2Bin
{
Text [ en-US ] = "Places";
};
- String 5 // description of parameter 2 Oct2Bin
+ String 5 // description of parameter 2 Oct2Bin
{
Text [ en-US ] = "Number of places used";
};
@@ -685,17 +685,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Oct2Dec
{
- String 1 // description Oct2Dec
+ String 1 // description Oct2Dec
{
Text [ en-US ] = "Converts an octal number to a decimal number";
};
- String 2 // name of parameter 1 Oct2Dec
+ String 2 // name of parameter 1 Oct2Dec
{
Text [ en-US ] = "Number";
};
- String 3 // description of parameter 1 Oct2Dec
+ String 3 // description of parameter 1 Oct2Dec
{
Text [ en-US ] = "The octal number to be converted (as text)";
};
@@ -703,27 +703,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Oct2Hex
{
- String 1 // description Oct2Hex
+ String 1 // description Oct2Hex
{
Text [ en-US ] = "Converts an octal number to a hexadecimal number";
};
- String 2 // name of parameter 1 Oct2Hex
+ String 2 // name of parameter 1 Oct2Hex
{
Text [ en-US ] = "Number";
};
- String 3 // description of parameter 1 Oct2Hex
+ String 3 // description of parameter 1 Oct2Hex
{
Text [ en-US ] = "The octal number to be converted (as text)";
};
- String 4 // name of parameter 2 Oct2Hex
+ String 4 // name of parameter 2 Oct2Hex
{
Text [ en-US ] = "Places";
};
- String 5 // description of parameter 2 Oct2Hex
+ String 5 // description of parameter 2 Oct2Hex
{
Text [ en-US ] = "Number of places used";
};
@@ -731,27 +731,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Dec2Bin
{
- String 1 // description Dec2Bin
+ String 1 // description Dec2Bin
{
Text [ en-US ] = "Converts a decimal number to a binary number";
};
- String 2 // name of parameter 1 Dec2Bin
+ String 2 // name of parameter 1 Dec2Bin
{
Text [ en-US ] = "Number";
};
- String 3 // description of parameter 1 Dec2Bin
+ String 3 // description of parameter 1 Dec2Bin
{
Text [ en-US ] = "The decimal integer to be converted";
};
- String 4 // name of parameter 2 Dec2Bin
+ String 4 // name of parameter 2 Dec2Bin
{
Text [ en-US ] = "Places";
};
- String 5 // description of parameter 2 Dec2Bin
+ String 5 // description of parameter 2 Dec2Bin
{
Text [ en-US ] = "Number of places used";
};
@@ -759,27 +759,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Dec2Hex
{
- String 1 // description Dec2Hex
+ String 1 // description Dec2Hex
{
Text [ en-US ] = "Converts a decimal number to a hexadecimal number";
};
- String 2 // name of parameter 1 Dec2Hex
+ String 2 // name of parameter 1 Dec2Hex
{
Text [ en-US ] = "Number";
};
- String 3 // description of parameter 1 Dec2Hex
+ String 3 // description of parameter 1 Dec2Hex
{
Text [ en-US ] = "The decimal integer to be converted";
};
- String 4 // name of parameter 2 Dec2Hex
+ String 4 // name of parameter 2 Dec2Hex
{
Text [ en-US ] = "Places";
};
- String 5 // description of parameter 2 Dec2Hex
+ String 5 // description of parameter 2 Dec2Hex
{
Text [ en-US ] = "Number of places used";
};
@@ -787,27 +787,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Dec2Oct
{
- String 1 // description Dec2Oct
+ String 1 // description Dec2Oct
{
Text [ en-US ] = "Converts a decimal number into an octal number";
};
- String 2 // name of parameter 1 Dec2Oct
+ String 2 // name of parameter 1 Dec2Oct
{
Text [ en-US ] = "Number";
};
- String 3 // description of parameter 1 Dec2Oct
+ String 3 // description of parameter 1 Dec2Oct
{
Text [ en-US ] = "The decimal number";
};
- String 4 // name of parameter 2 Dec2Oct
+ String 4 // name of parameter 2 Dec2Oct
{
Text [ en-US ] = "Places";
};
- String 5 // description of parameter 2 Dec2Oct
+ String 5 // description of parameter 2 Dec2Oct
{
Text [ en-US ] = "Number of places used";
};
@@ -815,27 +815,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Hex2Bin
{
- String 1 // description Hex2Bin
+ String 1 // description Hex2Bin
{
Text [ en-US ] = "Converts a hexadecimal number to a binary number";
};
- String 2 // name of parameter 1 Hex2Bin
+ String 2 // name of parameter 1 Hex2Bin
{
Text [ en-US ] = "Number";
};
- String 3 // description of parameter 1 Hex2Bin
+ String 3 // description of parameter 1 Hex2Bin
{
Text [ en-US ] = "The hexadecimal number to be converted (as text)";
};
- String 4 // name of parameter 2 Hex2Bin
+ String 4 // name of parameter 2 Hex2Bin
{
Text [ en-US ] = "Places";
};
- String 5 // description of parameter 2 Hex2Bin
+ String 5 // description of parameter 2 Hex2Bin
{
Text [ en-US ] = "Number of places used";
};
@@ -843,17 +843,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Hex2Dec
{
- String 1 // description Hex2Dec
+ String 1 // description Hex2Dec
{
Text [ en-US ] = "Converts a hexadecimal number to a decimal number";
};
- String 2 // name of parameter 1 Hex2Dec
+ String 2 // name of parameter 1 Hex2Dec
{
Text [ en-US ] = "Number";
};
- String 3 // description of parameter 1 Hex2Dec
+ String 3 // description of parameter 1 Hex2Dec
{
Text [ en-US ] = "The hexadecimal number to be converted (as text)";
};
@@ -861,27 +861,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Hex2Oct
{
- String 1 // description Hex2Oct
+ String 1 // description Hex2Oct
{
Text [ en-US ] = "Converts a hexadecimal number to an octal number";
};
- String 2 // name of parameter 1 Hex2Oct
+ String 2 // name of parameter 1 Hex2Oct
{
Text [ en-US ] = "Number";
};
- String 3 // description of parameter 1 Hex2Oct
+ String 3 // description of parameter 1 Hex2Oct
{
Text [ en-US ] = "The hexadecimal number to be converted (as text)";
};
- String 4 // name of parameter 2 Hex2Oct
+ String 4 // name of parameter 2 Hex2Oct
{
Text [ en-US ] = "Places";
};
- String 5 // description of parameter 2 Hex2Oct
+ String 5 // description of parameter 2 Hex2Oct
{
Text [ en-US ] = "Number of places used";
};
@@ -889,27 +889,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Delta
{
- String 1 // description Delta
+ String 1 // description Delta
{
Text [ en-US ] = "Tests whether two values are equal";
};
- String 2 // name of parameter 1 Delta
+ String 2 // name of parameter 1 Delta
{
Text [ en-US ] = "Number 1";
};
- String 3 // description of parameter 1 Delta
+ String 3 // description of parameter 1 Delta
{
Text [ en-US ] = "The first number";
};
- String 4 // name of parameter 2 Delta
+ String 4 // name of parameter 2 Delta
{
Text [ en-US ] = "Number 2";
};
- String 5 // description of parameter 2 Delta
+ String 5 // description of parameter 2 Delta
{
Text [ en-US ] = "The second number";
};
@@ -917,27 +917,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Erf
{
- String 1 // description Erf
+ String 1 // description Erf
{
Text [ en-US ] = "Returns the error function";
};
- String 2 // name of parameter 1 Erf
+ String 2 // name of parameter 1 Erf
{
Text [ en-US ] = "Lower limit";
};
- String 3 // description of parameter 1 Erf
+ String 3 // description of parameter 1 Erf
{
Text [ en-US ] = "The lower limit for integration";
};
- String 4 // name of parameter 2 Erf
+ String 4 // name of parameter 2 Erf
{
Text [ en-US ] = "Upper limit";
};
- String 5 // description of parameter 2 Erf
+ String 5 // description of parameter 2 Erf
{
Text [ en-US ] = "The upper limit for integration";
};
@@ -945,17 +945,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Erfc
{
- String 1 // description Erfc
+ String 1 // description Erfc
{
Text [ en-US ] = "Returns the complementary error function";
};
- String 2 // name of parameter 1 Erfc
+ String 2 // name of parameter 1 Erfc
{
Text [ en-US ] = "Lower limit";
};
- String 3 // description of parameter 1 Erfc
+ String 3 // description of parameter 1 Erfc
{
Text [ en-US ] = "The lower limit for integration";
};
@@ -963,27 +963,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Gestep
{
- String 1 // description GeStep
+ String 1 // description GeStep
{
Text [ en-US ] = "Tests whether a number is greater than a threshold value";
};
- String 2 // name of parameter 1 GeStep
+ String 2 // name of parameter 1 GeStep
{
Text [ en-US ] = "Number";
};
- String 3 // description of parameter 1 GeStep
+ String 3 // description of parameter 1 GeStep
{
Text [ en-US ] = "The value to test against step";
};
- String 4 // name of parameter 2 GeStep
+ String 4 // name of parameter 2 GeStep
{
Text [ en-US ] = "Step";
};
- String 5 // description of parameter 2 GeStep
+ String 5 // description of parameter 2 GeStep
{
Text [ en-US ] = "The threshhold value";
};
@@ -991,17 +991,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Factdouble
{
- String 1 // description Factdouble
+ String 1 // description Factdouble
{
Text [ en-US ] = "Returns the double factorial of Number";
};
- String 2 // name of parameter 1 Factdouble
+ String 2 // name of parameter 1 Factdouble
{
Text [ en-US ] = "Number";
};
- String 3 // description of parameter 1 Factdouble
+ String 3 // description of parameter 1 Factdouble
{
Text [ en-US ] = "The number";
};
@@ -1009,17 +1009,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Imabs
{
- String 1 // description Imabs
+ String 1 // description Imabs
{
Text [ en-US ] = "Returns the absolute value (modulus) of a complex number";
};
- String 2 // name of parameter 1 Imabs
+ String 2 // name of parameter 1 Imabs
{
Text [ en-US ] = "Complex number";
};
- String 3 // description of parameter 1 Imabs
+ String 3 // description of parameter 1 Imabs
{
Text [ en-US ] = "The complex number";
};
@@ -1027,17 +1027,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Imaginary
{
- String 1 // description Imaginary
+ String 1 // description Imaginary
{
Text [ en-US ] = "Returns the imaginary coefficient of a complex number";
};
- String 2 // name of parameter 1 Imaginary
+ String 2 // name of parameter 1 Imaginary
{
Text [ en-US ] = "Complex number";
};
- String 3 // description of parameter 1 Imaginary
+ String 3 // description of parameter 1 Imaginary
{
Text [ en-US ] = "The complex number";
};
@@ -1045,27 +1045,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Impower
{
- String 1 // description Impower
+ String 1 // description Impower
{
Text [ en-US ] = "Returns a complex number raised to an integer power";
};
- String 2 // name of parameter 1 Impower
+ String 2 // name of parameter 1 Impower
{
Text [ en-US ] = "Complex number";
};
- String 3 // description of parameter 1 Impower
+ String 3 // description of parameter 1 Impower
{
Text [ en-US ] = "The complex number";
};
- String 4 // name of parameter 2 Impower
+ String 4 // name of parameter 2 Impower
{
Text [ en-US ] = "Number";
};
- String 5 // description of parameter 2 Impower
+ String 5 // description of parameter 2 Impower
{
Text [ en-US ] = "Power to which the complex number is raised";
};
@@ -1073,17 +1073,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Imargument
{
- String 1 // description Imargument
+ String 1 // description Imargument
{
Text [ en-US ] = "Returns the argument theta, an angle expressed in radians";
};
- String 2 // name of parameter 1 Imargument
+ String 2 // name of parameter 1 Imargument
{
Text [ en-US ] = "Complex number";
};
- String 3 // description of parameter 1 Imargument
+ String 3 // description of parameter 1 Imargument
{
Text [ en-US ] = "A complex number";
};
@@ -1091,17 +1091,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Imcos
{
- String 1 // description Imcos
+ String 1 // description Imcos
{
Text [ en-US ] = "Returns the cosine of a complex number";
};
- String 2 // name of parameter 1 Imcos
+ String 2 // name of parameter 1 Imcos
{
Text [ en-US ] = "Complex number";
};
- String 3 // description of parameter 1 Imcos
+ String 3 // description of parameter 1 Imcos
{
Text [ en-US ] = "A complex number";
};
@@ -1109,27 +1109,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Imdiv
{
- String 1 // description Imdiv
+ String 1 // description Imdiv
{
Text [ en-US ] = "Returns the quotient of two complex numbers";
};
- String 2 // name of parameter 1 Imdiv
+ String 2 // name of parameter 1 Imdiv
{
Text [ en-US ] = "Numerator";
};
- String 3 // description of parameter 1 Imdiv
+ String 3 // description of parameter 1 Imdiv
{
Text [ en-US ] = "The dividend";
};
- String 4 // name of parameter 2 Imdiv
+ String 4 // name of parameter 2 Imdiv
{
Text [ en-US ] = "Denominator";
};
- String 5 // description of parameter 2 Imdiv
+ String 5 // description of parameter 2 Imdiv
{
Text [ en-US ] = "The divisor";
};
@@ -1137,17 +1137,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Imexp
{
- String 1 // description Imexp
+ String 1 // description Imexp
{
Text [ en-US ] = "Returns the algebraic form of the exponential of a complex number";
};
- String 2 // name of parameter 1 Imexp
+ String 2 // name of parameter 1 Imexp
{
Text [ en-US ] = "Complex number";
};
- String 3 // description of parameter 1 Imexp
+ String 3 // description of parameter 1 Imexp
{
Text [ en-US ] = "The complex number";
};
@@ -1155,17 +1155,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Imconjugate
{
- String 1 // description Imconjugate
+ String 1 // description Imconjugate
{
Text [ en-US ] = "Returns the complex conjugate of a complex number";
};
- String 2 // name of parameter 1 Imconjugate
+ String 2 // name of parameter 1 Imconjugate
{
Text [ en-US ] = "Complex number";
};
- String 3 // description of parameter 1 Imconjugate
+ String 3 // description of parameter 1 Imconjugate
{
Text [ en-US ] = "The complex number";
};
@@ -1173,17 +1173,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Imln
{
- String 1 // description Imln
+ String 1 // description Imln
{
Text [ en-US ] = "Returns the natural logarithm of a complex number";
};
- String 2 // name of parameter 1 Imln
+ String 2 // name of parameter 1 Imln
{
Text [ en-US ] = "Complex number";
};
- String 3 // description of parameter 1 Imln
+ String 3 // description of parameter 1 Imln
{
Text [ en-US ] = "The complex number";
};
@@ -1191,17 +1191,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Imlog10
{
- String 1 // description Imlog10
+ String 1 // description Imlog10
{
Text [ en-US ] = "Returns the base-10 logarithm of a complex number";
};
- String 2 // name of parameter 1 Imlog10
+ String 2 // name of parameter 1 Imlog10
{
Text [ en-US ] = "Complex number";
};
- String 3 // description of parameter 1 Imlog10
+ String 3 // description of parameter 1 Imlog10
{
Text [ en-US ] = "The complex number";
};
@@ -1209,17 +1209,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Imlog2
{
- String 1 // description Imlog2
+ String 1 // description Imlog2
{
Text [ en-US ] = "Returns the base-2 logarithm of a complex number";
};
- String 2 // name of parameter 1 Imlog2
+ String 2 // name of parameter 1 Imlog2
{
Text [ en-US ] = "Complex number";
};
- String 3 // description of parameter 1 Imlog2
+ String 3 // description of parameter 1 Imlog2
{
Text [ en-US ] = "The complex number";
};
@@ -1227,27 +1227,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Improduct
{
- String 1 // description Improduct
+ String 1 // description Improduct
{
Text [ en-US ] = "Returns the product of several complex numbers";
};
- String 2 // name of parameter 1 Improduct
+ String 2 // name of parameter 1 Improduct
{
Text [ en-US ] = "Complex number";
};
- String 3 // description of parameter 1 Improduct
+ String 3 // description of parameter 1 Improduct
{
Text [ en-US ] = "The first complex number";
};
- String 4 // name of parameter 2 Improduct
+ String 4 // name of parameter 2 Improduct
{
Text [ en-US ] = "Complex number";
};
- String 5 // description of parameter 2 Improduct
+ String 5 // description of parameter 2 Improduct
{
Text [ en-US ] = "Another complex number";
};
@@ -1255,17 +1255,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Imreal
{
- String 1 // description Imreal
+ String 1 // description Imreal
{
Text [ en-US ] = "Returns the real coefficient of a complex number";
};
- String 2 // name of parameter 1 Imreal
+ String 2 // name of parameter 1 Imreal
{
Text [ en-US ] = "Complex number";
};
- String 3 // description of parameter 1 Imreal
+ String 3 // description of parameter 1 Imreal
{
Text [ en-US ] = "The complex number";
};
@@ -1273,17 +1273,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Imsin
{
- String 1 // description Imsin
+ String 1 // description Imsin
{
Text [ en-US ] = "Returns the sine of a complex number";
};
- String 2 // name of parameter 1 Imsin
+ String 2 // name of parameter 1 Imsin
{
Text [ en-US ] = "Complex number";
};
- String 3 // description of parameter 1 Imsin
+ String 3 // description of parameter 1 Imsin
{
Text [ en-US ] = "The complex number";
};
@@ -1291,27 +1291,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Imsub
{
- String 1 // description Imsub
+ String 1 // description Imsub
{
Text [ en-US ] = "Returns the difference of two complex numbers";
};
- String 2 // name of parameter 1 Imsub
+ String 2 // name of parameter 1 Imsub
{
Text [ en-US ] = "Complex number 1";
};
- String 3 // description of parameter 1 Imsub
+ String 3 // description of parameter 1 Imsub
{
Text [ en-US ] = "Complex number 1";
};
- String 4 // name of parameter 2 Imsub
+ String 4 // name of parameter 2 Imsub
{
Text [ en-US ] = "Complex number 2";
};
- String 5 // description of parameter 2 Imsub
+ String 5 // description of parameter 2 Imsub
{
Text [ en-US ] = "Complex number 2";
};
@@ -1319,17 +1319,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Imsqrt
{
- String 1 // description Imsqrt
+ String 1 // description Imsqrt
{
Text [ en-US ] = "Returns the square root of a complex number";
};
- String 2 // name of parameter 1 Imsqrt
+ String 2 // name of parameter 1 Imsqrt
{
Text [ en-US ] = "Complex number";
};
- String 3 // description of parameter 1 Imsqrt
+ String 3 // description of parameter 1 Imsqrt
{
Text [ en-US ] = "The complex number";
};
@@ -1337,17 +1337,17 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Imsum
{
- String 1 // description Imsum
+ String 1 // description Imsum
{
Text [ en-US ] = "Returns the sum of complex numbers";
};
- String 2 // name of parameter 1 Imsum
+ String 2 // name of parameter 1 Imsum
{
Text [ en-US ] = "Complex number";
};
- String 3 // description of parameter 1 Imsum
+ String 3 // description of parameter 1 Imsum
{
Text [ en-US ] = "The complex number";
};
@@ -1356,37 +1356,37 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Complex
{
- String 1 // description Complex
+ String 1 // description Complex
{
Text [ en-US ] = "Converts real and imaginary coefficients into a complex number";
};
- String 2 // name of parameter 1 Complex
+ String 2 // name of parameter 1 Complex
{
Text [ en-US ] = "Real num";
};
- String 3 // description of parameter 1 Complex
+ String 3 // description of parameter 1 Complex
{
Text [ en-US ] = "The real coefficient";
};
- String 4 // name of parameter 2 Complex
+ String 4 // name of parameter 2 Complex
{
Text [ en-US ] = "I num";
};
- String 5 // description of parameter 2 Complex
+ String 5 // description of parameter 2 Complex
{
Text [ en-US ] = "The imaginary coefficient";
};
- String 6 // name of parameter 3 Complex
+ String 6 // name of parameter 3 Complex
{
Text [ en-US ] = "Suffix";
};
- String 7 // description of parameter 3 Complex
+ String 7 // description of parameter 3 Complex
{
Text [ en-US ] = "The suffix";
};
@@ -1394,37 +1394,37 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Convert
{
- String 1 // description Convert_add
+ String 1 // description Convert_add
{
Text [ en-US ] = "Converts a number from one measurement system to another";
};
- String 2 // name of parameter 1 Convert_add
+ String 2 // name of parameter 1 Convert_add
{
Text [ en-US ] = "Number";
};
- String 3 // description of parameter 1 Convert_add
+ String 3 // description of parameter 1 Convert_add
{
Text [ en-US ] = "The number";
};
- String 4 // name of parameter 2 Convert_add
+ String 4 // name of parameter 2 Convert_add
{
Text [ en-US ] = "From unit";
};
- String 5 // description of parameter 2 Convert_add
+ String 5 // description of parameter 2 Convert_add
{
Text [ en-US ] = "Unit of measure for number";
};
- String 6 // name of parameter 3 Convert_add
+ String 6 // name of parameter 3 Convert_add
{
Text [ en-US ] = "To unit";
};
- String 7 // description of parameter 3 Convert_add
+ String 7 // description of parameter 3 Convert_add
{
Text [ en-US ] = "Unit of measure for the result";
};
@@ -1432,77 +1432,77 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Amordegrc
{
- String 1 // description Amordegrc
+ String 1 // description Amordegrc
{
Text [ en-US ] = "Returns the prorated linear depreciation of an asset for each accounting period";
};
- String 2 // name of parameter 1 Amordegrc
+ String 2 // name of parameter 1 Amordegrc
{
Text [ en-US ] = "Cost";
};
- String 3 // description of parameter 1 Amordegrc
+ String 3 // description of parameter 1 Amordegrc
{
Text [ en-US ] = "Cost of the asset";
};
- String 4 // name of parameter 2 Amordegrc
+ String 4 // name of parameter 2 Amordegrc
{
Text [ en-US ] = "Date purchased";
};
- String 5 // description of parameter 2 Amordegrc
+ String 5 // description of parameter 2 Amordegrc
{
Text [ en-US ] = "Purchase date of the asset";
};
- String 6 // name of parameter 3 Amordegrc
+ String 6 // name of parameter 3 Amordegrc
{
Text [ en-US ] = "First period";
};
- String 7 // description of parameter 3 Amordegrc
+ String 7 // description of parameter 3 Amordegrc
{
Text [ en-US ] = "Date the first period ends";
};
- String 8 // name of parameter 4 Amordegrc
+ String 8 // name of parameter 4 Amordegrc
{
Text [ en-US ] = "Salvage";
};
- String 9 // description of parameter 4 Amordegrc
+ String 9 // description of parameter 4 Amordegrc
{
Text [ en-US ] = "Salvage value of an asset at the end of its life";
};
- String 10 // name of parameter 5 Amordegrc
+ String 10 // name of parameter 5 Amordegrc
{
Text [ en-US ] = "Period";
};
- String 11 // description of parameter 5 Amordegrc
+ String 11 // description of parameter 5 Amordegrc
{
Text [ en-US ] = "The period";
};
- String 12 // name of parameter 6 Amordegrc
+ String 12 // name of parameter 6 Amordegrc
{
Text [ en-US ] = "Rate";
};
- String 13 // description of parameter 6 Amordegrc
+ String 13 // description of parameter 6 Amordegrc
{
Text [ en-US ] = "The rate of depreciation";
};
- String 14 // name of parameter 7 Amordegrc
+ String 14 // name of parameter 7 Amordegrc
{
Text [ en-US ] = "Basis";
};
- String 15 // description of parameter 7 Amordegrc
+ String 15 // description of parameter 7 Amordegrc
{
Text [ en-US ] = "The year basis to be used";
};
@@ -1510,77 +1510,77 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Amorlinc
{
- String 1 // description Amorlinc
+ String 1 // description Amorlinc
{
Text [ en-US ] = "Returns the prorated linear depreciation of an asset for each accounting period";
};
- String 2 // name of parameter 1 Amorlinc
+ String 2 // name of parameter 1 Amorlinc
{
Text [ en-US ] = "Cost";
};
- String 3 // description of parameter 1 Amorlinc
+ String 3 // description of parameter 1 Amorlinc
{
Text [ en-US ] = "Cost of the asset";
};
- String 4 // name of parameter 2 Amorlinc
+ String 4 // name of parameter 2 Amorlinc
{
Text [ en-US ] = "Date purchased";
};
- String 5 // description of parameter 2 Amorlinc
+ String 5 // description of parameter 2 Amorlinc
{
Text [ en-US ] = "Purchase date of the asset";
};
- String 6 // name of parameter 3 Amorlinc
+ String 6 // name of parameter 3 Amorlinc
{
Text [ en-US ] = "First period";
};
- String 7 // description of parameter 3 Amorlinc
+ String 7 // description of parameter 3 Amorlinc
{
Text [ en-US ] = "The date the first period ends";
};
- String 8 // name of parameter 4 Amorlinc
+ String 8 // name of parameter 4 Amorlinc
{
Text [ en-US ] = "Salvage";
};
- String 9 // description of parameter 4 Amorlinc
+ String 9 // description of parameter 4 Amorlinc
{
Text [ en-US ] = "The salvage value of an asset at the end of its life";
};
- String 10 // name of parameter 5 Amorlinc
+ String 10 // name of parameter 5 Amorlinc
{
Text [ en-US ] = "Period";
};
- String 11 // description of parameter 5 Amorlinc
+ String 11 // description of parameter 5 Amorlinc
{
Text [ en-US ] = "The period";
};
- String 12 // name of parameter 6 Amorlinc
+ String 12 // name of parameter 6 Amorlinc
{
Text [ en-US ] = "Rate";
};
- String 13 // description of parameter 6 Amorlinc
+ String 13 // description of parameter 6 Amorlinc
{
Text [ en-US ] = "The rate of depreciation";
};
- String 14 // name of parameter 7 Amorlinc
+ String 14 // name of parameter 7 Amorlinc
{
Text [ en-US ] = "Basis";
};
- String 15 // description of parameter 7 Amorlinc
+ String 15 // description of parameter 7 Amorlinc
{
Text [ en-US ] = "The year basis to be used";
};
@@ -1588,77 +1588,77 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Accrint
{
- String 1 // description Accrint
+ String 1 // description Accrint
{
Text [ en-US ] = "Returns the accrued interest for a security that pays periodic interest";
};
- String 2 // name of parameter 1 Accrint
+ String 2 // name of parameter 1 Accrint
{
Text [ en-US ] = "Issue";
};
- String 3 // description of parameter 1 Accrint
+ String 3 // description of parameter 1 Accrint
{
Text [ en-US ] = "Issue date of the security";
};
- String 4 // name of parameter 2 Accrint
+ String 4 // name of parameter 2 Accrint
{
Text [ en-US ] = "First interest";
};
- String 5 // description of parameter 2 Accrint
+ String 5 // description of parameter 2 Accrint
{
Text [ en-US ] = "First interest date of the security";
};
- String 6 // name of parameter 3 Accrint
+ String 6 // name of parameter 3 Accrint
{
Text [ en-US ] = "Settlement";
};
- String 7 // description of parameter 3 Accrint
+ String 7 // description of parameter 3 Accrint
{
Text [ en-US ] = "The settlement";
};
- String 8 // name of parameter 4 Accrint
+ String 8 // name of parameter 4 Accrint
{
Text [ en-US ] = "Rate";
};
- String 9 // description of parameter 4 Accrint
+ String 9 // description of parameter 4 Accrint
{
Text [ en-US ] = "The rate";
};
- String 10 // name of parameter 5 Accrint
+ String 10 // name of parameter 5 Accrint
{
Text [ en-US ] = "Par";
};
- String 11 // description of parameter 5 Accrint
+ String 11 // description of parameter 5 Accrint
{
Text [ en-US ] = "The par value";
};
- String 12 // name of parameter 6 Accrint
+ String 12 // name of parameter 6 Accrint
{
Text [ en-US ] = "Frequency";
};
- String 13 // description of parameter 6 Accrint
+ String 13 // description of parameter 6 Accrint
{
Text [ en-US ] = "The frequency";
};
- String 14 // name of parameter 7 Accrint
+ String 14 // name of parameter 7 Accrint
{
Text [ en-US ] = "Basis";
};
- String 15 // description of parameter 7 Accrint
+ String 15 // description of parameter 7 Accrint
{
Text [ en-US ] = "The basis";
};
@@ -1666,57 +1666,57 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Accrintm
{
- String 1 // description Accrintm
+ String 1 // description Accrintm
{
Text [ en-US ] = "Returns the accrued interest for a security that pays interest at maturity";
};
- String 2 // name of parameter 1 Accrintm
+ String 2 // name of parameter 1 Accrintm
{
Text [ en-US ] = "Issue";
};
- String 3 // description of parameter 1 Accrintm
+ String 3 // description of parameter 1 Accrintm
{
Text [ en-US ] = "The issue date";
};
- String 4 // name of parameter 2 Accrintm
+ String 4 // name of parameter 2 Accrintm
{
Text [ en-US ] = "Settlement";
};
- String 5 // description of parameter 2 Accrintm
+ String 5 // description of parameter 2 Accrintm
{
Text [ en-US ] = "The settlement";
};
- String 6 // name of parameter 3 Accrintm
+ String 6 // name of parameter 3 Accrintm
{
Text [ en-US ] = "Rate";
};
- String 7 // description of parameter 3 Accrintm
+ String 7 // description of parameter 3 Accrintm
{
Text [ en-US ] = "The rate";
};
- String 8 // name of parameter 4 Accrintm
+ String 8 // name of parameter 4 Accrintm
{
Text [ en-US ] = "Par";
};
- String 9 // description of parameter 4 Accrintm
+ String 9 // description of parameter 4 Accrintm
{
Text [ en-US ] = "The par value";
};
- String 10 // name of parameter 5 Accrintm
+ String 10 // name of parameter 5 Accrintm
{
Text [ en-US ] = "Basis";
};
- String 11 // description of parameter 5 Accrintm
+ String 11 // description of parameter 5 Accrintm
{
Text [ en-US ] = "The basis";
};
@@ -1724,57 +1724,57 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Received
{
- String 1 // description Received
+ String 1 // description Received
{
Text [ en-US ] = "Returns the amount paid out at maturity for a fully invested security";
};
- String 2 // name of parameter 1 Received
+ String 2 // name of parameter 1 Received
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Received
+ String 3 // description of parameter 1 Received
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Received
+ String 4 // name of parameter 2 Received
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Received
+ String 5 // description of parameter 2 Received
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Received
+ String 6 // name of parameter 3 Received
{
Text [ en-US ] = "Investment";
};
- String 7 // description of parameter 3 Received
+ String 7 // description of parameter 3 Received
{
Text [ en-US ] = "The investment";
};
- String 8 // name of parameter 4 Received
+ String 8 // name of parameter 4 Received
{
Text [ en-US ] = "Discount";
};
- String 9 // description of parameter 4 Received
+ String 9 // description of parameter 4 Received
{
Text [ en-US ] = "The discount";
};
- String 10 // name of parameter 5 Received
+ String 10 // name of parameter 5 Received
{
Text [ en-US ] = "Basis";
};
- String 11 // description of parameter 5 Received
+ String 11 // description of parameter 5 Received
{
Text [ en-US ] = "The basis";
};
@@ -1782,57 +1782,57 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Disc
{
- String 1 // description Disc
+ String 1 // description Disc
{
Text [ en-US ] = "Returns the discount rate for a security";
};
- String 2 // name of parameter 1 Disc
+ String 2 // name of parameter 1 Disc
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Disc
+ String 3 // description of parameter 1 Disc
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Disc
+ String 4 // name of parameter 2 Disc
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Disc
+ String 5 // description of parameter 2 Disc
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Disc
+ String 6 // name of parameter 3 Disc
{
Text [ en-US ] = "Price";
};
- String 7 // description of parameter 3 Disc
+ String 7 // description of parameter 3 Disc
{
Text [ en-US ] = "The price";
};
- String 8 // name of parameter 4 Disc
+ String 8 // name of parameter 4 Disc
{
Text [ en-US ] = "Redemption";
};
- String 9 // description of parameter 4 Disc
+ String 9 // description of parameter 4 Disc
{
Text [ en-US ] = "The redemption value";
};
- String 10 // name of parameter 5 Disc
+ String 10 // name of parameter 5 Disc
{
Text [ en-US ] = "Basis";
};
- String 11 // description of parameter 5 Disc
+ String 11 // description of parameter 5 Disc
{
Text [ en-US ] = "The basis";
};
@@ -1840,67 +1840,67 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Duration
{
- String 1 // description Duration
+ String 1 // description Duration
{
Text [ en-US ] = "Returns the annual Macaulay duration of a security with periodic interest payments";
};
- String 2 // name of parameter 1 Duration
+ String 2 // name of parameter 1 Duration
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Duration
+ String 3 // description of parameter 1 Duration
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Duration
+ String 4 // name of parameter 2 Duration
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Duration
+ String 5 // description of parameter 2 Duration
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Duration
+ String 6 // name of parameter 3 Duration
{
Text [ en-US ] = "Coupon";
};
- String 7 // description of parameter 3 Duration
+ String 7 // description of parameter 3 Duration
{
Text [ en-US ] = "The coupon rate";
};
- String 8 // name of parameter 4 Duration
+ String 8 // name of parameter 4 Duration
{
Text [ en-US ] = "Yield";
};
- String 9 // description of parameter 4 Duration
+ String 9 // description of parameter 4 Duration
{
Text [ en-US ] = "The yield";
};
- String 10 // name of parameter 5 Duration
+ String 10 // name of parameter 5 Duration
{
Text [ en-US ] = "Frequency";
};
- String 11 // description of parameter 5 Duration
+ String 11 // description of parameter 5 Duration
{
Text [ en-US ] = "The frequency";
};
- String 12 // name of parameter 6 Duration
+ String 12 // name of parameter 6 Duration
{
Text [ en-US ] = "Basis";
};
- String 13 // description of parameter 6 Duration
+ String 13 // description of parameter 6 Duration
{
Text [ en-US ] = "The basis";
};
@@ -1908,27 +1908,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Effect
{
- String 1 // description Effect_add
+ String 1 // description Effect_add
{
Text [ en-US ] = "Returns the effective annual interest rate";
};
- String 2 // name of parameter 1 Effect_add
+ String 2 // name of parameter 1 Effect_add
{
Text [ en-US ] = "Nominal rate";
};
- String 3 // description of parameter 1 Effect_add
+ String 3 // description of parameter 1 Effect_add
{
Text [ en-US ] = "The nominal rate";
};
- String 4 // name of parameter 2 Effect_add
+ String 4 // name of parameter 2 Effect_add
{
Text [ en-US ] = "Npery";
};
- String 5 // description of parameter 2 Effect_add
+ String 5 // description of parameter 2 Effect_add
{
Text [ en-US ] = "The periods";
};
@@ -1936,67 +1936,67 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Cumprinc
{
- String 1 // description Cumprinc_add
+ String 1 // description Cumprinc_add
{
Text [ en-US ] = "Returns the cumulative principal on a loan to be paid between two periods";
};
- String 2 // name of parameter 1 Cumprinc_add
+ String 2 // name of parameter 1 Cumprinc_add
{
Text [ en-US ] = "Rate";
};
- String 3 // description of parameter 1 Cumprinc_add
+ String 3 // description of parameter 1 Cumprinc_add
{
Text [ en-US ] = "The rate";
};
- String 4 // name of parameter 2 Cumprinc_add
+ String 4 // name of parameter 2 Cumprinc_add
{
Text [ en-US ] = "Nper";
};
- String 5 // description of parameter 2 Cumprinc_add
+ String 5 // description of parameter 2 Cumprinc_add
{
Text [ en-US ] = "Number of payment periods";
};
- String 6 // name of parameter 3 Cumprinc_add
+ String 6 // name of parameter 3 Cumprinc_add
{
Text [ en-US ] = "Pv";
};
- String 7 // description of parameter 3 Cumprinc_add
+ String 7 // description of parameter 3 Cumprinc_add
{
Text [ en-US ] = "The present value";
};
- String 8 // name of parameter 4 Cumprinc_add
+ String 8 // name of parameter 4 Cumprinc_add
{
Text [ en-US ] = "Start period";
};
- String 9 // description of parameter 4 Cumprinc_add
+ String 9 // description of parameter 4 Cumprinc_add
{
Text [ en-US ] = "The start period";
};
- String 10 // name of parameter 5 Cumprinc_add
+ String 10 // name of parameter 5 Cumprinc_add
{
Text [ en-US ] = "End period";
};
- String 11 // description of parameter 5 Cumprinc_add
+ String 11 // description of parameter 5 Cumprinc_add
{
Text [ en-US ] = "The end period";
};
- String 12 // name of parameter 6 Cumprinc_add
+ String 12 // name of parameter 6 Cumprinc_add
{
Text [ en-US ] = "Type";
};
- String 13 // description of parameter 6 Cumprinc_add
+ String 13 // description of parameter 6 Cumprinc_add
{
Text [ en-US ] = "The type of maturity";
};
@@ -2004,67 +2004,67 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Cumipmt
{
- String 1 // description Cumipmt_add
+ String 1 // description Cumipmt_add
{
Text [ en-US ] = "Returns the cumulative interest to be paid between two periods";
};
- String 2 // name of parameter 1 Cumipmt_add
+ String 2 // name of parameter 1 Cumipmt_add
{
Text [ en-US ] = "Rate";
};
- String 3 // description of parameter 1 Cumipmt_add
+ String 3 // description of parameter 1 Cumipmt_add
{
Text [ en-US ] = "The rate";
};
- String 4 // name of parameter 2 Cumipmt_add
+ String 4 // name of parameter 2 Cumipmt_add
{
Text [ en-US ] = "Nper";
};
- String 5 // description of parameter 2 Cumipmt_add
+ String 5 // description of parameter 2 Cumipmt_add
{
Text [ en-US ] = "Number of payment periods";
};
- String 6 // name of parameter 3 Cumipmt_add
+ String 6 // name of parameter 3 Cumipmt_add
{
Text [ en-US ] = "Pv";
};
- String 7 // description of parameter 3 Cumipmt_add
+ String 7 // description of parameter 3 Cumipmt_add
{
Text [ en-US ] = "The present value";
};
- String 8 // name of parameter 4 Cumipmt_add
+ String 8 // name of parameter 4 Cumipmt_add
{
Text [ en-US ] = "Start period";
};
- String 9 // description of parameter 4 Cumipmt_add
+ String 9 // description of parameter 4 Cumipmt_add
{
Text [ en-US ] = "The start period";
};
- String 10 // name of parameter 5 Cumipmt_add
+ String 10 // name of parameter 5 Cumipmt_add
{
Text [ en-US ] = "End period";
};
- String 11 // description of parameter 5 Cumipmt_add
+ String 11 // description of parameter 5 Cumipmt_add
{
Text [ en-US ] = "The end period";
};
- String 12 // name of parameter 6 Cumipmt_add
+ String 12 // name of parameter 6 Cumipmt_add
{
Text [ en-US ] = "Type";
};
- String 13 // description of parameter 6 Cumipmt_add
+ String 13 // description of parameter 6 Cumipmt_add
{
Text [ en-US ] = "The type of maturity";
};
@@ -2072,77 +2072,77 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Price
{
- String 1 // description Price
+ String 1 // description Price
{
Text [ en-US ] = "Returns the price per 100 currency units face value of a security that pays periodic interest";
};
- String 2 // name of parameter 1 Price
+ String 2 // name of parameter 1 Price
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Price
+ String 3 // description of parameter 1 Price
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Price
+ String 4 // name of parameter 2 Price
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Price
+ String 5 // description of parameter 2 Price
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Price
+ String 6 // name of parameter 3 Price
{
Text [ en-US ] = "Rate";
};
- String 7 // description of parameter 3 Price
+ String 7 // description of parameter 3 Price
{
Text [ en-US ] = "The rate";
};
- String 8 // name of parameter 4 Price
+ String 8 // name of parameter 4 Price
{
Text [ en-US ] = "Yield";
};
- String 9 // description of parameter 4 Price
+ String 9 // description of parameter 4 Price
{
Text [ en-US ] = "The yield";
};
- String 10 // name of parameter 5 Price
+ String 10 // name of parameter 5 Price
{
Text [ en-US ] = "Redemption";
};
- String 11 // description of parameter 5 Price
+ String 11 // description of parameter 5 Price
{
Text [ en-US ] = "The redemption value";
};
- String 12 // name of parameter 6 Price
+ String 12 // name of parameter 6 Price
{
Text [ en-US ] = "Frequency";
};
- String 13 // description of parameter 6 Price
+ String 13 // description of parameter 6 Price
{
Text [ en-US ] = "The frequency";
};
- String 14 // name of parameter 7 Price
+ String 14 // name of parameter 7 Price
{
Text [ en-US ] = "Basis";
};
- String 15 // description of parameter 7 Price
+ String 15 // description of parameter 7 Price
{
Text [ en-US ] = "The basis";
};
@@ -2150,57 +2150,57 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Pricedisc
{
- String 1 // description Pricedisc
+ String 1 // description Pricedisc
{
Text [ en-US ] = "Returns the price per 100 currency units face value of a discounted security";
};
- String 2 // name of parameter 1 Pricedisc
+ String 2 // name of parameter 1 Pricedisc
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Pricedisc
+ String 3 // description of parameter 1 Pricedisc
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Pricedisc
+ String 4 // name of parameter 2 Pricedisc
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Pricedisc
+ String 5 // description of parameter 2 Pricedisc
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Pricedisc
+ String 6 // name of parameter 3 Pricedisc
{
Text [ en-US ] = "Discount";
};
- String 7 // description of parameter 3 Pricedisc
+ String 7 // description of parameter 3 Pricedisc
{
Text [ en-US ] = "The discount";
};
- String 8 // name of parameter 4 Pricedisc
+ String 8 // name of parameter 4 Pricedisc
{
Text [ en-US ] = "Redemption";
};
- String 9 // description of parameter 4 Pricedisc
+ String 9 // description of parameter 4 Pricedisc
{
Text [ en-US ] = "The redemption value";
};
- String 10 // name of parameter 5 Pricedisc
+ String 10 // name of parameter 5 Pricedisc
{
Text [ en-US ] = "Basis";
};
- String 11 // description of parameter 5 Pricedisc
+ String 11 // description of parameter 5 Pricedisc
{
Text [ en-US ] = "The basis";
};
@@ -2208,67 +2208,67 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Pricemat
{
- String 1 // description Pricemat
+ String 1 // description Pricemat
{
Text [ en-US ] = "Returns the price per 100 currency units face value of a security that pays interest at maturity";
};
- String 2 // name of parameter 1 Pricemat
+ String 2 // name of parameter 1 Pricemat
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Pricemat
+ String 3 // description of parameter 1 Pricemat
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Pricemat
+ String 4 // name of parameter 2 Pricemat
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Pricemat
+ String 5 // description of parameter 2 Pricemat
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Pricemat
+ String 6 // name of parameter 3 Pricemat
{
Text [ en-US ] = "Issue";
};
- String 7 // description of parameter 3 Pricemat
+ String 7 // description of parameter 3 Pricemat
{
Text [ en-US ] = "The issue date";
};
- String 8 // name of parameter 4 Pricemat
+ String 8 // name of parameter 4 Pricemat
{
Text [ en-US ] = "Rate";
};
- String 9 // description of parameter 4 Pricemat
+ String 9 // description of parameter 4 Pricemat
{
Text [ en-US ] = "The rate";
};
- String 10 // name of parameter 5 Pricemat
+ String 10 // name of parameter 5 Pricemat
{
Text [ en-US ] = "Yield";
};
- String 11 // description of parameter 5 Pricemat
+ String 11 // description of parameter 5 Pricemat
{
Text [ en-US ] = "The yield";
};
- String 12 // name of parameter 6 Pricemat
+ String 12 // name of parameter 6 Pricemat
{
Text [ en-US ] = "Basis";
};
- String 13 // description of parameter 6 Pricemat
+ String 13 // description of parameter 6 Pricemat
{
Text [ en-US ] = "The basis";
};
@@ -2276,67 +2276,67 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Mduration
{
- String 1 // description Mduration
+ String 1 // description Mduration
{
Text [ en-US ] = "Returns the Macaulay modified duration for a security with an assumed par value of 100 currency units";
};
- String 2 // name of parameter 1 Mduration
+ String 2 // name of parameter 1 Mduration
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Mduration
+ String 3 // description of parameter 1 Mduration
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Mduration
+ String 4 // name of parameter 2 Mduration
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Mduration
+ String 5 // description of parameter 2 Mduration
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Mduration
+ String 6 // name of parameter 3 Mduration
{
Text [ en-US ] = "Coupon";
};
- String 7 // description of parameter 3 Mduration
+ String 7 // description of parameter 3 Mduration
{
Text [ en-US ] = "The coupon rate";
};
- String 8 // name of parameter 4 Mduration
+ String 8 // name of parameter 4 Mduration
{
Text [ en-US ] = "Yield";
};
- String 9 // description of parameter 4 Mduration
+ String 9 // description of parameter 4 Mduration
{
Text [ en-US ] = "The yield";
};
- String 10 // name of parameter 5 Mduration
+ String 10 // name of parameter 5 Mduration
{
Text [ en-US ] = "Frequency";
};
- String 11 // description of parameter 5 Mduration
+ String 11 // description of parameter 5 Mduration
{
Text [ en-US ] = "The frequency";
};
- String 12 // name of parameter 6 Mduration
+ String 12 // name of parameter 6 Mduration
{
Text [ en-US ] = "Basis";
};
- String 13 // description of parameter 6 Mduration
+ String 13 // description of parameter 6 Mduration
{
Text [ en-US ] = "The basis";
};
@@ -2372,27 +2372,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Dollarfr
{
- String 1 // description Dollarfr
+ String 1 // description Dollarfr
{
Text [ en-US ] = "Converts a price expressed as a decimal into a price expressed as a fraction";
};
- String 2 // name of parameter 1 Dollarfr
+ String 2 // name of parameter 1 Dollarfr
{
Text [ en-US ] = "Decimal dollar";
};
- String 3 // description of parameter 1 Dollarfr
+ String 3 // description of parameter 1 Dollarfr
{
Text [ en-US ] = "The decimal number";
};
- String 4 // name of parameter 2 Dollarfr
+ String 4 // name of parameter 2 Dollarfr
{
Text [ en-US ] = "Fraction";
};
- String 5 // description of parameter 2 Dollarfr
+ String 5 // description of parameter 2 Dollarfr
{
Text [ en-US ] = "The divisor";
};
@@ -2400,27 +2400,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Dollarde
{
- String 1 // description Dollarde
+ String 1 // description Dollarde
{
Text [ en-US ] = "Converts a price expressed as a fraction into a price expressed as a decimal";
};
- String 2 // name of parameter 1 Dollarde
+ String 2 // name of parameter 1 Dollarde
{
Text [ en-US ] = "Fractional dollar";
};
- String 3 // description of parameter 1 Dollarde
+ String 3 // description of parameter 1 Dollarde
{
Text [ en-US ] = "The number as a fraction";
};
- String 4 // name of parameter 2 Dollarde
+ String 4 // name of parameter 2 Dollarde
{
Text [ en-US ] = "Fraction";
};
- String 5 // description of parameter 2 Dollarde
+ String 5 // description of parameter 2 Dollarde
{
Text [ en-US ] = "The divisor";
};
@@ -2428,77 +2428,77 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Yield
{
- String 1 // description Yield
+ String 1 // description Yield
{
Text [ en-US ] = "Returns the yield on a security that pays periodic interest";
};
- String 2 // name of parameter 1 Yield
+ String 2 // name of parameter 1 Yield
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Yield
+ String 3 // description of parameter 1 Yield
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Yield
+ String 4 // name of parameter 2 Yield
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Yield
+ String 5 // description of parameter 2 Yield
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Yield
+ String 6 // name of parameter 3 Yield
{
Text [ en-US ] = "Rate";
};
- String 7 // description of parameter 3 Yield
+ String 7 // description of parameter 3 Yield
{
Text [ en-US ] = "The rate";
};
- String 8 // name of parameter 4 Yield
+ String 8 // name of parameter 4 Yield
{
Text [ en-US ] = "Price";
};
- String 9 // description of parameter 4 Yield
+ String 9 // description of parameter 4 Yield
{
Text [ en-US ] = "The price";
};
- String 10 // name of parameter 5 Yield
+ String 10 // name of parameter 5 Yield
{
Text [ en-US ] = "Redemption";
};
- String 11 // description of parameter 5 Yield
+ String 11 // description of parameter 5 Yield
{
Text [ en-US ] = "The redemption value";
};
- String 12 // name of parameter 6 Yield
+ String 12 // name of parameter 6 Yield
{
Text [ en-US ] = "Frequency";
};
- String 13 // description of parameter 6 Yield
+ String 13 // description of parameter 6 Yield
{
Text [ en-US ] = "The frequency";
};
- String 14 // name of parameter 7 Yield
+ String 14 // name of parameter 7 Yield
{
Text [ en-US ] = "Basis";
};
- String 15 // description of parameter 7 Yield
+ String 15 // description of parameter 7 Yield
{
Text [ en-US ] = "The basis";
};
@@ -2506,57 +2506,57 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Yielddisc
{
- String 1 // description Yielddisc
+ String 1 // description Yielddisc
{
Text [ en-US ] = "Returns the annual yield for a discounted security";
};
- String 2 // name of parameter 1 Yielddisc
+ String 2 // name of parameter 1 Yielddisc
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Yielddisc
+ String 3 // description of parameter 1 Yielddisc
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Yielddisc
+ String 4 // name of parameter 2 Yielddisc
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Yielddisc
+ String 5 // description of parameter 2 Yielddisc
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Yielddisc
+ String 6 // name of parameter 3 Yielddisc
{
Text [ en-US ] = "Price";
};
- String 7 // description of parameter 3 Yielddisc
+ String 7 // description of parameter 3 Yielddisc
{
Text [ en-US ] = "The price";
};
- String 8 // name of parameter 4 Yielddisc
+ String 8 // name of parameter 4 Yielddisc
{
Text [ en-US ] = "Redemption";
};
- String 9 // description of parameter 4 Yielddisc
+ String 9 // description of parameter 4 Yielddisc
{
Text [ en-US ] = "The redemption value";
};
- String 10 // name of parameter 5 Yielddisc
+ String 10 // name of parameter 5 Yielddisc
{
Text [ en-US ] = "Basis";
};
- String 11 // description of parameter 5 Yielddisc
+ String 11 // description of parameter 5 Yielddisc
{
Text [ en-US ] = "The basis";
};
@@ -2564,67 +2564,67 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Yieldmat
{
- String 1 // description Yieldmat
+ String 1 // description Yieldmat
{
Text [ en-US ] = "Returns the annual yield of a security that pays interest at maturity";
};
- String 2 // name of parameter 1 Yieldmat
+ String 2 // name of parameter 1 Yieldmat
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Yieldmat
+ String 3 // description of parameter 1 Yieldmat
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Yieldmat
+ String 4 // name of parameter 2 Yieldmat
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Yieldmat
+ String 5 // description of parameter 2 Yieldmat
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Yieldmat
+ String 6 // name of parameter 3 Yieldmat
{
Text [ en-US ] = "Issue";
};
- String 7 // description of parameter 3 Yieldmat
+ String 7 // description of parameter 3 Yieldmat
{
Text [ en-US ] = "The issue date";
};
- String 8 // name of parameter 4 Yieldmat
+ String 8 // name of parameter 4 Yieldmat
{
Text [ en-US ] = "Rate";
};
- String 9 // description of parameter 4 Yieldmat
+ String 9 // description of parameter 4 Yieldmat
{
Text [ en-US ] = "The rate";
};
- String 10 // name of parameter 5 Yieldmat
+ String 10 // name of parameter 5 Yieldmat
{
Text [ en-US ] = "Price";
};
- String 11 // description of parameter 5 Yieldmat
+ String 11 // description of parameter 5 Yieldmat
{
Text [ en-US ] = "The price";
};
- String 12 // name of parameter 6 Yieldmat
+ String 12 // name of parameter 6 Yieldmat
{
Text [ en-US ] = "Basis";
};
- String 13 // description of parameter 6 Yieldmat
+ String 13 // description of parameter 6 Yieldmat
{
Text [ en-US ] = "The basis";
};
@@ -2632,37 +2632,37 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Tbilleq
{
- String 1 // description Tbilleq
+ String 1 // description Tbilleq
{
Text [ en-US ] = "Returns the bond-equivalent yield for a treasury bill";
};
- String 2 // name of parameter 1 Tbilleq
+ String 2 // name of parameter 1 Tbilleq
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Tbilleq
+ String 3 // description of parameter 1 Tbilleq
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Tbilleq
+ String 4 // name of parameter 2 Tbilleq
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Tbilleq
+ String 5 // description of parameter 2 Tbilleq
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Tbilleq
+ String 6 // name of parameter 3 Tbilleq
{
Text [ en-US ] = "Discount";
};
- String 7 // description of parameter 3 Tbilleq
+ String 7 // description of parameter 3 Tbilleq
{
Text [ en-US ] = "The discount rate";
};
@@ -2670,37 +2670,37 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Tbillprice
{
- String 1 // description Tbillprice
+ String 1 // description Tbillprice
{
Text [ en-US ] = "Returns the price of 100 currency units face value for a treasury bill";
};
- String 2 // name of parameter 1 Tbillprice
+ String 2 // name of parameter 1 Tbillprice
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Tbillprice
+ String 3 // description of parameter 1 Tbillprice
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Tbillprice
+ String 4 // name of parameter 2 Tbillprice
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Tbillprice
+ String 5 // description of parameter 2 Tbillprice
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Tbillprice
+ String 6 // name of parameter 3 Tbillprice
{
Text [ en-US ] = "Discount";
};
- String 7 // description of parameter 3 Tbillprice
+ String 7 // description of parameter 3 Tbillprice
{
Text [ en-US ] = "The discount rate";
};
@@ -2708,37 +2708,37 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Tbillyield
{
- String 1 // description Tbillyield
+ String 1 // description Tbillyield
{
Text [ en-US ] = "Returns the yield for a treasury bill";
};
- String 2 // name of parameter 1 Tbillyield
+ String 2 // name of parameter 1 Tbillyield
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Tbillyield
+ String 3 // description of parameter 1 Tbillyield
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Tbillyield
+ String 4 // name of parameter 2 Tbillyield
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Tbillyield
+ String 5 // description of parameter 2 Tbillyield
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Tbillyield
+ String 6 // name of parameter 3 Tbillyield
{
Text [ en-US ] = "Price";
};
- String 7 // description of parameter 3 Tbillyield
+ String 7 // description of parameter 3 Tbillyield
{
Text [ en-US ] = "The price";
};
@@ -2746,97 +2746,97 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Oddfprice
{
- String 1 // description Oddfprice
+ String 1 // description Oddfprice
{
Text [ en-US ] = "Returns the price per $100 face value of a security with an odd first period";
};
- String 2 // name of parameter 1 Oddfprice
+ String 2 // name of parameter 1 Oddfprice
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Oddfprice
+ String 3 // description of parameter 1 Oddfprice
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Oddfprice
+ String 4 // name of parameter 2 Oddfprice
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Oddfprice
+ String 5 // description of parameter 2 Oddfprice
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Oddfprice
+ String 6 // name of parameter 3 Oddfprice
{
Text [ en-US ] = "Issue";
};
- String 7 // description of parameter 3 Oddfprice
+ String 7 // description of parameter 3 Oddfprice
{
Text [ en-US ] = "The issue date";
};
- String 8 // name of parameter 4 Oddfprice
+ String 8 // name of parameter 4 Oddfprice
{
Text [ en-US ] = "First coupon";
};
- String 9 // description of parameter 4 Oddfprice
+ String 9 // description of parameter 4 Oddfprice
{
Text [ en-US ] = "The first coupon date";
};
- String 10 // name of parameter 5 Oddfprice
+ String 10 // name of parameter 5 Oddfprice
{
Text [ en-US ] = "Rate";
};
- String 11 // description of parameter 5 Oddfprice
+ String 11 // description of parameter 5 Oddfprice
{
Text [ en-US ] = "The rate";
};
- String 12 // name of parameter 6 Oddfprice
+ String 12 // name of parameter 6 Oddfprice
{
Text [ en-US ] = "Yield";
};
- String 13 // description of parameter 6 Oddfprice
+ String 13 // description of parameter 6 Oddfprice
{
Text [ en-US ] = "The yield";
};
- String 14 // name of parameter 7 Oddfprice
+ String 14 // name of parameter 7 Oddfprice
{
Text [ en-US ] = "Redemption";
};
- String 15 // description of parameter 7 Oddfprice
+ String 15 // description of parameter 7 Oddfprice
{
Text [ en-US ] = "The redemption value";
};
- String 16 // name of parameter 8 Oddfprice
+ String 16 // name of parameter 8 Oddfprice
{
Text [ en-US ] = "Frequency";
};
- String 17 // description of parameter 8 Oddfprice
+ String 17 // description of parameter 8 Oddfprice
{
Text [ en-US ] = "The frequency";
};
- String 18 // name of parameter 9 Oddfprice
+ String 18 // name of parameter 9 Oddfprice
{
Text [ en-US ] = "Basis";
};
- String 19 // description of parameter 9 Oddfprice
+ String 19 // description of parameter 9 Oddfprice
{
Text [ en-US ] = "The basis";
};
@@ -2844,97 +2844,97 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Oddfyield
{
- String 1 // description Oddfyield
+ String 1 // description Oddfyield
{
Text [ en-US ] = "Returns the yield of a security with an odd first period";
};
- String 2 // name of parameter 1 Oddfyield
+ String 2 // name of parameter 1 Oddfyield
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Oddfyield
+ String 3 // description of parameter 1 Oddfyield
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Oddfyield
+ String 4 // name of parameter 2 Oddfyield
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Oddfyield
+ String 5 // description of parameter 2 Oddfyield
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Oddfyield
+ String 6 // name of parameter 3 Oddfyield
{
Text [ en-US ] = "Issue";
};
- String 7 // description of parameter 3 Oddfyield
+ String 7 // description of parameter 3 Oddfyield
{
Text [ en-US ] = "The issue date";
};
- String 8 // name of parameter 4 Oddfyield
+ String 8 // name of parameter 4 Oddfyield
{
Text [ en-US ] = "First coupon";
};
- String 9 // description of parameter 4 Oddfyield
+ String 9 // description of parameter 4 Oddfyield
{
Text [ en-US ] = "The first coupon date";
};
- String 10 // name of parameter 5 Oddfyield
+ String 10 // name of parameter 5 Oddfyield
{
Text [ en-US ] = "Rate";
};
- String 11 // description of parameter 5 Oddfyield
+ String 11 // description of parameter 5 Oddfyield
{
Text [ en-US ] = "The rate";
};
- String 12 // name of parameter 6 Oddfyield
+ String 12 // name of parameter 6 Oddfyield
{
Text [ en-US ] = "Price";
};
- String 13 // description of parameter 6 Oddfyield
+ String 13 // description of parameter 6 Oddfyield
{
Text [ en-US ] = "The price";
};
- String 14 // name of parameter 7 Oddfyield
+ String 14 // name of parameter 7 Oddfyield
{
Text [ en-US ] = "Redemption";
};
- String 15 // description of parameter 7 Oddfyield
+ String 15 // description of parameter 7 Oddfyield
{
Text [ en-US ] = "The redemption value";
};
- String 16 // name of parameter 8 Oddfyield
+ String 16 // name of parameter 8 Oddfyield
{
Text [ en-US ] = "Frequency";
};
- String 17 // description of parameter 8 Oddfyield
+ String 17 // description of parameter 8 Oddfyield
{
Text [ en-US ] = "The frequency";
};
- String 18 // name of parameter 9 Oddfyield
+ String 18 // name of parameter 9 Oddfyield
{
Text [ en-US ] = "Basis";
};
- String 19 // description of parameter 9 Oddfyield
+ String 19 // description of parameter 9 Oddfyield
{
Text [ en-US ] = "The basis";
};
@@ -2942,87 +2942,87 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Oddlprice
{
- String 1 // description Oddlprice
+ String 1 // description Oddlprice
{
Text [ en-US ] = "Returns the price per $100 face value of a security with an odd last period";
};
- String 2 // name of parameter 1 Oddlprice
+ String 2 // name of parameter 1 Oddlprice
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Oddlprice
+ String 3 // description of parameter 1 Oddlprice
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Oddlprice
+ String 4 // name of parameter 2 Oddlprice
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Oddlprice
+ String 5 // description of parameter 2 Oddlprice
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Oddlprice
+ String 6 // name of parameter 3 Oddlprice
{
Text [ en-US ] = "Last interest";
};
- String 7 // description of parameter 3 Oddlprice
+ String 7 // description of parameter 3 Oddlprice
{
Text [ en-US ] = "The last interest date";
};
- String 8 // name of parameter 4 Oddlprice
+ String 8 // name of parameter 4 Oddlprice
{
Text [ en-US ] = "Rate";
};
- String 9 // description of parameter 4 Oddlprice
+ String 9 // description of parameter 4 Oddlprice
{
Text [ en-US ] = "The rate";
};
- String 10 // name of parameter 5 Oddlprice
+ String 10 // name of parameter 5 Oddlprice
{
Text [ en-US ] = "Yield";
};
- String 11 // description of parameter 5 Oddlprice
+ String 11 // description of parameter 5 Oddlprice
{
Text [ en-US ] = "The yield";
};
- String 12 // name of parameter 6 Oddlprice
+ String 12 // name of parameter 6 Oddlprice
{
Text [ en-US ] = "Redemption";
};
- String 13 // description of parameter 6 Oddlprice
+ String 13 // description of parameter 6 Oddlprice
{
Text [ en-US ] = "The redemption value";
};
- String 14 // name of parameter 7 Oddlprice
+ String 14 // name of parameter 7 Oddlprice
{
Text [ en-US ] = "Frequency";
};
- String 15 // description of parameter 7 Oddlprice
+ String 15 // description of parameter 7 Oddlprice
{
Text [ en-US ] = "The frequency";
};
- String 16 // name of parameter 8 Oddlprice
+ String 16 // name of parameter 8 Oddlprice
{
Text [ en-US ] = "Basis";
};
- String 17 // description of parameter 8 Oddlprice
+ String 17 // description of parameter 8 Oddlprice
{
Text [ en-US ] = "The basis";
};
@@ -3030,87 +3030,87 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Oddlyield
{
- String 1 // description Oddlyield
+ String 1 // description Oddlyield
{
Text [ en-US ] = "Returns the yield of a security with an odd last period";
};
- String 2 // name of parameter 1 Oddlyield
+ String 2 // name of parameter 1 Oddlyield
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Oddlyield
+ String 3 // description of parameter 1 Oddlyield
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Oddlyield
+ String 4 // name of parameter 2 Oddlyield
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Oddlyield
+ String 5 // description of parameter 2 Oddlyield
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Oddlyield
+ String 6 // name of parameter 3 Oddlyield
{
Text [ en-US ] = "Last interest";
};
- String 7 // description of parameter 3 Oddlyield
+ String 7 // description of parameter 3 Oddlyield
{
Text [ en-US ] = "The last interest date";
};
- String 8 // name of parameter 4 Oddlyield
+ String 8 // name of parameter 4 Oddlyield
{
Text [ en-US ] = "Rate";
};
- String 9 // description of parameter 4 Oddlyield
+ String 9 // description of parameter 4 Oddlyield
{
Text [ en-US ] = "The rate";
};
- String 10 // name of parameter 5 Oddlyield
+ String 10 // name of parameter 5 Oddlyield
{
Text [ en-US ] = "Price";
};
- String 11 // description of parameter 5 Oddlyield
+ String 11 // description of parameter 5 Oddlyield
{
Text [ en-US ] = "The price";
};
- String 12 // name of parameter 6 Oddlyield
+ String 12 // name of parameter 6 Oddlyield
{
Text [ en-US ] = "Redemption";
};
- String 13 // description of parameter 6 Oddlyield
+ String 13 // description of parameter 6 Oddlyield
{
Text [ en-US ] = "The redemption value";
};
- String 14 // name of parameter 7 Oddlyield
+ String 14 // name of parameter 7 Oddlyield
{
Text [ en-US ] = "Frequency";
};
- String 15 // description of parameter 7 Oddlyield
+ String 15 // description of parameter 7 Oddlyield
{
Text [ en-US ] = "The frequency";
};
- String 16 // name of parameter 8 Oddlyield
+ String 16 // name of parameter 8 Oddlyield
{
Text [ en-US ] = "Basis";
};
- String 17 // description of parameter 8 Oddlyield
+ String 17 // description of parameter 8 Oddlyield
{
Text [ en-US ] = "The basis";
};
@@ -3118,37 +3118,37 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Xirr
{
- String 1 // description Xirr
+ String 1 // description Xirr
{
Text [ en-US ] = "Returns the internal rate of return for a non-periodic schedule of payments";
};
- String 2 // name of parameter 1 Xirr
+ String 2 // name of parameter 1 Xirr
{
Text [ en-US ] = "Values";
};
- String 3 // description of parameter 1 Xirr
+ String 3 // description of parameter 1 Xirr
{
Text [ en-US ] = "The values";
};
- String 4 // name of parameter 2 Xirr
+ String 4 // name of parameter 2 Xirr
{
Text [ en-US ] = "Dates";
};
- String 5 // description of parameter 2 Xirr
+ String 5 // description of parameter 2 Xirr
{
Text [ en-US ] = "The dates";
};
- String 6 // name of parameter 3 Xirr
+ String 6 // name of parameter 3 Xirr
{
Text [ en-US ] = "Guess";
};
- String 7 // description of parameter 3 Xirr
+ String 7 // description of parameter 3 Xirr
{
Text [ en-US ] = "The guess";
};
@@ -3156,37 +3156,37 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Xnpv
{
- String 1 // description Xnpv
+ String 1 // description Xnpv
{
Text [ en-US ] = "Returns the net present value for a non-periodic schedule of payments";
};
- String 2 // name of parameter 1 Xnpv
+ String 2 // name of parameter 1 Xnpv
{
Text [ en-US ] = "Rate";
};
- String 3 // description of parameter 1 Xnpv
+ String 3 // description of parameter 1 Xnpv
{
Text [ en-US ] = "The rate";
};
- String 4 // name of parameter 2 Xnpv
+ String 4 // name of parameter 2 Xnpv
{
Text [ en-US ] = "Values";
};
- String 5 // description of parameter 2 Xnpv
+ String 5 // description of parameter 2 Xnpv
{
Text [ en-US ] = "The values";
};
- String 6 // name of parameter 3 Xnpv
+ String 6 // name of parameter 3 Xnpv
{
Text [ en-US ] = "Dates";
};
- String 7 // description of parameter 3 Xnpv
+ String 7 // description of parameter 3 Xnpv
{
Text [ en-US ] = "The dates";
};
@@ -3194,57 +3194,57 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Intrate
{
- String 1 // description Intrate
+ String 1 // description Intrate
{
Text [ en-US ] = "Returns the interest rate for a fully invested security";
};
- String 2 // name of parameter 1 Intrate
+ String 2 // name of parameter 1 Intrate
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Intrate
+ String 3 // description of parameter 1 Intrate
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Intrate
+ String 4 // name of parameter 2 Intrate
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Intrate
+ String 5 // description of parameter 2 Intrate
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Intrate
+ String 6 // name of parameter 3 Intrate
{
Text [ en-US ] = "Investment";
};
- String 7 // description of parameter 3 Intrate
+ String 7 // description of parameter 3 Intrate
{
Text [ en-US ] = "The investment";
};
- String 8 // name of parameter 4 Intrate
+ String 8 // name of parameter 4 Intrate
{
Text [ en-US ] = "Redemption";
};
- String 9 // description of parameter 4 Intrate
+ String 9 // description of parameter 4 Intrate
{
Text [ en-US ] = "The redemption value";
};
- String 10 // name of parameter 5 Intrate
+ String 10 // name of parameter 5 Intrate
{
Text [ en-US ] = "Basis";
};
- String 11 // description of parameter 5 Intrate
+ String 11 // description of parameter 5 Intrate
{
Text [ en-US ] = "The basis";
};
@@ -3252,47 +3252,47 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Coupncd
{
- String 1 // description Coupncd
+ String 1 // description Coupncd
{
Text [ en-US ] = "Returns the first coupon date after the settlement date";
};
- String 2 // name of parameter 1 Coupncd
+ String 2 // name of parameter 1 Coupncd
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Coupncd
+ String 3 // description of parameter 1 Coupncd
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Coupncd
+ String 4 // name of parameter 2 Coupncd
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Coupncd
+ String 5 // description of parameter 2 Coupncd
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Coupncd
+ String 6 // name of parameter 3 Coupncd
{
Text [ en-US ] = "Frequency";
};
- String 7 // description of parameter 3 Coupncd
+ String 7 // description of parameter 3 Coupncd
{
Text [ en-US ] = "The frequency";
};
- String 8 // name of parameter 4 Coupncd
+ String 8 // name of parameter 4 Coupncd
{
Text [ en-US ] = "Basis";
};
- String 9 // description of parameter 4 Coupncd
+ String 9 // description of parameter 4 Coupncd
{
Text [ en-US ] = "The basis";
};
@@ -3300,47 +3300,47 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Coupdays
{
- String 1 // description Coupdays
+ String 1 // description Coupdays
{
Text [ en-US ] = "Returns the number of days in the coupon period containing the settlement date";
};
- String 2 // name of parameter 1 Coupdays
+ String 2 // name of parameter 1 Coupdays
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Coupdays
+ String 3 // description of parameter 1 Coupdays
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Coupdays
+ String 4 // name of parameter 2 Coupdays
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Coupdays
+ String 5 // description of parameter 2 Coupdays
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Coupdays
+ String 6 // name of parameter 3 Coupdays
{
Text [ en-US ] = "Frequency";
};
- String 7 // description of parameter 3 Coupdays
+ String 7 // description of parameter 3 Coupdays
{
Text [ en-US ] = "The frequency";
};
- String 8 // name of parameter 4 Coupdays
+ String 8 // name of parameter 4 Coupdays
{
Text [ en-US ] = "Basis";
};
- String 9 // description of parameter 4 Coupdays
+ String 9 // description of parameter 4 Coupdays
{
Text [ en-US ] = "The basis";
};
@@ -3348,47 +3348,47 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Coupdaysnc
{
- String 1 // description Coupdaysnc
+ String 1 // description Coupdaysnc
{
Text [ en-US ] = "Returns the number of days from the settlement date to the next coupon date";
};
- String 2 // name of parameter 1 Coupdaysnc
+ String 2 // name of parameter 1 Coupdaysnc
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Coupdaysnc
+ String 3 // description of parameter 1 Coupdaysnc
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Coupdaysnc
+ String 4 // name of parameter 2 Coupdaysnc
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Coupdaysnc
+ String 5 // description of parameter 2 Coupdaysnc
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Coupdaysnc
+ String 6 // name of parameter 3 Coupdaysnc
{
Text [ en-US ] = "Frequency";
};
- String 7 // description of parameter 3 Coupdaysnc
+ String 7 // description of parameter 3 Coupdaysnc
{
Text [ en-US ] = "The frequency";
};
- String 8 // name of parameter 4 Coupdaysnc
+ String 8 // name of parameter 4 Coupdaysnc
{
Text [ en-US ] = "Basis";
};
- String 9 // description of parameter 4 Coupdaysnc
+ String 9 // description of parameter 4 Coupdaysnc
{
Text [ en-US ] = "The basis";
};
@@ -3396,47 +3396,47 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Coupdaybs
{
- String 1 // description Coupdaybs
+ String 1 // description Coupdaybs
{
Text [ en-US ] = "Returns the number of days from the beginning of the coupon period to the settlement date";
};
- String 2 // name of parameter 1 Coupdaybs
+ String 2 // name of parameter 1 Coupdaybs
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Coupdaybs
+ String 3 // description of parameter 1 Coupdaybs
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Coupdaybs
+ String 4 // name of parameter 2 Coupdaybs
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Coupdaybs
+ String 5 // description of parameter 2 Coupdaybs
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Coupdaybs
+ String 6 // name of parameter 3 Coupdaybs
{
Text [ en-US ] = "Frequency";
};
- String 7 // description of parameter 3 Coupdaybs
+ String 7 // description of parameter 3 Coupdaybs
{
Text [ en-US ] = "The frequency";
};
- String 8 // name of parameter 4 Coupdaybs
+ String 8 // name of parameter 4 Coupdaybs
{
Text [ en-US ] = "Basis";
};
- String 9 // description of parameter 4 Coupdaybs
+ String 9 // description of parameter 4 Coupdaybs
{
Text [ en-US ] = "The basis";
};
@@ -3444,47 +3444,47 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Couppcd
{
- String 1 // description Couppcd
+ String 1 // description Couppcd
{
Text [ en-US ] = "Returns the last coupon date preceding the settlement date";
};
- String 2 // name of parameter 1 Couppcd
+ String 2 // name of parameter 1 Couppcd
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Couppcd
+ String 3 // description of parameter 1 Couppcd
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Couppcd
+ String 4 // name of parameter 2 Couppcd
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Couppcd
+ String 5 // description of parameter 2 Couppcd
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Couppcd
+ String 6 // name of parameter 3 Couppcd
{
Text [ en-US ] = "Frequency";
};
- String 7 // description of parameter 3 Couppcd
+ String 7 // description of parameter 3 Couppcd
{
Text [ en-US ] = "The frequency";
};
- String 8 // name of parameter 4 Couppcd
+ String 8 // name of parameter 4 Couppcd
{
Text [ en-US ] = "Basis";
};
- String 9 // description of parameter 4 Couppcd
+ String 9 // description of parameter 4 Couppcd
{
Text [ en-US ] = "The basis";
};
@@ -3492,47 +3492,47 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Coupnum
{
- String 1 // description Coupnum
+ String 1 // description Coupnum
{
Text [ en-US ] = "Returns the number of coupons payable between the settlement and maturity dates";
};
- String 2 // name of parameter 1 Coupnum
+ String 2 // name of parameter 1 Coupnum
{
Text [ en-US ] = "Settlement";
};
- String 3 // description of parameter 1 Coupnum
+ String 3 // description of parameter 1 Coupnum
{
Text [ en-US ] = "The settlement";
};
- String 4 // name of parameter 2 Coupnum
+ String 4 // name of parameter 2 Coupnum
{
Text [ en-US ] = "Maturity";
};
- String 5 // description of parameter 2 Coupnum
+ String 5 // description of parameter 2 Coupnum
{
Text [ en-US ] = "The maturity";
};
- String 6 // name of parameter 3 Coupnum
+ String 6 // name of parameter 3 Coupnum
{
Text [ en-US ] = "Frequency";
};
- String 7 // description of parameter 3 Coupnum
+ String 7 // description of parameter 3 Coupnum
{
Text [ en-US ] = "The frequency";
};
- String 8 // name of parameter 4 Coupnum
+ String 8 // name of parameter 4 Coupnum
{
Text [ en-US ] = "Basis";
};
- String 9 // description of parameter 4 Coupnum
+ String 9 // description of parameter 4 Coupnum
{
Text [ en-US ] = "The basis";
};
@@ -3540,27 +3540,27 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
Resource ANALYSIS_Fvschedule
{
- String 1 // description Fvschedule
+ String 1 // description Fvschedule
{
Text [ en-US ] = "Returns the future value of the initial principal after a series of compound interest rates are applied";
};
- String 2 // name of parameter 1 Fvschedule
+ String 2 // name of parameter 1 Fvschedule
{
Text [ en-US ] = "Principal";
};
- String 3 // description of parameter 1 Fvschedule
+ String 3 // description of parameter 1 Fvschedule
{
Text [ en-US ] = "The principal";
};
- String 4 // name of parameter 2 Fvschedule
+ String 4 // name of parameter 2 Fvschedule
{
Text [ en-US ] = "Schedule";
};
- String 5 // description of parameter 2 Fvschedule
+ String 5 // description of parameter 2 Fvschedule
{
Text [ en-US ] = "The schedule";
};
diff --git a/scaddins/source/analysis/analysis_deffuncnames.src b/scaddins/source/analysis/analysis_deffuncnames.src
index 840800da8ae4..b3b0186149c8 100644
--- a/scaddins/source/analysis/analysis_deffuncnames.src
+++ b/scaddins/source/analysis/analysis_deffuncnames.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/scaddins/source/analysis/analysis_funcnames.src b/scaddins/source/analysis/analysis_funcnames.src
index e5cd3e02f9d3..39df00f49c97 100644
--- a/scaddins/source/analysis/analysis_funcnames.src
+++ b/scaddins/source/analysis/analysis_funcnames.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/scaddins/source/analysis/analysisadd.idl b/scaddins/source/analysis/analysisadd.idl
index 6245bff9ad5a..32a94f75df3b 100644
--- a/scaddins/source/analysis/analysisadd.idl
+++ b/scaddins/source/analysis/analysisadd.idl
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/scaddins/source/analysis/analysisdefs.hxx b/scaddins/source/analysis/analysisdefs.hxx
index dae4205e2d84..0b9bf2d43ed8 100644
--- a/scaddins/source/analysis/analysisdefs.hxx
+++ b/scaddins/source/analysis/analysisdefs.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,22 +28,22 @@
#ifndef ANALYSISDEFS_HXX
#define ANALYSISDEFS_HXX
-#define CSS ::com::sun::star
-#define XPROPSET CSS::beans::XPropertySet
-#define REF(c) CSS::uno::Reference< c >
-#define constREFXPS const REF(XPROPSET)
-#define SEQ(c) CSS::uno::Sequence< c >
-#define SEQSEQ(c) CSS::uno::Sequence< CSS::uno::Sequence< c > >
-#define SEQofLocName SEQ( CSS::sheet::LocalizedName )
-#define ANY CSS::uno::Any
-#define SEQ_ANY SEQ(ANY)
-#define STRING ::rtl::OUString
-#define STRFROMASCII(s) STRING::createFromAscii( s )
-#define STRFROMANSI(s) STRING( s, strlen( s ), RTL_TEXTENCODING_MS_1252 )
-#define THROWDEF_RTE throw(CSS::uno::RuntimeException)
-#define THROW_RTE throw CSS::uno::RuntimeException()
-#define THROWDEF_RTE_IAE throw(CSS::uno::RuntimeException,CSS::lang::IllegalArgumentException)
-#define THROW_IAE throw CSS::lang::IllegalArgumentException()
+#define CSS ::com::sun::star
+#define XPROPSET CSS::beans::XPropertySet
+#define REF(c) CSS::uno::Reference< c >
+#define constREFXPS const REF(XPROPSET)
+#define SEQ(c) CSS::uno::Sequence< c >
+#define SEQSEQ(c) CSS::uno::Sequence< CSS::uno::Sequence< c > >
+#define SEQofLocName SEQ( CSS::sheet::LocalizedName )
+#define ANY CSS::uno::Any
+#define SEQ_ANY SEQ(ANY)
+#define STRING ::rtl::OUString
+#define STRFROMASCII(s) STRING::createFromAscii( s )
+#define STRFROMANSI(s) STRING( s, strlen( s ), RTL_TEXTENCODING_MS_1252 )
+#define THROWDEF_RTE throw(CSS::uno::RuntimeException)
+#define THROW_RTE throw CSS::uno::RuntimeException()
+#define THROWDEF_RTE_IAE throw(CSS::uno::RuntimeException,CSS::lang::IllegalArgumentException)
+#define THROW_IAE throw CSS::lang::IllegalArgumentException()
#define THROWDEF_RTE_IAE_NCE throw(CSS::uno::RuntimeException,CSS::lang::IllegalArgumentException,CSS::sheet::NoConvergenceException)
#define THROW_NCE throw CSS::sheet::NoConvergenceException()
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index d47c02a4e961..bde1cdb8c44d 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,9 +197,9 @@ void DaysToDate( sal_Int32 nDays, sal_uInt16& rDay, sal_uInt16& rMonth, sal_uInt
if( nDays < 0 )
throw lang::IllegalArgumentException();
- sal_Int32 nTempDays;
- sal_Int32 i = 0;
- sal_Bool bCalc;
+ sal_Int32 nTempDays;
+ sal_Int32 i = 0;
+ sal_Bool bCalc;
do
{
@@ -252,8 +252,8 @@ sal_Int32 GetNullDate( constREFXPS& xOpt ) THROWDEF_RTE
{
try
{
- ANY aAny = xOpt->getPropertyValue( STRFROMASCII( "NullDate" ) );
- util::Date aDate;
+ ANY aAny = xOpt->getPropertyValue( STRFROMASCII( "NullDate" ) );
+ util::Date aDate;
if( aAny >>= aDate )
return DateToDays( aDate.Day, aDate.Month, aDate.Year );
}
@@ -281,7 +281,7 @@ sal_Int32 GetDiffDate360(
{
if( bUSAMethod && nDay1 != 30 )
{
- //aDate2 += 1; -> 1.xx.yyyy
+ //aDate2 += 1; -> 1.xx.yyyy
nDay2 = 1;
if( nMonth2 == 12 )
{
@@ -315,14 +315,14 @@ sal_Int32 GetDiffDate360( sal_Int32 nNullDate, sal_Int32 nDate1, sal_Int32 nDate
sal_Int32 GetDaysInYears( sal_uInt16 nYear1, sal_uInt16 nYear2 )
{
- sal_uInt16 nLeaps = 0;
+ sal_uInt16 nLeaps = 0;
for( sal_uInt16 n = nYear1 ; n <= nYear2 ; n++ )
{
if( IsLeapYear( n ) )
nLeaps++;
}
- sal_uInt32 nSum = 1;
+ sal_uInt32 nSum = 1;
nSum += nYear2;
nSum -= nYear1;
nSum *= 365;
@@ -337,35 +337,35 @@ void GetDiffParam( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate
{
if( nStartDate > nEndDate )
{
- sal_Int32 n = nEndDate;
+ sal_Int32 n = nEndDate;
nEndDate = nStartDate;
nStartDate = n;
}
- sal_Int32 nDate1 = nStartDate + nNullDate;
- sal_Int32 nDate2 = nEndDate + nNullDate;
+ sal_Int32 nDate1 = nStartDate + nNullDate;
+ sal_Int32 nDate2 = nEndDate + nNullDate;
- sal_uInt16 nDay1, nDay2;
- sal_uInt16 nMonth1, nMonth2;
- sal_uInt16 nYear1, nYear2;
+ sal_uInt16 nDay1, nDay2;
+ sal_uInt16 nMonth1, nMonth2;
+ sal_uInt16 nYear1, nYear2;
DaysToDate( nDate1, nDay1, nMonth1, nYear1 );
DaysToDate( nDate2, nDay2, nMonth2, nYear2 );
- sal_uInt16 nYears;
+ sal_uInt16 nYears;
- sal_Int32 nDayDiff, nDaysInYear;
+ sal_Int32 nDayDiff, nDaysInYear;
switch( nMode )
{
- case 0: // 0=USA (NASD) 30/360
- case 4: // 4=Europe 30/360
+ case 0: // 0=USA (NASD) 30/360
+ case 4: // 4=Europe 30/360
nDaysInYear = 360;
nYears = nYear2 - nYear1;
nDayDiff = GetDiffDate360( nDay1, nMonth1, nYear1, IsLeapYear( nYear1 ),
nDay2, nMonth2, nYear2, nMode == 0 ) - nYears * nDaysInYear;
break;
- case 1: // 1=exact/exact
+ case 1: // 1=exact/exact
nYears = nYear2 - nYear1;
nDaysInYear = IsLeapYear( nYear1 )? 366 : 365;
@@ -382,13 +382,13 @@ void GetDiffParam( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate
nDayDiff += nDaysInYear;
break;
- case 2: // 2=exact/360
+ case 2: // 2=exact/360
nDaysInYear = 360;
nYears = sal_uInt16( ( nDate2 - nDate1 ) / nDaysInYear );
nDayDiff = nDate2 - nDate1;
nDayDiff %= nDaysInYear;
break;
- case 3: //3=exact/365
+ case 3: //3=exact/365
nDaysInYear = 365;
nYears = sal_uInt16( ( nDate2 - nDate1 ) / nDaysInYear );
nDayDiff = nDate2 - nDate1;
@@ -407,23 +407,23 @@ void GetDiffParam( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate
sal_Int32 GetDiffDate( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode,
sal_Int32* pOptDaysIn1stYear ) THROWDEF_RTE_IAE
{
- sal_Bool bNeg = nStartDate > nEndDate;
+ sal_Bool bNeg = nStartDate > nEndDate;
if( bNeg )
{
- sal_Int32 n = nEndDate;
+ sal_Int32 n = nEndDate;
nEndDate = nStartDate;
nStartDate = n;
}
- sal_Int32 nRet;
+ sal_Int32 nRet;
switch( nMode )
{
- case 0: // 0=USA (NASD) 30/360
- case 4: // 4=Europe 30/360
+ case 0: // 0=USA (NASD) 30/360
+ case 4: // 4=Europe 30/360
{
- sal_uInt16 nD1, nM1, nY1, nD2, nM2, nY2;
+ sal_uInt16 nD1, nM1, nY1, nD2, nM2, nY2;
nStartDate += nNullDate;
nEndDate += nNullDate;
@@ -431,8 +431,8 @@ sal_Int32 GetDiffDate( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEnd
DaysToDate( nStartDate, nD1, nM1, nY1 );
DaysToDate( nEndDate, nD2, nM2, nY2 );
- sal_Bool bLeap = IsLeapYear( nY1 );
- sal_Int32 nDays, nMonths/*, nYears*/;
+ sal_Bool bLeap = IsLeapYear( nY1 );
+ sal_Int32 nDays, nMonths/*, nYears*/;
nMonths = nM2 - nM1;
nDays = nD2 - nD1;
@@ -447,10 +447,10 @@ sal_Int32 GetDiffDate( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEnd
*pOptDaysIn1stYear = 360;
}
break;
- case 1: // 1=exact/exact
+ case 1: // 1=exact/exact
if( pOptDaysIn1stYear )
{
- sal_uInt16 nD, nM, nY;
+ sal_uInt16 nD, nM, nY;
DaysToDate( nStartDate + nNullDate, nD, nM, nY );
@@ -458,12 +458,12 @@ sal_Int32 GetDiffDate( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEnd
}
nRet = nEndDate - nStartDate;
break;
- case 2: // 2=exact/360
+ case 2: // 2=exact/360
nRet = nEndDate - nStartDate;
if( pOptDaysIn1stYear )
*pOptDaysIn1stYear = 360;
break;
- case 3: //3=exact/365
+ case 3: //3=exact/365
nRet = nEndDate - nStartDate;
if( pOptDaysIn1stYear )
*pOptDaysIn1stYear = 365;
@@ -478,8 +478,8 @@ sal_Int32 GetDiffDate( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEnd
double GetYearDiff( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode ) THROWDEF_RTE_IAE
{
- sal_Int32 nDays1stYear;
- sal_Int32 nTotalDays = GetDiffDate( nNullDate, nStartDate, nEndDate, nMode, &nDays1stYear );
+ sal_Int32 nDays1stYear;
+ sal_Int32 nTotalDays = GetDiffDate( nNullDate, nStartDate, nEndDate, nMode, &nDays1stYear );
return double( nTotalDays ) / double( nDays1stYear );
}
@@ -489,18 +489,18 @@ sal_Int32 GetDaysInYear( sal_Int32 nNullDate, sal_Int32 nDate, sal_Int32 nMode )
{
switch( nMode )
{
- case 0: // 0=USA (NASD) 30/360
- case 2: // 2=exact/360
- case 4: // 4=Europe 30/360
+ case 0: // 0=USA (NASD) 30/360
+ case 2: // 2=exact/360
+ case 4: // 4=Europe 30/360
return 360;
- case 1: // 1=exact/exact
+ case 1: // 1=exact/exact
{
- sal_uInt16 nD, nM, nY;
+ sal_uInt16 nD, nM, nY;
nDate += nNullDate;
DaysToDate( nDate, nD, nM, nY );
return IsLeapYear( nY )? 366 : 365;
}
- case 3: //3=exact/365
+ case 3: //3=exact/365
return 365;
default:
THROW_IAE;
@@ -511,10 +511,10 @@ sal_Int32 GetDaysInYear( sal_Int32 nNullDate, sal_Int32 nDate, sal_Int32 nMode )
double GetYearFrac( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode ) THROWDEF_RTE_IAE
{
if( nStartDate == nEndDate )
- return 0.0; // nothing to do...
+ return 0.0; // nothing to do...
- sal_uInt16 nYears;
- sal_Int32 nDayDiff, nDaysInYear;
+ sal_uInt16 nYears;
+ sal_Int32 nDayDiff, nDaysInYear;
GetDiffParam( nNullDate, nStartDate, nEndDate, nMode, nYears, nDayDiff, nDaysInYear );
@@ -526,8 +526,8 @@ double Fak( sal_Int32 n )
{
if( n > 0 )
{
- double fRet = n;
- double f = n - 1;
+ double fRet = n;
+ double f = n - 1;
while( f >= 2.0 )
{
@@ -546,7 +546,7 @@ double Fak( sal_Int32 n )
double GetGcd( double f1, double f2 )
{
- double f = fmod( f1, f2 );
+ double f = fmod( f1, f2 );
while( f > 0.0 )
{
f1 = f2;
@@ -563,23 +563,23 @@ double ConvertToDec( const STRING& aStr, sal_uInt16 nBase, sal_uInt16 nCharLim )
if ( nBase < 2 || nBase > 36 )
THROW_IAE;
- sal_uInt32 nStrLen = aStr.getLength();
+ sal_uInt32 nStrLen = aStr.getLength();
if( nStrLen > nCharLim )
THROW_IAE;
else if( !nStrLen )
return 0.0;
- double fVal = 0.0;
+ double fVal = 0.0;
- register const sal_Unicode* p = aStr.getStr();
+ register const sal_Unicode* p = aStr.getStr();
- sal_uInt16 nFirstDig = 0;
- sal_Bool bFirstDig = sal_True;
- double fBase = nBase;
+ sal_uInt16 nFirstDig = 0;
+ sal_Bool bFirstDig = sal_True;
+ double fBase = nBase;
while ( *p )
{
- sal_uInt16 n;
+ sal_uInt16 n;
if( '0' <= *p && *p <= '9' )
n = *p - '0';
@@ -608,8 +608,8 @@ double ConvertToDec( const STRING& aStr, sal_uInt16 nBase, sal_uInt16 nCharLim )
}
if( nStrLen == nCharLim && !bFirstDig && (nFirstDig >= nBase / 2) )
- { // handling negativ values
- fVal = ( pow( double( nBase ), double( nCharLim ) ) - fVal ); // complement
+ { // handling negativ values
+ fVal = ( pow( double( nBase ), double( nCharLim ) ) - fVal ); // complement
fVal *= -1.0;
}
@@ -619,7 +619,7 @@ double ConvertToDec( const STRING& aStr, sal_uInt16 nBase, sal_uInt16 nCharLim )
static inline sal_Char GetMaxChar( sal_uInt16 nBase )
{
- const sal_Char* c = "--123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ const sal_Char* c = "--123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
return c[ nBase ];
}
@@ -635,11 +635,11 @@ STRING ConvertFromDec( double fNum, double fMin, double fMax, sal_uInt16 nBase,
THROW_IAE;
sal_Int64 nNum = static_cast< sal_Int64 >( fNum );
- sal_Bool bNeg = nNum < 0;
+ sal_Bool bNeg = nNum < 0;
if( bNeg )
nNum = sal_Int64( pow( double( nBase ), double( nMaxPlaces ) ) ) + nNum;
- STRING aRet( STRING::valueOf( nNum, nBase ).toAsciiUpperCase() );
+ STRING aRet( STRING::valueOf( nNum, nBase ).toAsciiUpperCase() );
if( bUsePlaces )
@@ -652,10 +652,10 @@ STRING ConvertFromDec( double fNum, double fMin, double fMax, sal_uInt16 nBase,
else if( ( bNeg && nLen < nMaxPlaces ) || ( !bNeg && nLen < nPlaces ) )
{
sal_Int32 nLeft = nPlaces - nLen;
- sal_Char* p = new sal_Char[ nLeft + 1 ];
+ sal_Char* p = new sal_Char[ nLeft + 1 ];
memset( p, bNeg? GetMaxChar( nBase ) : '0', nLeft );
p[ nLeft ] = 0x00;
- STRING aTmp( p, nLeft, RTL_TEXTENCODING_MS_1252 );
+ STRING aTmp( p, nLeft, RTL_TEXTENCODING_MS_1252 );
aTmp += aRet;
aRet = aTmp;
@@ -710,22 +710,22 @@ inline sal_uInt16 GetVal( sal_Unicode c )
sal_Bool ParseDouble( const sal_Unicode*& rp, double& rRet )
{
- double fInt = 0.0;
- double fFrac = 0.0;
- double fMult = 0.1; // multiplier to multiply digits with, when adding fractional ones
- sal_Int32 nExp = 0;
- sal_Int32 nMaxExp = 307;
- sal_uInt16 nDigCnt = 18; // max. number of digits to read in, rest doesn't matter
+ double fInt = 0.0;
+ double fFrac = 0.0;
+ double fMult = 0.1; // multiplier to multiply digits with, when adding fractional ones
+ sal_Int32 nExp = 0;
+ sal_Int32 nMaxExp = 307;
+ sal_uInt16 nDigCnt = 18; // max. number of digits to read in, rest doesn't matter
- enum State { S_End = 0, S_Sign, S_IntStart, S_Int, S_IgnoreIntDigs, S_Frac, S_IgnoreFracDigs, S_ExpSign, S_Exp };
+ enum State { S_End = 0, S_Sign, S_IntStart, S_Int, S_IgnoreIntDigs, S_Frac, S_IgnoreFracDigs, S_ExpSign, S_Exp };
- State eS = S_Sign;
+ State eS = S_Sign;
- sal_Bool bNegNum = sal_False;
- sal_Bool bNegExp = sal_False;
+ sal_Bool bNegNum = sal_False;
+ sal_Bool bNegExp = sal_False;
- const sal_Unicode* p = rp;
- sal_Unicode c;
+ const sal_Unicode* p = rp;
+ sal_Unicode c;
while( eS )
{
@@ -786,7 +786,7 @@ sal_Bool ParseDouble( const sal_Unicode*& rp, double& rRet )
break;
case S_IgnoreIntDigs:
if( IsNum( c ) )
- nExp++; // just multiply num with 10... ;-)
+ nExp++; // just multiply num with 10... ;-)
else if( IsComma( c ) )
eS = S_Frac;
else if( IsExpStart( c ) )
@@ -847,11 +847,11 @@ sal_Bool ParseDouble( const sal_Unicode*& rp, double& rRet )
p++;
}
- p--; // set pointer back to last
+ p--; // set pointer back to last
rp = p;
fInt += fFrac;
- sal_Int32 nLog10 = sal_Int32( log10( fInt ) );
+ sal_Int32 nLog10 = sal_Int32( log10( fInt ) );
if( bNegExp )
nExp = -nExp;
@@ -872,16 +872,16 @@ sal_Bool ParseDouble( const sal_Unicode*& rp, double& rRet )
STRING GetString( double f, sal_Bool bLeadingSign, sal_uInt16 nMaxDig )
{
- const int nBuff = 256;
- sal_Char aBuff[ nBuff + 1 ];
- const char* pFormStr = bLeadingSign? "%+.*g" : "%.*g";
+ const int nBuff = 256;
+ sal_Char aBuff[ nBuff + 1 ];
+ const char* pFormStr = bLeadingSign? "%+.*g" : "%.*g";
int nLen = snprintf( aBuff, nBuff, pFormStr, int( nMaxDig ), f );
// you never know which underlying implementation you get ...
aBuff[nBuff] = 0;
if ( nLen < 0 || nLen > nBuff )
nLen = strlen( aBuff );
- STRING aRet( aBuff, nLen, RTL_TEXTENCODING_MS_1252 );
+ STRING aRet( aBuff, nLen, RTL_TEXTENCODING_MS_1252 );
return aRet;
}
@@ -893,9 +893,9 @@ double GetAmordegrc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int
if( nBase == 2 )
THROW_IAE;
- sal_uInt32 nPer = sal_uInt32( fPer );
- double fUsePer = 1.0 / fRate;
- double fAmorCoeff;
+ sal_uInt32 nPer = sal_uInt32( fPer );
+ double fUsePer = 1.0 / fRate;
+ double fAmorCoeff;
if( fUsePer < 3.0 )
fAmorCoeff = 1.0;
@@ -907,9 +907,9 @@ double GetAmordegrc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int
fAmorCoeff = 2.5;
fRate *= fAmorCoeff;
- double fNRate = ::rtl::math::round( GetYearFrac( nNullDate, nDate, nFirstPer, nBase ) * fRate * fCost, 0 );
+ double fNRate = ::rtl::math::round( GetYearFrac( nNullDate, nDate, nFirstPer, nBase ) * fRate * fCost, 0 );
fCost -= fNRate;
- double fRest = fCost - fRestVal; // Anschaffungskosten - Restwert - Summe aller Abschreibungen
+ double fRest = fCost - fRestVal; // Anschaffungskosten - Restwert - Summe aller Abschreibungen
for( sal_uInt32 n = 0 ; n < nPer ; n++ )
{
@@ -941,11 +941,11 @@ double GetAmorlinc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int3
if( nBase == 2 )
THROW_IAE;
- sal_uInt32 nPer = sal_uInt32( fPer );
- double fOneRate = fCost * fRate;
- double fCostDelta = fCost - fRestVal;
- double f0Rate = GetYearFrac( nNullDate, nDate, nFirstPer, nBase ) * fRate * fCost;
- sal_uInt32 nNumOfFullPeriods = sal_uInt32( ( fCost - fRestVal - f0Rate) / fOneRate );
+ sal_uInt32 nPer = sal_uInt32( fPer );
+ double fOneRate = fCost * fRate;
+ double fCostDelta = fCost - fRestVal;
+ double f0Rate = GetYearFrac( nNullDate, nDate, nFirstPer, nBase ) * fRate * fCost;
+ sal_uInt32 nNumOfFullPeriods = sal_uInt32( ( fCost - fRestVal - f0Rate) / fOneRate );
if( nPer == 0 )
return f0Rate;
@@ -961,17 +961,17 @@ double GetAmorlinc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int3
double GetDuration( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fCoup,
double fYield, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE
{
- double fYearfrac = GetYearFrac( nNullDate, nSettle, nMat, nBase );
- double fNumOfCoups = GetCoupnum( nNullDate, nSettle, nMat, nFreq, nBase );
- double fDur = 0.0;
- const double f100 = 100.0;
- fCoup *= f100 / double( nFreq ); // fCoup is used as cash flow
+ double fYearfrac = GetYearFrac( nNullDate, nSettle, nMat, nBase );
+ double fNumOfCoups = GetCoupnum( nNullDate, nSettle, nMat, nFreq, nBase );
+ double fDur = 0.0;
+ const double f100 = 100.0;
+ fCoup *= f100 / double( nFreq ); // fCoup is used as cash flow
fYield /= nFreq;
fYield += 1.0;
double nDiff = fYearfrac * nFreq - fNumOfCoups;
- double t;
+ double t;
for( t = 1.0 ; t < fNumOfCoups ; t++ )
fDur += ( t + nDiff ) * ( fCoup ) / pow( fYield, t + nDiff );
@@ -994,11 +994,11 @@ double GetDuration( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, doub
double GetYieldmat( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue,
double fRate, double fPrice, sal_Int32 nBase ) THROWDEF_RTE_IAE
{
- double fIssMat = GetYearFrac( nNullDate, nIssue, nMat, nBase );
- double fIssSet = GetYearFrac( nNullDate, nIssue, nSettle, nBase );
- double fSetMat = GetYearFrac( nNullDate, nSettle, nMat, nBase );
+ double fIssMat = GetYearFrac( nNullDate, nIssue, nMat, nBase );
+ double fIssSet = GetYearFrac( nNullDate, nIssue, nSettle, nBase );
+ double fSetMat = GetYearFrac( nNullDate, nSettle, nMat, nBase );
- double y = 1.0 + fIssMat * fRate;
+ double y = 1.0 + fIssMat * fRate;
y /= fPrice / 100.0 + fIssSet * fRate;
y--;
y /= fSetMat;
@@ -1013,21 +1013,21 @@ double GetOddfprice( sal_Int32 /*nNullDate*/, sal_Int32 /*nSettle*/, sal_Int32 /
{
THROW_RTE; // #87380#
/*
- double fN = GetCoupnum( nNullDate, nSettle, nMat, nFreq, nBase ) - 1.0;
- double fNq = GetCoupnum( nNullDate, nSettle, nFirstCoup, nFreq, nBase ) - 1.0;
- double fDSC = GetCoupdaysnc( nNullDate, nSettle, nFirstCoup, nFreq, nBase );
- double fDSC_E = fDSC / GetCoupdays( nNullDate, nSettle, nMat, nFreq, nBase );
- double fNC = GetCoupnum( nNullDate, nIssue, nFirstCoup, nFreq, nBase );
- sal_uInt32 nNC = sal_uInt32( fNC );
- sal_uInt16 nMonthDelta = 12 / sal_uInt16( nFreq );
-
- sal_uInt32 i;
- double f1YieldFreq = 1.0 + fYield / double( nFreq );
- double f100RateFreq = 100.0 * fRate / double( nFreq );
-
- double* pDC = new double[ nNC + 1 ];
- double* pNL = new double[ nNC + 1 ];
- double* pA = new double[ nNC + 1 ];
+ double fN = GetCoupnum( nNullDate, nSettle, nMat, nFreq, nBase ) - 1.0;
+ double fNq = GetCoupnum( nNullDate, nSettle, nFirstCoup, nFreq, nBase ) - 1.0;
+ double fDSC = GetCoupdaysnc( nNullDate, nSettle, nFirstCoup, nFreq, nBase );
+ double fDSC_E = fDSC / GetCoupdays( nNullDate, nSettle, nMat, nFreq, nBase );
+ double fNC = GetCoupnum( nNullDate, nIssue, nFirstCoup, nFreq, nBase );
+ sal_uInt32 nNC = sal_uInt32( fNC );
+ sal_uInt16 nMonthDelta = 12 / sal_uInt16( nFreq );
+
+ sal_uInt32 i;
+ double f1YieldFreq = 1.0 + fYield / double( nFreq );
+ double f100RateFreq = 100.0 * fRate / double( nFreq );
+
+ double* pDC = new double[ nNC + 1 ];
+ double* pNL = new double[ nNC + 1 ];
+ double* pA = new double[ nNC + 1 ];
pDC[ 0 ] = pNL[ 0 ] = pA[ 0 ] = 1.0;
@@ -1051,19 +1051,19 @@ double GetOddfprice( sal_Int32 /*nNullDate*/, sal_Int32 /*nSettle*/, sal_Int32 /
}
}
- double fT1 = fRedemp / pow( f1YieldFreq, fN + fNq + fDSC_E );
+ double fT1 = fRedemp / pow( f1YieldFreq, fN + fNq + fDSC_E );
- double fT2 = 0.0;
+ double fT2 = 0.0;
for( i = 1 ; i <= nNC ; i++ )
fT2 += pDC[ i ] / pNL[ i ];
fT2 *= f100RateFreq / pow( f1YieldFreq, fNq + fDSC_E );
- double fT3 = 0.0;
+ double fT3 = 0.0;
for( double k = 2.0 ; k <= fN ; k++ )
fT3 += 1.0 / pow( f1YieldFreq, k - fNq + fDSC_E );
fT3 *= f100RateFreq;
- double fT4 = 0.0;
+ double fT4 = 0.0;
for( i = 1 ; i <= nNC ; i++ )
fT4 += pA[ i ] / pNL[ i ];
fT4 *= f100RateFreq;
@@ -1083,13 +1083,13 @@ double GetOddfprice( sal_Int32 /*nNullDate*/, sal_Int32 /*nSettle*/, sal_Int32 /
double getYield_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fPrice,
double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE
{
- double fRate = fCoup;
- double fPriceN = 0.0;
- double fYield1 = 0.0;
- double fYield2 = 1.0;
- double fPrice1 = getPrice_( nNullDate, nSettle, nMat, fRate, fYield1, fRedemp, nFreq, nBase );
- double fPrice2 = getPrice_( nNullDate, nSettle, nMat, fRate, fYield2, fRedemp, nFreq, nBase );
- double fYieldN = ( fYield2 - fYield1 ) * 0.5;
+ double fRate = fCoup;
+ double fPriceN = 0.0;
+ double fYield1 = 0.0;
+ double fYield2 = 1.0;
+ double fPrice1 = getPrice_( nNullDate, nSettle, nMat, fRate, fYield1, fRedemp, nFreq, nBase );
+ double fPrice2 = getPrice_( nNullDate, nSettle, nMat, fRate, fYield2, fRedemp, nFreq, nBase );
+ double fYieldN = ( fYield2 - fYield1 ) * 0.5;
for( sal_uInt32 nIter = 0 ; nIter < 100 && fPriceN != fPrice ; nIter++ )
{
@@ -1126,7 +1126,7 @@ double getYield_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double
}
if( fabs( fPrice - fPriceN ) > fPrice / 100.0 )
- THROW_IAE; // result not precise enough
+ THROW_IAE; // result not precise enough
return fYieldN;
}
@@ -1135,18 +1135,18 @@ double getYield_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double
double getPrice_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fRate, double fYield,
double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE
{
- double fFreq = nFreq;
+ double fFreq = nFreq;
- double fE = GetCoupdays( nNullDate, nSettle, nMat, nFreq, nBase );
- double fDSC_E = GetCoupdaysnc( nNullDate, nSettle, nMat, nFreq, nBase ) / fE;
- double fN = GetCoupnum( nNullDate, nSettle, nMat, nFreq, nBase );
+ double fE = GetCoupdays( nNullDate, nSettle, nMat, nFreq, nBase );
+ double fDSC_E = GetCoupdaysnc( nNullDate, nSettle, nMat, nFreq, nBase ) / fE;
+ double fN = GetCoupnum( nNullDate, nSettle, nMat, nFreq, nBase );
double fA = GetCoupdaybs( nNullDate, nSettle, nMat, nFreq, nBase );
- double fRet = fRedemp / ( pow( 1.0 + fYield / fFreq, fN - 1.0 + fDSC_E ) );
+ double fRet = fRedemp / ( pow( 1.0 + fYield / fFreq, fN - 1.0 + fDSC_E ) );
fRet -= 100.0 * fRate / fFreq * fA / fE;
- double fT1 = 100.0 * fRate / fFreq;
- double fT2 = 1.0 + fYield / fFreq;
+ double fT1 = 100.0 * fRate / fFreq;
+ double fT2 = 1.0 + fYield / fFreq;
for( double fK = 0.0 ; fK < fN ; fK++ )
fRet += fT1 / pow( fT2, fK + fDSC_E );
@@ -1164,12 +1164,12 @@ double GetOddfyield( sal_Int32 /*nNullDate*/, sal_Int32 /*nSettle*/, sal_Int32 /
//GetOddfprice( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue,
//sal_Int32 nFirstCoup, double fRate, double fYield, double fRedemp, sal_Int32 nFreq,
//sal_Int32 nBase )
- double fPriceN = 0.0;
- double fYield1 = 0.0;
- double fYield2 = 1.0;
- double fPrice1 = GetOddfprice( nNullDate, nSettle, nMat, nIssue, nFirstCoup, fRate, fYield1, fRedemp, nFreq, nBase );
- double fPrice2 = GetOddfprice( nNullDate, nSettle, nMat, nIssue, nFirstCoup, fRate, fYield2, fRedemp, nFreq, nBase );
- double fYieldN = ( fYield2 - fYield1 ) * 0.5;
+ double fPriceN = 0.0;
+ double fYield1 = 0.0;
+ double fYield2 = 1.0;
+ double fPrice1 = GetOddfprice( nNullDate, nSettle, nMat, nIssue, nFirstCoup, fRate, fYield1, fRedemp, nFreq, nBase );
+ double fPrice2 = GetOddfprice( nNullDate, nSettle, nMat, nIssue, nFirstCoup, fRate, fYield2, fRedemp, nFreq, nBase );
+ double fYieldN = ( fYield2 - fYield1 ) * 0.5;
for( sal_uInt32 nIter = 0 ; nIter < 100 && fPriceN != fPrice ; nIter++ )
{
@@ -1206,7 +1206,7 @@ double GetOddfyield( sal_Int32 /*nNullDate*/, sal_Int32 /*nSettle*/, sal_Int32 /
}
if( fabs( fPrice - fPriceN ) > fPrice / 100.0 )
- THROW_IAE; // result not precise enough
+ THROW_IAE; // result not precise enough
return fYieldN;
*/
@@ -1216,12 +1216,12 @@ double GetOddfyield( sal_Int32 /*nNullDate*/, sal_Int32 /*nSettle*/, sal_Int32 /
double GetOddlprice( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastCoup,
double fRate, double fYield, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE
{
- double fFreq = double( nFreq );
- double fDCi = GetYearFrac( nNullDate, nLastCoup, nMat, nBase ) * fFreq;
- double fDSCi = GetYearFrac( nNullDate, nSettle, nMat, nBase ) * fFreq;
- double fAi = GetYearFrac( nNullDate, nLastCoup, nSettle, nBase ) * fFreq;
+ double fFreq = double( nFreq );
+ double fDCi = GetYearFrac( nNullDate, nLastCoup, nMat, nBase ) * fFreq;
+ double fDSCi = GetYearFrac( nNullDate, nSettle, nMat, nBase ) * fFreq;
+ double fAi = GetYearFrac( nNullDate, nLastCoup, nSettle, nBase ) * fFreq;
- double p = fRedemp + fDCi * 100.0 * fRate / fFreq;
+ double p = fRedemp + fDCi * 100.0 * fRate / fFreq;
p /= fDSCi * fYield / fFreq + 1.0;
p -= fAi * 100.0 * fRate / fFreq;
@@ -1232,12 +1232,12 @@ double GetOddlprice( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal
double GetOddlyield( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastCoup,
double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE
{
- double fFreq = double( nFreq );
- double fDCi = GetYearFrac( nNullDate, nLastCoup, nMat, nBase ) * fFreq;
- double fDSCi = GetYearFrac( nNullDate, nSettle, nMat, nBase ) * fFreq;
- double fAi = GetYearFrac( nNullDate, nLastCoup, nSettle, nBase ) * fFreq;
+ double fFreq = double( nFreq );
+ double fDCi = GetYearFrac( nNullDate, nLastCoup, nMat, nBase ) * fFreq;
+ double fDSCi = GetYearFrac( nNullDate, nSettle, nMat, nBase ) * fFreq;
+ double fAi = GetYearFrac( nNullDate, nLastCoup, nSettle, nBase ) * fFreq;
- double y = fRedemp + fDCi * 100.0 * fRate / fFreq;
+ double y = fRedemp + fDCi * 100.0 * fRate / fFreq;
y /= fPrice + fAi * 100.0 * fRate / fFreq;
y--;
y *= fFreq / fDSCi;
@@ -1248,12 +1248,12 @@ double GetOddlyield( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal
double GetRmz( double fZins, double fZzr, double fBw, double fZw, sal_Int32 nF )
{
- double fRmz;
+ double fRmz;
if( fZins == 0.0 )
fRmz = ( fBw + fZw ) / fZzr;
else
{
- double fTerm = pow( 1.0 + fZins, fZzr );
+ double fTerm = pow( 1.0 + fZins, fZzr );
if( nF > 0 )
fRmz = ( fZw * fZins / ( fTerm - 1.0 ) + fBw * fZins / ( 1.0 - 1.0 / fTerm ) ) / ( 1.0 + fZins );
else
@@ -1266,12 +1266,12 @@ double GetRmz( double fZins, double fZzr, double fBw, double fZw, sal_Int32 nF )
double GetZw( double fZins, double fZzr, double fRmz, double fBw, sal_Int32 nF )
{
- double fZw;
+ double fZw;
if( fZins == 0.0 )
fZw = fBw + fRmz * fZzr;
else
{
- double fTerm = pow( 1.0 + fZins, fZzr );
+ double fTerm = pow( 1.0 + fZins, fZzr );
if( nF > 0 )
fZw = fBw * fTerm + fRmz * ( 1.0 + fZins ) * ( fTerm - 1.0 ) / fZins;
else
@@ -1284,12 +1284,12 @@ double GetZw( double fZins, double fZzr, double fRmz, double fBw, sal_Int32 nF )
/*double TBillYield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice ) THROWDEF_RTE_IAE
{
- sal_Int32 nDiff = GetDiffDate360( xOpt, nSettle, nMat, sal_True );
+ sal_Int32 nDiff = GetDiffDate360( xOpt, nSettle, nMat, sal_True );
if( fPrice <= 0.0 || nSettle >= nMat || nDiff > 360 )
THROW_IAE;
- double fRet = 100.0;
+ double fRet = 100.0;
fRet /= fPrice;
fRet--;
fRet *= double( nDiff );
@@ -1436,7 +1436,7 @@ void MyList::_Grow( void )
{
nSize += nIncrSize;
- void** pNewData = new void*[ nSize ];
+ void** pNewData = new void*[ nSize ];
memcpy( pNewData, pData, nNew * sizeof( void* ) );
delete[] pData;
@@ -1466,7 +1466,7 @@ void MyList::Insert( void* p, sal_uInt32 n )
{
Grow();
- void** pIns = pData + n;
+ void** pIns = pData + n;
memmove( pIns + 1, pIns, ( nNew - n ) * sizeof( void* ) );
*pIns = p;
@@ -1488,7 +1488,7 @@ StringList::~StringList()
class AnalysisRscStrArrLoader : public Resource
{
private:
- ResStringArray aStrArray;
+ ResStringArray aStrArray;
public:
AnalysisRscStrArrLoader( sal_uInt16 nRsc, sal_uInt16 nArrayId, ResMgr& rResMgr ) :
Resource( AnalysisResId( nRsc, rResMgr ) ),
@@ -1497,7 +1497,7 @@ public:
FreeResource();
}
- const ResStringArray& GetStringArray() const { return aStrArray; }
+ const ResStringArray& GetStringArray() const { return aStrArray; }
};
@@ -1513,12 +1513,12 @@ FuncData::FuncData( const FuncDataBase& r, ResMgr& rResMgr ) :
nCompID( r.nCompListID ),
eCat( r.eCat )
{
- AnalysisRscStrArrLoader aArrLoader( RID_ANALYSIS_DEFFUNCTION_NAMES, nCompID, rResMgr );
-// ResStringArray aDefFuncNameArray( AnalysisResId( nCompID, rResMgr ) );
- const ResStringArray& rArr = aArrLoader.GetStringArray();
+ AnalysisRscStrArrLoader aArrLoader( RID_ANALYSIS_DEFFUNCTION_NAMES, nCompID, rResMgr );
+// ResStringArray aDefFuncNameArray( AnalysisResId( nCompID, rResMgr ) );
+ const ResStringArray& rArr = aArrLoader.GetStringArray();
- sal_uInt16 nCount = sal::static_int_cast<sal_uInt16>( rArr.Count() );
- sal_uInt16 n;
+ sal_uInt16 nCount = sal::static_int_cast<sal_uInt16>( rArr.Count() );
+ sal_uInt16 n;
for( n = 0 ; n < nCount ; n++ )
aCompList.Append( rArr.GetString( n ) );
@@ -1546,7 +1546,7 @@ sal_uInt16 FuncData::GetStrIndex( sal_uInt16 nParamNum ) const
FuncDataList::FuncDataList( ResMgr& rResMgr )
{
- const sal_uInt32 nNum = sizeof( pFuncDatas ) / sizeof( FuncDataBase );
+ const sal_uInt32 nNum = sizeof( pFuncDatas ) / sizeof( FuncDataBase );
for( sal_uInt16 n = 0 ; n < nNum ; n++ )
Append( new FuncData( pFuncDatas[ n ], rResMgr ) );
@@ -1567,10 +1567,10 @@ const FuncData* FuncDataList::Get( const OUString& aProgrammaticName ) const
( ( FuncDataList* ) this )->aLastName = aProgrammaticName;
- sal_uInt32 nE = Count();
+ sal_uInt32 nE = Count();
for( sal_uInt32 n = 0 ; n < nE ; n++ )
{
- const FuncData* p = Get( n );
+ const FuncData* p = Get( n );
if( p->Is( aProgrammaticName ) )
{
( ( FuncDataList* ) this )->nLast = n;
@@ -1641,7 +1641,7 @@ void SortedIndividualInt32List::Insert(
sal_Bool SortedIndividualInt32List::Find( sal_Int32 nVal ) const
{
- sal_uInt32 nE = Count();
+ sal_uInt32 nE = Count();
if( !nE || nVal < Get( 0 ) || nVal > Get( nE - 1 ) )
return sal_False;
@@ -1650,7 +1650,7 @@ sal_Bool SortedIndividualInt32List::Find( sal_Int32 nVal ) const
for( sal_uInt32 n = 0 ; n < nE ; n++ )
{
- sal_Int32 nRef = Get( n );
+ sal_Int32 nRef = Get( n );
if( nRef == nVal )
return sal_True;
@@ -1842,7 +1842,7 @@ sal_Bool Complex::ParseString( const STRING& rStr, Complex& rCompl )
{
rCompl.c = '\0'; // do not force a symbol, if only real part present
- const sal_Unicode* pStr = ( const sal_Unicode * ) rStr;
+ const sal_Unicode* pStr = ( const sal_Unicode * ) rStr;
if( IsImagUnit( *pStr ) && rStr.getLength() == 1)
{
@@ -1852,17 +1852,17 @@ sal_Bool Complex::ParseString( const STRING& rStr, Complex& rCompl )
return sal_True;
}
- double f;
+ double f;
if( !ParseDouble( pStr, f ) )
return sal_False;
switch( *pStr )
{
- case '-': // imag part follows
+ case '-': // imag part follows
case '+':
{
- double r = f;
+ double r = f;
if( IsImagUnit( pStr[ 1 ] ) )
{
rCompl.c = pStr[ 1 ];
@@ -1897,7 +1897,7 @@ sal_Bool Complex::ParseString( const STRING& rStr, Complex& rCompl )
return sal_True;
}
break;
- case 0: // only real-part
+ case 0: // only real-part
rCompl.r = f;
rCompl.i = 0.0;
return sal_True;
@@ -1946,7 +1946,7 @@ double Complex::Arg( void ) const THROWDEF_RTE_IAE
if( r == 0.0 && i == 0.0 )
THROW_IAE;
- double phi = acos( r / Abs() );
+ double phi = acos( r / Abs() );
if( i < 0.0 )
phi = -phi;
@@ -1968,7 +1968,7 @@ void Complex::Power( double fPower ) THROWDEF_RTE_IAE
THROW_IAE;
}
- double p, phi;
+ double p, phi;
p = Abs();
@@ -1986,9 +1986,9 @@ void Complex::Power( double fPower ) THROWDEF_RTE_IAE
void Complex::Sqrt( void )
{
- static const double fMultConst = 0.7071067811865475; // ...2440084436210485 = 1/sqrt(2)
- double p = Abs();
- double i_ = sqrt( p - r ) * fMultConst;
+ static const double fMultConst = 0.7071067811865475; // ...2440084436210485 = 1/sqrt(2)
+ double p = Abs();
+ double i_ = sqrt( p - r ) * fMultConst;
r = sqrt( p + r ) * fMultConst;
i = ( i < 0.0 )? -i_ : i_;
@@ -2008,7 +2008,7 @@ void Complex::Sin( void ) THROWDEF_RTE_IAE
if( i )
{
- double r_;
+ double r_;
r_ = sin( r ) * cosh( i );
i = cos( r ) * sinh( i );
@@ -2026,7 +2026,7 @@ void Complex::Cos( void ) THROWDEF_RTE_IAE
if( i )
{
- double r_;
+ double r_;
r_ = cos( r ) * cosh( i );
i = -( sin( r ) * sinh( i ) );
@@ -2042,12 +2042,12 @@ void Complex::Div( const Complex& z ) THROWDEF_RTE_IAE
if( z.r == 0 && z.i == 0 )
THROW_IAE;
- double a1 = r;
- double a2 = z.r;
- double b1 = i;
- double b2 = z.i;
+ double a1 = r;
+ double a2 = z.r;
+ double b1 = i;
+ double b2 = z.i;
- double f = 1.0 / ( a2 * a2 + b2 * b2 );
+ double f = 1.0 / ( a2 * a2 + b2 * b2 );
r = ( a1 * a2 + b1 * b2 ) * f;
i = ( a2 * b1 - a1 * b2 ) * f;
@@ -2058,7 +2058,7 @@ void Complex::Div( const Complex& z ) THROWDEF_RTE_IAE
void Complex::Exp( void )
{
- double fE = exp( r );
+ double fE = exp( r );
r = fE * cos( i );
i = fE * sin( i );
}
@@ -2069,8 +2069,8 @@ void Complex::Ln( void ) THROWDEF_RTE_IAE
if( r == 0.0 && i == 0.0 )
THROW_IAE;
- double fAbs = Abs();
- sal_Bool bNegi = i < 0.0;
+ double fAbs = Abs();
+ sal_Bool bNegi = i < 0.0;
i = acos( r / fAbs );
@@ -2084,14 +2084,14 @@ void Complex::Ln( void ) THROWDEF_RTE_IAE
void Complex::Log10( void ) THROWDEF_RTE_IAE
{
Ln();
- Mult( 0.434294481903251828 ); // * log10( e )
+ Mult( 0.434294481903251828 ); // * log10( e )
}
void Complex::Log2( void ) THROWDEF_RTE_IAE
{
Ln();
- Mult( 1.442695040888963407 ); // * log2( e )
+ Mult( 1.442695040888963407 ); // * log2( e )
}
@@ -2106,20 +2106,20 @@ ComplexList::~ComplexList()
void ComplexList::Append( const SEQSEQ( STRING )& r, ComplListAppendHandl eAH ) THROWDEF_RTE_IAE
{
- sal_Int32 n1, n2;
- sal_Int32 nE1 = r.getLength();
- sal_Int32 nE2;
- sal_Bool bEmpty0 = eAH == AH_EmpyAs0;
- sal_Bool bErrOnEmpty = eAH == AH_EmptyAsErr;
+ sal_Int32 n1, n2;
+ sal_Int32 nE1 = r.getLength();
+ sal_Int32 nE2;
+ sal_Bool bEmpty0 = eAH == AH_EmpyAs0;
+ sal_Bool bErrOnEmpty = eAH == AH_EmptyAsErr;
for( n1 = 0 ; n1 < nE1 ; n1++ )
{
- const SEQ( STRING )& rList = r[ n1 ];
+ const SEQ( STRING )& rList = r[ n1 ];
nE2 = rList.getLength();
for( n2 = 0 ; n2 < nE2 ; n2++ )
{
- const STRING& rStr = rList[ n2 ];
+ const STRING& rStr = rList[ n2 ];
if( rStr.getLength() )
Append( new Complex( rStr ) );
@@ -2134,19 +2134,19 @@ void ComplexList::Append( const SEQSEQ( STRING )& r, ComplListAppendHandl eAH )
void ComplexList::Append( const SEQ( ANY )& aMultPars, ComplListAppendHandl eAH ) THROWDEF_RTE_IAE
{
- sal_Int32 nEle = aMultPars.getLength();
- sal_Bool bEmpty0 = eAH == AH_EmpyAs0;
- sal_Bool bErrOnEmpty = eAH == AH_EmptyAsErr;
+ sal_Int32 nEle = aMultPars.getLength();
+ sal_Bool bEmpty0 = eAH == AH_EmpyAs0;
+ sal_Bool bErrOnEmpty = eAH == AH_EmptyAsErr;
for( sal_Int32 i = 0 ; i < nEle ; i++ )
{
- const ANY& r = aMultPars[ i ];
+ const ANY& r = aMultPars[ i ];
switch( r.getValueTypeClass() )
{
- case uno::TypeClass_VOID: break;
+ case uno::TypeClass_VOID: break;
case uno::TypeClass_STRING:
{
- const STRING* pStr = ( const STRING* ) r.getValue();
+ const STRING* pStr = ( const STRING* ) r.getValue();
if( pStr->getLength() )
Append( new Complex( *( STRING* ) r.getValue() ) );
@@ -2161,11 +2161,11 @@ void ComplexList::Append( const SEQ( ANY )& aMultPars, ComplListAppendHandl eAH
break;
case uno::TypeClass_SEQUENCE:
{
- SEQSEQ( ANY ) aValArr;
+ SEQSEQ( ANY ) aValArr;
if( r >>= aValArr )
{
- sal_Int32 nE = aValArr.getLength();
- const SEQ( ANY )* pArr = aValArr.getConstArray();
+ sal_Int32 nE = aValArr.getLength();
+ const SEQ( ANY )* pArr = aValArr.getConstArray();
for( sal_Int32 n = 0 ; n < nE ; n++ )
Append( pArr[ n ], eAH );
}
@@ -2209,7 +2209,7 @@ sal_Int16 ConvertData::GetMatchingLevel( const STRING& rRef ) const
return 0;
else
{
- const sal_Unicode* p = aStr.getStr();
+ const sal_Unicode* p = aStr.getStr();
nLen = aStr.getLength();
bool bPref = IsPrefixSupport();
@@ -2217,18 +2217,18 @@ sal_Int16 ConvertData::GetMatchingLevel( const STRING& rRef ) const
if (bOneChar || (bPref && nLen > 2 && (aName == p + 2) &&
*p == 'd' && *(p+1) == 'a'))
{
- sal_Int16 n;
+ sal_Int16 n;
switch( *p )
{
- case 'y': n = -24; break; // yocto
- case 'z': n = -21; break; // zepto
- case 'a': n = -18; break;
- case 'f': n = -15; break;
- case 'p': n = -12; break;
- case 'n': n = -9; break;
- case 'u': n = -6; break;
- case 'm': n = -3; break;
- case 'c': n = -2; break;
+ case 'y': n = -24; break; // yocto
+ case 'z': n = -21; break; // zepto
+ case 'a': n = -18; break;
+ case 'f': n = -15; break;
+ case 'p': n = -12; break;
+ case 'n': n = -9; break;
+ case 'u': n = -6; break;
+ case 'm': n = -3; break;
+ case 'c': n = -2; break;
case 'd':
{
if ( bOneChar )
@@ -2237,16 +2237,16 @@ sal_Int16 ConvertData::GetMatchingLevel( const STRING& rRef ) const
n = 1; // deca
}
break;
- case 'e': n = 1; break;
- case 'h': n = 2; break;
- case 'k': n = 3; break;
- case 'M': n = 6; break;
- case 'G': n = 9; break;
- case 'T': n = 12; break;
- case 'P': n = 15; break;
- case 'E': n = 18; break;
- case 'Z': n = 21; break; // zetta
- case 'Y': n = 24; break; // yotta
+ case 'e': n = 1; break;
+ case 'h': n = 2; break;
+ case 'k': n = 3; break;
+ case 'M': n = 6; break;
+ case 'G': n = 9; break;
+ case 'T': n = 12; break;
+ case 'P': n = 15; break;
+ case 'E': n = 18; break;
+ case 'Z': n = 21; break; // zetta
+ case 'Y': n = 24; break; // yotta
default:
n = INV_MATCHLEV;
}
@@ -2317,7 +2317,7 @@ double ConvertData::Convert(
}
else if ( bBinFromLev )
f *= ( r.fConst / fConst ) * ( pow( 2.0, nLevFrom ) / pow( 10.0, nLevTo ) );
- else
+ else
f *= ( r.fConst / fConst ) * ( pow( 10.0, nLevFrom ) / pow( 2.0, nLevTo ) );
return f;
}
@@ -2356,7 +2356,7 @@ double ConvertDataLinear::Convert(
if( Class() != r.Class() )
THROW_IAE;
-// return ::rtl::math::round( r.ConvertFromBase( ConvertToBase( f, nLevFrom ), nLevTo ), 13 );
+// return ::rtl::math::round( r.ConvertFromBase( ConvertToBase( f, nLevFrom ), nLevTo ), 13 );
return r.ConvertFromBase( ConvertToBase( f, nLevFrom ), nLevTo );
}
@@ -2389,10 +2389,10 @@ double ConvertDataLinear::ConvertFromBase( double f, sal_Int16 n ) const
ConvertDataList::ConvertDataList( void )
{
-#define NEWD(str,unit,cl) Append(new ConvertData(str,unit,cl))
-#define NEWDP(str,unit,cl) Append(new ConvertData(str,unit,cl,sal_True))
-#define NEWL(str,unit,offs,cl) Append(new ConvertDataLinear(str,unit,offs,cl))
-#define NEWLP(str,unit,offs,cl) Append(new ConvertDataLinear(str,unit,offs,cl,sal_True))
+#define NEWD(str,unit,cl) Append(new ConvertData(str,unit,cl))
+#define NEWDP(str,unit,cl) Append(new ConvertData(str,unit,cl,sal_True))
+#define NEWL(str,unit,offs,cl) Append(new ConvertDataLinear(str,unit,offs,cl))
+#define NEWLP(str,unit,offs,cl) Append(new ConvertDataLinear(str,unit,offs,cl,sal_True))
// *** are extra and not standard Excel Analysis Addin!
@@ -2414,7 +2414,7 @@ ConvertDataList::ConvertDataList( void )
NEWD( "uk_cwt", 1.9684130552221213E-05, CDC_Mass ); // Imperial hundredweight
NEWD( "lcwt", 1.9684130552221213E-05, CDC_Mass ); // Imperial hundredweight also
NEWD( "hweight", 1.9684130552221213E-05, CDC_Mass ); // Imperial hundredweight also
- NEWD( "uk_ton", 9.8420652761106063E-07, CDC_Mass ); // Imperial ton
+ NEWD( "uk_ton", 9.8420652761106063E-07, CDC_Mass ); // Imperial ton
NEWD( "LTON", 9.8420652761106063E-07, CDC_Mass ); // Imperial ton also
// LENGTH: 1 Meter is...
@@ -2563,7 +2563,7 @@ ConvertDataList::ConvertDataList( void )
NEWD( "ludicrous speed", 2.0494886343432328E-14, CDC_Speed ); // ***
NEWD( "laecherliche Geschwindigkeit", 4.0156958471424288E-06, CDC_Speed); // ***
NEWD( "ridiculous speed", 4.0156958471424288E-06, CDC_Speed); // ***
-
+
// INFORMATION: 1 Bit is...
NEWDP( "bit", 1.00E00, CDC_Information); // *** Bit
NEWDP( "byte", 1.25E-01, CDC_Information); // *** Byte
@@ -2583,28 +2583,28 @@ double ConvertDataList::Convert( double fVal, const STRING& rFrom, const STRING&
// if( rFrom == rTo )
// return fVal;
- ConvertData* pFrom = NULL;
- ConvertData* pTo = NULL;
- sal_Bool bSearchFrom = sal_True;
- sal_Bool bSearchTo = sal_True;
- sal_Int16 nLevelFrom = 0;
- sal_Int16 nLevelTo = 0;
+ ConvertData* pFrom = NULL;
+ ConvertData* pTo = NULL;
+ sal_Bool bSearchFrom = sal_True;
+ sal_Bool bSearchTo = sal_True;
+ sal_Int16 nLevelFrom = 0;
+ sal_Int16 nLevelTo = 0;
- ConvertData* p = First();
+ ConvertData* p = First();
while( p && ( bSearchFrom || bSearchTo ) )
{
if( bSearchFrom )
{
- sal_Int16 n = p->GetMatchingLevel( rFrom );
+ sal_Int16 n = p->GetMatchingLevel( rFrom );
if( n != INV_MATCHLEV )
{
if( n )
- { // only first match for partial equality rulz a little bit more
+ { // only first match for partial equality rulz a little bit more
pFrom = p;
nLevelFrom = n;
}
else
- { // ... but exact match rulz most
+ { // ... but exact match rulz most
pFrom = p;
bSearchFrom = sal_False;
nLevelFrom = n;
@@ -2614,16 +2614,16 @@ double ConvertDataList::Convert( double fVal, const STRING& rFrom, const STRING&
if( bSearchTo )
{
- sal_Int16 n = p->GetMatchingLevel( rTo );
+ sal_Int16 n = p->GetMatchingLevel( rTo );
if( n != INV_MATCHLEV )
{
if( n )
- { // only first match for partial equality rulz a little bit more
+ { // only first match for partial equality rulz a little bit more
pTo = p;
nLevelTo = n;
}
else
- { // ... but exact match rulz most
+ { // ... but exact match rulz most
pTo = p;
bSearchTo = sal_False;
nLevelTo = n;
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index d226a9a98be1..c904ce5693b8 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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,94 +50,94 @@ class SortedIndividualInt32List;
class ScaAnyConverter;
-#define PI 3.1415926535897932
-#define PI_2 (PI/2.0)
-//#define EULER 2.7182818284590452
-#define EOL ( ( const sal_Char* ) 1 )
-#define EOE ( ( const sal_Char* ) 2 )
+#define PI 3.1415926535897932
+#define PI_2 (PI/2.0)
+//#define EULER 2.7182818284590452
+#define EOL ( ( const sal_Char* ) 1 )
+#define EOE ( ( const sal_Char* ) 2 )
-//double _Test( sal_Int32 nMode, double f1, double f2, double f3 );
+//double _Test( sal_Int32 nMode, double f1, double f2, double f3 );
inline sal_Bool IsLeapYear( sal_uInt16 nYear );
-sal_uInt16 DaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear );
-sal_Int32 DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear );
-void DaysToDate( sal_Int32 nDays, sal_uInt16& rDay, sal_uInt16& rMonth, sal_uInt16& rYear ) throw( ::com::sun::star::lang::IllegalArgumentException );
+sal_uInt16 DaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear );
+sal_Int32 DateToDays( sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear );
+void DaysToDate( sal_Int32 nDays, sal_uInt16& rDay, sal_uInt16& rMonth, sal_uInt16& rYear ) throw( ::com::sun::star::lang::IllegalArgumentException );
sal_Int32 GetNullDate( const REF( CSS::beans::XPropertySet )& xOptions ) THROWDEF_RTE;
-sal_Int32 GetDiffDate360(
+sal_Int32 GetDiffDate360(
sal_uInt16 nDay1, sal_uInt16 nMonth1, sal_uInt16 nYear1, sal_Bool bLeapYear1,
sal_uInt16 nDay2, sal_uInt16 nMonth2, sal_uInt16 nYear2,
sal_Bool bUSAMethod );
-inline sal_Int32 GetDiffDate360( constREFXPS& xOpt, sal_Int32 nDate1, sal_Int32 nDate2, sal_Bool bUSAMethod );
-sal_Int32 GetDiffDate360( sal_Int32 nNullDate, sal_Int32 nDate1, sal_Int32 nDate2, sal_Bool bUSAMethod );
+inline sal_Int32 GetDiffDate360( constREFXPS& xOpt, sal_Int32 nDate1, sal_Int32 nDate2, sal_Bool bUSAMethod );
+sal_Int32 GetDiffDate360( sal_Int32 nNullDate, sal_Int32 nDate1, sal_Int32 nDate2, sal_Bool bUSAMethod );
-sal_Int32 GetDaysInYears( sal_uInt16 nYear1, sal_uInt16 nYear2 );
-inline sal_Int16 GetDayOfWeek( sal_Int32 nDate );
-void GetDiffParam( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode,
+sal_Int32 GetDaysInYears( sal_uInt16 nYear1, sal_uInt16 nYear2 );
+inline sal_Int16 GetDayOfWeek( sal_Int32 nDate );
+void GetDiffParam( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode,
sal_uInt16& rYears, sal_Int32& rDayDiffPart, sal_Int32& rDaysInYear ) THROWDEF_RTE_IAE;
// rYears = full num of years
// rDayDiffPart = num of days for last year
// rDaysInYear = num of days in first year
-sal_Int32 GetDiffDate( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode,
+sal_Int32 GetDiffDate( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode,
sal_Int32* pOptDaysIn1stYear = NULL ) THROWDEF_RTE_IAE;
-double GetYearDiff( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode )
+double GetYearDiff( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode )
THROWDEF_RTE_IAE;
-sal_Int32 GetDaysInYear( sal_Int32 nNullDate, sal_Int32 nDate, sal_Int32 nMode ) THROWDEF_RTE_IAE;
-double GetYearFrac( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode )
+sal_Int32 GetDaysInYear( sal_Int32 nNullDate, sal_Int32 nDate, sal_Int32 nMode ) THROWDEF_RTE_IAE;
+double GetYearFrac( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode )
THROWDEF_RTE_IAE;
-inline double GetYearFrac( constREFXPS& xOpt, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode )
+inline double GetYearFrac( constREFXPS& xOpt, sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode )
THROWDEF_RTE_IAE;
-inline void AlignDate( sal_uInt16& rDay, sal_uInt16 nMonth, sal_uInt16 nYear );
+inline void AlignDate( sal_uInt16& rDay, sal_uInt16 nMonth, sal_uInt16 nYear );
-double Fak( sal_Int32 n );
-double GetGcd( double f1, double f2 );
-double ConvertToDec( const STRING& rFromNum, sal_uInt16 nBaseFrom, sal_uInt16 nCharLim ) THROWDEF_RTE_IAE;
-STRING ConvertFromDec(
+double Fak( sal_Int32 n );
+double GetGcd( double f1, double f2 );
+double ConvertToDec( const STRING& rFromNum, sal_uInt16 nBaseFrom, sal_uInt16 nCharLim ) THROWDEF_RTE_IAE;
+STRING ConvertFromDec(
double fNum, double fMin, double fMax, sal_uInt16 nBase,
sal_Int32 nPlaces, sal_Int32 nMaxPlaces, sal_Bool bUsePlaces ) THROWDEF_RTE_IAE;
-double Erf( double fX );
-double Erfc( double fX );
-sal_Bool ParseDouble( const sal_Unicode*& rpDoubleAsString, double& rReturn );
-STRING GetString( double fNumber, sal_Bool bLeadingSign = sal_False, sal_uInt16 nMaxNumOfDigits = 15 );
-inline double Exp10( sal_Int16 nPower ); // 10 ^ nPower
+double Erf( double fX );
+double Erfc( double fX );
+sal_Bool ParseDouble( const sal_Unicode*& rpDoubleAsString, double& rReturn );
+STRING GetString( double fNumber, sal_Bool bLeadingSign = sal_False, sal_uInt16 nMaxNumOfDigits = 15 );
+inline double Exp10( sal_Int16 nPower ); // 10 ^ nPower
-double GetAmordegrc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer,
+double GetAmordegrc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer,
double fRestVal, double fPer, double fRate, sal_Int32 nBase ) THROWDEF_RTE_IAE;
-double GetAmorlinc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer,
+double GetAmorlinc( sal_Int32 nNullDate, double fCost, sal_Int32 nDate, sal_Int32 nFirstPer,
double fRestVal, double fPer, double fRate, sal_Int32 nBase ) THROWDEF_RTE_IAE;
-double GetDuration( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fCoup,
+double GetDuration( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fCoup,
double fYield, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE;
-double GetYieldmat( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue,
+double GetYieldmat( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue,
double fRate, double fPrice, sal_Int32 nBase ) THROWDEF_RTE_IAE;
-double GetOddfprice( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue,
+double GetOddfprice( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue,
sal_Int32 nFirstCoup, double fRate, double fYield, double fRedemp,
sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE;
-double getYield_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fPrice,
+double getYield_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fCoup, double fPrice,
double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE;
-double getPrice_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fRate, double fYield,
+double getPrice_( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, double fRate, double fYield,
double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE;
-double GetOddfyield( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue,
+double GetOddfyield( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nIssue,
sal_Int32 nFirstCoup, double fRate, double fPrice, double fRedemp,
sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE;
-double GetOddlprice( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest,
+double GetOddlprice( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest,
double fRate, double fYield, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE;
-double GetOddlyield( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest,
+double GetOddlyield( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nLastInterest,
double fRate, double fPrice, double fRedemp, sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE;
-double GetRmz( double fZins, double fZzr, double fBw, double fZw, sal_Int32 nF );
-double GetZw( double fZins, double fZzr, double fRmz, double fBw, sal_Int32 nF );
-//double TBillYield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice )THROWDEF_RTE_IAE;
+double GetRmz( double fZins, double fZzr, double fBw, double fZw, sal_Int32 nF );
+double GetZw( double fZins, double fZzr, double fRmz, double fBw, sal_Int32 nF );
+//double TBillYield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice )THROWDEF_RTE_IAE;
-double GetCouppcd( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq,
+double GetCouppcd( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq,
sal_Int32 nBase ) THROWDEF_RTE_IAE;
double GetCoupncd( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq,
sal_Int32 nBase ) THROWDEF_RTE_IAE;
double GetCoupdaybs( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq,
sal_Int32 nBase ) THROWDEF_RTE_IAE;
-double GetCoupdaysnc( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq,
+double GetCoupdaysnc( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq,
sal_Int32 nBase ) THROWDEF_RTE_IAE;
double GetCoupnum( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat,
sal_Int32 nFreq, sal_Int32 nBase ) THROWDEF_RTE_IAE;
-double GetCoupdays( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq,
+double GetCoupdays( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq,
sal_Int32 nBase ) THROWDEF_RTE_IAE;
@@ -150,29 +150,29 @@ double GetCoupdays( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int
class MyList
{
private:
- static const sal_uInt32 nStartSize;
- static const sal_uInt32 nIncrSize;
+ static const sal_uInt32 nStartSize;
+ static const sal_uInt32 nIncrSize;
- void** pData; // pointer array
- sal_uInt32 nSize; // array size
- sal_uInt32 nNew; // next index to be inserted at
- sal_uInt32 nAct; // actual for iterations
+ void** pData; // pointer array
+ sal_uInt32 nSize; // array size
+ sal_uInt32 nNew; // next index to be inserted at
+ sal_uInt32 nAct; // actual for iterations
- void _Grow( void );
- inline void Grow( void );
+ void _Grow( void );
+ inline void Grow( void );
protected:
public:
MyList( void );
- virtual ~MyList();
+ virtual ~MyList();
- inline const void* GetObject( sal_uInt32 nIndex ) const;
- inline const void* First( void );
- inline const void* Next( void );
+ inline const void* GetObject( sal_uInt32 nIndex ) const;
+ inline const void* First( void );
+ inline const void* Next( void );
- inline void Append( void* pNewElement );
- void Insert( void* pNewLement, sal_uInt32 nPlace );
+ inline void Append( void* pNewElement );
+ void Insert( void* pNewLement, sal_uInt32 nPlace );
- inline sal_uInt32 Count( void ) const;
+ inline sal_uInt32 Count( void ) const;
};
@@ -181,15 +181,15 @@ public:
class StringList : protected MyList
{
public:
- virtual ~StringList();
+ virtual ~StringList();
- inline const STRING* First( void );
- inline const STRING* Next( void );
- inline const STRING* Get( sal_uInt32 nIndex ) const;
+ inline const STRING* First( void );
+ inline const STRING* Next( void );
+ inline const STRING* Get( sal_uInt32 nIndex ) const;
using MyList::Append;
- inline void Append( STRING* pNew );
- inline void Append( const STRING& rNew );
+ inline void Append( STRING* pNew );
+ inline void Append( const STRING& rNew );
using MyList::Count;
};
@@ -210,14 +210,14 @@ enum FDCategory
struct FuncDataBase
{
- const sal_Char* pIntName;
- sal_uInt16 nUINameID; // resource ID to UI name
- sal_uInt16 nDescrID; // resource ID to description, parameter names and ~ description
- sal_Bool bDouble; // name already exist in Calc
- sal_Bool bWithOpt; // first parameter is internal
- sal_uInt16 nCompListID; // resource ID to list of valid names
- sal_uInt16 nNumOfParams; // number of named / described parameters
- FDCategory eCat; // function category
+ const sal_Char* pIntName;
+ sal_uInt16 nUINameID; // resource ID to UI name
+ sal_uInt16 nDescrID; // resource ID to description, parameter names and ~ description
+ sal_Bool bDouble; // name already exist in Calc
+ sal_Bool bWithOpt; // first parameter is internal
+ sal_uInt16 nCompListID; // resource ID to list of valid names
+ sal_uInt16 nNumOfParams; // number of named / described parameters
+ FDCategory eCat; // function category
};
@@ -227,30 +227,30 @@ class FuncData
{
private:
::rtl::OUString aIntName;
- sal_uInt16 nUINameID;
- sal_uInt16 nDescrID; // leads also to parameter descriptions!
- sal_Bool bDouble; // flag for names, wich already exist in Calc
- sal_Bool bWithOpt; // has internal parameter on first position
-
- sal_uInt16 nParam; // num of parameters
- sal_uInt16 nCompID;
- StringList aCompList; // list of all valid names
- FDCategory eCat; // function category
+ sal_uInt16 nUINameID;
+ sal_uInt16 nDescrID; // leads also to parameter descriptions!
+ sal_Bool bDouble; // flag for names, wich already exist in Calc
+ sal_Bool bWithOpt; // has internal parameter on first position
+
+ sal_uInt16 nParam; // num of parameters
+ sal_uInt16 nCompID;
+ StringList aCompList; // list of all valid names
+ FDCategory eCat; // function category
public:
FuncData( const FuncDataBase& rBaseData, ResMgr& );
- virtual ~FuncData();
+ virtual ~FuncData();
- inline sal_uInt16 GetUINameID( void ) const;
- inline sal_uInt16 GetDescrID( void ) const;
- inline sal_Bool IsDouble( void ) const;
- inline sal_Bool HasIntParam( void ) const;
+ inline sal_uInt16 GetUINameID( void ) const;
+ inline sal_uInt16 GetDescrID( void ) const;
+ inline sal_Bool IsDouble( void ) const;
+ inline sal_Bool HasIntParam( void ) const;
- sal_uInt16 GetStrIndex( sal_uInt16 nParamNum ) const;
+ sal_uInt16 GetStrIndex( sal_uInt16 nParamNum ) const;
inline sal_Bool Is( const ::rtl::OUString& rCompareTo ) const;
- inline const StringList& GetCompNameList( void ) const;
+ inline const StringList& GetCompNameList( void ) const;
- inline FDCategory GetCategory( void ) const;
+ inline FDCategory GetCategory( void ) const;
};
@@ -260,8 +260,8 @@ class CStrList : private MyList
{
public:
using MyList::Append;
- inline void Append( const sal_Char* pNew );
- inline const sal_Char* Get( sal_uInt32 nIndex ) const;
+ inline void Append( const sal_Char* pNew );
+ inline const sal_Char* Get( sal_uInt32 nIndex ) const;
using MyList::Count;
};
@@ -271,13 +271,13 @@ public:
class FuncDataList : private MyList
{
::rtl::OUString aLastName;
- sal_uInt32 nLast;
+ sal_uInt32 nLast;
public:
FuncDataList( ResMgr& );
- virtual ~FuncDataList();
+ virtual ~FuncDataList();
using MyList::Append;
- inline void Append( FuncData* pNew );
- inline const FuncData* Get( sal_uInt32 nIndex ) const;
+ inline void Append( FuncData* pNew );
+ inline const FuncData* Get( sal_uInt32 nIndex ) const;
using MyList::Count;
const FuncData* Get( const ::rtl::OUString& aProgrammaticName ) const;
@@ -297,7 +297,7 @@ class AnalysisResId : public ResId
class AnalysisRscStrLoader : public Resource
{
private:
- String aStr;
+ String aStr;
public:
AnalysisRscStrLoader( sal_uInt16 nRsc, sal_uInt16 nStrId, ResMgr& rResMgr ) :
Resource( AnalysisResId( nRsc, rResMgr ) ),
@@ -306,7 +306,7 @@ public:
FreeResource();
}
- const String& GetString() const { return aStr; }
+ const String& GetString() const { return aStr; }
};
@@ -442,39 +442,39 @@ public:
class Complex
{
- double r;
- double i;
+ double r;
+ double i;
sal_Unicode c;
public:
inline Complex( double fReal, double fImag = 0.0, sal_Char cC = '\0' );
Complex( const STRING& rComplexAsString ) THROWDEF_RTE_IAE;
- inline static sal_Bool IsImagUnit( sal_Unicode c );
- static sal_Bool ParseString( const STRING& rComplexAsString, Complex& rReturn );
+ inline static sal_Bool IsImagUnit( sal_Unicode c );
+ static sal_Bool ParseString( const STRING& rComplexAsString, Complex& rReturn );
STRING GetString() const THROWDEF_RTE_IAE;
- inline double Real( void ) const;
- inline double Imag( void ) const;
+ inline double Real( void ) const;
+ inline double Imag( void ) const;
- double Arg( void ) const THROWDEF_RTE_IAE;
- inline double Abs( void ) const;
+ double Arg( void ) const THROWDEF_RTE_IAE;
+ inline double Abs( void ) const;
// following functions change the complex number itself to avoid unnecessary copy actions!
- void Power( double fPower ) THROWDEF_RTE_IAE;
- void Sqrt( void );
- void Sin( void ) THROWDEF_RTE_IAE;
- void Cos( void ) THROWDEF_RTE_IAE;
- void Div( const Complex& rDivisor ) THROWDEF_RTE_IAE;
- void Exp( void );
- inline void Conjugate( void );
- void Ln( void ) THROWDEF_RTE_IAE;
- void Log10( void ) THROWDEF_RTE_IAE;
- void Log2( void ) THROWDEF_RTE_IAE;
- inline void Mult( double fFact );
- inline void Mult( const Complex& rMult );
- inline void Sub( const Complex& rMult );
- inline void Add( const Complex& rAdd );
+ void Power( double fPower ) THROWDEF_RTE_IAE;
+ void Sqrt( void );
+ void Sin( void ) THROWDEF_RTE_IAE;
+ void Cos( void ) THROWDEF_RTE_IAE;
+ void Div( const Complex& rDivisor ) THROWDEF_RTE_IAE;
+ void Exp( void );
+ inline void Conjugate( void );
+ void Ln( void ) THROWDEF_RTE_IAE;
+ void Log10( void ) THROWDEF_RTE_IAE;
+ void Log2( void ) THROWDEF_RTE_IAE;
+ inline void Mult( double fFact );
+ inline void Mult( const Complex& rMult );
+ inline void Sub( const Complex& rMult );
+ inline void Add( const Complex& rAdd );
};
@@ -491,18 +491,18 @@ enum ComplListAppendHandl
class ComplexList : protected MyList
{
public:
- virtual ~ComplexList();
+ virtual ~ComplexList();
- inline const Complex* Get( sal_uInt32 nIndex ) const;
- inline const Complex* First( void );
- inline const Complex* Next( void );
+ inline const Complex* Get( sal_uInt32 nIndex ) const;
+ inline const Complex* First( void );
+ inline const Complex* Next( void );
using MyList::Count;
using MyList::Append;
- inline void Append( Complex* pNew );
- void Append( const SEQSEQ( STRING )& rComplexNumList, ComplListAppendHandl eAH = AH_EmpyAs0 ) THROWDEF_RTE_IAE;
- void Append( const SEQ( ANY )& aMultPars,ComplListAppendHandl eAH = AH_EmpyAs0 ) THROWDEF_RTE_IAE;
+ inline void Append( Complex* pNew );
+ void Append( const SEQSEQ( STRING )& rComplexNumList, ComplListAppendHandl eAH = AH_EmpyAs0 ) THROWDEF_RTE_IAE;
+ void Append( const SEQ( ANY )& aMultPars,ComplListAppendHandl eAH = AH_EmpyAs0 ) THROWDEF_RTE_IAE;
};
@@ -515,7 +515,7 @@ enum ConvertDataClass
};
-#define INV_MATCHLEV 1764 // guess, what this is... :-)
+#define INV_MATCHLEV 1764 // guess, what this is... :-)
class ConvertDataList;
@@ -527,34 +527,34 @@ class ConvertData
{
protected:
friend class ConvertDataList;
- double fConst;
- STRING aName;
- ConvertDataClass eClass;
+ double fConst;
+ STRING aName;
+ ConvertDataClass eClass;
sal_Bool bPrefixSupport;
public:
ConvertData(
- const sal_Char pUnitName[],
- double fConvertConstant,
- ConvertDataClass eClass,
+ const sal_Char pUnitName[],
+ double fConvertConstant,
+ ConvertDataClass eClass,
sal_Bool bPrefSupport = sal_False );
virtual ~ConvertData();
- sal_Int16 GetMatchingLevel( const STRING& rRef ) const;
+ sal_Int16 GetMatchingLevel( const STRING& rRef ) const;
// 0.0 = no equality
// 1.0 = matches exact
// rest = matches without an assumed prefix of one character
// rest gives power for 10 represented by the prefix (e.g. 3 for k or -9 for n
- virtual double Convert( double fVal, const ConvertData& rTo,
+ virtual double Convert( double fVal, const ConvertData& rTo,
sal_Int16 nMatchLevelFrom, sal_Int16 nMatchLevelTo ) const THROWDEF_RTE_IAE;
// converts fVal from this unit to rFrom unit
// throws exception if not from same class
// this implementation is for proportional cases only
- virtual double ConvertToBase( double fVal, sal_Int16 nMatchLevel ) const;
- virtual double ConvertFromBase( double fVal, sal_Int16 nMatchLevel ) const;
+ virtual double ConvertToBase( double fVal, sal_Int16 nMatchLevel ) const;
+ virtual double ConvertFromBase( double fVal, sal_Int16 nMatchLevel ) const;
- inline ConvertDataClass Class( void ) const;
+ inline ConvertDataClass Class( void ) const;
inline sal_Bool IsPrefixSupport( void ) const;
};
@@ -564,23 +564,23 @@ public:
class ConvertDataLinear : public ConvertData
{
protected:
- double fOffs;
+ double fOffs;
public:
- inline ConvertDataLinear(
- const sal_Char pUnitName[],
- double fConvertConstant,
- double fConvertOffset,
- ConvertDataClass eClass,
+ inline ConvertDataLinear(
+ const sal_Char pUnitName[],
+ double fConvertConstant,
+ double fConvertOffset,
+ ConvertDataClass eClass,
sal_Bool bPrefSupport = sal_False );
virtual ~ConvertDataLinear();
- virtual double Convert( double fVal, const ConvertData& rTo,
+ virtual double Convert( double fVal, const ConvertData& rTo,
sal_Int16 nMatchLevelFrom, sal_Int16 nMatchLevelTo ) const THROWDEF_RTE_IAE;
// for cases where f(x) = a + bx applies (e.g. Temperatures)
- virtual double ConvertToBase( double fVal, sal_Int16 nMatchLevel ) const;
- virtual double ConvertFromBase( double fVal, sal_Int16 nMatchLevel ) const;
+ virtual double ConvertToBase( double fVal, sal_Int16 nMatchLevel ) const;
+ virtual double ConvertFromBase( double fVal, sal_Int16 nMatchLevel ) const;
};
@@ -590,13 +590,13 @@ class ConvertDataList : protected MyList
{
private:
protected:
- inline ConvertData* First( void );
- inline ConvertData* Next( void );
+ inline ConvertData* First( void );
+ inline ConvertData* Next( void );
public:
ConvertDataList( void );
- virtual ~ConvertDataList();
+ virtual ~ConvertDataList();
- double Convert( double fVal, const STRING& rFrom, const STRING& rTo ) THROWDEF_RTE_IAE;
+ double Convert( double fVal, const STRING& rFrom, const STRING& rTo ) THROWDEF_RTE_IAE;
};
@@ -615,7 +615,7 @@ inline sal_Int32 GetDiffDate360( constREFXPS& xOpt, sal_Int32 nDate1, sal_Int32
inline sal_Int16 GetDayOfWeek( sal_Int32 n )
-{ // monday = 0, ..., sunday = 6
+{ // monday = 0, ..., sunday = 6
return static_cast< sal_Int16 >( ( n - 1 ) % 7 );
}
@@ -628,7 +628,7 @@ inline double GetYearFrac( constREFXPS& xOpt, sal_Int32 nStartDate, sal_Int32 nE
inline void AlignDate( sal_uInt16& rD, sal_uInt16 nM, sal_uInt16 nY )
{
- sal_uInt16 nMax = DaysInMonth( nM, nY );
+ sal_uInt16 nMax = DaysInMonth( nM, nY );
if( rD > nMax )
rD = nMax;
@@ -831,8 +831,8 @@ inline void Complex::Mult( double f )
inline void Complex::Mult( const Complex& rM )
{
- double r_ = r;
- double i_ = i;
+ double r_ = r;
+ double i_ = i;
r = r_ * rM.r - i_ * rM.i;
i = r_ * rM.i + i_ * rM.r;
@@ -885,7 +885,7 @@ inline void ComplexList::Append( Complex* p )
-inline ConvertDataClass ConvertData::Class( void ) const
+inline ConvertDataClass ConvertData::Class( void ) const
{
return eClass;
}
@@ -897,7 +897,7 @@ inline sal_Bool ConvertData::IsPrefixSupport( void ) const
return bPrefixSupport;
}
-inline ConvertDataLinear::ConvertDataLinear( const sal_Char* p, double fC, double fO, ConvertDataClass e,
+inline ConvertDataLinear::ConvertDataLinear( const sal_Char* p, double fC, double fO, ConvertDataClass e,
sal_Bool bPrefSupport ) :
ConvertData( p, fC, e, bPrefSupport ),
fOffs( fO )
diff --git a/scaddins/source/analysis/bessel.cxx b/scaddins/source/analysis/bessel.cxx
index f853b49eb443..2b5a8ec57b5d 100644
--- a/scaddins/source/analysis/bessel.cxx
+++ b/scaddins/source/analysis/bessel.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER 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 @@ double BesselJ( double x, sal_Int32 N ) throw (IllegalArgumentException, NoConve
and an odd function for odd N (means J(-x)=-J(x)).*/
double fSign = (N % 2 == 1 && x < 0) ? -1.0 : 1.0;
double fX = fabs(x);
-
+
const double fMaxIteration = 9000000.0; //experimental, for to return in < 3 seconds
double fEstimateIteration = fX * 1.5 + N;
bool bAsymptoticPossible = pow(fX,0.4) > N;
@@ -261,12 +261,12 @@ double BesselI( double x, sal_Int32 n ) throw( IllegalArgumentException, NoConve
double Besselk0( double fNum ) throw( IllegalArgumentException, NoConvergenceException )
{
- double fRet;
+ double fRet;
if( fNum <= 2.0 )
{
- double fNum2 = fNum * 0.5;
- double y = fNum2 * fNum2;
+ double fNum2 = fNum * 0.5;
+ double y = fNum2 * fNum2;
fRet = -log( fNum2 ) * BesselI( fNum, 0 ) +
( -0.57721566 + y * ( 0.42278420 + y * ( 0.23069756 + y * ( 0.3488590e-1 +
@@ -274,7 +274,7 @@ double Besselk0( double fNum ) throw( IllegalArgumentException, NoConvergenceExc
}
else
{
- double y = 2.0 / fNum;
+ double y = 2.0 / fNum;
fRet = exp( -fNum ) / sqrt( fNum ) * ( 1.25331414 + y * ( -0.7832358e-1 +
y * ( 0.2189568e-1 + y * ( -0.1062446e-1 + y * ( 0.587872e-2 +
@@ -287,12 +287,12 @@ double Besselk0( double fNum ) throw( IllegalArgumentException, NoConvergenceExc
double Besselk1( double fNum ) throw( IllegalArgumentException, NoConvergenceException )
{
- double fRet;
+ double fRet;
if( fNum <= 2.0 )
{
- double fNum2 = fNum * 0.5;
- double y = fNum2 * fNum2;
+ double fNum2 = fNum * 0.5;
+ double y = fNum2 * fNum2;
fRet = log( fNum2 ) * BesselI( fNum, 1 ) +
( 1.0 + y * ( 0.15443144 + y * ( -0.67278579 + y * ( -0.18156897 + y * ( -0.1919402e-1 +
@@ -301,7 +301,7 @@ double Besselk1( double fNum ) throw( IllegalArgumentException, NoConvergenceExc
}
else
{
- double y = 2.0 / fNum;
+ double y = 2.0 / fNum;
fRet = exp( -fNum ) / sqrt( fNum ) * ( 1.25331414 + y * ( 0.23498619 +
y * ( -0.3655620e-1 + y * ( 0.1504268e-1 + y * ( -0.780353e-2 +
@@ -316,15 +316,15 @@ double BesselK( double fNum, sal_Int32 nOrder ) throw( IllegalArgumentException,
{
switch( nOrder )
{
- case 0: return Besselk0( fNum );
- case 1: return Besselk1( fNum );
+ case 0: return Besselk0( fNum );
+ case 1: return Besselk1( fNum );
default:
{
- double fBkp;
+ double fBkp;
- double fTox = 2.0 / fNum;
- double fBkm = Besselk0( fNum );
- double fBk = Besselk1( fNum );
+ double fTox = 2.0 / fNum;
+ double fBkm = Besselk0( fNum );
+ double fBk = Besselk1( fNum );
for( sal_Int32 n = 1 ; n < nOrder ; n++ )
{
diff --git a/scaddins/source/analysis/bessel.hxx b/scaddins/source/analysis/bessel.hxx
index c94b4f1a9b77..62c350ed9193 100644
--- a/scaddins/source/analysis/bessel.hxx
+++ b/scaddins/source/analysis/bessel.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/scaddins/source/analysis/financial.cxx b/scaddins/source/analysis/financial.cxx
index fd5731d008a0..46f5a09d7ffd 100644
--- a/scaddins/source/analysis/financial.cxx
+++ b/scaddins/source/analysis/financial.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -120,7 +120,7 @@ double SAL_CALL AnalysisAddIn::getEffect( double fNominal, sal_Int32 nPeriods )
if( nPeriods < 1 || fNominal <= 0.0 )
THROW_IAE;
- double fPeriods = nPeriods;
+ double fPeriods = nPeriods;
double fRet = pow( 1.0 + fNominal / fPeriods, fPeriods ) - 1.0;
RETURN_FINITE( fRet );
@@ -233,14 +233,14 @@ double SAL_CALL AnalysisAddIn::getPricemat( constREFXPS& xOpt,
if( fRate < 0.0 || fYield < 0.0 || nSettle >= nMat )
THROW_IAE;
- sal_Int32 nNullDate = GetNullDate( xOpt );
+ sal_Int32 nNullDate = GetNullDate( xOpt );
sal_Int32 nBase = getDateMode( xOpt, rOB );
- double fIssMat = GetYearFrac( nNullDate, nIssue, nMat, nBase );
- double fIssSet = GetYearFrac( nNullDate, nIssue, nSettle, nBase );
- double fSetMat = GetYearFrac( nNullDate, nSettle, nMat, nBase );
+ double fIssMat = GetYearFrac( nNullDate, nIssue, nMat, nBase );
+ double fIssSet = GetYearFrac( nNullDate, nIssue, nSettle, nBase );
+ double fSetMat = GetYearFrac( nNullDate, nSettle, nMat, nBase );
- double fRet = 1.0 + fIssMat * fRate;
+ double fRet = 1.0 + fIssMat * fRate;
fRet /= 1.0 + fSetMat * fYield;
fRet -= fIssSet * fRate;
fRet *= 100.0;
@@ -267,7 +267,7 @@ double SAL_CALL AnalysisAddIn::getNominal( double fRate, sal_Int32 nPeriods ) TH
if( fRate <= 0.0 || nPeriods < 0 )
THROW_IAE;
- double fPeriods = nPeriods;
+ double fPeriods = nPeriods;
double fRet = ( pow( fRate + 1.0, 1.0 / fPeriods ) - 1.0 ) * fPeriods;
RETURN_FINITE( fRet );
}
@@ -278,10 +278,10 @@ double SAL_CALL AnalysisAddIn::getDollarfr( double fDollarDec, sal_Int32 nFrac )
if( nFrac <= 0 )
THROW_IAE;
- double fInt;
- double fFrac = nFrac;
+ double fInt;
+ double fFrac = nFrac;
- double fRet = modf( fDollarDec, &fInt );
+ double fRet = modf( fDollarDec, &fInt );
fRet *= fFrac;
@@ -298,10 +298,10 @@ double SAL_CALL AnalysisAddIn::getDollarde( double fDollarFrac, sal_Int32 nFrac
if( nFrac <= 0 )
THROW_IAE;
- double fInt;
- double fFrac = nFrac;
+ double fInt;
+ double fFrac = nFrac;
- double fRet = modf( fDollarFrac, &fInt );
+ double fRet = modf( fDollarFrac, &fInt );
fRet /= fFrac;
@@ -331,10 +331,10 @@ double SAL_CALL AnalysisAddIn::getYielddisc( constREFXPS& xOpt,
if( fPrice <= 0.0 || fRedemp <= 0.0 || nSettle >= nMat )
THROW_IAE;
- sal_Int32 nNullDate = GetNullDate( xOpt );
+ sal_Int32 nNullDate = GetNullDate( xOpt );
#if 0
- double fRet = 1.0 - fPrice / fRedemp;
+ double fRet = 1.0 - fPrice / fRedemp;
fRet /= GetYearFrac( nNullDate, nSettle, nMat, getDateMode( xOpt, rOB ) );
fRet /= 0.99795; // don't know what this constant means in original
#endif
@@ -363,7 +363,7 @@ double SAL_CALL AnalysisAddIn::getTbilleq( constREFXPS& xOpt,
{
nMat++;
- sal_Int32 nDiff = GetDiffDate360( xOpt, nSettle, nMat, sal_True );
+ sal_Int32 nDiff = GetDiffDate360( xOpt, nSettle, nMat, sal_True );
if( fDisc <= 0.0 || nSettle >= nMat || nDiff > 360 )
THROW_IAE;
@@ -381,9 +381,9 @@ double SAL_CALL AnalysisAddIn::getTbillprice( constREFXPS& xOpt,
nMat++;
- double fFraction = GetYearFrac( xOpt, nSettle, nMat, 0 ); // method: USA 30/360
+ double fFraction = GetYearFrac( xOpt, nSettle, nMat, 0 ); // method: USA 30/360
- double fDummy;
+ double fDummy;
if( modf( fFraction, &fDummy ) == 0.0 )
THROW_IAE;
@@ -395,13 +395,13 @@ double SAL_CALL AnalysisAddIn::getTbillprice( constREFXPS& xOpt,
double SAL_CALL AnalysisAddIn::getTbillyield( constREFXPS& xOpt, sal_Int32 nSettle, sal_Int32 nMat, double fPrice )
THROWDEF_RTE_IAE
{
- sal_Int32 nDiff = GetDiffDate360( xOpt, nSettle, nMat, sal_True );
+ sal_Int32 nDiff = GetDiffDate360( xOpt, nSettle, nMat, sal_True );
nDiff++;
if( fPrice <= 0.0 || nSettle >= nMat || nDiff > 360 )
THROW_IAE;
- double fRet = 100.0;
+ double fRet = 100.0;
fRet /= fPrice;
fRet--;
fRet /= double( nDiff );
@@ -577,13 +577,13 @@ double SAL_CALL AnalysisAddIn::getXnpv(
aValList.Append( rValues );
aDateList.Append( rDates );
- sal_Int32 nNum = aValList.Count();
+ sal_Int32 nNum = aValList.Count();
if( nNum != sal_Int32( aDateList.Count() ) || nNum < 2 )
THROW_IAE;
- double fRet = 0.0;
- double fNull = *aDateList.Get( 0 );
+ double fRet = 0.0;
+ double fNull = *aDateList.Get( 0 );
fRate++;
for( sal_Int32 i = 0 ; i < nNum ; i++ )
diff --git a/scaddins/source/datefunc/dateadd.idl b/scaddins/source/datefunc/dateadd.idl
index 2ac925678938..626121a88d4a 100644
--- a/scaddins/source/datefunc/dateadd.idl
+++ b/scaddins/source/datefunc/dateadd.idl
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index 988f132ff9f4..9d2b235e8e02 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/scaddins/source/datefunc/datefunc.hrc b/scaddins/source/datefunc/datefunc.hrc
index 73d19ac6d080..efd7ab41432f 100644
--- a/scaddins/source/datefunc/datefunc.hrc
+++ b/scaddins/source/datefunc/datefunc.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/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index 66ba09713583..2a64aa80b216 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -332,7 +332,7 @@ class ScaDateAddIn : public ::cppu::WeakImplHelper6<
private:
::com::sun::star::lang::Locale aFuncLoc;
::com::sun::star::lang::Locale* pDefLocales;
- ResMgr* pResMgr;
+ ResMgr* pResMgr;
ScaFuncDataList* pFuncDataList;
diff --git a/scaddins/source/datefunc/datefunc.src b/scaddins/source/datefunc/datefunc.src
index 80575e7fd933..b42f376aff9d 100644
--- a/scaddins/source/datefunc/datefunc.src
+++ b/scaddins/source/datefunc/datefunc.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/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index 6c04f79d7cf5..c36cb791ac7d 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -602,7 +602,7 @@ extern "C"
}
// -------------------------------------------------------------------------
-
+
SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
{
if (pRegistryKey)
@@ -642,7 +642,7 @@ extern "C"
if( aImplName.equals( SolverComponent_getImplementationName() ) )
xFactory = cppu::createSingleComponentFactory(
SolverComponent_createInstance,
- OUString::createFromAscii( pImplName ),
+ OUString::createFromAscii( pImplName ),
SolverComponent_getSupportedServiceNames() );
if( xFactory.is() )
diff --git a/sccomp/source/solver/solver.hrc b/sccomp/source/solver/solver.hrc
index 8cfc9026121e..9f85172a4b20 100644
--- a/sccomp/source/solver/solver.hrc
+++ b/sccomp/source/solver/solver.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/sccomp/source/solver/solver.hxx b/sccomp/source/solver/solver.hxx
index cafa723e3b89..d870083a6579 100644
--- a/sccomp/source/solver/solver.hxx
+++ b/sccomp/source/solver/solver.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sccomp/source/solver/solver.src b/sccomp/source/solver/solver.src
index ff353bc4db9e..2c4c27af9e19 100644
--- a/sccomp/source/solver/solver.src
+++ b/sccomp/source/solver/solver.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